Merge lp:~attente/gnome-control-center/keyboard-layout-panel into lp:~ubuntu-desktop/gnome-control-center/ubuntu

Proposed by William Hua
Status: Merged
Merged at revision: 607
Proposed branch: lp:~attente/gnome-control-center/keyboard-layout-panel
Merge into: lp:~ubuntu-desktop/gnome-control-center/ubuntu
Diff against target: 2262 lines (+637/-1385)
5 files modified
debian/patches/10_keyboard_layout_on_unity.patch (+99/-0)
debian/patches/git_drop_ibus_engine_whitelist.patch (+1/-1)
debian/patches/git_show_per_window_input_settings.patch (+6/-6)
debian/patches/input-sources-text-entry.patch (+529/-1377)
debian/patches/series (+2/-1)
To merge this branch: bzr merge lp:~attente/gnome-control-center/keyboard-layout-panel
Reviewer Review Type Date Requested Status
Sebastien Bacher Needs Fixing
Review via email: mp+188251@code.launchpad.net

Commit message

Re-add 10_keyboard_layout_on_unity.patch.

Description of the change

Re-add 10_keyboard_layout_on_unity.patch.

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks for the work, some comments:

* Why did you change the git_drop_ibus_engine_whitelist.patch (is that still what is in git?)

* with that version, I get those warnings when clicking on "keyboard layout"

"Gtk-WARNING **: Unknown object user_input_source specified in sizegroup system-input-source-sizegroup"

those as well (but that was also happening with the previous version):

g_settings_bind_with_mapping: assertion 'G_IS_OBJECT (object)' failed

* it's my fault for not pointing that before/pointing the wrong patch, but could you include those changes to the .desktop:
http://bazaar.launchpad.net/~ubuntu-desktop/gnome-control-center/ubuntu/revision/522

(there seems to be some noise/patch refresh in that revision, the important part is to have different .desktop for unity and GNOME so they can have different names)

Otherwise it looks good to merge in, settings as "needs fixing" until the different .desktop for GNOME and Unity item is done. We can deal with the warning in another bug/merge request if you want

review: Needs Fixing
Revision history for this message
William Hua (attente) wrote :

Thanks for the review, just to cover the first point before I forget, there is a one-line fuzz caused by the changes in 10_keyboard_layout_on_unity.patch and input-sources-text-entry.patch. I should be able to fix up the other two issues later today.

Revision history for this message
Gunnar Hjalmarsson (gunnarhj) wrote :

Given the ibus integration, shouldn't the name of the .desktop file be "Text Entry" rather than "Keyboard Layout"?

606. By William Hua on 2013-09-30

Different region panel desktop files for GNOME and Unity.

607. By William Hua on 2013-09-30

Remove invalid size group.

608. By William Hua on 2013-09-30

Re-order patches...

Revision history for this message
William Hua (attente) wrote :

Thanks for catching that, Gunnar, it should be fixed now.

609. By William Hua on 2013-09-30

Don't reference widget which may not exist.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/patches/10_keyboard_layout_on_unity.patch'
2--- debian/patches/10_keyboard_layout_on_unity.patch 1970-01-01 00:00:00 +0000
3+++ debian/patches/10_keyboard_layout_on_unity.patch 2013-09-30 21:01:55 +0000
4@@ -0,0 +1,99 @@
5+--- a/panels/region/gnome-region-panel.desktop.in.in
6++++ b/panels/region/gnome-region-panel.desktop.in.in
7+@@ -7,7 +7,7 @@
8+ Type=Application
9+ StartupNotify=true
10+ Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings
11+-OnlyShowIn=GNOME;Unity;
12++OnlyShowIn=GNOME;
13+ X-GNOME-Bugzilla-Bugzilla=GNOME
14+ X-GNOME-Bugzilla-Product=gnome-control-center
15+ X-GNOME-Bugzilla-Component=region
16+--- a/panels/region/cc-region-panel.c
17++++ b/panels/region/cc-region-panel.c
18+@@ -47,6 +47,12 @@
19+ SYSTEM_PAGE
20+ };
21+
22++static gboolean
23++is_unity (void)
24++{
25++ return g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0;
26++}
27++
28+ static void
29+ cc_region_panel_set_page (CcRegionPanel *panel,
30+ const char *page)
31+@@ -149,16 +155,24 @@
32+ return;
33+ }
34+
35+- prefs_widget = (GtkWidget *) gtk_builder_get_object (priv->builder,
36+- "region_notebook");
37++ if (!is_unity ())
38++ prefs_widget = (GtkWidget *) gtk_builder_get_object (priv->builder,
39++ "region_notebook");
40++ else
41++ prefs_widget = (GtkWidget *) gtk_builder_get_object (priv->builder,
42++ "vbox5");
43++
44+ gtk_widget_set_size_request (GTK_WIDGET (prefs_widget), -1, 400);
45+
46+ gtk_widget_reparent (prefs_widget, GTK_WIDGET (self));
47+
48+ setup_input_tabs (priv->builder, self);
49+- setup_language (priv->builder);
50+- setup_formats (priv->builder);
51+- setup_system (priv->builder);
52++
53++ if (!is_unity ()) {
54++ setup_language (priv->builder);
55++ setup_formats (priv->builder);
56++ setup_system (priv->builder);
57++ }
58+ }
59+
60+ void
61+--- /dev/null
62++++ b/panels/region/unity-region-panel.desktop.in.in
63+@@ -0,0 +1,17 @@
64++[Desktop Entry]
65++_Name=Text Entry
66++_Comment=Change your keyboard or input method settings
67++Exec=gnome-control-center region
68++Icon=preferences-desktop-keyboard-shortcuts
69++Terminal=false
70++Type=Application
71++StartupNotify=true
72++Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings
73++OnlyShowIn=Unity;
74++X-GNOME-Bugzilla-Bugzilla=GNOME
75++X-GNOME-Bugzilla-Product=gnome-control-center
76++X-GNOME-Bugzilla-Component=region
77++X-GNOME-Bugzilla-Version=@VERSION@
78++X-GNOME-Settings-Panel=region
79++# Translators: those are keywords for the region control-center panel
80++_Keywords=Language;Layout;Keyboard;Input Method;Text Entry;
81+--- a/panels/region/Makefile.am
82++++ b/panels/region/Makefile.am
83+@@ -40,7 +40,9 @@
84+ $(NULL)
85+
86+ desktopdir = $(datadir)/applications
87+-Desktop_in_files = gnome-region-panel.desktop.in
88++Desktop_in_files = \
89++ gnome-region-panel.desktop.in \
90++ unity-region-panel.desktop.in
91+ desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
92+
93+ CLEANFILES = $(Desktop_in_files) $(desktop_DATA)
94+--- a/configure.ac
95++++ b/configure.ac
96+@@ -414,6 +414,7 @@
97+ panels/keyboard/gnome-keybindings.pc
98+ panels/region/Makefile
99+ panels/region/gnome-region-panel.desktop.in
100++panels/region/unity-region-panel.desktop.in
101+ panels/mouse/Makefile
102+ panels/mouse/gnome-mouse-panel.desktop.in
103+ panels/online-accounts/Makefile
104
105=== modified file 'debian/patches/git_drop_ibus_engine_whitelist.patch'
106--- debian/patches/git_drop_ibus_engine_whitelist.patch 2013-09-14 15:17:54 +0000
107+++ debian/patches/git_drop_ibus_engine_whitelist.patch 2013-09-30 21:01:55 +0000
108@@ -228,7 +228,7 @@
109 -};
110 #endif /* HAVE_IBUS */
111
112- static gboolean
113+ static void populate_model (GtkListStore *store,
114 @@ -475,10 +263,10 @@
115 IBusEngineDesc *engine = l->data;
116 const gchar *engine_id = ibus_engine_desc_get_name (engine);
117
118=== modified file 'debian/patches/git_show_per_window_input_settings.patch'
119--- debian/patches/git_show_per_window_input_settings.patch 2013-09-24 20:59:44 +0000
120+++ debian/patches/git_show_per_window_input_settings.patch 2013-09-30 21:01:55 +0000
121@@ -285,10 +285,11 @@
122 <packing>
123 --- a/panels/region/gnome-region-panel-input.c
124 +++ b/panels/region/gnome-region-panel-input.c
125-@@ -1760,6 +1760,18 @@
126+@@ -1338,6 +1338,18 @@
127+ "changed::" KEY_INPUT_SOURCES,
128 G_CALLBACK (input_sources_changed),
129 builder);
130-
131++
132 + g_settings_bind (input_sources_settings, "per-window",
133 + WID("per-window-radio-true"), "active",
134 + G_SETTINGS_BIND_DEFAULT);
135@@ -300,7 +301,6 @@
136 + G_CALLBACK (g_settings_apply), input_sources_settings);
137 + g_signal_connect_swapped (WID("per-window-radio-false"), "clicked",
138 + G_CALLBACK (g_settings_apply), input_sources_settings);
139-+
140- if (has_indicator_keyboard ())
141- {
142- libgnomekbd_settings = g_settings_new (LIBGNOMEKBD_DESKTOP_SCHEMA_ID);
143+ }
144+
145+ static void
146
147=== modified file 'debian/patches/input-sources-text-entry.patch'
148--- debian/patches/input-sources-text-entry.patch 2013-09-24 20:59:44 +0000
149+++ debian/patches/input-sources-text-entry.patch 2013-09-30 21:01:55 +0000
150@@ -54,12 +54,11 @@
151
152 #ifdef HAVE_IBUS
153 static IBusBus *ibus = NULL;
154-@@ -279,6 +301,31 @@
155- };
156- #endif /* HAVE_IBUS */
157+@@ -289,6 +311,31 @@
158+ static GtkTreeModel *tree_view_get_actual_model (GtkTreeView *tv);
159
160-+static gboolean
161-+is_ubuntu (void)
162+ static gboolean
163++is_unity (void)
164 +{
165 + return g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0;
166 +}
167@@ -67,7 +66,7 @@
168 +static gboolean
169 +has_indicator_keyboard (void)
170 +{
171-+ if (is_ubuntu ())
172++ if (is_unity ())
173 + {
174 + const gchar * const *schemas = g_settings_list_schemas ();
175 +
176@@ -83,9 +82,10 @@
177 + return FALSE;
178 +}
179 +
180- static void populate_model (GtkListStore *store,
181- GtkListStore *active_sources_store);
182- static GtkWidget *input_chooser_new (GtkWindow *main_window,
183++static gboolean
184+ strv_contains (const gchar * const *strv,
185+ const gchar *str)
186+ {
187 @@ -467,9 +514,6 @@
188 ibus_cancellable,
189 (GAsyncReadyCallback)fetch_ibus_engines_result,
190@@ -387,6 +387,15 @@
191 }
192 maybe_start_ibus ();
193 }
194+@@ -909,7 +1223,7 @@
195+
196+ g_debug ("add an input source");
197+
198+- toplevel = gtk_widget_get_toplevel (WID ("region_notebook"));
199++ toplevel = gtk_widget_get_toplevel (WID ("active_input_sources"));
200+ treeview = WID ("active_input_sources");
201+ active_sources = GTK_LIST_STORE (tree_view_get_actual_model (GTK_TREE_VIEW (treeview)));
202+
203 @@ -1150,6 +1464,8 @@
204 const gchar *argv[] = { "shortcuts", "Typing", NULL };
205 GError *error = NULL;
206@@ -451,7 +460,7 @@
207 + *key,
208 + *code,
209 + *mask,
210-+ gtk_widget_get_toplevel (WID ("region_notebook")));
211++ gtk_widget_get_toplevel (GTK_WIDGET (entry)));
212 +
213 + return edited ? GTK_ENTRY_ACCEL_UPDATE : GTK_ENTRY_ACCEL_IGNORE;
214 +}
215@@ -549,7 +558,7 @@
216 #endif
217
218 populate_with_active_sources (store);
219-@@ -1327,17 +1753,70 @@
220+@@ -1327,29 +1753,84 @@
221 G_CALLBACK (show_selected_layout), builder);
222 g_signal_connect (WID("input_source_settings"), "clicked",
223 G_CALLBACK (show_selected_settings), builder);
224@@ -564,7 +573,18 @@
225 "changed::" KEY_INPUT_SOURCES,
226 G_CALLBACK (input_sources_changed),
227 builder);
228-+
229+
230+- g_settings_bind (input_sources_settings, "per-window",
231+- WID("per-window-radio-true"), "active",
232+- G_SETTINGS_BIND_DEFAULT);
233+- g_settings_bind (input_sources_settings, "per-window",
234+- WID("per-window-radio-false"), "active",
235+- G_SETTINGS_BIND_DEFAULT | G_SETTINGS_BIND_INVERT_BOOLEAN);
236+- /* because we are in delay-apply mode */
237+- g_signal_connect_swapped (WID("per-window-radio-true"), "clicked",
238+- G_CALLBACK (g_settings_apply), input_sources_settings);
239+- g_signal_connect_swapped (WID("per-window-radio-false"), "clicked",
240+- G_CALLBACK (g_settings_apply), input_sources_settings);
241 + if (has_indicator_keyboard ())
242 + {
243 + libgnomekbd_settings = g_settings_new (LIBGNOMEKBD_DESKTOP_SCHEMA_ID);
244@@ -621,7 +641,21 @@
245 + builder);
246 + }
247 + else
248-+ update_shortcuts (builder);
249++ {
250++ g_settings_bind (input_sources_settings, "per-window",
251++ WID("per-window-radio-true"), "active",
252++ G_SETTINGS_BIND_DEFAULT);
253++ g_settings_bind (input_sources_settings, "per-window",
254++ WID("per-window-radio-false"), "active",
255++ G_SETTINGS_BIND_DEFAULT | G_SETTINGS_BIND_INVERT_BOOLEAN);
256++ /* because we are in delay-apply mode */
257++ g_signal_connect_swapped (WID("per-window-radio-true"), "clicked",
258++ G_CALLBACK (g_settings_apply), input_sources_settings);
259++ g_signal_connect_swapped (WID("per-window-radio-false"), "clicked",
260++ G_CALLBACK (g_settings_apply), input_sources_settings);
261++
262++ update_shortcuts (builder);
263++ }
264 }
265
266 static void
267@@ -1176,7 +1210,7 @@
268 uidir = $(pkgdatadir)/ui
269 ui_DATA = \
270 gnome-region-panel.ui \
271-+ ubuntu-region-panel.ui \
272++ unity-region-panel.ui \
273 gnome-region-panel-input-chooser.ui \
274 $(NULL)
275
276@@ -1190,41 +1224,39 @@
277
278 CC_PANEL_REGISTER (CcRegionPanel, cc_region_panel)
279
280-@@ -47,6 +48,33 @@
281+@@ -47,12 +48,31 @@
282 SYSTEM_PAGE
283 };
284
285 +#define INDICATOR_KEYBOARD_SCHEMA_ID "com.canonical.indicator.keyboard"
286 +
287-+static gboolean
288-+is_ubuntu (void)
289-+{
290-+ return g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0;
291-+}
292-+
293+ static gboolean
294+ is_unity (void)
295+ {
296+ return g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0;
297+ }
298+
299 +static gboolean
300 +has_indicator_keyboard (void)
301 +{
302-+ if (is_ubuntu ())
303-+ {
304-+ const gchar * const *schemas = g_settings_list_schemas ();
305-+
306-+ while (*schemas != NULL)
307-+ {
308-+ if (g_strcmp0 (*schemas, INDICATOR_KEYBOARD_SCHEMA_ID) == 0)
309-+ return TRUE;
310-+
311-+ schemas++;
312-+ }
313-+ }
314-+
315-+ return FALSE;
316++ if (is_unity ()) {
317++ const gchar * const *schemas = g_settings_list_schemas ();
318++
319++ while (*schemas != NULL) {
320++ if (g_strcmp0 (*schemas, INDICATOR_KEYBOARD_SCHEMA_ID) == 0)
321++ return TRUE;
322++
323++ schemas++;
324++ }
325++ }
326++
327++ return FALSE;
328 +}
329 +
330 static void
331 cc_region_panel_set_page (CcRegionPanel *panel,
332 const char *page)
333-@@ -136,13 +164,21 @@
334+@@ -142,13 +162,21 @@
335 GtkWidget *prefs_widget;
336 GError *error = NULL;
337
338@@ -1239,7 +1271,7 @@
339 - &error);
340 + if (has_indicator_keyboard ())
341 + gtk_builder_add_from_file (priv->builder,
342-+ GNOMECC_UI_DIR "/ubuntu-region-panel.ui",
343++ GNOMECC_UI_DIR "/unity-region-panel.ui",
344 + &error);
345 + else
346 + gtk_builder_add_from_file (priv->builder,
347@@ -2990,8 +3022,8 @@
348 [type: gettext/glade]panels/screen/screen.ui
349 panels/sound/applet-main.c
350 --- /dev/null
351-+++ b/panels/region/ubuntu-region-panel.ui
352-@@ -0,0 +1,1529 @@
353++++ b/panels/region/unity-region-panel.ui
354+@@ -0,0 +1,649 @@
355 +<?xml version="1.0" encoding="UTF-8"?>
356 +<interface>
357 + <!-- interface-requires gtk+ 3.0 -->
358@@ -3095,47 +3127,47 @@
359 + <property name="border_width">5</property>
360 + <property name="spacing">12</property>
361 + <child>
362-+ <object class="GtkNotebook" id="region_notebook">
363++ <object class="GtkVBox" id="vbox5">
364 + <property name="visible">True</property>
365-+ <property name="can_focus">True</property>
366-+ <property name="border_width">10</property>
367++ <property name="can_focus">False</property>
368++ <property name="border_width">12</property>
369++ <property name="spacing">12</property>
370 + <child>
371-+ <object class="GtkVBox" id="vbox2">
372++ <object class="GtkHBox" id="hbox3">
373 + <property name="visible">True</property>
374 + <property name="can_focus">False</property>
375-+ <property name="border_width">12</property>
376 + <property name="spacing">12</property>
377 + <child>
378-+ <object class="GtkLabel" id="label4">
379-+ <property name="visible">True</property>
380-+ <property name="can_focus">False</property>
381-+ <property name="xalign">0</property>
382-+ <property name="label" translatable="yes">Select a display language (change will be applied next time you log in)</property>
383-+ </object>
384-+ <packing>
385-+ <property name="expand">False</property>
386-+ <property name="fill">True</property>
387-+ <property name="position">0</property>
388-+ </packing>
389-+ </child>
390-+ <child>
391-+ <object class="GtkBox" id="hbox1">
392-+ <property name="visible">True</property>
393-+ <property name="can_focus">False</property>
394-+ <property name="orientation">vertical</property>
395-+ <child>
396-+ <object class="GtkScrolledWindow" id="language-swindow">
397++ <object class="GtkVBox" id="vbox6">
398++ <property name="visible">True</property>
399++ <property name="can_focus">False</property>
400++ <property name="margin_right">5</property>
401++ <child>
402++ <object class="GtkLabel" id="label2">
403++ <property name="visible">True</property>
404++ <property name="can_focus">False</property>
405++ <property name="margin_bottom">5</property>
406++ <property name="xalign">0</property>
407++ <property name="label" translatable="yes">Input sources to use:</property>
408++ </object>
409++ <packing>
410++ <property name="expand">False</property>
411++ <property name="fill">True</property>
412++ <property name="position">0</property>
413++ </packing>
414++ </child>
415++ <child>
416++ <object class="GtkScrolledWindow" id="input_sources_swindow">
417 + <property name="visible">True</property>
418 + <property name="can_focus">True</property>
419-+ <property name="hscrollbar_policy">never</property>
420 + <property name="shadow_type">in</property>
421 + <child>
422-+ <object class="GtkTreeView" id="display_language_treeview">
423++ <object class="GtkTreeView" id="active_input_sources">
424 + <property name="visible">True</property>
425 + <property name="can_focus">True</property>
426 + <property name="headers_visible">False</property>
427 + <child internal-child="selection">
428-+ <object class="GtkTreeSelection" id="language-treeview-selection"/>
429++ <object class="GtkTreeSelection" id="treeview-selection3"/>
430 + </child>
431 + </object>
432 + </child>
433@@ -3143,11 +3175,12 @@
434 + <packing>
435 + <property name="expand">True</property>
436 + <property name="fill">True</property>
437-+ <property name="position">0</property>
438++ <property name="position">1</property>
439 + </packing>
440 + </child>
441 + <child>
442-+ <object class="GtkToolbar" id="language-toolbar">
443++ <object class="GtkToolbar" id="input-toolbar">
444++ <property name="visible">True</property>
445 + <property name="can_focus">False</property>
446 + <property name="toolbar_style">icons</property>
447 + <property name="show_arrow">False</property>
448@@ -3156,18 +3189,231 @@
449 + <class name="inline-toolbar"/>
450 + </style>
451 + <child>
452-+ <object class="GtkToolButton" id="language_add">
453-+ <property name="visible">True</property>
454-+ <property name="can_focus">False</property>
455-+ <property name="label" translatable="yes">Add Language</property>
456-+ <property name="use_underline">True</property>
457-+ <property name="icon_name">list-add-symbolic</property>
458-+ </object>
459-+ <packing>
460-+ <property name="expand">False</property>
461-+ <property name="homogeneous">True</property>
462-+ </packing>
463-+ </child>
464++ <object class="GtkToolItem" id="i_s_ar_item">
465++ <property name="visible">True</property>
466++ <property name="can_focus">False</property>
467++ <child>
468++ <object class="GtkBox" id="i_s_ar_box">
469++ <property name="visible">True</property>
470++ <property name="can_focus">False</property>
471++ <child>
472++ <object class="GtkButton" id="input_source_add">
473++ <property name="visible">True</property>
474++ <property name="can_focus">False</property>
475++ <property name="receives_default">False</property>
476++ <child>
477++ <object class="GtkImage" id="i_s_a_image">
478++ <property name="visible">True</property>
479++ <property name="can_focus">False</property>
480++ <property name="icon_name">list-add-symbolic</property>
481++ <property name="icon-size">1</property>
482++ </object>
483++ </child>
484++ </object>
485++ <packing>
486++ <property name="expand">False</property>
487++ <property name="fill">True</property>
488++ <property name="position">0</property>
489++ </packing>
490++ </child>
491++ <child>
492++ <object class="GtkButton" id="input_source_remove">
493++ <property name="visible">True</property>
494++ <property name="can_focus">False</property>
495++ <property name="receives_default">False</property>
496++ <child>
497++ <object class="GtkImage" id="i_s_r_image">
498++ <property name="visible">True</property>
499++ <property name="can_focus">False</property>
500++ <property name="icon_name">list-remove-symbolic</property>
501++ <property name="icon-size">1</property>
502++ </object>
503++ </child>
504++ </object>
505++ <packing>
506++ <property name="expand">False</property>
507++ <property name="fill">True</property>
508++ <property name="position">1</property>
509++ </packing>
510++ </child>
511++ </object>
512++ </child>
513++ </object>
514++ <packing>
515++ <property name="expand">False</property>
516++ </packing>
517++ </child>
518++ <child>
519++ <object class="GtkSeparatorToolItem" id="sep1">
520++ <property name="visible">True</property>
521++ <property name="can_focus">False</property>
522++ <property name="draw">False</property>
523++ </object>
524++ <packing>
525++ <property name="expand">True</property>
526++ </packing>
527++ </child>
528++ <child>
529++ <object class="GtkToolItem" id="i_s_ud_item">
530++ <property name="visible">True</property>
531++ <property name="can_focus">False</property>
532++ <child>
533++ <object class="GtkBox" id="i_s_ud_box">
534++ <property name="visible">True</property>
535++ <property name="can_focus">False</property>
536++ <child>
537++ <object class="GtkButton" id="input_source_move_up">
538++ <property name="visible">True</property>
539++ <property name="can_focus">False</property>
540++ <property name="receives_default">False</property>
541++ <child>
542++ <object class="GtkImage" id="i_s_u_image">
543++ <property name="visible">True</property>
544++ <property name="can_focus">False</property>
545++ <property name="icon_name">go-up-symbolic</property>
546++ <property name="icon-size">1</property>
547++ </object>
548++ </child>
549++ </object>
550++ <packing>
551++ <property name="expand">False</property>
552++ <property name="fill">True</property>
553++ <property name="position">0</property>
554++ </packing>
555++ </child>
556++ <child>
557++ <object class="GtkButton" id="input_source_move_down">
558++ <property name="visible">True</property>
559++ <property name="can_focus">False</property>
560++ <property name="receives_default">False</property>
561++ <child>
562++ <object class="GtkImage" id="i_s_d_image">
563++ <property name="visible">True</property>
564++ <property name="can_focus">False</property>
565++ <property name="icon_name">go-down-symbolic</property>
566++ <property name="icon-size">1</property>
567++ </object>
568++ </child>
569++ </object>
570++ <packing>
571++ <property name="expand">False</property>
572++ <property name="fill">True</property>
573++ <property name="position">1</property>
574++ </packing>
575++ </child>
576++ </object>
577++ </child>
578++ </object>
579++ <packing>
580++ <property name="expand">False</property>
581++ </packing>
582++ </child>
583++ <child>
584++ <object class="GtkSeparatorToolItem" id="sep2">
585++ <property name="visible">True</property>
586++ <property name="can_focus">False</property>
587++ <property name="hexpand">True</property>
588++ <property name="draw">False</property>
589++ </object>
590++ <packing>
591++ <property name="expand">True</property>
592++ </packing>
593++ </child>
594++ <child>
595++ <object class="GtkToolItem" id="i_s_sp_item">
596++ <property name="visible">True</property>
597++ <property name="can_focus">False</property>
598++ <child>
599++ <object class="GtkBox" id="i_s_sp_box">
600++ <property name="visible">True</property>
601++ <property name="can_focus">False</property>
602++ <child>
603++ <object class="GtkButton" id="input_source_settings">
604++ <property name="visible">True</property>
605++ <property name="can_focus">False</property>
606++ <property name="receives_default">False</property>
607++ <child>
608++ <object class="GtkImage" id="i_s_s_image">
609++ <property name="visible">True</property>
610++ <property name="can_focus">False</property>
611++ <property name="pixel_size">16</property>
612++ <property name="icon_name">preferences-system-symbolic</property>
613++ <property name="icon-size">1</property>
614++ </object>
615++ </child>
616++ </object>
617++ <packing>
618++ <property name="expand">False</property>
619++ <property name="fill">True</property>
620++ <property name="position">0</property>
621++ </packing>
622++ </child>
623++ <child>
624++ <object class="GtkButton" id="input_source_show">
625++ <property name="visible">True</property>
626++ <property name="can_focus">False</property>
627++ <property name="receives_default">False</property>
628++ <child>
629++ <object class="GtkImage" id="i_s_p_image">
630++ <property name="visible">True</property>
631++ <property name="can_focus">False</property>
632++ <property name="icon_name">input-keyboard-symbolic</property>
633++ <property name="icon-size">1</property>
634++ </object>
635++ </child>
636++ </object>
637++ <packing>
638++ <property name="expand">False</property>
639++ <property name="fill">True</property>
640++ <property name="position">1</property>
641++ </packing>
642++ </child>
643++ </object>
644++ </child>
645++ </object>
646++ <packing>
647++ <property name="expand">False</property>
648++ </packing>
649++ </child>
650++ </object>
651++ <packing>
652++ <property name="expand">False</property>
653++ <property name="fill">True</property>
654++ <property name="position">2</property>
655++ </packing>
656++ </child>
657++ </object>
658++ <packing>
659++ <property name="expand">True</property>
660++ <property name="fill">True</property>
661++ <property name="position">0</property>
662++ </packing>
663++ </child>
664++ <child>
665++ <object class="GtkBox" id="box2">
666++ <property name="visible">True</property>
667++ <property name="can_focus">False</property>
668++ <property name="orientation">vertical</property>
669++ <child>
670++ <object class="GtkLabel" id="label22">
671++ <property name="visible">True</property>
672++ <property name="can_focus">False</property>
673++ <property name="margin_bottom">5</property>
674++ <property name="xalign">0</property>
675++ <property name="label" translatable="yes">Switch to next source using:</property>
676++ </object>
677++ <packing>
678++ <property name="expand">False</property>
679++ <property name="fill">True</property>
680++ <property name="position">0</property>
681++ </packing>
682++ </child>
683++ <child>
684++ <object class="GtkEntryAccel" id="next-source-entry">
685++ <property name="visible">True</property>
686++ <property name="can_focus">True</property>
687++ <property name="margin_bottom">5</property>
688++ <property name="invisible_char">•</property>
689 + </object>
690 + <packing>
691 + <property name="expand">False</property>
692@@ -3176,40 +3422,181 @@
693 + </packing>
694 + </child>
695 + <child>
696-+ <object class="GtkVBox" id="vbox3">
697-+ <property name="can_focus">False</property>
698-+ <child>
699-+ <object class="GtkLabel" id="label23">
700-+ <property name="visible">True</property>
701-+ <property name="can_focus">False</property>
702-+ <property name="label" translatable="yes">Add Language</property>
703-+ <property name="use_underline">True</property>
704-+ </object>
705-+ <packing>
706-+ <property name="expand">True</property>
707-+ <property name="fill">True</property>
708-+ <property name="position">0</property>
709-+ </packing>
710-+ </child>
711-+ <child>
712-+ <object class="GtkLinkButton" id="linkbutton1">
713-+ <property name="label" translatable="yes">Install languages…</property>
714-+ <property name="visible">True</property>
715-+ <property name="can_focus">True</property>
716++ <object class="GtkLabel" id="label24">
717++ <property name="visible">True</property>
718++ <property name="can_focus">False</property>
719++ <property name="margin_bottom">5</property>
720++ <property name="xalign">0</property>
721++ <property name="label" translatable="yes">Switch to previous source using:</property>
722++ </object>
723++ <packing>
724++ <property name="expand">False</property>
725++ <property name="fill">True</property>
726++ <property name="position">2</property>
727++ </packing>
728++ </child>
729++ <child>
730++ <object class="GtkEntryAccel" id="prev-source-entry">
731++ <property name="visible">True</property>
732++ <property name="can_focus">True</property>
733++ <property name="margin_bottom">15</property>
734++ <property name="invisible_char">•</property>
735++ </object>
736++ <packing>
737++ <property name="expand">False</property>
738++ <property name="fill">True</property>
739++ <property name="position">3</property>
740++ </packing>
741++ </child>
742++ <child>
743++ <object class="GtkRadioButton" id="same-source-radio">
744++ <property name="label" translatable="yes">Use the same source for all windows</property>
745++ <property name="visible">True</property>
746++ <property name="can_focus">False</property>
747++ <property name="receives_default">False</property>
748++ <property name="xalign">0</property>
749++ <property name="active">True</property>
750++ <property name="draw_indicator">True</property>
751++ </object>
752++ <packing>
753++ <property name="expand">False</property>
754++ <property name="fill">True</property>
755++ <property name="position">4</property>
756++ </packing>
757++ </child>
758++ <child>
759++ <object class="GtkRadioButton" id="different-source-radio">
760++ <property name="label" translatable="yes">Allow different sources for each window</property>
761++ <property name="visible">True</property>
762++ <property name="can_focus">False</property>
763++ <property name="receives_default">False</property>
764++ <property name="xalign">0</property>
765++ <property name="active">True</property>
766++ <property name="draw_indicator">True</property>
767++ <property name="group">same-source-radio</property>
768++ </object>
769++ <packing>
770++ <property name="expand">False</property>
771++ <property name="fill">True</property>
772++ <property name="position">5</property>
773++ </packing>
774++ </child>
775++ <child>
776++ <object class="GtkRadioButton" id="default-source-radio">
777++ <property name="label" translatable="yes">New windows use the default source</property>
778++ <property name="visible">True</property>
779++ <property name="can_focus">False</property>
780++ <property name="receives_default">False</property>
781++ <property name="margin_left">25</property>
782++ <property name="xalign">0</property>
783++ <property name="active">True</property>
784++ <property name="draw_indicator">True</property>
785++ </object>
786++ <packing>
787++ <property name="expand">False</property>
788++ <property name="fill">True</property>
789++ <property name="position">6</property>
790++ </packing>
791++ </child>
792++ <child>
793++ <object class="GtkRadioButton" id="current-source-radio">
794++ <property name="label" translatable="yes">New windows use the current source</property>
795++ <property name="visible">True</property>
796++ <property name="can_focus">False</property>
797++ <property name="receives_default">False</property>
798++ <property name="margin_left">25</property>
799++ <property name="margin_bottom">15</property>
800++ <property name="xalign">0</property>
801++ <property name="active">True</property>
802++ <property name="draw_indicator">True</property>
803++ <property name="group">default-source-radio</property>
804++ </object>
805++ <packing>
806++ <property name="expand">False</property>
807++ <property name="fill">True</property>
808++ <property name="position">7</property>
809++ </packing>
810++ </child>
811++ <child>
812++ <object class="GtkGrid" id="grid1">
813++ <property name="visible">True</property>
814++ <property name="can_focus">False</property>
815++ <child>
816++ <object class="GtkLabel" id="label25">
817++ <property name="visible">True</property>
818++ <property name="can_focus">False</property>
819++ <property name="halign">end</property>
820++ <property name="margin_right">10</property>
821++ <property name="margin_bottom">10</property>
822++ <property name="hexpand">True</property>
823++ <property name="label" translatable="yes">Show input candidates:</property>
824++ </object>
825++ <packing>
826++ <property name="left_attach">0</property>
827++ <property name="top_attach">0</property>
828++ <property name="width">1</property>
829++ <property name="height">1</property>
830++ </packing>
831++ </child>
832++ <child>
833++ <object class="GtkComboBoxText" id="orientation-combo">
834++ <property name="visible">True</property>
835++ <property name="can_focus">False</property>
836++ <property name="margin_bottom">10</property>
837++ <property name="entry_text_column">0</property>
838++ <property name="id_column">1</property>
839++ <items>
840++ <item translatable="yes">Horizontally</item>
841++ <item translatable="yes">Vertically</item>
842++ </items>
843++ </object>
844++ <packing>
845++ <property name="left_attach">1</property>
846++ <property name="top_attach">0</property>
847++ <property name="width">1</property>
848++ <property name="height">1</property>
849++ </packing>
850++ </child>
851++ <child>
852++ <object class="GtkFontButton" id="custom-font-button">
853++ <property name="visible">True</property>
854++ <property name="can_focus">False</property>
855 + <property name="receives_default">True</property>
856-+ <property name="has_tooltip">True</property>
857-+ </object>
858-+ <packing>
859-+ <property name="expand">False</property>
860-+ <property name="fill">True</property>
861-+ <property name="position">1</property>
862++ <property name="font">Sans 12</property>
863++ <property name="preview_text"/>
864++ <property name="show_preview_entry">False</property>
865++ </object>
866++ <packing>
867++ <property name="left_attach">1</property>
868++ <property name="top_attach">1</property>
869++ <property name="width">1</property>
870++ <property name="height">1</property>
871++ </packing>
872++ </child>
873++ <child>
874++ <object class="GtkCheckButton" id="custom-font-check">
875++ <property name="label" translatable="yes">Using custom font:</property>
876++ <property name="visible">True</property>
877++ <property name="can_focus">False</property>
878++ <property name="receives_default">False</property>
879++ <property name="halign">end</property>
880++ <property name="margin_right">10</property>
881++ <property name="hexpand">True</property>
882++ <property name="xalign">0</property>
883++ <property name="draw_indicator">True</property>
884++ </object>
885++ <packing>
886++ <property name="left_attach">0</property>
887++ <property name="top_attach">1</property>
888++ <property name="width">1</property>
889++ <property name="height">1</property>
890 + </packing>
891 + </child>
892 + </object>
893 + <packing>
894 + <property name="expand">False</property>
895 + <property name="fill">True</property>
896-+ <property name="position">1</property>
897++ <property name="position">8</property>
898 + </packing>
899 + </child>
900 + </object>
901@@ -3220,1287 +3607,59 @@
902 + </packing>
903 + </child>
904 + </object>
905-+ </child>
906-+ <child type="tab">
907-+ <object class="GtkLabel" id="label1">
908-+ <property name="visible">True</property>
909-+ <property name="can_focus">False</property>
910-+ <property name="label" translatable="yes">Language</property>
911-+ </object>
912-+ <packing>
913-+ <property name="tab_fill">False</property>
914-+ </packing>
915-+ </child>
916-+ <child>
917-+ <object class="GtkGrid" id="table1">
918-+ <property name="visible">True</property>
919-+ <property name="can_focus">False</property>
920-+ <property name="margin_left">12</property>
921-+ <property name="margin_right">12</property>
922-+ <property name="margin_top">12</property>
923-+ <property name="margin_bottom">12</property>
924-+ <property name="row_spacing">6</property>
925-+ <property name="column_spacing">12</property>
926-+ <child>
927-+ <object class="GtkLabel" id="label5">
928-+ <property name="visible">True</property>
929-+ <property name="can_focus">False</property>
930-+ <property name="halign">start</property>
931-+ <property name="label" translatable="yes">Select a region (change will be applied the next time you log in)</property>
932-+ </object>
933-+ <packing>
934-+ <property name="left_attach">0</property>
935-+ <property name="top_attach">0</property>
936-+ <property name="width">2</property>
937-+ <property name="height">1</property>
938-+ </packing>
939-+ </child>
940-+ <child>
941-+ <object class="GtkBox" id="region-box">
942-+ <property name="visible">True</property>
943-+ <property name="can_focus">False</property>
944-+ <property name="orientation">vertical</property>
945-+ <child>
946-+ <object class="GtkScrolledWindow" id="region-swindow">
947-+ <property name="visible">True</property>
948-+ <property name="can_focus">True</property>
949-+ <property name="vexpand">True</property>
950-+ <property name="hscrollbar_policy">never</property>
951-+ <property name="shadow_type">in</property>
952-+ <child>
953-+ <object class="GtkTreeView" id="region_selector">
954-+ <property name="visible">True</property>
955-+ <property name="can_focus">True</property>
956-+ <property name="headers_visible">False</property>
957-+ <child internal-child="selection">
958-+ <object class="GtkTreeSelection" id="region-treeview-selection"/>
959-+ </child>
960-+ </object>
961-+ </child>
962-+ </object>
963-+ <packing>
964-+ <property name="expand">True</property>
965-+ <property name="fill">True</property>
966-+ <property name="position">0</property>
967-+ </packing>
968-+ </child>
969-+ <child>
970-+ <object class="GtkToolbar" id="region-toolbar">
971-+ <property name="visible">True</property>
972-+ <property name="can_focus">False</property>
973-+ <property name="toolbar_style">icons</property>
974-+ <property name="show_arrow">False</property>
975-+ <property name="icon_size">1</property>
976-+ <style>
977-+ <class name="inline-toolbar"/>
978-+ </style>
979-+ <child>
980-+ <object class="GtkToolButton" id="region_add">
981-+ <property name="visible">True</property>
982-+ <property name="can_focus">False</property>
983-+ <property name="label" translatable="yes">Add Region</property>
984-+ <property name="use_underline">True</property>
985-+ <property name="icon_name">list-add-symbolic</property>
986-+ </object>
987-+ <packing>
988-+ <property name="expand">False</property>
989-+ <property name="homogeneous">True</property>
990-+ </packing>
991-+ </child>
992-+ <child>
993-+ <object class="GtkToolButton" id="region_remove">
994-+ <property name="visible">True</property>
995-+ <property name="sensitive">False</property>
996-+ <property name="can_focus">False</property>
997-+ <property name="label" translatable="yes">Remove Region</property>
998-+ <property name="use_underline">True</property>
999-+ <property name="icon_name">list-remove-symbolic</property>
1000-+ </object>
1001-+ <packing>
1002-+ <property name="expand">False</property>
1003-+ <property name="homogeneous">True</property>
1004-+ </packing>
1005-+ </child>
1006-+ </object>
1007-+ <packing>
1008-+ <property name="expand">False</property>
1009-+ <property name="fill">True</property>
1010-+ <property name="position">1</property>
1011-+ </packing>
1012-+ </child>
1013-+ </object>
1014-+ <packing>
1015-+ <property name="left_attach">0</property>
1016-+ <property name="top_attach">1</property>
1017-+ <property name="width">1</property>
1018-+ <property name="height">1</property>
1019-+ </packing>
1020-+ </child>
1021-+ <child>
1022-+ <object class="GtkFrame" id="frame1">
1023-+ <property name="visible">True</property>
1024-+ <property name="can_focus">False</property>
1025-+ <property name="label_xalign">0</property>
1026-+ <property name="shadow_type">none</property>
1027-+ <child>
1028-+ <object class="GtkAlignment" id="alignment2">
1029-+ <property name="visible">True</property>
1030-+ <property name="can_focus">False</property>
1031-+ <property name="left_padding">12</property>
1032-+ <child>
1033-+ <object class="GtkTable" id="table2">
1034-+ <property name="visible">True</property>
1035-+ <property name="can_focus">False</property>
1036-+ <property name="n_rows">9</property>
1037-+ <property name="n_columns">2</property>
1038-+ <child>
1039-+ <placeholder/>
1040-+ </child>
1041-+ <child>
1042-+ <placeholder/>
1043-+ </child>
1044-+ <child>
1045-+ <placeholder/>
1046-+ </child>
1047-+ <child>
1048-+ <placeholder/>
1049-+ </child>
1050-+ <child>
1051-+ <object class="GtkLabel" id="label7">
1052-+ <property name="visible">True</property>
1053-+ <property name="can_focus">False</property>
1054-+ <property name="xalign">0</property>
1055-+ <property name="label" translatable="yes">Dates</property>
1056-+ </object>
1057-+ <packing>
1058-+ <property name="x_options">GTK_FILL</property>
1059-+ <property name="y_options">GTK_FILL</property>
1060-+ <property name="x_padding">3</property>
1061-+ <property name="y_padding">3</property>
1062-+ </packing>
1063-+ </child>
1064-+ <child>
1065-+ <object class="GtkLabel" id="full_date_format">
1066-+ <property name="visible">True</property>
1067-+ <property name="can_focus">False</property>
1068-+ <property name="xalign">0</property>
1069-+ </object>
1070-+ <packing>
1071-+ <property name="left_attach">1</property>
1072-+ <property name="right_attach">2</property>
1073-+ <property name="y_options">GTK_FILL</property>
1074-+ <property name="x_padding">3</property>
1075-+ <property name="y_padding">3</property>
1076-+ </packing>
1077-+ </child>
1078-+ <child>
1079-+ <object class="GtkLabel" id="full_day_format">
1080-+ <property name="visible">True</property>
1081-+ <property name="can_focus">False</property>
1082-+ <property name="xalign">0</property>
1083-+ </object>
1084-+ <packing>
1085-+ <property name="left_attach">1</property>
1086-+ <property name="right_attach">2</property>
1087-+ <property name="top_attach">1</property>
1088-+ <property name="bottom_attach">2</property>
1089-+ <property name="y_options">GTK_FILL</property>
1090-+ <property name="x_padding">3</property>
1091-+ <property name="y_padding">3</property>
1092-+ </packing>
1093-+ </child>
1094-+ <child>
1095-+ <object class="GtkLabel" id="short_day_format">
1096-+ <property name="visible">True</property>
1097-+ <property name="can_focus">False</property>
1098-+ <property name="xalign">0</property>
1099-+ </object>
1100-+ <packing>
1101-+ <property name="left_attach">1</property>
1102-+ <property name="right_attach">2</property>
1103-+ <property name="top_attach">2</property>
1104-+ <property name="bottom_attach">3</property>
1105-+ <property name="y_options">GTK_FILL</property>
1106-+ <property name="x_padding">3</property>
1107-+ <property name="y_padding">3</property>
1108-+ </packing>
1109-+ </child>
1110-+ <child>
1111-+ <object class="GtkLabel" id="shortest_day_format">
1112-+ <property name="visible">True</property>
1113-+ <property name="can_focus">False</property>
1114-+ <property name="xalign">0</property>
1115-+ </object>
1116-+ <packing>
1117-+ <property name="left_attach">1</property>
1118-+ <property name="right_attach">2</property>
1119-+ <property name="top_attach">3</property>
1120-+ <property name="bottom_attach">4</property>
1121-+ <property name="y_options">GTK_FILL</property>
1122-+ <property name="x_padding">3</property>
1123-+ <property name="y_padding">3</property>
1124-+ </packing>
1125-+ </child>
1126-+ <child>
1127-+ <object class="GtkLabel" id="label8">
1128-+ <property name="visible">True</property>
1129-+ <property name="can_focus">False</property>
1130-+ <property name="xalign">0</property>
1131-+ <property name="label" translatable="yes">Times</property>
1132-+ </object>
1133-+ <packing>
1134-+ <property name="top_attach">4</property>
1135-+ <property name="bottom_attach">5</property>
1136-+ <property name="x_options">GTK_FILL</property>
1137-+ <property name="y_options">GTK_FILL</property>
1138-+ <property name="x_padding">3</property>
1139-+ <property name="y_padding">3</property>
1140-+ </packing>
1141-+ </child>
1142-+ <child>
1143-+ <object class="GtkLabel" id="full_time_format">
1144-+ <property name="visible">True</property>
1145-+ <property name="can_focus">False</property>
1146-+ <property name="xalign">0</property>
1147-+ </object>
1148-+ <packing>
1149-+ <property name="left_attach">1</property>
1150-+ <property name="right_attach">2</property>
1151-+ <property name="top_attach">4</property>
1152-+ <property name="bottom_attach">5</property>
1153-+ <property name="y_options">GTK_FILL</property>
1154-+ <property name="x_padding">3</property>
1155-+ <property name="y_padding">3</property>
1156-+ </packing>
1157-+ </child>
1158-+ <child>
1159-+ <object class="GtkLabel" id="short_time_format">
1160-+ <property name="visible">True</property>
1161-+ <property name="can_focus">False</property>
1162-+ <property name="xalign">0</property>
1163-+ </object>
1164-+ <packing>
1165-+ <property name="left_attach">1</property>
1166-+ <property name="right_attach">2</property>
1167-+ <property name="top_attach">5</property>
1168-+ <property name="bottom_attach">6</property>
1169-+ <property name="y_options">GTK_FILL</property>
1170-+ <property name="x_padding">3</property>
1171-+ <property name="y_padding">3</property>
1172-+ </packing>
1173-+ </child>
1174-+ <child>
1175-+ <object class="GtkLabel" id="label9">
1176-+ <property name="visible">True</property>
1177-+ <property name="can_focus">False</property>
1178-+ <property name="xalign">0</property>
1179-+ <property name="label" translatable="yes">Numbers</property>
1180-+ </object>
1181-+ <packing>
1182-+ <property name="top_attach">6</property>
1183-+ <property name="bottom_attach">7</property>
1184-+ <property name="x_options">GTK_FILL</property>
1185-+ <property name="y_options">GTK_FILL</property>
1186-+ <property name="x_padding">3</property>
1187-+ <property name="y_padding">3</property>
1188-+ </packing>
1189-+ </child>
1190-+ <child>
1191-+ <object class="GtkLabel" id="numbers_format">
1192-+ <property name="visible">True</property>
1193-+ <property name="can_focus">False</property>
1194-+ <property name="xalign">0</property>
1195-+ </object>
1196-+ <packing>
1197-+ <property name="left_attach">1</property>
1198-+ <property name="right_attach">2</property>
1199-+ <property name="top_attach">6</property>
1200-+ <property name="bottom_attach">7</property>
1201-+ <property name="y_options">GTK_FILL</property>
1202-+ <property name="x_padding">3</property>
1203-+ <property name="y_padding">3</property>
1204-+ </packing>
1205-+ </child>
1206-+ <child>
1207-+ <object class="GtkLabel" id="label10">
1208-+ <property name="visible">True</property>
1209-+ <property name="can_focus">False</property>
1210-+ <property name="xalign">0</property>
1211-+ <property name="label" translatable="yes">Currency</property>
1212-+ </object>
1213-+ <packing>
1214-+ <property name="top_attach">7</property>
1215-+ <property name="bottom_attach">8</property>
1216-+ <property name="x_options">GTK_FILL</property>
1217-+ <property name="y_options">GTK_FILL</property>
1218-+ <property name="x_padding">3</property>
1219-+ <property name="y_padding">3</property>
1220-+ </packing>
1221-+ </child>
1222-+ <child>
1223-+ <object class="GtkLabel" id="currency_format">
1224-+ <property name="visible">True</property>
1225-+ <property name="can_focus">False</property>
1226-+ <property name="xalign">0</property>
1227-+ </object>
1228-+ <packing>
1229-+ <property name="left_attach">1</property>
1230-+ <property name="right_attach">2</property>
1231-+ <property name="top_attach">7</property>
1232-+ <property name="bottom_attach">8</property>
1233-+ <property name="y_options">GTK_FILL</property>
1234-+ <property name="x_padding">3</property>
1235-+ <property name="y_padding">3</property>
1236-+ </packing>
1237-+ </child>
1238-+ <child>
1239-+ <object class="GtkLabel" id="label11">
1240-+ <property name="visible">True</property>
1241-+ <property name="can_focus">False</property>
1242-+ <property name="xalign">0</property>
1243-+ <property name="label" translatable="yes">Measurement</property>
1244-+ </object>
1245-+ <packing>
1246-+ <property name="top_attach">8</property>
1247-+ <property name="bottom_attach">9</property>
1248-+ <property name="x_options">GTK_FILL</property>
1249-+ <property name="y_options">GTK_FILL</property>
1250-+ <property name="x_padding">3</property>
1251-+ <property name="y_padding">3</property>
1252-+ </packing>
1253-+ </child>
1254-+ <child>
1255-+ <object class="GtkLabel" id="measurement_format">
1256-+ <property name="visible">True</property>
1257-+ <property name="can_focus">False</property>
1258-+ <property name="xalign">0</property>
1259-+ </object>
1260-+ <packing>
1261-+ <property name="left_attach">1</property>
1262-+ <property name="right_attach">2</property>
1263-+ <property name="top_attach">8</property>
1264-+ <property name="bottom_attach">9</property>
1265-+ <property name="y_options">GTK_FILL</property>
1266-+ <property name="x_padding">3</property>
1267-+ <property name="y_padding">3</property>
1268-+ </packing>
1269-+ </child>
1270-+ </object>
1271-+ </child>
1272-+ </object>
1273-+ </child>
1274-+ <child type="label">
1275-+ <object class="GtkLabel" id="label6">
1276-+ <property name="visible">True</property>
1277-+ <property name="can_focus">False</property>
1278-+ <property name="label" translatable="yes">Examples</property>
1279-+ <attributes>
1280-+ <attribute name="weight" value="bold"/>
1281-+ </attributes>
1282-+ </object>
1283-+ </child>
1284-+ </object>
1285-+ <packing>
1286-+ <property name="left_attach">1</property>
1287-+ <property name="top_attach">1</property>
1288-+ <property name="width">1</property>
1289-+ <property name="height">1</property>
1290-+ </packing>
1291-+ </child>
1292-+ </object>
1293-+ <packing>
1294-+ <property name="position">1</property>
1295-+ </packing>
1296-+ </child>
1297-+ <child type="tab">
1298-+ <object class="GtkLabel" id="label3">
1299-+ <property name="visible">True</property>
1300-+ <property name="can_focus">False</property>
1301-+ <property name="label" translatable="yes">Formats</property>
1302-+ </object>
1303-+ <packing>
1304-+ <property name="position">1</property>
1305-+ <property name="tab_fill">False</property>
1306-+ </packing>
1307-+ </child>
1308-+ <child>
1309-+ <object class="GtkVBox" id="vbox5">
1310-+ <property name="visible">True</property>
1311-+ <property name="can_focus">False</property>
1312-+ <property name="border_width">12</property>
1313-+ <property name="spacing">12</property>
1314-+ <child>
1315-+ <object class="GtkHBox" id="hbox3">
1316-+ <property name="visible">True</property>
1317-+ <property name="can_focus">False</property>
1318-+ <property name="spacing">12</property>
1319-+ <child>
1320-+ <object class="GtkVBox" id="vbox6">
1321-+ <property name="visible">True</property>
1322-+ <property name="can_focus">False</property>
1323-+ <property name="margin_right">5</property>
1324-+ <child>
1325-+ <object class="GtkLabel" id="label2">
1326-+ <property name="visible">True</property>
1327-+ <property name="can_focus">False</property>
1328-+ <property name="margin_bottom">5</property>
1329-+ <property name="xalign">0</property>
1330-+ <property name="label" translatable="yes">Input sources to use:</property>
1331-+ </object>
1332-+ <packing>
1333-+ <property name="expand">False</property>
1334-+ <property name="fill">True</property>
1335-+ <property name="position">0</property>
1336-+ </packing>
1337-+ </child>
1338-+ <child>
1339-+ <object class="GtkScrolledWindow" id="input_sources_swindow">
1340-+ <property name="visible">True</property>
1341-+ <property name="can_focus">True</property>
1342-+ <property name="shadow_type">in</property>
1343-+ <child>
1344-+ <object class="GtkTreeView" id="active_input_sources">
1345-+ <property name="visible">True</property>
1346-+ <property name="can_focus">True</property>
1347-+ <property name="headers_visible">False</property>
1348-+ <child internal-child="selection">
1349-+ <object class="GtkTreeSelection" id="treeview-selection3"/>
1350-+ </child>
1351-+ </object>
1352-+ </child>
1353-+ </object>
1354-+ <packing>
1355-+ <property name="expand">True</property>
1356-+ <property name="fill">True</property>
1357-+ <property name="position">1</property>
1358-+ </packing>
1359-+ </child>
1360-+ <child>
1361-+ <object class="GtkToolbar" id="input-toolbar">
1362-+ <property name="visible">True</property>
1363-+ <property name="can_focus">False</property>
1364-+ <property name="toolbar_style">icons</property>
1365-+ <property name="show_arrow">False</property>
1366-+ <property name="icon_size">1</property>
1367-+ <style>
1368-+ <class name="inline-toolbar"/>
1369-+ </style>
1370-+ <child>
1371-+ <object class="GtkToolItem" id="i_s_ar_item">
1372-+ <property name="visible">True</property>
1373-+ <property name="can_focus">False</property>
1374-+ <child>
1375-+ <object class="GtkBox" id="i_s_ar_box">
1376-+ <property name="visible">True</property>
1377-+ <property name="can_focus">False</property>
1378-+ <child>
1379-+ <object class="GtkButton" id="input_source_add">
1380-+ <property name="visible">True</property>
1381-+ <property name="can_focus">False</property>
1382-+ <property name="receives_default">False</property>
1383-+ <child>
1384-+ <object class="GtkImage" id="i_s_a_image">
1385-+ <property name="visible">True</property>
1386-+ <property name="can_focus">False</property>
1387-+ <property name="icon_name">list-add-symbolic</property>
1388-+ <property name="icon-size">1</property>
1389-+ </object>
1390-+ </child>
1391-+ </object>
1392-+ <packing>
1393-+ <property name="expand">False</property>
1394-+ <property name="fill">True</property>
1395-+ <property name="position">0</property>
1396-+ </packing>
1397-+ </child>
1398-+ <child>
1399-+ <object class="GtkButton" id="input_source_remove">
1400-+ <property name="visible">True</property>
1401-+ <property name="can_focus">False</property>
1402-+ <property name="receives_default">False</property>
1403-+ <child>
1404-+ <object class="GtkImage" id="i_s_r_image">
1405-+ <property name="visible">True</property>
1406-+ <property name="can_focus">False</property>
1407-+ <property name="icon_name">list-remove-symbolic</property>
1408-+ <property name="icon-size">1</property>
1409-+ </object>
1410-+ </child>
1411-+ </object>
1412-+ <packing>
1413-+ <property name="expand">False</property>
1414-+ <property name="fill">True</property>
1415-+ <property name="position">1</property>
1416-+ </packing>
1417-+ </child>
1418-+ </object>
1419-+ </child>
1420-+ </object>
1421-+ <packing>
1422-+ <property name="expand">False</property>
1423-+ </packing>
1424-+ </child>
1425-+ <child>
1426-+ <object class="GtkSeparatorToolItem" id="sep1">
1427-+ <property name="visible">True</property>
1428-+ <property name="can_focus">False</property>
1429-+ <property name="draw">False</property>
1430-+ </object>
1431-+ <packing>
1432-+ <property name="expand">True</property>
1433-+ </packing>
1434-+ </child>
1435-+ <child>
1436-+ <object class="GtkToolItem" id="i_s_ud_item">
1437-+ <property name="visible">True</property>
1438-+ <property name="can_focus">False</property>
1439-+ <child>
1440-+ <object class="GtkBox" id="i_s_ud_box">
1441-+ <property name="visible">True</property>
1442-+ <property name="can_focus">False</property>
1443-+ <child>
1444-+ <object class="GtkButton" id="input_source_move_up">
1445-+ <property name="visible">True</property>
1446-+ <property name="can_focus">False</property>
1447-+ <property name="receives_default">False</property>
1448-+ <child>
1449-+ <object class="GtkImage" id="i_s_u_image">
1450-+ <property name="visible">True</property>
1451-+ <property name="can_focus">False</property>
1452-+ <property name="icon_name">go-up-symbolic</property>
1453-+ <property name="icon-size">1</property>
1454-+ </object>
1455-+ </child>
1456-+ </object>
1457-+ <packing>
1458-+ <property name="expand">False</property>
1459-+ <property name="fill">True</property>
1460-+ <property name="position">0</property>
1461-+ </packing>
1462-+ </child>
1463-+ <child>
1464-+ <object class="GtkButton" id="input_source_move_down">
1465-+ <property name="visible">True</property>
1466-+ <property name="can_focus">False</property>
1467-+ <property name="receives_default">False</property>
1468-+ <child>
1469-+ <object class="GtkImage" id="i_s_d_image">
1470-+ <property name="visible">True</property>
1471-+ <property name="can_focus">False</property>
1472-+ <property name="icon_name">go-down-symbolic</property>
1473-+ <property name="icon-size">1</property>
1474-+ </object>
1475-+ </child>
1476-+ </object>
1477-+ <packing>
1478-+ <property name="expand">False</property>
1479-+ <property name="fill">True</property>
1480-+ <property name="position">1</property>
1481-+ </packing>
1482-+ </child>
1483-+ </object>
1484-+ </child>
1485-+ </object>
1486-+ <packing>
1487-+ <property name="expand">False</property>
1488-+ </packing>
1489-+ </child>
1490-+ <child>
1491-+ <object class="GtkSeparatorToolItem" id="sep2">
1492-+ <property name="visible">True</property>
1493-+ <property name="can_focus">False</property>
1494-+ <property name="hexpand">True</property>
1495-+ <property name="draw">False</property>
1496-+ </object>
1497-+ <packing>
1498-+ <property name="expand">True</property>
1499-+ </packing>
1500-+ </child>
1501-+ <child>
1502-+ <object class="GtkToolItem" id="i_s_sp_item">
1503-+ <property name="visible">True</property>
1504-+ <property name="can_focus">False</property>
1505-+ <child>
1506-+ <object class="GtkBox" id="i_s_sp_box">
1507-+ <property name="visible">True</property>
1508-+ <property name="can_focus">False</property>
1509-+ <child>
1510-+ <object class="GtkButton" id="input_source_settings">
1511-+ <property name="visible">True</property>
1512-+ <property name="can_focus">False</property>
1513-+ <property name="receives_default">False</property>
1514-+ <child>
1515-+ <object class="GtkImage" id="i_s_s_image">
1516-+ <property name="visible">True</property>
1517-+ <property name="can_focus">False</property>
1518-+ <property name="pixel_size">16</property>
1519-+ <property name="icon_name">preferences-system-symbolic</property>
1520-+ <property name="icon-size">1</property>
1521-+ </object>
1522-+ </child>
1523-+ </object>
1524-+ <packing>
1525-+ <property name="expand">False</property>
1526-+ <property name="fill">True</property>
1527-+ <property name="position">0</property>
1528-+ </packing>
1529-+ </child>
1530-+ <child>
1531-+ <object class="GtkButton" id="input_source_show">
1532-+ <property name="visible">True</property>
1533-+ <property name="can_focus">False</property>
1534-+ <property name="receives_default">False</property>
1535-+ <child>
1536-+ <object class="GtkImage" id="i_s_p_image">
1537-+ <property name="visible">True</property>
1538-+ <property name="can_focus">False</property>
1539-+ <property name="icon_name">input-keyboard-symbolic</property>
1540-+ <property name="icon-size">1</property>
1541-+ </object>
1542-+ </child>
1543-+ </object>
1544-+ <packing>
1545-+ <property name="expand">False</property>
1546-+ <property name="fill">True</property>
1547-+ <property name="position">1</property>
1548-+ </packing>
1549-+ </child>
1550-+ </object>
1551-+ </child>
1552-+ </object>
1553-+ <packing>
1554-+ <property name="expand">False</property>
1555-+ </packing>
1556-+ </child>
1557-+ </object>
1558-+ <packing>
1559-+ <property name="expand">False</property>
1560-+ <property name="fill">True</property>
1561-+ <property name="position">2</property>
1562-+ </packing>
1563-+ </child>
1564-+ </object>
1565-+ <packing>
1566-+ <property name="expand">True</property>
1567-+ <property name="fill">True</property>
1568-+ <property name="position">0</property>
1569-+ </packing>
1570-+ </child>
1571-+ <child>
1572-+ <object class="GtkBox" id="box2">
1573-+ <property name="visible">True</property>
1574-+ <property name="can_focus">False</property>
1575-+ <property name="orientation">vertical</property>
1576-+ <child>
1577-+ <object class="GtkLabel" id="label22">
1578-+ <property name="visible">True</property>
1579-+ <property name="can_focus">False</property>
1580-+ <property name="margin_bottom">5</property>
1581-+ <property name="xalign">0</property>
1582-+ <property name="label" translatable="yes">Switch to next source using:</property>
1583-+ </object>
1584-+ <packing>
1585-+ <property name="expand">False</property>
1586-+ <property name="fill">True</property>
1587-+ <property name="position">0</property>
1588-+ </packing>
1589-+ </child>
1590-+ <child>
1591-+ <object class="GtkEntryAccel" id="next-source-entry">
1592-+ <property name="visible">True</property>
1593-+ <property name="can_focus">True</property>
1594-+ <property name="margin_bottom">5</property>
1595-+ <property name="invisible_char">•</property>
1596-+ </object>
1597-+ <packing>
1598-+ <property name="expand">False</property>
1599-+ <property name="fill">True</property>
1600-+ <property name="position">1</property>
1601-+ </packing>
1602-+ </child>
1603-+ <child>
1604-+ <object class="GtkLabel" id="label24">
1605-+ <property name="visible">True</property>
1606-+ <property name="can_focus">False</property>
1607-+ <property name="margin_bottom">5</property>
1608-+ <property name="xalign">0</property>
1609-+ <property name="label" translatable="yes">Switch to previous source using:</property>
1610-+ </object>
1611-+ <packing>
1612-+ <property name="expand">False</property>
1613-+ <property name="fill">True</property>
1614-+ <property name="position">2</property>
1615-+ </packing>
1616-+ </child>
1617-+ <child>
1618-+ <object class="GtkEntryAccel" id="prev-source-entry">
1619-+ <property name="visible">True</property>
1620-+ <property name="can_focus">True</property>
1621-+ <property name="margin_bottom">15</property>
1622-+ <property name="invisible_char">•</property>
1623-+ </object>
1624-+ <packing>
1625-+ <property name="expand">False</property>
1626-+ <property name="fill">True</property>
1627-+ <property name="position">3</property>
1628-+ </packing>
1629-+ </child>
1630-+ <child>
1631-+ <object class="GtkRadioButton" id="same-source-radio">
1632-+ <property name="label" translatable="yes">Use the same source for all windows</property>
1633-+ <property name="visible">True</property>
1634-+ <property name="can_focus">False</property>
1635-+ <property name="receives_default">False</property>
1636-+ <property name="xalign">0</property>
1637-+ <property name="active">True</property>
1638-+ <property name="draw_indicator">True</property>
1639-+ </object>
1640-+ <packing>
1641-+ <property name="expand">False</property>
1642-+ <property name="fill">True</property>
1643-+ <property name="position">4</property>
1644-+ </packing>
1645-+ </child>
1646-+ <child>
1647-+ <object class="GtkRadioButton" id="different-source-radio">
1648-+ <property name="label" translatable="yes">Allow different sources for each window</property>
1649-+ <property name="visible">True</property>
1650-+ <property name="can_focus">False</property>
1651-+ <property name="receives_default">False</property>
1652-+ <property name="xalign">0</property>
1653-+ <property name="active">True</property>
1654-+ <property name="draw_indicator">True</property>
1655-+ <property name="group">same-source-radio</property>
1656-+ </object>
1657-+ <packing>
1658-+ <property name="expand">False</property>
1659-+ <property name="fill">True</property>
1660-+ <property name="position">5</property>
1661-+ </packing>
1662-+ </child>
1663-+ <child>
1664-+ <object class="GtkRadioButton" id="default-source-radio">
1665-+ <property name="label" translatable="yes">New windows use the default source</property>
1666-+ <property name="visible">True</property>
1667-+ <property name="can_focus">False</property>
1668-+ <property name="receives_default">False</property>
1669-+ <property name="margin_left">25</property>
1670-+ <property name="xalign">0</property>
1671-+ <property name="active">True</property>
1672-+ <property name="draw_indicator">True</property>
1673-+ </object>
1674-+ <packing>
1675-+ <property name="expand">False</property>
1676-+ <property name="fill">True</property>
1677-+ <property name="position">6</property>
1678-+ </packing>
1679-+ </child>
1680-+ <child>
1681-+ <object class="GtkRadioButton" id="current-source-radio">
1682-+ <property name="label" translatable="yes">New windows use the current source</property>
1683-+ <property name="visible">True</property>
1684-+ <property name="can_focus">False</property>
1685-+ <property name="receives_default">False</property>
1686-+ <property name="margin_left">25</property>
1687-+ <property name="margin_bottom">15</property>
1688-+ <property name="xalign">0</property>
1689-+ <property name="active">True</property>
1690-+ <property name="draw_indicator">True</property>
1691-+ <property name="group">default-source-radio</property>
1692-+ </object>
1693-+ <packing>
1694-+ <property name="expand">False</property>
1695-+ <property name="fill">True</property>
1696-+ <property name="position">7</property>
1697-+ </packing>
1698-+ </child>
1699-+ <child>
1700-+ <object class="GtkGrid" id="grid1">
1701-+ <property name="visible">True</property>
1702-+ <property name="can_focus">False</property>
1703-+ <child>
1704-+ <object class="GtkLabel" id="label25">
1705-+ <property name="visible">True</property>
1706-+ <property name="can_focus">False</property>
1707-+ <property name="halign">end</property>
1708-+ <property name="margin_right">10</property>
1709-+ <property name="margin_bottom">10</property>
1710-+ <property name="hexpand">True</property>
1711-+ <property name="label" translatable="yes">Show input candidates:</property>
1712-+ </object>
1713-+ <packing>
1714-+ <property name="left_attach">0</property>
1715-+ <property name="top_attach">0</property>
1716-+ <property name="width">1</property>
1717-+ <property name="height">1</property>
1718-+ </packing>
1719-+ </child>
1720-+ <child>
1721-+ <object class="GtkComboBoxText" id="orientation-combo">
1722-+ <property name="visible">True</property>
1723-+ <property name="can_focus">False</property>
1724-+ <property name="margin_bottom">10</property>
1725-+ <property name="entry_text_column">0</property>
1726-+ <property name="id_column">1</property>
1727-+ <items>
1728-+ <item translatable="yes">Horizontally</item>
1729-+ <item translatable="yes">Vertically</item>
1730-+ </items>
1731-+ </object>
1732-+ <packing>
1733-+ <property name="left_attach">1</property>
1734-+ <property name="top_attach">0</property>
1735-+ <property name="width">1</property>
1736-+ <property name="height">1</property>
1737-+ </packing>
1738-+ </child>
1739-+ <child>
1740-+ <object class="GtkFontButton" id="custom-font-button">
1741-+ <property name="visible">True</property>
1742-+ <property name="can_focus">False</property>
1743-+ <property name="receives_default">True</property>
1744-+ <property name="font">Sans 12</property>
1745-+ <property name="preview_text"/>
1746-+ <property name="show_preview_entry">False</property>
1747-+ </object>
1748-+ <packing>
1749-+ <property name="left_attach">1</property>
1750-+ <property name="top_attach">1</property>
1751-+ <property name="width">1</property>
1752-+ <property name="height">1</property>
1753-+ </packing>
1754-+ </child>
1755-+ <child>
1756-+ <object class="GtkCheckButton" id="custom-font-check">
1757-+ <property name="label" translatable="yes">Using custom font:</property>
1758-+ <property name="visible">True</property>
1759-+ <property name="can_focus">False</property>
1760-+ <property name="receives_default">False</property>
1761-+ <property name="halign">end</property>
1762-+ <property name="margin_right">10</property>
1763-+ <property name="hexpand">True</property>
1764-+ <property name="xalign">0</property>
1765-+ <property name="draw_indicator">True</property>
1766-+ </object>
1767-+ <packing>
1768-+ <property name="left_attach">0</property>
1769-+ <property name="top_attach">1</property>
1770-+ <property name="width">1</property>
1771-+ <property name="height">1</property>
1772-+ </packing>
1773-+ </child>
1774-+ </object>
1775-+ <packing>
1776-+ <property name="expand">False</property>
1777-+ <property name="fill">True</property>
1778-+ <property name="position">8</property>
1779-+ </packing>
1780-+ </child>
1781-+ </object>
1782-+ <packing>
1783-+ <property name="expand">True</property>
1784-+ <property name="fill">True</property>
1785-+ <property name="position">1</property>
1786-+ </packing>
1787-+ </child>
1788-+ </object>
1789-+ <packing>
1790-+ <property name="expand">True</property>
1791++ <packing>
1792++ <property name="expand">True</property>
1793++ <property name="fill">True</property>
1794++ <property name="position">0</property>
1795++ </packing>
1796++ </child>
1797++ <child>
1798++ <object class="GtkBox" id="box1">
1799++ <property name="visible">True</property>
1800++ <property name="can_focus">False</property>
1801++ <property name="valign">end</property>
1802++ <child>
1803++ <object class="GtkCheckButton" id="show-indicator-check">
1804++ <property name="label" translatable="yes">Show current input source in the menu bar</property>
1805++ <property name="visible">True</property>
1806++ <property name="can_focus">False</property>
1807++ <property name="receives_default">False</property>
1808++ <property name="hexpand">True</property>
1809++ <property name="xalign">0</property>
1810++ <property name="draw_indicator">True</property>
1811++ </object>
1812++ <packing>
1813++ <property name="expand">False</property>
1814 + <property name="fill">True</property>
1815 + <property name="position">0</property>
1816 + </packing>
1817 + </child>
1818 + <child>
1819-+ <object class="GtkBox" id="box1">
1820-+ <property name="visible">True</property>
1821-+ <property name="can_focus">False</property>
1822-+ <property name="valign">end</property>
1823-+ <child>
1824-+ <object class="GtkCheckButton" id="show-indicator-check">
1825-+ <property name="label" translatable="yes">Show current input source in the menu bar</property>
1826-+ <property name="visible">True</property>
1827-+ <property name="can_focus">False</property>
1828-+ <property name="receives_default">False</property>
1829-+ <property name="hexpand">True</property>
1830-+ <property name="xalign">0</property>
1831-+ <property name="draw_indicator">True</property>
1832-+ </object>
1833-+ <packing>
1834-+ <property name="expand">False</property>
1835-+ <property name="fill">True</property>
1836-+ <property name="position">0</property>
1837-+ </packing>
1838-+ </child>
1839-+ <child>
1840-+ <object class="GtkLinkButton" id="jump-to-shortcuts">
1841-+ <property name="label" translatable="yes">Keyboard Settings...</property>
1842-+ <property name="visible">True</property>
1843-+ <property name="can_focus">True</property>
1844-+ <property name="receives_default">True</property>
1845-+ <property name="has_tooltip">True</property>
1846-+ <property name="halign">end</property>
1847-+ <property name="relief">none</property>
1848-+ </object>
1849-+ <packing>
1850-+ <property name="expand">False</property>
1851-+ <property name="fill">True</property>
1852-+ <property name="position">1</property>
1853-+ </packing>
1854-+ </child>
1855-+ </object>
1856-+ <packing>
1857-+ <property name="expand">True</property>
1858-+ <property name="fill">True</property>
1859-+ <property name="position">1</property>
1860-+ </packing>
1861-+ </child>
1862-+ </object>
1863-+ <packing>
1864-+ <property name="position">3</property>
1865-+ </packing>
1866-+ </child>
1867-+ <child type="tab">
1868-+ <object class="GtkLabel" id="label13">
1869-+ <property name="visible">True</property>
1870-+ <property name="can_focus">False</property>
1871-+ <property name="label" translatable="yes">Text Entry</property>
1872-+ </object>
1873-+ <packing>
1874-+ <property name="position">3</property>
1875-+ <property name="tab_fill">False</property>
1876-+ </packing>
1877-+ </child>
1878-+ <child>
1879-+ <object class="GtkTable" id="table3">
1880-+ <property name="visible">True</property>
1881-+ <property name="can_focus">False</property>
1882-+ <property name="n_rows">3</property>
1883-+ <property name="n_columns">2</property>
1884-+ <property name="column_spacing">12</property>
1885-+ <property name="row_spacing">12</property>
1886-+ <child>
1887-+ <placeholder/>
1888-+ </child>
1889-+ <child>
1890-+ <object class="GtkLabel" id="system-title">
1891-+ <property name="visible">True</property>
1892-+ <property name="can_focus">False</property>
1893-+ <property name="xalign">0</property>
1894-+ <property name="xpad">6</property>
1895-+ <property name="ypad">6</property>
1896-+ <property name="label" translatable="yes">The login screen, system accounts and new user accounts use the system-wide Region and Language settings. You may change the system settings to match yours.</property>
1897-+ <property name="wrap">True</property>
1898-+ <property name="width_chars">60</property>
1899-+ </object>
1900-+ <packing>
1901-+ <property name="right_attach">2</property>
1902-+ <property name="x_options">GTK_FILL</property>
1903-+ <property name="y_options">GTK_SHRINK</property>
1904-+ <property name="x_padding">3</property>
1905-+ <property name="y_padding">3</property>
1906-+ </packing>
1907-+ </child>
1908-+ <child>
1909-+ <object class="GtkFrame" id="frame2">
1910-+ <property name="visible">True</property>
1911-+ <property name="can_focus">False</property>
1912-+ <property name="label_xalign">0</property>
1913-+ <property name="shadow_type">none</property>
1914-+ <child>
1915-+ <object class="GtkTable" id="table4">
1916-+ <property name="visible">True</property>
1917-+ <property name="can_focus">False</property>
1918-+ <property name="margin_left">12</property>
1919-+ <property name="margin_top">12</property>
1920-+ <property name="n_rows">3</property>
1921-+ <property name="n_columns">2</property>
1922-+ <property name="column_spacing">3</property>
1923-+ <property name="row_spacing">3</property>
1924-+ <child>
1925-+ <object class="GtkLabel" id="label16">
1926-+ <property name="visible">True</property>
1927-+ <property name="can_focus">False</property>
1928-+ <property name="xalign">0</property>
1929-+ <property name="label" translatable="yes" comments="'display' means 'output' here, as in 'translated messages that are displayed to the user'">Display language:</property>
1930-+ </object>
1931-+ <packing>
1932-+ <property name="y_options">GTK_FILL</property>
1933-+ <property name="x_padding">3</property>
1934-+ <property name="y_padding">3</property>
1935-+ </packing>
1936-+ </child>
1937-+ <child>
1938-+ <object class="GtkLabel" id="user_display_language">
1939-+ <property name="visible">True</property>
1940-+ <property name="can_focus">False</property>
1941-+ <property name="xalign">0</property>
1942-+ </object>
1943-+ <packing>
1944-+ <property name="left_attach">1</property>
1945-+ <property name="right_attach">2</property>
1946-+ <property name="y_options">GTK_FILL</property>
1947-+ <property name="x_padding">3</property>
1948-+ <property name="y_padding">3</property>
1949-+ </packing>
1950-+ </child>
1951-+ <child>
1952-+ <object class="GtkLabel" id="label17">
1953-+ <property name="visible">True</property>
1954-+ <property name="can_focus">False</property>
1955-+ <property name="xalign">0</property>
1956-+ <property name="yalign">0</property>
1957-+ <property name="label" translatable="yes">Input source:</property>
1958-+ </object>
1959-+ <packing>
1960-+ <property name="top_attach">1</property>
1961-+ <property name="bottom_attach">2</property>
1962-+ <property name="y_options">GTK_FILL</property>
1963-+ <property name="x_padding">3</property>
1964-+ <property name="y_padding">3</property>
1965-+ </packing>
1966-+ </child>
1967-+ <child>
1968-+ <object class="GtkLabel" id="user_input_source">
1969-+ <property name="visible">True</property>
1970-+ <property name="can_focus">False</property>
1971-+ <property name="xalign">0</property>
1972-+ <property name="yalign">0</property>
1973-+ <property name="wrap">True</property>
1974-+ <property name="width_chars">18</property>
1975-+ </object>
1976-+ <packing>
1977-+ <property name="left_attach">1</property>
1978-+ <property name="right_attach">2</property>
1979-+ <property name="top_attach">1</property>
1980-+ <property name="bottom_attach">2</property>
1981-+ <property name="y_options">GTK_FILL</property>
1982-+ <property name="x_padding">3</property>
1983-+ <property name="y_padding">3</property>
1984-+ </packing>
1985-+ </child>
1986-+ <child>
1987-+ <object class="GtkLabel" id="label18">
1988-+ <property name="visible">True</property>
1989-+ <property name="can_focus">False</property>
1990-+ <property name="xalign">0</property>
1991-+ <property name="label" translatable="yes">Format:</property>
1992-+ </object>
1993-+ <packing>
1994-+ <property name="top_attach">2</property>
1995-+ <property name="bottom_attach">3</property>
1996-+ <property name="y_options">GTK_FILL</property>
1997-+ <property name="x_padding">3</property>
1998-+ <property name="y_padding">3</property>
1999-+ </packing>
2000-+ </child>
2001-+ <child>
2002-+ <object class="GtkLabel" id="user_format">
2003-+ <property name="visible">True</property>
2004-+ <property name="can_focus">False</property>
2005-+ <property name="xalign">0</property>
2006-+ </object>
2007-+ <packing>
2008-+ <property name="left_attach">1</property>
2009-+ <property name="right_attach">2</property>
2010-+ <property name="top_attach">2</property>
2011-+ <property name="bottom_attach">3</property>
2012-+ <property name="y_options">GTK_FILL</property>
2013-+ <property name="x_padding">3</property>
2014-+ <property name="y_padding">3</property>
2015-+ </packing>
2016-+ </child>
2017-+ </object>
2018-+ </child>
2019-+ <child type="label">
2020-+ <object class="GtkLabel" id="label14">
2021-+ <property name="visible">True</property>
2022-+ <property name="can_focus">False</property>
2023-+ <property name="label" translatable="yes">Your settings</property>
2024-+ <attributes>
2025-+ <attribute name="weight" value="bold"/>
2026-+ </attributes>
2027-+ </object>
2028-+ </child>
2029-+ </object>
2030-+ <packing>
2031-+ <property name="top_attach">1</property>
2032-+ <property name="bottom_attach">2</property>
2033-+ <property name="y_options">GTK_FILL</property>
2034-+ <property name="x_padding">3</property>
2035-+ <property name="y_padding">3</property>
2036-+ </packing>
2037-+ </child>
2038-+ <child>
2039-+ <object class="GtkFrame" id="frame3">
2040-+ <property name="visible">True</property>
2041-+ <property name="can_focus">False</property>
2042-+ <property name="label_xalign">0</property>
2043-+ <property name="shadow_type">none</property>
2044-+ <child>
2045-+ <object class="GtkTable" id="table5">
2046-+ <property name="visible">True</property>
2047-+ <property name="can_focus">False</property>
2048-+ <property name="margin_left">12</property>
2049-+ <property name="margin_top">12</property>
2050-+ <property name="n_rows">3</property>
2051-+ <property name="n_columns">2</property>
2052-+ <property name="column_spacing">3</property>
2053-+ <property name="row_spacing">3</property>
2054-+ <child>
2055-+ <object class="GtkLabel" id="label19">
2056-+ <property name="visible">True</property>
2057-+ <property name="can_focus">False</property>
2058-+ <property name="xalign">0</property>
2059-+ <property name="label" translatable="yes">Display language:</property>
2060-+ </object>
2061-+ <packing>
2062-+ <property name="y_options">GTK_FILL</property>
2063-+ <property name="x_padding">3</property>
2064-+ <property name="y_padding">3</property>
2065-+ </packing>
2066-+ </child>
2067-+ <child>
2068-+ <object class="GtkLabel" id="system_display_language">
2069-+ <property name="visible">True</property>
2070-+ <property name="can_focus">False</property>
2071-+ <property name="xalign">0</property>
2072-+ </object>
2073-+ <packing>
2074-+ <property name="left_attach">1</property>
2075-+ <property name="right_attach">2</property>
2076-+ <property name="y_options">GTK_FILL</property>
2077-+ <property name="x_padding">3</property>
2078-+ <property name="y_padding">3</property>
2079-+ </packing>
2080-+ </child>
2081-+ <child>
2082-+ <object class="GtkLabel" id="label20">
2083-+ <property name="visible">True</property>
2084-+ <property name="can_focus">False</property>
2085-+ <property name="xalign">0</property>
2086-+ <property name="yalign">0</property>
2087-+ <property name="label" translatable="yes">Input source:</property>
2088-+ </object>
2089-+ <packing>
2090-+ <property name="top_attach">1</property>
2091-+ <property name="bottom_attach">2</property>
2092-+ <property name="y_options">GTK_FILL</property>
2093-+ <property name="x_padding">3</property>
2094-+ <property name="y_padding">3</property>
2095-+ </packing>
2096-+ </child>
2097-+ <child>
2098-+ <object class="GtkLabel" id="system_input_source">
2099-+ <property name="visible">True</property>
2100-+ <property name="can_focus">False</property>
2101-+ <property name="xalign">0</property>
2102-+ <property name="yalign">0</property>
2103-+ <property name="wrap">True</property>
2104-+ <property name="width_chars">18</property>
2105-+ </object>
2106-+ <packing>
2107-+ <property name="left_attach">1</property>
2108-+ <property name="right_attach">2</property>
2109-+ <property name="top_attach">1</property>
2110-+ <property name="bottom_attach">2</property>
2111-+ <property name="y_options">GTK_FILL</property>
2112-+ <property name="x_padding">3</property>
2113-+ <property name="y_padding">3</property>
2114-+ </packing>
2115-+ </child>
2116-+ <child>
2117-+ <object class="GtkLabel" id="label21">
2118-+ <property name="visible">True</property>
2119-+ <property name="can_focus">False</property>
2120-+ <property name="xalign">0</property>
2121-+ <property name="label" translatable="yes">Format:</property>
2122-+ </object>
2123-+ <packing>
2124-+ <property name="top_attach">2</property>
2125-+ <property name="bottom_attach">3</property>
2126-+ <property name="y_options">GTK_FILL</property>
2127-+ <property name="x_padding">3</property>
2128-+ <property name="y_padding">3</property>
2129-+ </packing>
2130-+ </child>
2131-+ <child>
2132-+ <object class="GtkLabel" id="system_format">
2133-+ <property name="visible">True</property>
2134-+ <property name="can_focus">False</property>
2135-+ <property name="xalign">0</property>
2136-+ </object>
2137-+ <packing>
2138-+ <property name="left_attach">1</property>
2139-+ <property name="right_attach">2</property>
2140-+ <property name="top_attach">2</property>
2141-+ <property name="bottom_attach">3</property>
2142-+ <property name="y_options">GTK_FILL</property>
2143-+ <property name="x_padding">3</property>
2144-+ <property name="y_padding">3</property>
2145-+ </packing>
2146-+ </child>
2147-+ </object>
2148-+ </child>
2149-+ <child type="label">
2150-+ <object class="GtkLabel" id="label15">
2151-+ <property name="visible">True</property>
2152-+ <property name="can_focus">False</property>
2153-+ <property name="label" translatable="yes">System settings</property>
2154-+ <attributes>
2155-+ <attribute name="weight" value="bold"/>
2156-+ </attributes>
2157-+ </object>
2158-+ </child>
2159-+ </object>
2160-+ <packing>
2161-+ <property name="left_attach">1</property>
2162-+ <property name="right_attach">2</property>
2163-+ <property name="top_attach">1</property>
2164-+ <property name="bottom_attach">2</property>
2165-+ <property name="y_options">GTK_FILL</property>
2166-+ <property name="x_padding">3</property>
2167-+ <property name="y_padding">3</property>
2168-+ </packing>
2169-+ </child>
2170-+ <child>
2171-+ <object class="GtkButton" id="copy_settings_button">
2172-+ <property name="label" translatable="yes">Copy Settings...</property>
2173++ <object class="GtkLinkButton" id="jump-to-shortcuts">
2174++ <property name="label" translatable="yes">Keyboard Settings...</property>
2175 + <property name="visible">True</property>
2176 + <property name="can_focus">True</property>
2177 + <property name="receives_default">True</property>
2178++ <property name="has_tooltip">True</property>
2179++ <property name="halign">end</property>
2180++ <property name="relief">none</property>
2181 + </object>
2182 + <packing>
2183-+ <property name="left_attach">1</property>
2184-+ <property name="right_attach">2</property>
2185-+ <property name="top_attach">2</property>
2186-+ <property name="bottom_attach">3</property>
2187-+ <property name="x_options">GTK_SHRINK</property>
2188-+ <property name="y_options">GTK_SHRINK</property>
2189-+ <property name="x_padding">3</property>
2190-+ <property name="y_padding">3</property>
2191++ <property name="expand">False</property>
2192++ <property name="fill">True</property>
2193++ <property name="position">1</property>
2194 + </packing>
2195 + </child>
2196 + </object>
2197 + <packing>
2198-+ <property name="position">4</property>
2199-+ </packing>
2200-+ </child>
2201-+ <child type="tab">
2202-+ <object class="GtkLabel" id="label12">
2203-+ <property name="visible">True</property>
2204-+ <property name="can_focus">False</property>
2205-+ <property name="label" translatable="yes">System</property>
2206-+ </object>
2207-+ <packing>
2208-+ <property name="position">4</property>
2209-+ <property name="tab_fill">False</property>
2210++ <property name="expand">True</property>
2211++ <property name="fill">True</property>
2212++ <property name="position">1</property>
2213 + </packing>
2214 + </child>
2215 + </object>
2216 + <packing>
2217-+ <property name="expand">False</property>
2218-+ <property name="fill">False</property>
2219-+ <property name="position">0</property>
2220++ <property name="position">3</property>
2221 + </packing>
2222 + </child>
2223 + </object>
2224@@ -4513,11 +3672,4 @@
2225 + </object>
2226 + </child>
2227 + </object>
2228-+ <object class="GtkSizeGroup" id="system-input-source-sizegroup">
2229-+ <property name="mode">vertical</property>
2230-+ <widgets>
2231-+ <widget name="user_input_source"/>
2232-+ <widget name="system_input_source"/>
2233-+ </widgets>
2234-+ </object>
2235 +</interface>
2236
2237=== modified file 'debian/patches/series'
2238--- debian/patches/series 2013-09-30 14:29:53 +0000
2239+++ debian/patches/series 2013-09-30 21:01:55 +0000
2240@@ -1,5 +1,6 @@
2241 05_run_update_manager.patch
2242 06_handle_passwd_with_ldap.patch
2243+10_keyboard_layout_on_unity.patch
2244 11_power-configure_lid_action.patch
2245 12_add_never_turn_screen_off.patch
2246 51_unity_options_in_display_panel.patch
2247@@ -37,6 +38,7 @@
2248 git-rename-bluetooth-panel.patch
2249 zz_add_fallback_panels_dir.patch
2250 rename_screenshot_media_keys.patch
2251+git_show_per_window_input_settings.patch
2252 input-sources-text-entry.patch
2253 unity_menus.patch
2254 git_power_gsd_proxies.patch
2255@@ -48,7 +50,6 @@
2256 git-background-lock-screen.patch
2257 git_rename_natural_scrolling.patch
2258 git_hide_unavailable_layout_settings_btn.patch
2259-git_show_per_window_input_settings.patch
2260 git_restore_mouse_speed.patch
2261 git_drop_ibus_engine_whitelist.patch
2262 ubuntu_update_translations_template.patch

Subscribers

People subscribed via source and target branches