diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2013-09-16 09:04:15 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-09-19 13:56:58 +0200 |
commit | 23f020f742aea622e5dd7aef81eb59c99f8ef000 (patch) | |
tree | e880b7a44254f792dccbe393e74e767620e8ea06 /meta-xfce | |
parent | e839d7b6716609407931a258aed2f91baf6bf79b (diff) | |
download | meta-openembedded-23f020f742aea622e5dd7aef81eb59c99f8ef000.tar.gz |
xfce4-settings: move to schnitzeltony's git repo to get new datetime setter
I implemented a datetime setting dialog based on gnome-control-center and
submitted a pull-request in [1,2]. As long as it is not submitted - or as long
as I find no way to patch binary files (e.g. icons - I asked for that in [3] -
no response yet) we use the git repo and a copied branch of the pull-request
(just in case some feedback from xfce-devels requires modifcations).
Some patches had to be modified/removed to apply against mainline HEAD still.
Furthermore in 0002-mouse-settings-dialog-add-touchscreen-pointer-option.patch
label 'alignment8' was introduced mainline and we do not need mouse-dialog_ui.h
when building from git in maintainer-mode - this file is created during build
process.
[1] http://mail.xfce.org/pipermail/xfce4-dev/2013-September/030442.html
[2] https://bugzilla.xfce.org/show_bug.cgi?id=10354
[3] http://lists.openembedded.org/pipermail/openembedded-core/2013-September/083804.html
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-xfce')
-rw-r--r-- | meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0003-Remember-the-settings-manager-window-size-bug-9384.patch | 155 | ||||
-rw-r--r-- | meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0001-add-cursor-theme-xfce-invisible.patch | 8 | ||||
-rw-r--r-- | meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0002-mouse-settings-dialog-add-touchscreen-pointer-option.patch | 1083 | ||||
-rw-r--r-- | meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0005-pointers-detect-a-change-of-pointer-device-used-and-.patch | 10 | ||||
-rw-r--r-- | meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb (renamed from meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.11.0.bb) | 23 |
5 files changed, 29 insertions, 1250 deletions
diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0003-Remember-the-settings-manager-window-size-bug-9384.patch b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0003-Remember-the-settings-manager-window-size-bug-9384.patch deleted file mode 100644 index 8c1d1d9aa..000000000 --- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0003-Remember-the-settings-manager-window-size-bug-9384.patch +++ /dev/null | |||
@@ -1,155 +0,0 @@ | |||
1 | From b3b1986327b9b42ac6f9442443ff103f6565a323 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Guelfucci?= <jeromeg@xfce.org> | ||
3 | Date: Wed, 19 Dec 2012 09:53:58 +0100 | ||
4 | Subject: [PATCH] Remember the settings manager window size (bug #9384). | ||
5 | |||
6 | Handy with pluggable dialogs, allows the user to get rid of most of the | ||
7 | scrollbars. | ||
8 | |||
9 | Upstream-Status: applied | ||
10 | --- | ||
11 | xfce4-settings-manager/Makefile.am | 2 + | ||
12 | xfce4-settings-manager/main.c | 13 +++++++ | ||
13 | .../xfce-settings-manager-dialog.c | 38 +++++++++++++++----- | ||
14 | 3 files changed, 44 insertions(+), 9 deletions(-) | ||
15 | |||
16 | diff --git a/xfce4-settings-manager/Makefile.am b/xfce4-settings-manager/Makefile.am | ||
17 | index c6bdc2d..99f9b3f 100644 | ||
18 | --- a/xfce4-settings-manager/Makefile.am | ||
19 | +++ b/xfce4-settings-manager/Makefile.am | ||
20 | @@ -20,6 +20,7 @@ xfce4_settings_manager_CFLAGS = \ | ||
21 | $(LIBXFCE4UTIL_CFLAGS) \ | ||
22 | $(LIBXFCE4UI_CFLAGS) \ | ||
23 | $(GARCON_CFLAGS) \ | ||
24 | + $(XFCONF_CFLAGS) \ | ||
25 | $(EXO_CFLAGS) \ | ||
26 | $(PLATFORM_CFLAGS) | ||
27 | |||
28 | @@ -31,6 +32,7 @@ xfce4_settings_manager_LDADD = \ | ||
29 | $(GTK_LIBS) \ | ||
30 | $(LIBXFCE4UTIL_LIBS) \ | ||
31 | $(LIBXFCE4UI_LIBS) \ | ||
32 | + $(XFCONF_LIBS) \ | ||
33 | $(EXO_LIBS) \ | ||
34 | $(GARCON_LIBS) | ||
35 | |||
36 | diff --git a/xfce4-settings-manager/main.c b/xfce4-settings-manager/main.c | ||
37 | index 3a65879..42bec66 100644 | ||
38 | --- a/xfce4-settings-manager/main.c | ||
39 | +++ b/xfce4-settings-manager/main.c | ||
40 | @@ -28,6 +28,7 @@ | ||
41 | #include <gtk/gtk.h> | ||
42 | #include <libxfce4util/libxfce4util.h> | ||
43 | #include <garcon/garcon.h> | ||
44 | +#include <xfconf/xfconf.h> | ||
45 | |||
46 | #include "xfce-settings-manager-dialog.h" | ||
47 | |||
48 | @@ -79,6 +80,16 @@ main(int argc, | ||
49 | return EXIT_SUCCESS; | ||
50 | } | ||
51 | |||
52 | + /* initialize xfconf */ | ||
53 | + if (G_UNLIKELY (!xfconf_init (&error))) | ||
54 | + { | ||
55 | + /* print error and leave */ | ||
56 | + g_critical ("Failed to connect to Xfconf daemon: %s", error->message); | ||
57 | + g_error_free (error); | ||
58 | + | ||
59 | + return EXIT_FAILURE; | ||
60 | + } | ||
61 | + | ||
62 | garcon_set_environment ("XFCE"); | ||
63 | |||
64 | dialog = xfce_settings_manager_dialog_new (); | ||
65 | @@ -95,5 +106,7 @@ main(int argc, | ||
66 | |||
67 | gtk_main(); | ||
68 | |||
69 | + xfconf_shutdown (); | ||
70 | + | ||
71 | return EXIT_SUCCESS; | ||
72 | } | ||
73 | diff --git a/xfce4-settings-manager/xfce-settings-manager-dialog.c b/xfce4-settings-manager/xfce-settings-manager-dialog.c | ||
74 | index 043b143..39e33ff 100644 | ||
75 | --- a/xfce4-settings-manager/xfce-settings-manager-dialog.c | ||
76 | +++ b/xfce4-settings-manager/xfce-settings-manager-dialog.c | ||
77 | @@ -35,6 +35,7 @@ | ||
78 | |||
79 | #include <libxfce4util/libxfce4util.h> | ||
80 | #include <libxfce4ui/libxfce4ui.h> | ||
81 | +#include <xfconf/xfconf.h> | ||
82 | #include <garcon/garcon.h> | ||
83 | #include <exo/exo.h> | ||
84 | |||
85 | @@ -55,6 +56,7 @@ struct _XfceSettingsManagerDialog | ||
86 | { | ||
87 | XfceTitledDialog __parent__; | ||
88 | |||
89 | + XfconfChannel *channel; | ||
90 | GarconMenu *menu; | ||
91 | |||
92 | GtkListStore *store; | ||
93 | @@ -156,17 +158,19 @@ xfce_settings_manager_dialog_class_init (XfceSettingsManagerDialogClass *klass) | ||
94 | static void | ||
95 | xfce_settings_manager_dialog_init (XfceSettingsManagerDialog *dialog) | ||
96 | { | ||
97 | - GtkWidget *scroll; | ||
98 | + GtkWidget *align; | ||
99 | + GtkWidget *bbox; | ||
100 | GtkWidget *dialog_vbox; | ||
101 | - GtkWidget *viewport; | ||
102 | - gchar *path; | ||
103 | - GtkWidget *hbox; | ||
104 | + GtkWidget *ebox; | ||
105 | GtkWidget *entry; | ||
106 | - GtkWidget *align; | ||
107 | - GList *children; | ||
108 | + GtkWidget *hbox; | ||
109 | GtkWidget *header; | ||
110 | - GtkWidget *ebox; | ||
111 | - GtkWidget *bbox; | ||
112 | + GtkWidget *scroll; | ||
113 | + GtkWidget *viewport; | ||
114 | + GList *children; | ||
115 | + gchar *path; | ||
116 | + | ||
117 | + dialog->channel = xfconf_channel_get ("xfce4-settings-manager"); | ||
118 | |||
119 | dialog->store = gtk_list_store_new (N_COLUMNS, | ||
120 | G_TYPE_STRING, | ||
121 | @@ -180,7 +184,9 @@ xfce_settings_manager_dialog_init (XfceSettingsManagerDialog *dialog) | ||
122 | dialog->menu = garcon_menu_new_for_path (path != NULL ? path : MENUFILE); | ||
123 | g_free (path); | ||
124 | |||
125 | - gtk_window_set_default_size (GTK_WINDOW (dialog), 640, 500); | ||
126 | + gtk_window_set_default_size (GTK_WINDOW (dialog), | ||
127 | + xfconf_channel_get_int (dialog->channel, "/last/window-width", 640), | ||
128 | + xfconf_channel_get_int (dialog->channel, "/last/window-height", 500)); | ||
129 | xfce_settings_manager_dialog_set_title (dialog, NULL, NULL, NULL); | ||
130 | |||
131 | dialog->button_back = xfce_gtk_button_new_mixed (GTK_STOCK_GO_BACK, _("All _Settings")); | ||
132 | @@ -334,6 +340,20 @@ xfce_settings_manager_dialog_response (GtkDialog *widget, | ||
133 | } | ||
134 | else | ||
135 | { | ||
136 | + GdkWindowState state; | ||
137 | + gint width, height; | ||
138 | + | ||
139 | + /* Don't save the state for full-screen windows */ | ||
140 | + state = gdk_window_get_state (GTK_WIDGET (widget)->window); | ||
141 | + | ||
142 | + if ((state & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)) == 0) | ||
143 | + { | ||
144 | + /* Save window size */ | ||
145 | + gtk_window_get_size (GTK_WINDOW (widget), &width, &height); | ||
146 | + xfconf_channel_set_int (dialog->channel, "/last/window-width", width), | ||
147 | + xfconf_channel_set_int (dialog->channel, "/last/window-height", height); | ||
148 | + } | ||
149 | + | ||
150 | gtk_widget_destroy (GTK_WIDGET (widget)); | ||
151 | gtk_main_quit (); | ||
152 | } | ||
153 | -- | ||
154 | 1.7.4.4 | ||
155 | |||
diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0001-add-cursor-theme-xfce-invisible.patch b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0001-add-cursor-theme-xfce-invisible.patch index 9272081f0..4d8e01d59 100644 --- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0001-add-cursor-theme-xfce-invisible.patch +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0001-add-cursor-theme-xfce-invisible.patch | |||
@@ -11,7 +11,7 @@ Upstream-Status: Submitted [1] | |||
11 | [1] https://bugzilla.xfce.org/show_bug.cgi?id=9474 | 11 | [1] https://bugzilla.xfce.org/show_bug.cgi?id=9474 |
12 | --- | 12 | --- |
13 | Makefile.am | 1 + | 13 | Makefile.am | 1 + |
14 | configure.ac | 2 + | 14 | configure.ac.in | 2 + |
15 | cursors/Makefile.am | 178 +++++++++++++++++++++++++++++++++++++++++++++++++++ | 15 | cursors/Makefile.am | 178 +++++++++++++++++++++++++++++++++++++++++++++++++++ |
16 | cursors/index.theme | 3 + | 16 | cursors/index.theme | 3 + |
17 | 6 files changed, 184 insertions(+), 0 deletions(-) | 17 | 6 files changed, 184 insertions(+), 0 deletions(-) |
@@ -30,10 +30,10 @@ index 3060bac..3f0dd1d 100644 | |||
30 | dialogs \ | 30 | dialogs \ |
31 | xfce4-settings-manager \ | 31 | xfce4-settings-manager \ |
32 | xfce4-settings-editor \ | 32 | xfce4-settings-editor \ |
33 | diff --git a/configure.ac b/configure.ac | 33 | diff --git a/configure.ac.in b/configure.ac.in |
34 | index 0e7907d..1378049 100644 | 34 | index 0e7907d..1378049 100644 |
35 | --- a/configure.ac | 35 | --- a/configure.ac.in |
36 | +++ b/configure.ac | 36 | +++ b/configure.ac.in |
37 | @@ -157,6 +157,7 @@ dnl *** Optional support for Xcursor *** | 37 | @@ -157,6 +157,7 @@ dnl *** Optional support for Xcursor *** |
38 | dnl ************************************ | 38 | dnl ************************************ |
39 | XDT_CHECK_OPTIONAL_PACKAGE([XCURSOR], [xcursor], [1.1.0], | 39 | XDT_CHECK_OPTIONAL_PACKAGE([XCURSOR], [xcursor], [1.1.0], |
diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0002-mouse-settings-dialog-add-touchscreen-pointer-option.patch b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0002-mouse-settings-dialog-add-touchscreen-pointer-option.patch index d5a1f2c95..cf58f73d8 100644 --- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0002-mouse-settings-dialog-add-touchscreen-pointer-option.patch +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0002-mouse-settings-dialog-add-touchscreen-pointer-option.patch | |||
@@ -13,7 +13,6 @@ Upstream-Status: Submitted [1] | |||
13 | --- | 13 | --- |
14 | dialogs/mouse-settings/main.c | 56 +++++++++++++++++++++++++++++ | 14 | dialogs/mouse-settings/main.c | 56 +++++++++++++++++++++++++++++ |
15 | dialogs/mouse-settings/mouse-dialog.glade | 28 ++++++++++++++- | 15 | dialogs/mouse-settings/mouse-dialog.glade | 28 ++++++++++++++- |
16 | dialogs/mouse-settings/mouse-dialog_ui.h | 1056 +++++++++++++++--------------- | ||
17 | 3 files changed, 422 insertions(+), 329 deletions(-) | 16 | 3 files changed, 422 insertions(+), 329 deletions(-) |
18 | 17 | ||
19 | diff --git a/dialogs/mouse-settings/main.c b/dialogs/mouse-settings/main.c | 18 | diff --git a/dialogs/mouse-settings/main.c b/dialogs/mouse-settings/main.c |
@@ -120,7 +119,7 @@ index d3aab0d..573c551 100644 | |||
120 | </packing> | 119 | </packing> |
121 | </child> | 120 | </child> |
122 | + <child> | 121 | + <child> |
123 | + <object class="GtkAlignment" id="alignment8"> | 122 | + <object class="GtkAlignment" id="alignment9"> |
124 | + <property name="visible">True</property> | 123 | + <property name="visible">True</property> |
125 | + <property name="can_focus">False</property> | 124 | + <property name="can_focus">False</property> |
126 | + <property name="xalign">0</property> | 125 | + <property name="xalign">0</property> |
@@ -148,1086 +147,6 @@ index d3aab0d..573c551 100644 | |||
148 | </object> | 147 | </object> |
149 | </child> | 148 | </child> |
150 | </object> | 149 | </object> |
151 | diff --git a/dialogs/mouse-settings/mouse-dialog_ui.h b/dialogs/mouse-settings/mouse-dialog_ui.h | ||
152 | index 59806a2..8a68c3b 100644 | ||
153 | --- a/dialogs/mouse-settings/mouse-dialog_ui.h | ||
154 | +++ b/dialogs/mouse-settings/mouse-dialog_ui.h | ||
155 | @@ -31,540 +31,555 @@ static const char mouse_dialog_ui[] = | ||
156 | "</property></object><object class=\"GtkImage\" id=\"image5\"><property " | ||
157 | "name=\"visible\">True</property><property name=\"can_focus\">False</pro" | ||
158 | "perty><property name=\"stock\">gtk-revert-to-saved</property></object><" | ||
159 | - "object class=\"XfceTitledDialog\" id=\"mouse-dialog\"><property name=\"" | ||
160 | - "can_focus\">False</property><property name=\"title\" translatable=\"yes" | ||
161 | - "\">Mouse and Touchpad</property><property name=\"window_position\">cent" | ||
162 | - "er-on-parent</property><property name=\"icon_name\">preferences-desktop" | ||
163 | - "-peripherals</property><property name=\"type_hint\">dialog</property><p" | ||
164 | - "roperty name=\"subtitle\" translatable=\"yes\">Configure pointer device" | ||
165 | - " behavior and appearance</property><child internal-child=\"vbox\"><obje" | ||
166 | - "ct class=\"GtkVBox\" id=\"dialog-vbox1\"><property name=\"visible\">Tru" | ||
167 | - "e</property><property name=\"can_focus\">False</property><property name" | ||
168 | - "=\"spacing\">2</property><child internal-child=\"action_area\"><object " | ||
169 | - "class=\"GtkHButtonBox\" id=\"dialog-action_area1\"><property name=\"vis" | ||
170 | - "ible\">True</property><property name=\"can_focus\">False</property><pro" | ||
171 | - "perty name=\"layout_style\">end</property><child><object class=\"GtkBut" | ||
172 | - "ton\" id=\"button1\"><property name=\"label\">gtk-close</property><prop" | ||
173 | - "erty name=\"visible\">True</property><property name=\"can_focus\">True<" | ||
174 | - "/property><property name=\"receives_default\">True</property><property " | ||
175 | - "name=\"use_action_appearance\">False</property><property name=\"use_sto" | ||
176 | - "ck\">True</property></object><packing><property name=\"expand\">False</" | ||
177 | - "property><property name=\"fill\">False</property><property name=\"posit" | ||
178 | - "ion\">0</property></packing></child><child><object class=\"GtkButton\" " | ||
179 | - "id=\"button2\"><property name=\"label\">gtk-help</property><property na" | ||
180 | - "me=\"use_action_appearance\">False</property><property name=\"visible\"" | ||
181 | - ">True</property><property name=\"can_focus\">True</property><property n" | ||
182 | - "ame=\"receives_default\">True</property><property name=\"use_stock\">Tr" | ||
183 | - "ue</property></object><packing><property name=\"expand\">False</propert" | ||
184 | - "y><property name=\"fill\">False</property><property name=\"position\">0" | ||
185 | - "</property><property name=\"secondary\">True</property></packing></chil" | ||
186 | - "d></object><packing><property name=\"expand\">False</property><property" | ||
187 | - " name=\"fill\">True</property><property name=\"pack_type\">end</propert" | ||
188 | - "y><property name=\"position\">0</property></packing></child><child><obj" | ||
189 | - "ect class=\"GtkNotebook\" id=\"plug-child\"><property name=\"visible\">" | ||
190 | - "True</property><property name=\"can_focus\">True</property><property na" | ||
191 | - "me=\"border_width\">6</property><child><object class=\"GtkVBox\" id=\"v" | ||
192 | - "box1\"><property name=\"visible\">True</property><property name=\"can_f" | ||
193 | - "ocus\">False</property><property name=\"border_width\">12</property><pr" | ||
194 | - "operty name=\"spacing\">6</property><child><object class=\"GtkHBox\" id" | ||
195 | - "=\"hbox1\"><property name=\"visible\">True</property><property name=\"c" | ||
196 | - "an_focus\">False</property><property name=\"spacing\">12</property><chi" | ||
197 | - "ld><object class=\"GtkLabel\" id=\"label7\"><property name=\"visible\">" | ||
198 | - "True</property><property name=\"can_focus\">False</property><property n" | ||
199 | - "ame=\"label\" translatable=\"yes\">De_vice:</property><property name=\"" | ||
200 | - "use_underline\">True</property><property name=\"mnemonic_widget\">devic" | ||
201 | - "e-combobox</property><property name=\"angle\">0.050000000000000003</pro" | ||
202 | - "perty></object><packing><property name=\"expand\">False</property><prop" | ||
203 | - "erty name=\"fill\">True</property><property name=\"position\">0</proper" | ||
204 | - "ty></packing></child><child><object class=\"GtkComboBox\" id=\"device-c" | ||
205 | - "ombobox\"><property name=\"visible\">True</property><property name=\"ca" | ||
206 | - "n_focus\">False</property></object><packing><property name=\"expand\">T" | ||
207 | - "rue</property><property name=\"fill\">True</property><property name=\"p" | ||
208 | - "osition\">1</property></packing></child></object><packing><property nam" | ||
209 | - "e=\"expand\">False</property><property name=\"fill\">True</property><pr" | ||
210 | - "operty name=\"position\">0</property></packing></child><child><object c" | ||
211 | - "lass=\"GtkCheckButton\" id=\"device-enabled\"><property name=\"label\" " | ||
212 | - "translatable=\"yes\">_Enable this device</property><property name=\"vis" | ||
213 | - "ible\">True</property><property name=\"can_focus\">True</property><prop" | ||
214 | - "erty name=\"receives_default\">False</property><property name=\"use_act" | ||
215 | - "ion_appearance\">False</property><property name=\"use_underline\">True<" | ||
216 | - "/property><property name=\"draw_indicator\">True</property></object><pa" | ||
217 | - "cking><property name=\"expand\">False</property><property name=\"fill\"" | ||
218 | - ">True</property><property name=\"position\">1</property></packing></chi" | ||
219 | - "ld><child><object class=\"GtkNotebook\" id=\"device-notebook\"><propert" | ||
220 | - "y name=\"visible\">True</property><property name=\"can_focus\">True</pr" | ||
221 | - "operty><child><object class=\"GtkVBox\" id=\"device-box\"><property nam" | ||
222 | - "e=\"visible\">True</property><property name=\"can_focus\">False</proper" | ||
223 | - "ty><property name=\"border_width\">6</property><property name=\"spacing" | ||
224 | - "\">6</property><child><object class=\"GtkFrame\" id=\"frame1\"><propert" | ||
225 | - "y name=\"visible\">True</property><property name=\"can_focus\">False</p" | ||
226 | - "roperty><property name=\"label_xalign\">0</property><property name=\"sh" | ||
227 | - "adow_type\">none</property><child><object class=\"GtkAlignment\" id=\"a" | ||
228 | - "lignment1\"><property name=\"visible\">True</property><property name=\"" | ||
229 | - "can_focus\">False</property><property name=\"left_padding\">12</propert" | ||
230 | - "y><child><object class=\"GtkVBox\" id=\"vbox12\"><property name=\"visib" | ||
231 | - "le\">True</property><property name=\"can_focus\">False</property><prope" | ||
232 | - "rty name=\"border_width\">6</property><property name=\"spacing\">6</pro" | ||
233 | - "perty><child><object class=\"GtkHBox\" id=\"hbox3\"><property name=\"vi" | ||
234 | - "sible\">True</property><property name=\"can_focus\">False</property><pr" | ||
235 | - "operty name=\"spacing\">12</property><child><object class=\"GtkRadioBut" | ||
236 | - "ton\" id=\"device-right-handed\"><property name=\"label\" translatable=" | ||
237 | - "\"yes\">_Right-handed</property><property name=\"visible\">True</proper" | ||
238 | - "ty><property name=\"can_focus\">True</property><property name=\"receive" | ||
239 | - "s_default\">False</property><property name=\"use_action_appearance\">Fa" | ||
240 | - "lse</property><property name=\"use_underline\">True</property><property" | ||
241 | - " name=\"active\">True</property><property name=\"draw_indicator\">True<" | ||
242 | - "/property></object><packing><property name=\"expand\">False</property><" | ||
243 | - "property name=\"fill\">True</property><property name=\"position\">0</pr" | ||
244 | - "operty></packing></child><child><object class=\"GtkRadioButton\" id=\"d" | ||
245 | - "evice-left-handed\"><property name=\"label\" translatable=\"yes\">_Left" | ||
246 | - "-handed</property><property name=\"visible\">True</property><property n" | ||
247 | - "ame=\"can_focus\">True</property><property name=\"receives_default\">Fa" | ||
248 | - "lse</property><property name=\"use_action_appearance\">False</property>" | ||
249 | - "<property name=\"use_underline\">True</property><property name=\"draw_i" | ||
250 | - "ndicator\">True</property><property name=\"group\">device-right-handed<" | ||
251 | - "/property></object><packing><property name=\"expand\">False</property><" | ||
252 | - "property name=\"fill\">True</property><property name=\"position\">1</pr" | ||
253 | - "operty></packing></child></object><packing><property name=\"expand\">Tr" | ||
254 | - "ue</property><property name=\"fill\">True</property><property name=\"po" | ||
255 | - "sition\">0</property></packing></child><child><object class=\"GtkCheckB" | ||
256 | - "utton\" id=\"device-reverse-scrolling\"><property name=\"label\" transl" | ||
257 | - "atable=\"yes\">Reverse scroll d_irection</property><property name=\"vis" | ||
258 | - "ible\">True</property><property name=\"can_focus\">True</property><prop" | ||
259 | - "erty name=\"receives_default\">False</property><property name=\"tooltip" | ||
260 | - "_text\" translatable=\"yes\">When selected, the scroll wheel will work " | ||
261 | - "in the opposite direction</property><property name=\"use_action_appeara" | ||
262 | - "nce\">False</property><property name=\"use_underline\">True</property><" | ||
263 | - "property name=\"draw_indicator\">True</property></object><packing><prop" | ||
264 | - "erty name=\"expand\">True</property><property name=\"fill\">True</prope" | ||
265 | - "rty><property name=\"position\">1</property></packing></child></object>" | ||
266 | - "</child></object></child><child type=\"label\"><object class=\"GtkLabel" | ||
267 | - "\" id=\"label14\"><property name=\"visible\">True</property><property n" | ||
268 | - "ame=\"can_focus\">False</property><property name=\"label\" translatable" | ||
269 | - "=\"yes\">Buttons</property><attributes><attribute name=\"weight\" value" | ||
270 | - "=\"bold\"/></attributes></object></child></object><packing><property na" | ||
271 | - "me=\"expand\">False</property><property name=\"fill\">True</property><p" | ||
272 | - "roperty name=\"position\">0</property></packing></child><child><object " | ||
273 | - "class=\"GtkFrame\" id=\"frame2\"><property name=\"visible\">True</prope" | ||
274 | - "rty><property name=\"can_focus\">False</property><property name=\"label" | ||
275 | - "_xalign\">0</property><property name=\"shadow_type\">none</property><ch" | ||
276 | - "ild><object class=\"GtkAlignment\" id=\"alignment2\"><property name=\"v" | ||
277 | + "object class=\"GtkListStore\" id=\"synaptics-scroll-store\"><columns><c" | ||
278 | + "olumn type=\"gchararray\"/><column type=\"gboolean\"/></columns><data><" | ||
279 | + "row><col id=\"0\" translatable=\"yes\">Disabled</col><col id=\"1\">True" | ||
280 | + "</col></row><row><col id=\"0\" translatable=\"yes\">Edge scrolling</col" | ||
281 | + "><col id=\"1\">True</col></row><row><col id=\"0\" translatable=\"yes\">" | ||
282 | + "Two-finger scrolling</col><col id=\"1\">True</col></row><row><col id=\"" | ||
283 | + "0\" translatable=\"yes\">Circular scrolling</col><col id=\"1\">True</co" | ||
284 | + "l></row></data></object><object class=\"GtkAdjustment\" id=\"theme-curs" | ||
285 | + "or-size\"><property name=\"lower\">16</property><property name=\"upper\"" | ||
286 | + ">48</property><property name=\"value\">24</property><property name=\"st" | ||
287 | + "ep_increment\">1</property><property name=\"page_increment\">11</proper" | ||
288 | + "ty></object><object class=\"XfceTitledDialog\" id=\"mouse-dialog\"><pro" | ||
289 | + "perty name=\"can_focus\">False</property><property name=\"title\" trans" | ||
290 | + "latable=\"yes\">Mouse and Touchpad</property><property name=\"window_po" | ||
291 | + "sition\">center-on-parent</property><property name=\"icon_name\">prefer" | ||
292 | + "ences-desktop-peripherals</property><property name=\"type_hint\">dialog" | ||
293 | + "</property><property name=\"subtitle\" translatable=\"yes\">Configure p" | ||
294 | + "ointer device behavior and appearance</property><child internal-child=\"" | ||
295 | + "vbox\"><object class=\"GtkVBox\" id=\"dialog-vbox1\"><property name=\"v" | ||
296 | "isible\">True</property><property name=\"can_focus\">False</property><p" | ||
297 | - "roperty name=\"left_padding\">12</property><child><object class=\"GtkTa" | ||
298 | - "ble\" id=\"table1\"><property name=\"visible\">True</property><property" | ||
299 | - " name=\"can_focus\">False</property><property name=\"border_width\">6</" | ||
300 | - "property><property name=\"n_rows\">3</property><property name=\"n_colum" | ||
301 | - "ns\">2</property><property name=\"column_spacing\">12</property><proper" | ||
302 | - "ty name=\"row_spacing\">6</property><child><object class=\"GtkLabel\" i" | ||
303 | - "d=\"device-acceleration-label\"><property name=\"visible\">True</proper" | ||
304 | - "ty><property name=\"can_focus\">False</property><property name=\"xalign" | ||
305 | - "\">0</property><property name=\"label\" translatable=\"yes\">_Accelerat" | ||
306 | - "ion:</property><property name=\"use_underline\">True</property><propert" | ||
307 | - "y name=\"mnemonic_widget\">device-acceleration-scale</property></object" | ||
308 | - "><packing><property name=\"x_options\">GTK_FILL</property><property nam" | ||
309 | - "e=\"y_options\">GTK_FILL</property></packing></child><child><object cla" | ||
310 | - "ss=\"GtkHScale\" id=\"device-acceleration-scale\"><property name=\"visi" | ||
311 | - "ble\">True</property><property name=\"can_focus\">True</property><prope" | ||
312 | - "rty name=\"tooltip_text\" translatable=\"yes\">The factor at which the " | ||
313 | - "pointer\'s speed will increase as the mouse is moved</property><propert" | ||
314 | - "y name=\"update_policy\">delayed</property><property name=\"adjustment\"" | ||
315 | - ">device-acceleration</property><property name=\"round_digits\">1</prope" | ||
316 | - "rty><property name=\"value_pos\">right</property></object><packing><pro" | ||
317 | - "perty name=\"left_attach\">1</property><property name=\"right_attach\">" | ||
318 | - "2</property></packing></child><child><object class=\"GtkHScale\" id=\"d" | ||
319 | - "evice-threshold-scale\"><property name=\"visible\">True</property><prop" | ||
320 | - "erty name=\"can_focus\">True</property><property name=\"tooltip_text\" " | ||
321 | - "translatable=\"yes\">The number of pixels the pointer must move in a sh" | ||
322 | - "ort time before it starts accelerating</property><property name=\"updat" | ||
323 | - "e_policy\">delayed</property><property name=\"adjustment\">device-thres" | ||
324 | - "hold</property><property name=\"round_digits\">0</property><property na" | ||
325 | - "me=\"digits\">0</property><property name=\"value_pos\">right</property>" | ||
326 | - "</object><packing><property name=\"left_attach\">1</property><property " | ||
327 | - "name=\"right_attach\">2</property><property name=\"top_attach\">1</prop" | ||
328 | - "erty><property name=\"bottom_attach\">2</property></packing></child><ch" | ||
329 | - "ild><object class=\"GtkLabel\" id=\"device-threshold-label\"><property " | ||
330 | + "roperty name=\"spacing\">2</property><child internal-child=\"action_are" | ||
331 | + "a\"><object class=\"GtkHButtonBox\" id=\"dialog-action_area1\"><propert" | ||
332 | + "y name=\"visible\">True</property><property name=\"can_focus\">False</p" | ||
333 | + "roperty><property name=\"layout_style\">end</property><child><object cl" | ||
334 | + "ass=\"GtkButton\" id=\"button2\"><property name=\"label\">gtk-help</pro" | ||
335 | + "perty><property name=\"use_action_appearance\">False</property><propert" | ||
336 | + "y name=\"visible\">True</property><property name=\"can_focus\">True</pr" | ||
337 | + "operty><property name=\"receives_default\">True</property><property nam" | ||
338 | + "e=\"use_stock\">True</property></object><packing><property name=\"expan" | ||
339 | + "d\">False</property><property name=\"fill\">False</property><property n" | ||
340 | + "ame=\"position\">0</property><property name=\"secondary\">True</propert" | ||
341 | + "y></packing></child><child><object class=\"GtkButton\" id=\"button1\"><" | ||
342 | + "property name=\"label\">gtk-close</property><property name=\"use_action" | ||
343 | + "_appearance\">False</property><property name=\"visible\">True</property" | ||
344 | + "><property name=\"can_focus\">True</property><property name=\"receives_" | ||
345 | + "default\">True</property><property name=\"use_stock\">True</property></" | ||
346 | + "object><packing><property name=\"expand\">False</property><property nam" | ||
347 | + "e=\"fill\">False</property><property name=\"position\">0</property></pa" | ||
348 | + "cking></child></object><packing><property name=\"expand\">False</proper" | ||
349 | + "ty><property name=\"fill\">True</property><property name=\"pack_type\">" | ||
350 | + "end</property><property name=\"position\">0</property></packing></child" | ||
351 | + "><child><object class=\"GtkNotebook\" id=\"plug-child\"><property name=" | ||
352 | + "\"visible\">True</property><property name=\"can_focus\">True</property>" | ||
353 | + "<property name=\"border_width\">6</property><child><object class=\"GtkV" | ||
354 | + "Box\" id=\"vbox1\"><property name=\"visible\">True</property><property " | ||
355 | + "name=\"can_focus\">False</property><property name=\"border_width\">12</" | ||
356 | + "property><property name=\"spacing\">6</property><child><object class=\"" | ||
357 | + "GtkHBox\" id=\"hbox1\"><property name=\"visible\">True</property><prope" | ||
358 | + "rty name=\"can_focus\">False</property><property name=\"spacing\">12</p" | ||
359 | + "roperty><child><object class=\"GtkLabel\" id=\"label7\"><property name=" | ||
360 | + "\"visible\">True</property><property name=\"can_focus\">False</property" | ||
361 | + "><property name=\"label\" translatable=\"yes\">De_vice:</property><prop" | ||
362 | + "erty name=\"use_underline\">True</property><property name=\"mnemonic_wi" | ||
363 | + "dget\">device-combobox</property><property name=\"angle\">0.05000000000" | ||
364 | + "0000003</property></object><packing><property name=\"expand\">False</pr" | ||
365 | + "operty><property name=\"fill\">True</property><property name=\"position" | ||
366 | + "\">0</property></packing></child><child><object class=\"GtkComboBox\" i" | ||
367 | + "d=\"device-combobox\"><property name=\"visible\">True</property><proper" | ||
368 | + "ty name=\"can_focus\">False</property></object><packing><property name=" | ||
369 | + "\"expand\">True</property><property name=\"fill\">True</property><prope" | ||
370 | + "rty name=\"position\">1</property></packing></child></object><packing><" | ||
371 | + "property name=\"expand\">False</property><property name=\"fill\">True</" | ||
372 | + "property><property name=\"position\">0</property></packing></child><chi" | ||
373 | + "ld><object class=\"GtkCheckButton\" id=\"device-enabled\"><property nam" | ||
374 | + "e=\"label\" translatable=\"yes\">_Enable this device</property><propert" | ||
375 | + "y name=\"use_action_appearance\">False</property><property name=\"visib" | ||
376 | + "le\">True</property><property name=\"can_focus\">True</property><proper" | ||
377 | + "ty name=\"receives_default\">False</property><property name=\"use_under" | ||
378 | + "line\">True</property><property name=\"draw_indicator\">True</property>" | ||
379 | + "</object><packing><property name=\"expand\">False</property><property n" | ||
380 | + "ame=\"fill\">True</property><property name=\"position\">1</property></p" | ||
381 | + "acking></child><child><object class=\"GtkNotebook\" id=\"device-noteboo" | ||
382 | + "k\"><property name=\"visible\">True</property><property name=\"can_focu" | ||
383 | + "s\">True</property><child><object class=\"GtkVBox\" id=\"device-box\"><" | ||
384 | + "property name=\"visible\">True</property><property name=\"can_focus\">F" | ||
385 | + "alse</property><property name=\"border_width\">6</property><property na" | ||
386 | + "me=\"spacing\">6</property><child><object class=\"GtkFrame\" id=\"frame" | ||
387 | + "1\"><property name=\"visible\">True</property><property name=\"can_focu" | ||
388 | + "s\">False</property><property name=\"label_xalign\">0</property><proper" | ||
389 | + "ty name=\"shadow_type\">none</property><child><object class=\"GtkAlignm" | ||
390 | + "ent\" id=\"alignment1\"><property name=\"visible\">True</property><prop" | ||
391 | + "erty name=\"can_focus\">False</property><property name=\"left_padding\"" | ||
392 | + ">12</property><child><object class=\"GtkVBox\" id=\"vbox12\"><property " | ||
393 | "name=\"visible\">True</property><property name=\"can_focus\">False</pro" | ||
394 | - "perty><property name=\"xalign\">0</property><property name=\"label\" tr" | ||
395 | - "anslatable=\"yes\">_Sensitivity:</property><property name=\"use_underli" | ||
396 | - "ne\">True</property><property name=\"mnemonic_widget\">device-threshold" | ||
397 | - "-scale</property></object><packing><property name=\"top_attach\">1</pro" | ||
398 | - "perty><property name=\"bottom_attach\">2</property><property name=\"x_o" | ||
399 | - "ptions\">GTK_FILL</property></packing></child><child><object class=\"Gt" | ||
400 | - "kAlignment\" id=\"alignment7\"><property name=\"visible\">True</propert" | ||
401 | - "y><property name=\"can_focus\">False</property><property name=\"xalign\"" | ||
402 | - ">0</property><property name=\"xscale\">0</property><property name=\"ysc" | ||
403 | - "ale\">0</property><child><object class=\"GtkButton\" id=\"device-reset-" | ||
404 | - "feedback\"><property name=\"label\" translatable=\"yes\">Reset to De_fa" | ||
405 | - "ults</property><property name=\"visible\">True</property><property name" | ||
406 | - "=\"can_focus\">True</property><property name=\"receives_default\">True<" | ||
407 | - "/property><property name=\"tooltip_text\" translatable=\"yes\">Set the " | ||
408 | - "acceleration and sensitivity for the selected device to the default val" | ||
409 | - "ues</property><property name=\"use_action_appearance\">False</property>" | ||
410 | - "<property name=\"image\">image5</property><property name=\"use_underlin" | ||
411 | - "e\">True</property></object></child></object><packing><property name=\"" | ||
412 | - "right_attach\">2</property><property name=\"top_attach\">2</property><p" | ||
413 | - "roperty name=\"bottom_attach\">3</property></packing></child></object><" | ||
414 | - "/child></object></child><child type=\"label\"><object class=\"GtkLabel\"" | ||
415 | - " id=\"label15\"><property name=\"visible\">True</property><property nam" | ||
416 | - "e=\"can_focus\">False</property><property name=\"label\" translatable=\"" | ||
417 | - "yes\">Pointer Speed</property><attributes><attribute name=\"weight\" va" | ||
418 | - "lue=\"bold\"/></attributes></object></child></object><packing><property" | ||
419 | - " name=\"expand\">False</property><property name=\"fill\">True</property" | ||
420 | - "><property name=\"position\">1</property></packing></child></object></c" | ||
421 | - "hild><child type=\"tab\"><object class=\"GtkLabel\" id=\"label4\"><prop" | ||
422 | - "erty name=\"visible\">True</property><property name=\"can_focus\">False" | ||
423 | - "</property><property name=\"label\" translatable=\"yes\">B_uttons and F" | ||
424 | - "eedback</property><property name=\"use_underline\">True</property></obj" | ||
425 | - "ect><packing><property name=\"tab_fill\">False</property></packing></ch" | ||
426 | - "ild><child><object class=\"GtkVBox\" id=\"synaptics-tab\"><property nam" | ||
427 | - "e=\"visible\">True</property><property name=\"can_focus\">False</proper" | ||
428 | - "ty><property name=\"border_width\">6</property><property name=\"spacing" | ||
429 | - "\">6</property><child><object class=\"GtkFrame\" id=\"frame11\"><proper" | ||
430 | + "perty><property name=\"border_width\">6</property><property name=\"spac" | ||
431 | + "ing\">6</property><child><object class=\"GtkHBox\" id=\"hbox3\"><proper" | ||
432 | "ty name=\"visible\">True</property><property name=\"can_focus\">False</" | ||
433 | - "property><property name=\"label_xalign\">0</property><property name=\"s" | ||
434 | - "hadow_type\">none</property><child><object class=\"GtkAlignment\" id=\"" | ||
435 | - "alignment13\"><property name=\"visible\">True</property><property name=" | ||
436 | - "\"can_focus\">False</property><property name=\"left_padding\">12</prope" | ||
437 | - "rty><child><object class=\"GtkVBox\" id=\"vbox11\"><property name=\"vis" | ||
438 | - "ible\">True</property><property name=\"can_focus\">False</property><pro" | ||
439 | - "perty name=\"border_width\">6</property><property name=\"spacing\">6</p" | ||
440 | - "roperty><child><object class=\"GtkCheckButton\" id=\"synaptics-disable-" | ||
441 | - "while-type\"><property name=\"label\" translatable=\"yes\">Disable to_u" | ||
442 | - "chpad while typing</property><property name=\"visible\">True</property>" | ||
443 | + "property><property name=\"spacing\">12</property><child><object class=\"" | ||
444 | + "GtkRadioButton\" id=\"device-right-handed\"><property name=\"label\" tr" | ||
445 | + "anslatable=\"yes\">Ri_ght-handed</property><property name=\"use_action_" | ||
446 | + "appearance\">False</property><property name=\"visible\">True</property>" | ||
447 | "<property name=\"can_focus\">True</property><property name=\"receives_d" | ||
448 | - "efault\">False</property><property name=\"tooltip_text\" translatable=\"" | ||
449 | - "yes\">When selected, the touchpad will be disabled when the keyboard is" | ||
450 | - " being used</property><property name=\"use_action_appearance\">False</p" | ||
451 | - "roperty><property name=\"use_underline\">True</property><property name=" | ||
452 | - "\"draw_indicator\">True</property></object><packing><property name=\"ex" | ||
453 | - "pand\">True</property><property name=\"fill\">True</property><property " | ||
454 | - "name=\"position\">0</property></packing></child><child><object class=\"" | ||
455 | - "GtkCheckButton\" id=\"synaptics-tap-to-click\"><property name=\"label\"" | ||
456 | - " translatable=\"yes\">T_ap touchpad to click</property><property name=\"" | ||
457 | - "visible\">True</property><property name=\"can_focus\">True</property><p" | ||
458 | - "roperty name=\"receives_default\">False</property><property name=\"use_" | ||
459 | - "action_appearance\">False</property><property name=\"use_underline\">Tr" | ||
460 | - "ue</property><property name=\"draw_indicator\">True</property></object>" | ||
461 | - "<packing><property name=\"expand\">True</property><property name=\"fill" | ||
462 | - "\">True</property><property name=\"position\">1</property></packing></c" | ||
463 | - "hild></object></child></object></child><child type=\"label\"><object cl" | ||
464 | - "ass=\"GtkLabel\" id=\"label16\"><property name=\"visible\">True</proper" | ||
465 | - "ty><property name=\"can_focus\">False</property><property name=\"label\"" | ||
466 | - " translatable=\"yes\">General</property><property name=\"use_markup\">T" | ||
467 | - "rue</property><attributes><attribute name=\"weight\" value=\"bold\"/></" | ||
468 | - "attributes></object></child></object><packing><property name=\"expand\"" | ||
469 | - ">False</property><property name=\"fill\">True</property><property name=" | ||
470 | - "\"position\">0</property></packing></child><child><object class=\"GtkFr" | ||
471 | - "ame\" id=\"frame10\"><property name=\"visible\">True</property><propert" | ||
472 | - "y name=\"can_focus\">False</property><property name=\"label_xalign\">0<" | ||
473 | - "/property><property name=\"shadow_type\">none</property><child><object " | ||
474 | - "class=\"GtkAlignment\" id=\"alignment12\"><property name=\"visible\">Tr" | ||
475 | - "ue</property><property name=\"can_focus\">False</property><property nam" | ||
476 | - "e=\"left_padding\">12</property><child><object class=\"GtkVBox\" id=\"v" | ||
477 | - "box10\"><property name=\"visible\">True</property><property name=\"can_" | ||
478 | - "focus\">False</property><property name=\"border_width\">6</property><pr" | ||
479 | - "operty name=\"spacing\">6</property><child><object class=\"GtkHBox\" id" | ||
480 | - "=\"hbox4\"><property name=\"visible\">True</property><property name=\"c" | ||
481 | - "an_focus\">False</property><property name=\"spacing\">12</property><chi" | ||
482 | - "ld><object class=\"GtkLabel\" id=\"label23\"><property name=\"visible\"" | ||
483 | - ">True</property><property name=\"can_focus\">False</property><property " | ||
484 | - "name=\"xalign\">0</property><property name=\"label\" translatable=\"yes" | ||
485 | - "\">Scro_lling mode:</property><property name=\"use_underline\">True</pr" | ||
486 | - "operty><property name=\"mnemonic_widget\">synaptics-scroll</property></" | ||
487 | - "object><packing><property name=\"expand\">False</property><property nam" | ||
488 | - "e=\"fill\">True</property><property name=\"position\">0</property></pac" | ||
489 | - "king></child><child><object class=\"GtkComboBox\" id=\"synaptics-scroll" | ||
490 | - "\"><property name=\"visible\">True</property><property name=\"can_focus" | ||
491 | - "\">False</property><property name=\"model\">synaptics-scroll-store</pro" | ||
492 | - "perty><child><object class=\"GtkCellRendererText\" id=\"cellrenderertex" | ||
493 | - "t3\"/><attributes><attribute name=\"text\">0</attribute><attribute name" | ||
494 | - "=\"sensitive\">1</attribute></attributes></child></object><packing><pro" | ||
495 | - "perty name=\"expand\">True</property><property name=\"fill\">True</prop" | ||
496 | - "erty><property name=\"position\">1</property></packing></child></object" | ||
497 | - "><packing><property name=\"expand\">True</property><property name=\"fil" | ||
498 | - "l\">True</property><property name=\"position\">0</property></packing></" | ||
499 | - "child><child><object class=\"GtkCheckButton\" id=\"synaptics-scroll-hor" | ||
500 | - "iz\"><property name=\"label\" translatable=\"yes\">Enable hori_zontal s" | ||
501 | - "crolling</property><property name=\"visible\">True</property><property " | ||
502 | - "name=\"can_focus\">True</property><property name=\"receives_default\">F" | ||
503 | - "alse</property><property name=\"use_action_appearance\">False</property" | ||
504 | - "><property name=\"use_underline\">True</property><property name=\"draw_" | ||
505 | - "indicator\">True</property></object><packing><property name=\"expand\">" | ||
506 | - "True</property><property name=\"fill\">True</property><property name=\"" | ||
507 | - "position\">1</property></packing></child></object></child></object></ch" | ||
508 | - "ild><child type=\"label\"><object class=\"GtkLabel\" id=\"label17\"><pr" | ||
509 | - "operty name=\"visible\">True</property><property name=\"can_focus\">Fal" | ||
510 | - "se</property><property name=\"label\" translatable=\"yes\">Scrolling</p" | ||
511 | - "roperty><property name=\"use_markup\">True</property><attributes><attri" | ||
512 | - "bute name=\"weight\" value=\"bold\"/></attributes></object></child></ob" | ||
513 | - "ject><packing><property name=\"expand\">False</property><property name=" | ||
514 | - "\"fill\">True</property><property name=\"position\">1</property></packi" | ||
515 | - "ng></child></object><packing><property name=\"position\">1</property></" | ||
516 | - "packing></child><child type=\"tab\"><object class=\"GtkLabel\" id=\"syn" | ||
517 | - "aptics-label\"><property name=\"visible\">True</property><property name" | ||
518 | - "=\"can_focus\">False</property><property name=\"label\" translatable=\"" | ||
519 | - "yes\">T_ouchpad</property><property name=\"use_underline\">True</proper" | ||
520 | - "ty></object><packing><property name=\"position\">1</property><property " | ||
521 | - "name=\"tab_fill\">False</property></packing></child><child><object clas" | ||
522 | - "s=\"GtkVBox\" id=\"wacom-tab\"><property name=\"visible\">True</propert" | ||
523 | + "efault\">False</property><property name=\"use_underline\">True</propert" | ||
524 | + "y><property name=\"active\">True</property><property name=\"draw_indica" | ||
525 | + "tor\">True</property></object><packing><property name=\"expand\">False<" | ||
526 | + "/property><property name=\"fill\">True</property><property name=\"posit" | ||
527 | + "ion\">0</property></packing></child><child><object class=\"GtkRadioButt" | ||
528 | + "on\" id=\"device-left-handed\"><property name=\"label\" translatable=\"" | ||
529 | + "yes\">Le_ft-handed</property><property name=\"use_action_appearance\">F" | ||
530 | + "alse</property><property name=\"visible\">True</property><property name" | ||
531 | + "=\"can_focus\">True</property><property name=\"receives_default\">False" | ||
532 | + "</property><property name=\"use_underline\">True</property><property na" | ||
533 | + "me=\"draw_indicator\">True</property><property name=\"group\">device-ri" | ||
534 | + "ght-handed</property></object><packing><property name=\"expand\">False<" | ||
535 | + "/property><property name=\"fill\">True</property><property name=\"posit" | ||
536 | + "ion\">1</property></packing></child></object><packing><property name=\"" | ||
537 | + "expand\">True</property><property name=\"fill\">True</property><propert" | ||
538 | + "y name=\"position\">0</property></packing></child><child><object class=" | ||
539 | + "\"GtkCheckButton\" id=\"device-reverse-scrolling\"><property name=\"lab" | ||
540 | + "el\" translatable=\"yes\">Reverse scroll d_irection</property><property" | ||
541 | + " name=\"use_action_appearance\">False</property><property name=\"visibl" | ||
542 | + "e\">True</property><property name=\"can_focus\">True</property><propert" | ||
543 | + "y name=\"receives_default\">False</property><property name=\"tooltip_te" | ||
544 | + "xt\" translatable=\"yes\">When selected, the scroll wheel will work in " | ||
545 | + "the opposite direction</property><property name=\"use_underline\">True<" | ||
546 | + "/property><property name=\"draw_indicator\">True</property></object><pa" | ||
547 | + "cking><property name=\"expand\">True</property><property name=\"fill\">" | ||
548 | + "True</property><property name=\"position\">1</property></packing></chil" | ||
549 | + "d></object></child></object></child><child type=\"label\"><object class" | ||
550 | + "=\"GtkLabel\" id=\"label14\"><property name=\"visible\">True</property>" | ||
551 | + "<property name=\"can_focus\">False</property><property name=\"label\" t" | ||
552 | + "ranslatable=\"yes\">Buttons</property><attributes><attribute name=\"wei" | ||
553 | + "ght\" value=\"bold\"/></attributes></object></child></object><packing><" | ||
554 | + "property name=\"expand\">False</property><property name=\"fill\">True</" | ||
555 | + "property><property name=\"position\">0</property></packing></child><chi" | ||
556 | + "ld><object class=\"GtkFrame\" id=\"frame2\"><property name=\"visible\">" | ||
557 | + "True</property><property name=\"can_focus\">False</property><property n" | ||
558 | + "ame=\"label_xalign\">0</property><property name=\"shadow_type\">none</p" | ||
559 | + "roperty><child><object class=\"GtkAlignment\" id=\"alignment2\"><proper" | ||
560 | + "ty name=\"visible\">True</property><property name=\"can_focus\">False</" | ||
561 | + "property><property name=\"left_padding\">12</property><child><object cl" | ||
562 | + "ass=\"GtkTable\" id=\"table1\"><property name=\"visible\">True</propert" | ||
563 | "y><property name=\"can_focus\">False</property><property name=\"border_" | ||
564 | - "width\">6</property><property name=\"spacing\">6</property><child><obje" | ||
565 | - "ct class=\"GtkFrame\" id=\"frame12\"><property name=\"visible\">True</p" | ||
566 | - "roperty><property name=\"can_focus\">False</property><property name=\"l" | ||
567 | - "abel_xalign\">0</property><property name=\"shadow_type\">none</property" | ||
568 | - "><child><object class=\"GtkAlignment\" id=\"alignment14\"><property nam" | ||
569 | - "e=\"visible\">True</property><property name=\"can_focus\">False</proper" | ||
570 | - "ty><property name=\"left_padding\">12</property><child><object class=\"" | ||
571 | - "GtkTable\" id=\"table2\"><property name=\"visible\">True</property><pro" | ||
572 | - "perty name=\"can_focus\">False</property><property name=\"border_width\"" | ||
573 | - ">6</property><property name=\"n_rows\">2</property><property name=\"n_c" | ||
574 | - "olumns\">2</property><property name=\"column_spacing\">12</property><pr" | ||
575 | - "operty name=\"row_spacing\">6</property><child><object class=\"GtkLabel" | ||
576 | - "\" id=\"label9\"><property name=\"visible\">True</property><property na" | ||
577 | - "me=\"can_focus\">False</property><property name=\"xalign\">0</property>" | ||
578 | - "<property name=\"label\" translatable=\"yes\">Tr_acking mode:</property" | ||
579 | - "><property name=\"use_underline\">True</property><property name=\"mnemo" | ||
580 | - "nic_widget\">wacom-mode</property></object><packing><property name=\"x_" | ||
581 | - "options\">GTK_FILL</property></packing></child><child><object class=\"G" | ||
582 | - "tkLabel\" id=\"label10\"><property name=\"visible\">True</property><pro" | ||
583 | - "perty name=\"can_focus\">False</property><property name=\"xalign\">0</p" | ||
584 | - "roperty><property name=\"label\" translatable=\"yes\">_Rotation:</prope" | ||
585 | - "rty><property name=\"use_underline\">True</property><property name=\"mn" | ||
586 | - "emonic_widget\">wacom-rotation</property></object><packing><property na" | ||
587 | - "me=\"top_attach\">1</property><property name=\"bottom_attach\">2</prope" | ||
588 | - "rty><property name=\"x_options\">GTK_FILL</property></packing></child><" | ||
589 | - "child><object class=\"GtkComboBox\" id=\"wacom-mode\"><property name=\"" | ||
590 | - "visible\">True</property><property name=\"can_focus\">False</property><" | ||
591 | - "property name=\"model\">wacom-mode-store</property><child><object class" | ||
592 | - "=\"GtkCellRendererText\" id=\"cellrenderertext1\"/><attributes><attribu" | ||
593 | - "te name=\"text\">1</attribute></attributes></child></object><packing><p" | ||
594 | - "roperty name=\"left_attach\">1</property><property name=\"right_attach\"" | ||
595 | - ">2</property></packing></child><child><object class=\"GtkComboBox\" id=" | ||
596 | - "\"wacom-rotation\"><property name=\"visible\">True</property><property " | ||
597 | - "name=\"can_focus\">False</property><property name=\"model\">wacom-rotat" | ||
598 | - "ion-store</property><child><object class=\"GtkCellRendererText\" id=\"c" | ||
599 | - "ellrenderertext2\"/><attributes><attribute name=\"text\">1</attribute><" | ||
600 | - "/attributes></child></object><packing><property name=\"left_attach\">1<" | ||
601 | - "/property><property name=\"right_attach\">2</property><property name=\"" | ||
602 | - "top_attach\">1</property><property name=\"bottom_attach\">2</property><" | ||
603 | - "/packing></child></object></child></object></child><child type=\"label\"" | ||
604 | - "><object class=\"GtkLabel\" id=\"label18\"><property name=\"visible\">T" | ||
605 | + "width\">6</property><property name=\"n_rows\">4</property><property nam" | ||
606 | + "e=\"n_columns\">2</property><property name=\"column_spacing\">12</prope" | ||
607 | + "rty><property name=\"row_spacing\">6</property><child><object class=\"G" | ||
608 | + "tkLabel\" id=\"device-acceleration-label\"><property name=\"visible\">T" | ||
609 | "rue</property><property name=\"can_focus\">False</property><property na" | ||
610 | - "me=\"label\" translatable=\"yes\">General</property><property name=\"us" | ||
611 | - "e_markup\">True</property><attributes><attribute name=\"weight\" value=" | ||
612 | - "\"bold\"/></attributes></object></child></object><packing><property nam" | ||
613 | - "e=\"expand\">False</property><property name=\"fill\">True</property><pr" | ||
614 | - "operty name=\"position\">0</property></packing></child></object><packin" | ||
615 | - "g><property name=\"position\">2</property></packing></child><child type" | ||
616 | - "=\"tab\"><object class=\"GtkLabel\" id=\"wacom-label\"><property name=\"" | ||
617 | - "visible\">True</property><property name=\"can_focus\">False</property><" | ||
618 | - "property name=\"label\" translatable=\"yes\">Table_t</property><propert" | ||
619 | - "y name=\"use_underline\">True</property></object><packing><property nam" | ||
620 | - "e=\"position\">2</property><property name=\"tab_fill\">False</property>" | ||
621 | - "</packing></child></object><packing><property name=\"expand\">True</pro" | ||
622 | - "perty><property name=\"fill\">True</property><property name=\"position\"" | ||
623 | - ">2</property></packing></child></object></child><child type=\"tab\"><ob" | ||
624 | - "ject class=\"GtkLabel\" id=\"label1\"><property name=\"visible\">True</" | ||
625 | - "property><property name=\"can_focus\">False</property><property name=\"" | ||
626 | - "label\" translatable=\"yes\">_Devices</property><property name=\"use_un" | ||
627 | - "derline\">True</property></object><packing><property name=\"tab_fill\">" | ||
628 | - "False</property></packing></child><child><object class=\"GtkVBox\" id=\"" | ||
629 | - "vbox3\"><property name=\"visible\">True</property><property name=\"can_" | ||
630 | - "focus\">False</property><property name=\"border_width\">12</property><p" | ||
631 | - "roperty name=\"spacing\">6</property><child><object class=\"GtkFrame\" " | ||
632 | - "id=\"frame3\"><property name=\"visible\">True</property><property name=" | ||
633 | - "\"can_focus\">False</property><property name=\"label_xalign\">0</proper" | ||
634 | - "ty><property name=\"shadow_type\">none</property><child><object class=\"" | ||
635 | - "GtkAlignment\" id=\"alignment3\"><property name=\"visible\">True</prope" | ||
636 | - "rty><property name=\"can_focus\">False</property><property name=\"left_" | ||
637 | - "padding\">12</property><child><object class=\"GtkVBox\" id=\"vbox4\"><p" | ||
638 | - "roperty name=\"visible\">True</property><property name=\"can_focus\">Fa" | ||
639 | - "lse</property><property name=\"border_width\">6</property><property nam" | ||
640 | - "e=\"spacing\">6</property><child><object class=\"GtkLabel\" id=\"mouse-" | ||
641 | - "dnd-label\"><property name=\"visible\">True</property><property name=\"" | ||
642 | - "can_focus\">False</property><property name=\"xalign\">0</property><prop" | ||
643 | - "erty name=\"label\" translatable=\"yes\">Th_reshold:</property><propert" | ||
644 | - "y name=\"use_underline\">True</property><property name=\"mnemonic_widge" | ||
645 | - "t\">dnd-threshold-scale</property></object><packing><property name=\"ex" | ||
646 | - "pand\">True</property><property name=\"fill\">True</property><property " | ||
647 | - "name=\"position\">0</property></packing></child><child><object class=\"" | ||
648 | - "GtkHScale\" id=\"dnd-threshold-scale\"><property name=\"visible\">True<" | ||
649 | - "/property><property name=\"can_focus\">True</property><property name=\"" | ||
650 | - "tooltip_text\" translatable=\"yes\">The number of pixels the pointer mu" | ||
651 | - "st move before a drag operation will start</property><property name=\"u" | ||
652 | - "pdate_policy\">delayed</property><property name=\"adjustment\">dnd-thre" | ||
653 | - "shold</property><property name=\"digits\">0</property><property name=\"" | ||
654 | - "value_pos\">right</property></object><packing><property name=\"expand\"" | ||
655 | - ">True</property><property name=\"fill\">True</property><property name=\"" | ||
656 | - "position\">1</property></packing></child></object></child></object></ch" | ||
657 | - "ild><child type=\"label\"><object class=\"GtkLabel\" id=\"label6\"><pro" | ||
658 | - "perty name=\"visible\">True</property><property name=\"can_focus\">Fals" | ||
659 | - "e</property><property name=\"label\" translatable=\"yes\">Drag and Drop" | ||
660 | - "</property><attributes><attribute name=\"weight\" value=\"bold\"/></att" | ||
661 | - "ributes></object></child></object><packing><property name=\"expand\">Fa" | ||
662 | - "lse</property><property name=\"fill\">True</property><property name=\"p" | ||
663 | - "osition\">0</property></packing></child><child><object class=\"GtkFrame" | ||
664 | - "\" id=\"frame4\"><property name=\"visible\">True</property><property na" | ||
665 | - "me=\"can_focus\">False</property><property name=\"label_xalign\">0</pro" | ||
666 | - "perty><property name=\"shadow_type\">none</property><child><object clas" | ||
667 | - "s=\"GtkAlignment\" id=\"alignment4\"><property name=\"visible\">True</p" | ||
668 | - "roperty><property name=\"can_focus\">False</property><property name=\"l" | ||
669 | - "eft_padding\">12</property><child><object class=\"GtkVBox\" id=\"vbox5\"" | ||
670 | + "me=\"xalign\">0</property><property name=\"label\" translatable=\"yes\"" | ||
671 | + ">Acceleratio_n:</property><property name=\"use_underline\">True</proper" | ||
672 | + "ty><property name=\"mnemonic_widget\">device-acceleration-scale</proper" | ||
673 | + "ty></object><packing><property name=\"x_options\">GTK_FILL</property><p" | ||
674 | + "roperty name=\"y_options\">GTK_FILL</property></packing></child><child>" | ||
675 | + "<object class=\"GtkHScale\" id=\"device-acceleration-scale\"><property " | ||
676 | + "name=\"visible\">True</property><property name=\"can_focus\">True</prop" | ||
677 | + "erty><property name=\"tooltip_text\" translatable=\"yes\">The factor at" | ||
678 | + " which the pointer\'s speed will increase as the mouse is moved</proper" | ||
679 | + "ty><property name=\"update_policy\">delayed</property><property name=\"" | ||
680 | + "adjustment\">device-acceleration</property><property name=\"round_digit" | ||
681 | + "s\">1</property><property name=\"value_pos\">right</property></object><" | ||
682 | + "packing><property name=\"left_attach\">1</property><property name=\"rig" | ||
683 | + "ht_attach\">2</property></packing></child><child><object class=\"GtkHSc" | ||
684 | + "ale\" id=\"device-threshold-scale\"><property name=\"visible\">True</pr" | ||
685 | + "operty><property name=\"can_focus\">True</property><property name=\"too" | ||
686 | + "ltip_text\" translatable=\"yes\">The number of pixels the pointer must " | ||
687 | + "move in a short time before it starts accelerating</property><property " | ||
688 | + "name=\"update_policy\">delayed</property><property name=\"adjustment\">" | ||
689 | + "device-threshold</property><property name=\"round_digits\">0</property>" | ||
690 | + "<property name=\"digits\">0</property><property name=\"value_pos\">righ" | ||
691 | + "t</property></object><packing><property name=\"left_attach\">1</propert" | ||
692 | + "y><property name=\"right_attach\">2</property><property name=\"top_atta" | ||
693 | + "ch\">1</property><property name=\"bottom_attach\">2</property></packing" | ||
694 | + "></child><child><object class=\"GtkLabel\" id=\"device-threshold-label\"" | ||
695 | "><property name=\"visible\">True</property><property name=\"can_focus\"" | ||
696 | - ">False</property><property name=\"border_width\">6</property><property " | ||
697 | - "name=\"spacing\">6</property><child><object class=\"GtkLabel\" id=\"dcl" | ||
698 | - "ick-time-label\"><property name=\"visible\">True</property><property na" | ||
699 | - "me=\"can_focus\">False</property><property name=\"xalign\">0</property>" | ||
700 | - "<property name=\"label\" translatable=\"yes\">Ti_me:</property><propert" | ||
701 | - "y name=\"use_underline\">True</property><property name=\"mnemonic_widge" | ||
702 | - "t\">dclick-time-scale</property></object><packing><property name=\"expa" | ||
703 | - "nd\">True</property><property name=\"fill\">True</property><property na" | ||
704 | - "me=\"position\">0</property></packing></child><child><object class=\"Gt" | ||
705 | - "kHScale\" id=\"dclick-time-scale\"><property name=\"visible\">True</pro" | ||
706 | - "perty><property name=\"can_focus\">True</property><property name=\"tool" | ||
707 | - "tip_text\" translatable=\"yes\">Two mouse clicks in less than this leng" | ||
708 | - "th of time (in milliseconds) will be considered a double click</propert" | ||
709 | - "y><property name=\"update_policy\">delayed</property><property name=\"a" | ||
710 | - "djustment\">dclick-time</property><property name=\"digits\">0</property" | ||
711 | - "><property name=\"value_pos\">right</property></object><packing><proper" | ||
712 | - "ty name=\"expand\">True</property><property name=\"fill\">True</propert" | ||
713 | - "y><property name=\"position\">1</property></packing></child><child><obj" | ||
714 | - "ect class=\"GtkLabel\" id=\"dclick-distance-label\"><property name=\"vi" | ||
715 | - "sible\">True</property><property name=\"can_focus\">False</property><pr" | ||
716 | - "operty name=\"xalign\">0</property><property name=\"label\" translatabl" | ||
717 | - "e=\"yes\">D_istance:</property><property name=\"use_underline\">True</p" | ||
718 | - "roperty><property name=\"mnemonic_widget\">dclick-distance-scale</prope" | ||
719 | - "rty></object><packing><property name=\"expand\">True</property><propert" | ||
720 | - "y name=\"fill\">True</property><property name=\"position\">2</property>" | ||
721 | - "</packing></child><child><object class=\"GtkHScale\" id=\"dclick-distan" | ||
722 | - "ce-scale\"><property name=\"visible\">True</property><property name=\"c" | ||
723 | - "an_focus\">True</property><property name=\"tooltip_text\" translatable=" | ||
724 | - "\"yes\">The mouse pointer cannot move farther than this distance betwee" | ||
725 | - "n two clicks for them to be considered a double click</property><proper" | ||
726 | - "ty name=\"update_policy\">delayed</property><property name=\"adjustment" | ||
727 | - "\">dclick-distance</property><property name=\"digits\">0</property><pro" | ||
728 | - "perty name=\"value_pos\">right</property></object><packing><property na" | ||
729 | - "me=\"expand\">True</property><property name=\"fill\">True</property><pr" | ||
730 | - "operty name=\"position\">3</property></packing></child></object></child" | ||
731 | - "></object></child><child type=\"label\"><object class=\"GtkLabel\" id=\"" | ||
732 | - "label8\"><property name=\"visible\">True</property><property name=\"can" | ||
733 | - "_focus\">False</property><property name=\"label\" translatable=\"yes\">" | ||
734 | - "Double Click</property><attributes><attribute name=\"weight\" value=\"b" | ||
735 | - "old\"/></attributes></object></child></object><packing><property name=\"" | ||
736 | - "expand\">False</property><property name=\"fill\">True</property><proper" | ||
737 | - "ty name=\"position\">1</property></packing></child></object><packing><p" | ||
738 | - "roperty name=\"position\">1</property></packing></child><child type=\"t" | ||
739 | - "ab\"><object class=\"GtkLabel\" id=\"label2\"><property name=\"visible\"" | ||
740 | - ">True</property><property name=\"can_focus\">False</property><property " | ||
741 | - "name=\"label\" translatable=\"yes\">_Behavior</property><property name=" | ||
742 | - "\"use_underline\">True</property></object><packing><property name=\"pos" | ||
743 | - "ition\">1</property><property name=\"tab_fill\">False</property></packi" | ||
744 | - "ng></child><child><object class=\"GtkHBox\" id=\"themes-hbox\"><propert" | ||
745 | - "y name=\"visible\">True</property><property name=\"can_focus\">False</p" | ||
746 | - "roperty><property name=\"border_width\">12</property><property name=\"s" | ||
747 | - "pacing\">12</property><child><object class=\"GtkScrolledWindow\" id=\"s" | ||
748 | - "crolledwindow2\"><property name=\"visible\">True</property><property na" | ||
749 | - "me=\"can_focus\">True</property><property name=\"hscrollbar_policy\">au" | ||
750 | - "tomatic</property><property name=\"vscrollbar_policy\">automatic</prope" | ||
751 | - "rty><property name=\"shadow_type\">etched-in</property><child><object c" | ||
752 | - "lass=\"GtkTreeView\" id=\"theme-treeview\"><property name=\"width_reque" | ||
753 | - "st\">200</property><property name=\"visible\">True</property><property " | ||
754 | - "name=\"can_focus\">True</property><property name=\"headers_visible\">Fa" | ||
755 | - "lse</property></object></child></object><packing><property name=\"expan" | ||
756 | - "d\">True</property><property name=\"fill\">True</property><property nam" | ||
757 | - "e=\"position\">0</property></packing></child><child><object class=\"Gtk" | ||
758 | - "VBox\" id=\"vbox9\"><property name=\"visible\">True</property><property" | ||
759 | - " name=\"can_focus\">False</property><property name=\"spacing\">6</prope" | ||
760 | - "rty><child><object class=\"GtkFrame\" id=\"frame5\"><property name=\"vi" | ||
761 | - "sible\">True</property><property name=\"can_focus\">False</property><pr" | ||
762 | - "operty name=\"label_xalign\">0</property><property name=\"shadow_type\"" | ||
763 | - ">none</property><child><object class=\"GtkAlignment\" id=\"alignment5\"" | ||
764 | + ">False</property><property name=\"xalign\">0</property><property name=\"" | ||
765 | + "label\" translatable=\"yes\">Sensitivit_y:</property><property name=\"u" | ||
766 | + "se_underline\">True</property><property name=\"mnemonic_widget\">device" | ||
767 | + "-threshold-scale</property></object><packing><property name=\"top_attac" | ||
768 | + "h\">1</property><property name=\"bottom_attach\">2</property><property " | ||
769 | + "name=\"x_options\">GTK_FILL</property></packing></child><child><object " | ||
770 | + "class=\"GtkAlignment\" id=\"alignment7\"><property name=\"visible\">Tru" | ||
771 | + "e</property><property name=\"can_focus\">False</property><property name" | ||
772 | + "=\"xalign\">0</property><property name=\"xscale\">0</property><property" | ||
773 | + " name=\"yscale\">0</property><child><object class=\"GtkButton\" id=\"de" | ||
774 | + "vice-reset-feedback\"><property name=\"label\" translatable=\"yes\">_Re" | ||
775 | + "set to Defaults</property><property name=\"use_action_appearance\">Fals" | ||
776 | + "e</property><property name=\"visible\">True</property><property name=\"" | ||
777 | + "can_focus\">True</property><property name=\"receives_default\">True</pr" | ||
778 | + "operty><property name=\"tooltip_text\" translatable=\"yes\">Set the acc" | ||
779 | + "eleration and sensitivity for the selected device to the default values" | ||
780 | + "</property><property name=\"image\">image5</property><property name=\"u" | ||
781 | + "se_underline\">True</property></object></child></object><packing><prope" | ||
782 | + "rty name=\"right_attach\">2</property><property name=\"top_attach\">2</" | ||
783 | + "property><property name=\"bottom_attach\">3</property></packing></child" | ||
784 | + "><child><object class=\"GtkAlignment\" id=\"alignment8\"><property name" | ||
785 | + "=\"visible\">True</property><property name=\"can_focus\">False</propert" | ||
786 | + "y><property name=\"xalign\">0</property><property name=\"xscale\">0</pr" | ||
787 | + "operty><property name=\"yscale\">0</property><child><object class=\"Gtk" | ||
788 | + "CheckButton\" id=\"touchscreen-pointer\"><property name=\"label\" trans" | ||
789 | + "latable=\"yes\">_Touchscreen pointer</property><property name=\"use_act" | ||
790 | + "ion_appearance\">False</property><property name=\"visible\">True</prope" | ||
791 | + "rty><property name=\"can_focus\">True</property><property name=\"receiv" | ||
792 | + "es_default\">False</property><property name=\"tooltip_text\" translatab" | ||
793 | + "le=\"yes\">When selected, no mouse pointer is displayed for this device" | ||
794 | + " and gtk TouchscreenMode is activated</property><property name=\"use_un" | ||
795 | + "derline\">True</property><property name=\"draw_indicator\">True</proper" | ||
796 | + "ty></object></child></object><packing><property name=\"right_attach\">2" | ||
797 | + "</property><property name=\"top_attach\">3</property><property name=\"b" | ||
798 | + "ottom_attach\">4</property></packing></child></object></child></object>" | ||
799 | + "</child><child type=\"label\"><object class=\"GtkLabel\" id=\"label15\"" | ||
800 | "><property name=\"visible\">True</property><property name=\"can_focus\"" | ||
801 | - ">False</property><property name=\"left_padding\">12</property><child><o" | ||
802 | - "bject class=\"GtkHBox\" id=\"hbox7\"><property name=\"visible\">True</p" | ||
803 | + ">False</property><property name=\"label\" translatable=\"yes\">Pointer " | ||
804 | + "Speed</property><attributes><attribute name=\"weight\" value=\"bold\"/>" | ||
805 | + "</attributes></object></child></object><packing><property name=\"expand" | ||
806 | + "\">False</property><property name=\"fill\">True</property><property nam" | ||
807 | + "e=\"position\">1</property></packing></child></object></child><child ty" | ||
808 | + "pe=\"tab\"><object class=\"GtkLabel\" id=\"label4\"><property name=\"vi" | ||
809 | + "sible\">True</property><property name=\"can_focus\">False</property><pr" | ||
810 | + "operty name=\"label\" translatable=\"yes\">B_uttons and Feedback</prope" | ||
811 | + "rty><property name=\"use_underline\">True</property></object><packing><" | ||
812 | + "property name=\"tab_fill\">False</property></packing></child><child><ob" | ||
813 | + "ject class=\"GtkVBox\" id=\"synaptics-tab\"><property name=\"visible\">" | ||
814 | + "True</property><property name=\"can_focus\">False</property><property n" | ||
815 | + "ame=\"border_width\">6</property><property name=\"spacing\">6</property" | ||
816 | + "><child><object class=\"GtkFrame\" id=\"frame11\"><property name=\"visi" | ||
817 | + "ble\">True</property><property name=\"can_focus\">False</property><prop" | ||
818 | + "erty name=\"label_xalign\">0</property><property name=\"shadow_type\">n" | ||
819 | + "one</property><child><object class=\"GtkAlignment\" id=\"alignment13\">" | ||
820 | + "<property name=\"visible\">True</property><property name=\"can_focus\">" | ||
821 | + "False</property><property name=\"left_padding\">12</property><child><ob" | ||
822 | + "ject class=\"GtkVBox\" id=\"vbox11\"><property name=\"visible\">True</p" | ||
823 | "roperty><property name=\"can_focus\">False</property><property name=\"b" | ||
824 | - "order_width\">6</property><property name=\"spacing\">12</property><chil" | ||
825 | - "d><object class=\"GtkLabel\" id=\"label21\"><property name=\"visible\">" | ||
826 | + "order_width\">6</property><property name=\"spacing\">6</property><child" | ||
827 | + "><object class=\"GtkCheckButton\" id=\"synaptics-disable-while-type\"><" | ||
828 | + "property name=\"label\" translatable=\"yes\">Disable touchpad _while ty" | ||
829 | + "ping</property><property name=\"use_action_appearance\">False</property" | ||
830 | + "><property name=\"visible\">True</property><property name=\"can_focus\"" | ||
831 | + ">True</property><property name=\"receives_default\">False</property><pr" | ||
832 | + "operty name=\"tooltip_text\" translatable=\"yes\">When selected, the to" | ||
833 | + "uchpad will be disabled when the keyboard is being used</property><prop" | ||
834 | + "erty name=\"use_underline\">True</property><property name=\"draw_indica" | ||
835 | + "tor\">True</property></object><packing><property name=\"expand\">True</" | ||
836 | + "property><property name=\"fill\">True</property><property name=\"positi" | ||
837 | + "on\">0</property></packing></child><child><object class=\"GtkCheckButto" | ||
838 | + "n\" id=\"synaptics-tap-to-click\"><property name=\"label\" translatable" | ||
839 | + "=\"yes\">Tap touchpad to clic_k</property><property name=\"use_action_a" | ||
840 | + "ppearance\">False</property><property name=\"visible\">True</property><" | ||
841 | + "property name=\"can_focus\">True</property><property name=\"receives_de" | ||
842 | + "fault\">False</property><property name=\"use_underline\">True</property" | ||
843 | + "><property name=\"draw_indicator\">True</property></object><packing><pr" | ||
844 | + "operty name=\"expand\">True</property><property name=\"fill\">True</pro" | ||
845 | + "perty><property name=\"position\">1</property></packing></child></objec" | ||
846 | + "t></child></object></child><child type=\"label\"><object class=\"GtkLab" | ||
847 | + "el\" id=\"label16\"><property name=\"visible\">True</property><property" | ||
848 | + " name=\"can_focus\">False</property><property name=\"label\" translatab" | ||
849 | + "le=\"yes\">General</property><property name=\"use_markup\">True</proper" | ||
850 | + "ty><attributes><attribute name=\"weight\" value=\"bold\"/></attributes>" | ||
851 | + "</object></child></object><packing><property name=\"expand\">False</pro" | ||
852 | + "perty><property name=\"fill\">True</property><property name=\"position\"" | ||
853 | + ">0</property></packing></child><child><object class=\"GtkFrame\" id=\"f" | ||
854 | + "rame10\"><property name=\"visible\">True</property><property name=\"can" | ||
855 | + "_focus\">False</property><property name=\"label_xalign\">0</property><p" | ||
856 | + "roperty name=\"shadow_type\">none</property><child><object class=\"GtkA" | ||
857 | + "lignment\" id=\"alignment12\"><property name=\"visible\">True</property" | ||
858 | + "><property name=\"can_focus\">False</property><property name=\"left_pad" | ||
859 | + "ding\">12</property><child><object class=\"GtkVBox\" id=\"vbox10\"><pro" | ||
860 | + "perty name=\"visible\">True</property><property name=\"can_focus\">Fals" | ||
861 | + "e</property><property name=\"border_width\">6</property><property name=" | ||
862 | + "\"spacing\">6</property><child><object class=\"GtkHBox\" id=\"hbox4\"><" | ||
863 | + "property name=\"visible\">True</property><property name=\"can_focus\">F" | ||
864 | + "alse</property><property name=\"spacing\">12</property><child><object c" | ||
865 | + "lass=\"GtkLabel\" id=\"label23\"><property name=\"visible\">True</prope" | ||
866 | + "rty><property name=\"can_focus\">False</property><property name=\"xalig" | ||
867 | + "n\">0</property><property name=\"label\" translatable=\"yes\">Scrolling" | ||
868 | + " _mode:</property><property name=\"use_underline\">True</property><prop" | ||
869 | + "erty name=\"mnemonic_widget\">synaptics-scroll</property></object><pack" | ||
870 | + "ing><property name=\"expand\">False</property><property name=\"fill\">T" | ||
871 | + "rue</property><property name=\"position\">0</property></packing></child" | ||
872 | + "><child><object class=\"GtkComboBox\" id=\"synaptics-scroll\"><property" | ||
873 | + " name=\"visible\">True</property><property name=\"can_focus\">False</pr" | ||
874 | + "operty><property name=\"model\">synaptics-scroll-store</property><child" | ||
875 | + "><object class=\"GtkCellRendererText\" id=\"cellrenderertext3\"/><attri" | ||
876 | + "butes><attribute name=\"sensitive\">1</attribute><attribute name=\"text" | ||
877 | + "\">0</attribute></attributes></child></object><packing><property name=\"" | ||
878 | + "expand\">True</property><property name=\"fill\">True</property><propert" | ||
879 | + "y name=\"position\">1</property></packing></child></object><packing><pr" | ||
880 | + "operty name=\"expand\">True</property><property name=\"fill\">True</pro" | ||
881 | + "perty><property name=\"position\">0</property></packing></child><child>" | ||
882 | + "<object class=\"GtkCheckButton\" id=\"synaptics-scroll-horiz\"><propert" | ||
883 | + "y name=\"label\" translatable=\"yes\">Enable hori_zontal scrolling</pro" | ||
884 | + "perty><property name=\"use_action_appearance\">False</property><propert" | ||
885 | + "y name=\"visible\">True</property><property name=\"can_focus\">True</pr" | ||
886 | + "operty><property name=\"receives_default\">False</property><property na" | ||
887 | + "me=\"use_underline\">True</property><property name=\"draw_indicator\">T" | ||
888 | + "rue</property></object><packing><property name=\"expand\">True</propert" | ||
889 | + "y><property name=\"fill\">True</property><property name=\"position\">1<" | ||
890 | + "/property></packing></child></object></child></object></child><child ty" | ||
891 | + "pe=\"label\"><object class=\"GtkLabel\" id=\"label17\"><property name=\"" | ||
892 | + "visible\">True</property><property name=\"can_focus\">False</property><" | ||
893 | + "property name=\"label\" translatable=\"yes\">Scrolling</property><prope" | ||
894 | + "rty name=\"use_markup\">True</property><attributes><attribute name=\"we" | ||
895 | + "ight\" value=\"bold\"/></attributes></object></child></object><packing>" | ||
896 | + "<property name=\"expand\">False</property><property name=\"fill\">True<" | ||
897 | + "/property><property name=\"position\">1</property></packing></child></o" | ||
898 | + "bject><packing><property name=\"position\">1</property></packing></chil" | ||
899 | + "d><child type=\"tab\"><object class=\"GtkLabel\" id=\"synaptics-label\"" | ||
900 | + "><property name=\"visible\">True</property><property name=\"can_focus\"" | ||
901 | + ">False</property><property name=\"label\" translatable=\"yes\">T_ouchpa" | ||
902 | + "d</property><property name=\"use_underline\">True</property></object><p" | ||
903 | + "acking><property name=\"position\">1</property><property name=\"tab_fil" | ||
904 | + "l\">False</property></packing></child><child><object class=\"GtkVBox\" " | ||
905 | + "id=\"wacom-tab\"><property name=\"visible\">True</property><property na" | ||
906 | + "me=\"can_focus\">False</property><property name=\"border_width\">6</pro" | ||
907 | + "perty><property name=\"spacing\">6</property><child><object class=\"Gtk" | ||
908 | + "Frame\" id=\"frame12\"><property name=\"visible\">True</property><prope" | ||
909 | + "rty name=\"can_focus\">False</property><property name=\"label_xalign\">" | ||
910 | + "0</property><property name=\"shadow_type\">none</property><child><objec" | ||
911 | + "t class=\"GtkAlignment\" id=\"alignment14\"><property name=\"visible\">" | ||
912 | "True</property><property name=\"can_focus\">False</property><property n" | ||
913 | - "ame=\"label\" translatable=\"yes\">Cursor _size:</property><property na" | ||
914 | - "me=\"use_underline\">True</property><property name=\"mnemonic_widget\">" | ||
915 | - "spin1</property></object><packing><property name=\"expand\">False</prop" | ||
916 | - "erty><property name=\"fill\">True</property><property name=\"position\"" | ||
917 | - ">0</property></packing></child><child><object class=\"GtkSpinButton\" i" | ||
918 | - "d=\"spin1\"><property name=\"visible\">True</property><property name=\"" | ||
919 | - "can_focus\">True</property><property name=\"primary_icon_activatable\">" | ||
920 | - "False</property><property name=\"secondary_icon_activatable\">False</pr" | ||
921 | - "operty><property name=\"primary_icon_sensitive\">True</property><proper" | ||
922 | - "ty name=\"secondary_icon_sensitive\">True</property><property name=\"ad" | ||
923 | - "justment\">theme-cursor-size</property><property name=\"snap_to_ticks\"" | ||
924 | - ">True</property><property name=\"numeric\">True</property></object><pac" | ||
925 | - "king><property name=\"expand\">False</property><property name=\"fill\">" | ||
926 | - "True</property><property name=\"position\">1</property></packing></chil" | ||
927 | + "ame=\"left_padding\">12</property><child><object class=\"GtkTable\" id=" | ||
928 | + "\"table2\"><property name=\"visible\">True</property><property name=\"c" | ||
929 | + "an_focus\">False</property><property name=\"border_width\">6</property>" | ||
930 | + "<property name=\"n_rows\">2</property><property name=\"n_columns\">2</p" | ||
931 | + "roperty><property name=\"column_spacing\">12</property><property name=\"" | ||
932 | + "row_spacing\">6</property><child><object class=\"GtkLabel\" id=\"label9" | ||
933 | + "\"><property name=\"visible\">True</property><property name=\"can_focus" | ||
934 | + "\">False</property><property name=\"xalign\">0</property><property name" | ||
935 | + "=\"label\" translatable=\"yes\">Trac_king mode:</property><property nam" | ||
936 | + "e=\"use_underline\">True</property><property name=\"mnemonic_widget\">w" | ||
937 | + "acom-mode</property></object><packing><property name=\"x_options\">GTK_" | ||
938 | + "FILL</property></packing></child><child><object class=\"GtkLabel\" id=\"" | ||
939 | + "label10\"><property name=\"visible\">True</property><property name=\"ca" | ||
940 | + "n_focus\">False</property><property name=\"xalign\">0</property><proper" | ||
941 | + "ty name=\"label\" translatable=\"yes\">_Rotation:</property><property n" | ||
942 | + "ame=\"use_underline\">True</property><property name=\"mnemonic_widget\"" | ||
943 | + ">wacom-rotation</property></object><packing><property name=\"top_attach" | ||
944 | + "\">1</property><property name=\"bottom_attach\">2</property><property n" | ||
945 | + "ame=\"x_options\">GTK_FILL</property></packing></child><child><object c" | ||
946 | + "lass=\"GtkComboBox\" id=\"wacom-mode\"><property name=\"visible\">True<" | ||
947 | + "/property><property name=\"can_focus\">False</property><property name=\"" | ||
948 | + "model\">wacom-mode-store</property><child><object class=\"GtkCellRender" | ||
949 | + "erText\" id=\"cellrenderertext1\"/><attributes><attribute name=\"text\"" | ||
950 | + ">1</attribute></attributes></child></object><packing><property name=\"l" | ||
951 | + "eft_attach\">1</property><property name=\"right_attach\">2</property></" | ||
952 | + "packing></child><child><object class=\"GtkComboBox\" id=\"wacom-rotatio" | ||
953 | + "n\"><property name=\"visible\">True</property><property name=\"can_focu" | ||
954 | + "s\">False</property><property name=\"model\">wacom-rotation-store</prop" | ||
955 | + "erty><child><object class=\"GtkCellRendererText\" id=\"cellrenderertext" | ||
956 | + "2\"/><attributes><attribute name=\"text\">1</attribute></attributes></c" | ||
957 | + "hild></object><packing><property name=\"left_attach\">1</property><prop" | ||
958 | + "erty name=\"right_attach\">2</property><property name=\"top_attach\">1<" | ||
959 | + "/property><property name=\"bottom_attach\">2</property></packing></chil" | ||
960 | "d></object></child></object></child><child type=\"label\"><object class" | ||
961 | - "=\"GtkLabel\" id=\"label20\"><property name=\"visible\">True</property>" | ||
962 | + "=\"GtkLabel\" id=\"label18\"><property name=\"visible\">True</property>" | ||
963 | "<property name=\"can_focus\">False</property><property name=\"label\" t" | ||
964 | - "ranslatable=\"yes\">Size</property><attributes><attribute name=\"weight" | ||
965 | - "\" value=\"bold\"/></attributes></object></child></object><packing><pro" | ||
966 | - "perty name=\"expand\">False</property><property name=\"fill\">True</pro" | ||
967 | - "perty><property name=\"position\">0</property></packing></child><child>" | ||
968 | - "<object class=\"GtkFrame\" id=\"frame6\"><property name=\"visible\">Tru" | ||
969 | + "ranslatable=\"yes\">General</property><property name=\"use_markup\">Tru" | ||
970 | + "e</property><attributes><attribute name=\"weight\" value=\"bold\"/></at" | ||
971 | + "tributes></object></child></object><packing><property name=\"expand\">F" | ||
972 | + "alse</property><property name=\"fill\">True</property><property name=\"" | ||
973 | + "position\">0</property></packing></child></object><packing><property na" | ||
974 | + "me=\"position\">2</property></packing></child><child type=\"tab\"><obje" | ||
975 | + "ct class=\"GtkLabel\" id=\"wacom-label\"><property name=\"visible\">Tru" | ||
976 | "e</property><property name=\"can_focus\">False</property><property name" | ||
977 | - "=\"label_xalign\">0</property><property name=\"shadow_type\">none</prop" | ||
978 | - "erty><child><object class=\"GtkAlignment\" id=\"alignment6\"><property " | ||
979 | - "name=\"visible\">True</property><property name=\"can_focus\">False</pro" | ||
980 | - "perty><property name=\"border_width\">6</property><property name=\"xali" | ||
981 | - "gn\">0</property><property name=\"yalign\">0</property><property name=\"" | ||
982 | - "xscale\">0</property><property name=\"yscale\">0</property><property na" | ||
983 | - "me=\"top_padding\">6</property><property name=\"bottom_padding\">6</pro" | ||
984 | - "perty><property name=\"left_padding\">18</property><property name=\"rig" | ||
985 | - "ht_padding\">6</property><child><object class=\"GtkImage\" id=\"theme-p" | ||
986 | - "review\"><property name=\"visible\">True</property><property name=\"can" | ||
987 | - "_focus\">False</property><property name=\"stock\">gtk-missing-image</pr" | ||
988 | - "operty></object></child></object></child><child type=\"label\"><object " | ||
989 | - "class=\"GtkLabel\" id=\"label22\"><property name=\"visible\">True</prop" | ||
990 | + "=\"label\" translatable=\"yes\">Tab_let</property><property name=\"use_" | ||
991 | + "underline\">True</property></object><packing><property name=\"position\"" | ||
992 | + ">2</property><property name=\"tab_fill\">False</property></packing></ch" | ||
993 | + "ild></object><packing><property name=\"expand\">True</property><propert" | ||
994 | + "y name=\"fill\">True</property><property name=\"position\">2</property>" | ||
995 | + "</packing></child></object></child><child type=\"tab\"><object class=\"" | ||
996 | + "GtkLabel\" id=\"label1\"><property name=\"visible\">True</property><pro" | ||
997 | + "perty name=\"can_focus\">False</property><property name=\"label\" trans" | ||
998 | + "latable=\"yes\">_Devices</property><property name=\"use_underline\">Tru" | ||
999 | + "e</property></object><packing><property name=\"tab_fill\">False</proper" | ||
1000 | + "ty></packing></child><child><object class=\"GtkVBox\" id=\"vbox3\"><pro" | ||
1001 | + "perty name=\"visible\">True</property><property name=\"can_focus\">Fals" | ||
1002 | + "e</property><property name=\"border_width\">12</property><property name" | ||
1003 | + "=\"spacing\">6</property><child><object class=\"GtkFrame\" id=\"frame3\"" | ||
1004 | + "><property name=\"visible\">True</property><property name=\"can_focus\"" | ||
1005 | + ">False</property><property name=\"label_xalign\">0</property><property " | ||
1006 | + "name=\"shadow_type\">none</property><child><object class=\"GtkAlignment" | ||
1007 | + "\" id=\"alignment3\"><property name=\"visible\">True</property><propert" | ||
1008 | + "y name=\"can_focus\">False</property><property name=\"left_padding\">12" | ||
1009 | + "</property><child><object class=\"GtkVBox\" id=\"vbox4\"><property name" | ||
1010 | + "=\"visible\">True</property><property name=\"can_focus\">False</propert" | ||
1011 | + "y><property name=\"border_width\">6</property><property name=\"spacing\"" | ||
1012 | + ">6</property><child><object class=\"GtkLabel\" id=\"mouse-dnd-label\"><" | ||
1013 | + "property name=\"visible\">True</property><property name=\"can_focus\">F" | ||
1014 | + "alse</property><property name=\"xalign\">0</property><property name=\"l" | ||
1015 | + "abel\" translatable=\"yes\">Th_reshold:</property><property name=\"use_" | ||
1016 | + "underline\">True</property><property name=\"mnemonic_widget\">dnd-thres" | ||
1017 | + "hold-scale</property></object><packing><property name=\"expand\">True</" | ||
1018 | + "property><property name=\"fill\">True</property><property name=\"positi" | ||
1019 | + "on\">0</property></packing></child><child><object class=\"GtkHScale\" i" | ||
1020 | + "d=\"dnd-threshold-scale\"><property name=\"visible\">True</property><pr" | ||
1021 | + "operty name=\"can_focus\">True</property><property name=\"tooltip_text\"" | ||
1022 | + " translatable=\"yes\">The number of pixels the pointer must move before" | ||
1023 | + " a drag operation will start</property><property name=\"update_policy\"" | ||
1024 | + ">delayed</property><property name=\"adjustment\">dnd-threshold</propert" | ||
1025 | + "y><property name=\"digits\">0</property><property name=\"value_pos\">ri" | ||
1026 | + "ght</property></object><packing><property name=\"expand\">True</propert" | ||
1027 | + "y><property name=\"fill\">True</property><property name=\"position\">1<" | ||
1028 | + "/property></packing></child></object></child></object></child><child ty" | ||
1029 | + "pe=\"label\"><object class=\"GtkLabel\" id=\"label6\"><property name=\"" | ||
1030 | + "visible\">True</property><property name=\"can_focus\">False</property><" | ||
1031 | + "property name=\"label\" translatable=\"yes\">Drag and Drop</property><a" | ||
1032 | + "ttributes><attribute name=\"weight\" value=\"bold\"/></attributes></obj" | ||
1033 | + "ect></child></object><packing><property name=\"expand\">False</property" | ||
1034 | + "><property name=\"fill\">True</property><property name=\"position\">0</" | ||
1035 | + "property></packing></child><child><object class=\"GtkFrame\" id=\"frame" | ||
1036 | + "4\"><property name=\"visible\">True</property><property name=\"can_focu" | ||
1037 | + "s\">False</property><property name=\"label_xalign\">0</property><proper" | ||
1038 | + "ty name=\"shadow_type\">none</property><child><object class=\"GtkAlignm" | ||
1039 | + "ent\" id=\"alignment4\"><property name=\"visible\">True</property><prop" | ||
1040 | + "erty name=\"can_focus\">False</property><property name=\"left_padding\"" | ||
1041 | + ">12</property><child><object class=\"GtkVBox\" id=\"vbox5\"><property n" | ||
1042 | + "ame=\"visible\">True</property><property name=\"can_focus\">False</prop" | ||
1043 | + "erty><property name=\"border_width\">6</property><property name=\"spaci" | ||
1044 | + "ng\">6</property><child><object class=\"GtkLabel\" id=\"dclick-time-lab" | ||
1045 | + "el\"><property name=\"visible\">True</property><property name=\"can_foc" | ||
1046 | + "us\">False</property><property name=\"xalign\">0</property><property na" | ||
1047 | + "me=\"label\" translatable=\"yes\">Ti_me:</property><property name=\"use" | ||
1048 | + "_underline\">True</property><property name=\"mnemonic_widget\">dclick-t" | ||
1049 | + "ime-scale</property></object><packing><property name=\"expand\">True</p" | ||
1050 | + "roperty><property name=\"fill\">True</property><property name=\"positio" | ||
1051 | + "n\">0</property></packing></child><child><object class=\"GtkHScale\" id" | ||
1052 | + "=\"dclick-time-scale\"><property name=\"visible\">True</property><prope" | ||
1053 | + "rty name=\"can_focus\">True</property><property name=\"tooltip_text\" t" | ||
1054 | + "ranslatable=\"yes\">Two mouse clicks in less than this length of time (" | ||
1055 | + "in milliseconds) will be considered a double click</property><property " | ||
1056 | + "name=\"update_policy\">delayed</property><property name=\"adjustment\">" | ||
1057 | + "dclick-time</property><property name=\"digits\">0</property><property n" | ||
1058 | + "ame=\"value_pos\">right</property></object><packing><property name=\"ex" | ||
1059 | + "pand\">True</property><property name=\"fill\">True</property><property " | ||
1060 | + "name=\"position\">1</property></packing></child><child><object class=\"" | ||
1061 | + "GtkLabel\" id=\"dclick-distance-label\"><property name=\"visible\">True" | ||
1062 | + "</property><property name=\"can_focus\">False</property><property name=" | ||
1063 | + "\"xalign\">0</property><property name=\"label\" translatable=\"yes\">D_" | ||
1064 | + "istance:</property><property name=\"use_underline\">True</property><pro" | ||
1065 | + "perty name=\"mnemonic_widget\">dclick-distance-scale</property></object" | ||
1066 | + "><packing><property name=\"expand\">True</property><property name=\"fil" | ||
1067 | + "l\">True</property><property name=\"position\">2</property></packing></" | ||
1068 | + "child><child><object class=\"GtkHScale\" id=\"dclick-distance-scale\"><" | ||
1069 | + "property name=\"visible\">True</property><property name=\"can_focus\">T" | ||
1070 | + "rue</property><property name=\"tooltip_text\" translatable=\"yes\">The " | ||
1071 | + "mouse pointer cannot move farther than this distance between two clicks" | ||
1072 | + " for them to be considered a double click</property><property name=\"up" | ||
1073 | + "date_policy\">delayed</property><property name=\"adjustment\">dclick-di" | ||
1074 | + "stance</property><property name=\"digits\">0</property><property name=\"" | ||
1075 | + "value_pos\">right</property></object><packing><property name=\"expand\"" | ||
1076 | + ">True</property><property name=\"fill\">True</property><property name=\"" | ||
1077 | + "position\">3</property></packing></child></object></child></object></ch" | ||
1078 | + "ild><child type=\"label\"><object class=\"GtkLabel\" id=\"label8\"><pro" | ||
1079 | + "perty name=\"visible\">True</property><property name=\"can_focus\">Fals" | ||
1080 | + "e</property><property name=\"label\" translatable=\"yes\">Double Click<" | ||
1081 | + "/property><attributes><attribute name=\"weight\" value=\"bold\"/></attr" | ||
1082 | + "ibutes></object></child></object><packing><property name=\"expand\">Fal" | ||
1083 | + "se</property><property name=\"fill\">True</property><property name=\"po" | ||
1084 | + "sition\">1</property></packing></child></object><packing><property name" | ||
1085 | + "=\"position\">1</property></packing></child><child type=\"tab\"><object" | ||
1086 | + " class=\"GtkLabel\" id=\"label2\"><property name=\"visible\">True</prop" | ||
1087 | "erty><property name=\"can_focus\">False</property><property name=\"labe" | ||
1088 | - "l\" translatable=\"yes\">Preview</property><attributes><attribute name=" | ||
1089 | - "\"weight\" value=\"bold\"/></attributes></object></child></object><pack" | ||
1090 | - "ing><property name=\"expand\">False</property><property name=\"fill\">T" | ||
1091 | - "rue</property><property name=\"position\">1</property></packing></child" | ||
1092 | - "></object><packing><property name=\"expand\">False</property><property " | ||
1093 | - "name=\"fill\">True</property><property name=\"position\">1</property></" | ||
1094 | - "packing></child></object><packing><property name=\"position\">2</proper" | ||
1095 | - "ty></packing></child><child type=\"tab\"><object class=\"GtkLabel\" id=" | ||
1096 | - "\"label3\"><property name=\"visible\">True</property><property name=\"c" | ||
1097 | - "an_focus\">False</property><property name=\"label\" translatable=\"yes\"" | ||
1098 | - ">T_heme</property><property name=\"use_underline\">True</property></obj" | ||
1099 | - "ect><packing><property name=\"position\">2</property><property name=\"t" | ||
1100 | - "ab_fill\">False</property></packing></child></object><packing><property" | ||
1101 | - " name=\"expand\">True</property><property name=\"fill\">True</property>" | ||
1102 | - "<property name=\"position\">1</property></packing></child></object></ch" | ||
1103 | - "ild><action-widgets><action-widget response=\"0\">button1</action-widge" | ||
1104 | - "t><action-widget response=\"-11\">button2</action-widget></action-widge" | ||
1105 | - "ts></object><object class=\"GtkAdjustment\" id=\"theme-cursor-size\"><p" | ||
1106 | - "roperty name=\"lower\">16</property><property name=\"upper\">48</proper" | ||
1107 | - "ty><property name=\"value\">24</property><property name=\"step_incremen" | ||
1108 | - "t\">1</property><property name=\"page_increment\">11</property></object" | ||
1109 | - "><object class=\"GtkListStore\" id=\"synaptics-scroll-store\"><columns>" | ||
1110 | - "<column type=\"gchararray\"/><column type=\"gboolean\"/></columns><data" | ||
1111 | - "><row><col id=\"0\" translatable=\"yes\">Disabled</col><col id=\"1\">Tr" | ||
1112 | - "ue</col></row><row><col id=\"0\" translatable=\"yes\">Edge scrolling</c" | ||
1113 | - "ol><col id=\"1\">True</col></row><row><col id=\"0\" translatable=\"yes\"" | ||
1114 | - ">Two-finger scrolling</col><col id=\"1\">True</col></row><row><col id=\"" | ||
1115 | - "0\" translatable=\"yes\">Circular scrolling</col><col id=\"1\">True</co" | ||
1116 | - "l></row></data></object><object class=\"GtkListStore\" id=\"wacom-mode-" | ||
1117 | - "store\"><columns><column type=\"gchararray\"/><column type=\"gchararray" | ||
1118 | - "\"/></columns><data><row><col id=\"0\">ABSOLUTE</col><col id=\"1\" tran" | ||
1119 | - "slatable=\"yes\">Pen (absolute)</col></row><row><col id=\"0\">RELATIVE<" | ||
1120 | - "/col><col id=\"1\" translatable=\"yes\">Mouse (relative)</col></row></d" | ||
1121 | - "ata></object><object class=\"GtkListStore\" id=\"wacom-rotation-store\"" | ||
1122 | - "><columns><column type=\"gint\"/><column type=\"gchararray\"/></columns" | ||
1123 | - "><data><row><col id=\"0\">0</col><col id=\"1\" translatable=\"yes\">Non" | ||
1124 | - "e (right-handed)</col></row><row><col id=\"0\">3</col><col id=\"1\" tra" | ||
1125 | - "nslatable=\"yes\">Half (left-handed)</col></row><row><col id=\"0\">1</c" | ||
1126 | - "ol><col id=\"1\" translatable=\"yes\">Clockwise</col></row><row><col id" | ||
1127 | - "=\"0\">2</col><col id=\"1\" translatable=\"yes\">Counterclockwise</col>" | ||
1128 | - "</row></data></object></interface>" | ||
1129 | + "l\" translatable=\"yes\">_Behavior</property><property name=\"use_under" | ||
1130 | + "line\">True</property></object><packing><property name=\"position\">1</" | ||
1131 | + "property><property name=\"tab_fill\">False</property></packing></child>" | ||
1132 | + "<child><object class=\"GtkHBox\" id=\"themes-hbox\"><property name=\"vi" | ||
1133 | + "sible\">True</property><property name=\"can_focus\">False</property><pr" | ||
1134 | + "operty name=\"border_width\">12</property><property name=\"spacing\">12" | ||
1135 | + "</property><child><object class=\"GtkScrolledWindow\" id=\"scrolledwind" | ||
1136 | + "ow2\"><property name=\"visible\">True</property><property name=\"can_fo" | ||
1137 | + "cus\">True</property><property name=\"hscrollbar_policy\">automatic</pr" | ||
1138 | + "operty><property name=\"vscrollbar_policy\">automatic</property><proper" | ||
1139 | + "ty name=\"shadow_type\">etched-in</property><child><object class=\"GtkT" | ||
1140 | + "reeView\" id=\"theme-treeview\"><property name=\"width_request\">200</p" | ||
1141 | + "roperty><property name=\"visible\">True</property><property name=\"can_" | ||
1142 | + "focus\">True</property><property name=\"headers_visible\">False</proper" | ||
1143 | + "ty></object></child></object><packing><property name=\"expand\">True</p" | ||
1144 | + "roperty><property name=\"fill\">True</property><property name=\"positio" | ||
1145 | + "n\">0</property></packing></child><child><object class=\"GtkVBox\" id=\"" | ||
1146 | + "vbox9\"><property name=\"visible\">True</property><property name=\"can_" | ||
1147 | + "focus\">False</property><property name=\"spacing\">6</property><child><" | ||
1148 | + "object class=\"GtkFrame\" id=\"frame5\"><property name=\"visible\">True" | ||
1149 | + "</property><property name=\"can_focus\">False</property><property name=" | ||
1150 | + "\"label_xalign\">0</property><property name=\"shadow_type\">none</prope" | ||
1151 | + "rty><child><object class=\"GtkAlignment\" id=\"alignment5\"><property n" | ||
1152 | + "ame=\"visible\">True</property><property name=\"can_focus\">False</prop" | ||
1153 | + "erty><property name=\"left_padding\">12</property><child><object class=" | ||
1154 | + "\"GtkHBox\" id=\"hbox7\"><property name=\"visible\">True</property><pro" | ||
1155 | + "perty name=\"can_focus\">False</property><property name=\"border_width\"" | ||
1156 | + ">6</property><property name=\"spacing\">12</property><child><object cla" | ||
1157 | + "ss=\"GtkLabel\" id=\"label21\"><property name=\"visible\">True</propert" | ||
1158 | + "y><property name=\"can_focus\">False</property><property name=\"label\"" | ||
1159 | + " translatable=\"yes\">Cursor si_ze:</property><property name=\"use_unde" | ||
1160 | + "rline\">True</property><property name=\"mnemonic_widget\">spin1</proper" | ||
1161 | + "ty></object><packing><property name=\"expand\">False</property><propert" | ||
1162 | + "y name=\"fill\">True</property><property name=\"position\">0</property>" | ||
1163 | + "</packing></child><child><object class=\"GtkSpinButton\" id=\"spin1\"><" | ||
1164 | + "property name=\"visible\">True</property><property name=\"can_focus\">T" | ||
1165 | + "rue</property><property name=\"primary_icon_activatable\">False</proper" | ||
1166 | + "ty><property name=\"secondary_icon_activatable\">False</property><prope" | ||
1167 | + "rty name=\"primary_icon_sensitive\">True</property><property name=\"sec" | ||
1168 | + "ondary_icon_sensitive\">True</property><property name=\"adjustment\">th" | ||
1169 | + "eme-cursor-size</property><property name=\"snap_to_ticks\">True</proper" | ||
1170 | + "ty><property name=\"numeric\">True</property></object><packing><propert" | ||
1171 | + "y name=\"expand\">False</property><property name=\"fill\">True</propert" | ||
1172 | + "y><property name=\"position\">1</property></packing></child></object></" | ||
1173 | + "child></object></child><child type=\"label\"><object class=\"GtkLabel\"" | ||
1174 | + " id=\"label20\"><property name=\"visible\">True</property><property nam" | ||
1175 | + "e=\"can_focus\">False</property><property name=\"label\" translatable=\"" | ||
1176 | + "yes\">Size</property><attributes><attribute name=\"weight\" value=\"bol" | ||
1177 | + "d\"/></attributes></object></child></object><packing><property name=\"e" | ||
1178 | + "xpand\">False</property><property name=\"fill\">True</property><propert" | ||
1179 | + "y name=\"position\">0</property></packing></child><child><object class=" | ||
1180 | + "\"GtkFrame\" id=\"frame6\"><property name=\"visible\">True</property><p" | ||
1181 | + "roperty name=\"can_focus\">False</property><property name=\"label_xalig" | ||
1182 | + "n\">0</property><property name=\"shadow_type\">none</property><child><o" | ||
1183 | + "bject class=\"GtkAlignment\" id=\"alignment6\"><property name=\"visible" | ||
1184 | + "\">True</property><property name=\"can_focus\">False</property><propert" | ||
1185 | + "y name=\"border_width\">6</property><property name=\"xalign\">0</proper" | ||
1186 | + "ty><property name=\"yalign\">0</property><property name=\"xscale\">0</p" | ||
1187 | + "roperty><property name=\"yscale\">0</property><property name=\"top_padd" | ||
1188 | + "ing\">6</property><property name=\"bottom_padding\">6</property><proper" | ||
1189 | + "ty name=\"left_padding\">18</property><property name=\"right_padding\">" | ||
1190 | + "6</property><child><object class=\"GtkImage\" id=\"theme-preview\"><pro" | ||
1191 | + "perty name=\"visible\">True</property><property name=\"can_focus\">Fals" | ||
1192 | + "e</property><property name=\"stock\">gtk-missing-image</property></obje" | ||
1193 | + "ct></child></object></child><child type=\"label\"><object class=\"GtkLa" | ||
1194 | + "bel\" id=\"label22\"><property name=\"visible\">True</property><propert" | ||
1195 | + "y name=\"can_focus\">False</property><property name=\"label\" translata" | ||
1196 | + "ble=\"yes\">Preview</property><attributes><attribute name=\"weight\" va" | ||
1197 | + "lue=\"bold\"/></attributes></object></child></object><packing><property" | ||
1198 | + " name=\"expand\">False</property><property name=\"fill\">True</property" | ||
1199 | + "><property name=\"position\">1</property></packing></child></object><pa" | ||
1200 | + "cking><property name=\"expand\">False</property><property name=\"fill\"" | ||
1201 | + ">True</property><property name=\"position\">1</property></packing></chi" | ||
1202 | + "ld></object><packing><property name=\"position\">2</property></packing>" | ||
1203 | + "</child><child type=\"tab\"><object class=\"GtkLabel\" id=\"label3\"><p" | ||
1204 | + "roperty name=\"visible\">True</property><property name=\"can_focus\">Fa" | ||
1205 | + "lse</property><property name=\"label\" translatable=\"yes\">_Theme</pro" | ||
1206 | + "perty><property name=\"use_underline\">True</property></object><packing" | ||
1207 | + "><property name=\"position\">2</property><property name=\"tab_fill\">Fa" | ||
1208 | + "lse</property></packing></child></object><packing><property name=\"expa" | ||
1209 | + "nd\">True</property><property name=\"fill\">True</property><property na" | ||
1210 | + "me=\"position\">1</property></packing></child></object></child><action-" | ||
1211 | + "widgets><action-widget response=\"-11\">button2</action-widget><action-" | ||
1212 | + "widget response=\"0\">button1</action-widget></action-widgets></object>" | ||
1213 | + "<object class=\"GtkListStore\" id=\"wacom-mode-store\"><columns><column" | ||
1214 | + " type=\"gchararray\"/><column type=\"gchararray\"/></columns><data><row" | ||
1215 | + "><col id=\"0\">ABSOLUTE</col><col id=\"1\" translatable=\"yes\">Pen (ab" | ||
1216 | + "solute)</col></row><row><col id=\"0\">RELATIVE</col><col id=\"1\" trans" | ||
1217 | + "latable=\"yes\">Mouse (relative)</col></row></data></object><object cla" | ||
1218 | + "ss=\"GtkListStore\" id=\"wacom-rotation-store\"><columns><column type=\"" | ||
1219 | + "gint\"/><column type=\"gchararray\"/></columns><data><row><col id=\"0\"" | ||
1220 | + ">0</col><col id=\"1\" translatable=\"yes\">None (right-handed)</col></r" | ||
1221 | + "ow><row><col id=\"0\">3</col><col id=\"1\" translatable=\"yes\">Half (l" | ||
1222 | + "eft-handed)</col></row><row><col id=\"0\">1</col><col id=\"1\" translat" | ||
1223 | + "able=\"yes\">Clockwise</col></row><row><col id=\"0\">2</col><col id=\"1" | ||
1224 | + "\" translatable=\"yes\">Counterclockwise</col></row></data></object></i" | ||
1225 | + "nterface>" | ||
1226 | }; | ||
1227 | |||
1228 | -static const unsigned mouse_dialog_ui_length = 37588u; | ||
1229 | +static const unsigned mouse_dialog_ui_length = 38582u; | ||
1230 | |||
1231 | -- | 150 | -- |
1232 | 1.7.6.5 | 151 | 1.7.6.5 |
1233 | 152 | ||
diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0005-pointers-detect-a-change-of-pointer-device-used-and-.patch b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0005-pointers-detect-a-change-of-pointer-device-used-and-.patch index edcb4e1cd..f4c28397d 100644 --- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0005-pointers-detect-a-change-of-pointer-device-used-and-.patch +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0005-pointers-detect-a-change-of-pointer-device-used-and-.patch | |||
@@ -133,7 +133,7 @@ index 62ebc60..32662cc 100644 | |||
133 | 133 | ||
134 | (*G_OBJECT_CLASS (xfce_pointers_helper_parent_class)->finalize) (object); | 134 | (*G_OBJECT_CLASS (xfce_pointers_helper_parent_class)->finalize) (object); |
135 | } | 135 | } |
136 | @@ -267,17 +295,17 @@ static void | 136 | @@ -267,19 +295,19 @@ static void |
137 | xfce_pointers_helper_syndaemon_check (XfcePointersHelper *helper) | 137 | xfce_pointers_helper_syndaemon_check (XfcePointersHelper *helper) |
138 | { | 138 | { |
139 | #ifdef DEVICE_PROPERTIES | 139 | #ifdef DEVICE_PROPERTIES |
@@ -146,7 +146,9 @@ index 62ebc60..32662cc 100644 | |||
146 | - Atom *props; | 146 | - Atom *props; |
147 | - gint i, nprops; | 147 | - gint i, nprops; |
148 | - gboolean have_synaptics = FALSE; | 148 | - gboolean have_synaptics = FALSE; |
149 | - gchar *args[] = { "syndaemon", "-i", "2.0", "-K", "-R", NULL }; | 149 | - gdouble disable_duration; |
150 | - gchar disable_duration_string[64]; | ||
151 | - gchar *args[] = { "syndaemon", "-i", disable_duration_string, "-K", "-R", NULL }; | ||
150 | - GError *error = NULL; | 152 | - GError *error = NULL; |
151 | + Display *xdisplay = GDK_DISPLAY (); | 153 | + Display *xdisplay = GDK_DISPLAY (); |
152 | + XDeviceInfo *device_list; | 154 | + XDeviceInfo *device_list; |
@@ -157,7 +159,9 @@ index 62ebc60..32662cc 100644 | |||
157 | + Atom *props; | 159 | + Atom *props; |
158 | + gint i, nprops; | 160 | + gint i, nprops; |
159 | + gboolean have_synaptics = FALSE; | 161 | + gboolean have_synaptics = FALSE; |
160 | + gchar *args[] = { "syndaemon", "-i", "2.0", "-K", "-R", NULL }; | 162 | + gdouble disable_duration; |
163 | + gchar disable_duration_string[64]; | ||
164 | + gchar *args[] = { "syndaemon", "-i", disable_duration_string, "-K", "-R", NULL }; | ||
161 | + GError *error = NULL; | 165 | + GError *error = NULL; |
162 | 166 | ||
163 | /* only stop a running daemon */ | 167 | /* only stop a running daemon */ |
diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.11.0.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb index 4aac5a374..4b75dd7ee 100644 --- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.11.0.bb +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb | |||
@@ -6,9 +6,9 @@ DEPENDS = "exo garcon gtk+ libxfce4util libxfce4ui xfconf dbus-glib libxi virtua | |||
6 | 6 | ||
7 | inherit xfce | 7 | inherit xfce |
8 | 8 | ||
9 | SRC_URI += "file://0001-xsettings.xml-remove-trouble-causing-comment.patch \ | 9 | SRC_URI = " git://gitorious.org/xfce/xfce4-settings.git;protocol=git;branch=for-oe \ |
10 | file://0001-xsettings.xml-remove-trouble-causing-comment.patch \ | ||
10 | file://0002-xsettings.xml-Set-default-themes.patch \ | 11 | file://0002-xsettings.xml-Set-default-themes.patch \ |
11 | file://0003-Remember-the-settings-manager-window-size-bug-9384.patch \ | ||
12 | file://touchscreen/invisible \ | 12 | file://touchscreen/invisible \ |
13 | file://touchscreen/wait \ | 13 | file://touchscreen/wait \ |
14 | file://touchscreen/0001-add-cursor-theme-xfce-invisible.patch \ | 14 | file://touchscreen/0001-add-cursor-theme-xfce-invisible.patch \ |
@@ -17,13 +17,24 @@ SRC_URI += "file://0001-xsettings.xml-remove-trouble-causing-comment.patch \ | |||
17 | file://touchscreen/0004-XfceXSettingsHelper-gets-a-property-touchscreen-poin.patch \ | 17 | file://touchscreen/0004-XfceXSettingsHelper-gets-a-property-touchscreen-poin.patch \ |
18 | file://touchscreen/0005-pointers-detect-a-change-of-pointer-device-used-and-.patch \ | 18 | file://touchscreen/0005-pointers-detect-a-change-of-pointer-device-used-and-.patch \ |
19 | " | 19 | " |
20 | SRC_URI[md5sum] = "3bf42281b64b10b2691008cd693f7dbd" | 20 | SRCREV = "b7a0e1fd77f5bb5c372223ff62aec7acf252f061" |
21 | SRC_URI[sha256sum] = "4a4f1e79a58b524f3a6dd030b6fc687671b35566f847e6f516c6f84211191698" | 21 | S = "${WORKDIR}/git" |
22 | PV = "4.10.0+git${SRCPV}" | ||
23 | |||
24 | EXTRA_OECONF += "--enable-maintainer-mode --disable-debug" | ||
22 | 25 | ||
23 | PACKAGECONFIG ??= "" | 26 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','systemd','datetime-setter','',d)}" |
27 | PACKAGECONFIG[datetime-setter] = "--enable-datetime-settings, --disable-datetime-settings,, tzdata" | ||
24 | PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify" | 28 | PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify" |
25 | 29 | ||
26 | FILES_${PN} += "${libdir}/xfce4" | 30 | do_configure_prepend() { |
31 | NOCONFIGURE=yes ./autogen.sh | ||
32 | } | ||
33 | |||
34 | FILES_${PN} += " \ | ||
35 | ${libdir}/xfce4 \ | ||
36 | ${datadir}/xfce4 \ | ||
37 | " | ||
27 | 38 | ||
28 | do_install_prepend() { | 39 | do_install_prepend() { |
29 | # somehow binary files are not patched correctly by oe-patch - so copy them | 40 | # somehow binary files are not patched correctly by oe-patch - so copy them |