gnome-control-center

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

  1. keyboard-layout-panel
  2. Merge into 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"?

lp:~attente/gnome-control-center/keyboard-layout-panel updated
606. By William Hua

Different region panel desktop files for GNOME and Unity.

607. By William Hua

Remove invalid size group.

608. By William Hua

Re-order patches...

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

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

lp:~attente/gnome-control-center/keyboard-layout-panel updated
609. By William Hua

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
=== added file 'debian/patches/10_keyboard_layout_on_unity.patch'
--- debian/patches/10_keyboard_layout_on_unity.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/10_keyboard_layout_on_unity.patch 2013-09-30 21:01:55 +0000
@@ -0,0 +1,99 @@
1--- a/panels/region/gnome-region-panel.desktop.in.in
2+++ b/panels/region/gnome-region-panel.desktop.in.in
3@@ -7,7 +7,7 @@
4 Type=Application
5 StartupNotify=true
6 Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings
7-OnlyShowIn=GNOME;Unity;
8+OnlyShowIn=GNOME;
9 X-GNOME-Bugzilla-Bugzilla=GNOME
10 X-GNOME-Bugzilla-Product=gnome-control-center
11 X-GNOME-Bugzilla-Component=region
12--- a/panels/region/cc-region-panel.c
13+++ b/panels/region/cc-region-panel.c
14@@ -47,6 +47,12 @@
15 SYSTEM_PAGE
16 };
17
18+static gboolean
19+is_unity (void)
20+{
21+ return g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0;
22+}
23+
24 static void
25 cc_region_panel_set_page (CcRegionPanel *panel,
26 const char *page)
27@@ -149,16 +155,24 @@
28 return;
29 }
30
31- prefs_widget = (GtkWidget *) gtk_builder_get_object (priv->builder,
32- "region_notebook");
33+ if (!is_unity ())
34+ prefs_widget = (GtkWidget *) gtk_builder_get_object (priv->builder,
35+ "region_notebook");
36+ else
37+ prefs_widget = (GtkWidget *) gtk_builder_get_object (priv->builder,
38+ "vbox5");
39+
40 gtk_widget_set_size_request (GTK_WIDGET (prefs_widget), -1, 400);
41
42 gtk_widget_reparent (prefs_widget, GTK_WIDGET (self));
43
44 setup_input_tabs (priv->builder, self);
45- setup_language (priv->builder);
46- setup_formats (priv->builder);
47- setup_system (priv->builder);
48+
49+ if (!is_unity ()) {
50+ setup_language (priv->builder);
51+ setup_formats (priv->builder);
52+ setup_system (priv->builder);
53+ }
54 }
55
56 void
57--- /dev/null
58+++ b/panels/region/unity-region-panel.desktop.in.in
59@@ -0,0 +1,17 @@
60+[Desktop Entry]
61+_Name=Text Entry
62+_Comment=Change your keyboard or input method settings
63+Exec=gnome-control-center region
64+Icon=preferences-desktop-keyboard-shortcuts
65+Terminal=false
66+Type=Application
67+StartupNotify=true
68+Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings
69+OnlyShowIn=Unity;
70+X-GNOME-Bugzilla-Bugzilla=GNOME
71+X-GNOME-Bugzilla-Product=gnome-control-center
72+X-GNOME-Bugzilla-Component=region
73+X-GNOME-Bugzilla-Version=@VERSION@
74+X-GNOME-Settings-Panel=region
75+# Translators: those are keywords for the region control-center panel
76+_Keywords=Language;Layout;Keyboard;Input Method;Text Entry;
77--- a/panels/region/Makefile.am
78+++ b/panels/region/Makefile.am
79@@ -40,7 +40,9 @@
80 $(NULL)
81
82 desktopdir = $(datadir)/applications
83-Desktop_in_files = gnome-region-panel.desktop.in
84+Desktop_in_files = \
85+ gnome-region-panel.desktop.in \
86+ unity-region-panel.desktop.in
87 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
88
89 CLEANFILES = $(Desktop_in_files) $(desktop_DATA)
90--- a/configure.ac
91+++ b/configure.ac
92@@ -414,6 +414,7 @@
93 panels/keyboard/gnome-keybindings.pc
94 panels/region/Makefile
95 panels/region/gnome-region-panel.desktop.in
96+panels/region/unity-region-panel.desktop.in
97 panels/mouse/Makefile
98 panels/mouse/gnome-mouse-panel.desktop.in
99 panels/online-accounts/Makefile
0100
=== modified file 'debian/patches/git_drop_ibus_engine_whitelist.patch'
--- debian/patches/git_drop_ibus_engine_whitelist.patch 2013-09-14 15:17:54 +0000
+++ debian/patches/git_drop_ibus_engine_whitelist.patch 2013-09-30 21:01:55 +0000
@@ -228,7 +228,7 @@
228-};228-};
229 #endif /* HAVE_IBUS */229 #endif /* HAVE_IBUS */
230 230
231 static gboolean231 static void populate_model (GtkListStore *store,
232@@ -475,10 +263,10 @@232@@ -475,10 +263,10 @@
233 IBusEngineDesc *engine = l->data;233 IBusEngineDesc *engine = l->data;
234 const gchar *engine_id = ibus_engine_desc_get_name (engine);234 const gchar *engine_id = ibus_engine_desc_get_name (engine);
235235
=== modified file 'debian/patches/git_show_per_window_input_settings.patch'
--- debian/patches/git_show_per_window_input_settings.patch 2013-09-24 20:59:44 +0000
+++ debian/patches/git_show_per_window_input_settings.patch 2013-09-30 21:01:55 +0000
@@ -285,10 +285,11 @@
285 <packing>285 <packing>
286--- a/panels/region/gnome-region-panel-input.c286--- a/panels/region/gnome-region-panel-input.c
287+++ b/panels/region/gnome-region-panel-input.c287+++ b/panels/region/gnome-region-panel-input.c
288@@ -1760,6 +1760,18 @@288@@ -1338,6 +1338,18 @@
289 "changed::" KEY_INPUT_SOURCES,
289 G_CALLBACK (input_sources_changed),290 G_CALLBACK (input_sources_changed),
290 builder);291 builder);
291 292+
292+ g_settings_bind (input_sources_settings, "per-window",293+ g_settings_bind (input_sources_settings, "per-window",
293+ WID("per-window-radio-true"), "active",294+ WID("per-window-radio-true"), "active",
294+ G_SETTINGS_BIND_DEFAULT);295+ G_SETTINGS_BIND_DEFAULT);
@@ -300,7 +301,6 @@
300+ G_CALLBACK (g_settings_apply), input_sources_settings);301+ G_CALLBACK (g_settings_apply), input_sources_settings);
301+ g_signal_connect_swapped (WID("per-window-radio-false"), "clicked",302+ g_signal_connect_swapped (WID("per-window-radio-false"), "clicked",
302+ G_CALLBACK (g_settings_apply), input_sources_settings);303+ G_CALLBACK (g_settings_apply), input_sources_settings);
303+304 }
304 if (has_indicator_keyboard ())305
305 {306 static void
306 libgnomekbd_settings = g_settings_new (LIBGNOMEKBD_DESKTOP_SCHEMA_ID);
307307
=== modified file 'debian/patches/input-sources-text-entry.patch'
--- debian/patches/input-sources-text-entry.patch 2013-09-24 20:59:44 +0000
+++ debian/patches/input-sources-text-entry.patch 2013-09-30 21:01:55 +0000
@@ -54,12 +54,11 @@
54 54
55 #ifdef HAVE_IBUS55 #ifdef HAVE_IBUS
56 static IBusBus *ibus = NULL;56 static IBusBus *ibus = NULL;
57@@ -279,6 +301,31 @@57@@ -289,6 +311,31 @@
58 };58 static GtkTreeModel *tree_view_get_actual_model (GtkTreeView *tv);
59 #endif /* HAVE_IBUS */
60 59
61+static gboolean60 static gboolean
62+is_ubuntu (void)61+is_unity (void)
63+{62+{
64+ return g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0;63+ return g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0;
65+}64+}
@@ -67,7 +66,7 @@
67+static gboolean66+static gboolean
68+has_indicator_keyboard (void)67+has_indicator_keyboard (void)
69+{68+{
70+ if (is_ubuntu ())69+ if (is_unity ())
71+ {70+ {
72+ const gchar * const *schemas = g_settings_list_schemas ();71+ const gchar * const *schemas = g_settings_list_schemas ();
73+72+
@@ -83,9 +82,10 @@
83+ return FALSE;82+ return FALSE;
84+}83+}
85+84+
86 static void populate_model (GtkListStore *store,85+static gboolean
87 GtkListStore *active_sources_store);86 strv_contains (const gchar * const *strv,
88 static GtkWidget *input_chooser_new (GtkWindow *main_window,87 const gchar *str)
88 {
89@@ -467,9 +514,6 @@89@@ -467,9 +514,6 @@
90 ibus_cancellable,90 ibus_cancellable,
91 (GAsyncReadyCallback)fetch_ibus_engines_result,91 (GAsyncReadyCallback)fetch_ibus_engines_result,
@@ -387,6 +387,15 @@
387 }387 }
388 maybe_start_ibus ();388 maybe_start_ibus ();
389 }389 }
390@@ -909,7 +1223,7 @@
391
392 g_debug ("add an input source");
393
394- toplevel = gtk_widget_get_toplevel (WID ("region_notebook"));
395+ toplevel = gtk_widget_get_toplevel (WID ("active_input_sources"));
396 treeview = WID ("active_input_sources");
397 active_sources = GTK_LIST_STORE (tree_view_get_actual_model (GTK_TREE_VIEW (treeview)));
398
390@@ -1150,6 +1464,8 @@399@@ -1150,6 +1464,8 @@
391 const gchar *argv[] = { "shortcuts", "Typing", NULL };400 const gchar *argv[] = { "shortcuts", "Typing", NULL };
392 GError *error = NULL;401 GError *error = NULL;
@@ -451,7 +460,7 @@
451+ *key,460+ *key,
452+ *code,461+ *code,
453+ *mask,462+ *mask,
454+ gtk_widget_get_toplevel (WID ("region_notebook")));463+ gtk_widget_get_toplevel (GTK_WIDGET (entry)));
455+464+
456+ return edited ? GTK_ENTRY_ACCEL_UPDATE : GTK_ENTRY_ACCEL_IGNORE;465+ return edited ? GTK_ENTRY_ACCEL_UPDATE : GTK_ENTRY_ACCEL_IGNORE;
457+}466+}
@@ -549,7 +558,7 @@
549 #endif558 #endif
550 559
551 populate_with_active_sources (store);560 populate_with_active_sources (store);
552@@ -1327,17 +1753,70 @@561@@ -1327,29 +1753,84 @@
553 G_CALLBACK (show_selected_layout), builder);562 G_CALLBACK (show_selected_layout), builder);
554 g_signal_connect (WID("input_source_settings"), "clicked",563 g_signal_connect (WID("input_source_settings"), "clicked",
555 G_CALLBACK (show_selected_settings), builder);564 G_CALLBACK (show_selected_settings), builder);
@@ -564,7 +573,18 @@
564 "changed::" KEY_INPUT_SOURCES,573 "changed::" KEY_INPUT_SOURCES,
565 G_CALLBACK (input_sources_changed),574 G_CALLBACK (input_sources_changed),
566 builder);575 builder);
567+576
577- g_settings_bind (input_sources_settings, "per-window",
578- WID("per-window-radio-true"), "active",
579- G_SETTINGS_BIND_DEFAULT);
580- g_settings_bind (input_sources_settings, "per-window",
581- WID("per-window-radio-false"), "active",
582- G_SETTINGS_BIND_DEFAULT | G_SETTINGS_BIND_INVERT_BOOLEAN);
583- /* because we are in delay-apply mode */
584- g_signal_connect_swapped (WID("per-window-radio-true"), "clicked",
585- G_CALLBACK (g_settings_apply), input_sources_settings);
586- g_signal_connect_swapped (WID("per-window-radio-false"), "clicked",
587- G_CALLBACK (g_settings_apply), input_sources_settings);
568+ if (has_indicator_keyboard ())588+ if (has_indicator_keyboard ())
569+ {589+ {
570+ libgnomekbd_settings = g_settings_new (LIBGNOMEKBD_DESKTOP_SCHEMA_ID);590+ libgnomekbd_settings = g_settings_new (LIBGNOMEKBD_DESKTOP_SCHEMA_ID);
@@ -621,7 +641,21 @@
621+ builder);641+ builder);
622+ }642+ }
623+ else643+ else
624+ update_shortcuts (builder);644+ {
645+ g_settings_bind (input_sources_settings, "per-window",
646+ WID("per-window-radio-true"), "active",
647+ G_SETTINGS_BIND_DEFAULT);
648+ g_settings_bind (input_sources_settings, "per-window",
649+ WID("per-window-radio-false"), "active",
650+ G_SETTINGS_BIND_DEFAULT | G_SETTINGS_BIND_INVERT_BOOLEAN);
651+ /* because we are in delay-apply mode */
652+ g_signal_connect_swapped (WID("per-window-radio-true"), "clicked",
653+ G_CALLBACK (g_settings_apply), input_sources_settings);
654+ g_signal_connect_swapped (WID("per-window-radio-false"), "clicked",
655+ G_CALLBACK (g_settings_apply), input_sources_settings);
656+
657+ update_shortcuts (builder);
658+ }
625 }659 }
626 660
627 static void661 static void
@@ -1176,7 +1210,7 @@
1176 uidir = $(pkgdatadir)/ui1210 uidir = $(pkgdatadir)/ui
1177 ui_DATA = \1211 ui_DATA = \
1178 gnome-region-panel.ui \1212 gnome-region-panel.ui \
1179+ ubuntu-region-panel.ui \1213+ unity-region-panel.ui \
1180 gnome-region-panel-input-chooser.ui \1214 gnome-region-panel-input-chooser.ui \
1181 $(NULL)1215 $(NULL)
1182 1216
@@ -1190,41 +1224,39 @@
1190 1224
1191 CC_PANEL_REGISTER (CcRegionPanel, cc_region_panel)1225 CC_PANEL_REGISTER (CcRegionPanel, cc_region_panel)
1192 1226
1193@@ -47,6 +48,33 @@1227@@ -47,12 +48,31 @@
1194 SYSTEM_PAGE1228 SYSTEM_PAGE
1195 };1229 };
1196 1230
1197+#define INDICATOR_KEYBOARD_SCHEMA_ID "com.canonical.indicator.keyboard"1231+#define INDICATOR_KEYBOARD_SCHEMA_ID "com.canonical.indicator.keyboard"
1198+1232+
1199+static gboolean1233 static gboolean
1200+is_ubuntu (void)1234 is_unity (void)
1201+{1235 {
1202+ return g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0;1236 return g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0;
1203+}1237 }
1204+1238
1205+static gboolean1239+static gboolean
1206+has_indicator_keyboard (void)1240+has_indicator_keyboard (void)
1207+{1241+{
1208+ if (is_ubuntu ())1242+ if (is_unity ()) {
1209+ {1243+ const gchar * const *schemas = g_settings_list_schemas ();
1210+ const gchar * const *schemas = g_settings_list_schemas ();1244+
1211+1245+ while (*schemas != NULL) {
1212+ while (*schemas != NULL)1246+ if (g_strcmp0 (*schemas, INDICATOR_KEYBOARD_SCHEMA_ID) == 0)
1213+ {1247+ return TRUE;
1214+ if (g_strcmp0 (*schemas, INDICATOR_KEYBOARD_SCHEMA_ID) == 0)1248+
1215+ return TRUE;1249+ schemas++;
1216+1250+ }
1217+ schemas++;1251+ }
1218+ }1252+
1219+ }1253+ return FALSE;
1220+
1221+ return FALSE;
1222+}1254+}
1223+1255+
1224 static void1256 static void
1225 cc_region_panel_set_page (CcRegionPanel *panel,1257 cc_region_panel_set_page (CcRegionPanel *panel,
1226 const char *page)1258 const char *page)
1227@@ -136,13 +164,21 @@1259@@ -142,13 +162,21 @@
1228 GtkWidget *prefs_widget;1260 GtkWidget *prefs_widget;
1229 GError *error = NULL;1261 GError *error = NULL;
1230 1262
@@ -1239,7 +1271,7 @@
1239- &error);1271- &error);
1240+ if (has_indicator_keyboard ())1272+ if (has_indicator_keyboard ())
1241+ gtk_builder_add_from_file (priv->builder,1273+ gtk_builder_add_from_file (priv->builder,
1242+ GNOMECC_UI_DIR "/ubuntu-region-panel.ui",1274+ GNOMECC_UI_DIR "/unity-region-panel.ui",
1243+ &error);1275+ &error);
1244+ else1276+ else
1245+ gtk_builder_add_from_file (priv->builder,1277+ gtk_builder_add_from_file (priv->builder,
@@ -2990,8 +3022,8 @@
2990 [type: gettext/glade]panels/screen/screen.ui3022 [type: gettext/glade]panels/screen/screen.ui
2991 panels/sound/applet-main.c3023 panels/sound/applet-main.c
2992--- /dev/null3024--- /dev/null
2993+++ b/panels/region/ubuntu-region-panel.ui3025+++ b/panels/region/unity-region-panel.ui
2994@@ -0,0 +1,1529 @@3026@@ -0,0 +1,649 @@
2995+<?xml version="1.0" encoding="UTF-8"?>3027+<?xml version="1.0" encoding="UTF-8"?>
2996+<interface>3028+<interface>
2997+ <!-- interface-requires gtk+ 3.0 -->3029+ <!-- interface-requires gtk+ 3.0 -->
@@ -3095,47 +3127,47 @@
3095+ <property name="border_width">5</property>3127+ <property name="border_width">5</property>
3096+ <property name="spacing">12</property>3128+ <property name="spacing">12</property>
3097+ <child>3129+ <child>
3098+ <object class="GtkNotebook" id="region_notebook">3130+ <object class="GtkVBox" id="vbox5">
3099+ <property name="visible">True</property>3131+ <property name="visible">True</property>
3100+ <property name="can_focus">True</property>3132+ <property name="can_focus">False</property>
3101+ <property name="border_width">10</property>3133+ <property name="border_width">12</property>
3134+ <property name="spacing">12</property>
3102+ <child>3135+ <child>
3103+ <object class="GtkVBox" id="vbox2">3136+ <object class="GtkHBox" id="hbox3">
3104+ <property name="visible">True</property>3137+ <property name="visible">True</property>
3105+ <property name="can_focus">False</property>3138+ <property name="can_focus">False</property>
3106+ <property name="border_width">12</property>
3107+ <property name="spacing">12</property>3139+ <property name="spacing">12</property>
3108+ <child>3140+ <child>
3109+ <object class="GtkLabel" id="label4">3141+ <object class="GtkVBox" id="vbox6">
3110+ <property name="visible">True</property>3142+ <property name="visible">True</property>
3111+ <property name="can_focus">False</property>3143+ <property name="can_focus">False</property>
3112+ <property name="xalign">0</property>3144+ <property name="margin_right">5</property>
3113+ <property name="label" translatable="yes">Select a display language (change will be applied next time you log in)</property>3145+ <child>
3114+ </object>3146+ <object class="GtkLabel" id="label2">
3115+ <packing>3147+ <property name="visible">True</property>
3116+ <property name="expand">False</property>3148+ <property name="can_focus">False</property>
3117+ <property name="fill">True</property>3149+ <property name="margin_bottom">5</property>
3118+ <property name="position">0</property>3150+ <property name="xalign">0</property>
3119+ </packing>3151+ <property name="label" translatable="yes">Input sources to use:</property>
3120+ </child>3152+ </object>
3121+ <child>3153+ <packing>
3122+ <object class="GtkBox" id="hbox1">3154+ <property name="expand">False</property>
3123+ <property name="visible">True</property>3155+ <property name="fill">True</property>
3124+ <property name="can_focus">False</property>3156+ <property name="position">0</property>
3125+ <property name="orientation">vertical</property>3157+ </packing>
3126+ <child>3158+ </child>
3127+ <object class="GtkScrolledWindow" id="language-swindow">3159+ <child>
3160+ <object class="GtkScrolledWindow" id="input_sources_swindow">
3128+ <property name="visible">True</property>3161+ <property name="visible">True</property>
3129+ <property name="can_focus">True</property>3162+ <property name="can_focus">True</property>
3130+ <property name="hscrollbar_policy">never</property>
3131+ <property name="shadow_type">in</property>3163+ <property name="shadow_type">in</property>
3132+ <child>3164+ <child>
3133+ <object class="GtkTreeView" id="display_language_treeview">3165+ <object class="GtkTreeView" id="active_input_sources">
3134+ <property name="visible">True</property>3166+ <property name="visible">True</property>
3135+ <property name="can_focus">True</property>3167+ <property name="can_focus">True</property>
3136+ <property name="headers_visible">False</property>3168+ <property name="headers_visible">False</property>
3137+ <child internal-child="selection">3169+ <child internal-child="selection">
3138+ <object class="GtkTreeSelection" id="language-treeview-selection"/>3170+ <object class="GtkTreeSelection" id="treeview-selection3"/>
3139+ </child>3171+ </child>
3140+ </object>3172+ </object>
3141+ </child>3173+ </child>
@@ -3143,11 +3175,12 @@
3143+ <packing>3175+ <packing>
3144+ <property name="expand">True</property>3176+ <property name="expand">True</property>
3145+ <property name="fill">True</property>3177+ <property name="fill">True</property>
3146+ <property name="position">0</property>3178+ <property name="position">1</property>
3147+ </packing>3179+ </packing>
3148+ </child>3180+ </child>
3149+ <child>3181+ <child>
3150+ <object class="GtkToolbar" id="language-toolbar">3182+ <object class="GtkToolbar" id="input-toolbar">
3183+ <property name="visible">True</property>
3151+ <property name="can_focus">False</property>3184+ <property name="can_focus">False</property>
3152+ <property name="toolbar_style">icons</property>3185+ <property name="toolbar_style">icons</property>
3153+ <property name="show_arrow">False</property>3186+ <property name="show_arrow">False</property>
@@ -3156,18 +3189,231 @@
3156+ <class name="inline-toolbar"/>3189+ <class name="inline-toolbar"/>
3157+ </style>3190+ </style>
3158+ <child>3191+ <child>
3159+ <object class="GtkToolButton" id="language_add">3192+ <object class="GtkToolItem" id="i_s_ar_item">
3160+ <property name="visible">True</property>3193+ <property name="visible">True</property>
3161+ <property name="can_focus">False</property>3194+ <property name="can_focus">False</property>
3162+ <property name="label" translatable="yes">Add Language</property>3195+ <child>
3163+ <property name="use_underline">True</property>3196+ <object class="GtkBox" id="i_s_ar_box">
3164+ <property name="icon_name">list-add-symbolic</property>3197+ <property name="visible">True</property>
3165+ </object>3198+ <property name="can_focus">False</property>
3166+ <packing>3199+ <child>
3167+ <property name="expand">False</property>3200+ <object class="GtkButton" id="input_source_add">
3168+ <property name="homogeneous">True</property>3201+ <property name="visible">True</property>
3169+ </packing>3202+ <property name="can_focus">False</property>
3170+ </child>3203+ <property name="receives_default">False</property>
3204+ <child>
3205+ <object class="GtkImage" id="i_s_a_image">
3206+ <property name="visible">True</property>
3207+ <property name="can_focus">False</property>
3208+ <property name="icon_name">list-add-symbolic</property>
3209+ <property name="icon-size">1</property>
3210+ </object>
3211+ </child>
3212+ </object>
3213+ <packing>
3214+ <property name="expand">False</property>
3215+ <property name="fill">True</property>
3216+ <property name="position">0</property>
3217+ </packing>
3218+ </child>
3219+ <child>
3220+ <object class="GtkButton" id="input_source_remove">
3221+ <property name="visible">True</property>
3222+ <property name="can_focus">False</property>
3223+ <property name="receives_default">False</property>
3224+ <child>
3225+ <object class="GtkImage" id="i_s_r_image">
3226+ <property name="visible">True</property>
3227+ <property name="can_focus">False</property>
3228+ <property name="icon_name">list-remove-symbolic</property>
3229+ <property name="icon-size">1</property>
3230+ </object>
3231+ </child>
3232+ </object>
3233+ <packing>
3234+ <property name="expand">False</property>
3235+ <property name="fill">True</property>
3236+ <property name="position">1</property>
3237+ </packing>
3238+ </child>
3239+ </object>
3240+ </child>
3241+ </object>
3242+ <packing>
3243+ <property name="expand">False</property>
3244+ </packing>
3245+ </child>
3246+ <child>
3247+ <object class="GtkSeparatorToolItem" id="sep1">
3248+ <property name="visible">True</property>
3249+ <property name="can_focus">False</property>
3250+ <property name="draw">False</property>
3251+ </object>
3252+ <packing>
3253+ <property name="expand">True</property>
3254+ </packing>
3255+ </child>
3256+ <child>
3257+ <object class="GtkToolItem" id="i_s_ud_item">
3258+ <property name="visible">True</property>
3259+ <property name="can_focus">False</property>
3260+ <child>
3261+ <object class="GtkBox" id="i_s_ud_box">
3262+ <property name="visible">True</property>
3263+ <property name="can_focus">False</property>
3264+ <child>
3265+ <object class="GtkButton" id="input_source_move_up">
3266+ <property name="visible">True</property>
3267+ <property name="can_focus">False</property>
3268+ <property name="receives_default">False</property>
3269+ <child>
3270+ <object class="GtkImage" id="i_s_u_image">
3271+ <property name="visible">True</property>
3272+ <property name="can_focus">False</property>
3273+ <property name="icon_name">go-up-symbolic</property>
3274+ <property name="icon-size">1</property>
3275+ </object>
3276+ </child>
3277+ </object>
3278+ <packing>
3279+ <property name="expand">False</property>
3280+ <property name="fill">True</property>
3281+ <property name="position">0</property>
3282+ </packing>
3283+ </child>
3284+ <child>
3285+ <object class="GtkButton" id="input_source_move_down">
3286+ <property name="visible">True</property>
3287+ <property name="can_focus">False</property>
3288+ <property name="receives_default">False</property>
3289+ <child>
3290+ <object class="GtkImage" id="i_s_d_image">
3291+ <property name="visible">True</property>
3292+ <property name="can_focus">False</property>
3293+ <property name="icon_name">go-down-symbolic</property>
3294+ <property name="icon-size">1</property>
3295+ </object>
3296+ </child>
3297+ </object>
3298+ <packing>
3299+ <property name="expand">False</property>
3300+ <property name="fill">True</property>
3301+ <property name="position">1</property>
3302+ </packing>
3303+ </child>
3304+ </object>
3305+ </child>
3306+ </object>
3307+ <packing>
3308+ <property name="expand">False</property>
3309+ </packing>
3310+ </child>
3311+ <child>
3312+ <object class="GtkSeparatorToolItem" id="sep2">
3313+ <property name="visible">True</property>
3314+ <property name="can_focus">False</property>
3315+ <property name="hexpand">True</property>
3316+ <property name="draw">False</property>
3317+ </object>
3318+ <packing>
3319+ <property name="expand">True</property>
3320+ </packing>
3321+ </child>
3322+ <child>
3323+ <object class="GtkToolItem" id="i_s_sp_item">
3324+ <property name="visible">True</property>
3325+ <property name="can_focus">False</property>
3326+ <child>
3327+ <object class="GtkBox" id="i_s_sp_box">
3328+ <property name="visible">True</property>
3329+ <property name="can_focus">False</property>
3330+ <child>
3331+ <object class="GtkButton" id="input_source_settings">
3332+ <property name="visible">True</property>
3333+ <property name="can_focus">False</property>
3334+ <property name="receives_default">False</property>
3335+ <child>
3336+ <object class="GtkImage" id="i_s_s_image">
3337+ <property name="visible">True</property>
3338+ <property name="can_focus">False</property>
3339+ <property name="pixel_size">16</property>
3340+ <property name="icon_name">preferences-system-symbolic</property>
3341+ <property name="icon-size">1</property>
3342+ </object>
3343+ </child>
3344+ </object>
3345+ <packing>
3346+ <property name="expand">False</property>
3347+ <property name="fill">True</property>
3348+ <property name="position">0</property>
3349+ </packing>
3350+ </child>
3351+ <child>
3352+ <object class="GtkButton" id="input_source_show">
3353+ <property name="visible">True</property>
3354+ <property name="can_focus">False</property>
3355+ <property name="receives_default">False</property>
3356+ <child>
3357+ <object class="GtkImage" id="i_s_p_image">
3358+ <property name="visible">True</property>
3359+ <property name="can_focus">False</property>
3360+ <property name="icon_name">input-keyboard-symbolic</property>
3361+ <property name="icon-size">1</property>
3362+ </object>
3363+ </child>
3364+ </object>
3365+ <packing>
3366+ <property name="expand">False</property>
3367+ <property name="fill">True</property>
3368+ <property name="position">1</property>
3369+ </packing>
3370+ </child>
3371+ </object>
3372+ </child>
3373+ </object>
3374+ <packing>
3375+ <property name="expand">False</property>
3376+ </packing>
3377+ </child>
3378+ </object>
3379+ <packing>
3380+ <property name="expand">False</property>
3381+ <property name="fill">True</property>
3382+ <property name="position">2</property>
3383+ </packing>
3384+ </child>
3385+ </object>
3386+ <packing>
3387+ <property name="expand">True</property>
3388+ <property name="fill">True</property>
3389+ <property name="position">0</property>
3390+ </packing>
3391+ </child>
3392+ <child>
3393+ <object class="GtkBox" id="box2">
3394+ <property name="visible">True</property>
3395+ <property name="can_focus">False</property>
3396+ <property name="orientation">vertical</property>
3397+ <child>
3398+ <object class="GtkLabel" id="label22">
3399+ <property name="visible">True</property>
3400+ <property name="can_focus">False</property>
3401+ <property name="margin_bottom">5</property>
3402+ <property name="xalign">0</property>
3403+ <property name="label" translatable="yes">Switch to next source using:</property>
3404+ </object>
3405+ <packing>
3406+ <property name="expand">False</property>
3407+ <property name="fill">True</property>
3408+ <property name="position">0</property>
3409+ </packing>
3410+ </child>
3411+ <child>
3412+ <object class="GtkEntryAccel" id="next-source-entry">
3413+ <property name="visible">True</property>
3414+ <property name="can_focus">True</property>
3415+ <property name="margin_bottom">5</property>
3416+ <property name="invisible_char">•</property>
3171+ </object>3417+ </object>
3172+ <packing>3418+ <packing>
3173+ <property name="expand">False</property>3419+ <property name="expand">False</property>
@@ -3176,40 +3422,181 @@
3176+ </packing>3422+ </packing>
3177+ </child>3423+ </child>
3178+ <child>3424+ <child>
3179+ <object class="GtkVBox" id="vbox3">3425+ <object class="GtkLabel" id="label24">
3180+ <property name="can_focus">False</property>3426+ <property name="visible">True</property>
3181+ <child>3427+ <property name="can_focus">False</property>
3182+ <object class="GtkLabel" id="label23">3428+ <property name="margin_bottom">5</property>
3183+ <property name="visible">True</property>3429+ <property name="xalign">0</property>
3184+ <property name="can_focus">False</property>3430+ <property name="label" translatable="yes">Switch to previous source using:</property>
3185+ <property name="label" translatable="yes">Add Language</property>3431+ </object>
3186+ <property name="use_underline">True</property>3432+ <packing>
3187+ </object>3433+ <property name="expand">False</property>
3188+ <packing>3434+ <property name="fill">True</property>
3189+ <property name="expand">True</property>3435+ <property name="position">2</property>
3190+ <property name="fill">True</property>3436+ </packing>
3191+ <property name="position">0</property>3437+ </child>
3192+ </packing>3438+ <child>
3193+ </child>3439+ <object class="GtkEntryAccel" id="prev-source-entry">
3194+ <child>3440+ <property name="visible">True</property>
3195+ <object class="GtkLinkButton" id="linkbutton1">3441+ <property name="can_focus">True</property>
3196+ <property name="label" translatable="yes">Install languages…</property>3442+ <property name="margin_bottom">15</property>
3197+ <property name="visible">True</property>3443+ <property name="invisible_char">•</property>
3198+ <property name="can_focus">True</property>3444+ </object>
3445+ <packing>
3446+ <property name="expand">False</property>
3447+ <property name="fill">True</property>
3448+ <property name="position">3</property>
3449+ </packing>
3450+ </child>
3451+ <child>
3452+ <object class="GtkRadioButton" id="same-source-radio">
3453+ <property name="label" translatable="yes">Use the same source for all windows</property>
3454+ <property name="visible">True</property>
3455+ <property name="can_focus">False</property>
3456+ <property name="receives_default">False</property>
3457+ <property name="xalign">0</property>
3458+ <property name="active">True</property>
3459+ <property name="draw_indicator">True</property>
3460+ </object>
3461+ <packing>
3462+ <property name="expand">False</property>
3463+ <property name="fill">True</property>
3464+ <property name="position">4</property>
3465+ </packing>
3466+ </child>
3467+ <child>
3468+ <object class="GtkRadioButton" id="different-source-radio">
3469+ <property name="label" translatable="yes">Allow different sources for each window</property>
3470+ <property name="visible">True</property>
3471+ <property name="can_focus">False</property>
3472+ <property name="receives_default">False</property>
3473+ <property name="xalign">0</property>
3474+ <property name="active">True</property>
3475+ <property name="draw_indicator">True</property>
3476+ <property name="group">same-source-radio</property>
3477+ </object>
3478+ <packing>
3479+ <property name="expand">False</property>
3480+ <property name="fill">True</property>
3481+ <property name="position">5</property>
3482+ </packing>
3483+ </child>
3484+ <child>
3485+ <object class="GtkRadioButton" id="default-source-radio">
3486+ <property name="label" translatable="yes">New windows use the default source</property>
3487+ <property name="visible">True</property>
3488+ <property name="can_focus">False</property>
3489+ <property name="receives_default">False</property>
3490+ <property name="margin_left">25</property>
3491+ <property name="xalign">0</property>
3492+ <property name="active">True</property>
3493+ <property name="draw_indicator">True</property>
3494+ </object>
3495+ <packing>
3496+ <property name="expand">False</property>
3497+ <property name="fill">True</property>
3498+ <property name="position">6</property>
3499+ </packing>
3500+ </child>
3501+ <child>
3502+ <object class="GtkRadioButton" id="current-source-radio">
3503+ <property name="label" translatable="yes">New windows use the current source</property>
3504+ <property name="visible">True</property>
3505+ <property name="can_focus">False</property>
3506+ <property name="receives_default">False</property>
3507+ <property name="margin_left">25</property>
3508+ <property name="margin_bottom">15</property>
3509+ <property name="xalign">0</property>
3510+ <property name="active">True</property>
3511+ <property name="draw_indicator">True</property>
3512+ <property name="group">default-source-radio</property>
3513+ </object>
3514+ <packing>
3515+ <property name="expand">False</property>
3516+ <property name="fill">True</property>
3517+ <property name="position">7</property>
3518+ </packing>
3519+ </child>
3520+ <child>
3521+ <object class="GtkGrid" id="grid1">
3522+ <property name="visible">True</property>
3523+ <property name="can_focus">False</property>
3524+ <child>
3525+ <object class="GtkLabel" id="label25">
3526+ <property name="visible">True</property>
3527+ <property name="can_focus">False</property>
3528+ <property name="halign">end</property>
3529+ <property name="margin_right">10</property>
3530+ <property name="margin_bottom">10</property>
3531+ <property name="hexpand">True</property>
3532+ <property name="label" translatable="yes">Show input candidates:</property>
3533+ </object>
3534+ <packing>
3535+ <property name="left_attach">0</property>
3536+ <property name="top_attach">0</property>
3537+ <property name="width">1</property>
3538+ <property name="height">1</property>
3539+ </packing>
3540+ </child>
3541+ <child>
3542+ <object class="GtkComboBoxText" id="orientation-combo">
3543+ <property name="visible">True</property>
3544+ <property name="can_focus">False</property>
3545+ <property name="margin_bottom">10</property>
3546+ <property name="entry_text_column">0</property>
3547+ <property name="id_column">1</property>
3548+ <items>
3549+ <item translatable="yes">Horizontally</item>
3550+ <item translatable="yes">Vertically</item>
3551+ </items>
3552+ </object>
3553+ <packing>
3554+ <property name="left_attach">1</property>
3555+ <property name="top_attach">0</property>
3556+ <property name="width">1</property>
3557+ <property name="height">1</property>
3558+ </packing>
3559+ </child>
3560+ <child>
3561+ <object class="GtkFontButton" id="custom-font-button">
3562+ <property name="visible">True</property>
3563+ <property name="can_focus">False</property>
3199+ <property name="receives_default">True</property>3564+ <property name="receives_default">True</property>
3200+ <property name="has_tooltip">True</property>3565+ <property name="font">Sans 12</property>
3201+ </object>3566+ <property name="preview_text"/>
3202+ <packing>3567+ <property name="show_preview_entry">False</property>
3203+ <property name="expand">False</property>3568+ </object>
3204+ <property name="fill">True</property>3569+ <packing>
3205+ <property name="position">1</property>3570+ <property name="left_attach">1</property>
3571+ <property name="top_attach">1</property>
3572+ <property name="width">1</property>
3573+ <property name="height">1</property>
3574+ </packing>
3575+ </child>
3576+ <child>
3577+ <object class="GtkCheckButton" id="custom-font-check">
3578+ <property name="label" translatable="yes">Using custom font:</property>
3579+ <property name="visible">True</property>
3580+ <property name="can_focus">False</property>
3581+ <property name="receives_default">False</property>
3582+ <property name="halign">end</property>
3583+ <property name="margin_right">10</property>
3584+ <property name="hexpand">True</property>
3585+ <property name="xalign">0</property>
3586+ <property name="draw_indicator">True</property>
3587+ </object>
3588+ <packing>
3589+ <property name="left_attach">0</property>
3590+ <property name="top_attach">1</property>
3591+ <property name="width">1</property>
3592+ <property name="height">1</property>
3206+ </packing>3593+ </packing>
3207+ </child>3594+ </child>
3208+ </object>3595+ </object>
3209+ <packing>3596+ <packing>
3210+ <property name="expand">False</property>3597+ <property name="expand">False</property>
3211+ <property name="fill">True</property>3598+ <property name="fill">True</property>
3212+ <property name="position">1</property>3599+ <property name="position">8</property>
3213+ </packing>3600+ </packing>
3214+ </child>3601+ </child>
3215+ </object>3602+ </object>
@@ -3220,1287 +3607,59 @@
3220+ </packing>3607+ </packing>
3221+ </child>3608+ </child>
3222+ </object>3609+ </object>
3223+ </child>3610+ <packing>
3224+ <child type="tab">3611+ <property name="expand">True</property>
3225+ <object class="GtkLabel" id="label1">3612+ <property name="fill">True</property>
3226+ <property name="visible">True</property>3613+ <property name="position">0</property>
3227+ <property name="can_focus">False</property>3614+ </packing>
3228+ <property name="label" translatable="yes">Language</property>3615+ </child>
3229+ </object>3616+ <child>
3230+ <packing>3617+ <object class="GtkBox" id="box1">
3231+ <property name="tab_fill">False</property>3618+ <property name="visible">True</property>
3232+ </packing>3619+ <property name="can_focus">False</property>
3233+ </child>3620+ <property name="valign">end</property>
3234+ <child>3621+ <child>
3235+ <object class="GtkGrid" id="table1">3622+ <object class="GtkCheckButton" id="show-indicator-check">
3236+ <property name="visible">True</property>3623+ <property name="label" translatable="yes">Show current input source in the menu bar</property>
3237+ <property name="can_focus">False</property>3624+ <property name="visible">True</property>
3238+ <property name="margin_left">12</property>3625+ <property name="can_focus">False</property>
3239+ <property name="margin_right">12</property>3626+ <property name="receives_default">False</property>
3240+ <property name="margin_top">12</property>3627+ <property name="hexpand">True</property>
3241+ <property name="margin_bottom">12</property>3628+ <property name="xalign">0</property>
3242+ <property name="row_spacing">6</property>3629+ <property name="draw_indicator">True</property>
3243+ <property name="column_spacing">12</property>3630+ </object>
3244+ <child>3631+ <packing>
3245+ <object class="GtkLabel" id="label5">3632+ <property name="expand">False</property>
3246+ <property name="visible">True</property>
3247+ <property name="can_focus">False</property>
3248+ <property name="halign">start</property>
3249+ <property name="label" translatable="yes">Select a region (change will be applied the next time you log in)</property>
3250+ </object>
3251+ <packing>
3252+ <property name="left_attach">0</property>
3253+ <property name="top_attach">0</property>
3254+ <property name="width">2</property>
3255+ <property name="height">1</property>
3256+ </packing>
3257+ </child>
3258+ <child>
3259+ <object class="GtkBox" id="region-box">
3260+ <property name="visible">True</property>
3261+ <property name="can_focus">False</property>
3262+ <property name="orientation">vertical</property>
3263+ <child>
3264+ <object class="GtkScrolledWindow" id="region-swindow">
3265+ <property name="visible">True</property>
3266+ <property name="can_focus">True</property>
3267+ <property name="vexpand">True</property>
3268+ <property name="hscrollbar_policy">never</property>
3269+ <property name="shadow_type">in</property>
3270+ <child>
3271+ <object class="GtkTreeView" id="region_selector">
3272+ <property name="visible">True</property>
3273+ <property name="can_focus">True</property>
3274+ <property name="headers_visible">False</property>
3275+ <child internal-child="selection">
3276+ <object class="GtkTreeSelection" id="region-treeview-selection"/>
3277+ </child>
3278+ </object>
3279+ </child>
3280+ </object>
3281+ <packing>
3282+ <property name="expand">True</property>
3283+ <property name="fill">True</property>
3284+ <property name="position">0</property>
3285+ </packing>
3286+ </child>
3287+ <child>
3288+ <object class="GtkToolbar" id="region-toolbar">
3289+ <property name="visible">True</property>
3290+ <property name="can_focus">False</property>
3291+ <property name="toolbar_style">icons</property>
3292+ <property name="show_arrow">False</property>
3293+ <property name="icon_size">1</property>
3294+ <style>
3295+ <class name="inline-toolbar"/>
3296+ </style>
3297+ <child>
3298+ <object class="GtkToolButton" id="region_add">
3299+ <property name="visible">True</property>
3300+ <property name="can_focus">False</property>
3301+ <property name="label" translatable="yes">Add Region</property>
3302+ <property name="use_underline">True</property>
3303+ <property name="icon_name">list-add-symbolic</property>
3304+ </object>
3305+ <packing>
3306+ <property name="expand">False</property>
3307+ <property name="homogeneous">True</property>
3308+ </packing>
3309+ </child>
3310+ <child>
3311+ <object class="GtkToolButton" id="region_remove">
3312+ <property name="visible">True</property>
3313+ <property name="sensitive">False</property>
3314+ <property name="can_focus">False</property>
3315+ <property name="label" translatable="yes">Remove Region</property>
3316+ <property name="use_underline">True</property>
3317+ <property name="icon_name">list-remove-symbolic</property>
3318+ </object>
3319+ <packing>
3320+ <property name="expand">False</property>
3321+ <property name="homogeneous">True</property>
3322+ </packing>
3323+ </child>
3324+ </object>
3325+ <packing>
3326+ <property name="expand">False</property>
3327+ <property name="fill">True</property>
3328+ <property name="position">1</property>
3329+ </packing>
3330+ </child>
3331+ </object>
3332+ <packing>
3333+ <property name="left_attach">0</property>
3334+ <property name="top_attach">1</property>
3335+ <property name="width">1</property>
3336+ <property name="height">1</property>
3337+ </packing>
3338+ </child>
3339+ <child>
3340+ <object class="GtkFrame" id="frame1">
3341+ <property name="visible">True</property>
3342+ <property name="can_focus">False</property>
3343+ <property name="label_xalign">0</property>
3344+ <property name="shadow_type">none</property>
3345+ <child>
3346+ <object class="GtkAlignment" id="alignment2">
3347+ <property name="visible">True</property>
3348+ <property name="can_focus">False</property>
3349+ <property name="left_padding">12</property>
3350+ <child>
3351+ <object class="GtkTable" id="table2">
3352+ <property name="visible">True</property>
3353+ <property name="can_focus">False</property>
3354+ <property name="n_rows">9</property>
3355+ <property name="n_columns">2</property>
3356+ <child>
3357+ <placeholder/>
3358+ </child>
3359+ <child>
3360+ <placeholder/>
3361+ </child>
3362+ <child>
3363+ <placeholder/>
3364+ </child>
3365+ <child>
3366+ <placeholder/>
3367+ </child>
3368+ <child>
3369+ <object class="GtkLabel" id="label7">
3370+ <property name="visible">True</property>
3371+ <property name="can_focus">False</property>
3372+ <property name="xalign">0</property>
3373+ <property name="label" translatable="yes">Dates</property>
3374+ </object>
3375+ <packing>
3376+ <property name="x_options">GTK_FILL</property>
3377+ <property name="y_options">GTK_FILL</property>
3378+ <property name="x_padding">3</property>
3379+ <property name="y_padding">3</property>
3380+ </packing>
3381+ </child>
3382+ <child>
3383+ <object class="GtkLabel" id="full_date_format">
3384+ <property name="visible">True</property>
3385+ <property name="can_focus">False</property>
3386+ <property name="xalign">0</property>
3387+ </object>
3388+ <packing>
3389+ <property name="left_attach">1</property>
3390+ <property name="right_attach">2</property>
3391+ <property name="y_options">GTK_FILL</property>
3392+ <property name="x_padding">3</property>
3393+ <property name="y_padding">3</property>
3394+ </packing>
3395+ </child>
3396+ <child>
3397+ <object class="GtkLabel" id="full_day_format">
3398+ <property name="visible">True</property>
3399+ <property name="can_focus">False</property>
3400+ <property name="xalign">0</property>
3401+ </object>
3402+ <packing>
3403+ <property name="left_attach">1</property>
3404+ <property name="right_attach">2</property>
3405+ <property name="top_attach">1</property>
3406+ <property name="bottom_attach">2</property>
3407+ <property name="y_options">GTK_FILL</property>
3408+ <property name="x_padding">3</property>
3409+ <property name="y_padding">3</property>
3410+ </packing>
3411+ </child>
3412+ <child>
3413+ <object class="GtkLabel" id="short_day_format">
3414+ <property name="visible">True</property>
3415+ <property name="can_focus">False</property>
3416+ <property name="xalign">0</property>
3417+ </object>
3418+ <packing>
3419+ <property name="left_attach">1</property>
3420+ <property name="right_attach">2</property>
3421+ <property name="top_attach">2</property>
3422+ <property name="bottom_attach">3</property>
3423+ <property name="y_options">GTK_FILL</property>
3424+ <property name="x_padding">3</property>
3425+ <property name="y_padding">3</property>
3426+ </packing>
3427+ </child>
3428+ <child>
3429+ <object class="GtkLabel" id="shortest_day_format">
3430+ <property name="visible">True</property>
3431+ <property name="can_focus">False</property>
3432+ <property name="xalign">0</property>
3433+ </object>
3434+ <packing>
3435+ <property name="left_attach">1</property>
3436+ <property name="right_attach">2</property>
3437+ <property name="top_attach">3</property>
3438+ <property name="bottom_attach">4</property>
3439+ <property name="y_options">GTK_FILL</property>
3440+ <property name="x_padding">3</property>
3441+ <property name="y_padding">3</property>
3442+ </packing>
3443+ </child>
3444+ <child>
3445+ <object class="GtkLabel" id="label8">
3446+ <property name="visible">True</property>
3447+ <property name="can_focus">False</property>
3448+ <property name="xalign">0</property>
3449+ <property name="label" translatable="yes">Times</property>
3450+ </object>
3451+ <packing>
3452+ <property name="top_attach">4</property>
3453+ <property name="bottom_attach">5</property>
3454+ <property name="x_options">GTK_FILL</property>
3455+ <property name="y_options">GTK_FILL</property>
3456+ <property name="x_padding">3</property>
3457+ <property name="y_padding">3</property>
3458+ </packing>
3459+ </child>
3460+ <child>
3461+ <object class="GtkLabel" id="full_time_format">
3462+ <property name="visible">True</property>
3463+ <property name="can_focus">False</property>
3464+ <property name="xalign">0</property>
3465+ </object>
3466+ <packing>
3467+ <property name="left_attach">1</property>
3468+ <property name="right_attach">2</property>
3469+ <property name="top_attach">4</property>
3470+ <property name="bottom_attach">5</property>
3471+ <property name="y_options">GTK_FILL</property>
3472+ <property name="x_padding">3</property>
3473+ <property name="y_padding">3</property>
3474+ </packing>
3475+ </child>
3476+ <child>
3477+ <object class="GtkLabel" id="short_time_format">
3478+ <property name="visible">True</property>
3479+ <property name="can_focus">False</property>
3480+ <property name="xalign">0</property>
3481+ </object>
3482+ <packing>
3483+ <property name="left_attach">1</property>
3484+ <property name="right_attach">2</property>
3485+ <property name="top_attach">5</property>
3486+ <property name="bottom_attach">6</property>
3487+ <property name="y_options">GTK_FILL</property>
3488+ <property name="x_padding">3</property>
3489+ <property name="y_padding">3</property>
3490+ </packing>
3491+ </child>
3492+ <child>
3493+ <object class="GtkLabel" id="label9">
3494+ <property name="visible">True</property>
3495+ <property name="can_focus">False</property>
3496+ <property name="xalign">0</property>
3497+ <property name="label" translatable="yes">Numbers</property>
3498+ </object>
3499+ <packing>
3500+ <property name="top_attach">6</property>
3501+ <property name="bottom_attach">7</property>
3502+ <property name="x_options">GTK_FILL</property>
3503+ <property name="y_options">GTK_FILL</property>
3504+ <property name="x_padding">3</property>
3505+ <property name="y_padding">3</property>
3506+ </packing>
3507+ </child>
3508+ <child>
3509+ <object class="GtkLabel" id="numbers_format">
3510+ <property name="visible">True</property>
3511+ <property name="can_focus">False</property>
3512+ <property name="xalign">0</property>
3513+ </object>
3514+ <packing>
3515+ <property name="left_attach">1</property>
3516+ <property name="right_attach">2</property>
3517+ <property name="top_attach">6</property>
3518+ <property name="bottom_attach">7</property>
3519+ <property name="y_options">GTK_FILL</property>
3520+ <property name="x_padding">3</property>
3521+ <property name="y_padding">3</property>
3522+ </packing>
3523+ </child>
3524+ <child>
3525+ <object class="GtkLabel" id="label10">
3526+ <property name="visible">True</property>
3527+ <property name="can_focus">False</property>
3528+ <property name="xalign">0</property>
3529+ <property name="label" translatable="yes">Currency</property>
3530+ </object>
3531+ <packing>
3532+ <property name="top_attach">7</property>
3533+ <property name="bottom_attach">8</property>
3534+ <property name="x_options">GTK_FILL</property>
3535+ <property name="y_options">GTK_FILL</property>
3536+ <property name="x_padding">3</property>
3537+ <property name="y_padding">3</property>
3538+ </packing>
3539+ </child>
3540+ <child>
3541+ <object class="GtkLabel" id="currency_format">
3542+ <property name="visible">True</property>
3543+ <property name="can_focus">False</property>
3544+ <property name="xalign">0</property>
3545+ </object>
3546+ <packing>
3547+ <property name="left_attach">1</property>
3548+ <property name="right_attach">2</property>
3549+ <property name="top_attach">7</property>
3550+ <property name="bottom_attach">8</property>
3551+ <property name="y_options">GTK_FILL</property>
3552+ <property name="x_padding">3</property>
3553+ <property name="y_padding">3</property>
3554+ </packing>
3555+ </child>
3556+ <child>
3557+ <object class="GtkLabel" id="label11">
3558+ <property name="visible">True</property>
3559+ <property name="can_focus">False</property>
3560+ <property name="xalign">0</property>
3561+ <property name="label" translatable="yes">Measurement</property>
3562+ </object>
3563+ <packing>
3564+ <property name="top_attach">8</property>
3565+ <property name="bottom_attach">9</property>
3566+ <property name="x_options">GTK_FILL</property>
3567+ <property name="y_options">GTK_FILL</property>
3568+ <property name="x_padding">3</property>
3569+ <property name="y_padding">3</property>
3570+ </packing>
3571+ </child>
3572+ <child>
3573+ <object class="GtkLabel" id="measurement_format">
3574+ <property name="visible">True</property>
3575+ <property name="can_focus">False</property>
3576+ <property name="xalign">0</property>
3577+ </object>
3578+ <packing>
3579+ <property name="left_attach">1</property>
3580+ <property name="right_attach">2</property>
3581+ <property name="top_attach">8</property>
3582+ <property name="bottom_attach">9</property>
3583+ <property name="y_options">GTK_FILL</property>
3584+ <property name="x_padding">3</property>
3585+ <property name="y_padding">3</property>
3586+ </packing>
3587+ </child>
3588+ </object>
3589+ </child>
3590+ </object>
3591+ </child>
3592+ <child type="label">
3593+ <object class="GtkLabel" id="label6">
3594+ <property name="visible">True</property>
3595+ <property name="can_focus">False</property>
3596+ <property name="label" translatable="yes">Examples</property>
3597+ <attributes>
3598+ <attribute name="weight" value="bold"/>
3599+ </attributes>
3600+ </object>
3601+ </child>
3602+ </object>
3603+ <packing>
3604+ <property name="left_attach">1</property>
3605+ <property name="top_attach">1</property>
3606+ <property name="width">1</property>
3607+ <property name="height">1</property>
3608+ </packing>
3609+ </child>
3610+ </object>
3611+ <packing>
3612+ <property name="position">1</property>
3613+ </packing>
3614+ </child>
3615+ <child type="tab">
3616+ <object class="GtkLabel" id="label3">
3617+ <property name="visible">True</property>
3618+ <property name="can_focus">False</property>
3619+ <property name="label" translatable="yes">Formats</property>
3620+ </object>
3621+ <packing>
3622+ <property name="position">1</property>
3623+ <property name="tab_fill">False</property>
3624+ </packing>
3625+ </child>
3626+ <child>
3627+ <object class="GtkVBox" id="vbox5">
3628+ <property name="visible">True</property>
3629+ <property name="can_focus">False</property>
3630+ <property name="border_width">12</property>
3631+ <property name="spacing">12</property>
3632+ <child>
3633+ <object class="GtkHBox" id="hbox3">
3634+ <property name="visible">True</property>
3635+ <property name="can_focus">False</property>
3636+ <property name="spacing">12</property>
3637+ <child>
3638+ <object class="GtkVBox" id="vbox6">
3639+ <property name="visible">True</property>
3640+ <property name="can_focus">False</property>
3641+ <property name="margin_right">5</property>
3642+ <child>
3643+ <object class="GtkLabel" id="label2">
3644+ <property name="visible">True</property>
3645+ <property name="can_focus">False</property>
3646+ <property name="margin_bottom">5</property>
3647+ <property name="xalign">0</property>
3648+ <property name="label" translatable="yes">Input sources to use:</property>
3649+ </object>
3650+ <packing>
3651+ <property name="expand">False</property>
3652+ <property name="fill">True</property>
3653+ <property name="position">0</property>
3654+ </packing>
3655+ </child>
3656+ <child>
3657+ <object class="GtkScrolledWindow" id="input_sources_swindow">
3658+ <property name="visible">True</property>
3659+ <property name="can_focus">True</property>
3660+ <property name="shadow_type">in</property>
3661+ <child>
3662+ <object class="GtkTreeView" id="active_input_sources">
3663+ <property name="visible">True</property>
3664+ <property name="can_focus">True</property>
3665+ <property name="headers_visible">False</property>
3666+ <child internal-child="selection">
3667+ <object class="GtkTreeSelection" id="treeview-selection3"/>
3668+ </child>
3669+ </object>
3670+ </child>
3671+ </object>
3672+ <packing>
3673+ <property name="expand">True</property>
3674+ <property name="fill">True</property>
3675+ <property name="position">1</property>
3676+ </packing>
3677+ </child>
3678+ <child>
3679+ <object class="GtkToolbar" id="input-toolbar">
3680+ <property name="visible">True</property>
3681+ <property name="can_focus">False</property>
3682+ <property name="toolbar_style">icons</property>
3683+ <property name="show_arrow">False</property>
3684+ <property name="icon_size">1</property>
3685+ <style>
3686+ <class name="inline-toolbar"/>
3687+ </style>
3688+ <child>
3689+ <object class="GtkToolItem" id="i_s_ar_item">
3690+ <property name="visible">True</property>
3691+ <property name="can_focus">False</property>
3692+ <child>
3693+ <object class="GtkBox" id="i_s_ar_box">
3694+ <property name="visible">True</property>
3695+ <property name="can_focus">False</property>
3696+ <child>
3697+ <object class="GtkButton" id="input_source_add">
3698+ <property name="visible">True</property>
3699+ <property name="can_focus">False</property>
3700+ <property name="receives_default">False</property>
3701+ <child>
3702+ <object class="GtkImage" id="i_s_a_image">
3703+ <property name="visible">True</property>
3704+ <property name="can_focus">False</property>
3705+ <property name="icon_name">list-add-symbolic</property>
3706+ <property name="icon-size">1</property>
3707+ </object>
3708+ </child>
3709+ </object>
3710+ <packing>
3711+ <property name="expand">False</property>
3712+ <property name="fill">True</property>
3713+ <property name="position">0</property>
3714+ </packing>
3715+ </child>
3716+ <child>
3717+ <object class="GtkButton" id="input_source_remove">
3718+ <property name="visible">True</property>
3719+ <property name="can_focus">False</property>
3720+ <property name="receives_default">False</property>
3721+ <child>
3722+ <object class="GtkImage" id="i_s_r_image">
3723+ <property name="visible">True</property>
3724+ <property name="can_focus">False</property>
3725+ <property name="icon_name">list-remove-symbolic</property>
3726+ <property name="icon-size">1</property>
3727+ </object>
3728+ </child>
3729+ </object>
3730+ <packing>
3731+ <property name="expand">False</property>
3732+ <property name="fill">True</property>
3733+ <property name="position">1</property>
3734+ </packing>
3735+ </child>
3736+ </object>
3737+ </child>
3738+ </object>
3739+ <packing>
3740+ <property name="expand">False</property>
3741+ </packing>
3742+ </child>
3743+ <child>
3744+ <object class="GtkSeparatorToolItem" id="sep1">
3745+ <property name="visible">True</property>
3746+ <property name="can_focus">False</property>
3747+ <property name="draw">False</property>
3748+ </object>
3749+ <packing>
3750+ <property name="expand">True</property>
3751+ </packing>
3752+ </child>
3753+ <child>
3754+ <object class="GtkToolItem" id="i_s_ud_item">
3755+ <property name="visible">True</property>
3756+ <property name="can_focus">False</property>
3757+ <child>
3758+ <object class="GtkBox" id="i_s_ud_box">
3759+ <property name="visible">True</property>
3760+ <property name="can_focus">False</property>
3761+ <child>
3762+ <object class="GtkButton" id="input_source_move_up">
3763+ <property name="visible">True</property>
3764+ <property name="can_focus">False</property>
3765+ <property name="receives_default">False</property>
3766+ <child>
3767+ <object class="GtkImage" id="i_s_u_image">
3768+ <property name="visible">True</property>
3769+ <property name="can_focus">False</property>
3770+ <property name="icon_name">go-up-symbolic</property>
3771+ <property name="icon-size">1</property>
3772+ </object>
3773+ </child>
3774+ </object>
3775+ <packing>
3776+ <property name="expand">False</property>
3777+ <property name="fill">True</property>
3778+ <property name="position">0</property>
3779+ </packing>
3780+ </child>
3781+ <child>
3782+ <object class="GtkButton" id="input_source_move_down">
3783+ <property name="visible">True</property>
3784+ <property name="can_focus">False</property>
3785+ <property name="receives_default">False</property>
3786+ <child>
3787+ <object class="GtkImage" id="i_s_d_image">
3788+ <property name="visible">True</property>
3789+ <property name="can_focus">False</property>
3790+ <property name="icon_name">go-down-symbolic</property>
3791+ <property name="icon-size">1</property>
3792+ </object>
3793+ </child>
3794+ </object>
3795+ <packing>
3796+ <property name="expand">False</property>
3797+ <property name="fill">True</property>
3798+ <property name="position">1</property>
3799+ </packing>
3800+ </child>
3801+ </object>
3802+ </child>
3803+ </object>
3804+ <packing>
3805+ <property name="expand">False</property>
3806+ </packing>
3807+ </child>
3808+ <child>
3809+ <object class="GtkSeparatorToolItem" id="sep2">
3810+ <property name="visible">True</property>
3811+ <property name="can_focus">False</property>
3812+ <property name="hexpand">True</property>
3813+ <property name="draw">False</property>
3814+ </object>
3815+ <packing>
3816+ <property name="expand">True</property>
3817+ </packing>
3818+ </child>
3819+ <child>
3820+ <object class="GtkToolItem" id="i_s_sp_item">
3821+ <property name="visible">True</property>
3822+ <property name="can_focus">False</property>
3823+ <child>
3824+ <object class="GtkBox" id="i_s_sp_box">
3825+ <property name="visible">True</property>
3826+ <property name="can_focus">False</property>
3827+ <child>
3828+ <object class="GtkButton" id="input_source_settings">
3829+ <property name="visible">True</property>
3830+ <property name="can_focus">False</property>
3831+ <property name="receives_default">False</property>
3832+ <child>
3833+ <object class="GtkImage" id="i_s_s_image">
3834+ <property name="visible">True</property>
3835+ <property name="can_focus">False</property>
3836+ <property name="pixel_size">16</property>
3837+ <property name="icon_name">preferences-system-symbolic</property>
3838+ <property name="icon-size">1</property>
3839+ </object>
3840+ </child>
3841+ </object>
3842+ <packing>
3843+ <property name="expand">False</property>
3844+ <property name="fill">True</property>
3845+ <property name="position">0</property>
3846+ </packing>
3847+ </child>
3848+ <child>
3849+ <object class="GtkButton" id="input_source_show">
3850+ <property name="visible">True</property>
3851+ <property name="can_focus">False</property>
3852+ <property name="receives_default">False</property>
3853+ <child>
3854+ <object class="GtkImage" id="i_s_p_image">
3855+ <property name="visible">True</property>
3856+ <property name="can_focus">False</property>
3857+ <property name="icon_name">input-keyboard-symbolic</property>
3858+ <property name="icon-size">1</property>
3859+ </object>
3860+ </child>
3861+ </object>
3862+ <packing>
3863+ <property name="expand">False</property>
3864+ <property name="fill">True</property>
3865+ <property name="position">1</property>
3866+ </packing>
3867+ </child>
3868+ </object>
3869+ </child>
3870+ </object>
3871+ <packing>
3872+ <property name="expand">False</property>
3873+ </packing>
3874+ </child>
3875+ </object>
3876+ <packing>
3877+ <property name="expand">False</property>
3878+ <property name="fill">True</property>
3879+ <property name="position">2</property>
3880+ </packing>
3881+ </child>
3882+ </object>
3883+ <packing>
3884+ <property name="expand">True</property>
3885+ <property name="fill">True</property>
3886+ <property name="position">0</property>
3887+ </packing>
3888+ </child>
3889+ <child>
3890+ <object class="GtkBox" id="box2">
3891+ <property name="visible">True</property>
3892+ <property name="can_focus">False</property>
3893+ <property name="orientation">vertical</property>
3894+ <child>
3895+ <object class="GtkLabel" id="label22">
3896+ <property name="visible">True</property>
3897+ <property name="can_focus">False</property>
3898+ <property name="margin_bottom">5</property>
3899+ <property name="xalign">0</property>
3900+ <property name="label" translatable="yes">Switch to next source using:</property>
3901+ </object>
3902+ <packing>
3903+ <property name="expand">False</property>
3904+ <property name="fill">True</property>
3905+ <property name="position">0</property>
3906+ </packing>
3907+ </child>
3908+ <child>
3909+ <object class="GtkEntryAccel" id="next-source-entry">
3910+ <property name="visible">True</property>
3911+ <property name="can_focus">True</property>
3912+ <property name="margin_bottom">5</property>
3913+ <property name="invisible_char">•</property>
3914+ </object>
3915+ <packing>
3916+ <property name="expand">False</property>
3917+ <property name="fill">True</property>
3918+ <property name="position">1</property>
3919+ </packing>
3920+ </child>
3921+ <child>
3922+ <object class="GtkLabel" id="label24">
3923+ <property name="visible">True</property>
3924+ <property name="can_focus">False</property>
3925+ <property name="margin_bottom">5</property>
3926+ <property name="xalign">0</property>
3927+ <property name="label" translatable="yes">Switch to previous source using:</property>
3928+ </object>
3929+ <packing>
3930+ <property name="expand">False</property>
3931+ <property name="fill">True</property>
3932+ <property name="position">2</property>
3933+ </packing>
3934+ </child>
3935+ <child>
3936+ <object class="GtkEntryAccel" id="prev-source-entry">
3937+ <property name="visible">True</property>
3938+ <property name="can_focus">True</property>
3939+ <property name="margin_bottom">15</property>
3940+ <property name="invisible_char">•</property>
3941+ </object>
3942+ <packing>
3943+ <property name="expand">False</property>
3944+ <property name="fill">True</property>
3945+ <property name="position">3</property>
3946+ </packing>
3947+ </child>
3948+ <child>
3949+ <object class="GtkRadioButton" id="same-source-radio">
3950+ <property name="label" translatable="yes">Use the same source for all windows</property>
3951+ <property name="visible">True</property>
3952+ <property name="can_focus">False</property>
3953+ <property name="receives_default">False</property>
3954+ <property name="xalign">0</property>
3955+ <property name="active">True</property>
3956+ <property name="draw_indicator">True</property>
3957+ </object>
3958+ <packing>
3959+ <property name="expand">False</property>
3960+ <property name="fill">True</property>
3961+ <property name="position">4</property>
3962+ </packing>
3963+ </child>
3964+ <child>
3965+ <object class="GtkRadioButton" id="different-source-radio">
3966+ <property name="label" translatable="yes">Allow different sources for each window</property>
3967+ <property name="visible">True</property>
3968+ <property name="can_focus">False</property>
3969+ <property name="receives_default">False</property>
3970+ <property name="xalign">0</property>
3971+ <property name="active">True</property>
3972+ <property name="draw_indicator">True</property>
3973+ <property name="group">same-source-radio</property>
3974+ </object>
3975+ <packing>
3976+ <property name="expand">False</property>
3977+ <property name="fill">True</property>
3978+ <property name="position">5</property>
3979+ </packing>
3980+ </child>
3981+ <child>
3982+ <object class="GtkRadioButton" id="default-source-radio">
3983+ <property name="label" translatable="yes">New windows use the default source</property>
3984+ <property name="visible">True</property>
3985+ <property name="can_focus">False</property>
3986+ <property name="receives_default">False</property>
3987+ <property name="margin_left">25</property>
3988+ <property name="xalign">0</property>
3989+ <property name="active">True</property>
3990+ <property name="draw_indicator">True</property>
3991+ </object>
3992+ <packing>
3993+ <property name="expand">False</property>
3994+ <property name="fill">True</property>
3995+ <property name="position">6</property>
3996+ </packing>
3997+ </child>
3998+ <child>
3999+ <object class="GtkRadioButton" id="current-source-radio">
4000+ <property name="label" translatable="yes">New windows use the current source</property>
4001+ <property name="visible">True</property>
4002+ <property name="can_focus">False</property>
4003+ <property name="receives_default">False</property>
4004+ <property name="margin_left">25</property>
4005+ <property name="margin_bottom">15</property>
4006+ <property name="xalign">0</property>
4007+ <property name="active">True</property>
4008+ <property name="draw_indicator">True</property>
4009+ <property name="group">default-source-radio</property>
4010+ </object>
4011+ <packing>
4012+ <property name="expand">False</property>
4013+ <property name="fill">True</property>
4014+ <property name="position">7</property>
4015+ </packing>
4016+ </child>
4017+ <child>
4018+ <object class="GtkGrid" id="grid1">
4019+ <property name="visible">True</property>
4020+ <property name="can_focus">False</property>
4021+ <child>
4022+ <object class="GtkLabel" id="label25">
4023+ <property name="visible">True</property>
4024+ <property name="can_focus">False</property>
4025+ <property name="halign">end</property>
4026+ <property name="margin_right">10</property>
4027+ <property name="margin_bottom">10</property>
4028+ <property name="hexpand">True</property>
4029+ <property name="label" translatable="yes">Show input candidates:</property>
4030+ </object>
4031+ <packing>
4032+ <property name="left_attach">0</property>
4033+ <property name="top_attach">0</property>
4034+ <property name="width">1</property>
4035+ <property name="height">1</property>
4036+ </packing>
4037+ </child>
4038+ <child>
4039+ <object class="GtkComboBoxText" id="orientation-combo">
4040+ <property name="visible">True</property>
4041+ <property name="can_focus">False</property>
4042+ <property name="margin_bottom">10</property>
4043+ <property name="entry_text_column">0</property>
4044+ <property name="id_column">1</property>
4045+ <items>
4046+ <item translatable="yes">Horizontally</item>
4047+ <item translatable="yes">Vertically</item>
4048+ </items>
4049+ </object>
4050+ <packing>
4051+ <property name="left_attach">1</property>
4052+ <property name="top_attach">0</property>
4053+ <property name="width">1</property>
4054+ <property name="height">1</property>
4055+ </packing>
4056+ </child>
4057+ <child>
4058+ <object class="GtkFontButton" id="custom-font-button">
4059+ <property name="visible">True</property>
4060+ <property name="can_focus">False</property>
4061+ <property name="receives_default">True</property>
4062+ <property name="font">Sans 12</property>
4063+ <property name="preview_text"/>
4064+ <property name="show_preview_entry">False</property>
4065+ </object>
4066+ <packing>
4067+ <property name="left_attach">1</property>
4068+ <property name="top_attach">1</property>
4069+ <property name="width">1</property>
4070+ <property name="height">1</property>
4071+ </packing>
4072+ </child>
4073+ <child>
4074+ <object class="GtkCheckButton" id="custom-font-check">
4075+ <property name="label" translatable="yes">Using custom font:</property>
4076+ <property name="visible">True</property>
4077+ <property name="can_focus">False</property>
4078+ <property name="receives_default">False</property>
4079+ <property name="halign">end</property>
4080+ <property name="margin_right">10</property>
4081+ <property name="hexpand">True</property>
4082+ <property name="xalign">0</property>
4083+ <property name="draw_indicator">True</property>
4084+ </object>
4085+ <packing>
4086+ <property name="left_attach">0</property>
4087+ <property name="top_attach">1</property>
4088+ <property name="width">1</property>
4089+ <property name="height">1</property>
4090+ </packing>
4091+ </child>
4092+ </object>
4093+ <packing>
4094+ <property name="expand">False</property>
4095+ <property name="fill">True</property>
4096+ <property name="position">8</property>
4097+ </packing>
4098+ </child>
4099+ </object>
4100+ <packing>
4101+ <property name="expand">True</property>
4102+ <property name="fill">True</property>
4103+ <property name="position">1</property>
4104+ </packing>
4105+ </child>
4106+ </object>
4107+ <packing>
4108+ <property name="expand">True</property>
4109+ <property name="fill">True</property>3633+ <property name="fill">True</property>
4110+ <property name="position">0</property>3634+ <property name="position">0</property>
4111+ </packing>3635+ </packing>
4112+ </child>3636+ </child>
4113+ <child>3637+ <child>
4114+ <object class="GtkBox" id="box1">3638+ <object class="GtkLinkButton" id="jump-to-shortcuts">
4115+ <property name="visible">True</property>3639+ <property name="label" translatable="yes">Keyboard Settings...</property>
4116+ <property name="can_focus">False</property>
4117+ <property name="valign">end</property>
4118+ <child>
4119+ <object class="GtkCheckButton" id="show-indicator-check">
4120+ <property name="label" translatable="yes">Show current input source in the menu bar</property>
4121+ <property name="visible">True</property>
4122+ <property name="can_focus">False</property>
4123+ <property name="receives_default">False</property>
4124+ <property name="hexpand">True</property>
4125+ <property name="xalign">0</property>
4126+ <property name="draw_indicator">True</property>
4127+ </object>
4128+ <packing>
4129+ <property name="expand">False</property>
4130+ <property name="fill">True</property>
4131+ <property name="position">0</property>
4132+ </packing>
4133+ </child>
4134+ <child>
4135+ <object class="GtkLinkButton" id="jump-to-shortcuts">
4136+ <property name="label" translatable="yes">Keyboard Settings...</property>
4137+ <property name="visible">True</property>
4138+ <property name="can_focus">True</property>
4139+ <property name="receives_default">True</property>
4140+ <property name="has_tooltip">True</property>
4141+ <property name="halign">end</property>
4142+ <property name="relief">none</property>
4143+ </object>
4144+ <packing>
4145+ <property name="expand">False</property>
4146+ <property name="fill">True</property>
4147+ <property name="position">1</property>
4148+ </packing>
4149+ </child>
4150+ </object>
4151+ <packing>
4152+ <property name="expand">True</property>
4153+ <property name="fill">True</property>
4154+ <property name="position">1</property>
4155+ </packing>
4156+ </child>
4157+ </object>
4158+ <packing>
4159+ <property name="position">3</property>
4160+ </packing>
4161+ </child>
4162+ <child type="tab">
4163+ <object class="GtkLabel" id="label13">
4164+ <property name="visible">True</property>
4165+ <property name="can_focus">False</property>
4166+ <property name="label" translatable="yes">Text Entry</property>
4167+ </object>
4168+ <packing>
4169+ <property name="position">3</property>
4170+ <property name="tab_fill">False</property>
4171+ </packing>
4172+ </child>
4173+ <child>
4174+ <object class="GtkTable" id="table3">
4175+ <property name="visible">True</property>
4176+ <property name="can_focus">False</property>
4177+ <property name="n_rows">3</property>
4178+ <property name="n_columns">2</property>
4179+ <property name="column_spacing">12</property>
4180+ <property name="row_spacing">12</property>
4181+ <child>
4182+ <placeholder/>
4183+ </child>
4184+ <child>
4185+ <object class="GtkLabel" id="system-title">
4186+ <property name="visible">True</property>
4187+ <property name="can_focus">False</property>
4188+ <property name="xalign">0</property>
4189+ <property name="xpad">6</property>
4190+ <property name="ypad">6</property>
4191+ <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>
4192+ <property name="wrap">True</property>
4193+ <property name="width_chars">60</property>
4194+ </object>
4195+ <packing>
4196+ <property name="right_attach">2</property>
4197+ <property name="x_options">GTK_FILL</property>
4198+ <property name="y_options">GTK_SHRINK</property>
4199+ <property name="x_padding">3</property>
4200+ <property name="y_padding">3</property>
4201+ </packing>
4202+ </child>
4203+ <child>
4204+ <object class="GtkFrame" id="frame2">
4205+ <property name="visible">True</property>
4206+ <property name="can_focus">False</property>
4207+ <property name="label_xalign">0</property>
4208+ <property name="shadow_type">none</property>
4209+ <child>
4210+ <object class="GtkTable" id="table4">
4211+ <property name="visible">True</property>
4212+ <property name="can_focus">False</property>
4213+ <property name="margin_left">12</property>
4214+ <property name="margin_top">12</property>
4215+ <property name="n_rows">3</property>
4216+ <property name="n_columns">2</property>
4217+ <property name="column_spacing">3</property>
4218+ <property name="row_spacing">3</property>
4219+ <child>
4220+ <object class="GtkLabel" id="label16">
4221+ <property name="visible">True</property>
4222+ <property name="can_focus">False</property>
4223+ <property name="xalign">0</property>
4224+ <property name="label" translatable="yes" comments="'display' means 'output' here, as in 'translated messages that are displayed to the user'">Display language:</property>
4225+ </object>
4226+ <packing>
4227+ <property name="y_options">GTK_FILL</property>
4228+ <property name="x_padding">3</property>
4229+ <property name="y_padding">3</property>
4230+ </packing>
4231+ </child>
4232+ <child>
4233+ <object class="GtkLabel" id="user_display_language">
4234+ <property name="visible">True</property>
4235+ <property name="can_focus">False</property>
4236+ <property name="xalign">0</property>
4237+ </object>
4238+ <packing>
4239+ <property name="left_attach">1</property>
4240+ <property name="right_attach">2</property>
4241+ <property name="y_options">GTK_FILL</property>
4242+ <property name="x_padding">3</property>
4243+ <property name="y_padding">3</property>
4244+ </packing>
4245+ </child>
4246+ <child>
4247+ <object class="GtkLabel" id="label17">
4248+ <property name="visible">True</property>
4249+ <property name="can_focus">False</property>
4250+ <property name="xalign">0</property>
4251+ <property name="yalign">0</property>
4252+ <property name="label" translatable="yes">Input source:</property>
4253+ </object>
4254+ <packing>
4255+ <property name="top_attach">1</property>
4256+ <property name="bottom_attach">2</property>
4257+ <property name="y_options">GTK_FILL</property>
4258+ <property name="x_padding">3</property>
4259+ <property name="y_padding">3</property>
4260+ </packing>
4261+ </child>
4262+ <child>
4263+ <object class="GtkLabel" id="user_input_source">
4264+ <property name="visible">True</property>
4265+ <property name="can_focus">False</property>
4266+ <property name="xalign">0</property>
4267+ <property name="yalign">0</property>
4268+ <property name="wrap">True</property>
4269+ <property name="width_chars">18</property>
4270+ </object>
4271+ <packing>
4272+ <property name="left_attach">1</property>
4273+ <property name="right_attach">2</property>
4274+ <property name="top_attach">1</property>
4275+ <property name="bottom_attach">2</property>
4276+ <property name="y_options">GTK_FILL</property>
4277+ <property name="x_padding">3</property>
4278+ <property name="y_padding">3</property>
4279+ </packing>
4280+ </child>
4281+ <child>
4282+ <object class="GtkLabel" id="label18">
4283+ <property name="visible">True</property>
4284+ <property name="can_focus">False</property>
4285+ <property name="xalign">0</property>
4286+ <property name="label" translatable="yes">Format:</property>
4287+ </object>
4288+ <packing>
4289+ <property name="top_attach">2</property>
4290+ <property name="bottom_attach">3</property>
4291+ <property name="y_options">GTK_FILL</property>
4292+ <property name="x_padding">3</property>
4293+ <property name="y_padding">3</property>
4294+ </packing>
4295+ </child>
4296+ <child>
4297+ <object class="GtkLabel" id="user_format">
4298+ <property name="visible">True</property>
4299+ <property name="can_focus">False</property>
4300+ <property name="xalign">0</property>
4301+ </object>
4302+ <packing>
4303+ <property name="left_attach">1</property>
4304+ <property name="right_attach">2</property>
4305+ <property name="top_attach">2</property>
4306+ <property name="bottom_attach">3</property>
4307+ <property name="y_options">GTK_FILL</property>
4308+ <property name="x_padding">3</property>
4309+ <property name="y_padding">3</property>
4310+ </packing>
4311+ </child>
4312+ </object>
4313+ </child>
4314+ <child type="label">
4315+ <object class="GtkLabel" id="label14">
4316+ <property name="visible">True</property>
4317+ <property name="can_focus">False</property>
4318+ <property name="label" translatable="yes">Your settings</property>
4319+ <attributes>
4320+ <attribute name="weight" value="bold"/>
4321+ </attributes>
4322+ </object>
4323+ </child>
4324+ </object>
4325+ <packing>
4326+ <property name="top_attach">1</property>
4327+ <property name="bottom_attach">2</property>
4328+ <property name="y_options">GTK_FILL</property>
4329+ <property name="x_padding">3</property>
4330+ <property name="y_padding">3</property>
4331+ </packing>
4332+ </child>
4333+ <child>
4334+ <object class="GtkFrame" id="frame3">
4335+ <property name="visible">True</property>
4336+ <property name="can_focus">False</property>
4337+ <property name="label_xalign">0</property>
4338+ <property name="shadow_type">none</property>
4339+ <child>
4340+ <object class="GtkTable" id="table5">
4341+ <property name="visible">True</property>
4342+ <property name="can_focus">False</property>
4343+ <property name="margin_left">12</property>
4344+ <property name="margin_top">12</property>
4345+ <property name="n_rows">3</property>
4346+ <property name="n_columns">2</property>
4347+ <property name="column_spacing">3</property>
4348+ <property name="row_spacing">3</property>
4349+ <child>
4350+ <object class="GtkLabel" id="label19">
4351+ <property name="visible">True</property>
4352+ <property name="can_focus">False</property>
4353+ <property name="xalign">0</property>
4354+ <property name="label" translatable="yes">Display language:</property>
4355+ </object>
4356+ <packing>
4357+ <property name="y_options">GTK_FILL</property>
4358+ <property name="x_padding">3</property>
4359+ <property name="y_padding">3</property>
4360+ </packing>
4361+ </child>
4362+ <child>
4363+ <object class="GtkLabel" id="system_display_language">
4364+ <property name="visible">True</property>
4365+ <property name="can_focus">False</property>
4366+ <property name="xalign">0</property>
4367+ </object>
4368+ <packing>
4369+ <property name="left_attach">1</property>
4370+ <property name="right_attach">2</property>
4371+ <property name="y_options">GTK_FILL</property>
4372+ <property name="x_padding">3</property>
4373+ <property name="y_padding">3</property>
4374+ </packing>
4375+ </child>
4376+ <child>
4377+ <object class="GtkLabel" id="label20">
4378+ <property name="visible">True</property>
4379+ <property name="can_focus">False</property>
4380+ <property name="xalign">0</property>
4381+ <property name="yalign">0</property>
4382+ <property name="label" translatable="yes">Input source:</property>
4383+ </object>
4384+ <packing>
4385+ <property name="top_attach">1</property>
4386+ <property name="bottom_attach">2</property>
4387+ <property name="y_options">GTK_FILL</property>
4388+ <property name="x_padding">3</property>
4389+ <property name="y_padding">3</property>
4390+ </packing>
4391+ </child>
4392+ <child>
4393+ <object class="GtkLabel" id="system_input_source">
4394+ <property name="visible">True</property>
4395+ <property name="can_focus">False</property>
4396+ <property name="xalign">0</property>
4397+ <property name="yalign">0</property>
4398+ <property name="wrap">True</property>
4399+ <property name="width_chars">18</property>
4400+ </object>
4401+ <packing>
4402+ <property name="left_attach">1</property>
4403+ <property name="right_attach">2</property>
4404+ <property name="top_attach">1</property>
4405+ <property name="bottom_attach">2</property>
4406+ <property name="y_options">GTK_FILL</property>
4407+ <property name="x_padding">3</property>
4408+ <property name="y_padding">3</property>
4409+ </packing>
4410+ </child>
4411+ <child>
4412+ <object class="GtkLabel" id="label21">
4413+ <property name="visible">True</property>
4414+ <property name="can_focus">False</property>
4415+ <property name="xalign">0</property>
4416+ <property name="label" translatable="yes">Format:</property>
4417+ </object>
4418+ <packing>
4419+ <property name="top_attach">2</property>
4420+ <property name="bottom_attach">3</property>
4421+ <property name="y_options">GTK_FILL</property>
4422+ <property name="x_padding">3</property>
4423+ <property name="y_padding">3</property>
4424+ </packing>
4425+ </child>
4426+ <child>
4427+ <object class="GtkLabel" id="system_format">
4428+ <property name="visible">True</property>
4429+ <property name="can_focus">False</property>
4430+ <property name="xalign">0</property>
4431+ </object>
4432+ <packing>
4433+ <property name="left_attach">1</property>
4434+ <property name="right_attach">2</property>
4435+ <property name="top_attach">2</property>
4436+ <property name="bottom_attach">3</property>
4437+ <property name="y_options">GTK_FILL</property>
4438+ <property name="x_padding">3</property>
4439+ <property name="y_padding">3</property>
4440+ </packing>
4441+ </child>
4442+ </object>
4443+ </child>
4444+ <child type="label">
4445+ <object class="GtkLabel" id="label15">
4446+ <property name="visible">True</property>
4447+ <property name="can_focus">False</property>
4448+ <property name="label" translatable="yes">System settings</property>
4449+ <attributes>
4450+ <attribute name="weight" value="bold"/>
4451+ </attributes>
4452+ </object>
4453+ </child>
4454+ </object>
4455+ <packing>
4456+ <property name="left_attach">1</property>
4457+ <property name="right_attach">2</property>
4458+ <property name="top_attach">1</property>
4459+ <property name="bottom_attach">2</property>
4460+ <property name="y_options">GTK_FILL</property>
4461+ <property name="x_padding">3</property>
4462+ <property name="y_padding">3</property>
4463+ </packing>
4464+ </child>
4465+ <child>
4466+ <object class="GtkButton" id="copy_settings_button">
4467+ <property name="label" translatable="yes">Copy Settings...</property>
4468+ <property name="visible">True</property>3640+ <property name="visible">True</property>
4469+ <property name="can_focus">True</property>3641+ <property name="can_focus">True</property>
4470+ <property name="receives_default">True</property>3642+ <property name="receives_default">True</property>
3643+ <property name="has_tooltip">True</property>
3644+ <property name="halign">end</property>
3645+ <property name="relief">none</property>
4471+ </object>3646+ </object>
4472+ <packing>3647+ <packing>
4473+ <property name="left_attach">1</property>3648+ <property name="expand">False</property>
4474+ <property name="right_attach">2</property>3649+ <property name="fill">True</property>
4475+ <property name="top_attach">2</property>3650+ <property name="position">1</property>
4476+ <property name="bottom_attach">3</property>
4477+ <property name="x_options">GTK_SHRINK</property>
4478+ <property name="y_options">GTK_SHRINK</property>
4479+ <property name="x_padding">3</property>
4480+ <property name="y_padding">3</property>
4481+ </packing>3651+ </packing>
4482+ </child>3652+ </child>
4483+ </object>3653+ </object>
4484+ <packing>3654+ <packing>
4485+ <property name="position">4</property>3655+ <property name="expand">True</property>
4486+ </packing>3656+ <property name="fill">True</property>
4487+ </child>3657+ <property name="position">1</property>
4488+ <child type="tab">
4489+ <object class="GtkLabel" id="label12">
4490+ <property name="visible">True</property>
4491+ <property name="can_focus">False</property>
4492+ <property name="label" translatable="yes">System</property>
4493+ </object>
4494+ <packing>
4495+ <property name="position">4</property>
4496+ <property name="tab_fill">False</property>
4497+ </packing>3658+ </packing>
4498+ </child>3659+ </child>
4499+ </object>3660+ </object>
4500+ <packing>3661+ <packing>
4501+ <property name="expand">False</property>3662+ <property name="position">3</property>
4502+ <property name="fill">False</property>
4503+ <property name="position">0</property>
4504+ </packing>3663+ </packing>
4505+ </child>3664+ </child>
4506+ </object>3665+ </object>
@@ -4513,11 +3672,4 @@
4513+ </object>3672+ </object>
4514+ </child>3673+ </child>
4515+ </object>3674+ </object>
4516+ <object class="GtkSizeGroup" id="system-input-source-sizegroup">
4517+ <property name="mode">vertical</property>
4518+ <widgets>
4519+ <widget name="user_input_source"/>
4520+ <widget name="system_input_source"/>
4521+ </widgets>
4522+ </object>
4523+</interface>3675+</interface>
45243676
=== modified file 'debian/patches/series'
--- debian/patches/series 2013-09-30 14:29:53 +0000
+++ debian/patches/series 2013-09-30 21:01:55 +0000
@@ -1,5 +1,6 @@
105_run_update_manager.patch105_run_update_manager.patch
206_handle_passwd_with_ldap.patch206_handle_passwd_with_ldap.patch
310_keyboard_layout_on_unity.patch
311_power-configure_lid_action.patch411_power-configure_lid_action.patch
412_add_never_turn_screen_off.patch512_add_never_turn_screen_off.patch
551_unity_options_in_display_panel.patch651_unity_options_in_display_panel.patch
@@ -37,6 +38,7 @@
37git-rename-bluetooth-panel.patch38git-rename-bluetooth-panel.patch
38zz_add_fallback_panels_dir.patch39zz_add_fallback_panels_dir.patch
39rename_screenshot_media_keys.patch40rename_screenshot_media_keys.patch
41git_show_per_window_input_settings.patch
40input-sources-text-entry.patch42input-sources-text-entry.patch
41unity_menus.patch43unity_menus.patch
42git_power_gsd_proxies.patch44git_power_gsd_proxies.patch
@@ -48,7 +50,6 @@
48git-background-lock-screen.patch50git-background-lock-screen.patch
49git_rename_natural_scrolling.patch51git_rename_natural_scrolling.patch
50git_hide_unavailable_layout_settings_btn.patch52git_hide_unavailable_layout_settings_btn.patch
51git_show_per_window_input_settings.patch
52git_restore_mouse_speed.patch53git_restore_mouse_speed.patch
53git_drop_ibus_engine_whitelist.patch54git_drop_ibus_engine_whitelist.patch
54ubuntu_update_translations_template.patch55ubuntu_update_translations_template.patch

Subscribers

People subscribed via source and target branches