Author: nick
Date: 2008-07-19 06:47:03 +0000 (Sat, 19 Jul 2008)
New Revision: 27350
Modified:
xfce4-settings/trunk/ChangeLog
xfce4-settings/trunk/dialogs/mouse-settings/mouse-dialog.glade
Log:
* dialogs/mouse-settings/mouse-dialog.glade: Simplify packing
of the widgets, like we do in the other dialogs.
Modified: xfce4-settings/trunk/ChangeLog
===================================================================
--- xfce4-settings/trunk/ChangeLog 2008-07-19 06:38:26 UTC (rev 27349)
+++ xfce4-settings/trunk/ChangeLog 2008-07-19 06:47:03 UTC (rev 27350)
@@ -1,5 +1,10 @@
2008-07-19 Nick Schermer <[EMAIL PROTECTED]>
+ * dialogs/mouse-settings/mouse-dialog.glade: Simplify packing
+ of the widgets, like we do in the other dialogs.
+
+2008-07-19 Nick Schermer <[EMAIL PROTECTED]>
+
* dialogs/mouse-settings/main.c, xfce4-settings-helper/pointers.c:
Remove the notification. Not a good idea since it also shows
after suspend.
Modified: xfce4-settings/trunk/dialogs/mouse-settings/mouse-dialog.glade
===================================================================
--- xfce4-settings/trunk/dialogs/mouse-settings/mouse-dialog.glade
2008-07-19 06:38:26 UTC (rev 27349)
+++ xfce4-settings/trunk/dialogs/mouse-settings/mouse-dialog.glade
2008-07-19 06:47:03 UTC (rev 27350)
@@ -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 Fri Jul 18 02:18:08 2008 -->
+<!--Generated with glade3 3.4.5 on Sat Jul 19 08:44:26 2008 -->
<glade-interface>
<requires lib="xfce4"/>
<widget class="XfceTitledDialog" id="mouse-dialog">
@@ -60,38 +60,32 @@
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkVBox" id="vbox2">
+ <widget class="GtkRadioButton"
id="mouse-right-handed">
<property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkRadioButton"
id="mouse-right-handed">
- <property
name="visible">True</property>
- <property
name="can_focus">True</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>
- </widget>
- </child>
- <child>
- <widget class="GtkRadioButton"
id="mouse-left-handed">
- <property
name="visible">True</property>
- <property
name="can_focus">True</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>
- <property
name="group">mouse-right-handed</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</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>
</widget>
</child>
<child>
+ <widget class="GtkRadioButton"
id="mouse-left-handed">
+ <property name="visible">True</property>
+ <property name="can_focus">True</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>
+ <property
name="group">mouse-right-handed</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkCheckButton"
id="mouse-reverse-scrolling">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -102,9 +96,12 @@
<property
name="draw_indicator">True</property>
</widget>
<packing>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -140,71 +137,58 @@
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkVBox" id="vbox7">
+ <widget class="GtkLabel"
id="mouse-acceleration-label">
<property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkLabel"
id="mouse-acceleration-label">
- <property
name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">_Acceleration:</property>
- <property
name="use_underline">True</property>
- <property
name="mnemonic_widget">mouse-acceleration-scale</property>
- </widget>
- </child>
- <child>
- <widget class="GtkHScale"
id="mouse-acceleration-scale">
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property name="tooltip"
translatable="yes">The pointer will go 'acceleration' times as fast when it
travels more than 'threshold' pixels in a short time</property>
- <property
name="update_policy">GTK_UPDATE_DELAYED</property>
- <property name="adjustment">2
0.10000000000000001 10 0.10000000000000001 1 1</property>
- <property
name="value_pos">GTK_POS_RIGHT</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">_Acceleration:</property>
+ <property
name="use_underline">True</property>
+ <property
name="mnemonic_widget">mouse-acceleration-scale</property>
</widget>
</child>
<child>
- <widget class="GtkVBox" id="vbox8">
+ <widget class="GtkHScale"
id="mouse-acceleration-scale">
<property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkLabel"
id="mouse-threshold-label">
- <property
name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">_Threshold:</property>
- <property
name="use_underline">True</property>
- <property
name="mnemonic_widget">mouse-threshold-scale</property>
- </widget>
- </child>
- <child>
- <widget class="GtkHScale"
id="mouse-threshold-scale">
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property name="tooltip"
translatable="yes">The number of pixels the pointer has to moved in a short
time before the acceleration starts</property>
- <property
name="update_policy">GTK_UPDATE_DELAYED</property>
- <property name="adjustment">4 1 30 1 5
5</property>
- <property name="digits">0</property>
- <property
name="value_pos">GTK_POS_RIGHT</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="tooltip"
translatable="yes">The pointer will go 'acceleration' times as fast when it
travels more than 'threshold' pixels in a short time</property>
+ <property
name="update_policy">GTK_UPDATE_DELAYED</property>
+ <property name="adjustment">2
0.10000000000000001 10 0.10000000000000001 1 1</property>
+ <property
name="value_pos">GTK_POS_RIGHT</property>
</widget>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
+ <widget class="GtkLabel"
id="mouse-threshold-label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">_Threshold:</property>
+ <property
name="use_underline">True</property>
+ <property
name="mnemonic_widget">mouse-threshold-scale</property>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHScale"
id="mouse-threshold-scale">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip"
translatable="yes">The number of pixels the pointer has to moved in a short
time before the acceleration starts</property>
+ <property
name="update_policy">GTK_UPDATE_DELAYED</property>
+ <property name="adjustment">4 1 30 1 5
5</property>
+ <property name="digits">0</property>
+ <property
name="value_pos">GTK_POS_RIGHT</property>
+ </widget>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkAlignment" id="alignment7">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="xscale">0</property>
- <property name="top_padding">6</property>
<child>
<widget class="GtkButton"
id="mouse-reset">
<property
name="visible">True</property>
@@ -218,7 +202,7 @@
</child>
</widget>
<packing>
- <property name="position">2</property>
+ <property name="position">4</property>
</packing>
</child>
</widget>
@@ -277,7 +261,7 @@
<widget class="GtkVBox" id="vbox4">
<property name="visible">True</property>
<property name="border_width">6</property>
- <property name="spacing">2</property>
+ <property name="spacing">6</property>
<child>
<widget class="GtkLabel" id="mouse-dnd-label">
<property name="visible">True</property>
@@ -336,66 +320,54 @@
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkVBox" id="vbox10">
+ <widget class="GtkLabel"
id="mouse-double-click-time-label">
<property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkLabel"
id="mouse-double-click-time-label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">Ti_me:</property>
- <property
name="use_underline">True</property>
- <property
name="mnemonic_widget">mouse-double-click-time</property>
- </widget>
- </child>
- <child>
- <widget class="GtkHScale"
id="mouse-double-click-time">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip"
translatable="yes">The maximum time allowed between two clicks, in
milliseconds, for them to be considered a double click</property>
- <property
name="update_policy">GTK_UPDATE_DELAYED</property>
- <property name="adjustment">250 100 2000
10 100 100</property>
- <property name="digits">0</property>
- <property
name="value_pos">GTK_POS_RIGHT</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">Ti_me:</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">mouse-double-click-time</property>
</widget>
</child>
<child>
- <widget class="GtkVBox" id="vbox11">
+ <widget class="GtkHScale"
id="mouse-double-click-time">
<property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkLabel"
id="mouse-double-click-distance-label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">_Distance:</property>
- <property
name="use_underline">True</property>
- <property
name="mnemonic_widget">mouse-double-click-distance</property>
- </widget>
- </child>
- <child>
- <widget class="GtkHScale"
id="mouse-double-click-distance">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip"
translatable="yes">The maximum distance allowed between two clicks, in pixels,
for them to be considered a double click</property>
- <property
name="update_policy">GTK_UPDATE_DELAYED</property>
- <property name="adjustment">4 0 20 1 5
5</property>
- <property name="digits">0</property>
- <property
name="value_pos">GTK_POS_RIGHT</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="tooltip"
translatable="yes">The maximum time allowed between two clicks, in
milliseconds, for them to be considered a double click</property>
+ <property
name="update_policy">GTK_UPDATE_DELAYED</property>
+ <property name="adjustment">250 100 2000 10
100 100</property>
+ <property name="digits">0</property>
+ <property
name="value_pos">GTK_POS_RIGHT</property>
</widget>
<packing>
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel"
id="mouse-double-click-distance-label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">_Distance:</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">mouse-double-click-distance</property>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHScale"
id="mouse-double-click-distance">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip"
translatable="yes">The maximum distance allowed between two clicks, in pixels,
for them to be considered a double click</property>
+ <property
name="update_policy">GTK_UPDATE_DELAYED</property>
+ <property name="adjustment">4 0 20 1 5
5</property>
+ <property name="digits">0</property>
+ <property
name="value_pos">GTK_POS_RIGHT</property>
+ </widget>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
