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

Use bookmark/ folder-new in bookmark panel

Browse source 
Fixes: https://bugs.launchpad.net/midori/+bug/940536
This commit is contained in:
Niels Avonds 2012-07-11 18:36:58 +02:00 committed by Christian Dywan
parent 28c5af1458
commit 6f47ae75fc
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
midori/midori-app.c
View file

@ -1423,6 +1423,7 @@ midori_app_setup (gchar** argument_vector)
{ STOCK_PLUGINS, N_("Netscape p_lugins") }, { STOCK_PLUGINS, N_("Netscape p_lugins") },
{ STOCK_USER_TRASH, N_("_Closed Tabs") }, { STOCK_USER_TRASH, N_("_Closed Tabs") },
{ STOCK_WINDOW_NEW, N_("New _Window") }, { STOCK_WINDOW_NEW, N_("New _Window") },
{ STOCK_FOLDER_NEW, N_("New _Folder") },
}; };
/* libSoup uses threads, therefore if WebKit is built with libSoup /* libSoup uses threads, therefore if WebKit is built with libSoup

1
midori/midori-stock.h
View file

@ -30,5 +30,6 @@
#define STOCK_TAB_NEW "tab-new" #define STOCK_TAB_NEW "tab-new"
#define STOCK_USER_TRASH "user-trash" #define STOCK_USER_TRASH "user-trash"
#define STOCK_WINDOW_NEW "window-new" #define STOCK_WINDOW_NEW "window-new"
#define STOCK_FOLDER_NEW "folder-new"
#endif /* !__MIDORI_STOCK_H__ */ #endif /* !__MIDORI_STOCK_H__ */

4
panels/midori-bookmarks.c
View file

@ -521,7 +521,7 @@ midori_bookmarks_get_toolbar (MidoriViewable* viewable)
gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON); gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE); gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE);
bookmarks->toolbar = toolbar; bookmarks->toolbar = toolbar;
toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_ADD); toolitem = gtk_tool_button_new_from_stock (STOCK_BOOKMARK_ADD);
gtk_widget_set_name (GTK_WIDGET (toolitem), "BookmarkAdd"); gtk_widget_set_name (GTK_WIDGET (toolitem), "BookmarkAdd");
gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem),
_("Add a new bookmark")); _("Add a new bookmark"));
@ -552,7 +552,7 @@ midori_bookmarks_get_toolbar (MidoriViewable* viewable)
gtk_tool_item_set_expand (toolitem, TRUE); gtk_tool_item_set_expand (toolitem, TRUE);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
gtk_widget_show (GTK_WIDGET (toolitem)); gtk_widget_show (GTK_WIDGET (toolitem));
toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DIRECTORY); toolitem = gtk_tool_button_new_from_stock (STOCK_FOLDER_NEW);
gtk_widget_set_name (GTK_WIDGET (toolitem), "BookmarkFolderAdd"); gtk_widget_set_name (GTK_WIDGET (toolitem), "BookmarkFolderAdd");
gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem),
_("Add a new folder")); _("Add a new folder"));