[Xfce4-commits] r27190 - in xfce4-settings/trunk: . dialogs/accessibility-settings dialogs/appearance-settings dialogs/keyboard-settings dialogs/mouse-settings

Nick Schermer nick at xfce.org
Tue Jul 1 22:46:06 CEST 2008


Author: nick
Date: 2008-07-01 20:46:06 +0000 (Tue, 01 Jul 2008)
New Revision: 27190

Modified:
   xfce4-settings/trunk/ChangeLog
   xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade
   xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade
   xfce4-settings/trunk/dialogs/keyboard-settings/keyboard-dialog.glade
   xfce4-settings/trunk/dialogs/mouse-settings/mouse-dialog.glade
Log:
	* dialogs/accessibility-settings/accessibility-dialog.glade,
	  dialogs/mouse-settings/mouse-dialog.glade,
	  dialogs/appearance-settings/appearance-dialog.glade,
	  dialogs/keyboard-settings/keyboard-dialog.glade: Make labels next
	  to the sliders small italic, like in Xfwm4; Make mnemonic widgets
	  work and some a buch of new ones where possible/suitable; Fix
	  case usage in labels.

Modified: xfce4-settings/trunk/ChangeLog
===================================================================
--- xfce4-settings/trunk/ChangeLog	2008-07-01 19:46:42 UTC (rev 27189)
+++ xfce4-settings/trunk/ChangeLog	2008-07-01 20:46:06 UTC (rev 27190)
@@ -1,5 +1,15 @@
 2008-07-01	Nick Schermer <nick"xfce.org>
 
+	* dialogs/accessibility-settings/accessibility-dialog.glade,
+	  dialogs/mouse-settings/mouse-dialog.glade,
+	  dialogs/appearance-settings/appearance-dialog.glade,
+	  dialogs/keyboard-settings/keyboard-dialog.glade: Make labels next
+	  to the sliders small italic, like in Xfwm4; Make mnemonic widgets
+	  work and some a buch of new ones where possible/suitable; Fix
+	  case usage in labels.
+
+2008-07-01	Nick Schermer <nick"xfce.org>
+
 	* dialogs/mouse-settings/main.c: Destroy the dialog on exit
 	  and Xfce4-mouse-settings in the version information.
 	* dialogs/mouse-settings/Makefile.am: Add the G_LOG_DOMAIN

Modified: xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade
===================================================================
--- xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade	2008-07-01 19:46:42 UTC (rev 27189)
+++ xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade	2008-07-01 20:46:06 UTC (rev 27190)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Sun Jun 29 14:23:01 2008 -->
+<!--Generated with glade3 3.4.5 on Tue Jul  1 22:36:17 2008 -->
 <glade-interface>
   <requires lib="xfce4"/>
   <widget class="XfceTitledDialog" id="accessibility-settings-dialog">
@@ -45,7 +45,7 @@
                                   <widget class="GtkCheckButton" id="xkb_accessx_sticky_check">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="label" translatable="yes">Enable _Sticky Keys</property>
+                                    <property name="label" translatable="yes">Enable _sticky keys</property>
                                     <property name="use_underline">True</property>
                                     <property name="response_id">0</property>
                                     <property name="draw_indicator">True</property>
@@ -87,7 +87,7 @@
                                               <widget class="GtkRadioButton" id="xkb_accessx_sticky_lock_mode">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
-                                                <property name="label" translatable="yes">L_ock Mode</property>
+                                                <property name="label" translatable="yes">L_ock mode</property>
                                                 <property name="use_underline">True</property>
                                                 <property name="response_id">0</property>
                                                 <property name="active">True</property>
@@ -133,7 +133,7 @@
                         <child>
                           <widget class="GtkLabel" id="label3">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Sticky keys&lt;/b&gt;</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Sticky Keys&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </widget>
                           <packing>
@@ -165,7 +165,7 @@
                                   <widget class="GtkCheckButton" id="xkb_accessx_slow_check">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="label" translatable="yes">Enable Slow _Keys</property>
+                                    <property name="label" translatable="yes">Enable slow _keys</property>
                                     <property name="use_underline">True</property>
                                     <property name="response_id">0</property>
                                     <property name="draw_indicator">True</property>
@@ -188,9 +188,9 @@
                                           <widget class="GtkLabel" id="label6">
                                             <property name="visible">True</property>
                                             <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Slow Keys _delay:</property>
+                                            <property name="label" translatable="yes">Slow keys _delay:</property>
                                             <property name="use_underline">True</property>
-                                            <property name="mnemonic_widget">xkb_accessx_mouse_delay_scale</property>
+                                            <property name="mnemonic_widget">xkb_accessx_slow_delay_scale</property>
                                           </widget>
                                           <packing>
                                             <property name="expand">False</property>
@@ -200,11 +200,12 @@
                                         <child>
                                           <widget class="GtkHBox" id="hbox1">
                                             <property name="visible">True</property>
+                                            <property name="spacing">2</property>
                                             <child>
                                               <widget class="GtkLabel" id="label13">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">&lt;i&gt;short&lt;/i&gt;</property>
+                                                <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Short&lt;/i&gt;&lt;/small&gt;</property>
                                                 <property name="use_markup">True</property>
                                               </widget>
                                               <packing>
@@ -228,7 +229,7 @@
                                               <widget class="GtkLabel" id="label14">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">&lt;i&gt;long&lt;/i&gt;</property>
+                                                <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Long&lt;/i&gt;&lt;/small&gt;</property>
                                                 <property name="use_markup">True</property>
                                               </widget>
                                               <packing>
@@ -258,7 +259,7 @@
                         <child>
                           <widget class="GtkLabel" id="label4">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Slow keys&lt;/b&gt;</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Slow Keys&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </widget>
                           <packing>
@@ -290,7 +291,7 @@
                                   <widget class="GtkCheckButton" id="xkb_accessx_bounce_check">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="label" translatable="yes">Enable _Bounce Keys</property>
+                                    <property name="label" translatable="yes">Enable _bounce keys</property>
                                     <property name="use_underline">True</property>
                                     <property name="response_id">0</property>
                                     <property name="draw_indicator">True</property>
@@ -325,11 +326,12 @@
                                         <child>
                                           <widget class="GtkHBox" id="hbox3">
                                             <property name="visible">True</property>
+                                            <property name="spacing">2</property>
                                             <child>
                                               <widget class="GtkLabel" id="label10">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">&lt;i&gt;short&lt;/i&gt;</property>
+                                                <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Short&lt;/i&gt;&lt;/small&gt;</property>
                                                 <property name="use_markup">True</property>
                                               </widget>
                                               <packing>
@@ -353,7 +355,7 @@
                                               <widget class="GtkLabel" id="label11">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">&lt;i&gt;long&lt;/i&gt;</property>
+                                                <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Long&lt;/i&gt;&lt;/small&gt;</property>
                                                 <property name="use_markup">True</property>
                                               </widget>
                                               <packing>
@@ -383,7 +385,7 @@
                         <child>
                           <widget class="GtkLabel" id="label5">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Bounce keys&lt;/b&gt;</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Bounce Keys&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </widget>
                           <packing>
@@ -468,11 +470,12 @@
                                             <child>
                                               <widget class="GtkHBox" id="hbox2">
                                                 <property name="visible">True</property>
+                                                <property name="spacing">2</property>
                                                 <child>
                                                   <widget class="GtkLabel" id="label8">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">&lt;i&gt;short&lt;/i&gt;</property>
+                                                    <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Short&lt;/i&gt;&lt;/small&gt;</property>
                                                     <property name="use_markup">True</property>
                                                   </widget>
                                                   <packing>
@@ -496,7 +499,7 @@
                                                   <widget class="GtkLabel" id="label15">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">&lt;i&gt;long&lt;/i&gt;</property>
+                                                    <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Long&lt;/i&gt;&lt;/small&gt;</property>
                                                     <property name="use_markup">True</property>
                                                   </widget>
                                                   <packing>
@@ -528,7 +531,7 @@
                                                 <property name="xalign">0</property>
                                                 <property name="label" translatable="yes">_Interval:</property>
                                                 <property name="use_underline">True</property>
-                                                <property name="mnemonic_widget">xkb_accessx_mouse_delay_scale</property>
+                                                <property name="mnemonic_widget">xkb_accessx_mouse_interval_scale</property>
                                               </widget>
                                               <packing>
                                                 <property name="expand">False</property>
@@ -538,11 +541,12 @@
                                             <child>
                                               <widget class="GtkHBox" id="hbox5">
                                                 <property name="visible">True</property>
+                                                <property name="spacing">2</property>
                                                 <child>
                                                   <widget class="GtkLabel" id="label17">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">&lt;i&gt;short&lt;/i&gt;</property>
+                                                    <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Short&lt;/i&gt;&lt;/small&gt;</property>
                                                     <property name="use_markup">True</property>
                                                   </widget>
                                                   <packing>
@@ -566,7 +570,7 @@
                                                   <widget class="GtkLabel" id="label18">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">&lt;i&gt;long&lt;/i&gt;</property>
+                                                    <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Long&lt;/i&gt;&lt;/small&gt;</property>
                                                     <property name="use_markup">True</property>
                                                   </widget>
                                                   <packing>
@@ -599,7 +603,7 @@
                                                 <property name="xalign">0</property>
                                                 <property name="label" translatable="yes">Acceleration _delay:</property>
                                                 <property name="use_underline">True</property>
-                                                <property name="mnemonic_widget">xkb_accessx_mouse_delay_scale</property>
+                                                <property name="mnemonic_widget">xkb_accessx_mouse_acceldelay_scale</property>
                                               </widget>
                                               <packing>
                                                 <property name="expand">False</property>
@@ -609,11 +613,12 @@
                                             <child>
                                               <widget class="GtkHBox" id="hbox6">
                                                 <property name="visible">True</property>
+                                                <property name="spacing">2</property>
                                                 <child>
                                                   <widget class="GtkLabel" id="label20">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">&lt;i&gt;short&lt;/i&gt;</property>
+                                                    <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Short&lt;/i&gt;&lt;/small&gt;</property>
                                                     <property name="use_markup">True</property>
                                                   </widget>
                                                   <packing>
@@ -637,7 +642,7 @@
                                                   <widget class="GtkLabel" id="label21">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">&lt;i&gt;long&lt;/i&gt;</property>
+                                                    <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Long&lt;/i&gt;&lt;/small&gt;</property>
                                                     <property name="use_markup">True</property>
                                                   </widget>
                                                   <packing>
@@ -668,9 +673,9 @@
                                               <widget class="GtkLabel" id="label22">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">Maximum _Speed:</property>
+                                                <property name="label" translatable="yes">Maximum _speed:</property>
                                                 <property name="use_underline">True</property>
-                                                <property name="mnemonic_widget">xkb_accessx_mouse_delay_scale</property>
+                                                <property name="mnemonic_widget">xkb_accessx_mouse_speed_scale</property>
                                               </widget>
                                               <packing>
                                                 <property name="expand">False</property>
@@ -680,11 +685,12 @@
                                             <child>
                                               <widget class="GtkHBox" id="hbox7">
                                                 <property name="visible">True</property>
+                                                <property name="spacing">2</property>
                                                 <child>
                                                   <widget class="GtkLabel" id="label23">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">&lt;i&gt;short&lt;/i&gt;</property>
+                                                    <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Short&lt;/i&gt;&lt;/small&gt;</property>
                                                     <property name="use_markup">True</property>
                                                   </widget>
                                                   <packing>
@@ -708,7 +714,7 @@
                                                   <widget class="GtkLabel" id="label24">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">&lt;i&gt;long&lt;/i&gt;</property>
+                                                    <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Long&lt;/i&gt;&lt;/small&gt;</property>
                                                     <property name="use_markup">True</property>
                                                   </widget>
                                                   <packing>
@@ -745,7 +751,7 @@
                         <child>
                           <widget class="GtkLabel" id="label12">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Mouse emulation&lt;/b&gt;</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Mouse Emulation&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </widget>
                           <packing>

Modified: xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade
===================================================================
--- xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade	2008-07-01 19:46:42 UTC (rev 27189)
+++ xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade	2008-07-01 20:46:06 UTC (rev 27190)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Sun Jun 29 14:25:24 2008 -->
+<!--Generated with glade3 3.4.5 on Tue Jul  1 22:32:28 2008 -->
 <glade-interface>
   <requires lib="xfce4"/>
   <widget class="XfceTitledDialog" id="appearance-settings-dialog">
@@ -30,12 +30,13 @@
                       <widget class="GtkVBox" id="vbox8">
                         <property name="visible">True</property>
                         <property name="border_width">6</property>
+                        <property name="spacing">6</property>
                         <child>
                           <widget class="GtkLabel" id="label14">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="yalign">0</property>
-                            <property name="label" translatable="yes">Please select the UI-theme you want to use</property>
+                            <property name="label" translatable="yes">Please select the UI-theme you want to use:</property>
                           </widget>
                           <packing>
                             <property name="expand">False</property>
@@ -76,6 +77,7 @@
                       <widget class="GtkVBox" id="vbox9">
                         <property name="visible">True</property>
                         <property name="border_width">6</property>
+                        <property name="spacing">6</property>
                         <child>
                           <widget class="GtkLabel" id="label13">
                             <property name="visible">True</property>
@@ -114,7 +116,7 @@
                     <child>
                       <widget class="GtkLabel" id="label15">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Icon theme</property>
+                        <property name="label" translatable="yes">Icon Theme</property>
                       </widget>
                       <packing>
                         <property name="type">tab</property>
@@ -127,7 +129,7 @@
                 <child>
                   <widget class="GtkLabel" id="label1">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">_Themes</property>
+                    <property name="label" translatable="yes">Themes</property>
                     <property name="use_underline">True</property>
                   </widget>
                   <packing>
@@ -159,7 +161,9 @@
                                   <widget class="GtkLabel" id="label5">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Select the default user-interface font:</property>
+                                    <property name="label" translatable="yes">Select the default user-interface _font:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="mnemonic_widget">gtk_fontname_button</property>
                                   </widget>
                                   <packing>
                                     <property name="expand">False</property>
@@ -218,28 +222,27 @@
                                 <property name="column_spacing">12</property>
                                 <property name="row_spacing">6</property>
                                 <child>
-                                  <widget class="GtkLabel" id="label17">
+                                  <widget class="GtkCheckButton" id="xft_antialias_check_button">
                                     <property name="visible">True</property>
-                                    <property name="xalign">1</property>
-                                    <property name="label" translatable="yes">_Subpixel hinting:</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">_Enable antialias</property>
                                     <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">xft_rgba_combo_box</property>
+                                    <property name="response_id">0</property>
+                                    <property name="draw_indicator">True</property>
                                   </widget>
                                   <packing>
-                                    <property name="top_attach">2</property>
-                                    <property name="bottom_attach">3</property>
-                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="right_attach">2</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkComboBox" id="xft_rgba_combo_box">
+                                  <widget class="GtkComboBox" id="xft_hinting_style_combo_box">
                                     <property name="visible">True</property>
                                   </widget>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
-                                    <property name="top_attach">2</property>
-                                    <property name="bottom_attach">3</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -257,27 +260,28 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkComboBox" id="xft_hinting_style_combo_box">
+                                  <widget class="GtkComboBox" id="xft_rgba_combo_box">
                                     <property name="visible">True</property>
                                   </widget>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkCheckButton" id="xft_antialias_check_button">
+                                  <widget class="GtkLabel" id="label17">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="label" translatable="yes">_Enable Antialias</property>
+                                    <property name="xalign">1</property>
+                                    <property name="label" translatable="yes">_Subpixel order:</property>
                                     <property name="use_underline">True</property>
-                                    <property name="response_id">0</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="mnemonic_widget">xft_rgba_combo_box</property>
                                   </widget>
                                   <packing>
-                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="x_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                               </widget>
@@ -319,7 +323,8 @@
                                   <widget class="GtkCheckButton" id="xft_custom_dpi_check_button">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="label" translatable="yes">Custom DPI Settings</property>
+                                    <property name="label" translatable="yes">Custom _DPI settings</property>
+                                    <property name="use_underline">True</property>
                                     <property name="response_id">0</property>
                                     <property name="draw_indicator">True</property>
                                   </widget>
@@ -369,7 +374,7 @@
                 <child>
                   <widget class="GtkLabel" id="label2">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">_Font</property>
+                    <property name="label" translatable="yes">Font</property>
                     <property name="use_underline">True</property>
                   </widget>
                   <packing>
@@ -402,7 +407,9 @@
                                   <widget class="GtkLabel" id="label9">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Select the toolbar style:</property>
+                                    <property name="label" translatable="yes">Select the toolbar _style:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="mnemonic_widget">gtk_toolbar_style_combo_box</property>
                                   </widget>
                                   <packing>
                                     <property name="expand">False</property>
@@ -524,7 +531,7 @@
                 <child>
                   <widget class="GtkLabel" id="label3">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">_Behaviour</property>
+                    <property name="label" translatable="yes">Behaviour</property>
                     <property name="use_underline">True</property>
                   </widget>
                   <packing>

Modified: xfce4-settings/trunk/dialogs/keyboard-settings/keyboard-dialog.glade
===================================================================
--- xfce4-settings/trunk/dialogs/keyboard-settings/keyboard-dialog.glade	2008-07-01 19:46:42 UTC (rev 27189)
+++ xfce4-settings/trunk/dialogs/keyboard-settings/keyboard-dialog.glade	2008-07-01 20:46:06 UTC (rev 27190)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Sun Jun 29 14:24:01 2008 -->
+<!--Generated with glade3 3.4.5 on Tue Jul  1 22:39:19 2008 -->
 <glade-interface>
   <requires lib="xfce4"/>
   <widget class="XfceTitledDialog" id="keyboard-settings-dialog">
@@ -58,7 +58,7 @@
                         <child>
                           <widget class="GtkLabel" id="label4">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Keytheme&lt;/b&gt;</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Key Theme&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </widget>
                           <packing>
@@ -66,10 +66,6 @@
                           </packing>
                         </child>
                       </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                      </packing>
                     </child>
                     <child>
                       <widget class="GtkVBox" id="vbox2">
@@ -94,7 +90,8 @@
                                       <widget class="GtkCheckButton" id="xkb_key_repeat_check">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="label" translatable="yes">Enable key repeat</property>
+                                        <property name="label" translatable="yes">_Enable key repeat</property>
+                                        <property name="use_underline">True</property>
                                         <property name="response_id">0</property>
                                         <property name="draw_indicator">True</property>
                                       </widget>
@@ -116,7 +113,9 @@
                                               <widget class="GtkLabel" id="label7">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">Repeat delay:</property>
+                                                <property name="label" translatable="yes">_Repeat delay:</property>
+                                                <property name="use_underline">True</property>
+                                                <property name="mnemonic_widget">xkb_key_repeat_delay_scale</property>
                                               </widget>
                                               <packing>
                                                 <property name="expand">False</property>
@@ -126,10 +125,11 @@
                                             <child>
                                               <widget class="GtkHBox" id="hbox2">
                                                 <property name="visible">True</property>
+                                                <property name="spacing">2</property>
                                                 <child>
                                                   <widget class="GtkLabel" id="label8">
                                                     <property name="visible">True</property>
-                                                    <property name="label" translatable="yes">&lt;i&gt;Short&lt;/i&gt;</property>
+                                                    <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Short&lt;/i&gt;&lt;/small&gt;</property>
                                                     <property name="use_markup">True</property>
                                                   </widget>
                                                   <packing>
@@ -152,7 +152,7 @@
                                                 <child>
                                                   <widget class="GtkLabel" id="label9">
                                                     <property name="visible">True</property>
-                                                    <property name="label" translatable="yes">&lt;i&gt;Long&lt;/i&gt;</property>
+                                                    <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Long&lt;/i&gt;&lt;/small&gt;</property>
                                                     <property name="use_markup">True</property>
                                                   </widget>
                                                   <packing>
@@ -172,7 +172,9 @@
                                               <widget class="GtkLabel" id="label10">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">Repeat speed:</property>
+                                                <property name="label" translatable="yes">Repeat _speed:</property>
+                                                <property name="use_underline">True</property>
+                                                <property name="mnemonic_widget">xkb_key_repeat_rate_scale</property>
                                               </widget>
                                               <packing>
                                                 <property name="expand">False</property>
@@ -183,10 +185,11 @@
                                             <child>
                                               <widget class="GtkHBox" id="hbox3">
                                                 <property name="visible">True</property>
+                                                <property name="spacing">2</property>
                                                 <child>
                                                   <widget class="GtkLabel" id="label11">
                                                     <property name="visible">True</property>
-                                                    <property name="label" translatable="yes">&lt;i&gt;Slow&lt;/i&gt;</property>
+                                                    <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Slow&lt;/i&gt;&lt;/small&gt;</property>
                                                     <property name="use_markup">True</property>
                                                   </widget>
                                                   <packing>
@@ -208,7 +211,7 @@
                                                 <child>
                                                   <widget class="GtkLabel" id="label12">
                                                     <property name="visible">True</property>
-                                                    <property name="label" translatable="yes">&lt;i&gt;Fast&lt;/i&gt;</property>
+                                                    <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Fast&lt;/i&gt;&lt;/small&gt;</property>
                                                     <property name="use_markup">True</property>
                                                   </widget>
                                                   <packing>
@@ -269,7 +272,8 @@
                                       <widget class="GtkCheckButton" id="net_cursor_blink_check">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="label" translatable="yes">Show blinking</property>
+                                        <property name="label" translatable="yes">Show _blinking</property>
+                                        <property name="use_underline">True</property>
                                         <property name="response_id">0</property>
                                         <property name="draw_indicator">True</property>
                                       </widget>
@@ -291,7 +295,9 @@
                                               <widget class="GtkLabel" id="label13">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">Blink delay:</property>
+                                                <property name="label" translatable="yes">Blink _delay:</property>
+                                                <property name="use_underline">True</property>
+                                                <property name="mnemonic_widget">net_cursor_blink_time_scale</property>
                                               </widget>
                                               <packing>
                                                 <property name="expand">False</property>
@@ -301,10 +307,11 @@
                                             <child>
                                               <widget class="GtkHBox" id="hbox4">
                                                 <property name="visible">True</property>
+                                                <property name="spacing">2</property>
                                                 <child>
                                                   <widget class="GtkLabel" id="label14">
                                                     <property name="visible">True</property>
-                                                    <property name="label" translatable="yes">&lt;i&gt;Short&lt;/i&gt;</property>
+                                                    <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Short&lt;/i&gt;&lt;/small&gt;</property>
                                                     <property name="use_markup">True</property>
                                                   </widget>
                                                   <packing>
@@ -326,7 +333,7 @@
                                                 <child>
                                                   <widget class="GtkLabel" id="label15">
                                                     <property name="visible">True</property>
-                                                    <property name="label" translatable="yes">&lt;i&gt;Long&lt;/i&gt;</property>
+                                                    <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Long&lt;/i&gt;&lt;/small&gt;</property>
                                                     <property name="use_markup">True</property>
                                                   </widget>
                                                   <packing>
@@ -412,7 +419,6 @@
                           <widget class="GtkTreeView" id="treeview2">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="headers_clickable">True</property>
                           </widget>
                         </child>
                       </widget>

Modified: xfce4-settings/trunk/dialogs/mouse-settings/mouse-dialog.glade
===================================================================
--- xfce4-settings/trunk/dialogs/mouse-settings/mouse-dialog.glade	2008-07-01 19:46:42 UTC (rev 27189)
+++ xfce4-settings/trunk/dialogs/mouse-settings/mouse-dialog.glade	2008-07-01 20:46:06 UTC (rev 27190)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Sun Jun 29 17:03:23 2008 -->
+<!--Generated with glade3 3.4.5 on Tue Jul  1 22:30:33 2008 -->
 <glade-interface>
   <requires lib="xfce4"/>
   <widget class="XfceTitledDialog" id="mouse-settings-dialog">
@@ -48,7 +48,8 @@
                                   <widget class="GtkRadioButton" id="button_left_handed">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="label" translatable="yes">Left handed</property>
+                                    <property name="label" translatable="yes">_Left handed</property>
+                                    <property name="use_underline">True</property>
                                     <property name="response_id">0</property>
                                     <property name="active">True</property>
                                     <property name="draw_indicator">True</property>
@@ -58,7 +59,8 @@
                                   <widget class="GtkRadioButton" id="button_right_handed">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="label" translatable="yes">Right handed</property>
+                                    <property name="label" translatable="yes">_Right handed</property>
+                                    <property name="use_underline">True</property>
                                     <property name="response_id">0</property>
                                     <property name="active">True</property>
                                     <property name="draw_indicator">True</property>
@@ -75,7 +77,7 @@
                         <child>
                           <widget class="GtkLabel" id="label3">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Button settings&lt;/b&gt;</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Button Settings&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </widget>
                           <packing>
@@ -83,6 +85,9 @@
                           </packing>
                         </child>
                       </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                      </packing>
                     </child>
                     <child>
                       <widget class="GtkFrame" id="frame_motion_settings">
@@ -103,16 +108,19 @@
                                   <widget class="GtkLabel" id="label9">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Acceleration:</property>
+                                    <property name="label" translatable="yes">_Acceleration:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="mnemonic_widget">mouse_motion_acceleration</property>
                                   </widget>
                                 </child>
                                 <child>
                                   <widget class="GtkHBox" id="hbox7">
                                     <property name="visible">True</property>
+                                    <property name="spacing">2</property>
                                     <child>
                                       <widget class="GtkLabel" id="label23">
                                         <property name="visible">True</property>
-                                        <property name="label" translatable="yes">&lt;i&gt;Slow&lt;/i&gt;</property>
+                                        <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Slow&lt;/i&gt;&lt;/small&gt;</property>
                                         <property name="use_markup">True</property>
                                       </widget>
                                       <packing>
@@ -135,7 +143,7 @@
                                     <child>
                                       <widget class="GtkLabel" id="label24">
                                         <property name="visible">True</property>
-                                        <property name="label" translatable="yes">&lt;i&gt;Fast&lt;/i&gt;</property>
+                                        <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Fast&lt;/i&gt;&lt;/small&gt;</property>
                                         <property name="use_markup">True</property>
                                       </widget>
                                       <packing>
@@ -155,7 +163,9 @@
                                   <widget class="GtkLabel" id="label10">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Threshold:</property>
+                                    <property name="label" translatable="yes">_Threshold:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="mnemonic_widget">mouse_motion_threshold</property>
                                   </widget>
                                   <packing>
                                     <property name="position">2</property>
@@ -164,10 +174,11 @@
                                 <child>
                                   <widget class="GtkHBox" id="hbox8">
                                     <property name="visible">True</property>
+                                    <property name="spacing">2</property>
                                     <child>
                                       <widget class="GtkLabel" id="label21">
                                         <property name="visible">True</property>
-                                        <property name="label" translatable="yes">&lt;i&gt;Low&lt;/i&gt;</property>
+                                        <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Low&lt;/i&gt;&lt;/small&gt;</property>
                                         <property name="use_markup">True</property>
                                       </widget>
                                       <packing>
@@ -180,6 +191,7 @@
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="adjustment">1 1 20 1 5 0</property>
+                                        <property name="fill_level">0</property>
                                         <property name="digits">0</property>
                                         <property name="draw_value">False</property>
                                       </widget>
@@ -190,7 +202,7 @@
                                     <child>
                                       <widget class="GtkLabel" id="label22">
                                         <property name="visible">True</property>
-                                        <property name="label" translatable="yes">&lt;i&gt;High&lt;/i&gt;</property>
+                                        <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;High&lt;/i&gt;&lt;/small&gt;</property>
                                         <property name="use_markup">True</property>
                                       </widget>
                                       <packing>
@@ -213,7 +225,7 @@
                         <child>
                           <widget class="GtkLabel" id="label4">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Motion settings&lt;/b&gt;</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Motion Settings&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </widget>
                           <packing>
@@ -222,6 +234,7 @@
                         </child>
                       </widget>
                       <packing>
+                        <property name="expand">False</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -244,16 +257,19 @@
                                   <widget class="GtkLabel" id="label11">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Threshold:</property>
+                                    <property name="label" translatable="yes">Thr_eshold:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="mnemonic_widget">mouse_dnd_threshold</property>
                                   </widget>
                                 </child>
                                 <child>
                                   <widget class="GtkHBox" id="hbox9">
                                     <property name="visible">True</property>
+                                    <property name="spacing">2</property>
                                     <child>
                                       <widget class="GtkLabel" id="label17">
                                         <property name="visible">True</property>
-                                        <property name="label" translatable="yes">&lt;i&gt;Low&lt;/i&gt;</property>
+                                        <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Low&lt;/i&gt;&lt;/small&gt;</property>
                                         <property name="use_markup">True</property>
                                       </widget>
                                       <packing>
@@ -276,7 +292,7 @@
                                     <child>
                                       <widget class="GtkLabel" id="label18">
                                         <property name="visible">True</property>
-                                        <property name="label" translatable="yes">&lt;i&gt;High&lt;/i&gt;</property>
+                                        <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;High&lt;/i&gt;&lt;/small&gt;</property>
                                         <property name="use_markup">True</property>
                                       </widget>
                                       <packing>
@@ -299,7 +315,7 @@
                         <child>
                           <widget class="GtkLabel" id="label5">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Drag and drop&lt;/b&gt;</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Drag and Drop&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </widget>
                           <packing>
@@ -308,6 +324,7 @@
                         </child>
                       </widget>
                       <packing>
+                        <property name="expand">False</property>
                         <property name="position">2</property>
                       </packing>
                     </child>
@@ -329,16 +346,19 @@
                                   <widget class="GtkLabel" id="label12">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Speed:</property>
+                                    <property name="label" translatable="yes">_Speed:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="mnemonic_widget">mouse_double_click_speed</property>
                                   </widget>
                                 </child>
                                 <child>
                                   <widget class="GtkHBox" id="hbox10">
                                     <property name="visible">True</property>
+                                    <property name="spacing">2</property>
                                     <child>
                                       <widget class="GtkLabel" id="label19">
                                         <property name="visible">True</property>
-                                        <property name="label" translatable="yes">&lt;i&gt;Slow&lt;/i&gt;</property>
+                                        <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Slow&lt;/i&gt;&lt;/small&gt;</property>
                                         <property name="use_markup">True</property>
                                       </widget>
                                       <packing>
@@ -361,7 +381,7 @@
                                     <child>
                                       <widget class="GtkLabel" id="label20">
                                         <property name="visible">True</property>
-                                        <property name="label" translatable="yes">&lt;i&gt;Fast&lt;/i&gt;</property>
+                                        <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Fast&lt;/i&gt;&lt;/small&gt;</property>
                                         <property name="use_markup">True</property>
                                       </widget>
                                       <packing>
@@ -384,7 +404,7 @@
                         <child>
                           <widget class="GtkLabel" id="label6">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Double click&lt;/b&gt;</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Double Click&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </widget>
                           <packing>
@@ -393,6 +413,7 @@
                         </child>
                       </widget>
                       <packing>
+                        <property name="expand">False</property>
                         <property name="position">3</property>
                       </packing>
                     </child>



More information about the Xfce4-commits mailing list