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
=== modified file 'extensions/addons.c'
--- extensions/addons.c 2013-04-16 23:16:24 +0000
+++ extensions/addons.c 2013-06-21 23:25:29 +0000
@@ -617,7 +617,6 @@
617 if (!ADDONS (viewable)->toolbar)617 if (!ADDONS (viewable)->toolbar)
618 {618 {
619 toolbar = gtk_toolbar_new ();619 toolbar = gtk_toolbar_new ();
620 gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
621 toolitem = gtk_tool_item_new ();620 toolitem = gtk_tool_item_new ();
622 gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);621 gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
623 gtk_widget_show (GTK_WIDGET (toolitem));622 gtk_widget_show (GTK_WIDGET (toolitem));
624623
=== modified file 'extensions/apps.vala'
--- extensions/apps.vala 2013-06-04 08:00:45 +0000
+++ extensions/apps.vala 2013-06-21 23:25:29 +0000
@@ -91,7 +91,6 @@
91 public Gtk.Widget get_toolbar () {91 public Gtk.Widget get_toolbar () {
92 if (toolbar == null) {92 if (toolbar == null) {
93 toolbar = new Gtk.Toolbar ();93 toolbar = new Gtk.Toolbar ();
94 toolbar.set_icon_size (Gtk.IconSize.BUTTON);
9594
96 var profile = new Gtk.ToolButton.from_stock (Gtk.STOCK_ADD);95 var profile = new Gtk.ToolButton.from_stock (Gtk.STOCK_ADD);
97 profile.label = _("New _Profile");96 profile.label = _("New _Profile");
9897
=== modified file 'extensions/cookie-manager/cookie-manager-page.c'
--- extensions/cookie-manager/cookie-manager-page.c 2013-02-21 21:36:30 +0000
+++ extensions/cookie-manager/cookie-manager-page.c 2013-06-21 23:25:29 +0000
@@ -87,10 +87,6 @@
87 GtkToolItem *toolitem;87 GtkToolItem *toolitem;
8888
89 priv->toolbar = toolbar = gtk_toolbar_new();89 priv->toolbar = toolbar = gtk_toolbar_new();
90 gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH_HORIZ);
91 gtk_toolbar_set_icon_size(GTK_TOOLBAR(toolbar), GTK_ICON_SIZE_BUTTON);
92 gtk_widget_show(toolbar);
93
94 toolitem = gtk_tool_button_new_from_stock(GTK_STOCK_DELETE);90 toolitem = gtk_tool_button_new_from_stock(GTK_STOCK_DELETE);
95 gtk_tool_item_set_is_important(toolitem, TRUE);91 gtk_tool_item_set_is_important(toolitem, TRUE);
96 g_signal_connect(toolitem, "clicked", G_CALLBACK(cm_button_delete_clicked_cb), cmp);92 g_signal_connect(toolitem, "clicked", G_CALLBACK(cm_button_delete_clicked_cb), cmp);
9793
=== modified file 'extensions/feed-panel/feed-panel.c'
--- extensions/feed-panel/feed-panel.c 2013-04-16 23:16:24 +0000
+++ extensions/feed-panel/feed-panel.c 2013-06-21 23:25:29 +0000
@@ -675,8 +675,6 @@
675 GtkToolItem* toolitem;675 GtkToolItem* toolitem;
676676
677 toolbar = gtk_toolbar_new ();677 toolbar = gtk_toolbar_new ();
678 gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ);
679 gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
680 panel->toolbar = toolbar;678 panel->toolbar = toolbar;
681 toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_ADD);679 toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_ADD);
682 gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), _("Add new feed"));680 gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), _("Add new feed"));
683681
=== modified file 'extensions/tab-panel.c'
--- extensions/tab-panel.c 2013-03-23 01:37:12 +0000
+++ extensions/tab-panel.c 2013-06-21 23:25:29 +0000
@@ -574,9 +574,6 @@
574574
575 toolbar = gtk_toolbar_new ();575 toolbar = gtk_toolbar_new ();
576 g_object_set_data (G_OBJECT (browser), "tab-panel-ext-toolbar", toolbar);576 g_object_set_data (G_OBJECT (browser), "tab-panel-ext-toolbar", toolbar);
577 gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ);
578 gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
579 gtk_widget_show (toolbar);
580577
581 /*578 /*
582 TODO: Implement optional thumbnail images579 TODO: Implement optional thumbnail images
583580
=== modified file 'midori/midori-panel.c'
--- midori/midori-panel.c 2012-12-13 23:00:06 +0000
+++ midori/midori-panel.c 2013-06-21 23:25:29 +0000
@@ -637,6 +637,9 @@
637 gtk_container_add (GTK_CONTAINER (panel->notebook), scrolled);637 gtk_container_add (GTK_CONTAINER (panel->notebook), scrolled);
638638
639 toolbar = midori_viewable_get_toolbar (viewable);639 toolbar = midori_viewable_get_toolbar (viewable);
640 gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ);
641 gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
642 gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE);
640 gtk_widget_show (toolbar);643 gtk_widget_show (toolbar);
641 gtk_container_add (GTK_CONTAINER (panel->toolbook), toolbar);644 gtk_container_add (GTK_CONTAINER (panel->toolbook), toolbar);
642 g_signal_connect (viewable, "destroy",645 g_signal_connect (viewable, "destroy",
643646
=== modified file 'panels/midori-bookmarks.c'
--- panels/midori-bookmarks.c 2013-06-13 16:53:19 +0000
+++ panels/midori-bookmarks.c 2013-06-21 23:25:29 +0000
@@ -630,8 +630,6 @@
630 GtkToolItem* toolitem;630 GtkToolItem* toolitem;
631631
632 toolbar = gtk_toolbar_new ();632 toolbar = gtk_toolbar_new ();
633 gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
634 gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE);
635 bookmarks->toolbar = toolbar;633 bookmarks->toolbar = toolbar;
636 toolitem = gtk_tool_button_new_from_stock (STOCK_BOOKMARK_ADD);634 toolitem = gtk_tool_button_new_from_stock (STOCK_BOOKMARK_ADD);
637 gtk_widget_set_name (GTK_WIDGET (toolitem), "BookmarkAdd");635 gtk_widget_set_name (GTK_WIDGET (toolitem), "BookmarkAdd");
638636
=== modified file 'panels/midori-extensions.c'
--- panels/midori-extensions.c 2013-03-12 17:12:06 +0000
+++ panels/midori-extensions.c 2013-06-21 23:25:29 +0000
@@ -104,8 +104,6 @@
104 GtkWidget* toolbar;104 GtkWidget* toolbar;
105105
106 toolbar = gtk_toolbar_new ();106 toolbar = gtk_toolbar_new ();
107 gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
108
109 MIDORI_EXTENSIONS (extensions)->toolbar = toolbar;107 MIDORI_EXTENSIONS (extensions)->toolbar = toolbar;
110 }108 }
111109
112110
=== modified file 'panels/midori-history.c'
--- panels/midori-history.c 2013-04-16 23:16:24 +0000
+++ panels/midori-history.c 2013-06-21 23:25:29 +0000
@@ -401,7 +401,6 @@
401 GtkToolItem* toolitem;401 GtkToolItem* toolitem;
402402
403 toolbar = gtk_toolbar_new ();403 toolbar = gtk_toolbar_new ();
404 gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
405 history->toolbar = toolbar;404 history->toolbar = toolbar;
406 toolitem = gtk_tool_button_new_from_stock (STOCK_BOOKMARK_ADD);405 toolitem = gtk_tool_button_new_from_stock (STOCK_BOOKMARK_ADD);
407 gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem),406 gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem),

Subscribers

People subscribed via source and target branches

to all changes: