[Xfce4-commits] <xfwm4:libxfce4ui> Fix the glade file.

Jérôme Guelfucci noreply at xfce.org
Sun Feb 28 12:48:08 CET 2010


Updating branch refs/heads/libxfce4ui
         to 97a4ac3e8545e572586a8c40905c4f02cc83112e (commit)
       from 66e9b937182e0dad01ff4b1aaf07aa524cea3973 (commit)

commit 97a4ac3e8545e572586a8c40905c4f02cc83112e
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sun Feb 28 11:44:35 2010 +0100

    Fix the glade file.
    
    Restore orientation properties and fix a crash in the dialog.

 settings-dialogs/xfwm4-dialog.glade |  291 +++++++++++++++++++++--------------
 1 files changed, 178 insertions(+), 113 deletions(-)

diff --git a/settings-dialogs/xfwm4-dialog.glade b/settings-dialogs/xfwm4-dialog.glade
index a3bafca..a29b380 100644
--- a/settings-dialogs/xfwm4-dialog.glade
+++ b/settings-dialogs/xfwm4-dialog.glade
@@ -1,53 +1,41 @@
 <?xml version="1.0"?>
-<!--Generated with glade3 3.4.5 on Mon Nov 10 13:50:52 2008 -->
 <interface>
+  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-requires libxfce4ui 4.5 -->
+  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">2000</property>
+    <property name="value">5</property>
     <property name="lower">5</property>
-    <property name="page_increment">10</property>
+    <property name="upper">2000</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">5</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment2">
-    <property name="upper">2000</property>
+    <property name="value">5</property>
     <property name="lower">5</property>
-    <property name="page_increment">10</property>
+    <property name="upper">2000</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">5</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment3">
-    <property name="upper">100</property>
+    <property name="value">20</property>
     <property name="lower">5</property>
-    <property name="page_increment">10</property>
+    <property name="upper">100</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">20</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment4">
-    <property name="upper">100</property>
+    <property name="value">20</property>
     <property name="lower">5</property>
-    <property name="page_increment">10</property>
+    <property name="upper">100</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">20</property>
-  </object>
-  <object class="GtkListStore" id="model1">
-    <columns>
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">  </col>
-      </row>
-    </data>
+    <property name="page_increment">10</property>
   </object>
   <object class="XfceTitledDialog" id="main-dialog">
     <property name="title" translatable="yes">Window Manager</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="window_position">center-on-parent</property>
     <property name="icon_name">xfwm4</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <property name="has_separator">False</property>
     <property name="subtitle" translatable="yes">Configure window behavior and shortcuts</property>
     <child internal-child="vbox">
@@ -67,7 +55,7 @@
                   <object class="GtkFrame" id="frame13">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment11">
                         <property name="visible">True</property>
@@ -78,9 +66,9 @@
                             <property name="width_request">200</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                            <property name="shadow_type">GTK_SHADOW_IN</property>
+                            <property name="hscrollbar_policy">automatic</property>
+                            <property name="vscrollbar_policy">automatic</property>
+                            <property name="shadow_type">in</property>
                             <child>
                               <object class="GtkTreeView" id="theme_name_treeview">
                                 <property name="visible">True</property>
@@ -101,16 +89,20 @@
                       </object>
                     </child>
                   </object>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
                 <child>
                   <object class="GtkVBox" id="vbox12">
                     <property name="visible">True</property>
+                    <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkFrame" id="frame10">
                         <property name="visible">True</property>
                         <property name="label_xalign">0</property>
-                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                        <property name="shadow_type">none</property>
                         <child>
                           <object class="GtkAlignment" id="alignment14">
                             <property name="visible">True</property>
@@ -139,13 +131,14 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkFrame" id="frame11">
                         <property name="visible">True</property>
                         <property name="label_xalign">0</property>
-                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                        <property name="shadow_type">none</property>
                         <child>
                           <object class="GtkAlignment" id="title_align_box">
                             <property name="visible">True</property>
@@ -179,7 +172,7 @@
                       <object class="GtkFrame" id="frame12">
                         <property name="visible">True</property>
                         <property name="label_xalign">0</property>
-                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                        <property name="shadow_type">none</property>
                         <child>
                           <object class="GtkAlignment" id="button_layout_box">
                             <property name="visible">True</property>
@@ -189,6 +182,7 @@
                               <object class="GtkVBox" id="vbox13">
                                 <property name="visible">True</property>
                                 <property name="border_width">6</property>
+                                <property name="orientation">vertical</property>
                                 <property name="spacing">6</property>
                                 <child>
                                   <object class="GtkLabel" id="label26">
@@ -196,12 +190,15 @@
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Click and drag the buttons to change the layout</property>
                                   </object>
+                                  <packing>
+                                    <property name="position">0</property>
+                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkFrame" id="active-frame">
                                     <property name="visible">True</property>
                                     <property name="label_xalign">0</property>
-                                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                                    <property name="shadow_type">in</property>
                                     <child>
                                       <object class="GtkAlignment" id="alignment17">
                                         <property name="visible">True</property>
@@ -212,15 +209,16 @@
                                             <property name="visible">True</property>
                                             <child>
                                               <object class="GtkButton" id="button-layout-|">
+                                                <property name="label" translatable="yes">Title</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">True</property>
-                                                <property name="tooltip-text" translatable="yes">The window title cannot be removed</property>
-                                                <property name="label" translatable="yes">Title</property>
+                                                <property name="tooltip_text" translatable="yes">The window title cannot be removed</property>
                                               </object>
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">False</property>
+                                                <property name="position">0</property>
                                               </packing>
                                             </child>
                                           </object>
@@ -243,7 +241,7 @@
                                   <object class="GtkFrame" id="hidden-frame">
                                     <property name="visible">True</property>
                                     <property name="label_xalign">0</property>
-                                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                                    <property name="shadow_type">in</property>
                                     <child>
                                       <object class="GtkAlignment" id="alignment18">
                                         <property name="visible">True</property>
@@ -258,7 +256,7 @@
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">True</property>
-                                                <property name="tooltip-text" translatable="yes">Menu</property>
+                                                <property name="tooltip_text" translatable="yes">Menu</property>
                                                 <child>
                                                   <object class="GtkImage" id="image1">
                                                     <property name="visible">True</property>
@@ -269,6 +267,7 @@
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">False</property>
+                                                <property name="position">0</property>
                                               </packing>
                                             </child>
                                             <child>
@@ -276,7 +275,7 @@
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">True</property>
-                                                <property name="tooltip-text" translatable="yes">Stick</property>
+                                                <property name="tooltip_text" translatable="yes">Stick</property>
                                                 <child>
                                                   <object class="GtkImage" id="image2">
                                                     <property name="visible">True</property>
@@ -295,7 +294,7 @@
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">True</property>
-                                                <property name="tooltip-text" translatable="yes">Shade</property>
+                                                <property name="tooltip_text" translatable="yes">Shade</property>
                                                 <child>
                                                   <object class="GtkImage" id="image3">
                                                     <property name="visible">True</property>
@@ -314,7 +313,7 @@
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">True</property>
-                                                <property name="tooltip-text" translatable="yes">Hide</property>
+                                                <property name="tooltip_text" translatable="yes">Hide</property>
                                                 <child>
                                                   <object class="GtkImage" id="image4">
                                                     <property name="visible">True</property>
@@ -333,7 +332,7 @@
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">True</property>
-                                                <property name="tooltip-text" translatable="yes">Maximize</property>
+                                                <property name="tooltip_text" translatable="yes">Maximize</property>
                                                 <child>
                                                   <object class="GtkImage" id="image5">
                                                     <property name="visible">True</property>
@@ -352,7 +351,7 @@
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">True</property>
-                                                <property name="tooltip-text" translatable="yes">Close</property>
+                                                <property name="tooltip_text" translatable="yes">Close</property>
                                                 <child>
                                                   <object class="GtkImage" id="image6">
                                                     <property name="visible">True</property>
@@ -422,7 +421,7 @@
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
                 <property name="label_xalign">0</property>
-                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <property name="shadow_type">none</property>
                 <child>
                   <object class="GtkAlignment" id="alignment12">
                     <property name="visible">True</property>
@@ -436,9 +435,9 @@
                           <object class="GtkScrolledWindow" id="scrolledwindow2">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-                            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                            <property name="shadow_type">GTK_SHADOW_IN</property>
+                            <property name="hscrollbar_policy">never</property>
+                            <property name="vscrollbar_policy">automatic</property>
+                            <property name="shadow_type">in</property>
                             <child>
                               <object class="GtkTreeView" id="shortcuts_treeview">
                                 <property name="visible">True</property>
@@ -446,33 +445,41 @@
                               </object>
                             </child>
                           </object>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
                         </child>
                         <child>
                           <object class="GtkHButtonBox" id="hbuttonbox1">
                             <property name="visible">True</property>
                             <property name="spacing">12</property>
-                            <property name="layout_style">GTK_BUTTONBOX_CENTER</property>
+                            <property name="layout_style">center</property>
                             <child>
                               <object class="GtkButton" id="shortcuts_clear_button">
+                                <property name="label">gtk-clear</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="label">gtk-clear</property>
                                 <property name="use_stock">True</property>
                               </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
                             </child>
                             <child>
                               <object class="GtkButton" id="shortcuts_reset_button">
+                                <property name="label" translatable="yes">_Reset to Defaults</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="label" translatable="yes">_Reset to Defaults</property>
                                 <property name="use_underline">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
-                                <property name="pack_type">GTK_PACK_END</property>
+                                <property name="pack_type">end</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -495,6 +502,9 @@
                   </object>
                 </child>
               </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="label2">
@@ -511,12 +521,13 @@
               <object class="GtkVBox" id="vbox7">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkFrame" id="frame5">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment7">
                         <property name="visible">True</property>
@@ -526,6 +537,7 @@
                         <child>
                           <object class="GtkVBox" id="vbox14">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkHBox" id="hbox3">
@@ -534,18 +546,23 @@
                                 <property name="homogeneous">True</property>
                                 <child>
                                   <object class="GtkRadioButton" id="click_to_focus_radio">
+                                    <property name="label" translatable="yes">Clic_k to focus</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="label" translatable="yes">Clic_k to focus</property>
+                                    <property name="receives_default">False</property>
                                     <property name="use_underline">True</property>
                                     <property name="draw_indicator">True</property>
                                   </object>
+                                  <packing>
+                                    <property name="position">0</property>
+                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="focus_follows_mouse_radio">
+                                    <property name="label" translatable="yes">Focus follows _mouse</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="label" translatable="yes">Focus follows _mouse</property>
+                                    <property name="receives_default">False</property>
                                     <property name="use_underline">True</property>
                                     <property name="draw_indicator">True</property>
                                     <property name="group">click_to_focus_radio</property>
@@ -555,6 +572,9 @@
                                   </packing>
                                 </child>
                               </object>
+                              <packing>
+                                <property name="position">0</property>
+                              </packing>
                             </child>
                             <child>
                               <object class="GtkLabel" id="label29">
@@ -580,19 +600,20 @@
                                     <child>
                                       <object class="GtkLabel" id="label30">
                                         <property name="visible">True</property>
-                                        <property context="yes" name="label" translatable="yes">Delay|<i>Short</i></property>
+                                        <property name="label" translatable="yes" context="yes">Delay|<i>Short</i></property>
                                         <property name="use_markup">True</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkHScale" id="focus_delay_scale">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
+                                        <property name="update_policy">discontinuous</property>
                                         <property name="adjustment">adjustment1</property>
                                         <property name="draw_value">False</property>
                                       </object>
@@ -603,7 +624,7 @@
                                     <child>
                                       <object class="GtkLabel" id="label31">
                                         <property name="visible">True</property>
-                                        <property context="yes" name="label" translatable="yes">Delay|<i>Long</i></property>
+                                        <property name="label" translatable="yes" context="yes">Delay|<i>Long</i></property>
                                         <property name="use_markup">True</property>
                                       </object>
                                       <packing>
@@ -626,7 +647,7 @@
                     <child type="label">
                       <object class="GtkLabel" id="label15">
                         <property name="visible">True</property>
-                        <property context="yes" name="label" translatable="yes"><b>Focus model</b></property>
+                        <property name="label" translatable="yes" context="yes"><b>Focus model</b></property>
                         <property name="use_markup">True</property>
                       </object>
                     </child>
@@ -634,13 +655,14 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkFrame" id="frame6">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment8">
                         <property name="visible">True</property>
@@ -649,9 +671,10 @@
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkCheckButton" id="focus_new_check">
+                            <property name="label" translatable="yes" context="yes">Automatically give focus to _newly created windows</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property context="yes" name="label" translatable="yes">Automatically give focus to _newly created windows</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -661,7 +684,7 @@
                     <child type="label">
                       <object class="GtkLabel" id="label16">
                         <property name="visible">True</property>
-                        <property context="yes" name="label" translatable="yes"><b>New window focus</b></property>
+                        <property name="label" translatable="yes" context="yes"><b>New window focus</b></property>
                         <property name="use_markup">True</property>
                       </object>
                     </child>
@@ -676,7 +699,7 @@
                   <object class="GtkFrame" id="frame7">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment9">
                         <property name="visible">True</property>
@@ -689,12 +712,16 @@
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkCheckButton" id="raise_on_focus_check">
+                                <property name="label" translatable="yes" context="yes">Automatically _raise windows when they receive focus</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property context="yes" name="label" translatable="yes">Automatically _raise windows when they receive focus</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
                               </object>
+                              <packing>
+                                <property name="position">0</property>
+                              </packing>
                             </child>
                             <child>
                               <object class="GtkVBox" id="vbox9">
@@ -704,13 +731,14 @@
                                   <object class="GtkLabel" id="label19">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
-                                    <property context="yes" name="label" translatable="yes">Delay _before raising focused window:</property>
+                                    <property name="label" translatable="yes" context="yes">Delay _before raising focused window:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">focus_raise_delay_scale</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
+                                    <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -724,19 +752,20 @@
                                         <child>
                                           <object class="GtkLabel" id="label20">
                                             <property name="visible">True</property>
-                                            <property context="yes" name="label" translatable="yes">Delay|<i>Short</i></property>
+                                            <property name="label" translatable="yes" context="yes">Delay|<i>Short</i></property>
                                             <property name="use_markup">True</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
                                           <object class="GtkHScale" id="focus_raise_delay_scale">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
+                                            <property name="update_policy">discontinuous</property>
                                             <property name="adjustment">adjustment2</property>
                                             <property name="draw_value">False</property>
                                           </object>
@@ -747,7 +776,7 @@
                                         <child>
                                           <object class="GtkLabel" id="label21">
                                             <property name="visible">True</property>
-                                            <property context="yes" name="label" translatable="yes">Delay|<i>Long</i></property>
+                                            <property name="label" translatable="yes" context="yes">Delay|<i>Long</i></property>
                                             <property name="use_markup">True</property>
                                           </object>
                                           <packing>
@@ -775,7 +804,7 @@
                     <child type="label">
                       <object class="GtkLabel" id="label17">
                         <property name="visible">True</property>
-                        <property context="yes" name="label" translatable="yes"><b>Raise on focus</b></property>
+                        <property name="label" translatable="yes" context="yes"><b>Raise on focus</b></property>
                         <property name="use_markup">True</property>
                       </object>
                     </child>
@@ -790,7 +819,7 @@
                   <object class="GtkFrame" id="frame8">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment10">
                         <property name="visible">True</property>
@@ -799,9 +828,10 @@
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkCheckButton" id="raise_on_click_check">
+                            <property name="label" translatable="yes" context="yes">Raise window when clicking _inside application window</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property context="yes" name="label" translatable="yes">Raise window when clicking _inside application window</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -811,7 +841,7 @@
                     <child type="label">
                       <object class="GtkLabel" id="label18">
                         <property name="visible">True</property>
-                        <property context="yes" name="label" translatable="yes"><b>Raise on click</b></property>
+                        <property name="label" translatable="yes" context="yes"><b>Raise on click</b></property>
                         <property name="use_markup">True</property>
                       </object>
                     </child>
@@ -823,11 +853,14 @@
                   </packing>
                 </child>
               </object>
+              <packing>
+                <property name="position">2</property>
+              </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
-                <property context="yes" name="label" translatable="yes">_Focus</property>
+                <property name="label" translatable="yes" context="yes">_Focus</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -839,12 +872,13 @@
               <object class="GtkVBox" id="vbox1">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkFrame" id="frame1">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment2">
                         <property name="visible">True</property>
@@ -854,25 +888,29 @@
                         <child>
                           <object class="GtkVBox" id="vbox2">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkCheckButton" id="snap_to_border_check">
+                                <property name="label" translatable="yes" context="yes">Snap windows to screen _border</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property context="yes" name="label" translatable="yes">Snap windows to screen _border</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="snap_to_window_check">
+                                <property name="label" translatable="yes" context="yes">Snap windows to other _windows</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property context="yes" name="label" translatable="yes">Snap windows to other _windows</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
                               </object>
@@ -885,15 +923,19 @@
                             <child>
                               <object class="GtkVBox" id="vbox5">
                                 <property name="visible">True</property>
+                                <property name="orientation">vertical</property>
                                 <property name="spacing">6</property>
                                 <child>
                                   <object class="GtkLabel" id="label9">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
-                                    <property context="yes" name="label" translatable="yes">Dis_tance:</property>
+                                    <property name="label" translatable="yes" context="yes">Dis_tance:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">snap_width_scale</property>
                                   </object>
+                                  <packing>
+                                    <property name="position">0</property>
+                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkAlignment" id="alignment6">
@@ -906,19 +948,20 @@
                                         <child>
                                           <object class="GtkLabel" id="label11">
                                             <property name="visible">True</property>
-                                            <property context="yes" name="label" translatable="yes">Distance|<i>Small</i></property>
+                                            <property name="label" translatable="yes" context="yes">Distance|<i>Small</i></property>
                                             <property name="use_markup">True</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
                                           <object class="GtkHScale" id="snap_width_scale">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
+                                            <property name="update_policy">discontinuous</property>
                                             <property name="adjustment">adjustment3</property>
                                             <property name="restrict_to_fill_level">False</property>
                                             <property name="draw_value">False</property>
@@ -930,7 +973,7 @@
                                         <child>
                                           <object class="GtkLabel" id="label12">
                                             <property name="visible">True</property>
-                                            <property context="yes" name="label" translatable="yes">Distance|<i>Wide</i></property>
+                                            <property name="label" translatable="yes" context="yes">Distance|<i>Wide</i></property>
                                             <property name="use_markup">True</property>
                                           </object>
                                           <packing>
@@ -958,20 +1001,21 @@
                     <child type="label">
                       <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
-                        <property context="yes" name="label" translatable="yes"><b>Windows snapping</b></property>
+                        <property name="label" translatable="yes" context="yes"><b>Windows snapping</b></property>
                         <property name="use_markup">True</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkFrame" id="frame2">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment3">
                         <property name="visible">True</property>
@@ -981,21 +1025,27 @@
                         <child>
                           <object class="GtkVBox" id="vbox4">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkCheckButton" id="wrap_workspaces_check">
+                                <property name="label" translatable="yes" context="yes">Wrap workspaces when the _pointer reaches the screen edge</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property context="yes" name="label" translatable="yes">Wrap workspaces when the _pointer reaches the screen edge</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
                               </object>
+                              <packing>
+                                <property name="position">0</property>
+                              </packing>
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="wrap_windows_check">
+                                <property name="label" translatable="yes" context="yes">Wrap workspaces when _dragging a window off the screen</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property context="yes" name="label" translatable="yes">Wrap workspaces when _dragging a window off the screen</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
                               </object>
@@ -1006,12 +1056,13 @@
                             <child>
                               <object class="GtkVBox" id="vbox6">
                                 <property name="visible">True</property>
+                                <property name="orientation">vertical</property>
                                 <property name="spacing">6</property>
                                 <child>
                                   <object class="GtkLabel" id="label10">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
-                                    <property context="yes" name="label" translatable="yes">_Edge resistance:</property>
+                                    <property name="label" translatable="yes" context="yes">_Edge resistance:</property>
                                     <property name="use_underline">True</property>
                                     <property name="selectable">True</property>
                                     <property name="mnemonic_widget">wrap_resistance_scale</property>
@@ -1019,10 +1070,11 @@
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
+                                    <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkAlignment" id="alignment3">
+                                  <object class="GtkAlignment" id="alignment4">
                                     <property name="visible">True</property>
                                     <property name="left_padding">12</property>
                                     <child>
@@ -1032,19 +1084,20 @@
                                         <child>
                                           <object class="GtkLabel" id="label13">
                                             <property name="visible">True</property>
-                                            <property context="yes" name="label" translatable="yes">Resistance|<i>Small</i></property>
+                                            <property name="label" translatable="yes" context="yes">Resistance|<i>Small</i></property>
                                             <property name="use_markup">True</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
                                           <object class="GtkHScale" id="wrap_resistance_scale">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
+                                            <property name="update_policy">discontinuous</property>
                                             <property name="adjustment">adjustment4</property>
                                             <property name="restrict_to_fill_level">False</property>
                                             <property name="draw_value">False</property>
@@ -1056,7 +1109,7 @@
                                         <child>
                                           <object class="GtkLabel" id="label14">
                                             <property name="visible">True</property>
-                                            <property context="yes" name="label" translatable="yes">Resistance|<i>Wide</i></property>
+                                            <property name="label" translatable="yes" context="yes">Resistance|<i>Wide</i></property>
                                             <property name="use_markup">True</property>
                                           </object>
                                           <packing>
@@ -1084,7 +1137,7 @@
                     <child type="label">
                       <object class="GtkLabel" id="label6">
                         <property name="visible">True</property>
-                        <property context="yes" name="label" translatable="yes"><b>Wrap workspaces</b></property>
+                        <property name="label" translatable="yes" context="yes"><b>Wrap workspaces</b></property>
                         <property name="use_markup">True</property>
                       </object>
                     </child>
@@ -1098,9 +1151,9 @@
                   <object class="GtkFrame" id="frame3">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <property name="shadow_type">none</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment4">
+                      <object class="GtkAlignment" id="alignment5">
                         <property name="visible">True</property>
                         <property name="border_width">6</property>
                         <property name="bottom_padding">6</property>
@@ -1108,25 +1161,29 @@
                         <child>
                           <object class="GtkVBox" id="vbox3">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkCheckButton" id="box_resize_check">
+                                <property name="label" translatable="yes" context="yes">Hide content of windows when _resizing</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property context="yes" name="label" translatable="yes">Hide content of windows when _resizing</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="box_move_check">
+                                <property name="label" translatable="yes" context="yes">Hide content of windows when _moving</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property context="yes" name="label" translatable="yes">Hide content of windows when _moving</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
                               </object>
@@ -1143,7 +1200,7 @@
                     <child type="label">
                       <object class="GtkLabel" id="label7">
                         <property name="visible">True</property>
-                        <property context="yes" name="label" translatable="yes"><b>Box move and resize</b></property>
+                        <property name="label" translatable="yes" context="yes"><b>Box move and resize</b></property>
                         <property name="use_markup">True</property>
                       </object>
                     </child>
@@ -1157,23 +1214,16 @@
                   <object class="GtkFrame" id="frame4">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <property name="shadow_type">none</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment5">
+                      <object class="GtkAlignment" id="alignment13">
                         <property name="visible">True</property>
                         <property name="border_width">6</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkComboBox" id="double_click_action_combo">
                             <property name="visible">True</property>
-                            <property context="yes" name="tooltip-text" translatable="yes">The action to perform when the title-bar is double-clicked</property>
-                            <property name="model">model1</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="renderer1"/>
-                              <attributes>
-                                <attribute name="text">0</attribute>
-                              </attributes>
-                            </child>
+                            <property name="tooltip_text" translatable="yes" context="yes">The action to perform when the title-bar is double-clicked</property>
                           </object>
                         </child>
                       </object>
@@ -1181,7 +1231,7 @@
                     <child type="label">
                       <object class="GtkLabel" id="label8">
                         <property name="visible">True</property>
-                        <property context="yes" name="label" translatable="yes"><b>Double click _action</b></property>
+                        <property name="label" translatable="yes" context="yes"><b>Double click _action</b></property>
                         <property name="use_markup">True</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">double_click_action_combo</property>
@@ -1194,11 +1244,14 @@
                   </packing>
                 </child>
               </object>
+              <packing>
+                <property name="position">3</property>
+              </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
-                <property context="yes" name="label" translatable="yes">Ad_vanced</property>
+                <property name="label" translatable="yes" context="yes">Ad_vanced</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -1214,35 +1267,47 @@
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_EDGE</property>
+            <property name="layout_style">edge</property>
             <child>
               <object class="GtkButton" id="help_button">
+                <property name="label" context="yes">gtk-help</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property context="yes" name="label">gtk-help</property>
                 <property name="use_stock">True</property>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="close_button">
+                <property name="label" context="yes">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property context="yes" name="label">gtk-close</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </object>
     </child>
+    <action-widgets>
+      <action-widget response="0">help_button</action-widget>
+      <action-widget response="0">close_button</action-widget>
+    </action-widgets>
   </object>
 </interface>



More information about the Xfce4-commits mailing list