diff options
| author | Jasmine Hassan <[email protected]> | 2012-10-27 19:42:49 +0200 |
|---|---|---|
| committer | Jasmine Hassan <[email protected]> | 2012-11-16 09:45:53 +0200 |
| commit | b7f2233c06be6506e6913fcd02ae9c9e2183c9d3 (patch) | |
| tree | 56ebe5f675b2e2fe9b12e7be7074518948a800ff | |
| parent | 345bf975a496493161baf455af07977d57cbf709 (diff) | |
| download | caja-b7f2233c06be6506e6913fcd02ae9c9e2183c9d3.tar.bz2 caja-b7f2233c06be6506e6913fcd02ae9c9e2183c9d3.tar.xz | |
[fm-properties] use GtkComboBoxText in the GtkBuilder file
http://git.gnome.org/browse/nautilus/commit/?id=18fc6dd2516f9091570902640032e68b263cfddf
Also include subsequent commit:
preferences: cleanup expand/fill flags
Probably a change in GTK+ requires fixing this flags, so that the
dialog doesn't look odd.
http://git.gnome.org/browse/nautilus/commit/?id=6669f155734c320617bcf79f3b5d8f315f4886f9
| -rw-r--r-- | src/caja-file-management-properties.ui | 247 |
1 files changed, 69 insertions, 178 deletions
diff --git a/src/caja-file-management-properties.ui b/src/caja-file-management-properties.ui index 8f4003d8..5c4c3036 100644 --- a/src/caja-file-management-properties.ui +++ b/src/caja-file-management-properties.ui @@ -233,32 +233,6 @@ </row> </data> </object> - <object class="GtkListStore" id="model11"> - <columns> - <column type="gchararray"/> - </columns> - <data> - </data> - </object> - <object class="GtkListStore" id="model12"> - <columns> - <column type="gchararray"/> - </columns> - <data> - </data> - </object> - <object class="GtkListStore" id="model13"> - <columns> - <column type="gchararray"/> - </columns> - <data> - </data> - </object> - <object class="GtkListStore" id="model14"> - <columns> - <column type="gchararray"/> - </columns> - </object> <object class="GtkDialog" id="file_management_dialog"> <property name="border_width">5</property> <property name="title" translatable="yes">File Management Preferences</property> @@ -419,15 +393,13 @@ </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> <child> @@ -475,15 +447,13 @@ </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> <child> @@ -527,15 +497,13 @@ </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> </object> <packing> <property name="padding">0</property> <property name="expand">False</property> - <property name="fill">True</property> </packing> </child> <child> @@ -628,15 +596,13 @@ </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> <child> @@ -680,8 +646,7 @@ </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> </object> @@ -781,15 +746,13 @@ </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> <child> @@ -815,8 +778,7 @@ </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> </object> @@ -916,15 +878,13 @@ </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> </object> @@ -932,8 +892,7 @@ </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> </object> @@ -1011,8 +970,7 @@ </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> </object> @@ -1136,31 +1094,6 @@ </packing> </child> <child> - <object class="GtkLabel" id="label99"> - <property name="height_request">6</property> - <property name="visible">True</property> - <property name="label" translatable="yes"/> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </object> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - <child> <object class="GtkCheckButton" id="always_use_browser_checkbutton"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1183,8 +1116,8 @@ </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> </object> @@ -1300,8 +1233,8 @@ </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> </object> @@ -1397,8 +1330,8 @@ </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> </object> @@ -1538,29 +1471,23 @@ </packing> </child> <child> - <object class="GtkComboBox" id="captions_0_combobox"> + <object class="GtkComboBoxText" id="captions_0_combobox"> <property name="visible">True</property> <property name="add_tearoffs">False</property> <property name="focus_on_click">True</property> - <property name="model">model11</property> - <child> - <object class="GtkCellRendererText" id="renderer"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> + <property name="entry-text-column">0</property> </object> <packing> <property name="padding">0</property> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> </packing> </child> </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> <child> @@ -1593,22 +1520,16 @@ </packing> </child> <child> - <object class="GtkComboBox" id="captions_1_combobox"> + <object class="GtkComboBoxText" id="captions_1_combobox"> <property name="visible">True</property> <property name="add_tearoffs">False</property> <property name="focus_on_click">True</property> - <property name="model">model12</property> - <child> - <object class="GtkCellRendererText" id="renderer12"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> + <property name="entry-text-column">0</property> </object> <packing> <property name="padding">0</property> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> </packing> </child> </object> @@ -1648,29 +1569,23 @@ </packing> </child> <child> - <object class="GtkComboBox" id="captions_2_combobox"> + <object class="GtkComboBoxText" id="captions_2_combobox"> <property name="visible">True</property> <property name="add_tearoffs">False</property> <property name="focus_on_click">True</property> - <property name="model">model13</property> - <child> - <object class="GtkCellRendererText" id="renderer13"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> + <property name="entry-text-column">0</property> </object> <packing> <property name="padding">0</property> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> </packing> </child> </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> </object> @@ -1678,8 +1593,8 @@ </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> </object> @@ -1760,17 +1675,11 @@ </packing> </child> <child> - <object class="GtkComboBox" id="date_format_combobox"> + <object class="GtkComboBoxText" id="date_format_combobox"> <property name="visible">True</property> <property name="add_tearoffs">False</property> <property name="focus_on_click">True</property> - <property name="model">model14</property> - <child> - <object class="GtkCellRendererText" id="renderer14"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> + <property name="entry-text-column">0</property> </object> <packing> <property name="padding">0</property> @@ -1783,15 +1692,15 @@ </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> </object> <packing> <property name="padding">0</property> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> </packing> </child> </object> @@ -1902,15 +1811,13 @@ </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> </object> @@ -2034,15 +1941,15 @@ </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> </object> @@ -2050,8 +1957,8 @@ </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> </object> @@ -2151,15 +2058,15 @@ </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> <child> @@ -2207,15 +2114,13 @@ </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> </object> @@ -2223,8 +2128,7 @@ </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> </object> @@ -2324,15 +2228,13 @@ </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> </object> @@ -2340,8 +2242,7 @@ </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> </object> @@ -2441,15 +2342,13 @@ </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> </object> @@ -2457,8 +2356,7 @@ </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> </object> @@ -2798,8 +2696,7 @@ </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> </object> @@ -2807,15 +2704,13 @@ </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> <child> @@ -2983,8 +2878,7 @@ </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> </object> @@ -2992,15 +2886,13 @@ </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> </object> @@ -3100,8 +2992,7 @@ </object> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> </packing> </child> </object> |