From 737468b377c209b6c479a14b7dae7a6342ce8094 Mon Sep 17 00:00:00 2001 From: Dave Bordoley Date: Fri, 14 Feb 2003 15:18:26 +0000 Subject: data/ui/epiphany-ui.xml.in Added some separators. Changed "bookmark" verbs * 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 --- src/ephy-window.c | 50 +++++++++++++++++++++++++------------------------- src/popup-commands.c | 8 ++++---- src/popup-commands.h | 8 ++++---- src/window-commands.c | 4 ++-- src/window-commands.h | 4 ++-- 5 files changed, 37 insertions(+), 37 deletions(-) (limited to 'src') 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, "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, "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, "D", + { "FileBookmarkPage", N_("Boo_kmark Page..."), NULL, "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, "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, -- cgit v1.2.3