From 68fe5e05e18b4b931de6afab32519d8ad76bd1dd Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 1 Aug 2008 15:49:47 +0200 Subject: [PATCH] Use icons for Script and Extension --- midori/main.c | 1 + midori/main.h | 1 + midori/midori-browser.c | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/midori/main.c b/midori/main.c index 936967b5..4f89a358 100644 --- a/midori/main.c +++ b/midori/main.c @@ -35,6 +35,7 @@ stock_items_init (void) { static GtkStockItem items[] = { + { STOCK_EXTENSION }, { STOCK_NEWS_FEED }, { STOCK_LOCK_OPEN }, { STOCK_LOCK_SECURE }, diff --git a/midori/main.h b/midori/main.h index 29b1bb53..6cf216ce 100644 --- a/midori/main.h +++ b/midori/main.h @@ -30,6 +30,7 @@ KatzeXbelItem* bookmarks; in order to reduce the amount of warnings */ #define STOCK_BOOKMARK GTK_STOCK_FILE /* "stock_bookmark" "bookmark-web" */ +#define STOCK_EXTENSION GTK_STOCK_EXECUTE /* "extension" */ #define STOCK_FORM_FILL GTK_STOCK_JUSTIFY_FILL /* "insert-text" "form-fill" */ #define STOCK_NEWS_FEED "news-feed" diff --git a/midori/midori-browser.c b/midori/midori-browser.c index ed61d531..32522158 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3456,7 +3456,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_show (toolbar); midori_panel_append_page (MIDORI_PANEL (browser->panel), panel, toolbar, - "", _("Userscripts")); + STOCK_SCRIPT, _("Userscripts")); /* Userstyles */ /*panel = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_USER_STYLES); gtk_widget_show (panel); @@ -3466,6 +3466,15 @@ midori_browser_init (MidoriBrowser* browser) panel, toolbar, "", _("Userstyles"));*/ + /* Extensions */ + panel = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_EXTENSIONS); + gtk_widget_show (panel); + toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (panel)); + gtk_widget_show (toolbar); + midori_panel_append_page (MIDORI_PANEL (browser->panel), + panel, toolbar, + STOCK_EXTENSION, _("Extensions")); + /* Notebook, containing all web_views */ browser->notebook = gtk_notebook_new (); /* Remove the inner border between scrollbars and the window border */ @@ -3560,15 +3569,6 @@ midori_browser_init (MidoriBrowser* browser) gtk_box_pack_start (GTK_BOX (browser->statusbar), browser->progressbar, FALSE, FALSE, 3); - /* Extensions */ - panel = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_EXTENSIONS); - gtk_widget_show (panel); - toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (panel)); - gtk_widget_show (toolbar); - midori_panel_append_page (MIDORI_PANEL (browser->panel), - panel, toolbar, - "", _("Extensions")); - g_object_unref (ui_manager); #if !GLIB_CHECK_VERSION (2, 16, 0)