diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | lib/ephy-stock-icons.c | 1 | ||||
| -rw-r--r-- | lib/ephy-stock-icons.h | 9 | ||||
| -rw-r--r-- | src/ephy-window.c | 10 |
4 files changed, 21 insertions, 9 deletions
@@ -1,3 +1,13 @@ +2007-07-21 Wouter Bolsterlee <wbolster@svn.gnome.org> + + * lib/ephy-stock-icons.c: (ephy_stock_icons_init): + * lib/ephy-stock-icons.h: + * src/ephy-window.c: + + Remove some icons from the context menu, and use better + ones for some menu items. Reported by Andreas Nilsson. + Patch by Cosimo Cecchi. Fixes bug #410223. + 2007-07-16 Wouter Bolsterlee <wbolster@svn.gnome.org> * src/bookmarks/ephy-bookmark-factory-action.c: diff --git a/lib/ephy-stock-icons.c b/lib/ephy-stock-icons.c index d509b248e..b6678312a 100644 --- a/lib/ephy-stock-icons.c +++ b/lib/ephy-stock-icons.c @@ -42,6 +42,7 @@ ephy_stock_icons_init (void) STOCK_NEW_TAB, STOCK_NEW_WINDOW, STOCK_SEND_MAIL, + STOCK_NEW_MAIL, STOCK_ADD_BOOKMARK, STOCK_PRINT_SETUP, }; diff --git a/lib/ephy-stock-icons.h b/lib/ephy-stock-icons.h index cecd6ab93..f6220d9c9 100644 --- a/lib/ephy-stock-icons.h +++ b/lib/ephy-stock-icons.h @@ -23,22 +23,23 @@ G_BEGIN_DECLS -#define EPHY_STOCK_EPHY "gnome-web-browser" +#define EPHY_STOCK_EPHY "gnome-web-browser" /* Custom Epiphany named icons */ -#define EPHY_STOCK_POPUPS "popup-hidden" +#define EPHY_STOCK_POPUPS "popup-hidden" #define EPHY_STOCK_HISTORY "history-view" #define EPHY_STOCK_BOOKMARK "bookmark-web" #define EPHY_STOCK_BOOKMARKS "bookmark-view" -#define EPHY_STOCK_ENTRY "location-entry" +#define EPHY_STOCK_ENTRY "location-entry" #define STOCK_LOCK_INSECURE "lock-insecure" #define STOCK_LOCK_SECURE "lock-secure" -#define STOCK_LOCK_BROKEN "lock-broken" +#define STOCK_LOCK_BROKEN "lock-broken" /* Named icons defined in fd.o Icon Naming Spec */ #define STOCK_NEW_TAB "tab-new" #define STOCK_NEW_WINDOW "window-new" #define STOCK_SEND_MAIL "mail-forward" +#define STOCK_NEW_MAIL "mail-message-new" #define STOCK_ADD_BOOKMARK "bookmark-new" #define STOCK_PRINT_SETUP "document-page-setup" #define STOCK_DOWNLOAD "emblem-downloads" diff --git a/src/ephy-window.c b/src/ephy-window.c index d7f7ac9fc..685a1f2ff 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -309,7 +309,7 @@ static const GtkActionEntry ephy_popups_entries [] = { /* Links */ - { "OpenLink", GTK_STOCK_OPEN, N_("_Open Link"), NULL, + { "OpenLink", GTK_STOCK_JUMP_TO, N_("_Open Link"), NULL, N_("Open link in this window"), G_CALLBACK (popup_cmd_open_link) }, { "OpenLinkInNewWindow", NULL, N_("Open Link in New _Window"), NULL, @@ -318,7 +318,7 @@ static const GtkActionEntry ephy_popups_entries [] = { { "OpenLinkInNewTab", NULL, N_("Open Link in New _Tab"), NULL, N_("Open link in a new tab"), G_CALLBACK (popup_cmd_link_in_new_tab) }, - { "DownloadLink", STOCK_DOWNLOAD, N_("_Download Link"), NULL, + { "DownloadLink", NULL, N_("_Download Link"), NULL, NULL, G_CALLBACK (popup_cmd_download_link) }, { "DownloadLinkAs", GTK_STOCK_SAVE_AS, N_("_Save Link As…"), NULL, N_("Save link with a different name"), @@ -331,16 +331,16 @@ static const GtkActionEntry ephy_popups_entries [] = { /* Email links */ /* This is on the context menu on a mailto: link and opens the mail program */ - { "SendEmail", GTK_STOCK_OPEN, N_("_Send Email…"), + { "SendEmail", STOCK_NEW_MAIL, N_("_Send Email…"), NULL, NULL, G_CALLBACK (popup_cmd_open_link) }, { "CopyEmailAddress", NULL, N_("_Copy Email Address"), NULL, NULL, G_CALLBACK (popup_cmd_copy_link_address) }, /* Images */ - { "OpenImage", GTK_STOCK_OPEN, N_("Open _Image"), NULL, + { "OpenImage", NULL, N_("Open _Image"), NULL, NULL, G_CALLBACK (popup_cmd_open_image) }, - { "SaveImageAs", GTK_STOCK_SAVE_AS, N_("_Save Image As…"), NULL, + { "SaveImageAs", NULL, N_("_Save Image As…"), NULL, NULL, G_CALLBACK (popup_cmd_save_image_as) }, { "SetImageAsBackground", NULL, N_("_Use Image As Background"), NULL, NULL, G_CALLBACK (popup_cmd_set_image_as_background) }, |