diff --git a/0001-build-Don-t-treat-warnings-as-errors.patch b/0001-build-Don-t-treat-warnings-as-errors.patch deleted file mode 100644 index d76d8ec1a5af99e95b20ac983d006dbeef964fc2..0000000000000000000000000000000000000000 --- a/0001-build-Don-t-treat-warnings-as-errors.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8709588cc5ec11e7b1007e7d67aa4df74faf5c68 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray -Date: Mon, 23 Feb 2015 18:54:36 +0100 -Subject: [PATCH] build: Don't treat warnings as errors - ---- - configure.ac | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c732caf..e0c2514 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -234,12 +234,12 @@ CC_CHECK_FLAGS_APPEND([WARN_CFLAGS],[CFLAGS],[ \ - -Wall \ - -Wcast-align \ - -Wendif-labels \ -- "-Werror=format=2 -Werror=format-nonliteral -Werror=format-security" \ -- -Werror=implicit-function-declaration \ -- -Werror=init-self \ -- -Werror=missing-include-dirs \ -- -Werror=missing-prototypes \ -- -Werror=pointer-arith \ -+ "-Wformat=2 -Wformat-nonliteral -Wformat-security" \ -+ -Wimplicit-function-declaration \ -+ -Winit-self \ -+ -Wmissing-include-dirs \ -+ -Wmissing-prototypes \ -+ -Wpointer-arith \ - -Wextra \ - -Wfloat-equal \ - -Wimplicit \ diff --git a/gnome-terminal-3.38.3.tar.xz b/gnome-terminal-3.38.3.tar.xz deleted file mode 100644 index f4f9170826629cd7ce166cc8282bb543193bcaa9..0000000000000000000000000000000000000000 Binary files a/gnome-terminal-3.38.3.tar.xz and /dev/null differ diff --git a/gnome-terminal-3.46.7.tar.bz2 b/gnome-terminal-3.46.7.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..46450bbc2b6e67ebd1c372d1333802ef32bf8a42 Binary files /dev/null and b/gnome-terminal-3.46.7.tar.bz2 differ diff --git a/gnome-terminal-cntr-ntfy-autottl-ts.patch b/gnome-terminal-cntr-ntfy-autottl-ts.patch index 170b10edfc907692efd636dbf6ba4446af6ee8f7..d95686e4ea39ab638875f929b2602b4621f44fa3 100644 --- a/gnome-terminal-cntr-ntfy-autottl-ts.patch +++ b/gnome-terminal-cntr-ntfy-autottl-ts.patch @@ -1,4 +1,4 @@ -From 6715609da71987d6db7a70b4640f3b830dc405f8 Mon Sep 17 00:00:00 2001 +From b258ef0bdc4f1ea8dc9d8bf0b47a14d0b17d4473 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 12 May 2014 14:57:18 +0200 Subject: [PATCH 01/16] Restore transparency @@ -18,14 +18,14 @@ Some changes by Peter Weber --- src/org.gnome.Terminal.gschema.xml | 10 +++++++ src/preferences.ui | 47 ++++++++++++++++++++++++++++++ - src/profile-editor.c | 16 ++++++++++ - src/terminal-schemas.h | 3 ++ - src/terminal-screen.c | 22 +++++++++++++- - src/terminal-window.c | 7 +++++ - 6 files changed, 104 insertions(+), 1 deletion(-) + src/profile-editor.cc | 19 ++++++++++++ + src/terminal-schemas.hh | 3 ++ + src/terminal-screen.cc | 22 +++++++++++++- + src/terminal-window.cc | 7 +++++ + 6 files changed, 107 insertions(+), 1 deletion(-) diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml -index be00aa2d80de..7b04919202b7 100644 +index a860b73c..cca1aef3 100644 --- a/src/org.gnome.Terminal.gschema.xml +++ b/src/org.gnome.Terminal.gschema.xml @@ -349,6 +349,16 @@ @@ -46,7 +46,7 @@ index be00aa2d80de..7b04919202b7 100644 diff --git a/src/preferences.ui b/src/preferences.ui -index d1aca7b2c35c..64f8295bf2b0 100644 +index ca58c656..f3979307 100644 --- a/src/preferences.ui +++ b/src/preferences.ui @@ -95,6 +95,11 @@ @@ -61,7 +61,7 @@ index d1aca7b2c35c..64f8295bf2b0 100644 -@@ -1402,6 +1407,48 @@ +@@ -1435,6 +1440,48 @@ 1 @@ -110,38 +110,41 @@ index d1aca7b2c35c..64f8295bf2b0 100644 -diff --git a/src/profile-editor.c b/src/profile-editor.c -index 4098f90bf10e..35bd24791417 100644 ---- a/src/profile-editor.c -+++ b/src/profile-editor.c -@@ -1431,6 +1431,22 @@ profile_prefs_load (const char *uuid, GSettings *profile) - profile_prefs_settings_bind (profile, TERMINAL_PROFILE_ENABLE_SIXEL_KEY, w, - "active", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); +diff --git a/src/profile-editor.cc b/src/profile-editor.cc +index 0cb99b62..d0e71e26 100644 +--- a/src/profile-editor.cc ++++ b/src/profile-editor.cc +@@ -1491,6 +1491,25 @@ profile_prefs_load (const char *uuid, GSettings *profile) + GSettingsBindFlags(G_SETTINGS_BIND_GET | + G_SETTINGS_BIND_SET)); gtk_widget_set_visible (w, (vte_get_feature_flags() & VTE_FEATURE_FLAG_SIXEL) != 0); + + profile_prefs_settings_bind (profile, + TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND, + gtk_builder_get_object (builder, "use-transparent-background"), + "active", -+ G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); ++ GSettingsBindFlags(G_SETTINGS_BIND_GET | ++ G_SETTINGS_BIND_SET)); + profile_prefs_settings_bind (profile, + TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND, + gtk_builder_get_object (builder, "background-transparent-scale"), + "sensitive", -+ G_SETTINGS_BIND_GET | G_SETTINGS_BIND_NO_SENSITIVITY); ++ GSettingsBindFlags(G_SETTINGS_BIND_GET | ++ G_SETTINGS_BIND_NO_SENSITIVITY)); + profile_prefs_settings_bind (profile, + TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT, + gtk_builder_get_object (builder, "background-transparent-adjustment"), + "value", -+ G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); ++ GSettingsBindFlags(G_SETTINGS_BIND_GET | ++ G_SETTINGS_BIND_SET)); } /* Called once per Preferences window, to destroy stuff that doesn't depend on the profile being edited */ -diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h -index cffc4ed86b9f..6bfd3e346895 100644 ---- a/src/terminal-schemas.h -+++ b/src/terminal-schemas.h -@@ -76,6 +76,9 @@ G_BEGIN_DECLS +diff --git a/src/terminal-schemas.hh b/src/terminal-schemas.hh +index 61f1305e..c33723bf 100644 +--- a/src/terminal-schemas.hh ++++ b/src/terminal-schemas.hh +@@ -78,6 +78,9 @@ G_BEGIN_DECLS #define TERMINAL_PROFILE_VISIBLE_NAME_KEY "visible-name" #define TERMINAL_PROFILE_WORD_CHAR_EXCEPTIONS_KEY "word-char-exceptions" @@ -149,13 +152,13 @@ index cffc4ed86b9f..6bfd3e346895 100644 +#define TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT "background-transparency-percent" + #define TERMINAL_SETTING_CONFIRM_CLOSE_KEY "confirm-close" + #define TERMINAL_SETTING_CONTEXT_INFO_KEY "context-info" #define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY "default-show-menubar" - #define TERMINAL_SETTING_ENABLE_MENU_BAR_ACCEL_KEY "menu-accelerator-enabled" -diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 0c4ee5035215..128b74befc1e 100644 ---- a/src/terminal-screen.c -+++ b/src/terminal-screen.c -@@ -1075,7 +1075,9 @@ terminal_screen_profile_changed_cb (GSettings *profile, +diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc +index 54e10223..bae9c0cf 100644 +--- a/src/terminal-screen.cc ++++ b/src/terminal-screen.cc +@@ -1059,7 +1059,9 @@ terminal_screen_profile_changed_cb (GSettings *profile, prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_COLORS_SET_KEY) || prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_BACKGROUND_COLOR_KEY) || prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_FOREGROUND_COLOR_KEY) || @@ -166,16 +169,16 @@ index 0c4ee5035215..128b74befc1e 100644 update_color_scheme (screen); if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY)) -@@ -1160,6 +1162,8 @@ update_color_scheme (TerminalScreen *screen) - GdkRGBA *cursor_bgp = NULL, *cursor_fgp = NULL; - GdkRGBA *highlight_bgp = NULL, *highlight_fgp = NULL; +@@ -1144,6 +1146,8 @@ update_color_scheme (TerminalScreen *screen) + GdkRGBA *cursor_bgp = nullptr, *cursor_fgp = nullptr; + GdkRGBA *highlight_bgp = nullptr, *highlight_fgp = nullptr; GtkStyleContext *context; + GtkWidget *toplevel; + gboolean transparent; gboolean use_theme_colors; context = gtk_widget_get_style_context (widget); -@@ -1203,6 +1207,18 @@ update_color_scheme (TerminalScreen *screen) +@@ -1187,6 +1191,18 @@ update_color_scheme (TerminalScreen *screen) } colors = terminal_g_settings_get_rgba_palette (priv->profile, TERMINAL_PROFILE_PALETTE_KEY, &n_colors); @@ -194,22 +197,22 @@ index 0c4ee5035215..128b74befc1e 100644 vte_terminal_set_colors (VTE_TERMINAL (screen), &fg, &bg, colors, n_colors); vte_terminal_set_color_bold (VTE_TERMINAL (screen), boldp); -@@ -1210,6 +1226,10 @@ update_color_scheme (TerminalScreen *screen) +@@ -1194,6 +1210,10 @@ update_color_scheme (TerminalScreen *screen) vte_terminal_set_color_cursor_foreground (VTE_TERMINAL (screen), cursor_fgp); vte_terminal_set_color_highlight (VTE_TERMINAL (screen), highlight_bgp); vte_terminal_set_color_highlight_foreground (VTE_TERMINAL (screen), highlight_fgp); + + toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen)); -+ if (toplevel != NULL && gtk_widget_is_toplevel (toplevel)) ++ if (toplevel != nullptr && gtk_widget_is_toplevel (toplevel)) + gtk_widget_set_app_paintable (toplevel, transparent); } static void -diff --git a/src/terminal-window.c b/src/terminal-window.c -index 8adb134..bce94c7 100644 ---- a/src/terminal-window.c -+++ b/src/terminal-window.c -@@ -2097,6 +2097,8 @@ terminal_window_init (TerminalWindow *window) +diff --git a/src/terminal-window.cc b/src/terminal-window.cc +index 36eb7ce7..a41d2de2 100644 +--- a/src/terminal-window.cc ++++ b/src/terminal-window.cc +@@ -2173,6 +2173,8 @@ terminal_window_init (TerminalWindow *window) }; TerminalWindowPrivate *priv; TerminalApp *app; @@ -218,22 +221,23 @@ index 8adb134..bce94c7 100644 GSettings *gtk_debug_settings; GtkWindowGroup *window_group; // GtkAccelGroup *accel_group; -@@ -2111,6 +2113,10 @@ terminal_window_init (TerminalWindow *window) - priv = window->priv = G_TYPE_INSTANCE_GET_PRIVATE (window, TERMINAL_TYPE_WINDOW, TerminalWindowPrivate); - +@@ -2188,6 +2190,11 @@ terminal_window_init (TerminalWindow *window) + gtk_widget_init_template (GTK_WIDGET (window)); + + screen = gtk_widget_get_screen (GTK_WIDGET (window)); + visual = gdk_screen_get_rgba_visual (screen); -+ if (visual != NULL) ++ if (visual != nullptr) + gtk_widget_set_visual (GTK_WIDGET (window), visual); - ++ uuid_generate (u); uuid_unparse (u, uuidstr); + priv->uuid = g_strdup (uuidstr); -- -2.25.4 +2.39.1 -From c75db4814eaee946daccc526c5f37124f1981352 Mon Sep 17 00:00:00 2001 +From 0ab778ac032b1b5bc938dc73b11c2b58271b8567 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Wed, 28 May 2014 14:11:02 +0200 Subject: [PATCH 02/16] window: Make the drawing robust across all themes @@ -249,17 +253,17 @@ can avoid this by ensuring that the window always renders a background. https://bugzilla.gnome.org/show_bug.cgi?id=730016 --- - src/terminal-window.c | 21 +++++++++++++++++++++ + src/terminal-window.cc | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) -diff --git a/src/terminal-window.c b/src/terminal-window.c -index bce94c7..19881f8 100644 ---- a/src/terminal-window.c -+++ b/src/terminal-window.c -@@ -1956,6 +1956,26 @@ terminal_window_realize (GtkWidget *widget) +diff --git a/src/terminal-window.cc b/src/terminal-window.cc +index a41d2de2..11d93419 100644 +--- a/src/terminal-window.cc ++++ b/src/terminal-window.cc +@@ -2003,6 +2003,26 @@ terminal_window_realize (GtkWidget *widget) terminal_window_update_size (window); } - + +static gboolean +terminal_window_draw (GtkWidget *widget, + cairo_t *cr) @@ -283,8 +287,8 @@ index bce94c7..19881f8 100644 static gboolean terminal_window_state_event (GtkWidget *widget, GdkEventWindowState *event) -@@ -2272,6 +2292,7 @@ terminal_window_class_init (TerminalWindowClass *klass) - +@@ -2368,6 +2388,7 @@ terminal_window_class_init (TerminalWindowClass *klass) + widget_class->show = terminal_window_show; widget_class->realize = terminal_window_realize; + widget_class->draw = terminal_window_draw; @@ -292,10 +296,10 @@ index bce94c7..19881f8 100644 widget_class->screen_changed = terminal_window_screen_changed; widget_class->style_updated = terminal_window_style_updated; -- -2.25.4 +2.39.1 -From e7810e47cf096ce6901e572bb9f5256601aed62d Mon Sep 17 00:00:00 2001 +From 893b1b1ffba63bcaa78a29a127b5787325abc8cb Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Fri, 13 Nov 2015 15:16:42 +0100 Subject: [PATCH 03/16] screen, window: Extra padding around transparent @@ -303,15 +307,15 @@ Subject: [PATCH 03/16] screen, window: Extra padding around transparent https://bugzilla.redhat.com/show_bug.cgi?id=1207943 --- - src/terminal-screen.c | 41 +++++++++++++++++++++++++++++++++++++---- - src/terminal-window.c | 18 ++++++++++++------ + src/terminal-screen.cc | 41 +++++++++++++++++++++++++++++++++++++---- + src/terminal-window.cc | 18 ++++++++++++------ 2 files changed, 49 insertions(+), 10 deletions(-) -diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 128b74befc1e..a1c3161391da 100644 ---- a/src/terminal-screen.c -+++ b/src/terminal-screen.c -@@ -151,6 +151,8 @@ static void terminal_screen_system_font_changed_cb (GSettings *, +diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc +index bae9c0cf..85f0fbcf 100644 +--- a/src/terminal-screen.cc ++++ b/src/terminal-screen.cc +@@ -156,6 +156,8 @@ static void terminal_screen_system_font_changed_cb (GSettings *, static gboolean terminal_screen_popup_menu (GtkWidget *widget); static gboolean terminal_screen_button_press (GtkWidget *widget, GdkEventButton *event); @@ -320,7 +324,7 @@ index 128b74befc1e..a1c3161391da 100644 static void terminal_screen_child_exited (VteTerminal *terminal, int status); -@@ -620,6 +622,7 @@ terminal_screen_class_init (TerminalScreenClass *klass) +@@ -599,6 +601,7 @@ terminal_screen_class_init (TerminalScreenClass *klass) widget_class->drag_data_received = terminal_screen_drag_data_received; widget_class->button_press_event = terminal_screen_button_press; widget_class->popup_menu = terminal_screen_popup_menu; @@ -328,7 +332,7 @@ index 128b74befc1e..a1c3161391da 100644 terminal_class->child_exited = terminal_screen_child_exited; -@@ -1147,6 +1150,32 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1131,6 +1134,32 @@ terminal_screen_profile_changed_cb (GSettings *profile, g_object_thaw_notify (object); } @@ -341,7 +345,7 @@ index 128b74befc1e..a1c3161391da 100644 + GtkWidget *toplevel; + + toplevel = gtk_widget_get_toplevel (widget); -+ if (toplevel != NULL && gtk_widget_is_toplevel (toplevel)) ++ if (toplevel != nullptr && gtk_widget_is_toplevel (toplevel)) + { + gboolean transparent; + @@ -361,26 +365,26 @@ index 128b74befc1e..a1c3161391da 100644 static void update_color_scheme (TerminalScreen *screen) { -@@ -1162,7 +1191,6 @@ update_color_scheme (TerminalScreen *screen) - GdkRGBA *cursor_bgp = NULL, *cursor_fgp = NULL; - GdkRGBA *highlight_bgp = NULL, *highlight_fgp = NULL; +@@ -1146,7 +1175,6 @@ update_color_scheme (TerminalScreen *screen) + GdkRGBA *cursor_bgp = nullptr, *cursor_fgp = nullptr; + GdkRGBA *highlight_bgp = nullptr, *highlight_fgp = nullptr; GtkStyleContext *context; - GtkWidget *toplevel; gboolean transparent; gboolean use_theme_colors; -@@ -1227,9 +1255,7 @@ update_color_scheme (TerminalScreen *screen) +@@ -1211,9 +1239,7 @@ update_color_scheme (TerminalScreen *screen) vte_terminal_set_color_highlight (VTE_TERMINAL (screen), highlight_bgp); vte_terminal_set_color_highlight_foreground (VTE_TERMINAL (screen), highlight_fgp); - toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen)); -- if (toplevel != NULL && gtk_widget_is_toplevel (toplevel)) +- if (toplevel != nullptr && gtk_widget_is_toplevel (toplevel)) - gtk_widget_set_app_paintable (toplevel, transparent); + update_toplevel_transparency (screen); } static void -@@ -1748,6 +1774,13 @@ terminal_screen_do_popup (TerminalScreen *screen, +@@ -1752,6 +1778,13 @@ terminal_screen_do_popup (TerminalScreen *screen, terminal_screen_popup_info_unref (info); } @@ -394,11 +398,11 @@ index 128b74befc1e..a1c3161391da 100644 static gboolean terminal_screen_button_press (GtkWidget *widget, GdkEventButton *event) -diff --git a/src/terminal-window.c b/src/terminal-window.c -index 19881f8..003b9cf 100644 ---- a/src/terminal-window.c -+++ b/src/terminal-window.c -@@ -1962,15 +1962,22 @@ terminal_window_draw (GtkWidget *widget, +diff --git a/src/terminal-window.cc b/src/terminal-window.cc +index 11d93419..61857bfe 100644 +--- a/src/terminal-window.cc ++++ b/src/terminal-window.cc +@@ -2009,15 +2009,21 @@ terminal_window_draw (GtkWidget *widget, { if (gtk_widget_get_app_paintable (widget)) { @@ -406,13 +410,12 @@ index 19881f8..003b9cf 100644 GtkStyleContext *context; - int width; - int height; -+ + GtkWidget *child; + + /* Get the *child* allocation, so we don't overwrite window borders */ + child = gtk_bin_get_child (GTK_BIN (widget)); + gtk_widget_get_allocation (child, &child_allocation); - + context = gtk_widget_get_style_context (widget); - width = gtk_widget_get_allocated_width (widget); - height = gtk_widget_get_allocated_height (widget); @@ -425,13 +428,13 @@ index 19881f8..003b9cf 100644 + child_allocation.x, child_allocation.y, + child_allocation.width, child_allocation.height); } - + return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr); -- -2.25.4 +2.39.1 -From de1231cf68fbe55ab7b7b2c4660091bfb05ec493 Mon Sep 17 00:00:00 2001 +From 65f3ece2a95a9ec950d7be7b63cd1a5acc2731b7 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 18 May 2018 20:15:34 +0200 Subject: [PATCH 04/16] screen: Try harder to find a foreground process group @@ -453,17 +456,17 @@ long-running foreground process group terminates. https://bugzilla.gnome.org/show_bug.cgi?id=711059 --- - src/terminal-screen.c | 30 +++++++++++++++++++++++++++++- + src/terminal-screen.cc | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) -diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index a1c3161391da..e2545c3f9288 100644 ---- a/src/terminal-screen.c -+++ b/src/terminal-screen.c -@@ -2334,7 +2334,35 @@ terminal_screen_has_foreground_process (TerminalScreen *screen, +diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc +index 85f0fbcf..a973aa87 100644 +--- a/src/terminal-screen.cc ++++ b/src/terminal-screen.cc +@@ -2343,7 +2343,35 @@ terminal_screen_has_foreground_process (TerminalScreen *screen, #else g_snprintf (filename, sizeof (filename), "/proc/%d/cmdline", fgpid); - if (!g_file_get_contents (filename, &data_buf, &len, NULL)) + if (!g_file_get_contents (filename, &data_buf, &len, nullptr)) - return TRUE; + { + int j; @@ -486,7 +489,7 @@ index a1c3161391da..e2545c3f9288 100644 + g_snprintf (filename, sizeof (filename), "/proc/%d/cmdline", (int) pid); + + g_clear_pointer (&data_buf, g_free); -+ if (g_file_get_contents (filename, &data_buf, &len, NULL)) ++ if (g_file_get_contents (filename, &data_buf, &len, nullptr)) + break; + } + @@ -498,10 +501,10 @@ index a1c3161391da..e2545c3f9288 100644 #endif -- -2.25.4 +2.39.1 -From b4a8b69b27a26f95371a1780ad61e97529cb8f90 Mon Sep 17 00:00:00 2001 +From a80239410e4baf22ee57857d77ec469cbd2921dd Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 3 May 2018 16:49:28 +0200 Subject: [PATCH 05/16] screen: Track the current foreground process @@ -517,42 +520,40 @@ process. https://bugzilla.gnome.org/show_bug.cgi?id=711059 --- - src/terminal-debug.c | 1 + - src/terminal-debug.h | 3 +- - src/terminal-screen.c | 148 ++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 151 insertions(+), 1 deletion(-) + src/terminal-debug.cc | 1 + + src/terminal-debug.hh | 1 + + src/terminal-screen.cc | 150 +++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 152 insertions(+) -diff --git a/src/terminal-debug.c b/src/terminal-debug.c -index d08829e93ff4..6d325b5aee9d 100644 ---- a/src/terminal-debug.c -+++ b/src/terminal-debug.c -@@ -38,6 +38,7 @@ _terminal_debug_init(void) - { "profile", TERMINAL_DEBUG_PROFILE }, - { "settings-list", TERMINAL_DEBUG_SETTINGS_LIST }, +diff --git a/src/terminal-debug.cc b/src/terminal-debug.cc +index bf2db7e9..e2645335 100644 +--- a/src/terminal-debug.cc ++++ b/src/terminal-debug.cc +@@ -40,6 +40,7 @@ _terminal_debug_init(void) { "search", TERMINAL_DEBUG_SEARCH }, + { "bridge", TERMINAL_DEBUG_BRIDGE }, + { "default", TERMINAL_DEBUG_DEFAULT }, + { "shell-command", TERMINAL_DEBUG_SHELL_COMMAND }, }; - _terminal_debug_flags = g_parse_debug_string (g_getenv ("GNOME_TERMINAL_DEBUG"), -diff --git a/src/terminal-debug.h b/src/terminal-debug.h -index 0fafcc3a846c..b0f2fc9df7f6 100644 ---- a/src/terminal-debug.h -+++ b/src/terminal-debug.h -@@ -34,7 +34,8 @@ typedef enum { - TERMINAL_DEBUG_PROCESSES = 1 << 6, - TERMINAL_DEBUG_PROFILE = 1 << 7, - TERMINAL_DEBUG_SETTINGS_LIST = 1 << 8, -- TERMINAL_DEBUG_SEARCH = 1 << 9 -+ TERMINAL_DEBUG_SEARCH = 1 << 9, -+ TERMINAL_DEBUG_SHELL_COMMAND = 1 << 10, + _terminal_debug_flags = TerminalDebugFlags(g_parse_debug_string (g_getenv ("GNOME_TERMINAL_DEBUG"), +diff --git a/src/terminal-debug.hh b/src/terminal-debug.hh +index fedc9e4d..94f0e30b 100644 +--- a/src/terminal-debug.hh ++++ b/src/terminal-debug.hh +@@ -37,6 +37,7 @@ typedef enum { + TERMINAL_DEBUG_SEARCH = 1 << 9, + TERMINAL_DEBUG_BRIDGE = 1 << 10, + TERMINAL_DEBUG_DEFAULT = 1 << 11, ++ TERMINAL_DEBUG_SHELL_COMMAND = 1 << 12, } TerminalDebugFlags; void _terminal_debug_init(void); -diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index e2545c3f9288..57ea1cce26d5 100644 ---- a/src/terminal-screen.c -+++ b/src/terminal-screen.c -@@ -107,6 +107,11 @@ struct _TerminalScreenPrivate +diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc +index a973aa87..e5400940 100644 +--- a/src/terminal-screen.cc ++++ b/src/terminal-screen.cc +@@ -112,6 +112,11 @@ struct _TerminalScreenPrivate gboolean exec_on_realize; guint idle_exec_source; ExecData *exec_data; @@ -564,7 +565,7 @@ index e2545c3f9288..57ea1cce26d5 100644 }; enum -@@ -156,6 +161,12 @@ static void terminal_screen_hierarchy_changed (GtkWidget *widget, +@@ -161,6 +166,12 @@ static void terminal_screen_hierarchy_changed (GtkWidget *widget, static void terminal_screen_child_exited (VteTerminal *terminal, int status); @@ -577,7 +578,7 @@ index e2545c3f9288..57ea1cce26d5 100644 static void terminal_screen_window_title_changed (VteTerminal *vte_terminal, TerminalScreen *screen); -@@ -625,6 +636,9 @@ terminal_screen_class_init (TerminalScreenClass *klass) +@@ -604,6 +615,9 @@ terminal_screen_class_init (TerminalScreenClass *klass) widget_class->hierarchy_changed = terminal_screen_hierarchy_changed; terminal_class->child_exited = terminal_screen_child_exited; @@ -587,8 +588,8 @@ index e2545c3f9288..57ea1cce26d5 100644 signals[PROFILE_SET] = g_signal_new (I_("profile-set"), -@@ -724,6 +738,18 @@ terminal_screen_dispose (GObject *object) - 0, 0, NULL, NULL, +@@ -709,6 +723,18 @@ terminal_screen_dispose (GObject *object) + 0, 0, nullptr, nullptr, screen); + if (priv->contents_changed_source_id != 0) @@ -606,7 +607,7 @@ index e2545c3f9288..57ea1cce26d5 100644 if (priv->idle_exec_source != 0) { g_source_remove (priv->idle_exec_source); -@@ -760,6 +786,7 @@ terminal_screen_finalize (GObject *object) +@@ -745,6 +771,7 @@ terminal_screen_finalize (GObject *object) g_slist_free_full (priv->match_tags, (GDestroyNotify) free_tag_data); g_free (priv->uuid); @@ -614,7 +615,7 @@ index e2545c3f9288..57ea1cce26d5 100644 G_OBJECT_CLASS (terminal_screen_parent_class)->finalize (object); } -@@ -1959,6 +1986,123 @@ terminal_screen_child_exited (VteTerminal *terminal, +@@ -1966,6 +1993,125 @@ terminal_screen_child_exited (VteTerminal *terminal, } } @@ -622,21 +623,22 @@ index e2545c3f9288..57ea1cce26d5 100644 +terminal_screen_contents_changed_cb (TerminalScreen *screen) +{ + TerminalScreenPrivate *priv = screen->priv; -+ gs_free char *cmdline = NULL; ++ gs_free char *cmdline = nullptr; + + g_return_val_if_fail (priv->between_preexec_and_precmd, G_SOURCE_REMOVE); + g_return_val_if_fail (priv->shell_preexec_source_id == 0, G_SOURCE_REMOVE); + + _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Contents changed [timeout]\n"); + -+ if (!terminal_screen_has_foreground_process (screen, NULL, &cmdline)) ++ if (!terminal_screen_has_foreground_process (screen, nullptr, &cmdline)) + goto out; + + if (g_strcmp0 (priv->current_cmdline, cmdline) == 0) + goto out; + + g_free (priv->current_cmdline); -+ priv->current_cmdline = g_steal_pointer (&cmdline); ++ priv->current_cmdline = cmdline; ++ cmdline = nullptr; + _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Current foreground command-line: %s\n", priv->current_cmdline); + + out: @@ -697,17 +699,18 @@ index e2545c3f9288..57ea1cce26d5 100644 +{ + TerminalScreenPrivate *priv = screen->priv; + gboolean retval = G_SOURCE_CONTINUE; -+ gs_free char *cmdline = NULL; ++ gs_free char *cmdline = nullptr; + + g_return_val_if_fail (priv->between_preexec_and_precmd, G_SOURCE_REMOVE); -+ g_return_val_if_fail (priv->current_cmdline == NULL, G_SOURCE_REMOVE); ++ g_return_val_if_fail (priv->current_cmdline == nullptr, G_SOURCE_REMOVE); + + _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Shell preexec [timeout]\n"); + -+ if (!terminal_screen_has_foreground_process (screen, NULL, &cmdline)) ++ if (!terminal_screen_has_foreground_process (screen, nullptr, &cmdline)) + goto out; + -+ priv->current_cmdline = g_steal_pointer (&cmdline); ++ priv->current_cmdline = cmdline; ++ cmdline = nullptr; + _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Current foreground command-line: %s\n", priv->current_cmdline); + + priv->shell_preexec_source_id = 0; @@ -725,7 +728,7 @@ index e2545c3f9288..57ea1cce26d5 100644 + + g_return_if_fail (!priv->between_preexec_and_precmd); + g_return_if_fail (priv->contents_changed_source_id == 0); -+ g_return_if_fail (priv->current_cmdline == NULL); ++ g_return_if_fail (priv->current_cmdline == nullptr); + g_return_if_fail (priv->shell_preexec_source_id == 0); + + _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Shell preexec\n"); @@ -738,7 +741,7 @@ index e2545c3f9288..57ea1cce26d5 100644 static void terminal_screen_drag_data_received (GtkWidget *widget, GdkDragContext *context, -@@ -2303,7 +2447,11 @@ terminal_screen_has_foreground_process (TerminalScreen *screen, +@@ -2312,7 +2458,11 @@ terminal_screen_has_foreground_process (TerminalScreen *screen, if (fd == -1) return FALSE; @@ -751,10 +754,10 @@ index e2545c3f9288..57ea1cce26d5 100644 return FALSE; -- -2.25.4 +2.39.1 -From 3e7242e41500b5a7c85133dc15a0b290cd67d861 Mon Sep 17 00:00:00 2001 +From 5de49ccd79b557223f0cbbfb8254ec9319502f18 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 10 May 2018 19:23:16 +0200 Subject: [PATCH 06/16] Notify when a long-running foreground process group @@ -768,17 +771,17 @@ notification is sent. https://bugzilla.gnome.org/show_bug.cgi?id=711059 --- - src/terminal-app.c | 32 ++++++++++++ - src/terminal-screen.c | 109 +++++++++++++++++++++++++++++++++++++++ - src/terminal-tab-label.c | 30 ++++++++++- - src/terminal-tab-label.h | 4 ++ + src/terminal-app.cc | 32 +++++++++++ + src/terminal-screen.cc | 109 ++++++++++++++++++++++++++++++++++++++ + src/terminal-tab-label.cc | 30 ++++++++++- + src/terminal-tab-label.hh | 4 ++ 4 files changed, 174 insertions(+), 1 deletion(-) -diff --git a/src/terminal-app.c b/src/terminal-app.c -index 6a4fe03f2756..4e70facf9a43 100644 ---- a/src/terminal-app.c -+++ b/src/terminal-app.c -@@ -730,6 +730,31 @@ app_menu_quit_cb (GSimpleAction *action, +diff --git a/src/terminal-app.cc b/src/terminal-app.cc +index 70933a68..1f90a66b 100644 +--- a/src/terminal-app.cc ++++ b/src/terminal-app.cc +@@ -848,6 +848,31 @@ app_menu_quit_cb (GSimpleAction *action, gtk_widget_destroy (GTK_WIDGET (window)); } @@ -789,14 +792,14 @@ index 6a4fe03f2756..4e70facf9a43 100644 + GVariant *parameter, + gpointer user_data) +{ -+ GtkApplication *application = user_data; ++ GtkApplication *application = (GtkApplication*)user_data; + GtkWidget *toplevel; + TerminalScreen *screen; + const char *uuid; + + g_variant_get (parameter, "&s", &uuid); + screen = terminal_app_get_screen_by_uuid (TERMINAL_APP (application), uuid); -+ if (screen == NULL) ++ if (screen == nullptr) + return; + + toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen)); @@ -807,21 +810,17 @@ index 6a4fe03f2756..4e70facf9a43 100644 + gtk_window_present (GTK_WINDOW (toplevel)); +} + - /* Class implementation */ + #endif /* TERMINAL_SERVER */ - G_DEFINE_TYPE (TerminalApp, terminal_app, GTK_TYPE_APPLICATION) -@@ -753,6 +778,10 @@ terminal_app_startup (GApplication *application) - { "quit", app_menu_quit_cb, NULL, NULL, NULL } + /* Class implementation */ +@@ -890,9 +915,16 @@ terminal_app_startup (GApplication *application) + { "quit", app_menu_quit_cb, nullptr, nullptr, nullptr } }; -+ const GActionEntry other_actions[] = { -+ { "activate-tab", action_activate_tab_cb, "s", NULL, NULL } ++ GActionEntry const other_actions[] = { ++ { "activate-tab", action_activate_tab_cb, "s", nullptr, nullptr } + }; + - g_application_set_resource_base_path (application, TERMINAL_RESOURCES_PATH_PREFIX); - - G_APPLICATION_CLASS (terminal_app_parent_class)->startup (application); -@@ -763,6 +792,9 @@ terminal_app_startup (GApplication *application) g_action_map_add_action_entries (G_ACTION_MAP (application), action_entries, G_N_ELEMENTS (action_entries), application); @@ -829,21 +828,21 @@ index 6a4fe03f2756..4e70facf9a43 100644 + other_actions, G_N_ELEMENTS (other_actions), + application); - app_load_css (application); - -diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 57ea1cce26d5..d25b36597396 100644 ---- a/src/terminal-screen.c -+++ b/src/terminal-screen.c -@@ -54,6 +54,7 @@ + /* Figure out whether the shell shows the menubar */ + gboolean shell_shows_menubar; +diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc +index e5400940..219c051a 100644 +--- a/src/terminal-screen.cc ++++ b/src/terminal-screen.cc +@@ -55,6 +55,7 @@ #include "terminal-marshal.h" - #include "terminal-schemas.h" - #include "terminal-screen-container.h" -+#include "terminal-tab-label.h" - #include "terminal-util.h" - #include "terminal-window.h" - #include "terminal-info-bar.h" -@@ -156,6 +157,10 @@ static void terminal_screen_system_font_changed_cb (GSettings *, + #include "terminal-schemas.hh" + #include "terminal-screen-container.hh" ++#include "terminal-tab-label.hh" + #include "terminal-util.hh" + #include "terminal-window.hh" + #include "terminal-info-bar.hh" +@@ -161,6 +162,10 @@ static void terminal_screen_system_font_changed_cb (GSettings *, static gboolean terminal_screen_popup_menu (GtkWidget *widget); static gboolean terminal_screen_button_press (GtkWidget *widget, GdkEventButton *event); @@ -854,7 +853,7 @@ index 57ea1cce26d5..d25b36597396 100644 static void terminal_screen_hierarchy_changed (GtkWidget *widget, GtkWidget *previous_toplevel); static void terminal_screen_child_exited (VteTerminal *terminal, -@@ -628,6 +633,7 @@ terminal_screen_class_init (TerminalScreenClass *klass) +@@ -607,6 +612,7 @@ terminal_screen_class_init (TerminalScreenClass *klass) object_class->get_property = terminal_screen_get_property; object_class->set_property = terminal_screen_set_property; @@ -862,7 +861,7 @@ index 57ea1cce26d5..d25b36597396 100644 widget_class->realize = terminal_screen_realize; widget_class->style_updated = terminal_screen_style_updated; widget_class->drag_data_received = terminal_screen_drag_data_received; -@@ -727,6 +733,10 @@ terminal_screen_dispose (GObject *object) +@@ -712,6 +718,10 @@ terminal_screen_dispose (GObject *object) TerminalScreen *screen = TERMINAL_SCREEN (object); TerminalScreenPrivate *priv = screen->priv; GtkSettings *settings; @@ -873,7 +872,7 @@ index 57ea1cce26d5..d25b36597396 100644 /* Unset child PID so that when an eventual child-exited signal arrives, * we don't emit "close". -@@ -1890,6 +1900,45 @@ terminal_screen_button_press (GtkWidget *widget, +@@ -1897,6 +1907,45 @@ terminal_screen_button_press (GtkWidget *widget, return FALSE; } @@ -888,12 +887,12 @@ index 57ea1cce26d5..d25b36597396 100644 + _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Notification withdrawn\n"); + + window = terminal_screen_get_window (screen); -+ if (window != NULL) ++ if (window != nullptr) + { + TerminalScreenContainer *screen_container; + + screen_container = terminal_screen_container_get_from_screen (screen); -+ if (screen_container != NULL) ++ if (screen_container != nullptr) + { + GtkWidget *mdi_container; + @@ -905,7 +904,7 @@ index 57ea1cce26d5..d25b36597396 100644 + + tab_label = gtk_notebook_get_tab_label (GTK_NOTEBOOK (mdi_container), GTK_WIDGET (screen_container)); + terminal_tab_label_set_bold (TERMINAL_TAB_LABEL (tab_label), FALSE); -+ terminal_tab_label_set_icon (TERMINAL_TAB_LABEL (tab_label), NULL, NULL); ++ terminal_tab_label_set_icon (TERMINAL_TAB_LABEL (tab_label), nullptr, nullptr); + } + } + } @@ -919,7 +918,7 @@ index 57ea1cce26d5..d25b36597396 100644 /** * terminal_screen_get_current_dir: * @screen: -@@ -2034,6 +2083,63 @@ terminal_screen_contents_changed (VteTerminal *terminal) +@@ -2042,6 +2091,63 @@ terminal_screen_contents_changed (VteTerminal *terminal) screen); } @@ -930,7 +929,7 @@ index 57ea1cce26d5..d25b36597396 100644 + TerminalWindow *window; + + window = terminal_screen_get_window (screen); -+ if (window == NULL) ++ if (window == nullptr) + return; + + if (gtk_window_is_active (GTK_WINDOW (window))) @@ -942,7 +941,7 @@ index 57ea1cce26d5..d25b36597396 100644 + return; + + screen_container = terminal_screen_container_get_from_screen (screen); -+ if (screen_container == NULL) ++ if (screen_container == nullptr) + return; + + mdi_container = terminal_window_get_mdi_container (window); @@ -961,10 +960,10 @@ index 57ea1cce26d5..d25b36597396 100644 + } + else + { -+ gs_unref_object GNotification *notification = NULL; ++ gs_unref_object GNotification *notification = nullptr; + TerminalApp *app; -+ gs_free char *current_cmdline_valid = NULL; -+ gs_free char *detailed_action = NULL; ++ gs_free char *current_cmdline_valid = nullptr; ++ gs_free char *detailed_action = nullptr; + + notification = g_notification_new (_("Command completed")); + @@ -983,20 +982,20 @@ index 57ea1cce26d5..d25b36597396 100644 static void terminal_screen_shell_precmd (VteTerminal *terminal) { -@@ -2056,6 +2162,9 @@ terminal_screen_shell_precmd (VteTerminal *terminal) +@@ -2064,6 +2170,9 @@ terminal_screen_shell_precmd (VteTerminal *terminal) priv->shell_preexec_source_id = 0; } -+ if (priv->current_cmdline != NULL) ++ if (priv->current_cmdline != nullptr) + terminal_screen_show_notification (screen); + g_clear_pointer (&priv->current_cmdline, g_free); _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Current foreground command-line: (none)\n"); } -diff --git a/src/terminal-tab-label.c b/src/terminal-tab-label.c -index 7b4b0849ad8d..4fd0af13484a 100644 ---- a/src/terminal-tab-label.c -+++ b/src/terminal-tab-label.c +diff --git a/src/terminal-tab-label.cc b/src/terminal-tab-label.cc +index 88af5d41..d6423f11 100644 +--- a/src/terminal-tab-label.cc ++++ b/src/terminal-tab-label.cc @@ -34,6 +34,7 @@ struct _TerminalTabLabelPrivate { @@ -1022,10 +1021,10 @@ index 7b4b0849ad8d..4fd0af13484a 100644 + gtk_widget_set_no_show_all (icon, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0); + - priv->label = label = gtk_label_new (NULL); + priv->label = label = gtk_label_new (nullptr); gtk_widget_set_halign (label, GTK_ALIGN_CENTER); gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); -@@ -376,6 +381,29 @@ terminal_tab_label_set_bold (TerminalTabLabel *tab_label, +@@ -380,6 +385,29 @@ terminal_tab_label_set_bold (TerminalTabLabel *tab_label, pango_attr_list_unref (attr_list); } @@ -1036,7 +1035,7 @@ index 7b4b0849ad8d..4fd0af13484a 100644 + * @tooltip: (allow-none): text to be used as tooltip + * + * Shows an icon at the beginning of @tab_label. If @icon_name is -+ * %NULL, then the icon will be hidden. ++ * %nullptr, then the icon will be hidden. + */ +void +terminal_tab_label_set_icon (TerminalTabLabel *tab_label, @@ -1047,7 +1046,7 @@ index 7b4b0849ad8d..4fd0af13484a 100644 + + g_return_if_fail (TERMINAL_IS_TAB_LABEL (tab_label)); + -+ gtk_widget_set_visible (priv->icon, icon_name != NULL); ++ gtk_widget_set_visible (priv->icon, icon_name != nullptr); + gtk_image_set_from_icon_name (GTK_IMAGE (priv->icon), icon_name, GTK_ICON_SIZE_MENU); + gtk_widget_set_tooltip_text (GTK_WIDGET (priv->icon), tooltip); +} @@ -1055,10 +1054,10 @@ index 7b4b0849ad8d..4fd0af13484a 100644 /** * terminal_tab_label_get_screen: * @tab_label: a #TerminalTabLabel -diff --git a/src/terminal-tab-label.h b/src/terminal-tab-label.h -index 20cfbceb36b0..a987025e0524 100644 ---- a/src/terminal-tab-label.h -+++ b/src/terminal-tab-label.h +diff --git a/src/terminal-tab-label.hh b/src/terminal-tab-label.hh +index 91b7e617..37e808a7 100644 +--- a/src/terminal-tab-label.hh ++++ b/src/terminal-tab-label.hh @@ -59,6 +59,10 @@ GtkWidget * terminal_tab_label_new (TerminalScreen *screen); void terminal_tab_label_set_bold (TerminalTabLabel *tab_label, gboolean bold); @@ -1071,10 +1070,10 @@ index 20cfbceb36b0..a987025e0524 100644 G_END_DECLS -- -2.25.4 +2.39.1 -From a6dbcf9b15ae96829c5a1c20e2901c722457b3c6 Mon Sep 17 00:00:00 2001 +From f17dfaef169d3563ff62f4e0e41483c316040982 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 10 Apr 2018 15:39:35 +0200 Subject: [PATCH 07/16] profile: Split the Command tab into two nested GtkGrids @@ -1088,10 +1087,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110 1 file changed, 123 insertions(+), 116 deletions(-) diff --git a/src/preferences.ui b/src/preferences.ui -index 64f8295bf2b0..426993a4e154 100644 +index f3979307..285a3c61 100644 --- a/src/preferences.ui +++ b/src/preferences.ui -@@ -1965,130 +1965,137 @@ +@@ -1998,130 +1998,137 @@ True False 12 @@ -1346,10 +1345,10 @@ index 64f8295bf2b0..426993a4e154 100644 -- -2.25.4 +2.39.1 -From 528ffc16192fbd45fdb709a0c58dd5f51ab524e9 Mon Sep 17 00:00:00 2001 +From 020367f3110a0c8fe513b562aae43aea98a1264e Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 10 Apr 2018 16:01:51 +0200 Subject: [PATCH 08/16] Revert "profile: Remove the "Command" sub-heading" @@ -1362,10 +1361,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110 1 file changed, 143 insertions(+), 104 deletions(-) diff --git a/src/preferences.ui b/src/preferences.ui -index 426993a4e154..7f4a94c88b6b 100644 +index 285a3c61..5422de71 100644 --- a/src/preferences.ui +++ b/src/preferences.ui -@@ -1973,129 +1973,168 @@ +@@ -2006,129 +2006,168 @@ 12 6 @@ -1639,10 +1638,10 @@ index 426993a4e154..7f4a94c88b6b 100644 -- -2.25.4 +2.39.1 -From c95d6adef9b1c1c447249a44eb56750b321000e0 Mon Sep 17 00:00:00 2001 +From 052881d7c856ecfd4397ffd26db064b83cc1d9ac Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 30 Jun 2016 16:02:13 +0200 Subject: [PATCH 09/16] Revert "screen: Remove unused description and @@ -1652,15 +1651,15 @@ This reverts commit 3bb41272b7509a16ec2a5cd93e44f73d5743b626. https://bugzilla.redhat.com/show_bug.cgi?id=1296110 --- - src/terminal-screen.c | 63 +++++++++++++++++++++++++++++++++++++++++++ - src/terminal-screen.h | 5 ++++ - 2 files changed, 68 insertions(+) + src/terminal-screen.cc | 64 ++++++++++++++++++++++++++++++++++++++++++ + src/terminal-screen.hh | 5 ++++ + 2 files changed, 69 insertions(+) -diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index d25b36597396..91c76df3feea 100644 ---- a/src/terminal-screen.c -+++ b/src/terminal-screen.c -@@ -111,6 +111,7 @@ struct _TerminalScreenPrivate +diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc +index 219c051a..f22bcf65 100644 +--- a/src/terminal-screen.cc ++++ b/src/terminal-screen.cc +@@ -116,6 +116,7 @@ struct _TerminalScreenPrivate gboolean between_preexec_and_precmd; char *current_cmdline; @@ -1668,7 +1667,7 @@ index d25b36597396..91c76df3feea 100644 guint contents_changed_source_id; guint shell_preexec_source_id; }; -@@ -128,6 +129,7 @@ enum { +@@ -133,6 +134,7 @@ enum { PROP_0, PROP_PROFILE, PROP_TITLE, @@ -1676,7 +1675,7 @@ index d25b36597396..91c76df3feea 100644 }; enum -@@ -592,6 +594,9 @@ terminal_screen_get_property (GObject *object, +@@ -571,6 +573,9 @@ terminal_screen_get_property (GObject *object, case PROP_TITLE: g_value_set_string (value, terminal_screen_get_title (screen)); break; @@ -1686,29 +1685,30 @@ index d25b36597396..91c76df3feea 100644 default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; -@@ -612,6 +617,7 @@ terminal_screen_set_property (GObject *object, - terminal_screen_set_profile (screen, g_value_get_object (value)); +@@ -591,6 +596,7 @@ terminal_screen_set_property (GObject *object, + terminal_screen_set_profile (screen, (GSettings*)g_value_get_object (value)); break; case PROP_TITLE: + case PROP_DESCRIPTION: /* not writable */ default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -@@ -701,6 +707,13 @@ terminal_screen_class_init (TerminalScreenClass *klass) - NULL, - G_PARAM_READABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); - -+ g_object_class_install_property (object_class, -+ PROP_DESCRIPTION, -+ g_param_spec_string ("description", NULL, NULL, -+ NULL, -+ G_PARAM_READABLE | -+ G_PARAM_STATIC_STRINGS)); +@@ -686,6 +692,14 @@ terminal_screen_class_init (TerminalScreenClass *klass) + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB))); + ++ g_object_class_install_property ++ (object_class, ++ PROP_DESCRIPTION, ++ g_param_spec_string ("description", nullptr, nullptr, ++ nullptr, ++ GParamFlags(G_PARAM_READABLE | ++ G_PARAM_STATIC_STRINGS))); + g_type_class_add_private (object_class, sizeof (TerminalScreenPrivate)); n_url_regexes = G_N_ELEMENTS (url_regex_patterns); -@@ -797,6 +810,7 @@ terminal_screen_finalize (GObject *object) +@@ -782,6 +796,7 @@ terminal_screen_finalize (GObject *object) g_free (priv->uuid); g_free (priv->current_cmdline); @@ -1716,7 +1716,7 @@ index d25b36597396..91c76df3feea 100644 G_OBJECT_CLASS (terminal_screen_parent_class)->finalize (object); } -@@ -1056,6 +1070,21 @@ terminal_screen_get_title (TerminalScreen *screen) +@@ -1040,6 +1055,21 @@ terminal_screen_get_title (TerminalScreen *screen) return vte_terminal_get_window_title (VTE_TERMINAL (screen)); } @@ -1738,7 +1738,7 @@ index d25b36597396..91c76df3feea 100644 static void terminal_screen_profile_changed_cb (GSettings *profile, const char *prop_name, -@@ -1384,6 +1413,7 @@ terminal_screen_set_profile (TerminalScreen *screen, +@@ -1368,6 +1398,7 @@ terminal_screen_set_profile (TerminalScreen *screen, g_object_unref (old_profile); g_object_notify (G_OBJECT (screen), "profile"); @@ -1746,7 +1746,7 @@ index d25b36597396..91c76df3feea 100644 } GSettings* -@@ -1655,6 +1685,8 @@ spawn_result_cb (VteTerminal *terminal, +@@ -1655,6 +1686,8 @@ spawn_result_cb (VteTerminal *terminal, priv->child_pid = pid; @@ -1754,8 +1754,8 @@ index d25b36597396..91c76df3feea 100644 + if (error) { // FIXMEchpe should be unnecessary, vte already does this internally - vte_terminal_set_pty (terminal, NULL); -@@ -1939,6 +1971,35 @@ terminal_screen_focus_in (GtkWidget *widget, + vte_terminal_set_pty (terminal, nullptr); +@@ -1946,6 +1979,35 @@ terminal_screen_focus_in (GtkWidget *widget, return GTK_WIDGET_CLASS (terminal_screen_parent_class)->focus_in_event (widget, event); } @@ -1771,7 +1771,7 @@ index d25b36597396..91c76df3feea 100644 + return; + + g_free (priv->title); -+ priv->title = title && title[0] ? g_strdup (title) : NULL; ++ priv->title = title && title[0] ? g_strdup (title) : nullptr; + + g_object_notify (G_OBJECT (screen), "description"); +} @@ -1781,7 +1781,7 @@ index d25b36597396..91c76df3feea 100644 +{ + TerminalScreenPrivate *priv; + -+ g_return_val_if_fail (TERMINAL_IS_SCREEN (screen), NULL); ++ g_return_val_if_fail (TERMINAL_IS_SCREEN (screen), nullptr); + + priv = screen->priv; + @@ -1791,19 +1791,19 @@ index d25b36597396..91c76df3feea 100644 /** * terminal_screen_get_current_dir: * @screen: -@@ -1992,6 +2053,8 @@ terminal_screen_child_exited (VteTerminal *terminal, +@@ -1999,6 +2061,8 @@ terminal_screen_child_exited (VteTerminal *terminal, priv->child_pid = -1; + g_object_notify (G_OBJECT (screen), "description"); + - action = g_settings_get_enum (priv->profile, TERMINAL_PROFILE_EXIT_ACTION_KEY); + action = TerminalExitAction(g_settings_get_enum (priv->profile, TERMINAL_PROFILE_EXIT_ACTION_KEY)); switch (action) -diff --git a/src/terminal-screen.h b/src/terminal-screen.h -index 8ea337867222..049bbe5a2b8b 100644 ---- a/src/terminal-screen.h -+++ b/src/terminal-screen.h +diff --git a/src/terminal-screen.hh b/src/terminal-screen.hh +index ded6b8ca..f4ec9047 100644 +--- a/src/terminal-screen.hh ++++ b/src/terminal-screen.hh @@ -113,7 +113,12 @@ void terminal_screen_set_profile (TerminalScreen *screen, GSettings* terminal_screen_get_profile (TerminalScreen *screen); GSettings* terminal_screen_ref_profile (TerminalScreen *screen); @@ -1818,10 +1818,10 @@ index 8ea337867222..049bbe5a2b8b 100644 char *terminal_screen_get_current_dir (TerminalScreen *screen); -- -2.25.4 +2.39.1 -From 9c755aefcb53d63da73214a911ab75dd4fe6b7e2 Mon Sep 17 00:00:00 2001 +From b51278e3fefc940b75e2b7581638f93efcf9f32b Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 30 Jun 2016 17:39:48 +0200 Subject: [PATCH 10/16] Revert "Remove the static title setting from profile @@ -1833,13 +1833,13 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110 --- src/org.gnome.Terminal.gschema.xml | 5 +++ src/preferences.ui | 71 ++++++++++++++++++++++++++++++ - src/profile-editor.c | 5 +++ - src/terminal-schemas.h | 1 + - src/terminal-screen.c | 9 ++++ - 5 files changed, 91 insertions(+) + src/profile-editor.cc | 6 +++ + src/terminal-schemas.hh | 1 + + src/terminal-screen.cc | 9 ++++ + 5 files changed, 92 insertions(+) diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml -index 7b04919202b7..1c458a9fb9ec 100644 +index cca1aef3..9a41c45f 100644 --- a/src/org.gnome.Terminal.gschema.xml +++ b/src/org.gnome.Terminal.gschema.xml @@ -209,6 +209,11 @@ @@ -1855,10 +1855,10 @@ index 7b04919202b7..1c458a9fb9ec 100644 false Whether bold is also bright diff --git a/src/preferences.ui b/src/preferences.ui -index 7f4a94c88b6b..f86f8c980f89 100644 +index 5422de71..d851bcb6 100644 --- a/src/preferences.ui +++ b/src/preferences.ui -@@ -1966,6 +1966,77 @@ +@@ -1999,6 +1999,77 @@ False 12 18 @@ -1936,27 +1936,28 @@ index 7f4a94c88b6b..f86f8c980f89 100644 True -diff --git a/src/profile-editor.c b/src/profile-editor.c -index 35bd24791417..df1f219608c4 100644 ---- a/src/profile-editor.c -+++ b/src/profile-editor.c -@@ -1368,6 +1368,11 @@ profile_prefs_load (const char *uuid, GSettings *profile) +diff --git a/src/profile-editor.cc b/src/profile-editor.cc +index d0e71e26..f7997fbf 100644 +--- a/src/profile-editor.cc ++++ b/src/profile-editor.cc +@@ -1416,6 +1416,12 @@ profile_prefs_load (const char *uuid, GSettings *profile) (GSettingsBindSetMapping) enum_to_string, - terminal_preserve_working_directory_get_type, NULL); + terminal_preserve_working_directory_get_type, nullptr); + profile_prefs_settings_bind (profile, + TERMINAL_PROFILE_TITLE_KEY, + gtk_builder_get_object (builder, "title-entry"), + "text", -+ G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); ++ GSettingsBindFlags(G_SETTINGS_BIND_GET | ++ G_SETTINGS_BIND_SET)); profile_prefs_settings_bind (profile, TERMINAL_PROFILE_USE_CUSTOM_COMMAND_KEY, gtk_builder_get_object (builder, "use-custom-command-checkbutton"), -diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h -index 6bfd3e346895..cbb59a2301e6 100644 ---- a/src/terminal-schemas.h -+++ b/src/terminal-schemas.h -@@ -69,6 +69,7 @@ G_BEGIN_DECLS +diff --git a/src/terminal-schemas.hh b/src/terminal-schemas.hh +index c33723bf..d0f111a0 100644 +--- a/src/terminal-schemas.hh ++++ b/src/terminal-schemas.hh +@@ -71,6 +71,7 @@ G_BEGIN_DECLS #define TERMINAL_PROFILE_SCROLL_ON_KEYSTROKE_KEY "scroll-on-keystroke" #define TERMINAL_PROFILE_SCROLL_ON_OUTPUT_KEY "scroll-on-output" #define TERMINAL_PROFILE_TEXT_BLINK_MODE_KEY "text-blink-mode" @@ -1964,15 +1965,15 @@ index 6bfd3e346895..cbb59a2301e6 100644 #define TERMINAL_PROFILE_USE_CUSTOM_COMMAND_KEY "use-custom-command" #define TERMINAL_PROFILE_USE_SKEY_KEY "use-skey" #define TERMINAL_PROFILE_USE_SYSTEM_FONT_KEY "use-system-font" -diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 91c76df3feea..7724af0dfa04 100644 ---- a/src/terminal-screen.c -+++ b/src/terminal-screen.c -@@ -1074,11 +1074,14 @@ char * +diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc +index f22bcf65..8949d135 100644 +--- a/src/terminal-screen.cc ++++ b/src/terminal-screen.cc +@@ -1059,11 +1059,14 @@ char * terminal_screen_get_description (TerminalScreen *screen) { TerminalScreenPrivate *priv = screen->priv; -+ gs_free char *title_string = NULL; ++ gs_free char *title_string = nullptr; const char *title; /* use --title argument if one was supplied, otherwise ask the profile */ @@ -1983,8 +1984,8 @@ index 91c76df3feea..7724af0dfa04 100644 return g_strdup_printf ("%s — %d", title && title[0] ? title : _("Terminal"), -@@ -1124,6 +1127,12 @@ terminal_screen_profile_changed_cb (GSettings *profile, - vte_terminal_set_cjk_ambiguous_width (vte_terminal, (int) width); +@@ -1109,6 +1112,12 @@ terminal_screen_profile_changed_cb (GSettings *profile, + vte_terminal_set_cjk_ambiguous_width (vte_terminal, width); } + if (!prop_name || @@ -1997,112 +1998,112 @@ index 91c76df3feea..7724af0dfa04 100644 (!prop_name || prop_name == I_(TERMINAL_PROFILE_USE_SYSTEM_FONT_KEY) || -- -2.25.4 +2.39.1 -From f0e0ecdab4c22e7e1f44b5da9a6618c6563c5f5b Mon Sep 17 00:00:00 2001 +From 06df6eeaf16709f235d9eeb49a1be9ed606aa3f7 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 17 Feb 2015 17:06:17 +0100 Subject: [PATCH 11/16] Restore translations for setting a title and transparency --- - po/am.po | 8 ++++---- - po/an.po | 12 ++++++------ - po/ar.po | 16 ++++++++-------- - po/as.po | 16 ++++++++-------- - po/ast.po | 8 ++++---- - po/az.po | 8 ++++---- - po/be.po | 3 +++ - po/be@latin.po | 8 ++++---- - po/bg.po | 9 +++++++++ - po/bn.po | 8 ++++---- - po/bn_IN.po | 11 +++++++---- - po/br.po | 6 +++--- - po/bs.po | 10 ++++++++++ - po/ca.po | 12 ++++++++++++ - po/ca@valencia.po | 12 ++++++++++++ - po/cs.po | 12 ++++++++++++ - po/cy.po | 8 ++++---- - po/da.po | 12 ++++++++++++ - po/de.po | 12 ++++++++++++ - po/dz.po | 8 ++++---- - po/el.po | 15 +++++++++------ - po/en@shaw.po | 8 ++++---- - po/en_CA.po | 8 ++++---- - po/en_GB.po | 16 ++++++++-------- - po/eo.po | 8 ++++---- - po/es.po | 16 ++++++++-------- - po/et.po | 3 +++ - po/eu.po | 12 ++++++++++++ - po/fa.po | 15 +++++++++------ - po/fi.po | 12 ++++++++++++ - po/fr.po | 12 ++++++++++++ - po/fur.po | 11 +++++++++-- - po/ga.po | 3 +++ - po/gl.po | 12 ++++++++++++ - po/gu.po | 16 ++++++++-------- - po/he.po | 16 ++++++++-------- - po/hi.po | 17 ++++++++--------- - po/hr.po | 10 ++++++++++ - po/hu.po | 12 ++++++++++++ - po/hy.po | 8 ++++---- - po/id.po | 12 ++++++++++++ - po/it.po | 12 ++++++++++++ - po/ja.po | 12 ++++++++++++ - po/ka.po | 6 +++--- - po/kk.po | 12 ++++++++++++ - po/km.po | 4 ++-- - po/kn.po | 15 +++++++++------ - po/ko.po | 12 ++++++++++++ - po/ku.po | 8 ++++---- - po/lt.po | 12 ++++++++++++ - po/lv.po | 16 ++++++++++++++++ - po/mai.po | 8 ++++---- - po/mg.po | 8 ++++---- - po/mk.po | 8 ++++---- - po/ml.po | 3 +++ - po/mn.po | 8 ++++---- - po/mr.po | 16 ++++++++-------- - po/ms.po | 4 ++-- - po/nb.po | 12 ++++++++++++ - po/nds.po | 8 ++++---- - po/ne.po | 12 ++++++------ - po/nl.po | 12 ++++++++++++ - po/nn.po | 8 ++++---- - po/oc.po | 12 ++++++------ - po/or.po | 4 ++-- - po/pa.po | 23 +++++++++++------------ - po/ps.po | 8 ++++---- - po/pt.po | 16 ++++++++-------- - po/pt_BR.po | 15 +++++++++------ - po/ro.po | 4 ++-- - po/ru.po | 16 ++++++++++++++++ - po/rw.po | 3 +-- - po/si.po | 8 ++++---- - po/sk.po | 12 ++++++++++++ - po/sl.po | 15 +++++++++------ - po/sq.po | 8 ++++---- - po/sr.po | 22 ++++++++++++---------- - po/sr@latin.po | 22 ++++++++++++---------- - po/sv.po | 12 ++++++++++++ - po/ta.po | 27 +++++++++++++-------------- - po/te.po | 27 +++++++++++++-------------- - po/tg.po | 16 ++++++++-------- - po/th.po | 20 ++++++++++---------- - po/tr.po | 12 ++++++++++++ - po/ug.po | 4 ++-- - po/uk.po | 15 +++++++++++++++ - po/vi.po | 15 +++++++++------ - po/wa.po | 12 ++++++------ - po/xh.po | 12 ++++++------ - po/zh_CN.po | 15 +++++++++------ - po/zh_HK.po | 15 +++++++++------ - po/zh_TW.po | 15 +++++++++------ - 92 files changed, 719 insertions(+), 343 deletions(-) + po/am.po | 8 +++--- + po/an.po | 12 ++++---- + po/ar.po | 16 +++++------ + po/as.po | 16 +++++------ + po/ast.po | 8 +++--- + po/az.po | 8 +++--- + po/be.po | 3 ++ + po/be@latin.po | 8 +++--- + po/bg.po | 9 ++++++ + po/bn.po | 8 +++--- + po/bn_IN.po | 11 +++++--- + po/br.po | 6 ++-- + po/bs.po | 10 +++++++ + po/ca.po | 11 ++++++++ + po/ca@valencia.po | 12 ++++++++ + po/cs.po | 12 ++++++++ + po/cy.po | 8 +++--- + po/da.po | 12 ++++++++ + po/de.po | 12 ++++++++ + po/dz.po | 8 +++--- + po/el.po | 15 ++++++---- + po/en@shaw.po | 8 +++--- + po/en_CA.po | 8 +++--- + po/en_GB.po | 16 +++++------ + po/eo.po | 8 +++--- + po/es.po | 16 +++++------ + po/et.po | 3 ++ + po/eu.po | 12 ++++++++ + po/fa.po | 15 ++++++---- + po/fi.po | 12 ++++++++ + po/fr.po | 24 ++++++++++++++++ + po/fur.po | 11 ++++++-- + po/ga.po | 3 ++ + po/gl.po | 12 ++++++++ + po/gu.po | 16 +++++------ + po/he.po | 16 +++++------ + po/hi.po | 17 ++++++------ + po/hr.po | 10 +++++++ + po/hu.po | 12 ++++++++ + po/hy.po | 8 +++--- + po/id.po | 12 ++++++++ + po/it.po | 12 ++++++++ + po/ja.po | 12 ++++++++ + po/ka.po | 5 ++++ + po/kk.po | 12 ++++++++ + po/km.po | 4 +-- + po/kn.po | 15 ++++++---- + po/ko.po | 12 ++++++++ + po/ku.po | 8 +++--- + po/lt.po | 12 ++++++++ + po/lv.po | 16 +++++++++++ + po/mai.po | 8 +++--- + po/mg.po | 8 +++--- + po/mk.po | 8 +++--- + po/ml.po | 3 ++ + po/mn.po | 8 +++--- + po/mr.po | 16 +++++------ + po/ms.po | 4 +-- + po/nb.po | 12 ++++++++ + po/nds.po | 8 +++--- + po/ne.po | 11 +++++--- + po/nl.po | 12 ++++++++ + po/nn.po | 8 +++--- + po/oc.po | 12 ++++---- + po/or.po | 4 +-- + po/pa.po | 23 ++++++++-------- + po/ps.po | 8 +++--- + po/pt.po | 16 +++++------ + po/pt_BR.po | 12 ++++++++ + po/ro.po | 4 +-- + po/ru.po | 16 +++++++++++ + po/rw.po | 3 +- + po/si.po | 8 +++--- + po/sk.po | 12 ++++++++ + po/sl.po | 12 ++++++++ + po/sq.po | 8 +++--- + po/sr.po | 22 ++++++++------- + po/sr@latin.po | 22 ++++++++------- + po/sv.po | 12 ++++++++ + po/ta.po | 27 +++++++++--------- + po/te.po | 27 +++++++++--------- + po/tg.po | 16 +++++------ + po/th.po | 20 +++++++------- + po/tr.po | 12 ++++++++ + po/ug.po | 4 +-- + po/uk.po | 70 +++++++---------------------------------------- + po/vi.po | 15 ++++++---- + po/wa.po | 12 ++++---- + po/xh.po | 12 ++++---- + po/zh_CN.po | 15 ++++++---- + po/zh_HK.po | 15 ++++++---- + po/zh_TW.po | 15 ++++++---- + 92 files changed, 734 insertions(+), 386 deletions(-) diff --git a/po/am.po b/po/am.po -index 3445d96da657..ee992f0712a5 100644 +index 3445d96d..ee992f07 100644 --- a/po/am.po +++ b/po/am.po @@ -214,8 +214,8 @@ msgid "Background" @@ -2128,7 +2129,7 @@ index 3445d96da657..ee992f0712a5 100644 #: ../src/gnome-terminal.glade2.h:103 msgid "_Update login records when command is launched" diff --git a/po/an.po b/po/an.po -index fcec2668aa11..9e07cb682c57 100644 +index fcec2668..9e07cb68 100644 --- a/po/an.po +++ b/po/an.po @@ -2241,8 +2241,8 @@ msgstr "_Zarrar a finestra" @@ -2165,7 +2166,7 @@ index fcec2668aa11..9e07cb682c57 100644 #~ msgid "Keyboard Shortcuts" #~ msgstr "Alcorces de teclau" diff --git a/po/ar.po b/po/ar.po -index fac62fd10680..f77804d8aec4 100644 +index fac62fd1..f77804d8 100644 --- a/po/ar.po +++ b/po/ar.po @@ -2574,11 +2574,11 @@ msgstr "أغ_لق النافذة" @@ -2207,7 +2208,7 @@ index fac62fd10680..f77804d8aec4 100644 #~ msgid "S_hade transparent or image background:" #~ msgstr "_ظلل شفافية أو صورة الخلفية:" diff --git a/po/as.po b/po/as.po -index 3fade2b8cb12..5b905340f89f 100644 +index 3fade2b8..5b905340 100644 --- a/po/as.po +++ b/po/as.po @@ -2163,11 +2163,11 @@ msgstr "উইন্ডো বন্ধ কৰক (_l)" @@ -2249,7 +2250,7 @@ index 3fade2b8cb12..5b905340f89f 100644 #~ msgid "S_hade transparent or image background:" #~ msgstr "স্বচ্ছ বা ছবিৰ সৈতে পটভূমি ছায়া আচ্ছন্ন কৰক (_h):" diff --git a/po/ast.po b/po/ast.po -index d1c6e7b8174a..4dc0892ed9c4 100644 +index d1c6e7b8..4dc0892e 100644 --- a/po/ast.po +++ b/po/ast.po @@ -1304,8 +1304,8 @@ msgid "_Base on:" @@ -2275,7 +2276,7 @@ index d1c6e7b8174a..4dc0892ed9c4 100644 #: ../src/profile-preferences.glade.h:78 msgid "_Underline color:" diff --git a/po/az.po b/po/az.po -index 586c1e4d827b..4bd846797101 100644 +index 586c1e4d..4bd84679 100644 --- a/po/az.po +++ b/po/az.po @@ -218,8 +218,8 @@ msgid "Background" @@ -2301,7 +2302,7 @@ index 586c1e4d827b..4bd846797101 100644 #: ../src/gnome-terminal.glade2.h:103 msgid "_Update login records when command is launched" diff --git a/po/be.po b/po/be.po -index 298ec2d6ae0c..50f46093a712 100644 +index 298ec2d6..50f46093 100644 --- a/po/be.po +++ b/po/be.po @@ -2635,3 +2635,6 @@ msgstr "_Закрыць акно" @@ -2312,7 +2313,7 @@ index 298ec2d6ae0c..50f46093a712 100644 +msgid "Transparent background" +msgstr "Празрысты фон" diff --git a/po/be@latin.po b/po/be@latin.po -index 82ef0664ae1e..27e9877f96e8 100644 +index 82ef0664..27e9877f 100644 --- a/po/be@latin.po +++ b/po/be@latin.po @@ -1146,8 +1146,8 @@ msgid "_Base on:" @@ -2338,13 +2339,13 @@ index 82ef0664ae1e..27e9877f96e8 100644 #: ../src/profile-preferences.glade.h:74 msgid "_Update login records when command is launched" diff --git a/po/bg.po b/po/bg.po -index 9a4f32e4b135..6ac17c17efb8 100644 +index 920deb57..ceecc323 100644 --- a/po/bg.po +++ b/po/bg.po -@@ -2305,3 +2305,12 @@ msgstr "" - #: ../src/terminal-window.c:3953 - msgid "C_lose Window" - msgstr "_Затваряне на този прозорец" +@@ -2459,3 +2459,12 @@ msgstr "_Затваряне на този прозорец" + #, c-format + msgid "Failed to parse arguments: %s\n" + msgstr "Аргументите не могат да бъдат анализирани: %s\n" + +msgid "Transparent background" +msgstr "Прозрачен фон" @@ -2355,7 +2356,7 @@ index 9a4f32e4b135..6ac17c17efb8 100644 +msgid "Set Title" +msgstr "Задаване на заглавие" diff --git a/po/bn.po b/po/bn.po -index 4906009cf46f..f97d43b0e515 100644 +index 4906009c..f97d43b0 100644 --- a/po/bn.po +++ b/po/bn.po @@ -1217,8 +1217,8 @@ msgid "_Base on:" @@ -2380,8 +2381,34 @@ index 4906009cf46f..f97d43b0e515 100644 #: ../src/profile-preferences.glade.h:77 msgid "_Unlimited" +diff --git a/po/bn_IN.po b/po/bn_IN.po +index 96f28aae..fdd0ef72 100644 +--- a/po/bn_IN.po ++++ b/po/bn_IN.po +@@ -2894,8 +2894,8 @@ msgstr "উইন্ডো বন্ধ করুন (_l)" + #~ msgid "_Unlimited" + #~ msgstr "সীমাহীন (_U)" + +-#~ msgid "Set Title" +-#~ msgstr "শিরোনাম নির্ধারণ করুন" ++msgid "Set Title" ++msgstr "শিরোনাম নির্ধারণ করুন" + + #~ msgid "Switch to Tab 3" + #~ msgstr "ট্যাব ৩-এ পরিবর্তন করুন" +@@ -2936,5 +2936,8 @@ msgstr "উইন্ডো বন্ধ করুন (_l)" + #~ msgid "_Input Methods" + #~ msgstr "ইনপুট পদ্ধতি (_I)" + +-#~ msgid "_Title:" +-#~ msgstr "শিরোনাম: (_T)" ++msgid "_Title:" ++msgstr "শিরোনাম: (_T)" ++ ++msgid "Transparent background" ++msgstr "স্বচ্চ পটভূমি " diff --git a/po/br.po b/po/br.po -index e16ea07dfc21..f4cbe857d5ca 100644 +index e16ea07d..f4cbe857 100644 --- a/po/br.po +++ b/po/br.po @@ -958,8 +958,8 @@ msgid "_Base on:" @@ -2405,7 +2432,7 @@ index e16ea07dfc21..f4cbe857d5ca 100644 #: ../src/profile-preferences.glade.h:74 diff --git a/po/bs.po b/po/bs.po -index 49e710859ac9..8703552984b1 100644 +index 49e71085..87035529 100644 --- a/po/bs.po +++ b/po/bs.po @@ -680,6 +680,10 @@ msgstr "Kratica tastature za povećavanje fonta" @@ -2430,14 +2457,13 @@ index 49e710859ac9..8703552984b1 100644 +msgid "Set Title" +msgstr "Postavi naslov" diff --git a/po/ca.po b/po/ca.po -index d203c31406ea..a1d47c69679d 100644 +index 6db2cd03..4315b2fb 100644 --- a/po/ca.po +++ b/po/ca.po -@@ -2490,3 +2490,15 @@ msgstr "Tanca la _finestra" +@@ -2428,3 +2428,14 @@ msgstr "Tanca la _finestra" + msgid "Failed to parse arguments: %s\n" + msgstr "Ha fallat l'anàlisi dels arguments: %s\n" - #~ msgid "_Detach Tab" - #~ msgstr "_Separa la pestanya" -+ +msgid "Transparent background" +msgstr "Fons transparent" + @@ -2450,7 +2476,7 @@ index d203c31406ea..a1d47c69679d 100644 +msgid "Set Title" +msgstr "Estableix el títol" diff --git a/po/ca@valencia.po b/po/ca@valencia.po -index a6e8fb4250dc..c9ed8508228d 100644 +index a6e8fb42..c9ed8508 100644 --- a/po/ca@valencia.po +++ b/po/ca@valencia.po @@ -2357,3 +2357,15 @@ msgstr "Tanca la _finestra" @@ -2470,13 +2496,13 @@ index a6e8fb4250dc..c9ed8508228d 100644 +msgid "Set Title" +msgstr "Estableix el títol" diff --git a/po/cs.po b/po/cs.po -index f0cf6b424ae0..873c127e0f84 100644 +index 1beaf216..f27be077 100644 --- a/po/cs.po +++ b/po/cs.po -@@ -2422,3 +2422,15 @@ msgstr "" - #: src/terminal-window.c:3224 - msgid "C_lose Window" - msgstr "_Zavřít okno" +@@ -2452,3 +2452,15 @@ msgstr "_Zavřít okno" + #, c-format + msgid "Failed to parse arguments: %s\n" + msgstr "Selhala analýza argumentů: %s\n" + +msgid "Transparent background" +msgstr "Průsvitné pozadí" @@ -2490,7 +2516,7 @@ index f0cf6b424ae0..873c127e0f84 100644 +msgid "Set Title" +msgstr "Nastavit záhlaví" diff --git a/po/cy.po b/po/cy.po -index 644df82363f1..cd862feb50c0 100644 +index 644df823..cd862feb 100644 --- a/po/cy.po +++ b/po/cy.po @@ -1167,8 +1167,8 @@ msgid "_Base on:" @@ -2516,10 +2542,10 @@ index 644df82363f1..cd862feb50c0 100644 #: ../src/profile-preferences.glade.h:74 msgid "_Update login records when command is launched" diff --git a/po/da.po b/po/da.po -index eb21daa279ef..edebccb48e90 100644 +index 8ca75914..a27a354f 100644 --- a/po/da.po +++ b/po/da.po -@@ -2459,3 +2459,15 @@ msgstr "_Luk vindue" +@@ -2488,3 +2488,15 @@ msgstr "Kunne ikke fortolke argumenter: %s\n" #~ msgid "_Detach Tab" #~ msgstr "_Løsriv faneblad" @@ -2536,10 +2562,10 @@ index eb21daa279ef..edebccb48e90 100644 +msgid "Transparent background" +msgstr "Gennemsigtig baggrund" diff --git a/po/de.po b/po/de.po -index c123573f0cf1..6e40b82edea4 100644 +index 4b88ee94..62067cd2 100644 --- a/po/de.po +++ b/po/de.po -@@ -2538,3 +2538,15 @@ msgstr "Fenster _schließen" +@@ -2578,3 +2578,15 @@ msgstr "Einlesen der Argumente schlug fehl: %s\n" #~ msgid "_Quit" #~ msgstr "_Beenden" @@ -2556,7 +2582,7 @@ index c123573f0cf1..6e40b82edea4 100644 +msgid "Transparent background" +msgstr "Transparenter Hintergrund" diff --git a/po/dz.po b/po/dz.po -index d97e6102b850..a768fe4adc54 100644 +index d97e6102..a768fe4a 100644 --- a/po/dz.po +++ b/po/dz.po @@ -1255,8 +1255,8 @@ msgid "_Base on:" @@ -2582,10 +2608,10 @@ index d97e6102b850..a768fe4adc54 100644 #: ../src/profile-preferences.glade.h:78 #, fuzzy diff --git a/po/el.po b/po/el.po -index 3e44ba5d24f6..f93ecb561ef4 100644 +index a82659e6..d814147c 100644 --- a/po/el.po +++ b/po/el.po -@@ -2888,17 +2888,17 @@ msgstr "Κ_λείσιμο παραθύρου" +@@ -2915,17 +2915,17 @@ msgstr "Αποτυχία ανάλυσης των ορισμάτων: %s\n" #~ msgid "Default size:" #~ msgstr "Προεπιλεγμένο μέγεθος:" @@ -2609,7 +2635,7 @@ index 3e44ba5d24f6..f93ecb561ef4 100644 #~ msgid "Current Locale" #~ msgstr "Τρέχουσα τοπική ρύθμιση" -@@ -2936,3 +2936,6 @@ msgstr "Κ_λείσιμο παραθύρου" +@@ -2963,3 +2963,6 @@ msgstr "Αποτυχία ανάλυσης των ορισμάτων: %s\n" #~ msgid "_Input Methods" #~ msgstr "_Μέθοδοι εισαγωγής" @@ -2617,7 +2643,7 @@ index 3e44ba5d24f6..f93ecb561ef4 100644 +msgid "Transparent background" +msgstr "Διάφανο παρασκήνιο" diff --git a/po/en@shaw.po b/po/en@shaw.po -index 5bdb39250e53..6fb8a7e1c3bb 100644 +index 5bdb3925..6fb8a7e1 100644 --- a/po/en@shaw.po +++ b/po/en@shaw.po @@ -1212,8 +1212,8 @@ msgid "_Base on:" @@ -2643,7 +2669,7 @@ index 5bdb39250e53..6fb8a7e1c3bb 100644 #: ../src/profile-preferences.glade.h:79 msgid "_Underline color:" diff --git a/po/en_CA.po b/po/en_CA.po -index 6c9e0cd73d63..db4aa891dd45 100644 +index 6c9e0cd7..db4aa891 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -219,8 +219,8 @@ msgid "Background" @@ -2669,10 +2695,10 @@ index 6c9e0cd73d63..db4aa891dd45 100644 #: ../src/gnome-terminal.glade2.h:87 msgid "_Update login records when command is launched" diff --git a/po/en_GB.po b/po/en_GB.po -index d2542ff7db4a..dc3bdf23ca9e 100644 +index 2d112348..675cdb3d 100644 --- a/po/en_GB.po +++ b/po/en_GB.po -@@ -2828,8 +2828,8 @@ msgstr "C_lose Window" +@@ -2858,8 +2858,8 @@ msgstr "Failed to parse arguments: %s\n" #~ msgid "Default size:" #~ msgstr "Default size:" @@ -2683,7 +2709,7 @@ index d2542ff7db4a..dc3bdf23ca9e 100644 #~ msgid "When terminal commands set their o_wn titles:" #~ msgstr "When terminal commands set their o_wn titles:" -@@ -2846,8 +2846,8 @@ msgstr "C_lose Window" +@@ -2876,8 +2876,8 @@ msgstr "Failed to parse arguments: %s\n" #~ msgid "_Unlimited" #~ msgstr "_Unlimited" @@ -2694,7 +2720,7 @@ index d2542ff7db4a..dc3bdf23ca9e 100644 #~ msgid "Switch to Tab 3" #~ msgstr "Switch to Tab 3" -@@ -2888,8 +2888,8 @@ msgstr "C_lose Window" +@@ -2918,8 +2918,8 @@ msgstr "Failed to parse arguments: %s\n" #~ msgid "_Input Methods" #~ msgstr "_Input Methods" @@ -2705,7 +2731,7 @@ index d2542ff7db4a..dc3bdf23ca9e 100644 #~ msgid "Add or Remove Terminal Encodings" #~ msgstr "Add or Remove Terminal Encodings" -@@ -3584,8 +3584,8 @@ msgstr "C_lose Window" +@@ -3614,8 +3614,8 @@ msgstr "Failed to parse arguments: %s\n" #~ msgid "Background image _scrolls" #~ msgstr "Background image _scrolls" @@ -2717,7 +2743,7 @@ index d2542ff7db4a..dc3bdf23ca9e 100644 #~ msgid "S_hade transparent or image background:" #~ msgstr "S_hade transparent or image background:" diff --git a/po/eo.po b/po/eo.po -index 0e83b981753b..0d98ea57c90a 100644 +index 0e83b981..0d98ea57 100644 --- a/po/eo.po +++ b/po/eo.po @@ -2827,8 +2827,8 @@ msgstr "_Fermi la fenestron" @@ -2743,10 +2769,10 @@ index 0e83b981753b..0d98ea57c90a 100644 #~ msgid "On the left side" #~ msgstr "Maldekstre" diff --git a/po/es.po b/po/es.po -index 4a169d0d76ff..2a38bed154bf 100644 +index 3e9b3d37..905a24f5 100644 --- a/po/es.po +++ b/po/es.po -@@ -2889,17 +2889,17 @@ msgstr "_Cerrar ventana" +@@ -2921,17 +2921,17 @@ msgstr "Falló al analizar los argumentos: %s\n" #~ msgid "Default size:" #~ msgstr "Tamaño predeterminado:" @@ -2770,7 +2796,7 @@ index 4a169d0d76ff..2a38bed154bf 100644 #~ msgid "Current Locale" #~ msgstr "Configuración regional actual" -@@ -3725,8 +3725,8 @@ msgstr "_Cerrar ventana" +@@ -3757,8 +3757,8 @@ msgstr "Falló al analizar los argumentos: %s\n" #~ msgid "_Solid color" #~ msgstr "Color _sólido" @@ -2782,7 +2808,7 @@ index 4a169d0d76ff..2a38bed154bf 100644 #~ msgid "No such profile \"%s\", using default profile\n" #~ msgstr "No existe el perfil «%s», usando el perfil predeterminado\n" diff --git a/po/et.po b/po/et.po -index 4b1c2a7c67e4..770761168806 100644 +index 4b1c2a7c..77076116 100644 --- a/po/et.po +++ b/po/et.po @@ -1747,3 +1747,6 @@ msgstr "Su_lge aken" @@ -2793,10 +2819,10 @@ index 4b1c2a7c67e4..770761168806 100644 +msgid "Transparent background" +msgstr "Läbipaistev taust" diff --git a/po/eu.po b/po/eu.po -index eaf053b7395d..d657371ac667 100644 +index 56f3f1df..6d9680dc 100644 --- a/po/eu.po +++ b/po/eu.po -@@ -2333,3 +2333,15 @@ msgstr "It_xi leihoa" +@@ -2366,3 +2366,15 @@ msgstr "Huts egin du argumentuak analizatzean: %s\n" #~ msgid "_Detach Tab" #~ msgstr "_Desuztartu fitxa" @@ -2813,10 +2839,10 @@ index eaf053b7395d..d657371ac667 100644 +msgid "Transparent background" +msgstr "Atzeko plano gardena" diff --git a/po/fa.po b/po/fa.po -index 320667da5c90..af24d78d8acc 100644 +index 70ffa07d..8b746710 100644 --- a/po/fa.po +++ b/po/fa.po -@@ -2773,8 +2773,8 @@ msgstr "_بستن پنجره" +@@ -2793,8 +2793,8 @@ msgstr "تجزیهٔ آرگومان‌ها ممکن نبود: %s\n" #~ msgid "Use custom default terminal si_ze" #~ msgstr "استفاده از اندازه‌ی _سفارشی پایانه‌ی پیش‌فرض" @@ -2827,7 +2853,7 @@ index 320667da5c90..af24d78d8acc 100644 #~ msgid "When terminal commands set their o_wn titles:" #~ msgstr "وقتی که فرمان‌های پایانه عنوان‌های _خودشان را تنظیم می‌کنند:" -@@ -2788,8 +2788,8 @@ msgstr "_بستن پنجره" +@@ -2808,8 +2808,8 @@ msgstr "تجزیهٔ آرگومان‌ها ممکن نبود: %s\n" #~ msgid "_Unlimited" #~ msgstr "_نامحدود" @@ -2838,7 +2864,7 @@ index 320667da5c90..af24d78d8acc 100644 #~ msgid "Switch to Tab 3" #~ msgstr "تعویض به زبانه‌ی ۳" -@@ -2830,5 +2830,8 @@ msgstr "_بستن پنجره" +@@ -2850,5 +2850,8 @@ msgstr "تجزیهٔ آرگومان‌ها ممکن نبود: %s\n" #~ msgid "_Input Methods" #~ msgstr "روش‌های _ورودی" @@ -2850,10 +2876,10 @@ index 320667da5c90..af24d78d8acc 100644 +msgid "Transparent background" +msgstr "پس‌زمینه‌ی شفاف" diff --git a/po/fi.po b/po/fi.po -index 72581abb7462..2b1efadccd42 100644 +index 28f05dbd..ba5995c9 100644 --- a/po/fi.po +++ b/po/fi.po -@@ -2751,9 +2751,21 @@ msgstr "_Sulje ikkuna" +@@ -2782,9 +2782,21 @@ msgstr "Virhe tulkittaessa argumentteja: %s\n" #~ msgid "_Update login records when command is launched" #~ msgstr "_Päivitä kirjautumistallenne kun komento käynnistetään" @@ -2876,13 +2902,25 @@ index 72581abb7462..2b1efadccd42 100644 +msgid "Set Title" +msgstr "Aseta otsikko" diff --git a/po/fr.po b/po/fr.po -index 44bdeb2c7520..ba398e4f3c04 100644 +index 3a9ee71e..64d56414 100644 --- a/po/fr.po +++ b/po/fr.po -@@ -2513,3 +2513,15 @@ msgstr "Fermer _la fenêtre" +@@ -2533,3 +2533,27 @@ msgstr "Impossible d’analyser les paramètres : %s\n" - #~ msgid "_Detach Tab" - #~ msgstr "_Détacher l’onglet" + #~ msgid "Icelandic" + #~ msgstr "Islandais" ++ ++#~ msgid "Set _Character Encoding" ++#~ msgstr "_Définir le codage des caractères" ++ ++#~ msgid "Move Tab _Left" ++#~ msgstr "Déplacer l’onglet vers la _gauche" ++ ++#~ msgid "Move Tab _Right" ++#~ msgstr "Déplacer l’onglet vers la _droite" ++ ++#~ msgid "_Detach Tab" ++#~ msgstr "_Détacher l’onglet" + +msgid "Transparent background" +msgstr "Arrière-plan transparent" @@ -2896,10 +2934,10 @@ index 44bdeb2c7520..ba398e4f3c04 100644 +msgid "Set Title" +msgstr "Définir le titre" diff --git a/po/fur.po b/po/fur.po -index ced8f56677f7..c869f85f66ee 100644 +index edbba329..87755fc1 100644 --- a/po/fur.po +++ b/po/fur.po -@@ -545,6 +545,10 @@ msgstr "" +@@ -557,6 +557,10 @@ msgstr "" msgid "Which encoding to use" msgstr "Codifiche di doprâ" @@ -2910,7 +2948,7 @@ index ced8f56677f7..c869f85f66ee 100644 #: src/org.gnome.Terminal.gschema.xml:350 msgid "" "Whether ambiguous-width characters are narrow or wide when using UTF-8 " -@@ -3546,6 +3550,9 @@ msgstr "_Siere barcon" +@@ -3576,6 +3580,9 @@ msgstr "Analisi dai argoments falide: %s\n" #~ msgid "The text you clicked on doesn't seem to be a valid OTP challenge." #~ msgstr "Il test fracât nol samee jessi un OTP challenge." @@ -2920,7 +2958,7 @@ index ced8f56677f7..c869f85f66ee 100644 #~ msgid "Switch to Tab 3" #~ msgstr "Passe a la schede 3" -@@ -3601,8 +3608,8 @@ msgstr "_Siere barcon" +@@ -3631,8 +3638,8 @@ msgstr "Analisi dai argoments falide: %s\n" #~ msgid "_Input Methods" #~ msgstr "_Cemût inserî test" @@ -2932,7 +2970,7 @@ index ced8f56677f7..c869f85f66ee 100644 #~ msgid "" #~ "text/plain dropped on terminal had wrong format (%d) or length (%d)\n" diff --git a/po/ga.po b/po/ga.po -index 93d5fa9d1481..feb87dce3d6b 100644 +index 93d5fa9d..feb87dce 100644 --- a/po/ga.po +++ b/po/ga.po @@ -1925,3 +1925,6 @@ msgstr "_Dún Fuinneog" @@ -2943,13 +2981,13 @@ index 93d5fa9d1481..feb87dce3d6b 100644 +msgid "Transparent background" +msgstr "Cúlra trédhearcach" diff --git a/po/gl.po b/po/gl.po -index d411ea4f1347..f8a48d82635c 100644 +index 00325496..8c6f3472 100644 --- a/po/gl.po +++ b/po/gl.po -@@ -2445,3 +2445,15 @@ msgstr "" - #: src/terminal-window.c:3224 - msgid "C_lose Window" - msgstr "P_echar a xanela" +@@ -2480,3 +2480,15 @@ msgstr "P_echar a xanela" + #, c-format + msgid "Failed to parse arguments: %s\n" + msgstr "Produciuse un erro ao analizar os argumentos: %s\n" + +msgid "Title" +msgstr "Título" @@ -2963,7 +3001,7 @@ index d411ea4f1347..f8a48d82635c 100644 +msgid "Transparent background" +msgstr "Fondo transparente" diff --git a/po/gu.po b/po/gu.po -index 76b459cf8dc5..485beeac98b7 100644 +index 76b459cf..485beeac 100644 --- a/po/gu.po +++ b/po/gu.po @@ -2155,8 +2155,8 @@ msgstr "વિન્ડો બંધ કરો (_l)" @@ -3011,10 +3049,10 @@ index 76b459cf8dc5..485beeac98b7 100644 #~ msgid "No such profile \"%s\", using default profile\n" #~ msgstr "\"%s\" જેવી કોઈ રૂપરેખા નથી, મૂળભૂત રૂપરેખા વાપરી રહ્યા છે\n" diff --git a/po/he.po b/po/he.po -index ad00c9109e41..82fc3c9573e1 100644 +index 5fbb458f..28c6e0cb 100644 --- a/po/he.po +++ b/po/he.po -@@ -2769,17 +2769,17 @@ msgstr "סגירת ה_חלון" +@@ -2797,17 +2797,17 @@ msgstr "Failed to parse arguments: %s\n" #~ msgid "Default size:" #~ msgstr "גודל בררת מחדל:" @@ -3038,7 +3076,7 @@ index ad00c9109e41..82fc3c9573e1 100644 #~ msgid "Current Locale" #~ msgstr "השפה הנוכחית" -@@ -3591,8 +3591,8 @@ msgstr "סגירת ה_חלון" +@@ -3621,8 +3621,8 @@ msgstr "Failed to parse arguments: %s\n" #~ msgid "_Solid color" #~ msgstr "צבע _אחיד" @@ -3050,7 +3088,7 @@ index ad00c9109e41..82fc3c9573e1 100644 #~ msgid "No such profile \"%s\", using default profile\n" #~ msgstr "No such profile \"%s\", using default profile\n" diff --git a/po/hi.po b/po/hi.po -index 2d7dc5b14008..8d3d0529df61 100644 +index 2d7dc5b1..8d3d0529 100644 --- a/po/hi.po +++ b/po/hi.po @@ -2267,9 +2267,8 @@ msgstr "विंडो बंद करें (_l)" @@ -3099,10 +3137,10 @@ index 2d7dc5b14008..8d3d0529df61 100644 #~ msgid "S/Key Challenge Response" #~ msgstr "एस/कुंजी चैलेंज प्रतिक्रिया" diff --git a/po/hr.po b/po/hr.po -index 8cb0df752f2f..d7f96a287470 100644 +index 0c65eca2..1472cbb1 100644 --- a/po/hr.po +++ b/po/hr.po -@@ -2737,3 +2737,13 @@ msgstr "_Zatvori prozor" +@@ -2763,3 +2763,13 @@ msgstr "Greška u obradi argumenata: %s\n" #~ msgid "Use transparency from system theme" #~ msgstr "Koristi prozirnost iz teme sustava" @@ -3117,13 +3155,13 @@ index 8cb0df752f2f..d7f96a287470 100644 +msgid "Set Title" +msgstr "Postavi naslov" diff --git a/po/hu.po b/po/hu.po -index 9142e00ab1ac..33ff34110e05 100644 +index d34ab531..0ff0e9e0 100644 --- a/po/hu.po +++ b/po/hu.po -@@ -2433,3 +2433,15 @@ msgstr "" - #: src/terminal-window.c:3224 - msgid "C_lose Window" - msgstr "_Ablak bezárása" +@@ -2403,3 +2403,15 @@ msgstr "_Ablak bezárása" + #, c-format + msgid "Failed to parse arguments: %s\n" + msgstr "A paraméterek feldolgozása meghiúsult: %s\n" + +msgid "Title" +msgstr "Cím" @@ -3137,7 +3175,7 @@ index 9142e00ab1ac..33ff34110e05 100644 +msgid "Transparent background" +msgstr "Áttetsző háttér" diff --git a/po/hy.po b/po/hy.po -index aaf2d9b292da..4d466f164420 100644 +index aaf2d9b2..4d466f16 100644 --- a/po/hy.po +++ b/po/hy.po @@ -757,8 +757,8 @@ msgid "_Base on:" @@ -3163,10 +3201,10 @@ index aaf2d9b292da..4d466f164420 100644 #: ../src/profile-preferences.glade.h:74 msgid "_Update login records when command is launched" diff --git a/po/id.po b/po/id.po -index 5e3f3617dbe8..9df577e3edfe 100644 +index 1f906ac1..4fd3f448 100644 --- a/po/id.po +++ b/po/id.po -@@ -2442,3 +2442,15 @@ msgstr "Tutup Jende_la" +@@ -2474,3 +2474,15 @@ msgstr "Gagal mengurai argumen: \"%s\"\n" #~ msgid "_Detach Tab" #~ msgstr "_Pisahkan Tab" @@ -3183,13 +3221,13 @@ index 5e3f3617dbe8..9df577e3edfe 100644 +msgid "Set Title" +msgstr "Atur Judul" diff --git a/po/it.po b/po/it.po -index 3d6e7f02c168..d9560a1a5b1c 100644 +index c559a981..a69b00e5 100644 --- a/po/it.po +++ b/po/it.po -@@ -2459,3 +2459,15 @@ msgstr "" - #: src/terminal-window.c:3224 - msgid "C_lose Window" - msgstr "Chiudi _finestra" +@@ -2428,3 +2428,15 @@ msgstr "Chiudi _finestra" + #, c-format + msgid "Failed to parse arguments: %s\n" + msgstr "Analisi degli argomenti non riuscita: %s\n" + +msgid "Transparent background" +msgstr "Sfondo trasparente" @@ -3203,7 +3241,7 @@ index 3d6e7f02c168..d9560a1a5b1c 100644 +msgid "Set Title" +msgstr "Imposta titolo" diff --git a/po/ja.po b/po/ja.po -index ab72bc42e70b..690281a6713e 100644 +index ab72bc42..690281a6 100644 --- a/po/ja.po +++ b/po/ja.po @@ -2534,3 +2534,15 @@ msgstr "ウィンドウを閉じる(_L)" @@ -3223,34 +3261,26 @@ index ab72bc42e70b..690281a6713e 100644 +msgid "Set Title" +msgstr "タイトルを設定する" diff --git a/po/ka.po b/po/ka.po -index e0dd79f280a2..887d395ce150 100644 +index 601364e5..3ceb5c20 100644 --- a/po/ka.po +++ b/po/ka.po -@@ -219,8 +219,8 @@ msgid "Background" - msgstr "ფონი" - - #: ../src/gnome-terminal.glade2.h:3 --msgid "Command" --msgstr "ბრძანება" -+msgid "Command" -+msgstr "ბრძანება" +@@ -90,6 +90,11 @@ msgstr "პროფილის ადამიანისთვის-სა + msgid "Human-readable name of the profile." + msgstr "პროფილის ადამიანისთვის-სასიამოვნო წასაკითხი სახელი." - #: ../src/gnome-terminal.glade2.h:4 - msgid "Compatibility" -@@ -569,7 +569,7 @@ msgstr "_ტექსტის ფერი:" - - #: ../src/gnome-terminal.glade2.h:86 - #, fuzzy --msgid "_Transparent background" ++#: ../src/gnome-terminal.glade2.h:86 ++#, fuzzy +msgid "Transparent background" - msgstr "გამჭირვალე" - - #: ../src/gnome-terminal.glade2.h:87 ++msgstr "გამჭირვალე" ++ + #: src/org.gnome.Terminal.gschema.xml:139 + msgid "Default color of text in the terminal" + msgstr "ტერმინალის ტექსტის ნაგულისხმები ფერი" diff --git a/po/kk.po b/po/kk.po -index d2487add3897..a2beab5fa3f6 100644 +index 34ce6b2a..5d415eb3 100644 --- a/po/kk.po +++ b/po/kk.po -@@ -2712,3 +2712,15 @@ msgstr "Терезені жа_бу" +@@ -2741,3 +2741,15 @@ msgstr "Аргументтерді өндеу қатемен аяқталды: % #~ msgid "Be quiet" #~ msgstr "Тыныш болу" @@ -3267,7 +3297,7 @@ index d2487add3897..a2beab5fa3f6 100644 +msgid "Set Title" +msgstr "Атауын орнату" diff --git a/po/km.po b/po/km.po -index 352897d2963b..b6db9394a307 100644 +index 352897d2..b6db9394 100644 --- a/po/km.po +++ b/po/km.po @@ -2909,8 +2909,8 @@ msgstr "បិទ​បង្អួច" @@ -3282,7 +3312,7 @@ index 352897d2963b..b6db9394a307 100644 #~ msgid "S_hade transparent or image background:" #~ msgstr "ដាក់​ស្រមោល​ផ្ទៃខាងក្រោយ​ថ្លា ឬ​ផ្ទៃខាងក្រោយ​​រូបភាព ៖" diff --git a/po/kn.po b/po/kn.po -index c887f88a2c87..0fc1c3139258 100644 +index c887f88a..0fc1c313 100644 --- a/po/kn.po +++ b/po/kn.po @@ -2261,8 +2261,8 @@ msgstr "ಕಿಟಕಿಯನ್ನು ಮುಚ್ಚು (_l)" @@ -3319,10 +3349,10 @@ index c887f88a2c87..0fc1c3139258 100644 +msgid "Transparent background" +msgstr "ಪಾರದರ್ಶಕ ಹಿನ್ನಲೆ" diff --git a/po/ko.po b/po/ko.po -index 8bddfb9141b8..0d37503a81f7 100644 +index 69cb4516..b9b7d7de 100644 --- a/po/ko.po +++ b/po/ko.po -@@ -2474,3 +2474,15 @@ msgstr "창 닫기(_L)" +@@ -2508,3 +2508,15 @@ msgstr "인자 파싱에 실패했습니다: %s\n" #~ msgid "Verbose output" #~ msgstr "많이 출력" @@ -3339,7 +3369,7 @@ index 8bddfb9141b8..0d37503a81f7 100644 +msgid "Set Title" +msgstr "제목 설정" diff --git a/po/ku.po b/po/ku.po -index bc2bb7f03de4..d2a83a007097 100644 +index bc2bb7f0..d2a83a00 100644 --- a/po/ku.po +++ b/po/ku.po @@ -223,8 +223,8 @@ msgid "Background" @@ -3365,10 +3395,10 @@ index bc2bb7f03de4..d2a83a007097 100644 #: ../src/gnome-terminal.glade2.h:87 msgid "_Update login records when command is launched" diff --git a/po/lt.po b/po/lt.po -index 3c62d2ffab11..11a04aa72fc5 100644 +index c2729c2f..55165274 100644 --- a/po/lt.po +++ b/po/lt.po -@@ -2739,3 +2739,15 @@ msgstr "_Užverti langą" +@@ -2770,3 +2770,15 @@ msgstr "Nepavyko apdoroti argumentų: %s\n" #~ msgid "Whether to use a dark theme variant" #~ msgstr "Ar naudoti tamsų temos variantą" @@ -3385,10 +3415,10 @@ index 3c62d2ffab11..11a04aa72fc5 100644 +msgid "Set Title" +msgstr "Nustatyti pavadinimą" diff --git a/po/lv.po b/po/lv.po -index 57637022c2ee..d495e18ac27a 100644 +index dd601873..1544e268 100644 --- a/po/lv.po +++ b/po/lv.po -@@ -2691,3 +2691,19 @@ msgstr "Aizvērt _logu" +@@ -2715,3 +2715,19 @@ msgstr "Neizdevās parsēt parametrus — “%s”\n" #~ msgid "_Add or Remove…" #~ msgstr "_Pievienot vai izņemt…" @@ -3409,7 +3439,7 @@ index 57637022c2ee..d495e18ac27a 100644 +msgid "Set Title" +msgstr "Iestatīt nosaukumu" diff --git a/po/mai.po b/po/mai.po -index 715d0b9e1c82..0f31634e4f2e 100644 +index 715d0b9e..0f31634e 100644 --- a/po/mai.po +++ b/po/mai.po @@ -1044,8 +1044,8 @@ msgid "_Base on:" @@ -3435,7 +3465,7 @@ index 715d0b9e1c82..0f31634e4f2e 100644 #: ../src/profile-preferences.glade.h:70 msgid "_Update login records when command is launched" diff --git a/po/mg.po b/po/mg.po -index 99fa0f5e4059..a216602569af 100644 +index 99fa0f5e..a2166025 100644 --- a/po/mg.po +++ b/po/mg.po @@ -220,8 +220,8 @@ msgid "Background" @@ -3461,7 +3491,7 @@ index 99fa0f5e4059..a216602569af 100644 #: ../src/gnome-terminal.glade2.h:87 msgid "_Update login records when command is launched" diff --git a/po/mk.po b/po/mk.po -index 4fe43192fe57..a5a874b49c59 100644 +index 4fe43192..a5a874b4 100644 --- a/po/mk.po +++ b/po/mk.po @@ -863,8 +863,8 @@ msgid "_Base on:" @@ -3487,7 +3517,7 @@ index 4fe43192fe57..a5a874b49c59 100644 #: ../src/profile-preferences.glade.h:78 #| msgid "_Text color:" diff --git a/po/ml.po b/po/ml.po -index 296149701e1f..e3bce1225738 100644 +index 29614970..e3bce122 100644 --- a/po/ml.po +++ b/po/ml.po @@ -2577,3 +2577,6 @@ msgstr "ജാലകം അടയ്ക്കുക (_l)" @@ -3498,7 +3528,7 @@ index 296149701e1f..e3bce1225738 100644 +msgid "Transparent background" +msgstr "പുറകിലുള്ളവ കാണാവുന്ന പശ്ചാത്തലം" diff --git a/po/mn.po b/po/mn.po -index 2f9d86072d1c..09c4437d10f9 100644 +index 2f9d8607..09c4437d 100644 --- a/po/mn.po +++ b/po/mn.po @@ -217,8 +217,8 @@ msgid "Background" @@ -3524,7 +3554,7 @@ index 2f9d86072d1c..09c4437d10f9 100644 #: ../src/gnome-terminal.glade2.h:103 msgid "_Update login records when command is launched" diff --git a/po/mr.po b/po/mr.po -index 61997dafbd03..9c7dc77abd22 100644 +index 61997daf..9c7dc77a 100644 --- a/po/mr.po +++ b/po/mr.po @@ -2219,8 +2219,8 @@ msgstr "चौकट बंद करा (_l)" @@ -3572,7 +3602,7 @@ index 61997dafbd03..9c7dc77abd22 100644 #~ msgid "Disabled" #~ msgstr "अकार्यान्वीतित" diff --git a/po/ms.po b/po/ms.po -index 114f0d4e50c2..5d3f2e011f1c 100644 +index 114f0d4e..5d3f2e01 100644 --- a/po/ms.po +++ b/po/ms.po @@ -2717,8 +2717,8 @@ msgstr "T_utup Tetingkap" @@ -3587,13 +3617,13 @@ index 114f0d4e50c2..5d3f2e011f1c 100644 #~ msgid "_Update login records when command is launched" #~ msgstr "_Kemaskini rekod logmasuk bila arahan dilancarkan" diff --git a/po/nb.po b/po/nb.po -index e48f82b..4a311f7 100644 +index 99cb5599..5b1a79ad 100644 --- a/po/nb.po +++ b/po/nb.po -@@ -2406,3 +2406,15 @@ msgstr "" - #: src/terminal-window.c:3224 - msgid "C_lose Window" - msgstr "_Lukk vindu" +@@ -2436,3 +2436,15 @@ msgstr "_Lukk vindu" + #, c-format + msgid "Failed to parse arguments: %s\n" + msgstr "Klarte ikke å lese argumenter: %s\n" + +msgid "Transparent background" +msgstr "Gjennomsiktig bakgrunn" @@ -3607,7 +3637,7 @@ index e48f82b..4a311f7 100644 +msgid "Set Title" +msgstr "Sett tittel" diff --git a/po/nds.po b/po/nds.po -index 82f930b1cc0c..d52fbd94eb58 100644 +index 82f930b1..d52fbd94 100644 --- a/po/nds.po +++ b/po/nds.po @@ -748,8 +748,8 @@ msgid "_Base on:" @@ -3633,10 +3663,10 @@ index 82f930b1cc0c..d52fbd94eb58 100644 #: ../src/profile-preferences.glade.h:74 msgid "_Update login records when command is launched" diff --git a/po/ne.po b/po/ne.po -index 4fe16cc88a9a..53fb89134be0 100644 +index 992d7bad..7c560b83 100644 --- a/po/ne.po +++ b/po/ne.po -@@ -2398,8 +2398,8 @@ msgstr "सञ्झ्याल बन्द गर्नुहोस्" +@@ -2745,8 +2745,8 @@ msgstr "%sतर्कहरू पार्स गर्न असफल\n" #~ msgid "_None (use solid color)" #~ msgstr "कुनै पनि होइन (एउटै रङ प्रयोग गर्नुहोस्)" @@ -3647,18 +3677,17 @@ index 4fe16cc88a9a..53fb89134be0 100644 #~ msgid "_Use the system fixed width font" #~ msgstr "प्रणाली निश्चित गरिएको फन्ट चौडाइ प्रयोग गर्नुहोस्" -@@ -3052,8 +3052,8 @@ msgstr "सञ्झ्याल बन्द गर्नुहोस्" - #~ msgid "Close Tab" - #~ msgstr "ट्याब बन्द गर्नुहोस्" +@@ -3338,6 +3338,9 @@ msgstr "%sतर्कहरू पार्स गर्न असफल\n" + #~ msgid "The text you clicked on doesn't seem to be a valid OTP challenge." + #~ msgstr "तपाईँले क्लिक गरेको पाठ वैध OTP चुनौती नहुने देखिन्छ ।" --#~ msgid "Set Title" --#~ msgstr "शीर्षक सेट गर्नुहोस्" +msgid "Set Title" +msgstr "शीर्षक सेट गर्नुहोस्" ++ + #~ msgid "Switch to Tab 3" + #~ msgstr "ट्याब ३ मा स्विच गर्नुहोस्" - #~ msgid "Switch to Tab 2" - #~ msgstr "ट्याब २ मा स्विच गर्नुहोस्" -@@ -3232,8 +3232,8 @@ msgstr "सञ्झ्याल बन्द गर्नुहोस्" +@@ -3477,8 +3480,8 @@ msgstr "%sतर्कहरू पार्स गर्न असफल\n" #~ msgid "_Input Methods" #~ msgstr "आगत विधि" @@ -3667,13 +3696,13 @@ index 4fe16cc88a9a..53fb89134be0 100644 +msgid "_Title:" +msgstr "शीर्षक:" - #~ msgid "" - #~ "text/plain dropped on terminal had wrong format (%d) or length (%d)\n" + #~ msgid "text/plain dropped on terminal had wrong format (%d) or length (%d)\n" + #~ msgstr "टर्मिनलमा छोडिएको पाठ/सादा गलत ढाँचा (%d) वा लम्बाइ (%d)को थियो\n" diff --git a/po/nl.po b/po/nl.po -index b493d43bbbaf..e97079afacad 100644 +index cb6a5d2a..81f17d0f 100644 --- a/po/nl.po +++ b/po/nl.po -@@ -2776,3 +2776,15 @@ msgstr "Venster sl_uiten" +@@ -2808,3 +2808,15 @@ msgstr "Argumenten ontleden is mislukt: %s\n" #~ msgid "_Add or Remove…" #~ msgstr "_Toevoegen of verwijderen…" @@ -3690,7 +3719,7 @@ index b493d43bbbaf..e97079afacad 100644 +msgid "Transparent background" +msgstr "Transparante achtergrond" diff --git a/po/nn.po b/po/nn.po -index 5aa43b113ed9..f892290c256f 100644 +index 5aa43b11..f892290c 100644 --- a/po/nn.po +++ b/po/nn.po @@ -1149,8 +1149,8 @@ msgid "_Base on:" @@ -3716,10 +3745,10 @@ index 5aa43b113ed9..f892290c256f 100644 #: ../src/profile-preferences.glade.h:74 msgid "_Update login records when command is launched" diff --git a/po/oc.po b/po/oc.po -index 9a6f6186019a..6e51ea2f8980 100644 +index d7cddaec..7eab4a47 100644 --- a/po/oc.po +++ b/po/oc.po -@@ -2944,8 +2944,8 @@ msgstr "Tampar _la fenèstra" +@@ -3031,8 +3031,8 @@ msgstr "Impossible d'analisar los paramètres : %s\n" #~ msgid "Save as..." #~ msgstr "Enregistrar jos..." @@ -3730,7 +3759,7 @@ index 9a6f6186019a..6e51ea2f8980 100644 #~ msgid "_Detach tab" #~ msgstr "Des_tacar l'onglet" -@@ -3405,8 +3405,8 @@ msgstr "Tampar _la fenèstra" +@@ -3492,8 +3492,8 @@ msgstr "Impossible d'analisar los paramètres : %s\n" #~ msgid "_Use the system fixed width font" #~ msgstr "_Utilizar la poliça de chassa fixa del sistèma" @@ -3741,7 +3770,7 @@ index 9a6f6186019a..6e51ea2f8980 100644 #~ msgid "The shortcut key “%s” is already bound to the “%s” action" #~ msgstr "L'acorchi de clavièr « %s » es ja atribuit a l'accion « %s »" -@@ -3723,8 +3723,8 @@ msgstr "Tampar _la fenèstra" +@@ -3810,8 +3810,8 @@ msgstr "Impossible d'analisar los paramètres : %s\n" #~ msgid "Run;" #~ msgstr "Executar;Consòla;Shell;" @@ -3753,7 +3782,7 @@ index 9a6f6186019a..6e51ea2f8980 100644 #~ msgid "" #~ "A subset of possible encodings are presented in the Encoding submenu. " diff --git a/po/or.po b/po/or.po -index ec1e6bfb9a28..218acd712df6 100644 +index ec1e6bfb..218acd71 100644 --- a/po/or.po +++ b/po/or.po @@ -2705,8 +2705,8 @@ msgstr "ଶୀର୍ଷକ (_T):" @@ -3768,7 +3797,7 @@ index ec1e6bfb9a28..218acd712df6 100644 #~ msgid "S_hade transparent or image background:" #~ msgstr "ଛାୟା ସ୍ବଚ୍ଛ କିମ୍ବା ଚିତ୍ର ପୃଷ୍ଠଭୂମି (_h):" diff --git a/po/pa.po b/po/pa.po -index 1cb4b46dc2aa..2bdd01fecaab 100644 +index 1cb4b46d..2bdd01fe 100644 --- a/po/pa.po +++ b/po/pa.po @@ -2718,10 +2718,9 @@ msgstr "ਵਿੰਡੋ ਬੰਦ ਕਰੋ(_l)" @@ -3824,7 +3853,7 @@ index 1cb4b46dc2aa..2bdd01fecaab 100644 #~ msgid "S/Key Challenge Response" #~ msgstr "S/ਸਵਿੱਚ ਚੈਲੰਜ਼ ਜਵਾਬ" diff --git a/po/ps.po b/po/ps.po -index b25a2cb41712..3855b2f3423f 100644 +index b25a2cb4..3855b2f3 100644 --- a/po/ps.po +++ b/po/ps.po @@ -810,8 +810,8 @@ msgid "_Base on:" @@ -3850,10 +3879,10 @@ index b25a2cb41712..3855b2f3423f 100644 #: ../src/profile-preferences.glade.h:70 msgid "_Update login records when command is launched" diff --git a/po/pt.po b/po/pt.po -index d7af9e54ce22..f6f92cbeac5a 100644 +index 1ff7e2f3..6078ee79 100644 --- a/po/pt.po +++ b/po/pt.po -@@ -2938,11 +2938,11 @@ msgstr "Fechar jane_la" +@@ -2842,11 +2842,11 @@ msgstr "Falha ao processar argumentos: %s\n" #~ msgid "Default size:" #~ msgstr "Tamanho predefinido:" @@ -3869,7 +3898,7 @@ index d7af9e54ce22..f6f92cbeac5a 100644 #~ msgid "Title and Command" #~ msgstr "Título e comando" -@@ -2950,8 +2950,8 @@ msgstr "Fechar jane_la" +@@ -2854,8 +2854,8 @@ msgstr "Falha ao processar argumentos: %s\n" #~ msgid "_Unlimited" #~ msgstr "_Ilimitado" @@ -3880,7 +3909,7 @@ index d7af9e54ce22..f6f92cbeac5a 100644 #~ msgid "Current Locale" #~ msgstr "Configuração Regional Atual" -@@ -3705,8 +3705,8 @@ msgstr "Fechar jane_la" +@@ -3610,8 +3610,8 @@ msgstr "Falha ao processar argumentos: %s\n" #~ msgid "Background image _scrolls" #~ msgstr "Imagem de fundo _rola" @@ -3892,45 +3921,30 @@ index d7af9e54ce22..f6f92cbeac5a 100644 #~ msgid "S_hade transparent or image background:" #~ msgstr "Transparente som_breado ou imagem de fundo:" diff --git a/po/pt_BR.po b/po/pt_BR.po -index 4152306f6e0c..c8590c320d36 100644 +index dbdfda9e..f44ff3e7 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po -@@ -2858,17 +2858,17 @@ msgstr "_Fechar janela" - #~ msgid "Default size:" - #~ msgstr "Tamanho padrão:" - --#~ msgid "Title" --#~ msgstr "Título" +@@ -2482,3 +2482,15 @@ msgstr "_Fechar janela" + #, c-format + msgid "Failed to parse arguments: %s\n" + msgstr "Falha ao analisar os argumentos: %s\n" ++ +msgid "Title" +msgstr "Título" - --#~ msgid "_Title:" --#~ msgstr "_Título:" ++ +msgid "_Title:" +msgstr "_Título:" - - #~ msgid "Title and Command" - #~ msgstr "Título e comando" - --#~ msgid "Set Title" --#~ msgstr "Definir título" ++ +msgid "Set Title" +msgstr "Definir título" - - #~ msgid "Current Locale" - #~ msgstr "Codificação atual" -@@ -3494,3 +3494,6 @@ msgstr "_Fechar janela" - #~ "terminal poderão usar. Essa é a paleta, na forma de uma lista de nomes de " - #~ "cores separada por dois pontos. Os nomes de cores devem estar no formato " - #~ "hexadecimal. Exemplo: \"#FF00FF\"" + +msgid "Transparent background" +msgstr "Fundo transparente" diff --git a/po/ro.po b/po/ro.po -index 84030877e73a..cbe1e739889b 100644 +index 627aea90..14d04172 100644 --- a/po/ro.po +++ b/po/ro.po -@@ -3514,8 +3514,8 @@ msgstr "Î_nchide fereastra" +@@ -3545,8 +3545,8 @@ msgstr "Parsarea argumentelor a eșuat: %s\n" #~ msgid "_Solid color" #~ msgstr "Culoare _solidă" @@ -3942,10 +3956,10 @@ index 84030877e73a..cbe1e739889b 100644 #~ msgid "_Unlimited" #~ msgstr "_Neliminat" diff --git a/po/ru.po b/po/ru.po -index d6f6dd4f8279..814ba613679f 100644 +index bc423106..1d0cf58f 100644 --- a/po/ru.po +++ b/po/ru.po -@@ -2552,3 +2552,19 @@ msgstr "_Закрыть окно" +@@ -2749,3 +2749,19 @@ msgstr "Не удалось разобрать аргументы: %s\n" #~ msgid "_Add or Remove…" #~ msgstr "_Добавить или удалить…" @@ -3966,7 +3980,7 @@ index d6f6dd4f8279..814ba613679f 100644 +msgid "Set Title" +msgstr "Установить заголовок" diff --git a/po/rw.po b/po/rw.po -index 012f64e325c3..5ff633f8b3c2 100644 +index 012f64e3..5ff633f8 100644 --- a/po/rw.po +++ b/po/rw.po @@ -749,7 +749,7 @@ msgstr "Ibara ry'Inyandiko..." @@ -3987,7 +4001,7 @@ index 012f64e325c3..5ff633f8b3c2 100644 msgstr "Umutwe..." diff --git a/po/si.po b/po/si.po -index adca7d5acba9..6379cee7f0a3 100644 +index adca7d5a..6379cee7 100644 --- a/po/si.po +++ b/po/si.po @@ -218,8 +218,8 @@ msgid "Background" @@ -4013,10 +4027,10 @@ index adca7d5acba9..6379cee7f0a3 100644 #: ../src/gnome-terminal.glade2.h:87 msgid "_Update login records when command is launched" diff --git a/po/sk.po b/po/sk.po -index 765dcf2a034d..96bff962d86e 100644 +index e6745075..20d303c8 100644 --- a/po/sk.po +++ b/po/sk.po -@@ -3076,3 +3076,15 @@ msgstr "_Zavrieť okno" +@@ -3086,3 +3086,15 @@ msgstr "_Zavrieť okno" #~ "\n" #~ "Viac informácii o jednotlivých príkazoch získate pomocou „%s PRÍKAZ --" #~ "help“.\n" @@ -4033,42 +4047,27 @@ index 765dcf2a034d..96bff962d86e 100644 +msgid "Set Title" +msgstr "Nastaviť titulok" diff --git a/po/sl.po b/po/sl.po -index 3108543b2ed6..2f7d4b389da1 100644 +index ae803d9a..27a30070 100644 --- a/po/sl.po +++ b/po/sl.po -@@ -2836,17 +2836,17 @@ msgstr "_Zapri okno" - #~ msgid "Default size:" - #~ msgstr "Privzeta velikost:" - --#~ msgid "Title" --#~ msgstr "Naslov" +@@ -2378,3 +2378,15 @@ msgstr "_Zapri okno" + #, c-format + msgid "Failed to parse arguments: %s\n" + msgstr "Napaka med razčlenjevanjem argumentov: %s\n" ++ +msgid "Title" +msgstr "Naslov" - --#~ msgid "_Title:" --#~ msgstr "_Naziv:" ++ +msgid "_Title:" +msgstr "_Naziv:" - - #~ msgid "Title and Command" - #~ msgstr "Naziv in ukaz" - --#~ msgid "Set Title" --#~ msgstr "Določitev naziva okna" ++ +msgid "Set Title" +msgstr "Določitev naziva okna" - - #~ msgid "Current Locale" - #~ msgstr "Trenutne jezikovne nastavitve" -@@ -2961,3 +2961,6 @@ msgstr "_Zapri okno" - - #~ msgid "_Profile Preferences…" - #~ msgstr "Možnosti _profila ..." + +msgid "Transparent background" +msgstr "Prosojno ozadje" diff --git a/po/sq.po b/po/sq.po -index 158f6cb167cc..a3494fb70bd6 100644 +index 158f6cb1..a3494fb7 100644 --- a/po/sq.po +++ b/po/sq.po @@ -225,8 +225,8 @@ msgid "Background" @@ -4094,10 +4093,10 @@ index 158f6cb167cc..a3494fb70bd6 100644 #: ../src/gnome-terminal.glade2.h:86 msgid "_Update login records when command is launched" diff --git a/po/sr.po b/po/sr.po -index 64a3ca2ba635..a8e565c04333 100644 +index af7e13ed..b6ff94d7 100644 --- a/po/sr.po +++ b/po/sr.po -@@ -2746,10 +2746,9 @@ msgstr "_Затвори прозор" +@@ -2780,10 +2780,9 @@ msgstr "Нисам успео да обрадим аргументе: %s\n" #~ msgid "GNOME Terminal Client" #~ msgstr "Клијент Гномовог терминала" @@ -4111,7 +4110,7 @@ index 64a3ca2ba635..a8e565c04333 100644 #~ msgid "Title for terminal" #~ msgstr "Наслов за терминал" -@@ -2795,11 +2794,11 @@ msgstr "_Затвори прозор" +@@ -2829,11 +2828,11 @@ msgstr "Нисам успео да обрадим аргументе: %s\n" #~ msgid "Default size:" #~ msgstr "Основна величина:" @@ -4127,7 +4126,7 @@ index 64a3ca2ba635..a8e565c04333 100644 #~ msgid "Title and Command" #~ msgstr "Наслов и наредба" -@@ -2807,8 +2806,8 @@ msgstr "_Затвори прозор" +@@ -2841,8 +2840,8 @@ msgstr "Нисам успео да обрадим аргументе: %s\n" #~ msgid "_Unlimited" #~ msgstr "_Неограничено" @@ -4138,7 +4137,7 @@ index 64a3ca2ba635..a8e565c04333 100644 #~ msgid "Current Locale" #~ msgstr "Текући локалитет" -@@ -2818,3 +2817,6 @@ msgstr "_Затвори прозор" +@@ -2852,3 +2851,6 @@ msgstr "Нисам успео да обрадим аргументе: %s\n" #~ msgid "Hidden" #~ msgstr "Скривен" @@ -4146,7 +4145,7 @@ index 64a3ca2ba635..a8e565c04333 100644 +msgid "Transparent background" +msgstr "Провидна позадина" diff --git a/po/sr@latin.po b/po/sr@latin.po -index 45dbad07fba7..852c47cc6ee5 100644 +index 45dbad07..852c47cc 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po @@ -2576,10 +2576,9 @@ msgstr "_Zatvori prozor" @@ -4198,10 +4197,10 @@ index 45dbad07fba7..852c47cc6ee5 100644 +msgid "Transparent background" +msgstr "Providna pozadina" diff --git a/po/sv.po b/po/sv.po -index 5c5fa345c9ad..de87367421d7 100644 +index d0c3c812..6f4ec4f0 100644 --- a/po/sv.po +++ b/po/sv.po -@@ -2737,5 +2737,17 @@ msgstr "Stän_g fönster" +@@ -2778,5 +2778,17 @@ msgstr "Misslyckades med att tolka argument: %s\n" #~ msgid "Unknown completion request for \"%s\"" #~ msgstr "Okänd kompletteringsbegäran för \"%s\"" @@ -4220,7 +4219,7 @@ index 5c5fa345c9ad..de87367421d7 100644 +msgid "_Set Title…" +msgstr "A_nge titel..." diff --git a/po/ta.po b/po/ta.po -index 80aa2f684eec..afd335b0faf0 100644 +index 80aa2f68..afd335b0 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2171,10 +2171,9 @@ msgstr "_l சாளரத்தை மூடவும்" @@ -4287,7 +4286,7 @@ index 80aa2f684eec..afd335b0faf0 100644 #~ msgid "No such profile \"%s\", using default profile\n" #~ msgstr "\"%s\" என்ற வரியுரு கிடையாது, முன்னிருப்பு வரியுரு பயன்படுத்தப்படும்\n" diff --git a/po/te.po b/po/te.po -index 82c0e0fc8f54..0dd3d871f639 100644 +index 82c0e0fc..0dd3d871 100644 --- a/po/te.po +++ b/po/te.po @@ -2055,10 +2055,9 @@ msgstr "కిటికీని మూసివేయి (_l)" @@ -4351,7 +4350,7 @@ index 82c0e0fc8f54..0dd3d871f639 100644 #~ msgid "S_hade transparent or image background:" #~ msgstr "పారదర్శకంగా మారు లేదా చిత్రము బ్యాక్‌గ్రౌండ్ కు మారు(_h):" diff --git a/po/tg.po b/po/tg.po -index e3feef658e1e..6371c036626f 100644 +index e3feef65..6371c036 100644 --- a/po/tg.po +++ b/po/tg.po @@ -2158,23 +2158,23 @@ msgstr "П_ӯшонидани равзана" @@ -4387,7 +4386,7 @@ index e3feef658e1e..6371c036626f 100644 #~ msgid "_Next Tab" #~ msgstr "_Варақаи навбатӣ" diff --git a/po/th.po b/po/th.po -index 63263749655c..496da331bbf9 100644 +index 63263749..496da331 100644 --- a/po/th.po +++ b/po/th.po @@ -2308,23 +2308,23 @@ msgstr "ปิ_ดหน้าต่าง" @@ -4434,13 +4433,13 @@ index 63263749655c..496da331bbf9 100644 #~ msgid "" #~ "You already have a profile called “%s”. Do you want to create another " diff --git a/po/tr.po b/po/tr.po -index 3ac22937b896..bd971dd81d73 100644 +index 42b3bf22..062debe4 100644 --- a/po/tr.po +++ b/po/tr.po -@@ -2731,3 +2731,15 @@ msgstr "_Pencereyi Kapat" - - #~ msgid "_Same as text color" - #~ msgstr "_Metin rengiyle aynı" +@@ -2385,3 +2385,15 @@ msgstr "_Pencereyi Kapat" + #, c-format + msgid "Failed to parse arguments: %s\n" + msgstr "Bağımsız değişkenler ayrıştırılamadı: %s\n" + +msgid "Transparent background" +msgstr "Şeffaf arkaplan" @@ -4454,7 +4453,7 @@ index 3ac22937b896..bd971dd81d73 100644 +msgid "_Set Title…" +msgstr "_Başlığı Ata..." diff --git a/po/ug.po b/po/ug.po -index 313f76b98eae..be6089762082 100644 +index 313f76b9..be608976 100644 --- a/po/ug.po +++ b/po/ug.po @@ -2616,8 +2616,8 @@ msgstr "ماۋزۇ (_T):" @@ -4469,33 +4468,92 @@ index 313f76b98eae..be6089762082 100644 #~ msgid "" #~ "You already have a profile called “%s”. Do you want to create another " diff --git a/po/uk.po b/po/uk.po -index d6a261e2de57..9e0cca12a398 100644 +index 925bc11a..c7ac1919 100644 --- a/po/uk.po +++ b/po/uk.po -@@ -2422,3 +2422,18 @@ msgstr "" - #: src/terminal-window.c:3224 - msgid "C_lose Window" - msgstr "Закр_ити вікно" -+ +@@ -2392,67 +2392,17 @@ msgstr "Закр_ити вікно" + msgid "Failed to parse arguments: %s\n" + msgstr "Не вдається визначити аргументи: %s\n" + +-#~ msgid "org.gnome.Terminal.Nautilus" +-#~ msgstr "org.gnome.Terminal.Nautilus" +msgid "Title" +msgstr "Заголовок" -+ + +-#~ msgid "org.gnome.Nautilus.desktop" +-#~ msgstr "org.gnome.Nautilus.desktop" +msgid "_Title:" +msgstr "За_головок:" -+ + +-#~ msgid "GPL-3.0+ or GFDL-1.3-only" +-#~ msgstr "GPL-3.0+ або GFDL-1.3-only" +msgid "Set Title" +msgstr "Встановлення заголовка" -+ + +-#~ msgid "GPL-3.0+" +-#~ msgstr "GPL-3.0+" +msgid "_Set Title…" +msgstr "_Встановити заголовок…" -+ + +-#~ msgid "https://wiki.gnome.org/Apps/Terminal" +-#~ msgstr "https://wiki.gnome.org/Apps/Terminal" +- +-#~ msgid "https://wiki.gnome.org/Apps/Terminal/ReportingBugs" +-#~ msgstr "https://wiki.gnome.org/Apps/Terminal/ReportingBugs" +- +-#~ msgid "gnome-terminal" +-#~ msgstr "gnome-terminal" +- +-#~ msgid "org.gnome.Terminal" +-#~ msgstr "org.gnome.Terminal" +- +-#~ msgid "org.gnome.Terminal.desktop" +-#~ msgstr "org.gnome.Terminal.desktop" +- +-#~| msgid "Linux console" +-#~ msgid "console" +-#~ msgstr "консоль" +- +-#~ msgid "keyboard" +-#~ msgstr "клавіатура" +- +-#~ msgid "pointing" +-#~ msgstr "зазначення" +- +-#~ msgid "" +-#~ "https://help.gnome.org/users/gnome-terminal/stable/figures/gnome-terminal." +-#~ "png" +-#~ msgstr "" +-#~ "https://help.gnome.org/users/gnome-terminal/stable/figures/gnome-terminal." +-#~ "png" +- +-#~ msgid "HiDpiIcon" +-#~ msgstr "HiDpiIcon" +- +-#~ msgid "HighContrast" +-#~ msgstr "HighContrast" +- +-#~ msgid "ModernToolkit" +-#~ msgstr "ModernToolkit" +- +-#~ msgid "SearchProvider" +-#~ msgstr "SearchProvider" +- +-#~ msgid "UserDocs" +-#~ msgstr "UserDocs" +- +-#~ msgid "Armenian" +-#~ msgstr "Американське" +- +-#~ msgid "Georgian" +-#~ msgstr "Грузинське" +msgid "Transparent background" +msgstr "Прозоре тло" diff --git a/po/vi.po b/po/vi.po -index d5f27612f4be..8bb576b6d875 100644 +index 5304429b..af014ff2 100644 --- a/po/vi.po +++ b/po/vi.po -@@ -2703,8 +2703,8 @@ msgstr "Đón_g cửa sổ" +@@ -2852,8 +2852,8 @@ msgstr "Đón_g cửa sổ" #~ msgid "Default size:" #~ msgstr "Cỡ mặc định:" @@ -4506,7 +4564,7 @@ index d5f27612f4be..8bb576b6d875 100644 #~ msgid "When terminal commands set their o_wn titles:" #~ msgstr "Khi câu lệnh thiết bị cuối tự đặt tựa đề _mình:" -@@ -2715,8 +2715,8 @@ msgstr "Đón_g cửa sổ" +@@ -2864,8 +2864,8 @@ msgstr "Đón_g cửa sổ" #~ msgid "_Unlimited" #~ msgstr "_Không hạn chế" @@ -4517,7 +4575,7 @@ index d5f27612f4be..8bb576b6d875 100644 #~ msgid "Switch to Tab 3" #~ msgstr "Chuyển sang Thanh 3" -@@ -2757,8 +2757,8 @@ msgstr "Đón_g cửa sổ" +@@ -2906,8 +2906,8 @@ msgstr "Đón_g cửa sổ" #~ msgid "_Input Methods" #~ msgstr "K_iểu gõ" @@ -4528,7 +4586,7 @@ index d5f27612f4be..8bb576b6d875 100644 #~ msgid "Disable connection to session manager" #~ msgstr "Tắt kết nối đến trình quản lý phiên làm việc" -@@ -3143,3 +3143,6 @@ msgstr "Đón_g cửa sổ" +@@ -3292,3 +3292,6 @@ msgstr "Đón_g cửa sổ" #~ "Phím tắt để đặt lại thiết bị cuối. Dùng dạng chuỗi có cùng một khuôn dạng " #~ "với tập tin tài nguyên GTK+. Nếu bạn đặt tùy chọn là chuỗi “disabled” (bị " #~ "tắt), nghĩa là không có phím tắt cho hành động này." @@ -4536,7 +4594,7 @@ index d5f27612f4be..8bb576b6d875 100644 +msgid "Transparent background" +msgstr "Nền trong suốt" diff --git a/po/wa.po b/po/wa.po -index 2a29945bbc74..4f1c57c71e94 100644 +index 2a29945b..4f1c57c7 100644 --- a/po/wa.po +++ b/po/wa.po @@ -224,8 +224,8 @@ msgid "Background" @@ -4573,7 +4631,7 @@ index 2a29945bbc74..4f1c57c71e94 100644 #: ../src/terminal-window.c:1020 msgid "Set _Character Encoding" diff --git a/po/xh.po b/po/xh.po -index cb78ec67db2d..a4f3b4ddcfb6 100644 +index cb78ec67..a4f3b4dd 100644 --- a/po/xh.po +++ b/po/xh.po @@ -217,8 +217,8 @@ msgid "Background" @@ -4610,10 +4668,10 @@ index cb78ec67db2d..a4f3b4ddcfb6 100644 #: ../src/terminal-window.c:986 msgid "Set _Character Encoding" diff --git a/po/zh_CN.po b/po/zh_CN.po -index 4e07e12ea346..dbe611ed5d05 100644 +index 7026cc62..ddf108b4 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po -@@ -2754,17 +2754,17 @@ msgstr "关闭窗口(_L)" +@@ -2784,17 +2784,17 @@ msgstr "无法处理参数：%s\n" #~ msgid "Default size:" #~ msgstr "默认大小：" @@ -4637,7 +4695,7 @@ index 4e07e12ea346..dbe611ed5d05 100644 #~ msgid "Current Locale" #~ msgstr "当前区域" -@@ -2877,3 +2877,6 @@ msgstr "关闭窗口(_L)" +@@ -2907,3 +2907,6 @@ msgstr "无法处理参数：%s\n" #~ msgid "_Find..." #~ msgstr "查找(_F)..." @@ -4645,7 +4703,7 @@ index 4e07e12ea346..dbe611ed5d05 100644 +msgid "Transparent background" +msgstr "透明背景" diff --git a/po/zh_HK.po b/po/zh_HK.po -index 61153529f0c7..c366abddd1af 100644 +index 61153529..c366abdd 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -2114,17 +2114,17 @@ msgstr "關閉視窗(_L)" @@ -4680,7 +4738,7 @@ index 61153529f0c7..c366abddd1af 100644 +msgid "Transparent background" +msgstr "透明背景" diff --git a/po/zh_TW.po b/po/zh_TW.po -index 80cb23434a60..20e2a93ce3f0 100644 +index 80cb2343..20e2a93c 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -2735,17 +2735,17 @@ msgstr "關閉視窗(_L)" @@ -4715,10 +4773,10 @@ index 80cb23434a60..20e2a93ce3f0 100644 +msgid "Transparent background" +msgstr "透明背景" -- -2.25.4 +2.39.1 -From fc5845548ab6cbf56888c81fafdf63659ef9c337 Mon Sep 17 00:00:00 2001 +From 2d149670cb2c6c123081622193a7eb4c93a66f05 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 25 May 2016 13:47:36 +0200 Subject: [PATCH 12/16] Restore the action and shortcut to set a static title @@ -4730,12 +4788,12 @@ minor adjustments to keep up with later changes. https://bugzilla.redhat.com/show_bug.cgi?id=1296110 --- src/org.gnome.Terminal.gschema.xml | 4 ++ - src/terminal-accels.c | 2 + - src/terminal-window.c | 75 ++++++++++++++++++++++++++++++ - 3 files changed, 81 insertions(+) + src/terminal-accels.cc | 2 + + src/terminal-window.cc | 76 ++++++++++++++++++++++++++++++ + 3 files changed, 82 insertions(+) diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml -index 1c458a9fb9ec..c649e988b5cf 100644 +index 9a41c45f..a8f7f402 100644 --- a/src/org.gnome.Terminal.gschema.xml +++ b/src/org.gnome.Terminal.gschema.xml @@ -429,6 +429,10 @@ @@ -4749,10 +4807,10 @@ index 1c458a9fb9ec..c649e988b5cf 100644 'disabled' Keyboard shortcut to reset the terminal -diff --git a/src/terminal-accels.c b/src/terminal-accels.c -index 333c6d17006c..c0371c5cada4 100644 ---- a/src/terminal-accels.c -+++ b/src/terminal-accels.c +diff --git a/src/terminal-accels.cc b/src/terminal-accels.cc +index 66298100..b2b4e442 100644 +--- a/src/terminal-accels.cc ++++ b/src/terminal-accels.cc @@ -76,6 +76,7 @@ #define KEY_RESET "reset" #define KEY_SAVE_CONTENTS "save-contents" @@ -4762,18 +4820,18 @@ index 333c6d17006c..c0371c5cada4 100644 #define KEY_ZOOM_IN "zoom-in" #define KEY_ZOOM_NORMAL "zoom-normal" @@ -165,6 +166,7 @@ static KeyEntry terminal_entries[] = { - ENTRY (N_("Read-Only"), KEY_READ_ONLY, "read-only", NULL, NULL ), + ENTRY (N_("Read-Only"), KEY_READ_ONLY, "read-only", nullptr, nullptr ), ENTRY (N_("Reset"), KEY_RESET, "reset", "b", "false"), ENTRY (N_("Reset and Clear"), KEY_RESET_AND_CLEAR, "reset", "b", "true" ), -+ ENTRY (N_("Set Title"), KEY_SET_TERMINAL_TITLE, "set-title", NULL, NULL ), ++ ENTRY (N_("Set Title"), KEY_SET_TERMINAL_TITLE, "set-title", nullptr, nullptr ), }; static KeyEntry tabs_entries[] = { -diff --git a/src/terminal-window.c b/src/terminal-window.c -index c0219d872725..61c5e7de350a 100644 ---- a/src/terminal-window.c -+++ b/src/terminal-window.c -@@ -749,6 +749,80 @@ action_select_all_cb (GSimpleAction *action, +diff --git a/src/terminal-window.cc b/src/terminal-window.cc +index 61857bfe..98332c6d 100644 +--- a/src/terminal-window.cc ++++ b/src/terminal-window.cc +@@ -764,6 +764,81 @@ action_select_all_cb (GSimpleAction *action, vte_terminal_select_all (VTE_TERMINAL (priv->active_screen)); } @@ -4800,17 +4858,18 @@ index c0219d872725..61c5e7de350a 100644 + GVariant *parameter, + gpointer user_data) +{ -+ TerminalWindow *window = user_data; ++ TerminalWindow *window = (TerminalWindow*)user_data; + TerminalWindowPrivate *priv = window->priv; + GtkWidget *dialog, *message_area, *hbox, *label, *entry; + -+ if (priv->active_screen == NULL) ++ if (priv->active_screen == nullptr) + 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, ++ GtkDialogFlags(GTK_DIALOG_MODAL | ++ GTK_DIALOG_DESTROY_WITH_PARENT), + GTK_MESSAGE_OTHER, + GTK_BUTTONS_OK_CANCEL, + "%s", ""); @@ -4824,10 +4883,10 @@ index c0219d872725..61c5e7de350a 100644 + 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); ++ G_CALLBACK (terminal_util_dialog_response_on_delete), nullptr); + + message_area = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (dialog)); -+ gtk_container_foreach (GTK_CONTAINER (message_area), (GtkCallback) gtk_widget_hide, NULL); ++ gtk_container_foreach (GTK_CONTAINER (message_area), (GtkCallback) gtk_widget_hide, nullptr); + + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); + gtk_box_pack_start (GTK_BOX (message_area), hbox, FALSE, FALSE, 0); @@ -4854,19 +4913,19 @@ index c0219d872725..61c5e7de350a 100644 static void action_reset_cb (GSimpleAction *action, GVariant *parameter, -@@ -2086,6 +2160,7 @@ terminal_window_init (TerminalWindow *window) - { "paste-uris", action_paste_uris_cb, NULL, NULL, NULL }, - { "reset", action_reset_cb, "b", NULL, NULL }, - { "select-all", action_select_all_cb, NULL, NULL, NULL }, -+ { "set-title", action_set_title_cb, NULL, NULL, NULL }, - { "size-to", action_size_to_cb, "(uu)", NULL, NULL }, - { "tab-detach", action_tab_detach_cb, NULL, NULL, NULL }, - { "tab-move-left", action_tab_move_left_cb, NULL, NULL, NULL }, +@@ -2165,6 +2240,7 @@ terminal_window_init (TerminalWindow *window) + { "paste-uris", action_paste_uris_cb, nullptr, nullptr, nullptr }, + { "reset", action_reset_cb, "b", nullptr, nullptr }, + { "select-all", action_select_all_cb, nullptr, nullptr, nullptr }, ++ { "set-title", action_set_title_cb, nullptr, nullptr, nullptr }, + { "size-to", action_size_to_cb, "(uu)", nullptr, nullptr }, + { "tab-detach", action_tab_detach_cb, nullptr, nullptr, nullptr }, + { "tab-move-left", action_tab_move_left_cb, nullptr, nullptr, nullptr }, -- -2.25.4 +2.39.1 -From e5d3a23ff1f72a2fb2887abcbcb9a4d33dd4cdc3 Mon Sep 17 00:00:00 2001 +From 7a827a8ee62d97a871d2f0e17dd3ea2ee8e6f716 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 30 Jun 2016 18:14:36 +0200 Subject: [PATCH 13/16] screen: Style fix @@ -4876,27 +4935,27 @@ de0dc7c2649c42e2aa02a66e4be27d262b34452d https://bugzilla.redhat.com/show_bug.cgi?id=1296110 --- - src/terminal-screen.c | 2 +- + src/terminal-screen.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 7724af0dfa04..3e93ab8ff7e5 100644 ---- a/src/terminal-screen.c -+++ b/src/terminal-screen.c -@@ -833,7 +833,7 @@ terminal_screen_new (GSettings *profile, +diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc +index 8949d135..c48b5875 100644 +--- a/src/terminal-screen.cc ++++ b/src/terminal-screen.cc +@@ -819,7 +819,7 @@ terminal_screen_new (GSettings *profile, /* If given an initial title, strip it of control characters and * feed it to the terminal. */ -- if (title != NULL) { +- if (title != nullptr) { + if (title) { GString *seq; const char *p; -- -2.25.4 +2.39.1 -From 4dbaed23edd26456c0509d4bc5424acbdb9140f9 Mon Sep 17 00:00:00 2001 +From 857f6b73bfb6f479dd42369c5554497cf0b8eb45 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 30 Jun 2016 16:58:15 +0200 Subject: [PATCH 14/16] Restore the rest of the title handling options and make @@ -4909,16 +4968,16 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110 --- src/org.gnome.Terminal.gschema.xml | 12 ++ src/preferences.ui | 33 +++- - src/profile-editor.c | 9 + - src/terminal-enums.h | 8 + - src/terminal-schemas.h | 1 + - src/terminal-screen.c | 257 +++++++++++++++++++++-------- - src/terminal-screen.h | 8 +- - src/terminal-window.c | 9 +- - 8 files changed, 263 insertions(+), 74 deletions(-) + src/profile-editor.cc | 10 ++ + src/terminal-enums.hh | 8 + + src/terminal-schemas.hh | 1 + + src/terminal-screen.cc | 258 +++++++++++++++++++++-------- + src/terminal-screen.hh | 8 +- + src/terminal-window.cc | 9 +- + 8 files changed, 264 insertions(+), 75 deletions(-) diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml -index c649e988b5cf..53083a0e15d3 100644 +index a8f7f402..bd08008d 100644 --- a/src/org.gnome.Terminal.gschema.xml +++ b/src/org.gnome.Terminal.gschema.xml @@ -24,6 +24,13 @@ @@ -4948,10 +5007,10 @@ index c649e988b5cf..53083a0e15d3 100644 'Terminal' Title for terminal diff --git a/src/preferences.ui b/src/preferences.ui -index f86f8c980f89..c45366ae52fc 100644 +index d851bcb6..a9600d9a 100644 --- a/src/preferences.ui +++ b/src/preferences.ui -@@ -2002,7 +2002,7 @@ +@@ -2035,7 +2035,7 @@ True False 0 @@ -4960,7 +5019,7 @@ index f86f8c980f89..c45366ae52fc 100644 True title-entry -@@ -2022,6 +2022,37 @@ +@@ -2055,6 +2055,37 @@ 1 @@ -4998,30 +5057,31 @@ index f86f8c980f89..c45366ae52fc 100644 -diff --git a/src/profile-editor.c b/src/profile-editor.c -index df1f219608c4..1aa05fb33a92 100644 ---- a/src/profile-editor.c -+++ b/src/profile-editor.c -@@ -1373,6 +1373,15 @@ profile_prefs_load (const char *uuid, GSettings *profile) - gtk_builder_get_object (builder, "title-entry"), +diff --git a/src/profile-editor.cc b/src/profile-editor.cc +index f7997fbf..2f756fa3 100644 +--- a/src/profile-editor.cc ++++ b/src/profile-editor.cc +@@ -1422,6 +1422,16 @@ profile_prefs_load (const char *uuid, GSettings *profile) "text", - G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); + GSettingsBindFlags(G_SETTINGS_BIND_GET | + G_SETTINGS_BIND_SET)); + profile_prefs_settings_bind_with_mapping (profile, + TERMINAL_PROFILE_TITLE_MODE_KEY, + gtk_builder_get_object (builder, + "title-mode-combobox"), + "active", -+ G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET, ++ GSettingsBindFlags(G_SETTINGS_BIND_GET | ++ G_SETTINGS_BIND_SET), + (GSettingsBindGetMapping) string_to_enum, + (GSettingsBindSetMapping) enum_to_string, -+ terminal_title_mode_get_type, NULL); ++ terminal_title_mode_get_type, nullptr); profile_prefs_settings_bind (profile, TERMINAL_PROFILE_USE_CUSTOM_COMMAND_KEY, gtk_builder_get_object (builder, "use-custom-command-checkbutton"), -diff --git a/src/terminal-enums.h b/src/terminal-enums.h -index 93f1460c2207..5e816f71c10e 100644 ---- a/src/terminal-enums.h -+++ b/src/terminal-enums.h +diff --git a/src/terminal-enums.hh b/src/terminal-enums.hh +index 93f1460c..5e816f71 100644 +--- a/src/terminal-enums.hh ++++ b/src/terminal-enums.hh @@ -34,6 +34,14 @@ typedef enum { TERMINAL_NEW_TAB_POSITION_NEXT } TerminalNewTabPosition; @@ -5037,11 +5097,11 @@ index 93f1460c2207..5e816f71c10e 100644 typedef enum { TERMINAL_EXIT_CLOSE, -diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h -index cbb59a2301e6..78e7a9a54b60 100644 ---- a/src/terminal-schemas.h -+++ b/src/terminal-schemas.h -@@ -69,6 +69,7 @@ G_BEGIN_DECLS +diff --git a/src/terminal-schemas.hh b/src/terminal-schemas.hh +index d0f111a0..1c67e55d 100644 +--- a/src/terminal-schemas.hh ++++ b/src/terminal-schemas.hh +@@ -71,6 +71,7 @@ G_BEGIN_DECLS #define TERMINAL_PROFILE_SCROLL_ON_KEYSTROKE_KEY "scroll-on-keystroke" #define TERMINAL_PROFILE_SCROLL_ON_OUTPUT_KEY "scroll-on-output" #define TERMINAL_PROFILE_TEXT_BLINK_MODE_KEY "text-blink-mode" @@ -5049,11 +5109,11 @@ index cbb59a2301e6..78e7a9a54b60 100644 #define TERMINAL_PROFILE_TITLE_KEY "title" #define TERMINAL_PROFILE_USE_CUSTOM_COMMAND_KEY "use-custom-command" #define TERMINAL_PROFILE_USE_SKEY_KEY "use-skey" -diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 3e93ab8ff7e5..95ad21f6e867 100644 ---- a/src/terminal-screen.c -+++ b/src/terminal-screen.c -@@ -110,8 +110,11 @@ struct _TerminalScreenPrivate +diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc +index c48b5875..547ec12e 100644 +--- a/src/terminal-screen.cc ++++ b/src/terminal-screen.cc +@@ -115,8 +115,11 @@ struct _TerminalScreenPrivate ExecData *exec_data; gboolean between_preexec_and_precmd; @@ -5066,7 +5126,7 @@ index 3e93ab8ff7e5..95ad21f6e867 100644 guint contents_changed_source_id; guint shell_preexec_source_id; }; -@@ -128,8 +131,7 @@ enum +@@ -133,8 +136,7 @@ enum enum { PROP_0, PROP_PROFILE, @@ -5076,7 +5136,7 @@ index 3e93ab8ff7e5..95ad21f6e867 100644 }; enum -@@ -179,8 +181,13 @@ static void terminal_screen_window_title_changed (VteTerminal *vte_terminal +@@ -184,8 +186,13 @@ static void terminal_screen_window_title_changed (VteTerminal *vte_terminal static void update_color_scheme (TerminalScreen *screen); @@ -5089,18 +5149,18 @@ index 3e93ab8ff7e5..95ad21f6e867 100644 + static void terminal_screen_check_extra (TerminalScreen *screen, GdkEvent *event, - char **number_info); -@@ -561,6 +568,9 @@ terminal_screen_init (TerminalScreen *screen) + char **number_info, +@@ -547,6 +554,9 @@ terminal_screen_init (TerminalScreen *screen) gtk_target_table_free (targets, n_targets); gtk_target_list_unref (target_list); -+ priv->override_title = NULL; ++ priv->override_title = nullptr; + priv->user_title = FALSE; + g_signal_connect (screen, "window-title-changed", G_CALLBACK (terminal_screen_window_title_changed), screen); -@@ -594,9 +604,6 @@ terminal_screen_get_property (GObject *object, +@@ -573,9 +583,6 @@ terminal_screen_get_property (GObject *object, case PROP_TITLE: g_value_set_string (value, terminal_screen_get_title (screen)); break; @@ -5110,29 +5170,30 @@ index 3e93ab8ff7e5..95ad21f6e867 100644 default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; -@@ -617,7 +624,6 @@ terminal_screen_set_property (GObject *object, - terminal_screen_set_profile (screen, g_value_get_object (value)); +@@ -596,7 +603,6 @@ terminal_screen_set_property (GObject *object, + terminal_screen_set_profile (screen, (GSettings*)g_value_get_object (value)); break; case PROP_TITLE: - case PROP_DESCRIPTION: /* not writable */ default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -@@ -707,13 +713,6 @@ terminal_screen_class_init (TerminalScreenClass *klass) - NULL, - G_PARAM_READABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); - -- g_object_class_install_property (object_class, -- PROP_DESCRIPTION, -- g_param_spec_string ("description", NULL, NULL, -- NULL, -- G_PARAM_READABLE | -- G_PARAM_STATIC_STRINGS)); +@@ -692,14 +698,6 @@ terminal_screen_class_init (TerminalScreenClass *klass) + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB))); + +- g_object_class_install_property +- (object_class, +- PROP_DESCRIPTION, +- g_param_spec_string ("description", nullptr, nullptr, +- nullptr, +- GParamFlags(G_PARAM_READABLE | +- G_PARAM_STATIC_STRINGS))); - g_type_class_add_private (object_class, sizeof (TerminalScreenPrivate)); n_url_regexes = G_N_ELEMENTS (url_regex_patterns); -@@ -810,7 +809,9 @@ terminal_screen_finalize (GObject *object) +@@ -796,7 +794,9 @@ terminal_screen_finalize (GObject *object) g_free (priv->uuid); g_free (priv->current_cmdline); @@ -5143,7 +5204,7 @@ index 3e93ab8ff7e5..95ad21f6e867 100644 G_OBJECT_CLASS (terminal_screen_parent_class)->finalize (object); } -@@ -830,28 +831,8 @@ terminal_screen_new (GSettings *profile, +@@ -816,28 +816,8 @@ terminal_screen_new (GSettings *profile, g_settings_get_int (profile, TERMINAL_PROFILE_DEFAULT_SIZE_COLUMNS_KEY), g_settings_get_int (profile, TERMINAL_PROFILE_DEFAULT_SIZE_ROWS_KEY)); @@ -5174,7 +5235,7 @@ index 3e93ab8ff7e5..95ad21f6e867 100644 vte_terminal_set_font_scale (VTE_TERMINAL (screen), zoom); terminal_screen_set_font (screen); -@@ -1064,28 +1045,139 @@ terminal_screen_exec (TerminalScreen *screen, +@@ -1049,28 +1029,139 @@ terminal_screen_exec (TerminalScreen *screen, return TRUE; } @@ -5195,11 +5256,11 @@ index 3e93ab8ff7e5..95ad21f6e867 100644 - return vte_terminal_get_window_title (VTE_TERMINAL (screen)); + TerminalScreenPrivate *priv = screen->priv; + -+ if (priv->cooked_title == NULL) ++ if (priv->cooked_title == nullptr) + terminal_screen_cook_title (screen); + -+ /* cooked_title may still be NULL */ -+ if (priv->cooked_title != NULL) ++ /* cooked_title may still be nullptr */ ++ if (priv->cooked_title != nullptr) + return priv->cooked_title; + else + return ""; @@ -5215,8 +5276,10 @@ index 3e93ab8ff7e5..95ad21f6e867 100644 + */ +static const char * +terminal_screen_get_title_format (TerminalScreen *screen) -+{ -+ TerminalScreenPrivate *priv = screen->priv; + { + TerminalScreenPrivate *priv = screen->priv; +- gs_free char *title_string = nullptr; +- const char *title; + static const char *formats[] = { + "%A" /* TERMINAL_TITLE_REPLACE */, + "%D%-%S" /* TERMINAL_TITLE_BEFORE */, @@ -5234,7 +5297,7 @@ index 3e93ab8ff7e5..95ad21f6e867 100644 + * @titleptr : pointer of the current title string + * + * Format title according @format, and stores it in *titleptr. -+ * Always ensures that *titleptr will be non-NULL. ++ * Always ensures that *titleptr will be non-nullptr. + * + * Returns: %TRUE iff the title changed + */ @@ -5242,13 +5305,11 @@ index 3e93ab8ff7e5..95ad21f6e867 100644 +terminal_screen_format_title (TerminalScreen *screen, + const char *raw_title, + char **titleptr) - { - TerminalScreenPrivate *priv = screen->priv; -- gs_free char *title_string = NULL; -- const char *title; -+ gs_free char *static_title_string = NULL; ++{ ++ TerminalScreenPrivate *priv = screen->priv; ++ gs_free char *static_title_string = nullptr; + const char *format, *arg; -+ const char *static_title = NULL; ++ const char *static_title = nullptr; + GString *title; + gboolean add_sep = FALSE; + @@ -5268,10 +5329,13 @@ index 3e93ab8ff7e5..95ad21f6e867 100644 + format = terminal_screen_get_title_format (screen); + for (arg = format; *arg; arg += 2) + { -+ const char *text_to_append = NULL; ++ const char *text_to_append = nullptr; + + g_assert (arg[0] == '%'); -+ + +- return g_strdup_printf ("%s — %d", +- title && title[0] ? title : _("Terminal"), +- screen->priv->child_pid); + switch (arg[1]) + { + case 'A': @@ -5284,7 +5348,7 @@ index 3e93ab8ff7e5..95ad21f6e867 100644 + text_to_append = static_title; + break; + case '-': -+ text_to_append = NULL; ++ text_to_append = nullptr; + add_sep = TRUE; + break; + default: @@ -5300,11 +5364,8 @@ index 3e93ab8ff7e5..95ad21f6e867 100644 + g_string_append (title, text_to_append); + add_sep = FALSE; + } - -- return g_strdup_printf ("%s — %d", -- title && title[0] ? title : _("Terminal"), -- screen->priv->child_pid); -+ if (*titleptr == NULL || strcmp (title->str, *titleptr) != 0) ++ ++ if (*titleptr == nullptr || strcmp (title->str, *titleptr) != 0) + { + g_free (*titleptr); + *titleptr = g_string_free (title, FALSE); @@ -5325,7 +5386,7 @@ index 3e93ab8ff7e5..95ad21f6e867 100644 } static void -@@ -1128,9 +1220,10 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1113,9 +1204,10 @@ terminal_screen_profile_changed_cb (GSettings *profile, } if (!prop_name || @@ -5337,7 +5398,7 @@ index 3e93ab8ff7e5..95ad21f6e867 100644 } if (gtk_widget_get_realized (GTK_WIDGET (screen)) && -@@ -1422,7 +1515,6 @@ terminal_screen_set_profile (TerminalScreen *screen, +@@ -1407,7 +1499,6 @@ terminal_screen_set_profile (TerminalScreen *screen, g_object_unref (old_profile); g_object_notify (G_OBJECT (screen), "profile"); @@ -5345,7 +5406,7 @@ index 3e93ab8ff7e5..95ad21f6e867 100644 } GSettings* -@@ -1694,8 +1786,6 @@ spawn_result_cb (VteTerminal *terminal, +@@ -1695,8 +1786,6 @@ spawn_result_cb (VteTerminal *terminal, priv->child_pid = pid; @@ -5353,8 +5414,8 @@ index 3e93ab8ff7e5..95ad21f6e867 100644 - if (error) { // FIXMEchpe should be unnecessary, vte already does this internally - vte_terminal_set_pty (terminal, NULL); -@@ -1980,33 +2070,45 @@ terminal_screen_focus_in (GtkWidget *widget, + vte_terminal_set_pty (terminal, nullptr); +@@ -1988,33 +2077,45 @@ terminal_screen_focus_in (GtkWidget *widget, return GTK_WIDGET_CLASS (terminal_screen_parent_class)->focus_in_event (widget, event); } @@ -5378,13 +5439,12 @@ index 3e93ab8ff7e5..95ad21f6e867 100644 return; - g_free (priv->title); -- priv->title = title && title[0] ? g_strdup (title) : NULL; +- priv->title = title && title[0] ? g_strdup (title) : nullptr; + g_free (priv->raw_title); + priv->raw_title = g_strdup (title); + terminal_screen_cook_title (screen); +} - -- g_object_notify (G_OBJECT (screen), "description"); ++ +void +terminal_screen_set_override_title (TerminalScreen *screen, + const char *title) @@ -5395,7 +5455,8 @@ index 3e93ab8ff7e5..95ad21f6e867 100644 + old_title = priv->override_title; + priv->override_title = g_strdup (title); + g_free (old_title); -+ + +- g_object_notify (G_OBJECT (screen), "description"); + terminal_screen_set_dynamic_title (screen, title, FALSE); } @@ -5405,7 +5466,7 @@ index 3e93ab8ff7e5..95ad21f6e867 100644 { - TerminalScreenPrivate *priv; - - g_return_val_if_fail (TERMINAL_IS_SCREEN (screen), NULL); + g_return_val_if_fail (TERMINAL_IS_SCREEN (screen), nullptr); - priv = screen->priv; - @@ -5414,7 +5475,7 @@ index 3e93ab8ff7e5..95ad21f6e867 100644 } /** -@@ -2039,7 +2141,9 @@ static void +@@ -2047,7 +2148,9 @@ static void terminal_screen_window_title_changed (VteTerminal *vte_terminal, TerminalScreen *screen) { @@ -5425,16 +5486,16 @@ index 3e93ab8ff7e5..95ad21f6e867 100644 } static void -@@ -2062,8 +2166,6 @@ terminal_screen_child_exited (VteTerminal *terminal, +@@ -2070,8 +2173,6 @@ terminal_screen_child_exited (VteTerminal *terminal, priv->child_pid = -1; - g_object_notify (G_OBJECT (screen), "description"); - - action = g_settings_get_enum (priv->profile, TERMINAL_PROFILE_EXIT_ACTION_KEY); + action = TerminalExitAction(g_settings_get_enum (priv->profile, TERMINAL_PROFILE_EXIT_ACTION_KEY)); switch (action) -@@ -2107,6 +2209,23 @@ terminal_screen_child_exited (VteTerminal *terminal, +@@ -2115,6 +2216,23 @@ terminal_screen_child_exited (VteTerminal *terminal, } } @@ -5458,10 +5519,10 @@ index 3e93ab8ff7e5..95ad21f6e867 100644 static gboolean terminal_screen_contents_changed_cb (TerminalScreen *screen) { -diff --git a/src/terminal-screen.h b/src/terminal-screen.h -index 049bbe5a2b8b..5b7fcc59ddd0 100644 ---- a/src/terminal-screen.h -+++ b/src/terminal-screen.h +diff --git a/src/terminal-screen.hh b/src/terminal-screen.hh +index f4ec9047..feeab852 100644 +--- a/src/terminal-screen.hh ++++ b/src/terminal-screen.hh @@ -113,13 +113,17 @@ void terminal_screen_set_profile (TerminalScreen *screen, GSettings* terminal_screen_get_profile (TerminalScreen *screen); GSettings* terminal_screen_ref_profile (TerminalScreen *screen); @@ -5482,11 +5543,11 @@ index 049bbe5a2b8b..5b7fcc59ddd0 100644 char *terminal_screen_get_current_dir (TerminalScreen *screen); void terminal_screen_get_size (TerminalScreen *screen, -diff --git a/src/terminal-window.c b/src/terminal-window.c -index 61c5e7de350a..0d61db3c125d 100644 ---- a/src/terminal-window.c -+++ b/src/terminal-window.c -@@ -767,6 +767,12 @@ terminal_set_title_dialog_response_cb (GtkWidget *dialog, +diff --git a/src/terminal-window.cc b/src/terminal-window.cc +index 98332c6d..389d4d71 100644 +--- a/src/terminal-window.cc ++++ b/src/terminal-window.cc +@@ -782,6 +782,12 @@ terminal_set_title_dialog_response_cb (GtkWidget *dialog, gtk_widget_destroy (dialog); } @@ -5499,7 +5560,7 @@ index 61c5e7de350a..0d61db3c125d 100644 static void action_set_title_cb (GSimpleAction *action, GVariant *parameter, -@@ -2521,8 +2527,7 @@ sync_screen_title (TerminalScreen *screen, +@@ -2628,8 +2634,7 @@ sync_screen_title (TerminalScreen *screen, return; title = terminal_screen_get_title (screen); @@ -5510,25 +5571,27 @@ index 61c5e7de350a..0d61db3c125d 100644 static void -- -2.25.4 +2.39.1 -From a8afd6f8f6214a26f777c0412ce0d7cc3ebdea81 Mon Sep 17 00:00:00 2001 +From e509ea2cab9463dd391836db3937ef0503c8652c Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 3 Apr 2019 15:38:09 +0200 Subject: [PATCH 15/16] Update the title with the current foreground process -Some changes by Bill Nottingham +Some changes by: + Bill Nottingham + Ting-Wei Lan https://bugzilla.gnome.org/show_bug.cgi?id=711060 --- src/org.gnome.Terminal.gschema.xml | 5 ++++ - src/terminal-schemas.h | 1 + - src/terminal-screen.c | 39 +++++++++++++++++++++++++++++- - 3 files changed, 44 insertions(+), 1 deletion(-) + src/terminal-schemas.hh | 1 + + src/terminal-screen.cc | 45 +++++++++++++++++++++++++++++- + 3 files changed, 50 insertions(+), 1 deletion(-) diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml -index 53083a0e15d3..d7e12d831796 100644 +index bd08008d..e7139454 100644 --- a/src/org.gnome.Terminal.gschema.xml +++ b/src/org.gnome.Terminal.gschema.xml @@ -275,6 +275,11 @@ @@ -5543,11 +5606,11 @@ index 53083a0e15d3..d7e12d831796 100644 'close' What to do with the terminal when the child command exits -diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h -index 78e7a9a54b60..88dd11254c0d 100644 ---- a/src/terminal-schemas.h -+++ b/src/terminal-schemas.h -@@ -68,6 +68,7 @@ G_BEGIN_DECLS +diff --git a/src/terminal-schemas.hh b/src/terminal-schemas.hh +index 1c67e55d..443ebae4 100644 +--- a/src/terminal-schemas.hh ++++ b/src/terminal-schemas.hh +@@ -70,6 +70,7 @@ G_BEGIN_DECLS #define TERMINAL_PROFILE_SCROLLBAR_POLICY_KEY "scrollbar-policy" #define TERMINAL_PROFILE_SCROLL_ON_KEYSTROKE_KEY "scroll-on-keystroke" #define TERMINAL_PROFILE_SCROLL_ON_OUTPUT_KEY "scroll-on-output" @@ -5555,11 +5618,11 @@ index 78e7a9a54b60..88dd11254c0d 100644 #define TERMINAL_PROFILE_TEXT_BLINK_MODE_KEY "text-blink-mode" #define TERMINAL_PROFILE_TITLE_MODE_KEY "title-mode" #define TERMINAL_PROFILE_TITLE_KEY "title" -diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 95ad21f6e867..399dc889b96a 100644 ---- a/src/terminal-screen.c -+++ b/src/terminal-screen.c -@@ -109,7 +109,9 @@ struct _TerminalScreenPrivate +diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc +index 547ec12e..fe410fdf 100644 +--- a/src/terminal-screen.cc ++++ b/src/terminal-screen.cc +@@ -114,7 +114,9 @@ struct _TerminalScreenPrivate guint idle_exec_source; ExecData *exec_data; @@ -5569,28 +5632,34 @@ index 95ad21f6e867..399dc889b96a 100644 gboolean user_title; /* title was manually set */ char *current_cmdline; char *raw_title; -@@ -1160,6 +1162,20 @@ terminal_screen_format_title (TerminalScreen *screen, +@@ -1144,6 +1146,26 @@ terminal_screen_format_title (TerminalScreen *screen, add_sep = FALSE; } + if (priv->show_foreground_process && + !priv->application_title && + !priv->user_title && -+ priv->current_cmdline != NULL && ++ priv->current_cmdline != nullptr && + priv->current_cmdline[0] != '\0') + { -+ gs_free char *current_cmdline_truncated = NULL; -+ gs_free char *current_cmdline_valid = NULL; ++ gs_free char *current_cmdline_truncated = nullptr; ++ gs_free char *current_cmdline_valid = nullptr; ++ glong len_truncated; ++ glong len_valid; + + current_cmdline_valid = g_utf8_make_valid (priv->current_cmdline, -1); -+ current_cmdline_truncated = g_utf8_substring (current_cmdline_valid, 0, 1024); ++ len_valid = g_utf8_strlen (current_cmdline_valid, -1); ++ ++ len_truncated = len_valid > 1024 ? 1024 : len_valid; ++ current_cmdline_truncated = g_utf8_substring (current_cmdline_valid, 0, len_truncated); ++ + g_string_append_printf (title, " — %s", current_cmdline_truncated); + } + - if (*titleptr == NULL || strcmp (title->str, *titleptr) != 0) + if (*titleptr == nullptr || strcmp (title->str, *titleptr) != 0) { g_free (*titleptr); -@@ -1189,6 +1205,7 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1173,6 +1195,7 @@ terminal_screen_profile_changed_cb (GSettings *profile, GObject *object = G_OBJECT (screen); VteTerminal *vte_terminal = VTE_TERMINAL (screen); TerminalWindow *window; @@ -5598,7 +5667,7 @@ index 95ad21f6e867..399dc889b96a 100644 g_object_freeze_notify (object); -@@ -1223,7 +1240,7 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1207,7 +1230,7 @@ terminal_screen_profile_changed_cb (GSettings *profile, prop_name == I_(TERMINAL_PROFILE_TITLE_MODE_KEY) || prop_name == I_(TERMINAL_PROFILE_TITLE_KEY)) { @@ -5607,7 +5676,7 @@ index 95ad21f6e867..399dc889b96a 100644 } if (gtk_widget_get_realized (GTK_WIDGET (screen)) && -@@ -1251,6 +1268,13 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1235,6 +1258,13 @@ terminal_screen_profile_changed_cb (GSettings *profile, prop_name == I_(TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT)) update_color_scheme (screen); @@ -5621,7 +5690,7 @@ index 95ad21f6e867..399dc889b96a 100644 if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY)) vte_terminal_set_audible_bell (vte_terminal, g_settings_get_boolean (profile, TERMINAL_PROFILE_AUDIBLE_BELL_KEY)); -@@ -1315,6 +1339,9 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1299,6 +1329,9 @@ terminal_screen_profile_changed_cb (GSettings *profile, vte_terminal_set_word_char_exceptions (vte_terminal, word_char_exceptions); } @@ -5631,7 +5700,7 @@ index 95ad21f6e867..399dc889b96a 100644 g_object_thaw_notify (object); } -@@ -2141,6 +2168,9 @@ static void +@@ -2148,6 +2181,9 @@ static void terminal_screen_window_title_changed (VteTerminal *vte_terminal, TerminalScreen *screen) { @@ -5641,8 +5710,8 @@ index 95ad21f6e867..399dc889b96a 100644 terminal_screen_set_dynamic_title (screen, vte_terminal_get_window_title (vte_terminal), FALSE); -@@ -2247,6 +2277,8 @@ terminal_screen_contents_changed_cb (TerminalScreen *screen) - priv->current_cmdline = g_steal_pointer (&cmdline); +@@ -2255,6 +2291,8 @@ terminal_screen_contents_changed_cb (TerminalScreen *screen) + cmdline = nullptr; _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Current foreground command-line: %s\n", priv->current_cmdline); + terminal_screen_cook_title (screen); @@ -5650,7 +5719,7 @@ index 95ad21f6e867..399dc889b96a 100644 out: priv->contents_changed_source_id = 0; return G_SOURCE_REMOVE; -@@ -2339,6 +2371,7 @@ terminal_screen_shell_precmd (VteTerminal *terminal) +@@ -2347,6 +2385,7 @@ terminal_screen_shell_precmd (VteTerminal *terminal) _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Shell precmd\n"); @@ -5658,7 +5727,7 @@ index 95ad21f6e867..399dc889b96a 100644 priv->between_preexec_and_precmd = FALSE; if (priv->contents_changed_source_id != 0) -@@ -2358,6 +2391,8 @@ terminal_screen_shell_precmd (VteTerminal *terminal) +@@ -2366,6 +2405,8 @@ terminal_screen_shell_precmd (VteTerminal *terminal) g_clear_pointer (&priv->current_cmdline, g_free); _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Current foreground command-line: (none)\n"); @@ -5667,8 +5736,8 @@ index 95ad21f6e867..399dc889b96a 100644 } static gboolean -@@ -2378,6 +2413,8 @@ terminal_screen_shell_preexec_cb (TerminalScreen *screen) - priv->current_cmdline = g_steal_pointer (&cmdline); +@@ -2387,6 +2428,8 @@ terminal_screen_shell_preexec_cb (TerminalScreen *screen) + cmdline = nullptr; _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Current foreground command-line: %s\n", priv->current_cmdline); + terminal_screen_cook_title (screen); @@ -5677,10 +5746,10 @@ index 95ad21f6e867..399dc889b96a 100644 retval = G_SOURCE_REMOVE; -- -2.25.4 +2.39.1 -From 6fcc54a2475fa4d248f6b78ead8625e2d3e1ae9d Mon Sep 17 00:00:00 2001 +From 270d60c07f79325cf5488a836cb20a32d827d004 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 27 Feb 2020 19:32:08 +0100 Subject: [PATCH 16/16] screen, window: Preserve current toolbox, if any @@ -5690,16 +5759,16 @@ advertises the name of the current toolbox container. https://gitlab.freedesktop.org/terminal-wg/specifications/issues/17 --- - src/terminal-screen.c | 30 +++++++++++++++++++++++++++++- - src/terminal-screen.h | 6 ++++++ - src/terminal-window.c | 26 ++++++++++++++++++++++++-- - 3 files changed, 59 insertions(+), 3 deletions(-) + src/terminal-screen.cc | 33 ++++++++++++++++++++++++++++++++- + src/terminal-screen.hh | 6 ++++++ + src/terminal-window.cc | 26 ++++++++++++++++++++++++-- + 3 files changed, 62 insertions(+), 3 deletions(-) -diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 399dc889b96a..db088f6f2695 100644 ---- a/src/terminal-screen.c -+++ b/src/terminal-screen.c -@@ -877,6 +877,25 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen, +diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc +index fe410fdf..4fc15e04 100644 +--- a/src/terminal-screen.cc ++++ b/src/terminal-screen.cc +@@ -862,6 +862,25 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen, TerminalScreen *parent_screen, GCancellable *cancellable, GError **error) @@ -5711,7 +5780,7 @@ index 399dc889b96a..db088f6f2695 100644 + + return terminal_screen_reexec_from_screen_with_override_command (screen, + parent_screen, -+ NULL, ++ nullptr, + cancellable, + error); +} @@ -5725,12 +5794,15 @@ index 399dc889b96a..db088f6f2695 100644 { g_return_val_if_fail (TERMINAL_IS_SCREEN (screen), FALSE); -@@ -888,8 +907,17 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen, +@@ -873,8 +892,20 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen, terminal_unref_exec_data ExecData* data = exec_data_clone (parent_screen->priv->exec_data, FALSE); gs_free char* cwd = terminal_screen_get_current_dir (parent_screen); -+ if (override_command != NULL) ++ if (override_command != nullptr) + { ++ g_return_val_if_fail (parent_screen->priv->exec_data != nullptr, FALSE); ++ g_return_val_if_fail (data != nullptr, FALSE); ++ + g_strfreev (data->argv); + data->argv = g_strdupv (override_command); + @@ -5744,10 +5816,10 @@ index 399dc889b96a..db088f6f2695 100644 screen, parent_screen, cwd); -diff --git a/src/terminal-screen.h b/src/terminal-screen.h -index 5b7fcc59ddd0..5b1f983a7049 100644 ---- a/src/terminal-screen.h -+++ b/src/terminal-screen.h +diff --git a/src/terminal-screen.hh b/src/terminal-screen.hh +index feeab852..b5ab7908 100644 +--- a/src/terminal-screen.hh ++++ b/src/terminal-screen.hh @@ -108,6 +108,12 @@ gboolean terminal_screen_reexec_from_screen (TerminalScreen *screen, GCancellable *cancellable, GError **error); @@ -5761,43 +5833,43 @@ index 5b7fcc59ddd0..5b1f983a7049 100644 void terminal_screen_set_profile (TerminalScreen *screen, GSettings *profile); GSettings* terminal_screen_get_profile (TerminalScreen *screen); -diff --git a/src/terminal-window.c b/src/terminal-window.c -index 0d61db3c125d..ad3a95af7008 100644 ---- a/src/terminal-window.c -+++ b/src/terminal-window.c -@@ -405,8 +405,30 @@ action_new_terminal_cb (GSimpleAction *action, +diff --git a/src/terminal-window.cc b/src/terminal-window.cc +index 389d4d71..d69cf1f0 100644 +--- a/src/terminal-window.cc ++++ b/src/terminal-window.cc +@@ -417,8 +417,30 @@ action_new_terminal_cb (GSimpleAction *action, terminal_window_switch_screen (window, screen); gtk_widget_grab_focus (GTK_WIDGET (screen)); - /* Start child process, if possible by using the same args as the parent screen */ -- terminal_screen_reexec_from_screen (screen, parent_screen, NULL, NULL); +- terminal_screen_reexec_from_screen (screen, parent_screen, nullptr, nullptr); + const char *container_name = vte_terminal_get_current_container_name (VTE_TERMINAL (parent_screen)); + const char *container_runtime = vte_terminal_get_current_container_runtime (VTE_TERMINAL (parent_screen)); -+ if (g_strcmp0 (container_runtime, "toolbox") == 0 && container_name != NULL && container_name[0] != '\0') ++ if (g_strcmp0 (container_runtime, "toolbox") == 0 && container_name != nullptr && container_name[0] != '\0') + { -+ gs_free_error GError *error = NULL; -+ gs_free char *override_command_str = NULL; -+ gs_strfreev char **override_command = NULL; ++ gs_free_error GError *error = nullptr; ++ gs_free char *override_command_str = nullptr; ++ gs_strfreev char **override_command = nullptr; + + override_command_str = g_strdup_printf ("toolbox enter --container %s", container_name); -+ if (!g_shell_parse_argv (override_command_str, NULL, &override_command, &error)) ++ if (!g_shell_parse_argv (override_command_str, nullptr, &override_command, &error)) + g_printerr ("Failed to parse '%s': %s\n", override_command_str, error->message); + + /* Start child process, if possible by using the same args as the parent screen */ + terminal_screen_reexec_from_screen_with_override_command (screen, + parent_screen, + override_command, -+ NULL, -+ NULL); ++ nullptr, ++ nullptr); + } + else + { + /* Start child process, if possible by using the same args as the parent screen */ -+ terminal_screen_reexec_from_screen (screen, parent_screen, NULL, NULL); ++ terminal_screen_reexec_from_screen (screen, parent_screen, nullptr, nullptr); + } if (mode == TERMINAL_NEW_TERMINAL_MODE_WINDOW) gtk_window_present (GTK_WINDOW (window)); -- -2.25.4 +2.39.1 diff --git a/gnome-terminal.spec b/gnome-terminal.spec index 4bceded14201a1b9e99d85f303e098521ed0edb1..ad52c7b03f9380e1caf7e0f23767864aae27aae0 100644 --- a/gnome-terminal.spec +++ b/gnome-terminal.spec @@ -1,19 +1,19 @@ Name: gnome-terminal -Version: 3.38.3 -Release: 2 +Version: 3.46.7 +Release: 1 Summary: A terminal emulator for GNOME License: GPL-3.0-or-later and GFDL-1.3-only and LGPL-2.0-or-later URL: http://www.gnome.org/ -Source0: http://download.gnome.org/sources/gnome-terminal/3.38/gnome-terminal-%{version}.tar.xz +Source0: https://gitlab.gnome.org/GNOME/%{name}/-/archive/%{version}/%{name}-%{version}.tar.bz2 +Source1: org.gnome.Terminal.gschema.override Patch0000: gnome-terminal-cntr-ntfy-autottl-ts.patch -Patch0001: 0001-build-Don-t-treat-warnings-as-errors.patch BuildRequires: glib2-devel gtk3-devel gsettings-desktop-schemas-devel BuildRequires: desktop-file-utils gettext-devel autoconf automake BuildRequires: systemd libtool itstool dconf-devel libuuid-devel nautilus-devel -BuildRequires: gnome-shell pcre2-devel vala-devel vte291-devel -BuildRequires: docbook-style-xsl libxslt yelp-tools +BuildRequires: gnome-shell pcre2-devel vala-devel vte291-devel gcc-c++ +BuildRequires: docbook-style-xsl libxslt yelp-tools meson libappstream-glib Requires: dbus dbus-x11 glib2%{?_isa} gsettings-desktop-schemas gtk3%{?_isa} vte291%{?_isa} @@ -27,24 +27,25 @@ This package provides a terminal emulator application for GNOME. %autosetup -n %{name}-%{version} -p1 %build -autoreconf -f -i -%configure \ - --disable-silent-rules \ - --disable-static \ - --enable-debug \ - --with-gtk=3.0 \ - --with-nautilus-extension -%make_build +%meson \ + -Ddebug=true \ + -Ddocs=true \ + -Dnautilus_extension=true \ + -Dsearch_provider=true + +%meson_build %install -%make_install +%meson_install -%delete_la +install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/glib-2.0/schemas %find_lang %{name} --with-gnome %check -make check +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.gnome.Terminal*.metainfo.xml +desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Terminal.desktop +%meson_test %pre @@ -55,24 +56,35 @@ make check %postun %files -f %{name}.lang -%defattr(-,root,root) -%license COPYING AUTHORS -%doc NEWS +%license COPYING COPYING.GFDL +%doc README.md %{_bindir}/gnome-terminal -%{_datadir}/metainfo/org.gnome.Terminal.appdata.xml %{_datadir}/applications/org.gnome.Terminal.desktop +%{_datadir}/applications/org.gnome.Terminal.Preferences.desktop +%{_libexecdir}/gnome-terminal-preferences +%{_libexecdir}/gnome-terminal-server %{_datadir}/dbus-1/services/org.gnome.Terminal.service %{_datadir}/glib-2.0/schemas/org.gnome.Terminal.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.Terminal.gschema.override %{_datadir}/gnome-shell -%{_datadir}/metainfo/org.gnome.Terminal.Nautilus.metainfo.xml -%{_libexecdir}/gnome-terminal-server -%{_libdir}/nautilus/extensions-3.0/libterminal-nautilus.so -%{_userunitdir}/gnome-terminal-server.service %{_datadir}/icons/hicolor/scalable/apps/org.gnome.Terminal.svg %{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Terminal-symbolic.svg -%{_datadir}/man/man1/gnome-terminal.1* +%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Terminal.Preferences.svg +%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Terminal.Preferences-symbolic.svg +%dir %{_datadir}/xdg-terminals +%{_datadir}/xdg-terminals/org.gnome.Terminal.desktop +%dir %{_libdir}/gnome-terminal +%{_libdir}/gnome-terminal/gschemas.compiled +%{_mandir}/man1/gnome-terminal.1* +%{_metainfodir}/org.gnome.Terminal.metainfo.xml +%{_userunitdir}/gnome-terminal-server.service +%{_libdir}/nautilus/extensions-4/libterminal-nautilus.so +%{_metainfodir}/org.gnome.Terminal.Nautilus.metainfo.xml %changelog +* Tue Feb 7 2023 liyanan - 3.46.7-1 +- Update to 3.46.7 + * Wed Jul 27 2022 yaoxin - 3.38.3-2 - license compliance rectification diff --git a/org.gnome.Terminal.gschema.override b/org.gnome.Terminal.gschema.override new file mode 100644 index 0000000000000000000000000000000000000000..917b627bff6e0161ca6697b4c4014f9948a1c3c5 --- /dev/null +++ b/org.gnome.Terminal.gschema.override @@ -0,0 +1,3 @@ +[org.gnome.Terminal.Legacy.Settings] +theme-variant='dark' +unified-menu=false