From 1ab5f005479a30eacb0542d16e8ae9ebe326a0ef Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 18 Feb 2015 16:46:24 +0100 Subject: [PATCH] Update to 3.15.90 - Restore translations for transparency strings - Restore dark terminals - Add command-notify patches --- .gitignore | 1 + 0001-Restore-transparency-gnome-3-14.patch | 328 ---- gnome-terminal-command-notify.patch | 592 ++++++++ gnome-terminal-restore-dark.patch | 196 +++ gnome-terminal-restore-transparency.patch | 1600 ++++++++++++++++++++ gnome-terminal.spec | 24 +- sources | 2 +- 7 files changed, 2406 insertions(+), 337 deletions(-) delete mode 100644 0001-Restore-transparency-gnome-3-14.patch create mode 100644 gnome-terminal-command-notify.patch create mode 100644 gnome-terminal-restore-dark.patch create mode 100644 gnome-terminal-restore-transparency.patch diff --git a/.gitignore b/.gitignore index 3bc9031..c987679 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ gnome-terminal-2.31.3.tar.bz2 /gnome-terminal-3.14.0.tar.xz /gnome-terminal-3.14.1.tar.xz /gnome-terminal-3.14.2.tar.xz +/gnome-terminal-3.15.90.tar.xz diff --git a/0001-Restore-transparency-gnome-3-14.patch b/0001-Restore-transparency-gnome-3-14.patch deleted file mode 100644 index 7cb3732..0000000 --- a/0001-Restore-transparency-gnome-3-14.patch +++ /dev/null @@ -1,328 +0,0 @@ -From 1cb63cd1c90cb5bfc8ed2e6d161a7b96c51d8a29 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray -Date: Mon, 12 May 2014 14:57:18 +0200 -Subject: [PATCH 1/2] Restore transparency - -The transparency settings were removed as a side effect of -2bff4b63ed3ceef6055e35563e9b0b33ad57349d - -This restores them and you will need a compositing window manager to -use it. The background image setting, also known as faux transparency, -was not restored. ---- - src/org.gnome.Terminal.gschema.xml | 10 +++++ - src/profile-editor.c | 11 +++++ - src/profile-preferences.ui | 92 ++++++++++++++++++++++++++++++++++++++ - src/terminal-schemas.h | 3 ++ - src/terminal-screen.c | 22 ++++++++- - src/terminal-window.c | 7 +++ - 6 files changed, 144 insertions(+), 1 deletion(-) - -diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml -index c7d0edb..8910ddd 100644 ---- a/src/org.gnome.Terminal.gschema.xml -+++ b/src/org.gnome.Terminal.gschema.xml -@@ -318,6 +318,16 @@ - 'narrow' - Whether ambiguous-width characters are narrow or wide when using UTF-8 encoding - -+ -+ false -+ Whether to use a transparent background -+ -+ -+ 50 -+ -+ Adjust the amount of transparency -+ A value between 0 and 100, where 0 is opaque and 100 is fully transparent. -+ - - - -diff --git a/src/profile-editor.c b/src/profile-editor.c -index 8e5732d..dac5341 100644 ---- a/src/profile-editor.c -+++ b/src/profile-editor.c -@@ -1099,7 +1099,18 @@ terminal_profile_edit (GSettings *profile, - "active-id", - G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); - -+ g_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); -+ g_settings_bind (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND, -+ gtk_builder_get_object (builder, "background-transparent-scale-box"), -+ "sensitive", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_NO_SENSITIVITY); -+ g_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); -+ - /* Finished! */ -+ - terminal_util_bind_mnemonic_label_sensitivity (editor); - - terminal_util_dialog_focus_widget (editor, widget_name); -diff --git a/src/profile-preferences.ui b/src/profile-preferences.ui -index de901ee..25a284e 100644 ---- a/src/profile-preferences.ui -+++ b/src/profile-preferences.ui -@@ -23,6 +23,11 @@ - 1 - 100 - -+ -+ 100 -+ 1 -+ 10 -+ - - - -@@ -1073,6 +1078,93 @@ - 1 - - -+ -+ -+ True -+ False -+ horizontal -+ 12 -+ -+ -+ Use t_ransparent background -+ True -+ True -+ False -+ True -+ 0 -+ True -+ -+ -+ False -+ False -+ 0 -+ -+ -+ -+ -+ True -+ False -+ horizontal -+ 6 -+ -+ -+ True -+ False -+ 0.5 -+ none -+ -+ -+ -+ False -+ False -+ 0 -+ -+ -+ -+ -+ True -+ True -+ background-transparent-adjustment -+ False -+ -+ -+ True -+ True -+ 1 -+ -+ -+ -+ -+ True -+ False -+ 0.5 -+ full -+ -+ -+ -+ False -+ False -+ 2 -+ -+ -+ -+ -+ True -+ True -+ 1 -+ -+ -+ -+ -+ True -+ True -+ 2 -+ -+ - - - -diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h -index 90cc5a0..a3849eb 100644 ---- a/src/terminal-schemas.h -+++ b/src/terminal-schemas.h -@@ -63,6 +63,9 @@ G_BEGIN_DECLS - #define TERMINAL_PROFILE_USE_THEME_COLORS_KEY "use-theme-colors" - #define TERMINAL_PROFILE_VISIBLE_NAME_KEY "visible-name" - -+#define TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND "use-transparent-background" -+#define TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT "background-transparency-percent" -+ - #define TERMINAL_SETTING_CONFIRM_CLOSE_KEY "confirm-close" - #define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY "default-show-menubar" - #define TERMINAL_SETTING_DARK_THEME_KEY "dark-theme" -diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index ad78388..d09d812 100644 ---- a/src/terminal-screen.c -+++ b/src/terminal-screen.c -@@ -750,7 +750,9 @@ terminal_screen_profile_changed_cb (GSettings *profile, - prop_name == I_(TERMINAL_PROFILE_BACKGROUND_COLOR_KEY) || - prop_name == I_(TERMINAL_PROFILE_BOLD_COLOR_SAME_AS_FG_KEY) || - prop_name == I_(TERMINAL_PROFILE_BOLD_COLOR_KEY) || -- prop_name == I_(TERMINAL_PROFILE_PALETTE_KEY)) -+ prop_name == I_(TERMINAL_PROFILE_PALETTE_KEY) || -+ prop_name == I_(TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND) || -+ prop_name == I_(TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT)) - update_color_scheme (screen); - - if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY)) -@@ -809,6 +811,8 @@ update_color_scheme (TerminalScreen *screen) - GdkRGBA fg, bg, bold, theme_fg, theme_bg; - GdkRGBA *boldp; - GtkStyleContext *context; -+ GtkWidget *toplevel; -+ gboolean transparent; - - context = gtk_widget_get_style_context (widget); - gtk_style_context_get_color (context, GTK_STATE_FLAG_NORMAL, &theme_fg); -@@ -829,9 +833,25 @@ update_color_scheme (TerminalScreen *screen) - boldp = NULL; - - colors = terminal_g_settings_get_rgba_palette (priv->profile, TERMINAL_PROFILE_PALETTE_KEY, &n_colors); -+ -+ transparent = g_settings_get_boolean (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND); -+ if (transparent) -+ { -+ gint transparency_percent; -+ -+ transparency_percent = g_settings_get_int (profile, TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT); -+ bg.alpha = (100 - transparency_percent) / 100.0; -+ } -+ else -+ bg.alpha = 1.0; -+ - vte_terminal_set_colors (VTE_TERMINAL (screen), &fg, &bg, - colors, n_colors); - vte_terminal_set_color_bold (VTE_TERMINAL (screen), boldp); -+ -+ toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen)); -+ if (toplevel != NULL && 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 ce85744..98acab4 100644 ---- a/src/terminal-window.c -+++ b/src/terminal-window.c -@@ -2549,6 +2549,8 @@ terminal_window_init (TerminalWindow *window) - TerminalWindowPrivate *priv; - TerminalApp *app; - TerminalSettingsList *profiles_list; -+ GdkScreen *screen; -+ GdkVisual *visual; - GtkActionGroup *action_group; - GtkAction *action; - GtkUIManager *manager; -@@ -2564,6 +2566,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) -+ gtk_widget_set_visual (GTK_WIDGET (window), visual); -+ - uuid_generate (u); - uuid_unparse (u, uuidstr); - priv->uuid = g_strdup (uuidstr); --- -1.9.3 - - -From df5793813d19dccfb6dfa75c1be766df562adb48 Mon Sep 17 00:00:00 2001 -From: Lars Uebernickel -Date: Wed, 28 May 2014 14:11:02 +0200 -Subject: [PATCH 2/2] window: Make the drawing robust across all themes - -There are lots of themes out there in the wild that do not specify a -background-color for all widgets and the default is transparent. This -is usually not a problem because GTK+ sets an opaque region on the -whole window and things without a background-color get drawn with the -theme's default background colour. However, to achieve transparency -we disable the opaque region by making the window app-paintable. This -can lead to transparent menubars or notebook tabs in some themes. We -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 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/src/terminal-window.c b/src/terminal-window.c -index 98acab4..b838424 100644 ---- a/src/terminal-window.c -+++ b/src/terminal-window.c -@@ -2189,6 +2189,26 @@ terminal_window_realize (GtkWidget *widget) - } - - static gboolean -+terminal_window_draw (GtkWidget *widget, -+ cairo_t *cr) -+{ -+ if (gtk_widget_get_app_paintable (widget)) -+ { -+ GtkStyleContext *context; -+ int width; -+ int height; -+ -+ context = gtk_widget_get_style_context (widget); -+ width = gtk_widget_get_allocated_width (widget); -+ height = gtk_widget_get_allocated_height (widget); -+ gtk_render_background (context, cr, 0, 0, width, height); -+ gtk_render_frame (context, cr, 0, 0, width, height); -+ } -+ -+ return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr); -+} -+ -+static gboolean - terminal_window_state_event (GtkWidget *widget, - GdkEventWindowState *event) - { -@@ -2748,6 +2768,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; - widget_class->window_state_event = terminal_window_state_event; - widget_class->screen_changed = terminal_window_screen_changed; - widget_class->style_updated = terminal_window_style_updated; --- -1.9.3 - diff --git a/gnome-terminal-command-notify.patch b/gnome-terminal-command-notify.patch new file mode 100644 index 0000000..9a03eac --- /dev/null +++ b/gnome-terminal-command-notify.patch @@ -0,0 +1,592 @@ +From 5a956c497e970abf74aab5e72dae7c3e68ebb35a Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Tue, 27 Jan 2015 18:40:13 +0100 +Subject: [PATCH 1/3] Support desktop notifications from OSC 777 + +https://bugzilla.gnome.org/show_bug.cgi?id=711059 +--- + src/terminal-app.c | 32 +++++++++++++++++++++++ + src/terminal-notebook.c | 4 +++ + src/terminal-screen.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ + src/terminal-tab-label.c | 28 +++++++++++++++++++- + src/terminal-tab-label.h | 4 +++ + 5 files changed, 135 insertions(+), 1 deletion(-) + +diff --git a/src/terminal-app.c b/src/terminal-app.c +index 8a9434f..3d09914 100644 +--- a/src/terminal-app.c ++++ b/src/terminal-app.c +@@ -299,6 +299,31 @@ app_menu_quit_cb (GSimpleAction *action, + gtk_widget_destroy (GTK_WIDGET (window)); + } + ++/* Other action callbacks */ ++ ++static void ++action_activate_tab_cb (GSimpleAction *action, ++ GVariant *parameter, ++ gpointer user_data) ++{ ++ GtkApplication *application = 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) ++ return; ++ ++ toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen)); ++ if (!gtk_widget_is_toplevel (toplevel)) ++ return; ++ ++ terminal_window_switch_screen (TERMINAL_WINDOW (toplevel), screen); ++ gtk_window_present (GTK_WINDOW (toplevel)); ++} ++ + /* Class implementation */ + + G_DEFINE_TYPE (TerminalApp, terminal_app, GTK_TYPE_APPLICATION) +@@ -321,6 +346,10 @@ terminal_app_startup (GApplication *application) + { "quit", app_menu_quit_cb, NULL, NULL, NULL } + }; + ++ const GActionEntry other_actions[] = { ++ { "activate-tab", action_activate_tab_cb, "s", NULL, NULL } ++ }; ++ + gs_unref_object GtkBuilder *builder; + GError *error = NULL; + +@@ -332,6 +361,9 @@ terminal_app_startup (GApplication *application) + g_action_map_add_action_entries (G_ACTION_MAP (application), + app_menu_actions, G_N_ELEMENTS (app_menu_actions), + application); ++ g_action_map_add_action_entries (G_ACTION_MAP (application), ++ other_actions, G_N_ELEMENTS (other_actions), ++ application); + + builder = gtk_builder_new (); + gtk_builder_add_from_resource (builder, +diff --git a/src/terminal-notebook.c b/src/terminal-notebook.c +index d855a7b..31f2771 100644 +--- a/src/terminal-notebook.c ++++ b/src/terminal-notebook.c +@@ -243,6 +243,7 @@ terminal_notebook_switch_page (GtkNotebook *gtk_notebook, + { + TerminalNotebook *notebook = TERMINAL_NOTEBOOK (gtk_notebook); + TerminalNotebookPrivate *priv = notebook->priv; ++ GtkWidget *tab_label; + TerminalScreen *screen, *old_active_screen; + + GTK_NOTEBOOK_CLASS (terminal_notebook_parent_class)->switch_page (gtk_notebook, child, page_num); +@@ -253,6 +254,9 @@ terminal_notebook_switch_page (GtkNotebook *gtk_notebook, + if (screen == old_active_screen) + return; + ++ tab_label = gtk_notebook_get_tab_label (gtk_notebook, child); ++ terminal_tab_label_set_icon (TERMINAL_TAB_LABEL (tab_label), NULL, NULL); ++ + /* Workaround to remove gtknotebook's feature of computing its size based on + * all pages. When the widget is hidden, its size will not be taken into + * account. +diff --git a/src/terminal-screen.c b/src/terminal-screen.c +index 8813295..3699874 100644 +--- a/src/terminal-screen.c ++++ b/src/terminal-screen.c +@@ -48,6 +48,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" +@@ -81,6 +82,7 @@ struct _TerminalScreenPrivate + char **initial_env; + char **override_command; + gboolean shell; ++ gboolean shell_prompt_shown; + int child_pid; + GSList *match_tags; + guint launch_child_source_id; +@@ -136,6 +138,9 @@ static gboolean terminal_screen_do_exec (TerminalScreen *screen, + GError **error); + static void terminal_screen_child_exited (VteTerminal *terminal, + int status); ++static void terminal_screen_notification_received (VteTerminal *terminal, ++ const char *summary, ++ const char *body); + + static void terminal_screen_window_title_changed (VteTerminal *vte_terminal, + TerminalScreen *screen); +@@ -440,6 +445,7 @@ terminal_screen_class_init (TerminalScreenClass *klass) + widget_class->popup_menu = terminal_screen_popup_menu; + + terminal_class->child_exited = terminal_screen_child_exited; ++ terminal_class->notification_received = terminal_screen_notification_received; + + signals[PROFILE_SET] = + g_signal_new (I_("profile-set"), +@@ -561,6 +567,10 @@ terminal_screen_dispose (GObject *object) + TerminalScreen *screen = TERMINAL_SCREEN (object); + TerminalScreenPrivate *priv = screen->priv; + GtkSettings *settings; ++ TerminalApp *app; ++ ++ app = terminal_app_get (); ++ g_application_withdraw_notification (G_APPLICATION (app), priv->uuid); + + settings = gtk_widget_get_settings (GTK_WIDGET (screen)); + g_signal_handlers_disconnect_matched (settings, G_SIGNAL_MATCH_DATA, +@@ -1603,6 +1613,64 @@ terminal_screen_child_exited (VteTerminal *terminal, + } + + static void ++terminal_screen_notification_received (VteTerminal *terminal, ++ const char *summary, ++ const char *body) ++{ ++ TerminalScreen *screen = TERMINAL_SCREEN (terminal); ++ TerminalScreenPrivate *priv = screen->priv; ++ TerminalWindow *window; ++ ++ if (G_UNLIKELY (!priv->shell_prompt_shown)) ++ { ++ priv->shell_prompt_shown = TRUE; ++ return; ++ } ++ ++ window = terminal_screen_get_window (screen); ++ if (window == NULL) ++ return; ++ ++ if (gtk_window_is_active (GTK_WINDOW (window))) ++ { ++ GtkWidget *mdi_container; ++ TerminalScreenContainer *screen_container; ++ ++ if (screen == terminal_window_get_active (window)) ++ return; ++ ++ screen_container = terminal_screen_container_get_from_screen (screen); ++ if (screen_container == NULL) ++ return; ++ ++ mdi_container = terminal_window_get_mdi_container (window); ++ /* FIXME: add interface method to retrieve tab label */ ++ if (GTK_IS_NOTEBOOK (mdi_container)) ++ { ++ GtkWidget *tab_label; ++ ++ 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), TRUE); ++ terminal_tab_label_set_icon (TERMINAL_TAB_LABEL (tab_label), "dialog-information-symbolic", summary); ++ } ++ } ++ else ++ { ++ gs_unref_object GNotification *notification = NULL; ++ TerminalApp *app; ++ gs_free char *detailed_action = NULL; ++ ++ notification = g_notification_new (summary); ++ g_notification_set_body (notification, body); ++ detailed_action = g_strdup_printf ("app.activate-tab::%s", priv->uuid); ++ g_notification_set_default_action (notification, detailed_action); ++ ++ app = terminal_app_get (); ++ g_application_send_notification (G_APPLICATION (app), priv->uuid, notification); ++ } ++} ++ ++static void + terminal_screen_drag_data_received (GtkWidget *widget, + GdkDragContext *context, + gint x, +diff --git a/src/terminal-tab-label.c b/src/terminal-tab-label.c +index 0850652..987e93c 100644 +--- a/src/terminal-tab-label.c ++++ b/src/terminal-tab-label.c +@@ -34,6 +34,7 @@ + struct _TerminalTabLabelPrivate + { + TerminalScreen *screen; ++ GtkWidget *icon; + GtkWidget *label; + GtkWidget *close_button; + gboolean bold; +@@ -179,7 +180,7 @@ terminal_tab_label_constructed (GObject *object) + { + TerminalTabLabel *tab_label = TERMINAL_TAB_LABEL (object); + TerminalTabLabelPrivate *priv = tab_label->priv; +- GtkWidget *hbox, *label, *close_button; ++ GtkWidget *hbox, *icon, *label, *close_button; + + G_OBJECT_CLASS (terminal_tab_label_parent_class)->constructed (object); + +@@ -189,6 +190,10 @@ terminal_tab_label_constructed (GObject *object) + + gtk_box_set_spacing (GTK_BOX (hbox), SPACING); + ++ priv->icon = icon = gtk_image_new (); ++ 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); + gtk_widget_set_halign (label, GTK_ALIGN_CENTER); + gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); +@@ -377,6 +382,27 @@ terminal_tab_label_set_bold (TerminalTabLabel *tab_label, + } + + /** ++ * terminal_tab_label_set_icon: ++ * @tab_label: a #TerminalTabLabel ++ * @icon_name: (allow-none): an icon name ++ * @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. ++ */ ++void ++terminal_tab_label_set_icon (TerminalTabLabel *tab_label, ++ const char *icon_name, ++ const char *tooltip) ++{ ++ TerminalTabLabelPrivate *priv = tab_label->priv; ++ ++ gtk_widget_set_visible (priv->icon, icon_name != NULL); ++ 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); ++} ++ ++/** + * terminal_tab_label_get_screen: + * @tab_label: a #TerminalTabLabel + * +diff --git a/src/terminal-tab-label.h b/src/terminal-tab-label.h +index 20cfbce..a987025 100644 +--- a/src/terminal-tab-label.h ++++ b/src/terminal-tab-label.h +@@ -59,6 +59,10 @@ GtkWidget * terminal_tab_label_new (TerminalScreen *screen); + void terminal_tab_label_set_bold (TerminalTabLabel *tab_label, + gboolean bold); + ++void terminal_tab_label_set_icon (TerminalTabLabel *tab_label, ++ const char *icon_name, ++ const char *tooltip); ++ + TerminalScreen *terminal_tab_label_get_screen (TerminalTabLabel *tab_label); + + G_END_DECLS +-- +2.1.0 + + +From fa5163b82ef72cfc43ce2016749eb1e6fa0be813 Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Tue, 27 Jan 2015 19:04:19 +0100 +Subject: [PATCH 2/3] Make notifications based on org.gtk.Notification work + +The desktop file should be named after the application ID for this. + +https://bugzilla.gnome.org/show_bug.cgi?id=711059 +--- + Makefile.am | 4 ++-- + configure.ac | 2 +- + gnome-terminal.appdata.xml.in | 38 ---------------------------------- + gnome-terminal.desktop.in.in | 16 -------------- + org.gnome.Terminal.appdata.xml.in | 38 ++++++++++++++++++++++++++++++++++ + org.gnome.Terminal.desktop.in.in | 16 ++++++++++++++ + po/POTFILES.in | 4 ++-- + po/POTFILES.skip | 2 +- + src/gnome-terminal-search-provider.ini | 2 +- + 9 files changed, 61 insertions(+), 61 deletions(-) + delete mode 100644 gnome-terminal.appdata.xml.in + delete mode 100644 gnome-terminal.desktop.in.in + create mode 100644 org.gnome.Terminal.appdata.xml.in + create mode 100644 org.gnome.Terminal.desktop.in.in + +diff --git a/Makefile.am b/Makefile.am +index f6f41a6..3aa8677 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -14,7 +14,7 @@ DISTCHECK_CONFIGURE_FLAGS = \ + $(NULL) + + desktopdir = $(datadir)/applications +-desktop_in_files = @PACKAGE@.desktop.in.in ++desktop_in_files = org.gnome.Terminal.desktop.in.in + nodist_desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop) + @INTLTOOL_DESKTOP_RULE@ + +@@ -25,7 +25,7 @@ desktop-file-validate: $(nodist_desktop_DATA) + done + + appdatadir = $(datadir)/appdata +-appdata_in_files = gnome-terminal.appdata.xml.in ++appdata_in_files = org.gnome.Terminal.appdata.xml.in + nodist_appdata_DATA = $(appdata_in_files:.xml.in=.xml) + @INTLTOOL_XML_RULE@ + +diff --git a/configure.ac b/configure.ac +index 523a0da..e68392d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -345,7 +345,7 @@ AC_SUBST([AM_LDFLAGS]) + + AC_CONFIG_FILES([ + Makefile +-gnome-terminal.desktop.in ++org.gnome.Terminal.desktop.in + src/Makefile + src/terminal-version.h + help/Makefile +diff --git a/gnome-terminal.appdata.xml.in b/gnome-terminal.appdata.xml.in +deleted file mode 100644 +index 7ef61e9..0000000 +--- a/gnome-terminal.appdata.xml.in ++++ /dev/null +@@ -1,38 +0,0 @@ +- +- +- +- +- gnome-terminal.desktop +- GPL-3.0+ +- GPL-3.0+ +- <_name>Terminal +- <_summary>Use the command line +- +- <_p>GNOME Terminal is a terminal emulator application for accessing a UNIX shell environment which can be used to run programs available on your system. +- <_p>It supports several profiles, multiple tabs and implements several keyboard shortcuts. +- +- +- https://help.gnome.org/users/gnome-terminal/stable/figures/gnome-terminal.png +- +- https://wiki.gnome.org/Apps/Terminal +- GNOME +- https://wiki.gnome.org/Apps/Terminal/ReportingBugs +- +diff --git a/gnome-terminal.desktop.in.in b/gnome-terminal.desktop.in.in +deleted file mode 100644 +index e01c998..0000000 +--- a/gnome-terminal.desktop.in.in ++++ /dev/null +@@ -1,16 +0,0 @@ +-[Desktop Entry] +-_Name=Terminal +-_Comment=Use the command line +-_Keywords=shell;prompt;command;commandline; +-TryExec=gnome-terminal +-Exec=gnome-terminal +-Icon=utilities-terminal +-Type=Application +-X-GNOME-DocPath=gnome-terminal/index.html +-X-GNOME-Bugzilla-Bugzilla=GNOME +-X-GNOME-Bugzilla-Product=gnome-terminal +-X-GNOME-Bugzilla-Component=BugBuddyBugs +-X-GNOME-Bugzilla-Version=@VERSION@ +-Categories=GNOME;GTK;System;TerminalEmulator; +-StartupNotify=true +-X-GNOME-SingleWindow=false +diff --git a/org.gnome.Terminal.appdata.xml.in b/org.gnome.Terminal.appdata.xml.in +new file mode 100644 +index 0000000..ab4f23b +--- /dev/null ++++ b/org.gnome.Terminal.appdata.xml.in +@@ -0,0 +1,38 @@ ++ ++ ++ ++ ++ org.gnome.Terminal.desktop ++ GPL-3.0+ ++ GPL-3.0+ ++ <_name>Terminal ++ <_summary>Use the command line ++ ++ <_p>GNOME Terminal is a terminal emulator application for accessing a UNIX shell environment which can be used to run programs available on your system. ++ <_p>It supports several profiles, multiple tabs and implements several keyboard shortcuts. ++ ++ ++ https://help.gnome.org/users/gnome-terminal/stable/figures/gnome-terminal.png ++ ++ https://wiki.gnome.org/Apps/Terminal ++ GNOME ++ https://wiki.gnome.org/Apps/Terminal/ReportingBugs ++ +diff --git a/org.gnome.Terminal.desktop.in.in b/org.gnome.Terminal.desktop.in.in +new file mode 100644 +index 0000000..e01c998 +--- /dev/null ++++ b/org.gnome.Terminal.desktop.in.in +@@ -0,0 +1,16 @@ ++[Desktop Entry] ++_Name=Terminal ++_Comment=Use the command line ++_Keywords=shell;prompt;command;commandline; ++TryExec=gnome-terminal ++Exec=gnome-terminal ++Icon=utilities-terminal ++Type=Application ++X-GNOME-DocPath=gnome-terminal/index.html ++X-GNOME-Bugzilla-Bugzilla=GNOME ++X-GNOME-Bugzilla-Product=gnome-terminal ++X-GNOME-Bugzilla-Component=BugBuddyBugs ++X-GNOME-Bugzilla-Version=@VERSION@ ++Categories=GNOME;GTK;System;TerminalEmulator; ++StartupNotify=true ++X-GNOME-SingleWindow=false +diff --git a/po/POTFILES.in b/po/POTFILES.in +index af1304d..0aa03ec 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -1,8 +1,8 @@ + [encoding: UTF-8] + # List of source files containing translatable strings. + # Please keep this file sorted alphabetically. +-gnome-terminal.appdata.xml.in +-gnome-terminal.desktop.in.in ++org.gnome.Terminal.appdata.xml.in ++org.gnome.Terminal.desktop.in.in + [type: gettext/glade]src/find-dialog.ui + src/gterminal.vala + src/migration.c +diff --git a/po/POTFILES.skip b/po/POTFILES.skip +index 7c37b7f..ef7c635 100644 +--- a/po/POTFILES.skip ++++ b/po/POTFILES.skip +@@ -1,4 +1,4 @@ + # List of source files that should *not* be translated. + # Please keep this file sorted alphabetically. +-gnome-terminal.desktop.in ++org.gnome.Terminal.desktop.in + src/gterminal.c +diff --git a/src/gnome-terminal-search-provider.ini b/src/gnome-terminal-search-provider.ini +index b6506f2..1b9f81c 100644 +--- a/src/gnome-terminal-search-provider.ini ++++ b/src/gnome-terminal-search-provider.ini +@@ -14,7 +14,7 @@ + # along with this program. If not, see . + + [Shell Search Provider] +-DesktopId=gnome-terminal.desktop ++DesktopId=org.gnome.Terminal.desktop + BusName=org.gnome.Terminal + ObjectPath=/org/gnome/Terminal/SearchProvider + Version=2 +-- +2.1.0 + + +From 8ad7481febb1cd6e4341c650abc082c12cd79755 Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Thu, 29 Jan 2015 11:47:21 +0100 +Subject: [PATCH 3/3] Sprinkle debug messages for notifications + +This can be useful for finding out whether the escape sequence wasn't +emitted or the filtering was faulty. + +https://bugzilla.gnome.org/show_bug.cgi?id=711059 +--- + src/terminal-debug.c | 1 + + src/terminal-debug.h | 3 ++- + src/terminal-screen.c | 4 ++++ + 3 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/terminal-debug.c b/src/terminal-debug.c +index 0ff321f..dac79c3 100644 +--- a/src/terminal-debug.c ++++ b/src/terminal-debug.c +@@ -38,6 +38,7 @@ _terminal_debug_init(void) + { "settings-list", TERMINAL_DEBUG_SETTINGS_LIST }, + { "appmenu", TERMINAL_DEBUG_APPMENU }, + { "search", TERMINAL_DEBUG_SEARCH }, ++ { "notifications", TERMINAL_DEBUG_NOTIFICATIONS }, + }; + + _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 5dc3ca4..7499ebe 100644 +--- a/src/terminal-debug.h ++++ b/src/terminal-debug.h +@@ -34,7 +34,8 @@ typedef enum { + TERMINAL_DEBUG_PROFILE = 1 << 6, + TERMINAL_DEBUG_SETTINGS_LIST = 1 << 7, + TERMINAL_DEBUG_APPMENU = 1 << 8, +- TERMINAL_DEBUG_SEARCH = 1 << 9 ++ TERMINAL_DEBUG_SEARCH = 1 << 9, ++ TERMINAL_DEBUG_NOTIFICATIONS = 1 << 10 + } TerminalDebugFlags; + + void _terminal_debug_init(void); +diff --git a/src/terminal-screen.c b/src/terminal-screen.c +index 3699874..326dd3f 100644 +--- a/src/terminal-screen.c ++++ b/src/terminal-screen.c +@@ -1621,6 +1621,8 @@ terminal_screen_notification_received (VteTerminal *terminal, + TerminalScreenPrivate *priv = screen->priv; + TerminalWindow *window; + ++ _terminal_debug_print (TERMINAL_DEBUG_NOTIFICATIONS, "Notification received: [%s]: %s\n", summary, body); ++ + if (G_UNLIKELY (!priv->shell_prompt_shown)) + { + priv->shell_prompt_shown = TRUE; +@@ -1652,6 +1654,7 @@ terminal_screen_notification_received (VteTerminal *terminal, + 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), TRUE); + terminal_tab_label_set_icon (TERMINAL_TAB_LABEL (tab_label), "dialog-information-symbolic", summary); ++ _terminal_debug_print (TERMINAL_DEBUG_NOTIFICATIONS, "Notify tab\n"); + } + } + else +@@ -1667,6 +1670,7 @@ terminal_screen_notification_received (VteTerminal *terminal, + + app = terminal_app_get (); + g_application_send_notification (G_APPLICATION (app), priv->uuid, notification); ++ _terminal_debug_print (TERMINAL_DEBUG_NOTIFICATIONS, "Notify desktop\n"); + } + } + +-- +2.1.0 + diff --git a/gnome-terminal-restore-dark.patch b/gnome-terminal-restore-dark.patch new file mode 100644 index 0000000..3d6873a --- /dev/null +++ b/gnome-terminal-restore-dark.patch @@ -0,0 +1,196 @@ +From 2abe546b53ee00005ab76c5ef26e557a9422b980 Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Tue, 17 Feb 2015 13:22:11 +0100 +Subject: [PATCH 1/2] Revert "prefs: Remove dark theme pref" + +This reverts commit 5f6c514a8840a5d1b87a8c399defee3b5052ec18. +--- + src/org.gnome.Terminal.gschema.xml | 5 +++++ + src/preferences.ui | 16 ++++++++++++++++ + src/terminal-app.c | 4 ++++ + src/terminal-prefs.c | 9 ++++++++- + src/terminal-schemas.h | 1 + + 5 files changed, 34 insertions(+), 1 deletion(-) + +diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml +index e480155..668e8e1 100644 +--- a/src/org.gnome.Terminal.gschema.xml ++++ b/src/org.gnome.Terminal.gschema.xml +@@ -646,6 +646,11 @@ + Whether to show the menubar in new windows + + ++ ++ false ++ Whether to use a dark theme variant ++ ++ + + 'window' + Whether to open new terminals as windows or tabs +diff --git a/src/preferences.ui b/src/preferences.ui +index f64a11b..df82508 100644 +--- a/src/preferences.ui ++++ b/src/preferences.ui +@@ -139,6 +139,22 @@ + + + ++ ++ Use _dark theme variant ++ True ++ True ++ False ++ True ++ 0 ++ True ++ ++ ++ False ++ True ++ 3 ++ ++ ++ + + True + False +diff --git a/src/terminal-app.c b/src/terminal-app.c +index 8a9434f..95302c5 100644 +--- a/src/terminal-app.c ++++ b/src/terminal-app.c +@@ -362,6 +362,10 @@ terminal_app_init (TerminalApp *app) + + /* Terminal global settings */ + app->global_settings = g_settings_new (TERMINAL_SETTING_SCHEMA); ++ g_settings_bind (app->global_settings, TERMINAL_SETTING_DARK_THEME_KEY, ++ gtk_settings_get_default (), ++ "gtk-application-prefer-dark-theme", ++ G_SETTINGS_BIND_GET); + + /* Check if we need to migrate from gconf to dconf */ + maybe_migrate_settings (app); +diff --git a/src/terminal-prefs.c b/src/terminal-prefs.c +index 97f6c33..a57dde6 100644 +--- a/src/terminal-prefs.c ++++ b/src/terminal-prefs.c +@@ -562,7 +562,7 @@ terminal_prefs_show_preferences (GtkWindow *transient_parent, + GtkWidget *show_menubar_button, *disable_mnemonics_button, *disable_menu_accel_button; + GtkWidget *disable_shortcuts_button; + GtkWidget *tree_view_container, *new_button, *edit_button, *clone_button, *remove_button; +- GtkWidget *new_terminal_mode_combo; ++ GtkWidget *dark_theme_button, *new_terminal_mode_combo; + GtkWidget *default_hbox, *default_label; + GtkTreeSelection *selection; + GSettings *settings; +@@ -583,6 +583,7 @@ terminal_prefs_show_preferences (GtkWindow *transient_parent, + "preferences-dialog", + "preferences-dialog", &dialog, + "default-show-menubar-checkbutton", &show_menubar_button, ++ "dark-theme-checkbutton", &dark_theme_button, + "new-terminal-mode-combobox", &new_terminal_mode_combo, + "disable-mnemonics-checkbutton", &disable_mnemonics_button, + "disable-shortcuts-checkbutton", &disable_shortcuts_button, +@@ -613,6 +614,12 @@ terminal_prefs_show_preferences (GtkWindow *transient_parent, + G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); + + g_settings_bind (settings, ++ TERMINAL_SETTING_DARK_THEME_KEY, ++ dark_theme_button, ++ "active", ++ G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); ++ ++ g_settings_bind (settings, + TERMINAL_SETTING_NEW_TERMINAL_MODE_KEY, + new_terminal_mode_combo, + "active-id", +diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h +index 17ffdb2..8a1b45a 100644 +--- a/src/terminal-schemas.h ++++ b/src/terminal-schemas.h +@@ -66,6 +66,7 @@ G_BEGIN_DECLS + + #define TERMINAL_SETTING_CONFIRM_CLOSE_KEY "confirm-close" + #define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY "default-show-menubar" ++#define TERMINAL_SETTING_DARK_THEME_KEY "dark-theme" + #define TERMINAL_SETTING_ENABLE_MENU_BAR_ACCEL_KEY "menu-accelerator-enabled" + #define TERMINAL_SETTING_ENABLE_MNEMONICS_KEY "mnemonics-enabled" + #define TERMINAL_SETTING_ENABLE_SHORTCUTS_KEY "shortcuts-enabled" +-- +2.1.0 + + +From c940c71749614e32bf8878c9303432da6ac15164 Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Tue, 17 Feb 2015 13:22:21 +0100 +Subject: [PATCH 2/2] Revert "help: Remove dark theme pref" + +This reverts commit baaca6a4cc5ca78d7b0e02cfaee6c159bad7ce4b. +--- + help/C/pref-theme.page | 41 +++++++++++++++++++++++++++++++++++++++++ + help/Makefile.am | 1 + + 2 files changed, 42 insertions(+) + create mode 100644 help/C/pref-theme.page + +diff --git a/help/C/pref-theme.page b/help/C/pref-theme.page +new file mode 100644 +index 0000000..a997d14 +--- /dev/null ++++ b/help/C/pref-theme.page +@@ -0,0 +1,41 @@ ++ ++ ++ ++ ++ ++ ++ ++ Ekaterina Gerasimova ++ kittykat3756@gmail.com ++ 2014 ++ ++ ++ ++ ++ ++ Use either the light or dark theme for Terminal. ++ ++ ++ Chose the window theme ++ ++

You can chose to use either the dark theme or the light theme for the ++ terminal window.

++ ++ ++ ++

Select ++ EditPreferencesGeneral.

++ ++ ++

To use the dark theme, select Use dark theme variant.

++ ++ ++ ++ +diff --git a/help/Makefile.am b/help/Makefile.am +index 33389c5..9c02a74 100644 +--- a/help/Makefile.am ++++ b/help/Makefile.am +@@ -35,6 +35,7 @@ HELP_FILES = \ + pref-profile-encoding.page \ + pref-scrolling.page \ + pref-tab-window.page \ ++ pref-theme.page \ + pref-user-input.page \ + profile.page \ + prob-reset.page \ +-- +2.1.0 + diff --git a/gnome-terminal-restore-transparency.patch b/gnome-terminal-restore-transparency.patch new file mode 100644 index 0000000..4762200 --- /dev/null +++ b/gnome-terminal-restore-transparency.patch @@ -0,0 +1,1600 @@ +From aa7451ad6a9b4ea0f4d624320dba41d69d0cb8c9 Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Mon, 12 May 2014 14:57:18 +0200 +Subject: [PATCH 1/3] Restore transparency + +The transparency settings were removed as a side effect of +2bff4b63ed3ceef6055e35563e9b0b33ad57349d + +This restores them and you will need a compositing window manager to +use it. The background image setting, also known as faux transparency, +was not restored. + +The transparency checkbox lost its mnemonic accelerator because 't' +is already taken and using any other letter would make it hard to +restore the translations of the string. +--- + src/org.gnome.Terminal.gschema.xml | 10 +++++ + src/profile-editor.c | 11 +++++ + src/profile-preferences.ui | 92 ++++++++++++++++++++++++++++++++++++++ + src/terminal-schemas.h | 3 ++ + src/terminal-screen.c | 22 ++++++++- + src/terminal-window.c | 7 +++ + 6 files changed, 144 insertions(+), 1 deletion(-) + +diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml +index e480155..051bdc4 100644 +--- a/src/org.gnome.Terminal.gschema.xml ++++ b/src/org.gnome.Terminal.gschema.xml +@@ -332,6 +332,16 @@ + 'narrow' + Whether ambiguous-width characters are narrow or wide when using UTF-8 encoding + ++ ++ false ++ Whether to use a transparent background ++ ++ ++ 50 ++ ++ Adjust the amount of transparency ++ A value between 0 and 100, where 0 is opaque and 100 is fully transparent. ++ + + + +diff --git a/src/profile-editor.c b/src/profile-editor.c +index 8e5732d..dac5341 100644 +--- a/src/profile-editor.c ++++ b/src/profile-editor.c +@@ -1099,7 +1099,18 @@ terminal_profile_edit (GSettings *profile, + "active-id", + G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); + ++ g_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); ++ g_settings_bind (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND, ++ gtk_builder_get_object (builder, "background-transparent-scale-box"), ++ "sensitive", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_NO_SENSITIVITY); ++ g_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); ++ + /* Finished! */ ++ + terminal_util_bind_mnemonic_label_sensitivity (editor); + + terminal_util_dialog_focus_widget (editor, widget_name); +diff --git a/src/profile-preferences.ui b/src/profile-preferences.ui +index 488e777..6f27fe7 100644 +--- a/src/profile-preferences.ui ++++ b/src/profile-preferences.ui +@@ -23,6 +23,11 @@ + 1 + 100 + ++ ++ 100 ++ 1 ++ 10 ++ + + + +@@ -1045,6 +1050,93 @@ + 1 + + ++ ++ ++ True ++ False ++ horizontal ++ 12 ++ ++ ++ Transparent background ++ True ++ True ++ False ++ True ++ 0 ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ False ++ horizontal ++ 6 ++ ++ ++ True ++ False ++ 0.5 ++ none ++ ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ True ++ background-transparent-adjustment ++ False ++ ++ ++ True ++ True ++ 1 ++ ++ ++ ++ ++ True ++ False ++ 0.5 ++ full ++ ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ True ++ True ++ 1 ++ ++ ++ ++ ++ True ++ True ++ 2 ++ ++ + + + +diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h +index 17ffdb2..0fcbf52 100644 +--- a/src/terminal-schemas.h ++++ b/src/terminal-schemas.h +@@ -64,6 +64,9 @@ G_BEGIN_DECLS + #define TERMINAL_PROFILE_VISIBLE_NAME_KEY "visible-name" + #define TERMINAL_PROFILE_WORD_CHAR_EXCEPTIONS_KEY "word-char-exceptions" + ++#define TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND "use-transparent-background" ++#define TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT "background-transparency-percent" ++ + #define TERMINAL_SETTING_CONFIRM_CLOSE_KEY "confirm-close" + #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 8813295..62c9f5e 100644 +--- a/src/terminal-screen.c ++++ b/src/terminal-screen.c +@@ -750,7 +750,9 @@ terminal_screen_profile_changed_cb (GSettings *profile, + prop_name == I_(TERMINAL_PROFILE_BACKGROUND_COLOR_KEY) || + prop_name == I_(TERMINAL_PROFILE_BOLD_COLOR_SAME_AS_FG_KEY) || + prop_name == I_(TERMINAL_PROFILE_BOLD_COLOR_KEY) || +- prop_name == I_(TERMINAL_PROFILE_PALETTE_KEY)) ++ prop_name == I_(TERMINAL_PROFILE_PALETTE_KEY) || ++ prop_name == I_(TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND) || ++ prop_name == I_(TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT)) + update_color_scheme (screen); + + if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY)) +@@ -816,6 +818,8 @@ update_color_scheme (TerminalScreen *screen) + GdkRGBA fg, bg, bold, theme_fg, theme_bg; + GdkRGBA *boldp; + GtkStyleContext *context; ++ GtkWidget *toplevel; ++ gboolean transparent; + + context = gtk_widget_get_style_context (widget); + gtk_style_context_get_color (context, GTK_STATE_FLAG_NORMAL, &theme_fg); +@@ -836,9 +840,25 @@ update_color_scheme (TerminalScreen *screen) + boldp = NULL; + + colors = terminal_g_settings_get_rgba_palette (priv->profile, TERMINAL_PROFILE_PALETTE_KEY, &n_colors); ++ ++ transparent = g_settings_get_boolean (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND); ++ if (transparent) ++ { ++ gint transparency_percent; ++ ++ transparency_percent = g_settings_get_int (profile, TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT); ++ bg.alpha = (100 - transparency_percent) / 100.0; ++ } ++ else ++ bg.alpha = 1.0; ++ + vte_terminal_set_colors (VTE_TERMINAL (screen), &fg, &bg, + colors, n_colors); + vte_terminal_set_color_bold (VTE_TERMINAL (screen), boldp); ++ ++ toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen)); ++ if (toplevel != NULL && 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 d147ed8..fe9dc7e 100644 +--- a/src/terminal-window.c ++++ b/src/terminal-window.c +@@ -2549,6 +2549,8 @@ terminal_window_init (TerminalWindow *window) + TerminalWindowPrivate *priv; + TerminalApp *app; + TerminalSettingsList *profiles_list; ++ GdkScreen *screen; ++ GdkVisual *visual; + GtkActionGroup *action_group; + GtkAction *action; + GtkUIManager *manager; +@@ -2564,6 +2566,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) ++ gtk_widget_set_visual (GTK_WIDGET (window), visual); ++ + uuid_generate (u); + uuid_unparse (u, uuidstr); + priv->uuid = g_strdup (uuidstr); +-- +2.1.0 + + +From 4a8ac3ede3918c5e3a0a23345cc5e62d5fbedec0 Mon Sep 17 00:00:00 2001 +From: Lars Uebernickel +Date: Wed, 28 May 2014 14:11:02 +0200 +Subject: [PATCH 2/3] window: Make the drawing robust across all themes + +There are lots of themes out there in the wild that do not specify a +background-color for all widgets and the default is transparent. This +is usually not a problem because GTK+ sets an opaque region on the +whole window and things without a background-color get drawn with the +theme's default background colour. However, to achieve transparency +we disable the opaque region by making the window app-paintable. This +can lead to transparent menubars or notebook tabs in some themes. We +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 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +diff --git a/src/terminal-window.c b/src/terminal-window.c +index fe9dc7e..f239c1d 100644 +--- a/src/terminal-window.c ++++ b/src/terminal-window.c +@@ -2189,6 +2189,26 @@ terminal_window_realize (GtkWidget *widget) + } + + static gboolean ++terminal_window_draw (GtkWidget *widget, ++ cairo_t *cr) ++{ ++ if (gtk_widget_get_app_paintable (widget)) ++ { ++ GtkStyleContext *context; ++ int width; ++ int height; ++ ++ context = gtk_widget_get_style_context (widget); ++ width = gtk_widget_get_allocated_width (widget); ++ height = gtk_widget_get_allocated_height (widget); ++ gtk_render_background (context, cr, 0, 0, width, height); ++ gtk_render_frame (context, cr, 0, 0, width, height); ++ } ++ ++ return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr); ++} ++ ++static gboolean + terminal_window_state_event (GtkWidget *widget, + GdkEventWindowState *event) + { +@@ -2753,6 +2773,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; + widget_class->window_state_event = terminal_window_state_event; + widget_class->screen_changed = terminal_window_screen_changed; + widget_class->style_updated = terminal_window_style_updated; +-- +2.1.0 + + +From 682e352be0541c33d63c1d7c4ecebd515773859f Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Tue, 17 Feb 2015 17:06:17 +0100 +Subject: [PATCH 3/3] Restore translations for transparency + +--- + po/am.po | 4 ++-- + po/ar.po | 4 ++-- + po/as.po | 4 ++-- + po/ast.po | 4 ++-- + po/az.po | 4 ++-- + po/be.po | 3 +++ + po/be@latin.po | 4 ++-- + po/bg.po | 3 +++ + po/bn_IN.po | 3 +++ + po/bs.po | 4 ++-- + po/ca.po | 3 +++ + po/ca@valencia.po | 3 +++ + po/cs.po | 3 +++ + po/cy.po | 4 ++-- + po/da.po | 4 ++-- + po/de.po | 4 ++-- + po/dz.po | 4 ++-- + po/el.po | 3 +++ + po/en@shaw.po | 4 ++-- + po/en_CA.po | 4 ++-- + po/en_GB.po | 4 ++-- + po/es.po | 4 ++-- + po/et.po | 3 +++ + po/eu.po | 4 ++-- + po/fa.po | 3 +++ + po/fi.po | 3 +++ + po/fr.po | 3 +++ + po/fur.po | 4 ++-- + po/ga.po | 3 +++ + po/gl.po | 4 ++-- + po/gu.po | 4 ++-- + po/he.po | 4 ++-- + po/hi.po | 4 ++-- + po/hr.po | 4 ++-- + po/hu.po | 3 +++ + po/hy.po | 4 ++-- + po/id.po | 3 +++ + po/it.po | 3 +++ + po/ja.po | 4 ++-- + po/ka.po | 2 +- + po/kk.po | 3 +++ + po/kn.po | 3 +++ + po/ko.po | 3 +++ + po/ku.po | 4 ++-- + po/lt.po | 3 +++ + po/lv.po | 4 ++-- + po/mai.po | 4 ++-- + po/mg.po | 4 ++-- + po/mk.po | 4 ++-- + po/ml.po | 4 ++-- + po/mn.po | 4 ++-- + po/mr.po | 4 ++-- + po/ms.po | 4 ++-- + po/nb.po | 3 +++ + po/nds.po | 4 ++-- + po/ne.po | 4 ++-- + po/nl.po | 3 +++ + po/nn.po | 4 ++-- + po/oc.po | 4 ++-- + po/or.po | 4 ++-- + po/pa.po | 4 ++-- + po/pl.po | 3 +++ + po/ps.po | 4 ++-- + po/pt.po | 4 ++-- + po/pt_BR.po | 3 +++ + po/ro.po | 4 ++-- + po/ru.po | 3 +++ + po/rw.po | 2 +- + po/si.po | 4 ++-- + po/sk.po | 3 +++ + po/sl.po | 3 +++ + po/sq.po | 4 ++-- + po/sr.po | 3 +++ + po/sr@latin.po | 3 +++ + po/sv.po | 4 ++-- + po/ta.po | 4 ++-- + po/te.po | 4 ++-- + po/th.po | 4 ++-- + po/tr.po | 3 +++ + po/ug.po | 4 ++-- + po/uk.po | 4 ++-- + po/vi.po | 3 +++ + po/wa.po | 4 ++-- + po/xh.po | 4 ++-- + po/zh_CN.po | 3 +++ + po/zh_HK.po | 3 +++ + po/zh_TW.po | 3 +++ + 87 files changed, 205 insertions(+), 106 deletions(-) + +diff --git a/po/am.po b/po/am.po +index 27a7e96..04a8ad9 100644 +--- a/po/am.po ++++ b/po/am.po +@@ -613,8 +613,8 @@ msgid "_Text color:" + msgstr "የ_ጽሑፍ ቀለም፦" + + #: ../src/gnome-terminal.glade2.h:102 +-msgid "_Transparent background" +-msgstr "_የሚያሳይ መደብ" ++msgid "Transparent background" ++msgstr "የሚያሳይ መደብ" + + #: ../src/gnome-terminal.glade2.h:103 + msgid "_Update login records when command is launched" +diff --git a/po/ar.po b/po/ar.po +index 04ba00a..574aa89 100644 +--- a/po/ar.po ++++ b/po/ar.po +@@ -2881,8 +2881,8 @@ msgstr "أغ_لق النافذة" + #~ msgid "Background image _scrolls" + #~ msgstr "صورة الخلفية ت_لتف" + +-#~ msgid "_Transparent background" +-#~ msgstr "خلفية _شفافة" ++msgid "Transparent background" ++msgstr "خلفية شفافة" + + #~ msgid "S_hade transparent or image background:" + #~ msgstr "_ظلل شفافية أو صورة الخلفية:" +diff --git a/po/as.po b/po/as.po +index 0bd699d..63fca01 100644 +--- a/po/as.po ++++ b/po/as.po +@@ -2979,8 +2979,8 @@ msgstr "উইন্ডো বন্ধ কৰক (_l)" + #~ msgid "Background image _scrolls" + #~ msgstr "পটভূমিৰ ছবি স্ক্ৰল কৰক (_s)" + +-#~ msgid "_Transparent background" +-#~ msgstr "স্বচ্চ পটভূমি (_T)" ++msgid "Transparent background" ++msgstr "স্বচ্চ পটভূমি " + + #~ msgid "S_hade transparent or image background:" + #~ msgstr "স্বচ্ছ বা ছবিৰ সৈতে পটভূমি ছায়া আচ্ছন্ন কৰক (_h):" +diff --git a/po/ast.po b/po/ast.po +index d1c6e7b..4210820 100644 +--- a/po/ast.po ++++ b/po/ast.po +@@ -1598,8 +1598,8 @@ msgid "_Text color:" + msgstr "Color del _testu:" + + #: ../src/profile-preferences.glade.h:77 +-msgid "_Transparent background" +-msgstr "Fondu _tresparente" ++msgid "Transparent background" ++msgstr "Fondu tresparente" + + #: ../src/profile-preferences.glade.h:78 + msgid "_Underline color:" +diff --git a/po/az.po b/po/az.po +index b0f2e3e..877f114 100644 +--- a/po/az.po ++++ b/po/az.po +@@ -619,8 +619,8 @@ msgid "_Text color:" + msgstr "_Mətn rəngi:" + + #: ../src/gnome-terminal.glade2.h:102 +-msgid "_Transparent background" +-msgstr "_Şəffaf arxa plan" ++msgid "Transparent background" ++msgstr "Şəffaf arxa plan" + + #: ../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 fca0ae4..74ff329 100644 +--- a/po/be.po ++++ b/po/be.po +@@ -2015,3 +2015,6 @@ msgstr "" + msgid "C_lose Window" + msgstr "_Закрыць акно" + ++msgid "Transparent background" ++msgstr "Празрысты фон" ++ +diff --git a/po/be@latin.po b/po/be@latin.po +index 1e057c7..1d22a58 100644 +--- a/po/be@latin.po ++++ b/po/be@latin.po +@@ -1425,8 +1425,8 @@ msgid "_Text color:" + msgstr "Koler _tekstu:" + + #: ../src/profile-preferences.glade.h:73 +-msgid "_Transparent background" +-msgstr "_Prazrysty fon" ++msgid "Transparent background" ++msgstr "Prazrysty fon" + + #: ../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 dccd7e0..31ff48c 100644 +--- a/po/bg.po ++++ b/po/bg.po +@@ -2103,3 +2103,6 @@ msgstr "" + #: ../src/terminal-window.c:3645 + msgid "C_lose Window" + msgstr "_Затваряне на този прозорец" ++ ++msgid "Transparent background" ++msgstr "Прозрачен фон" +diff --git a/po/bn_IN.po b/po/bn_IN.po +index c74246a..d65b322 100644 +--- a/po/bn_IN.po ++++ b/po/bn_IN.po +@@ -2358,3 +2358,6 @@ msgstr "উইন্ডো বন্ধ করুন (_l)" + + #~ msgid "_Title:" + #~ msgstr "শিরোনাম: (_T)" ++ ++msgid "Transparent background" ++msgstr "স্বচ্চ পটভূমি " +diff --git a/po/bs.po b/po/bs.po +index 31db864..e02cd1c 100644 +--- a/po/bs.po ++++ b/po/bs.po +@@ -620,8 +620,8 @@ msgid "_Text color:" + msgstr "Boja _teksta:" + + #: ../src/gnome-terminal.glade2.h:102 +-msgid "_Transparent background" +-msgstr "_Providna pozadina" ++msgid "Transparent background" ++msgstr "Providna pozadina" + + #: ../src/gnome-terminal.glade2.h:103 + msgid "_Update login records when command is launched" +diff --git a/po/ca.po b/po/ca.po +index 917b700..ab21a12 100644 +--- a/po/ca.po ++++ b/po/ca.po +@@ -2102,3 +2102,6 @@ msgstr "" + #: ../src/terminal-window.c:3645 + msgid "C_lose Window" + msgstr "Tanca la _finestra" ++ ++msgid "Transparent background" ++msgstr "Fons transparent" +diff --git a/po/ca@valencia.po b/po/ca@valencia.po +index 22917ab..f7a4f48 100644 +--- a/po/ca@valencia.po ++++ b/po/ca@valencia.po +@@ -2092,3 +2092,6 @@ msgstr "" + #: ../src/terminal-window.c:3645 + msgid "C_lose Window" + msgstr "Tanca la _finestra" ++ ++msgid "Transparent background" ++msgstr "Fons transparent" +diff --git a/po/cs.po b/po/cs.po +index 75a7cbb..a7b654f 100644 +--- a/po/cs.po ++++ b/po/cs.po +@@ -2062,3 +2062,6 @@ msgstr "" + #: ../src/terminal-window.c:3643 + msgid "C_lose Window" + msgstr "_Zavřít okno" ++ ++msgid "Transparent background" ++msgstr "Průsvitné pozadí" +diff --git a/po/cy.po b/po/cy.po +index 06d0e3c..2491bd1 100644 +--- a/po/cy.po ++++ b/po/cy.po +@@ -1447,8 +1447,8 @@ msgid "_Text color:" + msgstr "Lliw'r _testun:" + + #: ../src/profile-preferences.glade.h:73 +-msgid "_Transparent background" +-msgstr "Cefndir _tryloyw" ++msgid "Transparent background" ++msgstr "Cefndir tryloyw" + + #: ../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 a6600c9..c3731b2 100644 +--- a/po/da.po ++++ b/po/da.po +@@ -2971,8 +2971,8 @@ msgstr "_Luk vindue" + #~ msgid "_Solid color" + #~ msgstr "_Ensfarvet" + +-#~ msgid "_Transparent background" +-#~ msgstr "_Gennemsigtig baggrund" ++msgid "Transparent background" ++msgstr "Gennemsigtig baggrund" + + #~ msgid "" + #~ "You already have a profile called “%s”. Do you want to create another " +diff --git a/po/de.po b/po/de.po +index 61b9fc1..9e91981 100644 +--- a/po/de.po ++++ b/po/de.po +@@ -3045,8 +3045,8 @@ msgstr "Fenster _schließen" + #~ msgid "Background image _scrolls" + #~ msgstr "Hintergrundbild _folgt Bildlauf" + +-#~ msgid "_Transparent background" +-#~ msgstr "_Transparenter Hintergrund" ++msgid "Transparent background" ++msgstr "Transparenter Hintergrund" + + #~ msgid "S_hade transparent or image background:" + #~ msgstr "Transparenz und Bildhintergründe _abdunkeln:" +diff --git a/po/dz.po b/po/dz.po +index ecb8fd5..290934a 100644 +--- a/po/dz.po ++++ b/po/dz.po +@@ -1551,8 +1551,8 @@ msgid "_Text color:" + msgstr "ཚིག་ཡིག་ཚོས་གཞི་:(_T)" + + #: ../src/profile-preferences.glade.h:77 +-msgid "_Transparent background" +-msgstr "དྭངས་གསལ་རྒྱབ་གཞི།(_T)" ++msgid "Transparent background" ++msgstr "དྭངས་གསལ་རྒྱབ་གཞི།" + + #: ../src/profile-preferences.glade.h:78 + #, fuzzy +diff --git a/po/el.po b/po/el.po +index 8367eae..dc5978d 100644 +--- a/po/el.po ++++ b/po/el.po +@@ -2278,3 +2278,6 @@ msgstr "Κ_λείσιμο παραθύρου" + + #~ msgid "_Input Methods" + #~ msgstr "_Μέθοδοι εισαγωγής" ++ ++msgid "Transparent background" ++msgstr "Διάφανο παρασκήνιο" +diff --git a/po/en@shaw.po b/po/en@shaw.po +index 65f3d41..05dc99d 100644 +--- a/po/en@shaw.po ++++ b/po/en@shaw.po +@@ -1467,8 +1467,8 @@ msgid "_Text color:" + msgstr "_𐑑𐑧𐑒𐑕𐑑 𐑒𐑳𐑤𐑼:" + + #: ../src/profile-preferences.glade.h:78 +-msgid "_Transparent background" +-msgstr "_𐑑𐑮𐑨𐑯𐑕𐑐𐑸𐑩𐑯𐑑 𐑚𐑨𐑒𐑜𐑮𐑬𐑯𐑛" ++msgid "Transparent background" ++msgstr "𐑑𐑮𐑨𐑯𐑕𐑐𐑸𐑩𐑯𐑑 𐑚𐑨𐑒𐑜𐑮𐑬𐑯𐑛" + + #: ../src/profile-preferences.glade.h:79 + msgid "_Underline color:" +diff --git a/po/en_CA.po b/po/en_CA.po +index c79cbf5..b8b14d2 100644 +--- a/po/en_CA.po ++++ b/po/en_CA.po +@@ -556,8 +556,8 @@ msgid "_Text color:" + msgstr "_Text colour:" + + #: ../src/gnome-terminal.glade2.h:86 +-msgid "_Transparent background" +-msgstr "_Transparent background" ++msgid "Transparent background" ++msgstr "Transparent background" + + #: ../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 4d38486..69e7113 100644 +--- a/po/en_GB.po ++++ b/po/en_GB.po +@@ -2732,8 +2732,8 @@ msgstr "_Title:" + #~ msgid "Background image _scrolls" + #~ msgstr "Background image _scrolls" + +-#~ msgid "_Transparent background" +-#~ msgstr "_Transparent background" ++msgid "Transparent background" ++msgstr "Transparent background" + + #~ msgid "S_hade transparent or image background:" + #~ msgstr "S_hade transparent or image background:" +diff --git a/po/es.po b/po/es.po +index e142e44..2eb2155 100644 +--- a/po/es.po ++++ b/po/es.po +@@ -3097,8 +3097,8 @@ msgstr "_Cerrar ventana" + #~ msgid "_Solid color" + #~ msgstr "Color _sólido" + +-#~ msgid "_Transparent background" +-#~ msgstr "Fondo _transparente" ++msgid "Transparent background" ++msgstr "Fondo transparente" + + #~ 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 4b1c2a7..7707611 100644 +--- a/po/et.po ++++ b/po/et.po +@@ -1747,3 +1747,6 @@ msgstr "Su_lge aken" + + #~ msgid "Choose base profile" + #~ msgstr "Vali põhiprofiil" ++ ++msgid "Transparent background" ++msgstr "Läbipaistev taust" +diff --git a/po/eu.po b/po/eu.po +index 9d47c54..3ce1d91 100644 +--- a/po/eu.po ++++ b/po/eu.po +@@ -2957,8 +2957,8 @@ msgstr "It_xi leihoa" + #~ msgid "_Solid color" + #~ msgstr "_Kolore solidoa" + +-#~ msgid "_Transparent background" +-#~ msgstr "_Atzeko plano gardena" ++msgid "Transparent background" ++msgstr "Atzeko plano gardena" + + #~ msgid "" + #~ "You already have a profile called “%s”. Do you want to create another " +diff --git a/po/fa.po b/po/fa.po +index 2090863..b9a05af 100644 +--- a/po/fa.po ++++ b/po/fa.po +@@ -2027,3 +2027,6 @@ msgstr "ذخیره به نام..." + #: ../src/terminal-window.c:3456 + msgid "_Title:" + msgstr "_عنوان:" ++ ++msgid "Transparent background" ++msgstr "پس‌زمینه‌ی شفاف" +diff --git a/po/fi.po b/po/fi.po +index 3954f3f..11d7e6e 100644 +--- a/po/fi.po ++++ b/po/fi.po +@@ -2090,3 +2090,6 @@ msgstr "" + #: ../src/terminal-window.c:3645 + msgid "C_lose Window" + msgstr "_Sulje ikkuna" ++ ++msgid "Transparent background" ++msgstr "Läpinäkyvä tausta" +diff --git a/po/fr.po b/po/fr.po +index 77580d2..cf7190b 100644 +--- a/po/fr.po ++++ b/po/fr.po +@@ -2119,3 +2119,6 @@ msgstr "" + #: ../src/terminal-window.c:3645 + msgid "C_lose Window" + msgstr "Fermer _la fenêtre" ++ ++msgid "Transparent background" ++msgstr "Arrière-plan transparent" +diff --git a/po/fur.po b/po/fur.po +index 5a20170..8c3daaf 100644 +--- a/po/fur.po ++++ b/po/fur.po +@@ -580,8 +580,8 @@ msgid "_Text color:" + msgstr "Colôr dal _test:" + + #: ../src/gnome-terminal.glade2.h:86 +-msgid "_Transparent background" +-msgstr "Fondâl _trasparent" ++msgid "Transparent background" ++msgstr "Fondâl trasparent" + + #: ../src/gnome-terminal.glade2.h:87 + msgid "_Update login records when command is launched" +diff --git a/po/ga.po b/po/ga.po +index 93d5fa9..feb87dc 100644 +--- a/po/ga.po ++++ b/po/ga.po +@@ -1925,3 +1925,6 @@ msgstr "_Dún Fuinneog" + #: ../src/terminal-window.c:3582 + msgid "C_lose Terminal" + msgstr "_Dún Teirminéal" ++ ++msgid "Transparent background" ++msgstr "Cúlra trédhearcach" +diff --git a/po/gl.po b/po/gl.po +index 9eb9769..37fc735 100644 +--- a/po/gl.po ++++ b/po/gl.po +@@ -3039,8 +3039,8 @@ msgstr "P_echar a xanela" + #~ msgid "Background image _scrolls" + #~ msgstr "A imaxe de fondo _desprázase" + +-#~ msgid "_Transparent background" +-#~ msgstr "Fondo _transparente" ++msgid "Transparent background" ++msgstr "Fondo transparente" + + #~ msgid "S_hade transparent or image background:" + #~ msgstr "_Sombra transparente ou imaxe de fondo:" +diff --git a/po/gu.po b/po/gu.po +index 0bcb195..f72a807 100644 +--- a/po/gu.po ++++ b/po/gu.po +@@ -2944,8 +2944,8 @@ msgstr "વિન્ડો બંધ કરો (_l)" + #~ msgid "_Solid color" + #~ msgstr "ઘટ્ટ રંગ (_S)" + +-#~ msgid "_Transparent background" +-#~ msgstr "પારદર્શક પાશ્વ ભાગનો ભાગ (_T)" ++msgid "Transparent background" ++msgstr "પારદર્શક પાશ્વ ભાગનો ભાગ" + + #~ msgid "No such profile \"%s\", using default profile\n" + #~ msgstr "\"%s\" જેવી કોઈ રૂપરેખા નથી, મૂળભૂત રૂપરેખા વાપરી રહ્યા છે\n" +diff --git a/po/he.po b/po/he.po +index 9c36866..6a161c5 100644 +--- a/po/he.po ++++ b/po/he.po +@@ -3007,8 +3007,8 @@ msgstr "סגירת ה_חלון" + #~ msgid "_Solid color" + #~ msgstr "צבע _אחיד" + +-#~ msgid "_Transparent background" +-#~ msgstr "רקע _שקוף" ++msgid "Transparent background" ++msgstr "רקע שקוף" + + #~ 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 2d7dc5b..adf8d35 100644 +--- a/po/hi.po ++++ b/po/hi.po +@@ -2979,8 +2979,8 @@ msgstr "विंडो बंद करें (_l)" + #~ msgid "_Background image" + #~ msgstr "पृष्ठभूमि छवि (_B)" + +-#~ msgid "_Transparent background" +-#~ msgstr "पारदर्शी पृष्ठभूमि (_T)" ++msgid "Transparent background" ++msgstr "पारदर्शी पृष्ठभूमि" + + #~ msgid "S/Key Challenge Response" + #~ msgstr "एस/कुंजी चैलेंज प्रतिक्रिया" +diff --git a/po/hr.po b/po/hr.po +index cb48c52..747cf48 100644 +--- a/po/hr.po ++++ b/po/hr.po +@@ -1362,8 +1362,8 @@ msgid "_Text color:" + msgstr "_Boja teksta:" + + #: ../src/profile-preferences.glade.h:69 +-msgid "_Transparent background" +-msgstr "_Prozirna pozadina" ++msgid "Transparent background" ++msgstr "Prozirna pozadina" + + #: ../src/profile-preferences.glade.h:70 + msgid "_Update login records when command is launched" +diff --git a/po/hu.po b/po/hu.po +index f0c897b..2ed253b 100644 +--- a/po/hu.po ++++ b/po/hu.po +@@ -2505,3 +2505,6 @@ msgstr "_Ablak bezárása" + + #~ msgid "Background type" + #~ msgstr "Háttér típusa" ++ ++msgid "Transparent background" ++msgstr "Áttetsző háttér" +diff --git a/po/hy.po b/po/hy.po +index 5584901..caadbba 100644 +--- a/po/hy.po ++++ b/po/hy.po +@@ -1011,8 +1011,8 @@ msgid "_Text color:" + msgstr "_Տեքստի գույնը՝" + + #: ../src/profile-preferences.glade.h:73 +-msgid "_Transparent background" +-msgstr "_Թափանցիկ նախադրյալ" ++msgid "Transparent background" ++msgstr "Թափանցիկ նախադրյալ" + + #: ../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 1339d3a..d897ef9 100644 +--- a/po/id.po ++++ b/po/id.po +@@ -2068,3 +2068,6 @@ msgstr "" + #: ../src/terminal-window.c:3645 + msgid "C_lose Window" + msgstr "Tutup Jende_la" ++ ++msgid "Transparent background" ++msgstr "Latar belakang transparan" +diff --git a/po/it.po b/po/it.po +index ae4b26b..ff727df 100644 +--- a/po/it.po ++++ b/po/it.po +@@ -2081,3 +2081,6 @@ msgstr "Chiudi _finestra" + + #~ msgid "_Detach tab" + #~ msgstr "St_acca scheda" ++ ++msgid "Transparent background" ++msgstr "Sfondo trasparente" +diff --git a/po/ja.po b/po/ja.po +index 529b672..fda6fb1 100644 +--- a/po/ja.po ++++ b/po/ja.po +@@ -2472,8 +2472,8 @@ msgstr "ウィンドウを閉じる(_L)" + #~ msgid "_Solid color" + #~ msgstr "単色にする(_S)" + +-#~ msgid "_Transparent background" +-#~ msgstr "透過な画像にする(_T)" ++msgid "Transparent background" ++msgstr "透過な画像にする" + + #~ msgid "No such profile \"%s\", using default profile\n" + #~ msgstr "\"%s\" というプロファイルはありません (デフォルトのプロファイルを使用します)\n" +diff --git a/po/ka.po b/po/ka.po +index 8415e88..3717b7e 100644 +--- a/po/ka.po ++++ b/po/ka.po +@@ -568,7 +568,7 @@ msgstr "_ტექსტის ფერი:" + + #: ../src/gnome-terminal.glade2.h:86 + #, fuzzy +-msgid "_Transparent background" ++msgid "Transparent background" + msgstr "გამჭირვალე" + + #: ../src/gnome-terminal.glade2.h:87 +diff --git a/po/kk.po b/po/kk.po +index 15a28c0..3f7fd7c 100644 +--- a/po/kk.po ++++ b/po/kk.po +@@ -2001,3 +2001,6 @@ msgstr "Терезені жа_бу" + + #~ msgid "Be quiet" + #~ msgstr "Тыныш болу" ++ ++msgid "Transparent background" ++msgstr "Мөлдір фон" +diff --git a/po/kn.po b/po/kn.po +index c887f88..e899ef3 100644 +--- a/po/kn.po ++++ b/po/kn.po +@@ -2344,3 +2344,6 @@ msgstr "ಕಿಟಕಿಯನ್ನು ಮುಚ್ಚು (_l)" + + #~ msgid "_Title:" + #~ msgstr "ಶೀರ್ಷಿಕೆ(_T):" ++ ++msgid "Transparent background" ++msgstr "ಪಾರದರ್ಶಕ ಹಿನ್ನಲೆ" +diff --git a/po/ko.po b/po/ko.po +index 61ffb3c..a2c9bdf 100644 +--- a/po/ko.po ++++ b/po/ko.po +@@ -2063,3 +2063,6 @@ msgstr "" + #: ../src/terminal-window.c:3645 + msgid "C_lose Window" + msgstr "창 닫기(_L)" ++ ++msgid "Transparent background" ++msgstr "투명한 배경" +diff --git a/po/ku.po b/po/ku.po +index 221825b..96e3581 100644 +--- a/po/ku.po ++++ b/po/ku.po +@@ -557,8 +557,8 @@ msgid "_Text color:" + msgstr "Rengê _nivîsê:" + + #: ../src/gnome-terminal.glade2.h:86 +-msgid "_Transparent background" +-msgstr "Rûerdê _transparan" ++msgid "Transparent background" ++msgstr "Rûerdê transparan" + + #: ../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 ceae59e..59288f6 100644 +--- a/po/lt.po ++++ b/po/lt.po +@@ -2072,3 +2072,6 @@ msgstr "" + #: ../src/terminal-window.c:3645 + msgid "C_lose Window" + msgstr "_Užverti langą" ++ ++msgid "Transparent background" ++msgstr "Permatomas fonas" +diff --git a/po/lv.po b/po/lv.po +index db25603..43ff9e8 100644 +--- a/po/lv.po ++++ b/po/lv.po +@@ -3016,8 +3016,8 @@ msgstr "Aizvērt _logu" + #~ msgid "Background image _scrolls" + #~ msgstr "Fona attēla ritināšanā_s" + +-#~ msgid "_Transparent background" +-#~ msgstr "_Caurspīdīgs fons" ++msgid "Transparent background" ++msgstr "Caurspīdīgs fons" + + #~ msgid "S_hade transparent or image background:" + #~ msgstr "_Aizēnot caurspīdīgo vai attēla fonu:" +diff --git a/po/mai.po b/po/mai.po +index 9b984a0..a3c0e17 100644 +--- a/po/mai.po ++++ b/po/mai.po +@@ -1290,8 +1290,8 @@ msgid "_Text color:" + msgstr "पाठ रँग (_T):" + + #: ../src/profile-preferences.glade.h:69 +-msgid "_Transparent background" +-msgstr "पारदर्शी पृष्ठभूमि (_T)" ++msgid "Transparent background" ++msgstr "पारदर्शी पृष्ठभूमि" + + #: ../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 1c1895c..a805417 100644 +--- a/po/mg.po ++++ b/po/mg.po +@@ -566,8 +566,8 @@ msgid "_Text color:" + msgstr "Lokon'ny _soratra:" + + #: ../src/gnome-terminal.glade2.h:86 +-msgid "_Transparent background" +-msgstr "_Afara tatera-pahazavana" ++msgid "Transparent background" ++msgstr "Afara tatera-pahazavana" + + #: ../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 e31378a..d2b74d4 100644 +--- a/po/mk.po ++++ b/po/mk.po +@@ -1166,8 +1166,8 @@ msgid "_Text color:" + msgstr "_Боја на текстот:" + + #: ../src/profile-preferences.glade.h:77 +-msgid "_Transparent background" +-msgstr "_Транспарентна позадина" ++msgid "Transparent background" ++msgstr "Транспарентна позадина" + + #: ../src/profile-preferences.glade.h:78 + #| msgid "_Text color:" +diff --git a/po/ml.po b/po/ml.po +index cc1928d..62abd21 100644 +--- a/po/ml.po ++++ b/po/ml.po +@@ -2751,8 +2751,8 @@ msgstr "ടെര്‍മിനല്‍ അ_ടയ്ക്കുക" + #~ msgid "_Solid color" + #~ msgstr "_സോളിഡ് നിറം" + +-#~ msgid "_Transparent background" +-#~ msgstr "_പുറകിലുള്ളവ കാണാവുന്ന പശ്ചാത്തലം" ++msgid "Transparent background" ++msgstr "പുറകിലുള്ളവ കാണാവുന്ന പശ്ചാത്തലം" + + #~ msgid "S/Key Challenge Response" + #~ msgstr "S/Key ചാലഞ്ച് മറുപടി" +diff --git a/po/mn.po b/po/mn.po +index 4922041..9696b7f 100644 +--- a/po/mn.po ++++ b/po/mn.po +@@ -617,8 +617,8 @@ msgid "_Text color:" + msgstr "_Текстийн өнгө:" + + #: ../src/gnome-terminal.glade2.h:102 +-msgid "_Transparent background" +-msgstr "_Тунгалаг дэвсгэр" ++msgid "Transparent background" ++msgstr "Тунгалаг дэвсгэр" + + #: ../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 61997da..50451d7 100644 +--- a/po/mr.po ++++ b/po/mr.po +@@ -3015,8 +3015,8 @@ msgstr "चौकट बंद करा (_l)" + #~ msgid "_Solid color" + #~ msgstr "गडद रंग (_S)" + +-#~ msgid "_Transparent background" +-#~ msgstr "पारदर्शी पार्श्वभूमी(_T)" ++msgid "Transparent background" ++msgstr "पारदर्शी पार्श्वभूमी" + + #~ msgid "Disabled" + #~ msgstr "अकार्यान्वीतित" +diff --git a/po/ms.po b/po/ms.po +index 5b663aa..38a2afe 100644 +--- a/po/ms.po ++++ b/po/ms.po +@@ -630,8 +630,8 @@ msgid "_Text color:" + msgstr "Warna _Teks:" + + #: ../src/gnome-terminal.glade2.h:102 +-msgid "_Transparent background" +-msgstr "LatarBelakang _Telus" ++msgid "Transparent background" ++msgstr "LatarBelakang Telus" + + #: ../src/gnome-terminal.glade2.h:103 + msgid "_Update login records when command is launched" +diff --git a/po/nb.po b/po/nb.po +index 74525bf..d1fc90b 100644 +--- a/po/nb.po ++++ b/po/nb.po +@@ -2054,3 +2054,6 @@ msgstr "" + #: ../src/terminal-window.c:3652 + msgid "C_lose Window" + msgstr "_Lukk vindu" ++ ++msgid "Transparent background" ++msgstr "Gjennomsiktig bakgrunn" +diff --git a/po/nds.po b/po/nds.po +index 98a1287..94fd757 100644 +--- a/po/nds.po ++++ b/po/nds.po +@@ -995,8 +995,8 @@ msgid "_Text color:" + msgstr "_Textklöör:" + + #: ../src/profile-preferences.glade.h:73 +-msgid "_Transparent background" +-msgstr "_Döörschienenachtergrund:" ++msgid "Transparent background" ++msgstr "Döörschienenachtergrund:" + + #: ../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 b5041bb..894ed29 100644 +--- a/po/ne.po ++++ b/po/ne.po +@@ -2398,8 +2398,8 @@ msgstr "सञ्झ्याल बन्द गर्नुहोस्" + #~ msgid "_None (use solid color)" + #~ msgstr "कुनै पनि होइन (एउटै रङ प्रयोग गर्नुहोस्)" + +-#~ msgid "_Transparent background" +-#~ msgstr "पारदर्शी पृष्ठभूमि" ++msgid "Transparent background" ++msgstr "पारदर्शी पृष्ठभूमि" + + #~ msgid "_Use the system fixed width font" + #~ msgstr "प्रणाली निश्चित गरिएको फन्ट चौडाइ प्रयोग गर्नुहोस्" +diff --git a/po/nl.po b/po/nl.po +index f130c9d..43790ea 100644 +--- a/po/nl.po ++++ b/po/nl.po +@@ -2352,3 +2352,6 @@ msgstr "Venster sl_uiten" + + #~ msgid "Switch to Tab 12" + #~ msgstr "Ga naar tab 12" ++ ++msgid "Transparent background" ++msgstr "Transparante achtergrond" +diff --git a/po/nn.po b/po/nn.po +index 91cd6ab..9284459 100644 +--- a/po/nn.po ++++ b/po/nn.po +@@ -1428,8 +1428,8 @@ msgid "_Text color:" + msgstr "_Tekstfarge:" + + #: ../src/profile-preferences.glade.h:73 +-msgid "_Transparent background" +-msgstr "_Gjennomskinleg bakgrunn" ++msgid "Transparent background" ++msgstr "Gjennomskinleg bakgrunn" + + #: ../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 5e7ca58..3bd9991 100644 +--- a/po/oc.po ++++ b/po/oc.po +@@ -1285,8 +1285,8 @@ msgid "_Text color:" + msgstr "Color del _tèxt :" + + #: ../src/profile-preferences.glade.h:78 +-msgid "_Transparent background" +-msgstr "Fons _transparent" ++msgid "Transparent background" ++msgstr "Fons transparent" + + #: ../src/profile-preferences.glade.h:79 + msgid "_Underline color:" +diff --git a/po/or.po b/po/or.po +index ec1e6bf..218acd7 100644 +--- a/po/or.po ++++ b/po/or.po +@@ -2705,8 +2705,8 @@ msgstr "ଶୀର୍ଷକ (_T):" + #~ msgid "Background image _scrolls" + #~ msgstr "ପୃଷ୍ଠଭୂମି ଚିତ୍ର ସ୍କ୍ରୋଲଗୁଡିକ (_s)" + +-#~ msgid "_Transparent background" +-#~ msgstr "ସ୍ବଚ୍ଛ ପୃଷ୍ଠଭୂମି (_T)" ++msgid "Transparent background" ++msgstr "ସ୍ବଚ୍ଛ ପୃଷ୍ଠଭୂମି" + + #~ msgid "S_hade transparent or image background:" + #~ msgstr "ଛାୟା ସ୍ବଚ୍ଛ କିମ୍ବା ଚିତ୍ର ପୃଷ୍ଠଭୂମି (_h):" +diff --git a/po/pa.po b/po/pa.po +index 9c95b66..5e5b8ba 100644 +--- a/po/pa.po ++++ b/po/pa.po +@@ -3008,8 +3008,8 @@ msgstr "ਵਿੰਡੋ ਬੰਦ ਕਰੋ(_l)" + #~ msgid "_Solid color" + #~ msgstr "ਇੱਕ ਰੰਗ ਵਰਤੋਂ(_S)" + +-#~ msgid "_Transparent background" +-#~ msgstr "ਪਾਰਦਰਸ਼ੀ ਬੈਕਗਰਾਊਂਡ(_T)" ++msgid "Transparent background" ++msgstr "ਪਾਰਦਰਸ਼ੀ ਬੈਕਗਰਾਊਂਡ" + + #~ msgid "S/Key Challenge Response" + #~ msgstr "S/ਸਵਿੱਚ ਚੈਲੰਜ਼ ਜਵਾਬ" +diff --git a/po/pl.po b/po/pl.po +index 6777466..85b6882d 100644 +--- a/po/pl.po ++++ b/po/pl.po +@@ -2093,3 +2093,6 @@ msgstr "" + #: ../src/terminal-window.c:3645 + msgid "C_lose Window" + msgstr "_Zamknij okno" ++ ++msgid "Transparent background" ++msgstr "Przezroczyste tło" +diff --git a/po/ps.po b/po/ps.po +index b1de52c..a16ac49 100644 +--- a/po/ps.po ++++ b/po/ps.po +@@ -1052,8 +1052,8 @@ msgid "_Text color:" + msgstr ":د ليکنې رنګ_" + + #: ../src/profile-preferences.glade.h:69 +-msgid "_Transparent background" +-msgstr "روڼ شاليد_" ++msgid "Transparent background" ++msgstr "روڼ شاليد" + + #: ../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 68bb2dd..9078dcb 100644 +--- a/po/pt.po ++++ b/po/pt.po +@@ -2948,8 +2948,8 @@ msgstr "_Fechar janela" + #~ msgid "Background image _scrolls" + #~ msgstr "Imagem de fundo _rola" + +-#~ msgid "_Transparent background" +-#~ msgstr "Fundo _transparente" ++msgid "Transparent background" ++msgstr "Fundo transparente" + + #~ 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 89b63ca..9441126 100644 +--- a/po/pt_BR.po ++++ b/po/pt_BR.po +@@ -2850,3 +2850,6 @@ msgstr "_Fechar janela" + #~ "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 179dd77..f7fc7ae 100644 +--- a/po/ro.po ++++ b/po/ro.po +@@ -1576,8 +1576,8 @@ msgid "_Text color:" + msgstr "Culoare _text:" + + #: ../src/profile-preferences.glade.h:77 +-msgid "_Transparent background" +-msgstr "Fundal _transparent" ++msgid "Transparent background" ++msgstr "Fundal transparent" + + #: ../src/profile-preferences.glade.h:78 + msgid "_Underline color:" +diff --git a/po/ru.po b/po/ru.po +index 8826be2..ce38a7f 100644 +--- a/po/ru.po ++++ b/po/ru.po +@@ -2062,3 +2062,6 @@ msgstr "" + #: ../src/terminal-window.c:3649 + msgid "C_lose Window" + msgstr "_Закрыть окно" ++ ++msgid "Transparent background" ++msgstr "Прозрачный фон" +diff --git a/po/rw.po b/po/rw.po +index 3f02231..b7fff4c 100644 +--- a/po/rw.po ++++ b/po/rw.po +@@ -748,7 +748,7 @@ msgstr "Ibara ry'Inyandiko..." + + #: ../src/gnome-terminal.glade2.h:102 + #, fuzzy +-msgid "_Transparent background" ++msgid "Transparent background" + msgstr "Mbuganyuma" + + #: ../src/gnome-terminal.glade2.h:103 +diff --git a/po/si.po b/po/si.po +index 81dbf65..5cb0e5a 100644 +--- a/po/si.po ++++ b/po/si.po +@@ -537,8 +537,8 @@ msgid "_Text color:" + msgstr "පෙළ වර්‍ණ: (_T)" + + #: ../src/gnome-terminal.glade2.h:86 +-msgid "_Transparent background" +-msgstr "විනිවිද පෙනෙන පසුබිම (_T)" ++msgid "Transparent background" ++msgstr "විනිවිද පෙනෙන පසුබිම" + + #: ../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 678b061..f5d9a0f 100644 +--- a/po/sk.po ++++ b/po/sk.po +@@ -2338,3 +2338,6 @@ msgstr "_Zavrieť okno" + #~ "\n" + #~ "Viac informácii o jednotlivých príkazoch získate pomocou „%s PRÍKAZ --" + #~ "help“.\n" ++ ++msgid "Transparent background" ++msgstr "Priehľadné pozadie" +diff --git a/po/sl.po b/po/sl.po +index 3a2a9b7..197723d 100644 +--- a/po/sl.po ++++ b/po/sl.po +@@ -2316,3 +2316,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 e59c0b6..6fb4090 100644 +--- a/po/sq.po ++++ b/po/sq.po +@@ -567,8 +567,8 @@ msgstr "Ngjyra e _tekstit:" + + # (pofilter) simplecaps: checks the capitalisation of two strings isn't wildly different + #: ../src/gnome-terminal.glade2.h:85 +-msgid "_Transparent background" +-msgstr "Sfond _Trasparent" ++msgid "Transparent background" ++msgstr "Sfond Trasparent" + + #: ../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 e6478cf..2beab9b 100644 +--- a/po/sr.po ++++ b/po/sr.po +@@ -2080,3 +2080,6 @@ msgstr "_Затвори прозор" + + #~ msgid "Close Window" + #~ msgstr "Затвори прозор" ++ ++msgid "Transparent background" ++msgstr "Провидна позадина" +diff --git a/po/sr@latin.po b/po/sr@latin.po +index 60c9c1d..adab17f 100644 +--- a/po/sr@latin.po ++++ b/po/sr@latin.po +@@ -2082,3 +2082,6 @@ msgstr "_Zatvori prozor" + + #~ msgid "Close Window" + #~ msgstr "Zatvori prozor" ++ ++msgid "Transparent background" ++msgstr "Providna pozadina" +diff --git a/po/sv.po b/po/sv.po +index 21ff2b9..0b24314 100644 +--- a/po/sv.po ++++ b/po/sv.po +@@ -2822,8 +2822,8 @@ msgstr "Stän_g fönster" + #~ msgid "Background image _scrolls" + #~ msgstr "Bakgrundsbilden _rullar" + +-#~ msgid "_Transparent background" +-#~ msgstr "_Genomskinlig bakgrund" ++msgid "Transparent background" ++msgstr "Genomskinlig bakgrund" + + #~ msgid "S_hade transparent or image background:" + #~ msgstr "För_mörka genomskinlig bakgrund eller bildbakgrund:" +diff --git a/po/ta.po b/po/ta.po +index 80aa2f6..61185b4 100644 +--- a/po/ta.po ++++ b/po/ta.po +@@ -3028,8 +3028,8 @@ msgstr "_l சாளரத்தை மூடவும்" + #~ msgid "_Solid color" + #~ msgstr "(_S) ஒரே வண்ணம்" + +-#~ msgid "_Transparent background" +-#~ msgstr "_T புலப்பாடு பின்னணி" ++msgid "Transparent background" ++msgstr "புலப்பாடு பின்னணி" + + #~ msgid "No such profile \"%s\", using default profile\n" + #~ msgstr "\"%s\" என்ற வரியுரு கிடையாது, முன்னிருப்பு வரியுரு பயன்படுத்தப்படும்\n" +diff --git a/po/te.po b/po/te.po +index 000cda3..6dcf793 100644 +--- a/po/te.po ++++ b/po/te.po +@@ -2898,8 +2898,8 @@ msgstr "కిటికీని మూసివేయి (_l)" + #~ msgid "Background image _scrolls" + #~ msgstr "నేపథ్యచిత్రము స్క్రాల్స్ (_s)" + +-#~ msgid "_Transparent background" +-#~ msgstr "పారదర్శక నేపథ్యం (_T)" ++msgid "Transparent background" ++msgstr "పారదర్శక నేపథ్యం" + + #~ msgid "S_hade transparent or image background:" + #~ msgstr "పారదర్శకంగా మారు లేదా చిత్రము బ్యాక్‌గ్రౌండ్ కు మారు(_h):" +diff --git a/po/th.po b/po/th.po +index bf1cc56..a269244 100644 +--- a/po/th.po ++++ b/po/th.po +@@ -2601,8 +2601,8 @@ msgstr "ปิ_ดหน้าต่าง" + #~ msgid "_Solid color" + #~ msgstr "สี_ทึบ" + +-#~ msgid "_Transparent background" +-#~ msgstr "พื้นหลังโปร่งแ_สง" ++msgid "Transparent background" ++msgstr "พื้นหลังโปร่งแสง" + + #~ 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 a8cfcb3..3580986 100644 +--- a/po/tr.po ++++ b/po/tr.po +@@ -1971,3 +1971,6 @@ msgstr "Hala bir süreç bu uçbirimde çalışıyor. Uçbirimi kapatmak onu son + #: ../src/terminal-window.c:3645 + msgid "C_lose Window" + msgstr "_Pencereyi Kapat" ++ ++msgid "Transparent background" ++msgstr "Şeffaf arkaplan" +diff --git a/po/ug.po b/po/ug.po +index 1673bb3..e21e61e 100644 +--- a/po/ug.po ++++ b/po/ug.po +@@ -2616,8 +2616,8 @@ msgstr "ماۋزۇ (_T):" + #~ msgid "_Solid color" + #~ msgstr "ساپ رەڭ(_S)" + +-#~ msgid "_Transparent background" +-#~ msgstr "سۈزۈك تەگلىك(_T)" ++msgid "Transparent background" ++msgstr "سۈزۈك تەگلىك" + + #~ 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 af6b833..1667442 100644 +--- a/po/uk.po ++++ b/po/uk.po +@@ -2957,8 +2957,8 @@ msgstr "Закр_ити вікно" + #~ msgid "_Solid color" + #~ msgstr "_Суцільний колір" + +-#~ msgid "_Transparent background" +-#~ msgstr "П_розоре тло" ++msgid "Transparent background" ++msgstr "Прозоре тло" + + #~ msgid "Switch to Tab 2" + #~ msgstr "До вкладки 2" +diff --git a/po/vi.po b/po/vi.po +index 029fa17..d27cdf0 100644 +--- a/po/vi.po ++++ b/po/vi.po +@@ -2657,3 +2657,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." ++ ++msgid "Transparent background" ++msgstr "Nền trong suốt" +diff --git a/po/wa.po b/po/wa.po +index 2856571..f068531 100644 +--- a/po/wa.po ++++ b/po/wa.po +@@ -563,8 +563,8 @@ msgid "_Text color:" + msgstr "Coleur pol _tecse:" + + #: ../src/gnome-terminal.glade2.h:86 +-msgid "_Transparent background" +-msgstr "Fond k' on voet _houte" ++msgid "Transparent background" ++msgstr "Fond k' on voet houte" + + #: ../src/gnome-terminal.glade2.h:87 + msgid "_Update login records when command is launched" +diff --git a/po/xh.po b/po/xh.po +index e5981c6..7f9f804 100644 +--- a/po/xh.po ++++ b/po/xh.po +@@ -620,8 +620,8 @@ msgid "_Text color:" + msgstr "_Umbala wombhalo:" + + #: ../src/gnome-terminal.glade2.h:102 +-msgid "_Transparent background" +-msgstr "_Okungasemva okucace gca" ++msgid "Transparent background" ++msgstr "Okungasemva okucace gca" + + #: ../src/gnome-terminal.glade2.h:103 + msgid "_Update login records when command is launched" +diff --git a/po/zh_CN.po b/po/zh_CN.po +index 00a6b21..b9e7e04 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -2266,3 +2266,6 @@ msgstr "关闭窗口(_L)" + + #~ msgid "_Find..." + #~ msgstr "查找(_F)..." ++ ++msgid "Transparent background" ++msgstr "透明背景" +diff --git a/po/zh_HK.po b/po/zh_HK.po +index 8ef69ea..ef644ec 100644 +--- a/po/zh_HK.po ++++ b/po/zh_HK.po +@@ -2376,3 +2376,6 @@ msgstr "關閉視窗(_L)" + + #~ msgid "Show session management options" + #~ msgstr "顯示作業階段管理選項" ++ ++msgid "Transparent background" ++msgstr "透明背景" +diff --git a/po/zh_TW.po b/po/zh_TW.po +index 9ffd491..ba6ea35 100644 +--- a/po/zh_TW.po ++++ b/po/zh_TW.po +@@ -2376,3 +2376,6 @@ msgstr "關閉視窗(_L)" + + #~ msgid "Show session management options" + #~ msgstr "顯示作業階段管理選項" ++ ++msgid "Transparent background" ++msgstr "透明背景" +-- +2.1.0 + diff --git a/gnome-terminal.spec b/gnome-terminal.spec index 81ee930..4f88c16 100644 --- a/gnome-terminal.spec +++ b/gnome-terminal.spec @@ -7,18 +7,18 @@ Summary: Terminal emulator for GNOME Name: gnome-terminal -Version: 3.14.2 -Release: 2%{?dist} +Version: 3.15.90 +Release: 1%{?dist} License: GPLv3+ and GFDL Group: User Interface/Desktops URL: http://www.gnome.org/ #VCS: git:git://git.gnome.org/gnome-terminal -Source0: http://download.gnome.org/sources/gnome-terminal/3.14/gnome-terminal-%{version}.tar.xz +Source0: http://download.gnome.org/sources/gnome-terminal/3.15/gnome-terminal-%{version}.tar.xz Source1: org.gnome.Terminal.gschema.override -Patch0: 0001-Restore-transparency-gnome-3-14.patch -# Company's initial patch for https://bugzilla.gnome.org/show_bug.cgi?id=743395 -Patch1: gnome-terminal-3.15-resize.patch +Patch100: gnome-terminal-restore-transparency.patch +Patch101: gnome-terminal-restore-dark.patch +Patch102: gnome-terminal-command-notify.patch BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: GConf2-devel @@ -57,10 +57,12 @@ option to the right-click context menu in Nautilus. %prep %setup -q -%patch0 -p1 -%patch1 -p1 +%patch100 -p1 -b .transparency +%patch101 -p1 -b .dark +%patch101 -p1 -b .command-notify %build +autoreconf -f -i %configure --disable-static --with-gtk=3.0 --with-nautilus-extension make %{?_smp_mflags} @@ -102,6 +104,12 @@ fi %{_libdir}/nautilus/extensions-3.0/libterminal-nautilus.so %changelog +* Wed Feb 18 2015 Debarshi Ray - 3.15.90-1 +- Update to 3.15.90 +- Restore translations for transparency strings +- Restore dark terminals +- Add command-notify patches + * Mon Jan 26 2015 Adam Williamson - 3.14.2-2 - backport partial fix for BGO#743395 diff --git a/sources b/sources index b903162..91c4f90 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8d1138bafa419882e37194a50869952f gnome-terminal-3.14.2.tar.xz +3bef6f12fb46340989981a8535353e90 gnome-terminal-3.15.90.tar.xz