mousetweaks r117 - in trunk: . data src
- From: gerdk svn gnome org
- To: svn-commits-list gnome org
- Subject: mousetweaks r117 - in trunk: . data src
- Date: Tue, 25 Mar 2008 08:26:08 +0000 (GMT)
Author: gerdk
Date: Tue Mar 25 08:26:08 2008
New Revision: 117
URL: http://svn.gnome.org/viewvc/mousetweaks?rev=117&view=rev
Log:
2008-03-25 Gerd Kohlberger <gerdk svn gnome org>
* src/mt-main.c: Fix typo.
* data/pointer-capture.glade: Button -> Mouse button
* data/pointer-capture.schemas.in: Enclose literal values in double quotes.
* data/mousetweaks.schemas.in: Enclose literal values in double quotes.
Fixes bug #516191.
Modified:
trunk/ChangeLog
trunk/data/mousetweaks.schemas.in
trunk/data/pointer-capture-applet.glade
trunk/data/pointer-capture-applet.schemas.in
trunk/src/mt-main.c
Modified: trunk/data/mousetweaks.schemas.in
==============================================================================
--- trunk/data/mousetweaks.schemas.in (original)
+++ trunk/data/mousetweaks.schemas.in Tue Mar 25 08:26:08 2008
@@ -12,7 +12,6 @@
<long>Distance in pixels before movement will be recognized</long>
</locale>
</schema>
-
<schema>
<key>/schemas/desktop/gnome/accessibility/mouse/delay_enable</key>
<applyto>/desktop/gnome/accessibility/mouse/delay_enable</applyto>
@@ -24,7 +23,6 @@
<long>Enable simulated secondary click</long>
</locale>
</schema>
-
<schema>
<key>/schemas/desktop/gnome/accessibility/mouse/delay_time</key>
<applyto>/desktop/gnome/accessibility/mouse/delay_time</applyto>
@@ -36,7 +34,6 @@
<long>Time in seconds before a secondary click is triggered</long>
</locale>
</schema>
-
<schema>
<key>/schemas/desktop/gnome/accessibility/mouse/dwell_enable</key>
<applyto>/desktop/gnome/accessibility/mouse/dwell_enable</applyto>
@@ -48,7 +45,6 @@
<long>Enable dwell click</long>
</locale>
</schema>
-
<schema>
<key>/schemas/desktop/gnome/accessibility/mouse/dwell_time</key>
<applyto>/desktop/gnome/accessibility/mouse/dwell_time</applyto>
@@ -60,7 +56,6 @@
<long>Time in seconds before a click is triggered</long>
</locale>
</schema>
-
<schema>
<key>/schemas/desktop/gnome/accessibility/mouse/dwell_gesture_single</key>
<applyto>/desktop/gnome/accessibility/mouse/dwell_gesture_single</applyto>
@@ -69,10 +64,9 @@
<default>0</default>
<locale name="C">
<short>Gesture single click</short>
- <long>Direction to perform a single click (0=Left, 1=Right, 2=Up, 3=Down)</long>
+ <long>Direction to perform a single click ("0" = Left, "1" = Right, "2" = Up, "3" = Down)</long>
</locale>
</schema>
-
<schema>
<key>/schemas/desktop/gnome/accessibility/mouse/dwell_gesture_double</key>
<applyto>/desktop/gnome/accessibility/mouse/dwell_gesture_double</applyto>
@@ -81,10 +75,9 @@
<default>2</default>
<locale name="C">
<short>Gesture double click</short>
- <long>Direction to perform a double click (0=Left, 1=Right, 2=Up, 3=Down)</long>
+ <long>Direction to perform a double click ("0" = Left, "1" = Right, "2" = Up, "3" = Down)</long>
</locale>
</schema>
-
<schema>
<key>/schemas/desktop/gnome/accessibility/mouse/dwell_gesture_drag</key>
<applyto>/desktop/gnome/accessibility/mouse/dwell_gesture_drag</applyto>
@@ -93,10 +86,9 @@
<default>3</default>
<locale name="C">
<short>Gesture drag click</short>
- <long>Direction to perform a drag click (0=Left, 1=Right, 2=Up, 3=Down)</long>
+ <long>Direction to perform a drag click ("0" = Left, "1" = Right, "2" = Up, "3" = Down)</long>
</locale>
</schema>
-
<schema>
<key>/schemas/desktop/gnome/accessibility/mouse/dwell_gesture_secondary</key>
<applyto>/desktop/gnome/accessibility/mouse/dwell_gesture_secondary</applyto>
@@ -105,10 +97,9 @@
<default>1</default>
<locale name="C">
<short>Gesture secondary click</short>
- <long>Direction to perform a secondary click (0=Left, 1=Right, 2=Up, 3=Down)</long>
+ <long>Direction to perform a secondary click ("0" = Left, "1" = Right, "2" = Up, "3" = Down)</long>
</locale>
</schema>
-
<schema>
<key>/schemas/desktop/gnome/accessibility/mouse/dwell_mode</key>
<applyto>/desktop/gnome/accessibility/mouse/dwell_mode</applyto>
@@ -117,10 +108,9 @@
<default>1</default>
<locale name="C">
<short>Dwell click mode</short>
- <long>Dwell click mode (0=Gesture mode, 1=Window mode)</long>
+ <long>Dwell click mode ("0" = Gesture mode, "1" = Window mode)</long>
</locale>
</schema>
-
<schema>
<key>/schemas/desktop/gnome/accessibility/mouse/dwell_show_ctw</key>
<applyto>/desktop/gnome/accessibility/mouse/dwell_show_ctw</applyto>
@@ -132,7 +122,6 @@
<long>Show click type window</long>
</locale>
</schema>
-
<schema>
<key>/schemas/desktop/gnome/accessibility/mouse/button_layout</key>
<applyto>/desktop/gnome/accessibility/mouse/button_layout</applyto>
@@ -141,9 +130,8 @@
<default>2</default>
<locale name="C">
<short>Button style</short>
- <long>Button style in click type window (0=Text, 1=Icon, 2=Both)</long>
+ <long>Button style in click type window ("0" = Text, "1" = Icon, "2" = Both)</long>
</locale>
</schema>
-
</schemalist>
</gconfschemafile>
Modified: trunk/data/pointer-capture-applet.glade
==============================================================================
--- trunk/data/pointer-capture-applet.glade (original)
+++ trunk/data/pointer-capture-applet.glade Tue Mar 25 08:26:08 2008
@@ -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.0 on Thu Nov 1 17:50:56 2007 -->
+<!--Generated with glade3 3.4.2 on Tue Mar 25 08:53:38 2008 -->
<glade-interface>
<widget class="GtkAboutDialog" id="about">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -78,29 +78,37 @@
<property name="column_spacing">12</property>
<property name="row_spacing">8</property>
<child>
- <widget class="GtkLabel" id="label10">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Button:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">cap_button</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label9">
+ <widget class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Modifier:</property>
+ <child>
+ <widget class="GtkSpinButton" id="cap_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip" translatable="yes">Selecting Button 0 will capture the pointer immediately</property>
+ <property name="max_length">1</property>
+ <property name="adjustment">1 0 3 1 1 1</property>
+ <property name="numeric">True</property>
+ <property name="update_policy">GTK_UPDATE_IF_VALID</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label22">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
</packing>
</child>
<child>
@@ -162,37 +170,29 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox1">
+ <widget class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <widget class="GtkSpinButton" id="cap_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip" translatable="yes">Selecting Button 0 will capture the pointer immediately</property>
- <property name="max_length">1</property>
- <property name="adjustment">1 0 3 1 1 1</property>
- <property name="numeric">True</property>
- <property name="update_policy">GTK_UPDATE_IF_VALID</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label22">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Modifier:</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="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Mouse _button:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">cap_button</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
</widget>
@@ -236,29 +236,36 @@
<property name="column_spacing">12</property>
<property name="row_spacing">8</property>
<child>
- <widget class="GtkLabel" id="label19">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">B_utton:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">rel_button</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label20">
+ <widget class="GtkHBox" id="hbox6">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Modifier:</property>
+ <child>
+ <widget class="GtkSpinButton" id="rel_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="max_length">1</property>
+ <property name="adjustment">1 1 3 1 1 1</property>
+ <property name="numeric">True</property>
+ <property name="update_policy">GTK_UPDATE_IF_VALID</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
</packing>
</child>
<child>
@@ -320,36 +327,29 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox6">
+ <widget class="GtkLabel" id="label20">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <widget class="GtkSpinButton" id="rel_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="max_length">1</property>
- <property name="adjustment">1 1 3 1 1 1</property>
- <property name="numeric">True</property>
- <property name="update_policy">GTK_UPDATE_IF_VALID</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Modifier:</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="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label19">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Mouse b_utton:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">rel_button</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
</widget>
Modified: trunk/data/pointer-capture-applet.schemas.in
==============================================================================
--- trunk/data/pointer-capture-applet.schemas.in (original)
+++ trunk/data/pointer-capture-applet.schemas.in Tue Mar 25 08:26:08 2008
@@ -1,7 +1,6 @@
<?xml version="1.0"?>
<gconfschemafile>
- <schemalist>
-
+ <schemalist>
<schema>
<key>/schemas/apps/pointer-capture/size</key>
<owner>pointer-capture</owner>
@@ -12,29 +11,26 @@
<long>Width of the capture area in pixels</long>
</locale>
</schema>
-
<schema>
<key>/schemas/apps/pointer-capture/capture_button</key>
<owner>pointer-capture</owner>
<type>int</type>
<default>1</default>
<locale name="C">
- <short>Capture button</short>
- <long>Button to capture the pointer (0=Capture immediately)</long>
+ <short>Capture mouse button</short>
+ <long>Mouse button to capture the pointer ("0" = Capture immediately)</long>
</locale>
</schema>
-
<schema>
<key>/schemas/apps/pointer-capture/release_button</key>
<owner>pointer-capture</owner>
<type>int</type>
<default>1</default>
<locale name="C">
- <short>Release button</short>
- <long>Button to release the pointer</long>
+ <short>Release mouse button</short>
+ <long>Mouse button to release the pointer</long>
</locale>
</schema>
-
<schema>
<key>/schemas/apps/pointer-capture/capture_mod_shift</key>
<owner>pointer-capture</owner>
@@ -45,7 +41,6 @@
<long>Capture modifier key (Shift)</long>
</locale>
</schema>
-
<schema>
<key>/schemas/apps/pointer-capture/capture_mod_alt</key>
<owner>pointer-capture</owner>
@@ -56,7 +51,6 @@
<long>Capture modifier key (Alt)</long>
</locale>
</schema>
-
<schema>
<key>/schemas/apps/pointer-capture/capture_mod_ctrl</key>
<owner>pointer-capture</owner>
@@ -67,7 +61,6 @@
<long>Capture modifier key (Ctrl)</long>
</locale>
</schema>
-
<schema>
<key>/schemas/apps/pointer-capture/release_mod_shift</key>
<owner>pointer-capture</owner>
@@ -78,7 +71,6 @@
<long>Release modifier key (Shift)</long>
</locale>
</schema>
-
<schema>
<key>/schemas/apps/pointer-capture/release_mod_alt</key>
<owner>pointer-capture</owner>
@@ -89,7 +81,6 @@
<long>Release modifier key (Alt)</long>
</locale>
</schema>
-
<schema>
<key>/schemas/apps/pointer-capture/release_mod_ctrl</key>
<owner>pointer-capture</owner>
@@ -100,6 +91,5 @@
<long>Release modifier key (Ctrl)</long>
</locale>
</schema>
-
</schemalist>
</gconfschemafile>
Modified: trunk/src/mt-main.c
==============================================================================
--- trunk/src/mt-main.c (original)
+++ trunk/src/mt-main.c Tue Mar 25 08:26:08 2008
@@ -420,7 +420,7 @@
{"ctw-y", 'y', 0, G_OPTION_ARG_INT, &pos_y,
_("Window y position"), 0},
{"shutdown", 's', 0, G_OPTION_ARG_NONE, &shutdown,
- _("Shutdown mousetweaks"), 0},
+ _("Shut down mousetweaks"), 0},
{NULL}
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
