diff options
| -rw-r--r-- | ChangeLog | 29 | ||||
| -rw-r--r-- | data/ui/epiphany-ui.xml.in | 16 | ||||
| -rw-r--r-- | lib/ephy-stock-icons.h | 2 | ||||
| -rw-r--r-- | src/ephy-window.c | 50 | ||||
| -rw-r--r-- | src/popup-commands.c | 8 | ||||
| -rw-r--r-- | src/popup-commands.h | 8 | ||||
| -rw-r--r-- | src/window-commands.c | 4 | ||||
| -rw-r--r-- | src/window-commands.h | 4 |
8 files changed, 77 insertions, 44 deletions
@@ -1,3 +1,32 @@ +2003-02-13 Dave Bordoley <bordoley@msu.edu> + + * data/ui/epiphany-ui.xml.in + Added some separators. + Changed "bookmark" verbs and menu names to reflect changes + in src/ephy-window.c + + * src/ephy-window.c + Added a bunch of mneumonics to context menu entries + s/Add Bookmark.../Bookmark Page... for pages. + s/Add Bookmark.../Bookmark Link... for links. + Changed callbacks in ephy_menu_entries[] and ephy_popups_entries + to reflect changes in src/window-commands.(ch) and src/pop-commands.(ch). + + * src/popup-commands.c + * src/popup-commands.h + s/popup_cmd_link_in_new_window/popup_cmd_link_in_new_browser + s/popup_cmd_image_in_new_window/popup_cmd_image_in_new_browser + s/popup_cmd_add_link_bookmark/void popup_cmd_bookmark_link + s/void popup_cmd_frame_in_new_window/void popup_cmd_frame_in_new_browser + + * src/window-commands.c + * src/window-commands.h + s/window_cmd_file_new_window/window_cmd_file_new_browser + s/window_cmd_file_add_bookmark/window_cmd_file_bookmark_page + + * lib/ephy-stock-icons.h + Fixed #endif comment s/RB/EPHY + 2003-02-13 Lee Willis <lwillis@plus.net> * src/session.c: Fix session saving diff --git a/data/ui/epiphany-ui.xml.in b/data/ui/epiphany-ui.xml.in index c8f5fe8de..9304db7a2 100644 --- a/data/ui/epiphany-ui.xml.in +++ b/data/ui/epiphany-ui.xml.in @@ -10,7 +10,7 @@ <menuitem name="FilePrintMenu" verb="FilePrint"/> <menuitem name="FileSendToMenu" verb="FileSendTo"/> <separator name="FileSep3"/> - <menuitem name="FileAddBookmarkMenu" verb="FileAddBookmark"/> + <menuitem name="FileBookmarkPageMenu" verb="FileBookmarkPage"/> <separator name="FileSep4"/> <menuitem name="FileCloseBrowserMenu" verb="FileCloseBrowser"/> </submenu> @@ -90,7 +90,7 @@ <separator name="DPSep1"/> <menuitem name="SavePageAsDP" verb="FileSaveAs"/> <menuitem name="SaveBackgroundAsDP" verb="SaveBackgroundAs"/> - <menuitem name="AddPageBookmarkDP" verb="FileAddBookmark"/> + <menuitem name="BookmarkPageDP" verb="FileBookmarkPage"/> <menuitem name="CopyPageLocationDP" verb="CopyPageLocation"/> </popup> @@ -101,7 +101,7 @@ <separator name="FDPSep1"/> <menuitem name="SavePageAsFDP" verb="FileSaveAs"/> <menuitem name="SaveBackgroundAsFDP" verb="SaveBackgroundAs"/> - <menuitem name="AddPageBookmarkFDP" verb="FileAddBookmark"/> + <menuitem name="BookmarkPageFDP" verb="FileBookmarkPage"/> <menuitem name="CopyPageLocationFDP" verb="CopyPageLocation"/> <separator name="FDBSep2"/> <menuitem name="OpenFrameFDP" verb="OpenFrame"/> @@ -113,8 +113,9 @@ <menuitem name="OpenLinkLP" verb="OpenLink"/> <menuitem name="OpenLinkInNewBrowserLP" verb="OpenLinkInNewBrowser"/> <menuitem name="OpenLinkInNewTabLP" verb="OpenLinkInNewTab"/> + <separator name="LPSep1"/> <menuitem name="DownloadLinkLP" verb="DownloadLink"/> - <menuitem name="AddLinkBookmarkLP" verb="AddLinkBookmark"/> + <menuitem name="BookmarkLinkLP" verb="BookmarkLink"/> <menuitem name="CopyLinkLocationLP" verb="CopyLinkLocation"/> <menuitem name="CopyEmailLinkLP" verb="CopyEmail"/> </popup> @@ -123,6 +124,7 @@ <menuitem name="OpenImageIP" verb="OpenImage"/> <menuitem name="OpenImageInNewBrowserIP" verb="OpenImageInNewBrowser"/> <menuitem name="OpenImageInNewTabIP" verb="OpenImageInNewTab"/> + <separator name="IPSep1"/> <menuitem name="SaveImageAsIP" verb="SaveImageAs"/> <menuitem name="SetImageAsBackgroundIP" verb="SetImageAsBackground"/> <menuitem name="CopyImageLocationIP" verb="CopyImageLocation"/> @@ -132,14 +134,16 @@ <menuitem name="OpenLinkILP" verb="OpenLink"/> <menuitem name="OpenLinkInNewBrowserILP" verb="OpenLinkInNewBrowser"/> <menuitem name="OpenLinkInNewTabILP" verb="OpenLinkInNewTab"/> + <separator name="ILPSep1"/> <menuitem name="DownloadLinkILP" verb="DownloadLink"/> - <menuitem name="AddLinkBookmarkILP" verb="AddLinkBookmark"/> + <menuitem name="BookmarkLinkILP" verb="BookmarkLink"/> <menuitem name="CopyLinkLocationILP" verb="CopyLinkLocation"/> <menuitem name="CopyEmailLinkILP" verb="CopyEmail"/> - <separator name="LPSep1"/> + <separator name="ILPSep2"/> <menuitem name="OpenImageILP" verb="OpenImage"/> <menuitem name="OpenImageInNewBrowserILP" verb="OpenImageInNewBrowser"/> <menuitem name="OpenImageInNewTabILP" verb="OpenImageInNewTab"/> + <separator name="ILPSep3"/> <menuitem name="SaveImageAsILP" verb="SaveImageAs"/> <menuitem name="SetImageAsBackgroundILP" verb="SetImageAsBackground"/> <menuitem name="CopyImageLocationILP" verb="CopyImageLocation"/> diff --git a/lib/ephy-stock-icons.h b/lib/ephy-stock-icons.h index 8c24fc154..585dc1709 100644 --- a/lib/ephy-stock-icons.h +++ b/lib/ephy-stock-icons.h @@ -36,4 +36,4 @@ void ephy_stock_icons_init (void); G_END_DECLS -#endif /* __RB_STOCK_ICONS_H */ +#endif /* EPHY_STOCK_ICONS_H */ diff --git a/src/ephy-window.c b/src/ephy-window.c index 127ab1c81..9163cfd1c 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -65,7 +65,7 @@ static EggActionGroupEntry ephy_menu_entries [] = { /* File menu */ { "FileNewBrowser", N_("_New Browser"), GTK_STOCK_NEW, "<control>N", N_("Create a new browser"), - G_CALLBACK (window_cmd_file_new_window), NULL }, + G_CALLBACK (window_cmd_file_new_browser), NULL }, { "FileNewTab", N_("New _Tab"), EPHY_STOCK_NEW_TAB, "<control>T", N_("Create a new tab"), G_CALLBACK (window_cmd_file_new_tab), NULL }, @@ -81,9 +81,9 @@ static EggActionGroupEntry ephy_menu_entries [] = { { "FileSendTo", N_("S_end To..."), EPHY_STOCK_SEND_LINK, NULL, N_("Send a link of the current page"), G_CALLBACK (window_cmd_file_send_to), NULL }, - { "FileAddBookmark", N_("_Add Bookmark..."), GTK_STOCK_ADD, "<control>D", + { "FileBookmarkPage", N_("Boo_kmark Page..."), NULL, "<control>D", N_("Add a bookmark for the current page"), - G_CALLBACK (window_cmd_file_add_bookmark), NULL }, + G_CALLBACK (window_cmd_file_bookmark_page), NULL }, { "FileCloseBrowser", N_("_Close"), GTK_STOCK_CLOSE, "<control>W", N_("Close this browser"), G_CALLBACK (window_cmd_file_close_browser), NULL }, @@ -207,47 +207,47 @@ static EggActionGroupEntry ephy_popups_entries [] = { { "FakeToplevel", (""), NULL, NULL, NULL, NULL, NULL }, /* Document */ - { "SaveBackgroundAs", N_("Save Background As..."), NULL, NULL, + { "SaveBackgroundAs", N_("_Save Background As..."), NULL, NULL, NULL, G_CALLBACK (popup_cmd_save_background_as), NULL }, - { "CopyPageLocation", N_("Copy Page Location"), GTK_STOCK_COPY, NULL, + { "CopyPageLocation", N_("_Copy Page Location"), GTK_STOCK_COPY, NULL, NULL, G_CALLBACK (popup_cmd_copy_page_location), NULL }, /* Framed document */ - { "OpenFrame", N_("Open Frame"), NULL, NULL, + { "OpenFrame", N_("_Open Frame"), NULL, NULL, NULL, G_CALLBACK (popup_cmd_open_frame), NULL }, - { "OpenFrameInNewBrowser", N_("Open Frame in New Browser"), NULL, NULL, - NULL, G_CALLBACK (popup_cmd_frame_in_new_window), NULL }, - { "OpenFrameInNewTab", N_("Open Frame in New Tab"), NULL, NULL, + { "OpenFrameInNewBrowser", N_("Open Frame in _New Browser"), NULL, NULL, + NULL, G_CALLBACK (popup_cmd_frame_in_new_browser), NULL }, + { "OpenFrameInNewTab", N_("Open Frame in New _Tab"), NULL, NULL, NULL, G_CALLBACK (popup_cmd_frame_in_new_tab), NULL }, /* Links */ - { "OpenLink", N_("Open Link"), GTK_STOCK_OPEN, NULL, + { "OpenLink", N_("_Open Link"), GTK_STOCK_OPEN, NULL, NULL, G_CALLBACK (popup_cmd_open_link), NULL }, - { "OpenLinkInNewBrowser", N_("Open Link in New Browser"), NULL, NULL, - NULL, G_CALLBACK (popup_cmd_link_in_new_window), NULL }, - { "OpenLinkInNewTab", N_("Open Link in New Tab"), NULL, NULL, + { "OpenLinkInNewBrowser", N_("Open Link in _New Browser"), NULL, NULL, + NULL, G_CALLBACK (popup_cmd_link_in_new_browser), NULL }, + { "OpenLinkInNewTab", N_("Open Link in New _Tab"), NULL, NULL, NULL, G_CALLBACK (popup_cmd_link_in_new_tab), NULL }, - { "DownloadLink", N_("Download Link"), GTK_STOCK_SAVE, NULL, + { "DownloadLink", N_("_Download Link"), GTK_STOCK_SAVE, NULL, NULL, G_CALLBACK (popup_cmd_download_link), NULL }, - { "AddLinkBookmark", N_("Add Bookmark"), GTK_STOCK_ADD, NULL, - NULL, G_CALLBACK (popup_cmd_add_link_bookmark), NULL }, - { "CopyLinkLocation", N_("Copy Link Location"), NULL, NULL, + { "BookmarkLink", N_("_Bookmark Link..."), NULL, NULL, + NULL, G_CALLBACK (popup_cmd_bookmark_link), NULL }, + { "CopyLinkLocation", N_("_Copy Link Location"), NULL, NULL, NULL, G_CALLBACK (popup_cmd_copy_link_location), NULL }, - { "CopyEmail", N_("Copy Email"), NULL, NULL, + { "CopyEmail", N_("Copy _Email"), NULL, NULL, NULL, G_CALLBACK (popup_cmd_copy_email), NULL }, /* Images */ - { "OpenImage", N_("Open Image"), GTK_STOCK_OPEN, NULL, + { "OpenImage", N_("_Open Image"), GTK_STOCK_OPEN, NULL, NULL, G_CALLBACK (popup_cmd_open_image), NULL }, - { "OpenImageInNewBrowser", N_("Open Image in New Browser"), NULL, NULL, - NULL, G_CALLBACK (popup_cmd_image_in_new_window), NULL }, - { "OpenImageInNewTab", N_("Open Image in New Tab"), NULL, NULL, + { "OpenImageInNewBrowser", N_("Open Image in _New Browser"), NULL, NULL, + NULL, G_CALLBACK (popup_cmd_image_in_new_browser), NULL }, + { "OpenImageInNewTab", N_("Open Image in New _Tab"), NULL, NULL, NULL, G_CALLBACK (popup_cmd_image_in_new_tab), NULL }, - { "SaveImageAs", N_("Save Image As..."), GTK_STOCK_SAVE_AS, NULL, + { "SaveImageAs", N_("_Save Image As..."), GTK_STOCK_SAVE_AS, NULL, NULL, G_CALLBACK (popup_cmd_save_image_as), NULL }, - { "SetImageAsBackground", N_("Use Image As Background"), NULL, NULL, + { "SetImageAsBackground", N_("Use Image As _Background"), NULL, NULL, NULL, G_CALLBACK (popup_cmd_set_image_as_background), NULL }, - { "CopyImageLocation", N_("Copy Image Location"), GTK_STOCK_COPY, NULL, + { "CopyImageLocation", N_("_Copy Image Location"), GTK_STOCK_COPY, NULL, NULL, G_CALLBACK (popup_cmd_copy_image_location), NULL }, }; static guint ephy_popups_n_entries = G_N_ELEMENTS (ephy_popups_entries); diff --git a/src/popup-commands.c b/src/popup-commands.c index 95e8eee78..fa75ef8ce 100644 --- a/src/popup-commands.c +++ b/src/popup-commands.c @@ -43,7 +43,7 @@ get_event_info (EphyWindow *window) } void -popup_cmd_link_in_new_window (EggAction *action, +popup_cmd_link_in_new_browser (EggAction *action, EphyWindow *window) { EphyEmbedEvent *info; @@ -100,7 +100,7 @@ popup_cmd_image_in_new_tab (EggAction *action, } void -popup_cmd_image_in_new_window (EggAction *action, +popup_cmd_image_in_new_browser (EggAction *action, EphyWindow *window) { EphyEmbedEvent *info; @@ -119,7 +119,7 @@ popup_cmd_image_in_new_window (EggAction *action, } void -popup_cmd_add_link_bookmark (EggAction *action, +popup_cmd_bookmark_link (EggAction *action, EphyWindow *window) { GtkWidget *new_bookmark; @@ -188,7 +188,7 @@ popup_cmd_frame_in_new_tab (EggAction *action, } void -popup_cmd_frame_in_new_window (EggAction *action, +popup_cmd_frame_in_new_browser (EggAction *action, EphyWindow *window) { EphyTab *tab; diff --git a/src/popup-commands.h b/src/popup-commands.h index c2ac4fb36..af41756c5 100644 --- a/src/popup-commands.h +++ b/src/popup-commands.h @@ -19,7 +19,7 @@ #include "egg-action.h" #include "ephy-window.h" -void popup_cmd_link_in_new_window (EggAction *action, +void popup_cmd_link_in_new_browser (EggAction *action, EphyWindow *window); void popup_cmd_link_in_new_tab (EggAction *action, @@ -28,16 +28,16 @@ void popup_cmd_link_in_new_tab (EggAction *action, void popup_cmd_image_in_new_tab (EggAction *action, EphyWindow *window); -void popup_cmd_image_in_new_window (EggAction *action, +void popup_cmd_image_in_new_browser (EggAction *action, EphyWindow *window); -void popup_cmd_add_link_bookmark (EggAction *action, +void popup_cmd_bookmark_link (EggAction *action, EphyWindow *window); void popup_cmd_frame_in_new_tab (EggAction *action, EphyWindow *window); -void popup_cmd_frame_in_new_window (EggAction *action, +void popup_cmd_frame_in_new_browser (EggAction *action, EphyWindow *window); void popup_cmd_add_frame_bookmark (EggAction *action, diff --git a/src/window-commands.c b/src/window-commands.c index a36307990..3518cf953 100644 --- a/src/window-commands.c +++ b/src/window-commands.c @@ -222,7 +222,7 @@ window_cmd_view_reload (EggAction *action, } void -window_cmd_file_new_window (EggAction *action, +window_cmd_file_new_browser (EggAction *action, EphyWindow *window) { EphyTab *tab; @@ -263,7 +263,7 @@ window_cmd_go_bookmarks (EggAction *action, } void -window_cmd_file_add_bookmark (EggAction *action, +window_cmd_file_bookmark_page (EggAction *action, EphyWindow *window) { EphyTab *tab; diff --git a/src/window-commands.h b/src/window-commands.h index 131d0f727..d14304d19 100644 --- a/src/window-commands.h +++ b/src/window-commands.h @@ -56,13 +56,13 @@ void window_cmd_view_reload (EggAction *action, void window_cmd_new (EggAction *action, EphyWindow *window); -void window_cmd_file_new_window (EggAction *action, +void window_cmd_file_new_browser (EggAction *action, EphyWindow *window); void window_cmd_file_new_tab (EggAction *action, EphyWindow *window); -void window_cmd_file_add_bookmark(EggAction *action, +void window_cmd_file_bookmark_page(EggAction *action, EphyWindow *window); void window_cmd_go_bookmarks (EggAction *action, |