[Xfce4-commits] <xfce4-settings:bluesabre/display-settings> Rework accelerators (bugs #9302 and #9308).
Jérôme Guelfucci
noreply at xfce.org
Mon Dec 9 12:58:05 CET 2013
Updating branch refs/heads/bluesabre/display-settings
to 515f187a3112c8d55d28cd1f02071f41452c05f4 (commit)
from 619944b4dfda51fcedd6e35c226ffc2f5ab6d547 (commit)
commit 515f187a3112c8d55d28cd1f02071f41452c05f4
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date: Wed Nov 7 09:53:36 2012 +0100
Rework accelerators (bugs #9302 and #9308).
.../accessibility-dialog.glade | 254 ++++++++++++------
.../appearance-settings/appearance-dialog.glade | 283 ++++++++++++--------
dialogs/display-settings/display-dialog.glade | 17 +-
dialogs/keyboard-settings/keyboard-dialog.glade | 81 +++---
dialogs/mouse-settings/mouse-dialog.glade | 122 ++++-----
.../xfce-settings-manager-dialog.c | 2 +-
6 files changed, 467 insertions(+), 292 deletions(-)
diff --git a/dialogs/accessibility-settings/accessibility-dialog.glade b/dialogs/accessibility-settings/accessibility-dialog.glade
index ea02430..bf097d1 100644
--- a/dialogs/accessibility-settings/accessibility-dialog.glade
+++ b/dialogs/accessibility-settings/accessibility-dialog.glade
@@ -1,57 +1,58 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <requires lib="gtk+" version="2.20"/>
<!-- interface-requires libxfce4ui 4.5 -->
<!-- interface-naming-policy toplevel-contextual -->
- <object class="GtkAdjustment" id="slow-keys-delay">
- <property name="value">500</property>
- <property name="lower">50</property>
- <property name="upper">1000</property>
- <property name="step_increment">10</property>
- <property name="page_increment">100</property>
- </object>
<object class="GtkAdjustment" id="bounce-keys-delay">
- <property name="value">500</property>
<property name="lower">50</property>
<property name="upper">1000</property>
+ <property name="value">500</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
+ <object class="GtkAdjustment" id="mouse-emulation-curve">
+ <property name="lower">-1000</property>
+ <property name="upper">1000</property>
+ <property name="step_increment">10</property>
+ <property name="page_increment">100</property>
+ </object>
<object class="GtkAdjustment" id="mouse-emulation-delay">
- <property name="value">150</property>
<property name="lower">1</property>
<property name="upper">1000</property>
+ <property name="value">150</property>
<property name="step_increment">10</property>
<property name="page_increment">100</property>
</object>
<object class="GtkAdjustment" id="mouse-emulation-interval">
- <property name="value">20</property>
<property name="lower">10</property>
<property name="upper">1000</property>
+ <property name="value">20</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkAdjustment" id="mouse-emulation-curve">
- <property name="lower">-1000</property>
- <property name="upper">1000</property>
- <property name="step_increment">10</property>
- <property name="page_increment">100</property>
- </object>
<object class="GtkAdjustment" id="mouse-emulation-max-speed">
- <property name="value">1000</property>
<property name="lower">1</property>
<property name="upper">2000</property>
+ <property name="value">1000</property>
<property name="step_increment">10</property>
<property name="page_increment">100</property>
</object>
<object class="GtkAdjustment" id="mouse-emulation-time-to-max">
- <property name="value">3000</property>
<property name="lower">100</property>
<property name="upper">10000</property>
+ <property name="value">3000</property>
+ <property name="step_increment">10</property>
+ <property name="page_increment">100</property>
+ </object>
+ <object class="GtkAdjustment" id="slow-keys-delay">
+ <property name="lower">50</property>
+ <property name="upper">1000</property>
+ <property name="value">500</property>
<property name="step_increment">10</property>
<property name="page_increment">100</property>
</object>
<object class="XfceTitledDialog" id="dialog">
+ <property name="can_focus">False</property>
<property name="title" translatable="yes">Accessibility</property>
<property name="window_position">center-on-parent</property>
<property name="icon_name">preferences-desktop-accessibility</property>
@@ -60,11 +61,56 @@
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" 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="button2">
+ <property name="label">gtk-close</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</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="button1">
+ <property name="label">gtk-help</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ <property name="secondary">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
<object class="GtkVBox" id="plug-child">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkNotebook" id="notebook1">
<property name="visible">True</property>
@@ -73,12 +119,13 @@
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="start-at">
<property name="label" translatable="yes">_Enable assistive technologies</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -88,79 +135,97 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="alignment5">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<placeholder/>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="info-logout">
+ <property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="stock">gtk-info</property>
<property name="icon-size">5</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label18">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Assistive technologies will be available the
next time you login</property>
<property name="wrap">True</property>
</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="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="info-no-at">
+ <property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="stock">gtk-dialog-warning</property>
<property name="icon-size">5</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label20">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">No AT-SPI provider was found on your system</property>
</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="fill">True</property>
<property name="position">3</property>
</packing>
</child>
@@ -169,7 +234,8 @@ next time you login</property>
<child type="tab">
<object class="GtkLabel" id="label17">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Assistive Technologies</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Assistive _Technologies</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -180,28 +246,31 @@ next time you login</property>
<child>
<object class="GtkVBox" id="vbox2">
<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">6</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="sticky-keys-enabled">
- <property name="label" translatable="yes">Use _sticky keys</property>
+ <property name="label" translatable="yes">_Use sticky keys</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -219,15 +288,17 @@ next time you login</property>
<object class="GtkAlignment" id="sticky-keys-box">
<property name="visible">True</property>
<property name="sensitive">False</property>
+ <property name="can_focus">False</property>
<property name="left_padding">18</property>
<child>
<object class="GtkVBox" id="vbox7">
<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="sticky-keys-latch-to-lock">
<property name="label" translatable="yes">_Lock sticky keys</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -236,12 +307,15 @@ next time you login</property>
<property name="draw_indicator">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="sticky-keys-two-keys-disable">
- <property name="label" translatable="yes">Disable sticky keys if _two keys are pressed</property>
+ <property name="label" translatable="yes">Disable sticky keys if two keys are _pressed</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -261,6 +335,8 @@ next time you login</property>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -271,6 +347,7 @@ next time you login</property>
<child type="label">
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Sticky Keys</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -287,22 +364,25 @@ next time you login</property>
<child>
<object class="GtkFrame" id="frame2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="slow-keys-enabled">
<property name="label" translatable="yes">Use slow _keys</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -320,14 +400,17 @@ next time you login</property>
<object class="GtkAlignment" id="slow-keys-box">
<property name="visible">True</property>
<property name="sensitive">False</property>
+ <property name="can_focus">False</property>
<property name="left_padding">18</property>
<child>
<object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Acceptance _delay:</property>
<property name="use_underline">True</property>
@@ -349,6 +432,8 @@ next time you login</property>
<property name="value_pos">right</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -356,6 +441,8 @@ next time you login</property>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -366,6 +453,7 @@ next time you login</property>
<child type="label">
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Slow Keys</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -382,21 +470,24 @@ next time you login</property>
<child>
<object class="GtkFrame" id="frame3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox6">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="bounce-keys-enabled">
<property name="label" translatable="yes">Use _bounce keys</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -414,14 +505,17 @@ next time you login</property>
<object class="GtkAlignment" id="bounce-keys-box">
<property name="visible">True</property>
<property name="sensitive">False</property>
+ <property name="can_focus">False</property>
<property name="left_padding">18</property>
<child>
<object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label9">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">K_eystroke delay:</property>
<property name="use_underline">True</property>
@@ -443,6 +537,8 @@ next time you login</property>
<property name="value_pos">right</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -450,6 +546,8 @@ next time you login</property>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -460,6 +558,7 @@ next time you login</property>
<child type="label">
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Bounce Keys</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -469,6 +568,7 @@ next time you login</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -480,6 +580,7 @@ next time you login</property>
<child type="tab">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Keyboa_rd</property>
<property name="use_underline">True</property>
</object>
@@ -491,26 +592,29 @@ next time you login</property>
<child>
<object class="GtkVBox" id="vbox5">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="orientation">vertical</property>
<child>
<object class="GtkFrame" id="frame4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox8">
<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="mouse-emulation-enabled">
<property name="label" translatable="yes">_Use mouse emulation</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -528,10 +632,12 @@ next time you login</property>
<object class="GtkAlignment" id="mouse-emulation-box">
<property name="visible">True</property>
<property name="sensitive">False</property>
+ <property name="can_focus">False</property>
<property name="left_padding">18</property>
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">5</property>
<property name="n_columns">3</property>
<property name="column_spacing">12</property>
@@ -539,6 +645,7 @@ next time you login</property>
<child>
<object class="GtkLabel" id="label16">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">R_epeat interval:</property>
<property name="use_underline">True</property>
@@ -553,6 +660,7 @@ next time you login</property>
<child>
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Acceleration delay:</property>
<property name="use_underline">True</property>
@@ -565,8 +673,9 @@ next time you login</property>
<child>
<object class="GtkLabel" id="label19">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Acceleration _time:</property>
+ <property name="label" translatable="yes">Acceleration t_ime:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">ttm-widget</property>
</object>
@@ -579,8 +688,9 @@ next time you login</property>
<child>
<object class="GtkLabel" id="label22">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Maximum _speed:</property>
+ <property name="label" translatable="yes">Ma_ximum speed:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">max-speed-widget</property>
</object>
@@ -593,6 +703,7 @@ next time you login</property>
<child>
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Acceleration _profile:</property>
<property name="use_underline">True</property>
@@ -607,6 +718,7 @@ next time you login</property>
<child>
<object class="GtkLabel" id="label10">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">msec</property>
</object>
@@ -618,6 +730,7 @@ next time you login</property>
<child>
<object class="GtkLabel" id="label11">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">msec</property>
</object>
@@ -631,6 +744,7 @@ next time you login</property>
<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">msec</property>
</object>
@@ -644,6 +758,7 @@ next time you login</property>
<child>
<object class="GtkLabel" id="label14">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -656,6 +771,7 @@ next time you login</property>
<child>
<object class="GtkLabel" id="label15">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">pixels/sec</property>
</object>
@@ -671,6 +787,10 @@ next time you login</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">The time, in milliseconds, between the initial key press and first repeated motion event</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="primary_icon_sensitive">True</property>
+ <property name="secondary_icon_sensitive">True</property>
<property name="adjustment">mouse-emulation-delay</property>
<property name="numeric">True</property>
<property name="update_policy">if-valid</property>
@@ -686,6 +806,10 @@ next time you login</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">The time, in milliseconds, between repeated motion events</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="primary_icon_sensitive">True</property>
+ <property name="secondary_icon_sensitive">True</property>
<property name="adjustment">mouse-emulation-interval</property>
<property name="numeric">True</property>
<property name="update_policy">if-valid</property>
@@ -703,6 +827,10 @@ next time you login</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">The ramp used to reach maximum pointer speed</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="primary_icon_sensitive">True</property>
+ <property name="secondary_icon_sensitive">True</property>
<property name="adjustment">mouse-emulation-curve</property>
<property name="numeric">True</property>
<property name="update_policy">if-valid</property>
@@ -720,6 +848,10 @@ next time you login</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">The maximum pointer speed after acceleration</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="primary_icon_sensitive">True</property>
+ <property name="secondary_icon_sensitive">True</property>
<property name="adjustment">mouse-emulation-max-speed</property>
<property name="numeric">True</property>
<property name="update_policy">if-valid</property>
@@ -737,6 +869,10 @@ next time you login</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">The time, in milliseconds, to get to maximum speed</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="primary_icon_sensitive">True</property>
+ <property name="secondary_icon_sensitive">True</property>
<property name="adjustment">mouse-emulation-time-to-max</property>
<property name="numeric">True</property>
<property name="update_policy">if-valid</property>
@@ -753,6 +889,8 @@ next time you login</property>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -763,6 +901,7 @@ next time you login</property>
<child type="label">
<object class="GtkLabel" id="label12">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Mouse Emulation</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -772,6 +911,7 @@ next time you login</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -783,6 +923,7 @@ next time you login</property>
<child type="tab">
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Mouse</property>
<property name="use_underline">True</property>
</object>
@@ -793,55 +934,18 @@ next time you login</property>
</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">True</property>
+ <property name="fill">True</property>
<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="button2">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</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="button1">
- <property name="label">gtk-help</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- <property name="secondary">True</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>
diff --git a/dialogs/appearance-settings/appearance-dialog.glade b/dialogs/appearance-settings/appearance-dialog.glade
index e5fb94b..a6c656d 100644
--- a/dialogs/appearance-settings/appearance-dialog.glade
+++ b/dialogs/appearance-settings/appearance-dialog.glade
@@ -1,75 +1,64 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-requires gtk+ 2.12 -->
+ <requires lib="gtk+" version="2.20"/>
<!-- interface-requires libxfce4ui 4.5 -->
<!-- interface-naming-policy toplevel-contextual -->
- <object class="GtkAdjustment" id="xft_custom_dpi">
- <property name="lower">48</property>
- <property name="upper">1000</property>
- <property name="value">96</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkListStore" id="liststore1">
- <columns>
- <!-- column-name title -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">None</col>
- </row>
- <row>
- <col id="0" translatable="yes">Slight</col>
- </row>
- <row>
- <col id="0" translatable="yes">Medium</col>
- </row>
- <row>
- <col id="0" translatable="yes">Full</col>
- </row>
- </data>
- </object>
- <object class="GtkListStore" id="liststore2">
- <columns>
- <!-- column-name title -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Icons</col>
- </row>
- <row>
- <col id="0" translatable="yes">Text</col>
- </row>
- <row>
- <col id="0" translatable="yes">Both</col>
- </row>
- <row>
- <col id="0" translatable="yes">Both Horizontal</col>
- </row>
- </data>
- </object>
- <object class="GtkListStore" id="xft_rgba_store">
- <columns>
- <!-- column-name pixbuf -->
- <column type="GdkPixbuf"/>
- <!-- column-name title -->
- <column type="gchararray"/>
- </columns>
- </object>
<object class="XfceTitledDialog" id="dialog">
+ <property name="can_focus">False</property>
<property name="title" translatable="yes">Appearance</property>
<property name="window_position">center-on-parent</property>
<property name="icon_name">preferences-desktop-theme</property>
<property name="type_hint">dialog</property>
- <property name="has_separator">False</property>
<property name="subtitle" translatable="yes">Customize the look of your desktop</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" 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="button2">
+ <property name="label">gtk-help</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ <property name="secondary">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button1">
+ <property name="label">gtk-close</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
<object class="GtkNotebook" id="plug-child">
<property name="visible">True</property>
@@ -96,6 +85,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">St_yle</property>
<property name="use_underline">True</property>
</object>
@@ -127,6 +117,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">_Icons</property>
<property name="use_underline">True</property>
</object>
@@ -138,22 +129,25 @@
<child>
<object class="GtkVBox" id="vbox3">
<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">12</property>
<child>
<object class="GtkFrame" id="frame3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkFontButton" id="gtk_fontname_button">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -166,6 +160,7 @@
<child type="label">
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Default Fon_t</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">gtk_fontname_button</property>
@@ -177,22 +172,26 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="n_rows">3</property>
<property name="n_columns">2</property>
@@ -201,6 +200,7 @@
<child>
<object class="GtkComboBox" id="xft_hinting_style_combo_box">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Many fonts contain information that provides extra hints as to how best draw the font; pick whichever looks best according to personal preference</property>
<property name="model">liststore1</property>
<child>
@@ -220,6 +220,7 @@
<child>
<object class="GtkComboBox" id="xft_rgba_combo_box">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Font quality on a TFT or LCD screen can be greatly improved by choosing the correct sub-pixel order of the screen</property>
<property name="model">xft_rgba_store</property>
<child>
@@ -245,6 +246,7 @@
<child>
<object class="GtkLabel" id="label11">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Sub-_pixel order:</property>
<property name="use_underline">True</property>
@@ -259,8 +261,9 @@
<child>
<object class="GtkLabel" id="label10">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Hinting:</property>
+ <property name="label" translatable="yes">Hintin_g:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">xft_hinting_style_combo_box</property>
</object>
@@ -272,7 +275,8 @@
</child>
<child>
<object class="GtkCheckButton" id="xft_antialias_check_button">
- <property name="label" translatable="yes">Enable _anti-aliasing</property>
+ <property name="label" translatable="yes">_Enable anti-aliasing</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -292,6 +296,7 @@
<child type="label">
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Rendering</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -301,27 +306,32 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame5">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment5">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="spacing">12</property>
<child>
<object class="GtkCheckButton" id="xft_custom_dpi_check_button">
<property name="label" translatable="yes">Custom _DPI setting:</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -331,6 +341,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -339,6 +350,10 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="primary_icon_sensitive">True</property>
+ <property name="secondary_icon_sensitive">True</property>
<property name="adjustment">xft_custom_dpi</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
@@ -346,6 +361,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -356,6 +372,7 @@
<child type="label">
<object class="GtkLabel" id="label9">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">DPI</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -365,6 +382,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -376,6 +394,7 @@
<child type="tab">
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Fonts</property>
<property name="use_underline">True</property>
</object>
@@ -387,23 +406,26 @@
<child>
<object class="GtkVBox" id="vbox1">
<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">6</property>
<child>
<object class="GtkFrame" id="frame2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkComboBox" id="gtk_toolbar_style_combo_box">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Specify what should be displayed in toolbar items</property>
<property name="model">liststore2</property>
<child>
@@ -419,6 +441,7 @@
<child type="label">
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Toolbar Style</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">gtk_toolbar_style_combo_box</property>
@@ -430,28 +453,32 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="gtk_button_images_check_button">
<property name="label" translatable="yes">Show images on _buttons</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -460,12 +487,15 @@
<property name="draw_indicator">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="gtk_menu_images_check_button">
<property name="label" translatable="yes">Show images in _menus</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -474,12 +504,15 @@
<property name="draw_indicator">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="gtk_caneditaccels_check_button">
<property name="label" translatable="yes">Enable e_ditable accelerators</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -488,6 +521,8 @@
<property name="draw_indicator">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -498,6 +533,7 @@
<child type="label">
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Menus and Buttons</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -507,27 +543,31 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="event_sounds_frame">
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment6">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="enable_event_sounds_check_button">
<property name="label" translatable="yes">Enable _event sounds</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -536,12 +576,15 @@
<property name="draw_indicator">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="enable_input_feedback_sounds_button">
- <property name="label" translatable="yes">Enable i_nput feedback sounds</property>
+ <property name="label" translatable="yes">Enable input feedbac_k sounds</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -550,6 +593,8 @@
<property name="draw_indicator">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
@@ -560,6 +605,7 @@
<child type="label">
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Event sounds</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -568,6 +614,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -579,7 +627,8 @@
<child type="tab">
<object class="GtkLabel" id="label12">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Settings</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Setti_ngs</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -589,55 +638,71 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<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="button1">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</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="button2">
- <property name="label">gtk-help</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- <property name="secondary">True</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="0">button1</action-widget>
<action-widget response="-11">button2</action-widget>
+ <action-widget response="0">button1</action-widget>
</action-widgets>
</object>
+ <object class="GtkListStore" id="liststore1">
+ <columns>
+ <!-- column-name title -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">None</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Slight</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Medium</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Full</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="liststore2">
+ <columns>
+ <!-- column-name title -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Icons</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Text</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Both</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Both Horizontal</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkAdjustment" id="xft_custom_dpi">
+ <property name="lower">48</property>
+ <property name="upper">1000</property>
+ <property name="value">96</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkListStore" id="xft_rgba_store">
+ <columns>
+ <!-- column-name pixbuf -->
+ <column type="GdkPixbuf"/>
+ <!-- column-name title -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
</interface>
diff --git a/dialogs/display-settings/display-dialog.glade b/dialogs/display-settings/display-dialog.glade
index c7357a3..1accd0e 100644
--- a/dialogs/display-settings/display-dialog.glade
+++ b/dialogs/display-settings/display-dialog.glade
@@ -25,10 +25,10 @@
<child>
<object class="GtkButton" id="button-help">
<property name="label">gtk-help</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -41,10 +41,10 @@
<child>
<object class="GtkButton" id="button-close">
<property name="label">gtk-close</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -214,7 +214,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Position:</property>
+ <property name="label" translatable="yes">P_osition:</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="top_attach">2</property>
@@ -225,11 +226,12 @@
</child>
<child>
<object class="GtkCheckButton" id="output-on">
- <property name="label" translatable="yes">Use this output</property>
+ <property name="label" translatable="yes">_Use this output</property>
+ <property name="use_action_appearance">False</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_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -240,11 +242,12 @@
</child>
<child>
<object class="GtkCheckButton" id="mirror-displays">
- <property name="label" translatable="yes">Mirror displays</property>
+ <property name="label" translatable="yes">_Mirror displays</property>
+ <property name="use_action_appearance">False</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_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
diff --git a/dialogs/keyboard-settings/keyboard-dialog.glade b/dialogs/keyboard-settings/keyboard-dialog.glade
index 7eccd51..740125b 100644
--- a/dialogs/keyboard-settings/keyboard-dialog.glade
+++ b/dialogs/keyboard-settings/keyboard-dialog.glade
@@ -113,8 +113,8 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="button2">
- <property name="label">gtk-close</property>
+ <object class="GtkButton" id="button1">
+ <property name="label">gtk-help</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -125,11 +125,12 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
+ <property name="secondary">True</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="button1">
- <property name="label">gtk-help</property>
+ <object class="GtkButton" id="button2">
+ <property name="label">gtk-close</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -140,7 +141,6 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
- <property name="secondary">True</property>
</packing>
</child>
</object>
@@ -293,7 +293,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Repeat _speed:</property>
+ <property name="label" translatable="yes">Repe_at speed:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">xkb_key_repeat_rate_scale</property>
</object>
@@ -504,7 +504,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Be_havior</property>
+ <property name="label" translatable="yes">Beha_vior</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -522,7 +522,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Define _shortcuts for launching applications:</property>
+ <property name="label" translatable="yes">Define _shortcuts for la_unching applications:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">kbd_shortcuts_view</property>
</object>
@@ -675,7 +675,8 @@
<object class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Keyboard model</property>
+ <property name="label" translatable="yes">_Keyboard model</property>
+ <property name="use_underline">True</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -692,7 +693,6 @@
<object class="GtkHBox" id="hbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">0</property>
<property name="spacing">6</property>
<property name="homogeneous">True</property>
<child>
@@ -719,7 +719,8 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Change layout option</property>
+ <property name="label" translatable="yes">Change la_yout option</property>
+ <property name="use_underline">True</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -756,7 +757,8 @@
<object class="GtkLabel" id="label15">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Compose key</property>
+ <property name="label" translatable="yes">Co_mpose key</property>
+ <property name="use_underline">True</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -792,22 +794,41 @@
<object class="GtkVBox" id="vbox8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">0</property>
<property name="spacing">6</property>
<child>
<object class="GtkHBox" id="hbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">0</property>
<property name="spacing">6</property>
<child>
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">etched-in</property>
+ <child>
+ <object class="GtkTreeView" id="xkb_layout_view">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="search_column">0</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkVBox" id="vbuttonbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
- <property name="orientation">vertical</property>
<child>
<object class="GtkButton" id="xkb_layout_up_button">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -815,6 +836,7 @@
<child>
<object class="GtkImage" id="image4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="stock">gtk-go-up</property>
</object>
</child>
@@ -827,6 +849,7 @@
</child>
<child>
<object class="GtkButton" id="xkb_layout_down_button">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -834,6 +857,7 @@
<child>
<object class="GtkImage" id="image3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="stock">gtk-go-down</property>
</object>
</child>
@@ -844,7 +868,6 @@
<property name="position">1</property>
</packing>
</child>
-
</object>
<packing>
<property name="expand">False</property>
@@ -852,27 +875,6 @@
<property name="position">1</property>
</packing>
</child>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">etched-in</property>
- <child>
- <object class="GtkTreeView" id="xkb_layout_view">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="search_column">0</property>
- </object>
- </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">True</property>
@@ -946,7 +948,8 @@
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Keyboard layout</property>
+ <property name="label" translatable="yes">Key_board layout</property>
+ <property name="use_underline">True</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -993,8 +996,8 @@
</object>
</child>
<action-widgets>
- <action-widget response="0">button2</action-widget>
<action-widget response="-11">button1</action-widget>
+ <action-widget response="0">button2</action-widget>
</action-widgets>
</object>
<object class="GtkAdjustment" id="net_cursor_blink_time">
diff --git a/dialogs/mouse-settings/mouse-dialog.glade b/dialogs/mouse-settings/mouse-dialog.glade
index c92f3ca..d3aab0d 100644
--- a/dialogs/mouse-settings/mouse-dialog.glade
+++ b/dialogs/mouse-settings/mouse-dialog.glade
@@ -42,6 +42,39 @@
<property name="can_focus">False</property>
<property name="stock">gtk-revert-to-saved</property>
</object>
+ <object class="GtkListStore" id="synaptics-scroll-store">
+ <columns>
+ <!-- column-name title -->
+ <column type="gchararray"/>
+ <!-- column-name sensitive -->
+ <column type="gboolean"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Disabled</col>
+ <col id="1">True</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Edge scrolling</col>
+ <col id="1">True</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Two-finger scrolling</col>
+ <col id="1">True</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Circular scrolling</col>
+ <col id="1">True</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkAdjustment" id="theme-cursor-size">
+ <property name="lower">16</property>
+ <property name="upper">48</property>
+ <property name="value">24</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">11</property>
+ </object>
<object class="XfceTitledDialog" id="mouse-dialog">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Mouse and Touchpad</property>
@@ -60,23 +93,24 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="button1">
- <property name="label">gtk-close</property>
+ <object class="GtkButton" id="button2">
+ <property name="label">gtk-help</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_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>
+ <property name="secondary">True</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="button2">
- <property name="label">gtk-help</property>
+ <object class="GtkButton" id="button1">
+ <property name="label">gtk-close</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -87,7 +121,6 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
- <property name="secondary">True</property>
</packing>
</child>
</object>
@@ -150,10 +183,10 @@
<child>
<object class="GtkCheckButton" id="device-enabled">
<property name="label" translatable="yes">_Enable this device</property>
+ <property name="use_action_appearance">False</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_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -197,11 +230,11 @@
<property name="spacing">12</property>
<child>
<object class="GtkRadioButton" id="device-right-handed">
- <property name="label" translatable="yes">_Right-handed</property>
+ <property name="label" translatable="yes">Ri_ght-handed</property>
+ <property name="use_action_appearance">False</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_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -214,11 +247,11 @@
</child>
<child>
<object class="GtkRadioButton" id="device-left-handed">
- <property name="label" translatable="yes">_Left-handed</property>
+ <property name="label" translatable="yes">Le_ft-handed</property>
+ <property name="use_action_appearance">False</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_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">device-right-handed</property>
@@ -239,11 +272,11 @@
<child>
<object class="GtkCheckButton" id="device-reverse-scrolling">
<property name="label" translatable="yes">Reverse scroll d_irection</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">When selected, the scroll wheel will work in the opposite direction</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -299,7 +332,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Acceleration:</property>
+ <property name="label" translatable="yes">Acceleratio_n:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">device-acceleration-scale</property>
</object>
@@ -346,7 +379,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Sensitivity:</property>
+ <property name="label" translatable="yes">Sensitivit_y:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">device-threshold-scale</property>
</object>
@@ -365,12 +398,12 @@
<property name="yscale">0</property>
<child>
<object class="GtkButton" id="device-reset-feedback">
- <property name="label" translatable="yes">Reset to De_faults</property>
+ <property name="label" translatable="yes">_Reset to Defaults</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Set the acceleration and sensitivity for the selected device to the default values</property>
- <property name="use_action_appearance">False</property>
<property name="image">image5</property>
<property name="use_underline">True</property>
</object>
@@ -441,12 +474,12 @@
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="synaptics-disable-while-type">
- <property name="label" translatable="yes">Disable to_uchpad while typing</property>
+ <property name="label" translatable="yes">Disable touchpad _while typing</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">When selected, the touchpad will be disabled when the keyboard is being used</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -458,11 +491,11 @@
</child>
<child>
<object class="GtkCheckButton" id="synaptics-tap-to-click">
- <property name="label" translatable="yes">T_ap touchpad to click</property>
+ <property name="label" translatable="yes">Tap touchpad to clic_k</property>
+ <property name="use_action_appearance">False</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_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -521,7 +554,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Scro_lling mode:</property>
+ <property name="label" translatable="yes">Scrolling _mode:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">synaptics-scroll</property>
</object>
@@ -539,8 +572,8 @@
<child>
<object class="GtkCellRendererText" id="cellrenderertext3"/>
<attributes>
- <attribute name="text">0</attribute>
<attribute name="sensitive">1</attribute>
+ <attribute name="text">0</attribute>
</attributes>
</child>
</object>
@@ -560,10 +593,10 @@
<child>
<object class="GtkCheckButton" id="synaptics-scroll-horiz">
<property name="label" translatable="yes">Enable hori_zontal scrolling</property>
+ <property name="use_action_appearance">False</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_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -643,7 +676,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Tr_acking mode:</property>
+ <property name="label" translatable="yes">Trac_king mode:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">wacom-mode</property>
</object>
@@ -733,7 +766,7 @@
<object class="GtkLabel" id="wacom-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Table_t</property>
+ <property name="label" translatable="yes">Tab_let</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -1007,7 +1040,7 @@
<object class="GtkLabel" id="label21">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Cursor _size:</property>
+ <property name="label" translatable="yes">Cursor si_ze:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">spin1</property>
</object>
@@ -1117,7 +1150,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">T_heme</property>
+ <property name="label" translatable="yes">_Theme</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -1135,43 +1168,10 @@
</object>
</child>
<action-widgets>
- <action-widget response="0">button1</action-widget>
<action-widget response="-11">button2</action-widget>
+ <action-widget response="0">button1</action-widget>
</action-widgets>
</object>
- <object class="GtkAdjustment" id="theme-cursor-size">
- <property name="lower">16</property>
- <property name="upper">48</property>
- <property name="value">24</property>
- <property name="step_increment">1</property>
- <property name="page_increment">11</property>
- </object>
- <object class="GtkListStore" id="synaptics-scroll-store">
- <columns>
- <!-- column-name title -->
- <column type="gchararray"/>
- <!-- column-name sensitive -->
- <column type="gboolean"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Disabled</col>
- <col id="1">True</col>
- </row>
- <row>
- <col id="0" translatable="yes">Edge scrolling</col>
- <col id="1">True</col>
- </row>
- <row>
- <col id="0" translatable="yes">Two-finger scrolling</col>
- <col id="1">True</col>
- </row>
- <row>
- <col id="0" translatable="yes">Circular scrolling</col>
- <col id="1">True</col>
- </row>
- </data>
- </object>
<object class="GtkListStore" id="wacom-mode-store">
<columns>
<!-- column-name mode -->
diff --git a/xfce4-settings-manager/xfce-settings-manager-dialog.c b/xfce4-settings-manager/xfce-settings-manager-dialog.c
index e2f9aa4..043b143 100644
--- a/xfce4-settings-manager/xfce-settings-manager-dialog.c
+++ b/xfce4-settings-manager/xfce-settings-manager-dialog.c
@@ -183,7 +183,7 @@ xfce_settings_manager_dialog_init (XfceSettingsManagerDialog *dialog)
gtk_window_set_default_size (GTK_WINDOW (dialog), 640, 500);
xfce_settings_manager_dialog_set_title (dialog, NULL, NULL, NULL);
- dialog->button_back = xfce_gtk_button_new_mixed (GTK_STOCK_GO_BACK, _("_All Settings"));
+ dialog->button_back = xfce_gtk_button_new_mixed (GTK_STOCK_GO_BACK, _("All _Settings"));
bbox = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
gtk_container_add (GTK_CONTAINER (bbox), dialog->button_back);
gtk_widget_set_sensitive (dialog->button_back, FALSE);
More information about the Xfce4-commits
mailing list