debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use icons for Script and Extension

Browse source
This commit is contained in:
Christian Dywan 2008-08-01 15:49:47 +02:00
parent 947761c32d
commit 68fe5e05e1
3 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
midori/main.c
View file

@ -35,6 +35,7 @@ stock_items_init (void)
{ {
static GtkStockItem items[] = static GtkStockItem items[] =
{ {
{ STOCK_EXTENSION },
{ STOCK_NEWS_FEED }, { STOCK_NEWS_FEED },
{ STOCK_LOCK_OPEN }, { STOCK_LOCK_OPEN },
{ STOCK_LOCK_SECURE }, { STOCK_LOCK_SECURE },

1
midori/main.h
View file

@ -30,6 +30,7 @@ KatzeXbelItem* bookmarks;
in order to reduce the amount of warnings */ in order to reduce the amount of warnings */
#define STOCK_BOOKMARK GTK_STOCK_FILE /* "stock_bookmark" "bookmark-web" */ #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_FORM_FILL GTK_STOCK_JUSTIFY_FILL /* "insert-text" "form-fill" */
#define STOCK_NEWS_FEED "news-feed" #define STOCK_NEWS_FEED "news-feed"

20
midori/midori-browser.c
View file

@ -3456,7 +3456,7 @@ midori_browser_init (MidoriBrowser* browser)
gtk_widget_show (toolbar); gtk_widget_show (toolbar);
midori_panel_append_page (MIDORI_PANEL (browser->panel), midori_panel_append_page (MIDORI_PANEL (browser->panel),
panel, toolbar, panel, toolbar,
"", _("Userscripts")); STOCK_SCRIPT, _("Userscripts"));
/* Userstyles */ /* Userstyles */
/*panel = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_USER_STYLES); /*panel = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_USER_STYLES);
gtk_widget_show (panel); gtk_widget_show (panel);
@ -3466,6 +3466,15 @@ midori_browser_init (MidoriBrowser* browser)
panel, toolbar, panel, toolbar,
"", _("Userstyles"));*/ "", _("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 */ /* Notebook, containing all web_views */
browser->notebook = gtk_notebook_new (); browser->notebook = gtk_notebook_new ();
/* Remove the inner border between scrollbars and the window border */ /* 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, gtk_box_pack_start (GTK_BOX (browser->statusbar), browser->progressbar,
FALSE, FALSE, 3); 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); g_object_unref (ui_manager);
#if !GLIB_CHECK_VERSION (2, 16, 0) #if !GLIB_CHECK_VERSION (2, 16, 0)