[Xfce4-commits] <xfce4-settings:master> Tweak buttons positions.

[Jérôme Guelfucci]

Updating branch refs/heads/master
         to cd952f2777ffa11e48c003f0795ba5d55c798340 (commit)
       from 0b39613666ee95df3dbba6a5c9d1470799104a34 (commit)

commit cd952f2777ffa11e48c003f0795ba5d55c798340
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Thu Dec 27 11:33:36 2012 +0100

    Tweak buttons positions.
    
    Group buttons which act on individual shortcuts to the left and put
    "Reset to defaults" with some padding on the right as it will reset all
    shortcuts.

 dialogs/keyboard-settings/keyboard-dialog.glade |   39 ++++++++++++-----------
 1 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/dialogs/keyboard-settings/keyboard-dialog.glade b/dialogs/keyboard-settings/keyboard-dialog.glade
index 822816b..72aec7f 100644
--- a/dialogs/keyboard-settings/keyboard-dialog.glade
+++ b/dialogs/keyboard-settings/keyboard-dialog.glade
@@ -8,6 +8,11 @@
     <property name="can_focus">False</property>
     <property name="stock">gtk-revert-to-saved</property>
   </object>
+  <object class="GtkImage" id="image2">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-revert-to-saved</property>
+  </object>
   <object class="XfceTitledDialog" id="keyboard-layout-selection-dialog">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Keyboard layout selection</property>
@@ -113,8 +118,8 @@
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="button2">
-                <property name="label">gtk-close</property>
+              <object class="GtkButton" id="button1">
+                <property name="label">gtk-help</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -125,11 +130,12 @@
                 <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="position">0</property>
+                <property name="secondary">True</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button1">
-                <property name="label">gtk-help</property>
+              <object class="GtkButton" id="button2">
+                <property name="label">gtk-close</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -140,7 +146,6 @@
                 <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="position">0</property>
-                <property name="secondary">True</property>
               </packing>
             </child>
           </object>
@@ -596,14 +601,13 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkButton" id="reset_shortcuts_button">
-                                <property name="label" translatable="yes">Reset to _Defaults</property>
+                              <object class="GtkButton" id="delete_shortcut_button">
+                                <property name="label">gtk-remove</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="image">image1</property>
-                                <property name="use_underline">True</property>
+                                <property name="use_stock">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -612,17 +616,19 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkButton" id="delete_shortcut_button">
-                                <property name="label">gtk-remove</property>
+                              <object class="GtkButton" id="reset_shortcuts_button">
+                                <property name="label" translatable="yes">Reset to _Defaults</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="use_stock">True</property>
+                                <property name="image">image1</property>
+                                <property name="use_underline">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
+                                <property name="padding">15</property>
                                 <property name="position">3</property>
                               </packing>
                             </child>
@@ -1020,8 +1026,8 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">button2</action-widget>
       <action-widget response="-11">button1</action-widget>
+      <action-widget response="0">button2</action-widget>
     </action-widgets>
   </object>
   <object class="GtkAdjustment" id="net_cursor_blink_time">
@@ -1031,12 +1037,6 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkSizeGroup" id="sizegroup1">
-    <widgets>
-      <widget name="add_shortcut_button"/>
-      <widget name="delete_shortcut_button"/>
-    </widgets>
-  </object>
   <object class="GtkAdjustment" id="xkb_key_repeat_delay">
     <property name="lower">10</property>
     <property name="upper">1000</property>
@@ -1051,4 +1051,5 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
+  <object class="GtkSizeGroup" id="sizegroup1"/>
 </interface>