[nautilus/gtk3-breakage: 3/19] preferences: cleanup expand/fill flags



commit 11ac9a67ebd0862145f2cbf2702182460eda9501
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Oct 22 02:35:40 2010 +0200

    preferences: cleanup expand/fill flags
    
    Probably a change in GTK+ requires fixing this flags, so that the dialog
    doesn't look odd.

 src/nautilus-file-management-properties.ui |  191 +++++++++-------------------
 1 files changed, 63 insertions(+), 128 deletions(-)
---
diff --git a/src/nautilus-file-management-properties.ui b/src/nautilus-file-management-properties.ui
index afa903c..b66cdde 100644
--- a/src/nautilus-file-management-properties.ui
+++ b/src/nautilus-file-management-properties.ui
@@ -390,15 +390,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>
@@ -446,15 +444,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>
@@ -498,15 +494,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>
@@ -599,15 +593,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>
@@ -651,8 +643,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>
@@ -752,15 +743,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>
@@ -786,8 +775,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>
@@ -887,15 +875,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>
@@ -903,8 +889,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>
@@ -982,8 +967,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>
@@ -1107,31 +1091,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>
@@ -1154,8 +1113,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>
@@ -1271,8 +1230,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>
@@ -1368,8 +1327,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>
@@ -1518,14 +1477,14 @@
                                   <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>
@@ -1567,7 +1526,7 @@
                                   <packing>
                                     <property name="padding">0</property>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
+                                    <property name="fill">False</property>
                                   </packing>
                                 </child>
                               </object>
@@ -1607,29 +1566,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>
@@ -1637,8 +1590,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>
@@ -1736,15 +1689,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>
@@ -1855,15 +1808,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>
@@ -1987,15 +1938,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>
@@ -2003,8 +1954,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>
@@ -2104,15 +2055,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>
@@ -2160,15 +2111,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>
@@ -2176,8 +2125,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>
@@ -2277,15 +2225,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>
@@ -2293,8 +2239,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>
@@ -2394,15 +2339,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>
@@ -2410,8 +2353,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>
@@ -2751,8 +2693,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>
@@ -2760,15 +2701,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>
@@ -2936,8 +2875,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>
@@ -2945,15 +2883,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>
@@ -3027,8 +2963,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>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]