mirror of
https://github.com/dguglielmi/sunny-overlay.git
synced 2025-12-06 20:22:38 +01:00
215 lines
8.7 KiB
Diff
215 lines
8.7 KiB
Diff
From 9bbe19e98f62aa3c9020913a3a5a8080a5177505 Mon Sep 17 00:00:00 2001
|
|
From: Debarshi Ray <debarshir@gnome.org>
|
|
Date: Wed, 16 Apr 2014 15:04:38 +0200
|
|
Subject: [PATCH 47/61] Remove the action and shortcut to set a static title
|
|
from the menus
|
|
|
|
Setting a static title does not work because there is no code
|
|
listening to changes in TerminalScreen:description. The title is
|
|
dynamically set via escape sequences, usually from a suitable
|
|
PROMPT_COMMAND, which is noticed by VteTerminal.
|
|
|
|
If you want to customize the title of a particular terminal, please use
|
|
the escape sequence. This is what you had to use before, anyway.
|
|
|
|
https://bugzilla.gnome.org/show_bug.cgi?id=724110
|
|
---
|
|
src/migration.c | 1 -
|
|
src/org.gnome.Terminal.gschema.xml | 4 --
|
|
src/terminal-accels.c | 2 -
|
|
src/terminal-window.c | 88 --------------------------------------
|
|
src/terminal.xml | 3 --
|
|
5 files changed, 98 deletions(-)
|
|
|
|
diff --git a/src/migration.c b/src/migration.c
|
|
index 7a7a773..b626ec5 100644
|
|
--- a/src/migration.c
|
|
+++ b/src/migration.c
|
|
@@ -541,7 +541,6 @@ migrate_accels (GSettings *global_settings,
|
|
{ "zoom_in", "zoom-in" },
|
|
{ "zoom_out", "zoom-out" },
|
|
{ "zoom_normal", "zoom-normal" },
|
|
- { "set_window_title", "set-terminal-title" },
|
|
{ "reset", "reset" },
|
|
{ "reset_and_clear", "reset-and-clear" },
|
|
{ "prev_tab", "prev-tab" },
|
|
diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml
|
|
index 1b926a6..be8f104 100644
|
|
--- a/src/org.gnome.Terminal.gschema.xml
|
|
+++ b/src/org.gnome.Terminal.gschema.xml
|
|
@@ -374,10 +374,6 @@
|
|
<default>'disabled'</default>
|
|
<summary>Keyboard shortcut to toggle the visibility of the menubar</summary>
|
|
</key>
|
|
- <key name="set-terminal-title" type="s">
|
|
- <default>'disabled'</default>
|
|
- <summary>Keyboard shortcut to set the terminal title</summary>
|
|
- </key>
|
|
<key name="reset" type="s">
|
|
<default>'disabled'</default>
|
|
<summary>Keyboard shortcut to reset the terminal</summary>
|
|
diff --git a/src/terminal-accels.c b/src/terminal-accels.c
|
|
index a3a8034..65d56bd 100644
|
|
--- a/src/terminal-accels.c
|
|
+++ b/src/terminal-accels.c
|
|
@@ -70,7 +70,6 @@
|
|
#define KEY_RESET_AND_CLEAR "reset-and-clear"
|
|
#define KEY_RESET "reset"
|
|
#define KEY_SAVE_CONTENTS "save-contents"
|
|
-#define KEY_SET_TERMINAL_TITLE "set-terminal-title"
|
|
#define KEY_TOGGLE_MENUBAR "toggle-menubar"
|
|
#define KEY_ZOOM_IN "zoom-in"
|
|
#define KEY_ZOOM_NORMAL "zoom-normal"
|
|
@@ -144,7 +143,6 @@ static KeyEntry view_entries[] = {
|
|
};
|
|
|
|
static KeyEntry terminal_entries[] = {
|
|
- ENTRY (N_("Set Title"), KEY_SET_TERMINAL_TITLE, "set-title", NULL, NULL ),
|
|
ENTRY (N_("Reset"), KEY_RESET, "reset", "b", "false"),
|
|
ENTRY (N_("Reset and Clear"), KEY_RESET_AND_CLEAR, "reset", "b", "true" ),
|
|
};
|
|
diff --git a/src/terminal-window.c b/src/terminal-window.c
|
|
index 9c209f7..93145ac 100644
|
|
--- a/src/terminal-window.c
|
|
+++ b/src/terminal-window.c
|
|
@@ -179,8 +179,6 @@ static void view_zoom_out_callback (GtkAction *action,
|
|
TerminalWindow *window);
|
|
static void view_zoom_normal_callback (GtkAction *action,
|
|
TerminalWindow *window);
|
|
-static void terminal_set_title_callback (GtkAction *action,
|
|
- TerminalWindow *window);
|
|
static void terminal_add_encoding_callback (GtkAction *action,
|
|
TerminalWindow *window);
|
|
static void terminal_reset_callback (GtkAction *action,
|
|
@@ -718,88 +716,6 @@ action_move_tab_cb (GSimpleAction *action,
|
|
}
|
|
|
|
static void
|
|
-terminal_set_title_dialog_response_cb (GtkWidget *dialog,
|
|
- int response,
|
|
- TerminalScreen *screen)
|
|
-{
|
|
- if (response == GTK_RESPONSE_OK)
|
|
- {
|
|
- GtkEntry *entry;
|
|
- const char *text;
|
|
-
|
|
- entry = GTK_ENTRY (g_object_get_data (G_OBJECT (dialog), "title-entry"));
|
|
- text = gtk_entry_get_text (entry);
|
|
- terminal_screen_set_user_title (screen, text);
|
|
- }
|
|
-
|
|
- gtk_widget_destroy (dialog);
|
|
-}
|
|
-
|
|
-static void
|
|
-action_set_title_cb (GSimpleAction *action,
|
|
- GVariant *parameter,
|
|
- gpointer user_data)
|
|
-{
|
|
- TerminalWindow *window = user_data;
|
|
- TerminalWindowPrivate *priv = window->priv;
|
|
- GtkWidget *dialog, *message_area, *hbox, *label, *entry;
|
|
-
|
|
- if (priv->active_screen == NULL)
|
|
- return;
|
|
-
|
|
- /* FIXME: hook the screen up so this dialogue closes if the terminal screen closes */
|
|
-
|
|
- dialog = gtk_message_dialog_new (GTK_WINDOW (window),
|
|
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
|
|
- GTK_MESSAGE_OTHER,
|
|
- GTK_BUTTONS_OK_CANCEL,
|
|
- "%s", "");
|
|
-
|
|
- gtk_window_set_title (GTK_WINDOW (dialog), _("Set Title"));
|
|
- gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
|
|
- gtk_window_set_role (GTK_WINDOW (dialog), "gnome-terminal-change-title");
|
|
- gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
|
|
- /* Alternative button order was set automatically by GtkMessageDialog */
|
|
-
|
|
- g_signal_connect (dialog, "response",
|
|
- G_CALLBACK (terminal_set_title_dialog_response_cb), priv->active_screen);
|
|
- g_signal_connect (dialog, "delete-event",
|
|
- G_CALLBACK (terminal_util_dialog_response_on_delete), NULL);
|
|
-
|
|
- message_area = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (dialog));
|
|
- gtk_container_foreach (GTK_CONTAINER (message_area), (GtkCallback) gtk_widget_hide, NULL);
|
|
-
|
|
- hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
|
|
- gtk_box_pack_start (GTK_BOX (message_area), hbox, FALSE, FALSE, 0);
|
|
-
|
|
- label = gtk_label_new_with_mnemonic (_("_Title:"));
|
|
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
|
|
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
|
|
-
|
|
- entry = gtk_entry_new ();
|
|
- gtk_entry_set_width_chars (GTK_ENTRY (entry), 32);
|
|
- gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
|
|
- gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry);
|
|
- gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
|
|
- gtk_widget_show_all (hbox);
|
|
-
|
|
- gtk_widget_grab_focus (entry);
|
|
- gtk_entry_set_text (GTK_ENTRY (entry), terminal_screen_get_user_title (priv->active_screen));
|
|
- gtk_editable_select_region (GTK_EDITABLE (entry), 0, -1);
|
|
- g_object_set_data (G_OBJECT (dialog), "title-entry", entry);
|
|
-
|
|
- gtk_window_present (GTK_WINDOW (dialog));
|
|
-}
|
|
-
|
|
-static void
|
|
-terminal_set_title_callback (GtkAction *action,
|
|
- TerminalWindow *window)
|
|
-{
|
|
- g_action_activate (g_action_map_lookup_action (G_ACTION_MAP (window), "set-title"),
|
|
- NULL);
|
|
-}
|
|
-
|
|
-static void
|
|
action_zoom_cb (GSimpleAction *action,
|
|
GVariant *parameter,
|
|
gpointer user_data)
|
|
@@ -2423,7 +2339,6 @@ terminal_window_init (TerminalWindow *window)
|
|
{ "reset", action_reset_cb, "b", NULL, NULL },
|
|
{ "switch-tab", action_switch_tab_cb, "i", NULL, NULL },
|
|
{ "move-tab", action_move_tab_cb, "i", NULL, NULL },
|
|
- { "set-title", action_set_title_cb, NULL, NULL, NULL },
|
|
{ "zoom", action_zoom_cb, "i", NULL, NULL },
|
|
{ "detach-tab", action_detach_tab_cb, NULL, NULL, NULL },
|
|
{ "find", action_find_cb, "s", NULL, NULL },
|
|
@@ -2528,9 +2443,6 @@ terminal_window_init (TerminalWindow *window)
|
|
|
|
/* Terminal menu */
|
|
{ "TerminalProfiles", NULL, N_("Change _Profile") },
|
|
- { "TerminalSetTitle", NULL, N_("_Set Title…"), NULL,
|
|
- NULL,
|
|
- G_CALLBACK (terminal_set_title_callback) },
|
|
{ "TerminalSetEncoding", NULL, N_("Set _Character Encoding") },
|
|
{ "TerminalReset", NULL, N_("_Reset"), NULL,
|
|
NULL,
|
|
diff --git a/src/terminal.xml b/src/terminal.xml
|
|
index 6743393..72cef17 100644
|
|
--- a/src/terminal.xml
|
|
+++ b/src/terminal.xml
|
|
@@ -46,7 +46,6 @@
|
|
</menu>
|
|
<menu action="Terminal">
|
|
<menu action="TerminalProfiles" />
|
|
- <menuitem action="TerminalSetTitle" />
|
|
<menu action="TerminalSetEncoding" >
|
|
<placeholder name="EncodingsPH" />
|
|
<separator />
|
|
@@ -100,8 +99,6 @@
|
|
<menuitem action="TabsMoveLeft"/>
|
|
<menuitem action="TabsMoveRight"/>
|
|
<separator />
|
|
- <menuitem action="TerminalSetTitle" />
|
|
- <separator />
|
|
<menuitem action="FileCloseTab"/>
|
|
</popup>
|
|
</ui>
|
|
--
|
|
1.9.0
|
|
|