GTK+

Merge lp:~larsu/gtk/lp1375979 into lp:~ubuntu-desktop/gtk/ubuntugtk3

  1. lp1375979
  2. Merge into ubuntugtk3
Proposed by Lars Karlitski
Status: Merged
Merged at revision: 368
Proposed branch: lp:~larsu/gtk/lp1375979
Merge into: lp:~ubuntu-desktop/gtk/ubuntugtk3
Diff against target: 132 lines (+21/-18)
1 file modified
debian/patches/gtkaboutdialog-support-showing-buttons-in-action-are.patch (+21/-18)
To merge this branch: bzr merge lp:~larsu/gtk/lp1375979
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+236678@code.launchpad.net

Commit message

about dialog patch: mark button titles as translatable

Description of the change

about dialog patch: mark button titles as translatable

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/patches/gtkaboutdialog-support-showing-buttons-in-action-are.patch'
2--- debian/patches/gtkaboutdialog-support-showing-buttons-in-action-are.patch 2014-06-05 11:44:17 +0000
3+++ debian/patches/gtkaboutdialog-support-showing-buttons-in-action-are.patch 2014-10-01 10:17:16 +0000
4@@ -1,7 +1,7 @@
5-From a40d083454949ff79d0ba6538eda3f67f2cde0a1 Mon Sep 17 00:00:00 2001
6+From 4af45c3ebc095c269af632081582fa05c1421c3e Mon Sep 17 00:00:00 2001
7 From: Lars Uebernickel <lars.uebernickel@canonical.com>
8-Date: Wed, 28 May 2014 17:32:21 +0200
9-Subject: [PATCH 2/3] gtkaboutdialog: support showing buttons in action area
10+Date: Wed, 1 Oct 2014 11:20:51 +0200
11+Subject: [PATCH] gtkaboutdialog: support showing buttons in action area
12
13 Give GtkAboutDialog buttons in the action area instead of hard-coding
14 use-header-bar to TRUE. This is for environments which don't have the
15@@ -12,10 +12,10 @@
16 gtk/gtkaboutdialog.c | 120 +++++++++++++++++++++++++++++++++++++--------------
17 1 file changed, 87 insertions(+), 33 deletions(-)
18
19-Index: gtk+3.0-3.12.2/gtk/gtkaboutdialog.c
20-===================================================================
21---- gtk+3.0-3.12.2.orig/gtk/gtkaboutdialog.c 2014-06-05 13:15:50.130082966 +0200
22-+++ gtk+3.0-3.12.2/gtk/gtkaboutdialog.c 2014-06-05 13:15:50.126082966 +0200
23+diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
24+index d2a56b6..c10e359 100644
25+--- a/gtk/gtkaboutdialog.c
26++++ b/gtk/gtkaboutdialog.c
27 @@ -56,6 +56,7 @@
28 #include "gtkheaderbar.h"
29 #include "gtkprivate.h"
30@@ -24,7 +24,7 @@
31
32
33 /**
34-@@ -154,6 +155,9 @@
35+@@ -154,6 +155,9 @@ struct _GtkAboutDialogPrivate
36
37 GtkWidget *stack;
38 GtkWidget *stack_switcher;
39@@ -34,7 +34,7 @@
40 GtkWidget *logo_image;
41 GtkWidget *name_label;
42 GtkWidget *version_label;
43-@@ -178,6 +182,7 @@
44+@@ -178,6 +182,7 @@ struct _GtkAboutDialogPrivate
45 guint hovering_over_link : 1;
46 guint wrap_license : 1;
47 guint in_child_changed : 1;
48@@ -42,7 +42,7 @@
49 };
50
51 enum
52-@@ -238,7 +243,10 @@
53+@@ -238,7 +243,10 @@ static gboolean text_view_motion_notify_event (GtkWidget
54 static gboolean text_view_visibility_notify_event(GtkWidget *text_view,
55 GdkEventVisibility *event,
56 GtkAboutDialog *about);
57@@ -54,7 +54,7 @@
58
59 enum {
60 ACTIVATE_LINK,
61-@@ -278,37 +286,6 @@
62+@@ -278,37 +286,6 @@ stack_visible_child_notify (GtkStack *stack,
63 return FALSE;
64 }
65
66@@ -92,7 +92,7 @@
67 static void
68 gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
69 {
70-@@ -321,7 +298,6 @@
71+@@ -321,7 +298,6 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
72 object_class->set_property = gtk_about_dialog_set_property;
73 object_class->get_property = gtk_about_dialog_get_property;
74
75@@ -100,7 +100,7 @@
76 object_class->finalize = gtk_about_dialog_finalize;
77
78 widget_class->show = gtk_about_dialog_show;
79-@@ -703,6 +679,51 @@
80+@@ -703,6 +679,51 @@ switch_page (GtkAboutDialog *about,
81 GtkAboutDialogPrivate *priv = about->priv;
82
83 gtk_stack_set_visible_child_name (GTK_STACK (priv->stack), name);
84@@ -130,7 +130,7 @@
85 + action_area = gtk_dialog_get_action_area (GTK_DIALOG (about));
86 + G_GNUC_END_IGNORE_DEPRECATIONS
87 +
88-+ priv->credits_button = gtk_toggle_button_new_with_mnemonic ("C_redits");
89++ priv->credits_button = gtk_toggle_button_new_with_mnemonic (_("C_redits"));
90 + g_object_bind_property (priv->credits_page, "visible",
91 + priv->credits_button, "visible", G_BINDING_SYNC_CREATE);
92 + g_signal_connect (priv->credits_button, "toggled", G_CALLBACK (toggle_credits), about);
93@@ -138,7 +138,7 @@
94 + "secondary", TRUE,
95 + NULL);
96 +
97-+ priv->license_button = gtk_toggle_button_new_with_mnemonic ("_License");
98++ priv->license_button = gtk_toggle_button_new_with_mnemonic (_("_License"));
99 + g_object_bind_property (priv->license_page, "visible",
100 + priv->license_button, "visible", G_BINDING_SYNC_CREATE);
101 + g_signal_connect (priv->license_button, "toggled", G_CALLBACK (toggle_license), about);
102@@ -147,12 +147,12 @@
103 + NULL);
104 +
105 +
106-+ gtk_dialog_add_button (GTK_DIALOG (about), "_Close", GTK_RESPONSE_DELETE_EVENT);
107++ gtk_dialog_add_button (GTK_DIALOG (about), _("_Close"), GTK_RESPONSE_DELETE_EVENT);
108 + }
109 }
110
111 static void
112-@@ -736,6 +757,9 @@
113+@@ -736,6 +757,9 @@ gtk_about_dialog_init (GtkAboutDialog *about)
114 gtk_dialog_set_default_response (GTK_DIALOG (about), GTK_RESPONSE_CANCEL);
115
116 gtk_widget_init_template (GTK_WIDGET (about));
117@@ -162,7 +162,7 @@
118
119 switch_page (about, "main");
120 update_stack_switcher_visibility (about);
121-@@ -919,6 +943,36 @@
122+@@ -919,6 +943,36 @@ gtk_about_dialog_get_property (GObject *object,
123 }
124 }
125
126@@ -199,3 +199,6 @@
127 static gboolean
128 gtk_about_dialog_activate_link (GtkAboutDialog *about,
129 const gchar *uri)
130+--
131+2.1.0
132+

Subscribers

People subscribed via source and target branches

to all changes: