]>
Commit | Line | Data |
---|---|---|
bb11d6bf | 1 | From c9a5c9630248efe0bc34dfbd4f54c8d4f68d4ee6 Mon Sep 17 00:00:00 2001 |
2b7dad92 JK |
2 | From: Debarshi Ray <debarshir@gnome.org> |
3 | Date: Mon, 12 May 2014 14:57:18 +0200 | |
d4bc1a2d | 4 | Subject: [PATCH 01/14] Restore transparency |
2b7dad92 JK |
5 | |
6 | The transparency settings were removed as a side effect of | |
7 | 2bff4b63ed3ceef6055e35563e9b0b33ad57349d | |
8 | ||
9 | This restores them and you will need a compositing window manager to | |
10 | use it. The background image setting, also known as faux transparency, | |
11 | was not restored. | |
12 | ||
13 | The transparency checkbox lost its mnemonic accelerator because 't' | |
14 | is already taken and using any other letter would make it hard to | |
15 | restore the translations of the string. | |
bb11d6bf JK |
16 | |
17 | Some changes by Peter Weber <peter.weber@mailbox.org> | |
2b7dad92 | 18 | --- |
bb11d6bf JK |
19 | src/org.gnome.Terminal.gschema.xml | 10 +++++++ |
20 | src/preferences.ui | 47 ++++++++++++++++++++++++++++++ | |
21 | src/profile-editor.c | 16 ++++++++++ | |
22 | src/terminal-schemas.h | 3 ++ | |
23 | src/terminal-screen.c | 22 +++++++++++++- | |
24 | src/terminal-window.c | 7 +++++ | |
25 | 6 files changed, 104 insertions(+), 1 deletion(-) | |
2b7dad92 JK |
26 | |
27 | diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml | |
bb11d6bf | 28 | index 945b0bd661c5..c581f3cf2553 100644 |
2b7dad92 JK |
29 | --- a/src/org.gnome.Terminal.gschema.xml |
30 | +++ b/src/org.gnome.Terminal.gschema.xml | |
bb11d6bf | 31 | @@ -400,6 +400,16 @@ |
2b7dad92 JK |
32 | <default>'narrow'</default> |
33 | <summary>Whether ambiguous-width characters are narrow or wide when using UTF-8 encoding</summary> | |
34 | </key> | |
35 | + <key name="use-transparent-background" type="b"> | |
36 | + <default>false</default> | |
37 | + <summary>Whether to use a transparent background</summary> | |
38 | + </key> | |
39 | + <key name="background-transparency-percent" type="i"> | |
40 | + <default>50</default> | |
41 | + <range min="0" max="100"/> | |
42 | + <summary>Adjust the amount of transparency</summary> | |
43 | + <description>A value between 0 and 100, where 0 is opaque and 100 is fully transparent.</description> | |
44 | + </key> | |
45 | </schema> | |
46 | ||
47 | <!-- Keybinding settings --> | |
bb11d6bf JK |
48 | diff --git a/src/preferences.ui b/src/preferences.ui |
49 | index 6259aac0f02f..f5c366f14e10 100644 | |
50 | --- a/src/preferences.ui | |
51 | +++ b/src/preferences.ui | |
52 | @@ -77,6 +77,11 @@ | |
53 | <property name="step_increment">0.05</property> | |
54 | <property name="page_increment">0.25</property> | |
2b7dad92 JK |
55 | </object> |
56 | + <object class="GtkAdjustment" id="background-transparent-adjustment"> | |
57 | + <property name="upper">100</property> | |
58 | + <property name="step_increment">1</property> | |
59 | + <property name="page_increment">10</property> | |
60 | + </object> | |
61 | <object class="GtkListStore" id="cjk-ambiguous-width-model"> | |
62 | <columns> | |
63 | <!-- column-name gchararray --> | |
bb11d6bf JK |
64 | @@ -1317,6 +1322,48 @@ |
65 | <property name="position">1</property> | |
66 | </packing> | |
67 | </child> | |
68 | + <child> | |
69 | + <object class="GtkBox" id="use-transparent-background-box"> | |
70 | + <property name="visible">True</property> | |
71 | + <property name="can_focus">False</property> | |
72 | + <property name="orientation">horizontal</property> | |
73 | + <property name="spacing">12</property> | |
74 | + <child> | |
75 | + <object class="GtkCheckButton" id="use-transparent-background"> | |
76 | + <property name="label" translatable="yes">Transparent background</property> | |
77 | + <property name="visible">True</property> | |
78 | + <property name="can_focus">True</property> | |
79 | + <property name="receives_default">False</property> | |
80 | + <property name="use_underline">True</property> | |
81 | + <property name="xalign">0</property> | |
82 | + <property name="draw_indicator">True</property> | |
83 | + </object> | |
84 | + <packing> | |
85 | + <property name="expand">False</property> | |
86 | + <property name="fill">False</property> | |
87 | + <property name="position">0</property> | |
88 | + </packing> | |
89 | + </child> | |
90 | + <child> | |
91 | + <object class="GtkScale" id="background-transparent-scale"> | |
92 | + <property name="visible">True</property> | |
93 | + <property name="can_focus">True</property> | |
94 | + <property name="adjustment">background-transparent-adjustment</property> | |
95 | + <property name="draw_value">False</property> | |
96 | + </object> | |
97 | + <packing> | |
98 | + <property name="expand">True</property> | |
99 | + <property name="fill">True</property> | |
100 | + <property name="position">1</property> | |
101 | + </packing> | |
102 | + </child> | |
103 | + </object> | |
104 | + <packing> | |
105 | + <property name="expand">True</property> | |
106 | + <property name="fill">True</property> | |
107 | + <property name="position">2</property> | |
108 | + </packing> | |
109 | + </child> | |
110 | </object> | |
111 | </child> | |
112 | </object> | |
69a77a74 JB |
113 | --- gnome-terminal-3.42.0/src/profile-editor.cc.orig 2021-09-22 18:38:05.775667700 +0200 |
114 | +++ gnome-terminal-3.42.0/src/profile-editor.cc 2021-09-27 21:23:43.302820304 +0200 | |
115 | @@ -1486,6 +1486,22 @@ profile_prefs_load (const char *uuid, GS | |
116 | GSettingsBindFlags(G_SETTINGS_BIND_GET | | |
117 | G_SETTINGS_BIND_SET)); | |
636978f6 | 118 | |
bb11d6bf JK |
119 | + profile_prefs_settings_bind (profile, |
120 | + TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND, | |
121 | + gtk_builder_get_object (builder, "use-transparent-background"), | |
122 | + "active", | |
69a77a74 | 123 | + GSettingsBindFlags(G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET)); |
bb11d6bf JK |
124 | + profile_prefs_settings_bind (profile, |
125 | + TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND, | |
126 | + gtk_builder_get_object (builder, "background-transparent-scale"), | |
127 | + "sensitive", | |
69a77a74 | 128 | + GSettingsBindFlags(G_SETTINGS_BIND_GET | G_SETTINGS_BIND_NO_SENSITIVITY)); |
bb11d6bf JK |
129 | + profile_prefs_settings_bind (profile, |
130 | + TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT, | |
131 | + gtk_builder_get_object (builder, "background-transparent-adjustment"), | |
132 | + "value", | |
69a77a74 | 133 | + GSettingsBindFlags(G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET)); |
636978f6 JB |
134 | + |
135 | w = (GtkWidget *) gtk_builder_get_object (builder, "enable-sixel-checkbutton"); | |
136 | profile_prefs_settings_bind (profile, TERMINAL_PROFILE_ENABLE_SIXEL_KEY, w, | |
69a77a74 JB |
137 | "active", |
138 | --- gnome-terminal-3.42.0/src/terminal-schemas.hh.orig 2021-04-17 08:51:31.266561277 +0200 | |
139 | +++ gnome-terminal-3.42.0/src/terminal-schemas.hh 2021-04-17 09:04:42.797545957 +0200 | |
8a5b6f76 | 140 | @@ -76,6 +76,9 @@ G_BEGIN_DECLS |
2b7dad92 JK |
141 | #define TERMINAL_PROFILE_VISIBLE_NAME_KEY "visible-name" |
142 | #define TERMINAL_PROFILE_WORD_CHAR_EXCEPTIONS_KEY "word-char-exceptions" | |
143 | ||
144 | +#define TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND "use-transparent-background" | |
145 | +#define TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT "background-transparency-percent" | |
146 | + | |
147 | #define TERMINAL_SETTING_CONFIRM_CLOSE_KEY "confirm-close" | |
8a5b6f76 | 148 | #define TERMINAL_SETTING_CONTEXT_INFO_KEY "context-info" |
2b7dad92 | 149 | #define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY "default-show-menubar" |
69a77a74 JB |
150 | --- a/src/terminal-screen.cc |
151 | +++ b/src/terminal-screen.cc | |
bb11d6bf | 152 | @@ -800,7 +800,9 @@ terminal_screen_profile_changed_cb (GSettings *profile, |
2b7dad92 JK |
153 | prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_COLORS_SET_KEY) || |
154 | prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_BACKGROUND_COLOR_KEY) || | |
155 | prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_FOREGROUND_COLOR_KEY) || | |
156 | - prop_name == I_(TERMINAL_PROFILE_PALETTE_KEY)) | |
157 | + prop_name == I_(TERMINAL_PROFILE_PALETTE_KEY) || | |
158 | + prop_name == I_(TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND) || | |
159 | + prop_name == I_(TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT)) | |
160 | update_color_scheme (screen); | |
161 | ||
162 | if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY)) | |
b3bfe551 JB |
163 | @@ -1198,6 +1198,8 @@ update_color_scheme (TerminalScreen *scr |
164 | GdkRGBA *cursor_bgp = nullptr, *cursor_fgp = nullptr; | |
165 | GdkRGBA *highlight_bgp = nullptr, *highlight_fgp = nullptr; | |
2b7dad92 JK |
166 | GtkStyleContext *context; |
167 | + GtkWidget *toplevel; | |
168 | + gboolean transparent; | |
169 | gboolean use_theme_colors; | |
170 | ||
171 | context = gtk_widget_get_style_context (widget); | |
b3bfe551 | 172 | @@ -1239,6 +1241,18 @@ update_color_scheme (TerminalScreen *screen) |
2b7dad92 JK |
173 | } |
174 | ||
175 | colors = terminal_g_settings_get_rgba_palette (priv->profile, TERMINAL_PROFILE_PALETTE_KEY, &n_colors); | |
176 | + | |
177 | + transparent = g_settings_get_boolean (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND); | |
178 | + if (transparent) | |
179 | + { | |
180 | + gint transparency_percent; | |
181 | + | |
182 | + transparency_percent = g_settings_get_int (profile, TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT); | |
183 | + bg.alpha = (100 - transparency_percent) / 100.0; | |
184 | + } | |
185 | + else | |
186 | + bg.alpha = 1.0; | |
187 | + | |
188 | vte_terminal_set_colors (VTE_TERMINAL (screen), &fg, &bg, | |
189 | colors, n_colors); | |
190 | vte_terminal_set_color_bold (VTE_TERMINAL (screen), boldp); | |
b3bfe551 | 191 | @@ -1246,6 +1260,10 @@ update_color_scheme (TerminalScreen *screen) |
2b7dad92 JK |
192 | vte_terminal_set_color_cursor_foreground (VTE_TERMINAL (screen), cursor_fgp); |
193 | vte_terminal_set_color_highlight (VTE_TERMINAL (screen), highlight_bgp); | |
194 | vte_terminal_set_color_highlight_foreground (VTE_TERMINAL (screen), highlight_fgp); | |
195 | + | |
196 | + toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen)); | |
197 | + if (toplevel != NULL && gtk_widget_is_toplevel (toplevel)) | |
198 | + gtk_widget_set_app_paintable (toplevel, transparent); | |
199 | } | |
200 | ||
201 | static void | |
69a77a74 JB |
202 | --- a/src/terminal-window.cc |
203 | +++ b/src/terminal-window.cc | |
bb11d6bf JK |
204 | @@ -2088,6 +2088,8 @@ terminal_window_init (TerminalWindow *window) |
205 | }; | |
2b7dad92 JK |
206 | TerminalWindowPrivate *priv; |
207 | TerminalApp *app; | |
2b7dad92 JK |
208 | + GdkScreen *screen; |
209 | + GdkVisual *visual; | |
d4bc1a2d | 210 | GSettings *gtk_debug_settings; |
bb11d6bf JK |
211 | GtkWindowGroup *window_group; |
212 | // GtkAccelGroup *accel_group; | |
213 | @@ -2102,6 +2104,11 @@ terminal_window_init (TerminalWindow *window) | |
2b7dad92 JK |
214 | |
215 | gtk_widget_init_template (GTK_WIDGET (window)); | |
216 | ||
217 | + screen = gtk_widget_get_screen (GTK_WIDGET (window)); | |
218 | + visual = gdk_screen_get_rgba_visual (screen); | |
219 | + if (visual != NULL) | |
220 | + gtk_widget_set_visual (GTK_WIDGET (window), visual); | |
221 | + | |
222 | uuid_generate (u); | |
223 | uuid_unparse (u, uuidstr); | |
224 | priv->uuid = g_strdup (uuidstr); | |
225 | -- | |
bb11d6bf | 226 | 2.19.1 |
2b7dad92 JK |
227 | |
228 | ||
bb11d6bf | 229 | From f10a426375c392add4ad9ce28bdfc17c27b2da23 Mon Sep 17 00:00:00 2001 |
2b7dad92 JK |
230 | From: Lars Uebernickel <lars.uebernickel@canonical.com> |
231 | Date: Wed, 28 May 2014 14:11:02 +0200 | |
d4bc1a2d | 232 | Subject: [PATCH 02/14] window: Make the drawing robust across all themes |
2b7dad92 JK |
233 | |
234 | There are lots of themes out there in the wild that do not specify a | |
235 | background-color for all widgets and the default is transparent. This | |
236 | is usually not a problem because GTK+ sets an opaque region on the | |
237 | whole window and things without a background-color get drawn with the | |
238 | theme's default background colour. However, to achieve transparency | |
239 | we disable the opaque region by making the window app-paintable. This | |
240 | can lead to transparent menubars or notebook tabs in some themes. We | |
241 | can avoid this by ensuring that the window always renders a background. | |
242 | ||
243 | https://bugzilla.gnome.org/show_bug.cgi?id=730016 | |
244 | --- | |
245 | src/terminal-window.c | 21 +++++++++++++++++++++ | |
246 | 1 file changed, 21 insertions(+) | |
247 | ||
69a77a74 JB |
248 | --- a/src/terminal-window.cc |
249 | +++ b/src/terminal-window.cc | |
bb11d6bf JK |
250 | @@ -1944,6 +1944,26 @@ terminal_window_realize (GtkWidget *widget) |
251 | terminal_window_update_size (window); | |
2b7dad92 JK |
252 | } |
253 | ||
bb11d6bf | 254 | +static gboolean |
2b7dad92 JK |
255 | +terminal_window_draw (GtkWidget *widget, |
256 | + cairo_t *cr) | |
257 | +{ | |
258 | + if (gtk_widget_get_app_paintable (widget)) | |
259 | + { | |
260 | + GtkStyleContext *context; | |
261 | + int width; | |
262 | + int height; | |
263 | + | |
264 | + context = gtk_widget_get_style_context (widget); | |
265 | + width = gtk_widget_get_allocated_width (widget); | |
266 | + height = gtk_widget_get_allocated_height (widget); | |
267 | + gtk_render_background (context, cr, 0, 0, width, height); | |
268 | + gtk_render_frame (context, cr, 0, 0, width, height); | |
269 | + } | |
270 | + | |
271 | + return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr); | |
272 | +} | |
273 | + | |
bb11d6bf | 274 | static gboolean |
2b7dad92 JK |
275 | terminal_window_state_event (GtkWidget *widget, |
276 | GdkEventWindowState *event) | |
bb11d6bf | 277 | @@ -2255,6 +2275,7 @@ terminal_window_class_init (TerminalWindowClass *klass) |
2b7dad92 JK |
278 | |
279 | widget_class->show = terminal_window_show; | |
280 | widget_class->realize = terminal_window_realize; | |
281 | + widget_class->draw = terminal_window_draw; | |
282 | widget_class->window_state_event = terminal_window_state_event; | |
283 | widget_class->screen_changed = terminal_window_screen_changed; | |
284 | widget_class->style_updated = terminal_window_style_updated; | |
285 | -- | |
bb11d6bf | 286 | 2.19.1 |
2b7dad92 JK |
287 | |
288 | ||
bb11d6bf | 289 | From ab579d89948777e2e0267376d64cca79af6684d9 Mon Sep 17 00:00:00 2001 |
2b7dad92 JK |
290 | From: "Owen W. Taylor" <otaylor@fishsoup.net> |
291 | Date: Fri, 13 Nov 2015 15:16:42 +0100 | |
d4bc1a2d | 292 | Subject: [PATCH 03/14] screen, window: Extra padding around transparent |
2b7dad92 JK |
293 | terminals in Wayland |
294 | ||
295 | https://bugzilla.redhat.com/show_bug.cgi?id=1207943 | |
296 | --- | |
297 | src/terminal-screen.c | 40 +++++++++++++++++++++++++++++++++++++--- | |
298 | src/terminal-window.c | 18 ++++++++++++------ | |
299 | 2 files changed, 49 insertions(+), 9 deletions(-) | |
300 | ||
69a77a74 JB |
301 | --- a/src/terminal-screen.cc |
302 | +++ b/src/terminal-screen.cc | |
4de6f867 | 303 | @@ -155,6 +155,8 @@ static void terminal_screen_system_font_ |
2b7dad92 JK |
304 | static gboolean terminal_screen_popup_menu (GtkWidget *widget); |
305 | static gboolean terminal_screen_button_press (GtkWidget *widget, | |
306 | GdkEventButton *event); | |
307 | +static void terminal_screen_hierarchy_changed (GtkWidget *widget, | |
308 | + GtkWidget *previous_toplevel); | |
4de6f867 JB |
309 | static void terminal_screen_child_exited (VteTerminal *terminal, |
310 | int status); | |
311 | ||
312 | @@ -624,6 +626,7 @@ terminal_screen_class_init (TerminalScre | |
2b7dad92 JK |
313 | widget_class->drag_data_received = terminal_screen_drag_data_received; |
314 | widget_class->button_press_event = terminal_screen_button_press; | |
315 | widget_class->popup_menu = terminal_screen_popup_menu; | |
316 | + widget_class->hierarchy_changed = terminal_screen_hierarchy_changed; | |
317 | ||
318 | terminal_class->child_exited = terminal_screen_child_exited; | |
319 | ||
bb11d6bf JK |
320 | @@ -864,6 +867,32 @@ terminal_screen_profile_changed_cb (GSettings *profile, |
321 | g_object_thaw_notify (object); | |
2b7dad92 JK |
322 | } |
323 | ||
bb11d6bf | 324 | +static void |
2b7dad92 JK |
325 | +update_toplevel_transparency (TerminalScreen *screen) |
326 | +{ | |
327 | + GtkWidget *widget = GTK_WIDGET (screen); | |
328 | + TerminalScreenPrivate *priv = screen->priv; | |
329 | + GSettings *profile = priv->profile; | |
330 | + GtkWidget *toplevel; | |
331 | + | |
332 | + toplevel = gtk_widget_get_toplevel (widget); | |
333 | + if (toplevel != NULL && gtk_widget_is_toplevel (toplevel)) | |
334 | + { | |
335 | + gboolean transparent; | |
336 | + | |
337 | + transparent = g_settings_get_boolean (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND); | |
338 | + if (gtk_widget_get_app_paintable (toplevel) != transparent) | |
339 | + { | |
340 | + gtk_widget_set_app_paintable (toplevel, transparent); | |
341 | + | |
342 | + /* The opaque region of the toplevel isn't updated until the toplevel is allocated; | |
343 | + * set_app_paintable() doesn't force an allocation, so do that manually. | |
344 | + */ | |
345 | + gtk_widget_queue_resize (toplevel); | |
346 | + } | |
347 | + } | |
348 | +} | |
349 | + | |
bb11d6bf | 350 | static void |
2b7dad92 JK |
351 | update_color_scheme (TerminalScreen *screen) |
352 | { | |
bb11d6bf | 353 | @@ -942,9 +971,7 @@ update_color_scheme (TerminalScreen *screen) |
2b7dad92 JK |
354 | vte_terminal_set_color_highlight (VTE_TERMINAL (screen), highlight_bgp); |
355 | vte_terminal_set_color_highlight_foreground (VTE_TERMINAL (screen), highlight_fgp); | |
356 | ||
357 | - toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen)); | |
358 | - if (toplevel != NULL && gtk_widget_is_toplevel (toplevel)) | |
359 | - gtk_widget_set_app_paintable (toplevel, transparent); | |
360 | + update_toplevel_transparency (screen); | |
361 | } | |
362 | ||
363 | static void | |
bb11d6bf | 364 | @@ -1549,6 +1576,13 @@ terminal_screen_do_popup (TerminalScreen *screen, |
2b7dad92 JK |
365 | terminal_screen_popup_info_unref (info); |
366 | } | |
367 | ||
368 | +static void | |
369 | +terminal_screen_hierarchy_changed (GtkWidget *widget, | |
370 | + GtkWidget *previous_toplevel) | |
371 | +{ | |
372 | + update_toplevel_transparency (TERMINAL_SCREEN (widget)); | |
373 | +} | |
374 | + | |
375 | static gboolean | |
376 | terminal_screen_button_press (GtkWidget *widget, | |
377 | GdkEventButton *event) | |
69a77a74 JB |
378 | --- a/src/terminal-window.cc |
379 | +++ b/src/terminal-window.cc | |
bb11d6bf | 380 | @@ -1950,15 +1950,21 @@ terminal_window_draw (GtkWidget *widget, |
2b7dad92 JK |
381 | { |
382 | if (gtk_widget_get_app_paintable (widget)) | |
383 | { | |
384 | + GtkAllocation child_allocation; | |
385 | GtkStyleContext *context; | |
386 | - int width; | |
387 | - int height; | |
388 | + GtkWidget *child; | |
389 | + | |
390 | + /* Get the *child* allocation, so we don't overwrite window borders */ | |
391 | + child = gtk_bin_get_child (GTK_BIN (widget)); | |
392 | + gtk_widget_get_allocation (child, &child_allocation); | |
393 | ||
394 | context = gtk_widget_get_style_context (widget); | |
395 | - width = gtk_widget_get_allocated_width (widget); | |
396 | - height = gtk_widget_get_allocated_height (widget); | |
397 | - gtk_render_background (context, cr, 0, 0, width, height); | |
398 | - gtk_render_frame (context, cr, 0, 0, width, height); | |
399 | + gtk_render_background (context, cr, | |
400 | + child_allocation.x, child_allocation.y, | |
401 | + child_allocation.width, child_allocation.height); | |
402 | + gtk_render_frame (context, cr, | |
403 | + child_allocation.x, child_allocation.y, | |
404 | + child_allocation.width, child_allocation.height); | |
405 | } | |
406 | ||
407 | return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr); | |
408 | -- | |
bb11d6bf | 409 | 2.19.1 |
2b7dad92 JK |
410 | |
411 | ||
bb11d6bf JK |
412 | From aa31c5189de74fba379426792f5d48c64515ba48 Mon Sep 17 00:00:00 2001 |
413 | From: Debarshi Ray <debarshir@gnome.org> | |
414 | Date: Mon, 27 Feb 2017 16:53:51 +0100 | |
415 | Subject: [PATCH 04/14] screen: Silence -Wunused variable | |
416 | ||
417 | https://bugzilla.redhat.com/show_bug.cgi?id=1207943 | |
418 | --- | |
419 | src/terminal-screen.c | 1 - | |
420 | 1 file changed, 1 deletion(-) | |
421 | ||
b3bfe551 JB |
422 | --- gnome-terminal-3.42.0/src/terminal-screen.cc.orig 2021-09-28 20:41:52.910073654 +0200 |
423 | +++ gnome-terminal-3.42.0/src/terminal-screen.cc 2021-09-28 20:42:11.541041566 +0200 | |
424 | @@ -1198,7 +1198,6 @@ update_color_scheme (TerminalScreen *scr | |
425 | GdkRGBA *cursor_bgp = nullptr, *cursor_fgp = nullptr; | |
426 | GdkRGBA *highlight_bgp = nullptr, *highlight_fgp = nullptr; | |
bb11d6bf JK |
427 | GtkStyleContext *context; |
428 | - GtkWidget *toplevel; | |
429 | gboolean transparent; | |
430 | gboolean use_theme_colors; | |
431 | ||
432 | -- | |
433 | 2.19.1 | |
434 | ||
435 | ||
436 | From b3c8ba6bd276defab38d05406d225f56b170db08 Mon Sep 17 00:00:00 2001 | |
2b7dad92 JK |
437 | From: Debarshi Ray <debarshir@gnome.org> |
438 | Date: Tue, 17 Feb 2015 17:06:17 +0100 | |
d4bc1a2d MB |
439 | Subject: [PATCH 11/14] Restore translations for setting a title and |
440 | transparency | |
2b7dad92 JK |
441 | |
442 | --- | |
bb11d6bf JK |
443 | po/am.po | 8 ++++---- |
444 | po/an.po | 12 ++++++------ | |
445 | po/ar.po | 16 ++++++++-------- | |
446 | po/as.po | 16 ++++++++-------- | |
d4bc1a2d | 447 | po/ast.po | 8 ++++---- |
bb11d6bf | 448 | po/az.po | 8 ++++---- |
d4bc1a2d MB |
449 | po/be.po | 3 +++ |
450 | po/be@latin.po | 8 ++++---- | |
bb11d6bf | 451 | po/bg.po | 9 +++++++++ |
d4bc1a2d | 452 | po/bn.po | 8 ++++---- |
bb11d6bf | 453 | po/bn_IN.po | 11 +++++++---- |
d4bc1a2d | 454 | po/br.po | 6 +++--- |
bb11d6bf JK |
455 | po/bs.po | 10 ++++++++++ |
456 | po/ca.po | 12 ++++++++++++ | |
457 | po/ca@valencia.po | 12 ++++++++++++ | |
458 | po/cs.po | 12 ++++++++++++ | |
d4bc1a2d | 459 | po/cy.po | 8 ++++---- |
bb11d6bf JK |
460 | po/da.po | 11 +++++++++++ |
461 | po/de.po | 12 ++++++++++++ | |
d4bc1a2d | 462 | po/dz.po | 8 ++++---- |
bb11d6bf | 463 | po/el.po | 15 +++++++++------ |
d4bc1a2d | 464 | po/en@shaw.po | 8 ++++---- |
bb11d6bf JK |
465 | po/en_CA.po | 8 ++++---- |
466 | po/en_GB.po | 16 ++++++++-------- | |
467 | po/eo.po | 8 ++++---- | |
468 | po/es.po | 16 ++++++++-------- | |
d4bc1a2d | 469 | po/et.po | 3 +++ |
bb11d6bf JK |
470 | po/eu.po | 16 ++++++++-------- |
471 | po/fa.po | 15 +++++++++------ | |
472 | po/fi.po | 12 ++++++++++++ | |
473 | po/fr.po | 12 ++++++++++++ | |
474 | po/fur.po | 11 +++++++++-- | |
d4bc1a2d | 475 | po/ga.po | 3 +++ |
bb11d6bf JK |
476 | po/gl.po | 16 ++++++++-------- |
477 | po/gu.po | 16 ++++++++-------- | |
478 | po/he.po | 16 ++++++++-------- | |
479 | po/hi.po | 17 ++++++++--------- | |
480 | po/hr.po | 10 ++++++++++ | |
481 | po/hu.po | 12 ++++++++++++ | |
d4bc1a2d | 482 | po/hy.po | 8 ++++---- |
bb11d6bf JK |
483 | po/id.po | 12 ++++++++++++ |
484 | po/it.po | 12 ++++++++++++ | |
485 | po/ja.po | 12 ++++++++++++ | |
486 | po/ka.po | 6 +++--- | |
487 | po/kk.po | 12 ++++++++++++ | |
d4bc1a2d | 488 | po/km.po | 4 ++-- |
bb11d6bf JK |
489 | po/kn.po | 15 +++++++++------ |
490 | po/ko.po | 12 ++++++++++++ | |
d4bc1a2d | 491 | po/ku.po | 8 ++++---- |
bb11d6bf JK |
492 | po/lt.po | 12 ++++++++++++ |
493 | po/lv.po | 16 ++++++++++++++++ | |
d4bc1a2d | 494 | po/mai.po | 8 ++++---- |
bb11d6bf | 495 | po/mg.po | 8 ++++---- |
d4bc1a2d | 496 | po/mk.po | 8 ++++---- |
bb11d6bf JK |
497 | po/ml.po | 3 +++ |
498 | po/mn.po | 8 ++++---- | |
499 | po/mr.po | 16 ++++++++-------- | |
500 | po/ms.po | 8 ++++---- | |
501 | po/nb.po | 12 ++++++++++++ | |
d4bc1a2d | 502 | po/nds.po | 8 ++++---- |
bb11d6bf JK |
503 | po/ne.po | 12 ++++++------ |
504 | po/nl.po | 12 ++++++++++++ | |
d4bc1a2d | 505 | po/nn.po | 8 ++++---- |
bb11d6bf | 506 | po/oc.po | 12 ++++++------ |
d4bc1a2d | 507 | po/or.po | 4 ++-- |
bb11d6bf | 508 | po/pa.po | 23 +++++++++++------------ |
d4bc1a2d | 509 | po/ps.po | 8 ++++---- |
bb11d6bf JK |
510 | po/pt.po | 16 ++++++++-------- |
511 | po/pt_BR.po | 15 +++++++++------ | |
512 | po/ro.po | 4 ++-- | |
513 | po/ru.po | 16 ++++++++++++++++ | |
d4bc1a2d | 514 | po/rw.po | 3 +-- |
bb11d6bf JK |
515 | po/si.po | 8 ++++---- |
516 | po/sk.po | 12 ++++++++++++ | |
517 | po/sl.po | 15 +++++++++------ | |
d4bc1a2d | 518 | po/sq.po | 8 ++++---- |
bb11d6bf JK |
519 | po/sr.po | 22 ++++++++++++---------- |
520 | po/sr@latin.po | 22 ++++++++++++---------- | |
d4bc1a2d MB |
521 | po/sv.po | 12 ++++++++++++ |
522 | po/ta.po | 27 +++++++++++++-------------- | |
523 | po/te.po | 27 +++++++++++++-------------- | |
524 | po/tg.po | 16 ++++++++-------- | |
525 | po/th.po | 20 ++++++++++---------- | |
526 | po/tr.po | 12 ++++++++++++ | |
527 | po/ug.po | 4 ++-- | |
528 | po/uk.po | 20 ++++++++++---------- | |
bb11d6bf | 529 | po/vi.po | 15 +++++++++------ |
d4bc1a2d MB |
530 | po/wa.po | 12 ++++++------ |
531 | po/xh.po | 12 ++++++------ | |
bb11d6bf JK |
532 | po/zh_CN.po | 15 +++++++++------ |
533 | po/zh_HK.po | 15 +++++++++------ | |
534 | po/zh_TW.po | 15 +++++++++------ | |
535 | 92 files changed, 707 insertions(+), 371 deletions(-) | |
2b7dad92 JK |
536 | |
537 | diff --git a/po/am.po b/po/am.po | |
bb11d6bf | 538 | index 3445d96da657..ee992f0712a5 100644 |
2b7dad92 JK |
539 | --- a/po/am.po |
540 | +++ b/po/am.po | |
d4bc1a2d MB |
541 | @@ -214,8 +214,8 @@ msgid "<b>Background</b>" |
542 | msgstr "<b>መደብ</b>" | |
543 | ||
544 | #: ../src/gnome-terminal.glade2.h:2 | |
545 | -msgid "<b>Command</b>" | |
546 | -msgstr "<b>ትእዛዝ</b>" | |
547 | +msgid "Command" | |
548 | +msgstr "ትእዛዝ" | |
549 | ||
550 | #: ../src/gnome-terminal.glade2.h:3 | |
551 | msgid "<b>Compatibility</b>" | |
552 | @@ -614,8 +614,8 @@ msgid "_Text color:" | |
2b7dad92 JK |
553 | msgstr "የ_ጽሑፍ ቀለም፦" |
554 | ||
555 | #: ../src/gnome-terminal.glade2.h:102 | |
556 | -msgid "_Transparent background" | |
557 | -msgstr "_የሚያሳይ መደብ" | |
558 | +msgid "Transparent background" | |
559 | +msgstr "የሚያሳይ መደብ" | |
560 | ||
561 | #: ../src/gnome-terminal.glade2.h:103 | |
562 | msgid "_Update login records when command is launched" | |
d4bc1a2d | 563 | diff --git a/po/an.po b/po/an.po |
bb11d6bf | 564 | index fcec2668aa11..9e07cb682c57 100644 |
d4bc1a2d MB |
565 | --- a/po/an.po |
566 | +++ b/po/an.po | |
567 | @@ -2241,8 +2241,8 @@ msgstr "_Zarrar a finestra" | |
568 | #~ msgid "Use custom default terminal si_ze" | |
569 | #~ msgstr "Emplegar grandaria predeterminada presonali_zada de terminal" | |
570 | ||
571 | -#~ msgid "Title" | |
572 | -#~ msgstr "Titol" | |
573 | +msgid "Title" | |
574 | +msgstr "Titol" | |
575 | ||
576 | #~ msgid "When terminal commands set their o_wn titles:" | |
577 | #~ msgstr "" | |
578 | @@ -2266,8 +2266,8 @@ msgstr "_Zarrar a finestra" | |
579 | #~ msgid "Close Window" | |
580 | #~ msgstr "Zarrar a finestra" | |
581 | ||
582 | -#~ msgid "Set Title" | |
583 | -#~ msgstr "Establir titol" | |
584 | +msgid "Set Title" | |
585 | +msgstr "Establir titol" | |
586 | ||
587 | #~ msgid "Switch to Tab 2" | |
588 | #~ msgstr "Cambiar a la pestanya 2" | |
d4bc1a2d MB |
589 | @@ -2340,8 +2340,8 @@ msgstr "_Zarrar a finestra" |
590 | #~ msgid "_Input Methods" | |
591 | #~ msgstr "Me_todos de dentrada" | |
592 | ||
593 | -#~ msgid "_Title:" | |
594 | -#~ msgstr "_Titol:" | |
595 | +msgid "_Title:" | |
596 | +msgstr "_Titol:" | |
597 | ||
598 | #~ msgid "Keyboard Shortcuts" | |
599 | #~ msgstr "Alcorces de teclau" | |
2b7dad92 | 600 | diff --git a/po/ar.po b/po/ar.po |
bb11d6bf | 601 | index 6f5e80cc2a66..53e15b97f312 100644 |
2b7dad92 JK |
602 | --- a/po/ar.po |
603 | +++ b/po/ar.po | |
bb11d6bf | 604 | @@ -2553,11 +2553,11 @@ msgstr "أغ_لق النافذة" |
d4bc1a2d MB |
605 | #~ msgid "Default size:" |
606 | #~ msgstr "الحجم المبدئي:" | |
607 | ||
608 | -#~ msgid "Title" | |
609 | -#~ msgstr "العنوان" | |
610 | +msgid "Title" | |
611 | +msgstr "العنوان" | |
612 | ||
613 | -#~ msgid "_Title:" | |
614 | -#~ msgstr "ال_عنوان:" | |
615 | +msgid "_Title:" | |
616 | +msgstr "ال_عنوان:" | |
617 | ||
618 | #~ msgid "Title and Command" | |
619 | #~ msgstr "العنوان والأمر" | |
bb11d6bf | 620 | @@ -2565,8 +2565,8 @@ msgstr "أغ_لق النافذة" |
d4bc1a2d MB |
621 | #~ msgid "_Unlimited" |
622 | #~ msgstr "_غير محدود" | |
623 | ||
624 | -#~ msgid "Set Title" | |
625 | -#~ msgstr "حدد العنوان" | |
626 | +msgid "Set Title" | |
627 | +msgstr "حدد العنوان" | |
628 | ||
629 | #~ msgid "Current Locale" | |
630 | #~ msgstr "المحليّة الحالية" | |
bb11d6bf | 631 | @@ -3309,8 +3309,8 @@ msgstr "أغ_لق النافذة" |
2b7dad92 JK |
632 | #~ msgid "Background image _scrolls" |
633 | #~ msgstr "صورة الخلفية ت_لتف" | |
634 | ||
635 | -#~ msgid "_Transparent background" | |
636 | -#~ msgstr "خلفية _شفافة" | |
637 | +msgid "Transparent background" | |
638 | +msgstr "خلفية شفافة" | |
639 | ||
640 | #~ msgid "S_hade transparent or image background:" | |
641 | #~ msgstr "_ظلل شفافية أو صورة الخلفية:" | |
642 | diff --git a/po/as.po b/po/as.po | |
bb11d6bf | 643 | index 3fade2b8cb12..5b905340f89f 100644 |
2b7dad92 JK |
644 | --- a/po/as.po |
645 | +++ b/po/as.po | |
d4bc1a2d MB |
646 | @@ -2163,11 +2163,11 @@ msgstr "উইন্ডো বন্ধ কৰক (_l)" |
647 | #~ msgid "Default size:" | |
648 | #~ msgstr "অবিকল্পিত আকাৰ:" | |
649 | ||
650 | -#~ msgid "Title" | |
651 | -#~ msgstr "শীৰ্ষক" | |
652 | +msgid "Title" | |
653 | +msgstr "শীৰ্ষক" | |
654 | ||
655 | -#~ msgid "_Title:" | |
656 | -#~ msgstr "শীৰ্ষক (_T):" | |
657 | +msgid "_Title:" | |
658 | +msgstr "শীৰ্ষক (_T):" | |
659 | ||
660 | #~ msgid "Title and Command" | |
661 | #~ msgstr "শীৰ্ষক আৰু কমান্ড" | |
bb11d6bf | 662 | @@ -2175,8 +2175,8 @@ msgstr "উইন্ডো বন্ধ কৰক (_l)" |
d4bc1a2d MB |
663 | #~ msgid "_Unlimited" |
664 | #~ msgstr "অসীমিত (_U)" | |
665 | ||
666 | -#~ msgid "Set Title" | |
667 | -#~ msgstr "শীৰ্ষক নিৰ্ধাৰণ কৰক" | |
668 | +msgid "Set Title" | |
669 | +msgstr "শীৰ্ষক নিৰ্ধাৰণ কৰক" | |
670 | ||
671 | #~ msgid "Current Locale" | |
672 | #~ msgstr "বৰ্তমান স্থানীয়" | |
2b7dad92 JK |
673 | @@ -2979,8 +2979,8 @@ msgstr "উইন্ডো বন্ধ কৰক (_l)" |
674 | #~ msgid "Background image _scrolls" | |
675 | #~ msgstr "পটভূমিৰ ছবি স্ক্ৰল কৰক (_s)" | |
676 | ||
677 | -#~ msgid "_Transparent background" | |
678 | -#~ msgstr "স্বচ্চ পটভূমি (_T)" | |
679 | +msgid "Transparent background" | |
680 | +msgstr "স্বচ্চ পটভূমি " | |
681 | ||
682 | #~ msgid "S_hade transparent or image background:" | |
683 | #~ msgstr "স্বচ্ছ বা ছবিৰ সৈতে পটভূমি ছায়া আচ্ছন্ন কৰক (_h):" | |
684 | diff --git a/po/ast.po b/po/ast.po | |
d4bc1a2d | 685 | index d1c6e7b8174a..4dc0892ed9c4 100644 |
2b7dad92 JK |
686 | --- a/po/ast.po |
687 | +++ b/po/ast.po | |
d4bc1a2d MB |
688 | @@ -1304,8 +1304,8 @@ msgid "_Base on:" |
689 | msgstr "_Basáu en:" | |
690 | ||
691 | #: ../src/profile-preferences.glade.h:1 | |
692 | -msgid "<b>Command</b>" | |
693 | -msgstr "<b>Comandu</b>" | |
694 | +msgid "Command" | |
695 | +msgstr "Comandu" | |
696 | ||
697 | #: ../src/profile-preferences.glade.h:2 | |
698 | msgid "<b>Foreground, Background, Bold and Underline</b>" | |
2b7dad92 JK |
699 | @@ -1598,8 +1598,8 @@ msgid "_Text color:" |
700 | msgstr "Color del _testu:" | |
701 | ||
702 | #: ../src/profile-preferences.glade.h:77 | |
703 | -msgid "_Transparent background" | |
704 | -msgstr "Fondu _tresparente" | |
705 | +msgid "Transparent background" | |
706 | +msgstr "Fondu tresparente" | |
707 | ||
708 | #: ../src/profile-preferences.glade.h:78 | |
709 | msgid "_Underline color:" | |
710 | diff --git a/po/az.po b/po/az.po | |
bb11d6bf | 711 | index 586c1e4d827b..4bd846797101 100644 |
2b7dad92 JK |
712 | --- a/po/az.po |
713 | +++ b/po/az.po | |
d4bc1a2d MB |
714 | @@ -218,8 +218,8 @@ msgid "<b>Background</b>" |
715 | msgstr "<b>Arxa plan</b>" | |
716 | ||
717 | #: ../src/gnome-terminal.glade2.h:2 | |
718 | -msgid "<b>Command</b>" | |
719 | -msgstr "<b>Əmr</b>" | |
720 | +msgid "Command" | |
721 | +msgstr "Əmr" | |
722 | ||
723 | #: ../src/gnome-terminal.glade2.h:3 | |
724 | msgid "<b>Compatibility</b>" | |
725 | @@ -620,8 +620,8 @@ msgid "_Text color:" | |
2b7dad92 JK |
726 | msgstr "_Mətn rəngi:" |
727 | ||
728 | #: ../src/gnome-terminal.glade2.h:102 | |
729 | -msgid "_Transparent background" | |
730 | -msgstr "_Şəffaf arxa plan" | |
731 | +msgid "Transparent background" | |
732 | +msgstr "Şəffaf arxa plan" | |
733 | ||
734 | #: ../src/gnome-terminal.glade2.h:103 | |
735 | msgid "_Update login records when command is launched" | |
736 | diff --git a/po/be.po b/po/be.po | |
bb11d6bf | 737 | index ce07d47995ca..3c65f9090ef4 100644 |
2b7dad92 JK |
738 | --- a/po/be.po |
739 | +++ b/po/be.po | |
385d8513 JB |
740 | @@ -2279,6 +2279,9 @@ |
741 | msgid "C_lose Window" | |
742 | msgstr "_Закрыць акно" | |
2b7dad92 JK |
743 | |
744 | +msgid "Transparent background" | |
745 | +msgstr "Празрысты фон" | |
385d8513 JB |
746 | + |
747 | #~ msgid "Verbose output" | |
748 | #~ msgstr "Падрабязны вывад" | |
749 | ||
2b7dad92 | 750 | diff --git a/po/be@latin.po b/po/be@latin.po |
d4bc1a2d | 751 | index 82ef0664ae1e..27e9877f96e8 100644 |
2b7dad92 JK |
752 | --- a/po/be@latin.po |
753 | +++ b/po/be@latin.po | |
d4bc1a2d MB |
754 | @@ -1146,8 +1146,8 @@ msgid "_Base on:" |
755 | msgstr "Na _bazie:" | |
756 | ||
757 | #: ../src/profile-preferences.glade.h:1 | |
758 | -msgid "<b>Command</b>" | |
759 | -msgstr "<b>Zahad</b>" | |
760 | +msgid "Command" | |
761 | +msgstr "Zahad" | |
762 | ||
763 | #: ../src/profile-preferences.glade.h:2 | |
764 | msgid "<b>Foreground and Background</b>" | |
765 | @@ -1426,8 +1426,8 @@ msgid "_Text color:" | |
2b7dad92 JK |
766 | msgstr "Koler _tekstu:" |
767 | ||
768 | #: ../src/profile-preferences.glade.h:73 | |
769 | -msgid "_Transparent background" | |
770 | -msgstr "_Prazrysty fon" | |
771 | +msgid "Transparent background" | |
772 | +msgstr "Prazrysty fon" | |
773 | ||
774 | #: ../src/profile-preferences.glade.h:74 | |
775 | msgid "_Update login records when command is launched" | |
69a77a74 JB |
776 | --- gnome-terminal-3.42.0/po/bg.po.orig 2021-09-27 20:34:18.648881212 +0200 |
777 | +++ gnome-terminal-3.42.0/po/bg.po 2021-09-27 20:42:08.969666599 +0200 | |
778 |