Remove icons from a few menu items and add an icon to Close Tab

This commit is contained in:
Christian Dywan 2009-07-24 16:43:55 +02:00
parent 9f4976b168
commit 65ff5b3277

View file

@ -2553,9 +2553,9 @@ _action_compact_menu_populate_popup (GtkAction* action,
{ "Panel" }, { "Panel" },
{ "Statusbar" }, { "Statusbar" },
{ NULL }, { NULL },
{ "ClearPrivateData" },
{ "Fullscreen" }, { "Fullscreen" },
{ "Preferences" }, { "Preferences" },
{ "ClearPrivateData" },
}; };
guint i; guint i;
@ -4033,8 +4033,8 @@ _action_trash_empty_activate (GtkAction* action,
static const GtkActionEntry entries[] = { static const GtkActionEntry entries[] = {
{ "File", NULL, N_("_File") }, { "File", NULL, N_("_File") },
{ "WindowNew", STOCK_WINDOW_NEW, { "WindowNew", NULL,
NULL, "<Ctrl>n", N_("New _Window"), "<Ctrl>n",
N_("Open a new window"), G_CALLBACK (_action_window_new_activate) }, N_("Open a new window"), G_CALLBACK (_action_window_new_activate) },
{ "TabNew", STOCK_TAB_NEW, { "TabNew", STOCK_TAB_NEW,
NULL, "<Ctrl>t", NULL, "<Ctrl>t",
@ -4048,7 +4048,7 @@ static const GtkActionEntry entries[] = {
{ "AddSpeedDial", NULL, { "AddSpeedDial", NULL,
N_("Add to Speed _dial"), "<Ctrl>h", N_("Add to Speed _dial"), "<Ctrl>h",
N_("Add shortcut to speed dial"), G_CALLBACK (_action_add_speed_dial_activate) }, N_("Add shortcut to speed dial"), G_CALLBACK (_action_add_speed_dial_activate) },
{ "TabClose", NULL, { "TabClose", GTK_STOCK_CLOSE,
N_("_Close Tab"), "<Ctrl>w", N_("_Close Tab"), "<Ctrl>w",
N_("Close the current tab"), G_CALLBACK (_action_tab_close_activate) }, N_("Close the current tab"), G_CALLBACK (_action_tab_close_activate) },
{ "WindowClose", NULL, { "WindowClose", NULL,
@ -4083,7 +4083,7 @@ static const GtkActionEntry entries[] = {
{ "Find", GTK_STOCK_FIND, { "Find", GTK_STOCK_FIND,
NULL, "<Ctrl>f", NULL, "<Ctrl>f",
N_("Find a word or phrase in the page"), G_CALLBACK (_action_find_activate) }, N_("Find a word or phrase in the page"), G_CALLBACK (_action_find_activate) },
{ "FindNext", GTK_STOCK_GO_FORWARD, { "FindNext", NULL,
N_("Find _Next"), "<Ctrl>g", N_("Find _Next"), "<Ctrl>g",
N_("Find the next occurrence of a word or phrase"), G_CALLBACK (_action_find_next_activate) }, N_("Find the next occurrence of a word or phrase"), G_CALLBACK (_action_find_next_activate) },
{ "FindPrevious", GTK_STOCK_GO_BACK, { "FindPrevious", GTK_STOCK_GO_BACK,
@ -4146,7 +4146,7 @@ static const GtkActionEntry entries[] = {
{ "BookmarkAdd", STOCK_BOOKMARK_ADD, { "BookmarkAdd", STOCK_BOOKMARK_ADD,
NULL, "<Ctrl>d", NULL, "<Ctrl>d",
N_("Add a new bookmark"), G_CALLBACK (_action_bookmark_add_activate) }, N_("Add a new bookmark"), G_CALLBACK (_action_bookmark_add_activate) },
{ "BookmarkFolderAdd", GTK_STOCK_DIRECTORY, { "BookmarkFolderAdd", NULL,
N_("Add a new _folder"), "", N_("Add a new _folder"), "",
N_("Add a new bookmark folder"), G_CALLBACK (_action_bookmark_folder_add_activate) }, N_("Add a new bookmark folder"), G_CALLBACK (_action_bookmark_folder_add_activate) },
{ "Tools", NULL, N_("_Tools") }, { "Tools", NULL, N_("_Tools") },
@ -4154,7 +4154,7 @@ static const GtkActionEntry entries[] = {
N_("_Manage Search Engines"), "<Ctrl><Alt>s", N_("_Manage Search Engines"), "<Ctrl><Alt>s",
N_("Add, edit and remove search engines..."), N_("Add, edit and remove search engines..."),
G_CALLBACK (_action_manage_search_engines_activate) }, G_CALLBACK (_action_manage_search_engines_activate) },
{ "ClearPrivateData", GTK_STOCK_CLEAR, { "ClearPrivateData", NULL,
N_("_Clear Private Data"), "<Ctrl><Shift>Delete", N_("_Clear Private Data"), "<Ctrl><Shift>Delete",
N_("Clear private data..."), N_("Clear private data..."),
G_CALLBACK (_action_clear_private_data_activate) }, G_CALLBACK (_action_clear_private_data_activate) },
@ -4689,7 +4689,7 @@ midori_browser_init (MidoriBrowser* browser)
action = g_object_new (MIDORI_TYPE_LOCATION_ACTION, action = g_object_new (MIDORI_TYPE_LOCATION_ACTION,
"name", "Location", "name", "Location",
"label", _("_Location..."), "label", _("_Location..."),
"stock-id", GTK_STOCK_JUMP_TO, "stock-id", NULL,
"tooltip", _("Open a particular location"), "tooltip", _("Open a particular location"),
NULL); NULL);
g_object_connect (action, g_object_connect (action,