applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

keyboard: Display shortcut for switching input source

Browse source
This commit is contained in:
Ian Douglas Scott 2020-09-14 11:09:40 -07:00
parent a19c7c2e65
commit a7d526f70b
2 changed files with 44 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

30
panels/keyboard/cc-keyboard-panel.c
View file

@ -43,6 +43,8 @@ struct _CcKeyboardPanel
GtkRadioButton *per_window_source; GtkRadioButton *per_window_source;
GtkRadioButton *same_source; GtkRadioButton *same_source;
GtkLabel *value_input_switch;
GSettings *keybindings_settings;
/* "Type Special Characters" section */ /* "Type Special Characters" section */
CcXkbModifierDialog *alt_chars_dialog; CcXkbModifierDialog *alt_chars_dialog;
@ -175,6 +177,7 @@ cc_keyboard_panel_finalize (GObject *object)
CcKeyboardPanel *self = CC_KEYBOARD_PANEL (object); CcKeyboardPanel *self = CC_KEYBOARD_PANEL (object);
g_clear_object (&self->input_source_settings); g_clear_object (&self->input_source_settings);
g_clear_object (&self->keybindings_settings);
G_OBJECT_CLASS (cc_keyboard_panel_parent_class)->finalize (object); G_OBJECT_CLASS (cc_keyboard_panel_parent_class)->finalize (object);
} }
@ -206,12 +209,32 @@ cc_keyboard_panel_class_init (CcKeyboardPanelClass *klass)
gtk_widget_class_bind_template_child (widget_class, CcKeyboardPanel, compose_row); gtk_widget_class_bind_template_child (widget_class, CcKeyboardPanel, compose_row);
gtk_widget_class_bind_template_child (widget_class, CcKeyboardPanel, value_alternate_chars); gtk_widget_class_bind_template_child (widget_class, CcKeyboardPanel, value_alternate_chars);
gtk_widget_class_bind_template_child (widget_class, CcKeyboardPanel, value_compose); gtk_widget_class_bind_template_child (widget_class, CcKeyboardPanel, value_compose);
gtk_widget_class_bind_template_child (widget_class, CcKeyboardPanel, value_input_switch);
gtk_widget_class_bind_template_child (widget_class, CcKeyboardPanel, common_shortcuts_row); gtk_widget_class_bind_template_child (widget_class, CcKeyboardPanel, common_shortcuts_row);
gtk_widget_class_bind_template_callback (widget_class, special_chars_activated); gtk_widget_class_bind_template_callback (widget_class, special_chars_activated);
gtk_widget_class_bind_template_callback (widget_class, keyboard_shortcuts_activated); gtk_widget_class_bind_template_callback (widget_class, keyboard_shortcuts_activated);
} }
static gboolean
translate_switch_input_source (GValue *value,
GVariant *variant,
gpointer user_data)
{
g_autofree const gchar **strv = NULL;
g_autofree gchar *label = NULL;
CcKeyCombo combo = { 0 };
strv = g_variant_get_strv (variant, NULL);
gtk_accelerator_parse (strv[0] ? strv[0] : "", &combo.keyval, &combo.mask);
label = convert_keysym_state_to_string (&combo);
g_value_set_string (value, label);
return TRUE;
}
static void static void
cc_keyboard_panel_init (CcKeyboardPanel *self) cc_keyboard_panel_init (CcKeyboardPanel *self)
{ {
@ -241,7 +264,12 @@ cc_keyboard_panel_init (CcKeyboardPanel *self)
g_settings_bind (self->input_source_settings, "per-window", g_settings_bind (self->input_source_settings, "per-window",
self->same_source, "active", self->same_source, "active",
G_SETTINGS_BIND_DEFAULT | G_SETTINGS_BIND_INVERT_BOOLEAN); G_SETTINGS_BIND_DEFAULT | G_SETTINGS_BIND_INVERT_BOOLEAN);
self->keybindings_settings = g_settings_new ("org.gnome.desktop.wm.keybindings");
g_settings_bind_with_mapping (self->keybindings_settings, "switch-input-source",
self->value_input_switch, "label",
G_SETTINGS_BIND_GET,
translate_switch_input_source,
NULL, NULL, NULL);
/* "Type Special Characters" section */ /* "Type Special Characters" section */
g_settings_bind_with_mapping (self->input_source_settings, g_settings_bind_with_mapping (self->input_source_settings,

15
panels/keyboard/cc-keyboard-panel.ui
View file

@ -130,6 +130,21 @@
</child> </child>
</object> </object>
</child> </child>
<child>
<object class="HdyActionRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="selectable">False</property>
<property name="title" translatable="yes">Keyboard Shortcut</property>
<property name="subtitle" translatable="yes">This can be changed in Customize Shortcuts</property>
<child>
<object class="GtkLabel" id="value_input_switch">
<property name="visible">True</property>
<property name="can_focus">True</property>
</object>
</child>
</object>
</child>
</object> </object>
</child> </child>
</object> </object>