Merge pull request #42 from jasmineaura/develop

Bring Caja up to speed, stage1

1 files changed, 69 insertions, 179 deletions

diff --git a/src/caja-file-management-properties.ui b/src/caja-file-management-properties.ui
index c810d57e..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>
@@ -274,7 +248,6 @@
     <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
     <property name="focus_on_map">True</property>
     <property name="urgency_hint">False</property>
-    <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
@@ -420,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>
@@ -476,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>
@@ -528,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>
@@ -629,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>
@@ -681,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>
@@ -782,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>
@@ -816,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>
@@ -917,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>
@@ -933,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>
@@ -1012,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>
@@ -1137,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>
@@ -1184,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>
@@ -1301,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>
@@ -1398,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>
@@ -1539,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>
@@ -1594,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>
@@ -1649,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>
@@ -1679,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>
@@ -1761,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>
@@ -1784,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>
@@ -1903,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>
@@ -2035,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>
@@ -2051,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>
@@ -2152,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>
@@ -2208,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>
@@ -2224,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>
@@ -2325,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>
@@ -2341,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>
@@ -2442,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>
@@ -2458,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>
@@ -2799,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>
@@ -2808,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>
@@ -2984,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>
@@ -2993,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>
@@ -3101,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>