Commit dce707b0 authored by Sergios - Anestis Kefalidis's avatar Sergios - Anestis Kefalidis Committed by Sergios - Anestis Kefalidis
Browse files

Remove disable-help preference.

Users can disable the help shortcut via the shortcuts editor.
parent 90777688
......@@ -131,8 +131,6 @@ terminal_app_init (TerminalApp *app)
app->preferences = terminal_preferences_get ();
g_signal_connect_swapped (G_OBJECT (app->preferences), "notify::shortcuts-no-menukey",
G_CALLBACK (terminal_app_update_accels), app);
g_signal_connect_swapped (G_OBJECT (app->preferences), "notify::shortcuts-no-helpkey",
G_CALLBACK (terminal_app_update_accels), app);
/* remember the original menu bar accel */
g_object_get (G_OBJECT (gtk_settings_get_default ()),
......@@ -206,12 +204,6 @@ terminal_app_update_accels (TerminalApp *app)
gtk_accelerator_parse (app->initial_menu_bar_accel, &key, &mod);
gtk_accel_map_change_entry ("<Actions>/terminal-window/toggle-menubar",
no_key ? 0 : key, no_key ? 0 : mod, TRUE);
g_object_get (G_OBJECT (app->preferences),
"shortcuts-no-helpkey", &no_key,
NULL);
gtk_accel_map_change_entry ("<Actions>/terminal-window/contents",
no_key ? 0 : GDK_KEY_F1, 0, TRUE);
}
......
......@@ -1484,16 +1484,6 @@ terminal_preferences_dialog_init (TerminalPreferencesDialog *dialog)
gtk_grid_attach (GTK_GRID (grid), button, 0, row, 1, 1);
gtk_widget_show (button);
/* next row */
row++;
button = gtk_check_button_new_with_mnemonic (_("_Disable help window shortcut key (F1 by default)"));
g_object_bind_property (G_OBJECT (dialog->preferences), "shortcuts-no-helpkey",
G_OBJECT (button), "active",
G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
gtk_grid_attach (GTK_GRID (grid), button, 0, row, 1, 1);
gtk_widget_show (button);
/* section: Misc */
terminal_preferences_dialog_new_section (&frame, &vbox, &grid, &label, &row, "Misc");
......
......@@ -123,7 +123,6 @@ enum
PROP_SCROLLING_ON_OUTPUT,
PROP_SCROLLING_ON_KEYSTROKE,
PROP_SCROLLING_UNLIMITED,
PROP_SHORTCUTS_NO_HELPKEY,
PROP_SHORTCUTS_NO_MENUKEY,
PROP_SHORTCUTS_NO_MNEMONICS,
PROP_TITLE_INITIAL,
......@@ -1148,18 +1147,6 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
TRUE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:shortcuts-no-helpkey:
*
* Disable help shortcut key (F1).
**/
preferences_props[PROP_SHORTCUTS_NO_HELPKEY] =
g_param_spec_boolean ("shortcuts-no-helpkey",
NULL,
"ShortcutsNoHelpkey",
FALSE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:shortcuts-no-menukey:
*
......
......@@ -2351,15 +2351,6 @@ terminal_window_action_send_signal (SendSignalData *data)
static gboolean
terminal_window_action_contents (TerminalWindow *window)
{
gboolean no_key;
/* check if the user has disabled the`Help` shortcut */
g_object_get (G_OBJECT (window->priv->preferences),
"shortcuts-no-helpkey", &no_key,
NULL);
if (no_key == TRUE)
return FALSE;
/* don't hide the drop-down terminal */
if (TERMINAL_IS_WINDOW_DROPDOWN (window))
terminal_window_dropdown_ignore_next_focus_out_event (TERMINAL_WINDOW_DROPDOWN (window));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment