[gnome-control-center] keyboard: Align the scales



commit 9a1bdb4a30b083356a3c16e0da6f94f569cdadd7
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Jan 31 16:30:01 2011 +0000

    keyboard: Align the scales
    
    Make sure the scales in the keyboard panel are aligned by adding
    them all to GtkSizeGroups.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=605501

 panels/keyboard/gnome-keyboard-panel.ui |  335 +++++++++++++++++++------------
 1 files changed, 206 insertions(+), 129 deletions(-)
---
diff --git a/panels/keyboard/gnome-keyboard-panel.ui b/panels/keyboard/gnome-keyboard-panel.ui
index 349390d..cd14832 100644
--- a/panels/keyboard/gnome-keyboard-panel.ui
+++ b/panels/keyboard/gnome-keyboard-panel.ui
@@ -1,43 +1,70 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.22"/>
-  <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkAdjustment" id="repeat_delay_adjustment">
-    <property name="value">500</property>
-    <property name="lower">100</property>
-    <property name="upper">2000</property>
-    <property name="step_increment">10</property>
-    <property name="page_increment">10</property>
-  </object>
- <object class="GtkAdjustment" id="repeat_speed_adjustment">
-    <property name="value">30</property>
-    <property name="lower">10</property>
-    <property name="upper">110</property>
-    <property name="step_increment">10</property>
-    <property name="page_increment">10</property>
-  </object>
   <object class="GtkAdjustment" id="cursor_blink_time_adjustment">
-    <property name="value">1000</property>
     <property name="lower">100</property>
     <property name="upper">2500</property>
+    <property name="value">1000</property>
     <property name="step_increment">200</property>
     <property name="page_increment">200</property>
   </object>
   <object class="GtkDialog" id="custom-shortcut-dialog">
+    <property name="can_focus">False</property>
     <property name="title" translatable="yes">Custom Shortcut</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="cancelbutton1">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</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="okbutton1">
+                <property name="label">gtk-apply</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</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>
+        </child>
         <child>
           <object class="GtkVBox" id="vbox4">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="border_width">5</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkTable" id="table1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="n_rows">2</property>
                 <property name="n_columns">2</property>
                 <property name="column_spacing">6</property>
@@ -45,6 +72,7 @@
                 <child>
                   <object class="GtkLabel" id="label13">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">_Name:</property>
                     <property name="use_underline">True</property>
@@ -58,6 +86,7 @@
                 <child>
                   <object class="GtkLabel" id="label14">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">C_ommand:</property>
                     <property name="use_underline">True</property>
@@ -74,7 +103,7 @@
                   <object class="GtkEntry" id="custom-shortcut-name-entry">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="invisible_char">&#x2022;</property>
+                    <property name="invisible_char">â?¢</property>
                     <property name="activates_default">True</property>
                   </object>
                   <packing>
@@ -87,7 +116,7 @@
                   <object class="GtkEntry" id="custom-shortcut-command-entry">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="invisible_char">&#x2022;</property>
+                    <property name="invisible_char">â?¢</property>
                     <property name="activates_default">True</property>
                   </object>
                   <packing>
@@ -100,24 +129,49 @@
                 </child>
               </object>
               <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
           </object>
           <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">cancelbutton1</action-widget>
+      <action-widget response="0">okbutton1</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="gnome-keyboard-dialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Keyboard</property>
+    <property name="type_hint">dialog</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="keyboard_vbox">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area2">
+          <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="cancelbutton1">
-                <property name="label">gtk-cancel</property>
+              <object class="GtkButton" id="helpbutton1">
+                <property name="label">gtk-help</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="can_default">True</property>
                 <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -127,43 +181,29 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="okbutton1">
-                <property name="label">gtk-apply</property>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkButton" id="button1">
+                <property name="label">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">1</property>
+                <property name="position">3</property>
               </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
         </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-6">cancelbutton1</action-widget>
-      <action-widget response="-5">okbutton1</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkDialog" id="gnome-keyboard-dialog">
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Keyboard</property>
-    <property name="type_hint">dialog</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="keyboard_vbox">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
         <child>
           <object class="GtkNotebook" id="keyboard_notebook">
             <property name="visible">True</property>
@@ -172,17 +212,18 @@
             <child>
               <object class="GtkVBox" id="general_page">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="border_width">12</property>
-                <property name="orientation">vertical</property>
                 <property name="spacing">18</property>
                 <child>
                   <object class="GtkVBox" id="vbox22">
                     <property name="visible">True</property>
-                    <property name="orientation">vertical</property>
+                    <property name="can_focus">False</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkLabel" id="label300">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Repeat Keys</property>
                         <attributes>
@@ -198,9 +239,11 @@
                     <child>
                       <object class="GtkHBox" id="hbox19">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <child>
                           <object class="GtkLabel" id="label43">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label">    </property>
                           </object>
                           <packing>
@@ -212,7 +255,7 @@
                         <child>
                           <object class="GtkVBox" id="vbox100">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">False</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkCheckButton" id="repeat_toggle">
@@ -220,7 +263,9 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
                               </object>
                               <packing>
@@ -232,11 +277,13 @@
                             <child>
                               <object class="GtkTable" id="table100">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="n_rows">2</property>
                                 <property name="n_columns">4</property>
                                 <child>
                                   <object class="GtkLabel" id="repeat_delay_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">_Delay:</property>
                                     <property name="use_underline">True</property>
@@ -244,13 +291,14 @@
                                     <property name="mnemonic_widget">repeat_delay_scale</property>
                                   </object>
                                   <packing>
-                                    <property name="x_options"></property>
+                                    <property name="x_options">GTK_SHRINK</property>
                                     <property name="y_options"></property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="repeat_speed_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">_Speed:</property>
                                     <property name="use_underline">True</property>
@@ -260,37 +308,39 @@
                                   <packing>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
-                                    <property name="x_options"></property>
+                                    <property name="x_options">GTK_SHRINK</property>
                                     <property name="y_options"></property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="delay_short_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">1</property>
                                     <property name="xpad">10</property>
                                     <property name="label" translatable="yes">Short</property>
                                     <attributes>
                                       <attribute name="style" value="italic"/>
-                                      <attribute name="scale" value="0.830000"/>
+                                      <attribute name="scale" value="0.82999999999999996"/>
                                     </attributes>
                                   </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
-                                    <property name="x_options"></property>
+                                    <property name="x_options">GTK_SHRINK</property>
                                     <property name="y_options"></property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="repeat_slow_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">1</property>
                                     <property name="xpad">10</property>
                                     <property name="label" translatable="yes">Slow</property>
                                     <attributes>
                                       <attribute name="style" value="italic"/>
-                                      <attribute name="scale" value="0.830000"/>
+                                      <attribute name="scale" value="0.82999999999999996"/>
                                     </attributes>
                                   </object>
                                   <packing>
@@ -298,7 +348,7 @@
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
-                                    <property name="x_options"></property>
+                                    <property name="x_options">GTK_SHRINK</property>
                                     <property name="y_options"></property>
                                   </packing>
                                 </child>
@@ -306,8 +356,8 @@
                                   <object class="GtkHScale" id="repeat_delay_scale">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="draw_value">False</property>
                                     <property name="adjustment">repeat_delay_adjustment</property>
+                                    <property name="draw_value">False</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">2</property>
@@ -319,8 +369,8 @@
                                   <object class="GtkHScale" id="repeat_speed_scale">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="draw_value">False</property>
                                     <property name="adjustment">repeat_speed_adjustment</property>
+                                    <property name="draw_value">False</property>
                                     <child internal-child="accessible">
                                       <object class="AtkObject" id="repeat_speed_scale-atkobject">
                                         <property name="AtkObject::accessible-description" translatable="yes">Repeat keys speed</property>
@@ -338,28 +388,30 @@
                                 <child>
                                   <object class="GtkLabel" id="delay_long_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Long</property>
                                     <attributes>
                                       <attribute name="style" value="italic"/>
-                                      <attribute name="scale" value="0.830000"/>
+                                      <attribute name="scale" value="0.82999999999999996"/>
                                     </attributes>
                                   </object>
                                   <packing>
                                     <property name="left_attach">3</property>
                                     <property name="right_attach">4</property>
-                                    <property name="x_options"></property>
+                                    <property name="x_options">GTK_SHRINK</property>
                                     <property name="y_options"></property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="repeat_fast_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Fast</property>
                                     <attributes>
                                       <attribute name="style" value="italic"/>
-                                      <attribute name="scale" value="0.830000"/>
+                                      <attribute name="scale" value="0.82999999999999996"/>
                                     </attributes>
                                   </object>
                                   <packing>
@@ -367,25 +419,27 @@
                                     <property name="right_attach">4</property>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
-                                    <property name="x_options"></property>
+                                    <property name="x_options">GTK_SHRINK</property>
                                     <property name="y_options"></property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
+                                <property name="expand">True</property>
                                 <property name="fill">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
+                        <property name="expand">True</property>
                         <property name="fill">False</property>
                         <property name="position">1</property>
                       </packing>
@@ -400,11 +454,12 @@
                 <child>
                   <object class="GtkVBox" id="vbox230">
                     <property name="visible">True</property>
-                    <property name="orientation">vertical</property>
+                    <property name="can_focus">False</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Cursor Blinking</property>
                         <attributes>
@@ -420,9 +475,11 @@
                     <child>
                       <object class="GtkHBox" id="hbox20">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <child>
                           <object class="GtkLabel" id="label44">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label">    </property>
                           </object>
                           <packing>
@@ -434,7 +491,7 @@
                         <child>
                           <object class="GtkVBox" id="cursor_vbox">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">False</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkCheckButton" id="cursor_toggle">
@@ -442,7 +499,9 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
                               </object>
                               <packing>
@@ -454,10 +513,12 @@
                             <child>
                               <object class="GtkTable" id="table30">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="n_columns">4</property>
                                 <child>
                                   <object class="GtkLabel" id="cursor_speed_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">S_peed:</property>
                                     <property name="use_underline">True</property>
@@ -465,7 +526,7 @@
                                     <property name="mnemonic_widget">cursor_blink_time_scale</property>
                                   </object>
                                   <packing>
-                                    <property name="x_options"></property>
+                                    <property name="x_options">GTK_SHRINK</property>
                                     <property name="y_options"></property>
                                   </packing>
                                 </child>
@@ -473,8 +534,8 @@
                                   <object class="GtkHScale" id="cursor_blink_time_scale">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="draw_value">False</property>
                                     <property name="adjustment">cursor_blink_time_adjustment</property>
+                                    <property name="draw_value">False</property>
                                     <child internal-child="accessible">
                                       <object class="AtkObject" id="cursor_blink_time_scale-atkobject">
                                         <property name="AtkObject::accessible-description" translatable="yes">Cursor blinks speed</property>
@@ -490,53 +551,57 @@
                                 <child>
                                   <object class="GtkLabel" id="blink_fast_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Fast</property>
                                     <attributes>
                                       <attribute name="style" value="italic"/>
-                                      <attribute name="scale" value="0.830000"/>
+                                      <attribute name="scale" value="0.82999999999999996"/>
                                     </attributes>
                                   </object>
                                   <packing>
                                     <property name="left_attach">3</property>
                                     <property name="right_attach">4</property>
-                                    <property name="x_options"></property>
+                                    <property name="x_options">GTK_SHRINK</property>
                                     <property name="y_options"></property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="blink_slow_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">1</property>
                                     <property name="xpad">10</property>
                                     <property name="label" translatable="yes">Slow</property>
                                     <attributes>
                                       <attribute name="style" value="italic"/>
-                                      <attribute name="scale" value="0.830000"/>
+                                      <attribute name="scale" value="0.82999999999999996"/>
                                     </attributes>
                                   </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
-                                    <property name="x_options"></property>
+                                    <property name="x_options">GTK_SHRINK</property>
                                     <property name="y_options"></property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
+                                <property name="expand">True</property>
                                 <property name="fill">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
+                        <property name="expand">True</property>
                         <property name="fill">False</property>
                         <property name="position">1</property>
                       </packing>
@@ -553,6 +618,7 @@
             <child type="tab">
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">General</property>
               </object>
               <packing>
@@ -562,17 +628,18 @@
             <child>
               <object class="GtkVBox" id="shortcuts_page">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="border_width">5</property>
-                <property name="orientation">vertical</property>
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkVBox" id="shortcuts_vbox">
                     <property name="visible">True</property>
-                    <property name="orientation">vertical</property>
+                    <property name="can_focus">False</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkTable" id="table11">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="n_rows">2</property>
                         <property name="n_columns">2</property>
                         <child>
@@ -580,13 +647,15 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="hscrollbar_policy">never</property>
-                            <property name="vscrollbar_policy">automatic</property>
                             <property name="shadow_type">in</property>
                             <child>
                               <object class="GtkTreeView" id="section_treeview">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="headers_visible">False</property>
+                                <child internal-child="selection">
+                                  <object class="GtkTreeSelection" id="treeview-selection1"/>
+                                </child>
                               </object>
                             </child>
                           </object>
@@ -599,7 +668,6 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="hscrollbar_policy">never</property>
-                            <property name="vscrollbar_policy">automatic</property>
                             <property name="shadow_type">in</property>
                             <child>
                               <object class="GtkTreeView" id="shortcut_treeview">
@@ -607,6 +675,9 @@
                                 <property name="can_focus">True</property>
                                 <property name="headers_visible">False</property>
                                 <property name="rules_hint">True</property>
+                                <child internal-child="selection">
+                                  <object class="GtkTreeSelection" id="treeview-selection2"/>
+                                </child>
                               </object>
                             </child>
                           </object>
@@ -618,11 +689,14 @@
                         <child>
                           <object class="GtkToolbar" id="shortcut-toolbar">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="icon_size">1</property>
                             <child>
                               <object class="GtkToolButton" id="add-toolbutton">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="no">add-toolbutton</property>
+                                <property name="can_focus">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="label">add-toolbutton</property>
                                 <property name="use_underline">True</property>
                                 <property name="icon_name">list-add-symbolic</property>
                               </object>
@@ -634,7 +708,9 @@
                             <child>
                               <object class="GtkToolButton" id="remove-toolbutton">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="no">remove-toolbutton</property>
+                                <property name="can_focus">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="label">remove-toolbutton</property>
                                 <property name="use_underline">True</property>
                                 <property name="icon_name">list-remove-symbolic</property>
                               </object>
@@ -655,6 +731,7 @@
                         <child>
                           <object class="GtkLabel" id="label3">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                           </object>
                           <packing>
                             <property name="top_attach">1</property>
@@ -664,34 +741,43 @@
                         </child>
                       </object>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkHBox" id="hbox1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="border_width">5</property>
                         <property name="spacing">12</property>
                         <child>
                           <object class="GtkLabel" id="label12">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">To edit a shortcut, click the row and hold down the new keys or press Backspace to clear.</property>
                             <property name="justify">fill</property>
                             <property name="wrap">True</property>
                           </object>
                           <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
@@ -703,6 +789,7 @@
             <child type="tab">
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Shortcuts</property>
               </object>
               <packing>
@@ -712,61 +799,51 @@
             </child>
           </object>
           <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="helpbutton1">
-                <property name="label">gtk-help</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</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>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <object class="GtkButton" id="button1">
-                <property name="label">gtk-close</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">3</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
             <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>
     </child>
     <action-widgets>
-      <action-widget response="-11">helpbutton1</action-widget>
-      <action-widget response="-7">button1</action-widget>
+      <action-widget response="0">helpbutton1</action-widget>
+      <action-widget response="0">button1</action-widget>
     </action-widgets>
   </object>
+  <object class="GtkAdjustment" id="repeat_delay_adjustment">
+    <property name="lower">100</property>
+    <property name="upper">2000</property>
+    <property name="value">500</property>
+    <property name="step_increment">10</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="repeat_speed_adjustment">
+    <property name="lower">10</property>
+    <property name="upper">110</property>
+    <property name="value">30</property>
+    <property name="step_increment">10</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkSizeGroup" id="lower_sizegroup">
+    <widgets>
+      <widget name="delay_short_label"/>
+      <widget name="repeat_slow_label"/>
+      <widget name="blink_slow_label"/>
+    </widgets>
+  </object>
+  <object class="GtkSizeGroup" id="sliders_sizegroup">
+    <widgets>
+      <widget name="cursor_blink_time_scale"/>
+      <widget name="repeat_speed_scale"/>
+      <widget name="repeat_delay_scale"/>
+    </widgets>
+  </object>
+  <object class="GtkSizeGroup" id="upper_sizegroup">
+    <widgets>
+      <widget name="delay_long_label"/>
+      <widget name="repeat_fast_label"/>
+      <widget name="blink_fast_label"/>
+    </widgets>
+  </object>
 </interface>



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