Midori Web Browser

Merge lp:~kalikiana/midori/buttonlabels into lp:midori

  1. buttonlabels
  2. Merge into trunk
Proposed by Cris Dywan
Status: Merged
Approved by: Paweł Forysiuk
Approved revision: 6226
Merged at revision: 6227
Proposed branch: lp:~kalikiana/midori/buttonlabels
Merge into: lp:midori
Diff against target: 117 lines (+3/-16)
9 files modified
extensions/addons.c (+0/-1)
extensions/apps.vala (+0/-1)
extensions/cookie-manager/cookie-manager-page.c (+0/-4)
extensions/feed-panel/feed-panel.c (+0/-2)
extensions/tab-panel.c (+0/-3)
midori/midori-panel.c (+3/-0)
panels/midori-bookmarks.c (+0/-2)
panels/midori-extensions.c (+0/-2)
panels/midori-history.c (+0/-1)
To merge this branch: bzr merge lp:~kalikiana/midori/buttonlabels
Reviewer Review Type Date Requested Status
gue5t gue5t Approve
Review via email: mp+170919@code.launchpad.net

Commit message

Setup viewable toolbar consistently in Midori.Panel

Description of the change

Setup viewable toolbar consistently in Midori.Panel

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

Good cleanup; I'd note, however, that this does make the minimum sidebar width larger for users whose GTK toolbar style preference didn't include text.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'extensions/addons.c'
2--- extensions/addons.c 2013-04-16 23:16:24 +0000
3+++ extensions/addons.c 2013-06-21 23:25:29 +0000
4@@ -617,7 +617,6 @@
5 if (!ADDONS (viewable)->toolbar)
6 {
7 toolbar = gtk_toolbar_new ();
8- gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
9 toolitem = gtk_tool_item_new ();
10 gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
11 gtk_widget_show (GTK_WIDGET (toolitem));
12
13=== modified file 'extensions/apps.vala'
14--- extensions/apps.vala 2013-06-04 08:00:45 +0000
15+++ extensions/apps.vala 2013-06-21 23:25:29 +0000
16@@ -91,7 +91,6 @@
17 public Gtk.Widget get_toolbar () {
18 if (toolbar == null) {
19 toolbar = new Gtk.Toolbar ();
20- toolbar.set_icon_size (Gtk.IconSize.BUTTON);
21
22 var profile = new Gtk.ToolButton.from_stock (Gtk.STOCK_ADD);
23 profile.label = _("New _Profile");
24
25=== modified file 'extensions/cookie-manager/cookie-manager-page.c'
26--- extensions/cookie-manager/cookie-manager-page.c 2013-02-21 21:36:30 +0000
27+++ extensions/cookie-manager/cookie-manager-page.c 2013-06-21 23:25:29 +0000
28@@ -87,10 +87,6 @@
29 GtkToolItem *toolitem;
30
31 priv->toolbar = toolbar = gtk_toolbar_new();
32- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH_HORIZ);
33- gtk_toolbar_set_icon_size(GTK_TOOLBAR(toolbar), GTK_ICON_SIZE_BUTTON);
34- gtk_widget_show(toolbar);
35-
36 toolitem = gtk_tool_button_new_from_stock(GTK_STOCK_DELETE);
37 gtk_tool_item_set_is_important(toolitem, TRUE);
38 g_signal_connect(toolitem, "clicked", G_CALLBACK(cm_button_delete_clicked_cb), cmp);
39
40=== modified file 'extensions/feed-panel/feed-panel.c'
41--- extensions/feed-panel/feed-panel.c 2013-04-16 23:16:24 +0000
42+++ extensions/feed-panel/feed-panel.c 2013-06-21 23:25:29 +0000
43@@ -675,8 +675,6 @@
44 GtkToolItem* toolitem;
45
46 toolbar = gtk_toolbar_new ();
47- gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ);
48- gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
49 panel->toolbar = toolbar;
50 toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_ADD);
51 gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), _("Add new feed"));
52
53=== modified file 'extensions/tab-panel.c'
54--- extensions/tab-panel.c 2013-03-23 01:37:12 +0000
55+++ extensions/tab-panel.c 2013-06-21 23:25:29 +0000
56@@ -574,9 +574,6 @@
57
58 toolbar = gtk_toolbar_new ();
59 g_object_set_data (G_OBJECT (browser), "tab-panel-ext-toolbar", toolbar);
60- gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ);
61- gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
62- gtk_widget_show (toolbar);
63
64 /*
65 TODO: Implement optional thumbnail images
66
67=== modified file 'midori/midori-panel.c'
68--- midori/midori-panel.c 2012-12-13 23:00:06 +0000
69+++ midori/midori-panel.c 2013-06-21 23:25:29 +0000
70@@ -637,6 +637,9 @@
71 gtk_container_add (GTK_CONTAINER (panel->notebook), scrolled);
72
73 toolbar = midori_viewable_get_toolbar (viewable);
74+ gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ);
75+ gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
76+ gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE);
77 gtk_widget_show (toolbar);
78 gtk_container_add (GTK_CONTAINER (panel->toolbook), toolbar);
79 g_signal_connect (viewable, "destroy",
80
81=== modified file 'panels/midori-bookmarks.c'
82--- panels/midori-bookmarks.c 2013-06-13 16:53:19 +0000
83+++ panels/midori-bookmarks.c 2013-06-21 23:25:29 +0000
84@@ -630,8 +630,6 @@
85 GtkToolItem* toolitem;
86
87 toolbar = gtk_toolbar_new ();
88- gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
89- gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE);
90 bookmarks->toolbar = toolbar;
91 toolitem = gtk_tool_button_new_from_stock (STOCK_BOOKMARK_ADD);
92 gtk_widget_set_name (GTK_WIDGET (toolitem), "BookmarkAdd");
93
94=== modified file 'panels/midori-extensions.c'
95--- panels/midori-extensions.c 2013-03-12 17:12:06 +0000
96+++ panels/midori-extensions.c 2013-06-21 23:25:29 +0000
97@@ -104,8 +104,6 @@
98 GtkWidget* toolbar;
99
100 toolbar = gtk_toolbar_new ();
101- gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
102-
103 MIDORI_EXTENSIONS (extensions)->toolbar = toolbar;
104 }
105
106
107=== modified file 'panels/midori-history.c'
108--- panels/midori-history.c 2013-04-16 23:16:24 +0000
109+++ panels/midori-history.c 2013-06-21 23:25:29 +0000
110@@ -401,7 +401,6 @@
111 GtkToolItem* toolitem;
112
113 toolbar = gtk_toolbar_new ();
114- gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
115 history->toolbar = toolbar;
116 toolitem = gtk_tool_button_new_from_stock (STOCK_BOOKMARK_ADD);
117 gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem),

Subscribers

People subscribed via source and target branches

to all changes: