[gnome-terminal] Allow disabling shortcuts
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-terminal] Allow disabling shortcuts
- Date: Thu, 21 Aug 2014 17:29:52 +0000 (UTC)
commit 8e66bcab26c937ec335512537a7561bfdaaf8650
Author: Matthias Clasen <mclasen redhat com>
Date: Sun Aug 10 20:47:34 2014 -0400
Allow disabling shortcuts
Just like mnemonics, shortcuts can sometimes interfere with
applications running in the terminal.
https://bugzilla.gnome.org/show_bug.cgi?id=731933
src/org.gnome.Terminal.gschema.xml | 10 ++++++++++
src/preferences.ui | 30 ++++++++++++++++++++++++++++++
src/terminal-accels.c | 11 ++++++++---
src/terminal-accels.h | 3 ++-
src/terminal-prefs.c | 9 ++++++++-
src/terminal-schemas.h | 1 +
src/terminal-window.c | 6 ++++++
7 files changed, 65 insertions(+), 5 deletions(-)
---
diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml
index 011bb34..c7d0edb 100644
--- a/src/org.gnome.Terminal.gschema.xml
+++ b/src/org.gnome.Terminal.gschema.xml
@@ -579,6 +579,16 @@
</description>
</key>
+ <key name="shortcuts-enabled" type="b">
+ <default>true</default>
+ <summary>Whether shortcuts are enabled</summary>
+ <description>
+ Whether shortcuts are enabled.
+ They may interfere with some applications run inside the terminal
+ so it's possible to turn them off.
+ </description>
+ </key>
+
<key name="menu-accelerator-enabled" type="b">
<default>true</default>
<summary>Whether the standard GTK shortcut for menubar access is enabled</summary>
diff --git a/src/preferences.ui b/src/preferences.ui
index d8ec2db..df82508 100644
--- a/src/preferences.ui
+++ b/src/preferences.ui
@@ -214,6 +214,29 @@
<property name="border_width">12</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">1</property>
+ <property name="homogeneous">False</property>
+ <child>
+ <object class="GtkCheckButton" id="disable-shortcuts-checkbutton">
+ <property name="label" translatable="yes">_Enable shortcuts</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="y_options">fill</property>
+ </packing>
+ </child>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
@@ -231,6 +254,13 @@
</object>
</child>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options">expand|fill</property>
+ </packing>
</child>
</object>
<packing>
diff --git a/src/terminal-accels.c b/src/terminal-accels.c
index 8710c07..b01d522 100644
--- a/src/terminal-accels.c
+++ b/src/terminal-accels.c
@@ -425,11 +425,13 @@ accel_set_func (GtkTreeViewColumn *tree_column,
guint key;
GdkModifierType mods;
gboolean writable;
+ GtkWidget *button = data;
value = g_settings_get_string (keybinding_settings, ke->settings_key);
gtk_accelerator_parse (value, &key, &mods);
- writable = g_settings_is_writable (keybinding_settings, ke->settings_key);
+ writable = g_settings_is_writable (keybinding_settings, ke->settings_key) &&
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
g_object_set (cell,
"visible", TRUE,
@@ -514,7 +516,8 @@ row_changed (GtkTreeModel *tree_model,
#endif
void
-terminal_accels_fill_treeview (GtkWidget *tree_view)
+terminal_accels_fill_treeview (GtkWidget *tree_view,
+ GtkWidget *disable_shortcuts_button)
{
GtkTreeViewColumn *column;
GtkCellRenderer *cell_renderer;
@@ -535,6 +538,7 @@ terminal_accels_fill_treeview (GtkWidget *tree_view)
"editable", TRUE,
"accel-mode", GTK_CELL_RENDERER_ACCEL_MODE_GTK,
NULL);
+
g_signal_connect (cell_renderer, "accel-edited",
G_CALLBACK (accel_edited_callback), tree_view);
g_signal_connect (cell_renderer, "accel-cleared",
@@ -543,7 +547,8 @@ terminal_accels_fill_treeview (GtkWidget *tree_view)
column = gtk_tree_view_column_new ();
gtk_tree_view_column_set_title (column, _("Shortcut _Key"));
gtk_tree_view_column_pack_start (column, cell_renderer, TRUE);
- gtk_tree_view_column_set_cell_data_func (column, cell_renderer, accel_set_func, NULL, NULL);
+ gtk_tree_view_column_set_cell_data_func (column, cell_renderer, accel_set_func,
+ disable_shortcuts_button, NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
/* Add the data */
diff --git a/src/terminal-accels.h b/src/terminal-accels.h
index bd28d71..e0a5204 100644
--- a/src/terminal-accels.h
+++ b/src/terminal-accels.h
@@ -28,7 +28,8 @@ void terminal_accels_init (GApplication *application,
void terminal_accels_shutdown (void);
-void terminal_accels_fill_treeview (GtkWidget *treeview);
+void terminal_accels_fill_treeview (GtkWidget *treeview,
+ GtkWidget *disable_shortcuts_button);
G_END_DECLS
diff --git a/src/terminal-prefs.c b/src/terminal-prefs.c
index 5708acc..a57dde6 100644
--- a/src/terminal-prefs.c
+++ b/src/terminal-prefs.c
@@ -560,6 +560,7 @@ terminal_prefs_show_preferences (GtkWindow *transient_parent,
PrefData *data;
GtkWidget *dialog, *tree_view;
GtkWidget *show_menubar_button, *disable_mnemonics_button, *disable_menu_accel_button;
+ GtkWidget *disable_shortcuts_button;
GtkWidget *tree_view_container, *new_button, *edit_button, *clone_button, *remove_button;
GtkWidget *dark_theme_button, *new_terminal_mode_combo;
GtkWidget *default_hbox, *default_label;
@@ -585,6 +586,7 @@ terminal_prefs_show_preferences (GtkWindow *transient_parent,
"dark-theme-checkbutton", &dark_theme_button,
"new-terminal-mode-combobox", &new_terminal_mode_combo,
"disable-mnemonics-checkbutton", &disable_mnemonics_button,
+ "disable-shortcuts-checkbutton", &disable_shortcuts_button,
"disable-menu-accel-checkbutton", &disable_menu_accel_button,
"accelerators-treeview", &tree_view,
"profiles-treeview-container", &tree_view_container,
@@ -631,12 +633,17 @@ terminal_prefs_show_preferences (GtkWindow *transient_parent,
"active",
G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
g_settings_bind (settings,
+ TERMINAL_SETTING_ENABLE_SHORTCUTS_KEY,
+ disable_shortcuts_button,
+ "active",
+ G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
+ g_settings_bind (settings,
TERMINAL_SETTING_ENABLE_MENU_BAR_ACCEL_KEY,
disable_menu_accel_button,
"active",
G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
- terminal_accels_fill_treeview (tree_view);
+ terminal_accels_fill_treeview (tree_view, disable_shortcuts_button);
/* Profiles tab */
diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h
index ce92340..90cc5a0 100644
--- a/src/terminal-schemas.h
+++ b/src/terminal-schemas.h
@@ -68,6 +68,7 @@ G_BEGIN_DECLS
#define TERMINAL_SETTING_DARK_THEME_KEY "dark-theme"
#define TERMINAL_SETTING_ENABLE_MENU_BAR_ACCEL_KEY "menu-accelerator-enabled"
#define TERMINAL_SETTING_ENABLE_MNEMONICS_KEY "mnemonics-enabled"
+#define TERMINAL_SETTING_ENABLE_SHORTCUTS_KEY "shortcuts-enabled"
#define TERMINAL_SETTING_ENCODINGS_KEY "encodings"
#define TERMINAL_SETTING_NEW_TERMINAL_MODE_KEY "new-terminal-mode"
#define TERMINAL_SETTING_SCHEMA_VERSION "schema-version"
diff --git a/src/terminal-window.c b/src/terminal-window.c
index 6660fa2..ce85744 100644
--- a/src/terminal-window.c
+++ b/src/terminal-window.c
@@ -2268,6 +2268,12 @@ terminal_window_screen_update (TerminalWindow *window,
"gtk-enable-mnemonics",
G_SETTINGS_BIND_GET);
+ g_settings_bind (settings,
+ TERMINAL_SETTING_ENABLE_SHORTCUTS_KEY,
+ gtk_settings,
+ "gtk-enable-accels",
+ G_SETTINGS_BIND_GET);
+
g_object_get (gtk_settings, "gtk-menu-bar-accel", &value, NULL);
g_object_set_data_full (G_OBJECT (gtk_settings), "GT::gtk-menu-bar-accel",
value, (GDestroyNotify) g_free);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]