diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | data/ui/epiphany-ui.xml.in | 13 | ||||
| -rw-r--r-- | src/ephy-window.c | 5 | ||||
| -rw-r--r-- | src/window-commands.c | 7 | ||||
| -rw-r--r-- | src/window-commands.h | 3 |
5 files changed, 31 insertions, 7 deletions
@@ -1,3 +1,13 @@ +2003-02-15 Dave Bordoley <bordoley@msu.edu> + + * src/ephy-window.c + * src/window-commands.c + * src/window-commands.h + * data/ui/epiphany-ui.xml.in + Added Help->Contents + Move reload and stop to bottom of view menu + Fix mneumonic collision in the go menu + 2003-02-14 James Willcox <jwillcox@gnome.org> * data/art/Makefile.am: diff --git a/data/ui/epiphany-ui.xml.in b/data/ui/epiphany-ui.xml.in index 9304db7a2..e9b411aba 100644 --- a/data/ui/epiphany-ui.xml.in +++ b/data/ui/epiphany-ui.xml.in @@ -32,19 +32,19 @@ </submenu> <submenu name="ViewMenu" verb="View"> - <menuitem name="ViewStopMenu" verb="ViewStop"/> - <menuitem name="ViewReloadMenu" verb="ViewReload"/> - <separator name="ViewSep1"/> <menuitem name="ViewToolbarMenu" verb="ViewToolbar"/> <menuitem name="ViewStatusbarMenu" verb="ViewStatusbar"/> <menuitem name="ViewFullscreenMenu" verb="ViewFullscreen"/> - <separator name="ViewSep2"/> + <separator name="ViewSep1"/> <menuitem name="ViewZoomInMenu" verb="ViewZoomIn"/> <menuitem name="ViewZoomOutMenu" verb="ViewZoomOut"/> <menuitem name="ViewZoomNormalMenu" verb="ViewZoomNormal"/> - <separator name="ViewSep3"/> + <separator name="ViewSep2"/> <placeholder name="ViewEncodingsPlaceholder"/> <menuitem name="ViewPageSourceMenu" verb="ViewPageSource"/> + <separator name="ViewSep3"/> + <menuitem name="ViewStopMenu" verb="ViewStop"/> + <menuitem name="ViewReloadMenu" verb="ViewReload"/> </submenu> <submenu name="GoMenu" verb="Go"> @@ -72,7 +72,8 @@ </submenu> <submenu name="HelpMenu" verb="Help"> - <menuitem name="HelpAboutMenu" verb="HelpAbout"/> + <menuitem name="HelpContentsMenu" verb="HelpContents"/> + <menuitem name="HelpAboutMenu" verb="HelpAbout"/> </submenu> </menu> diff --git a/src/ephy-window.c b/src/ephy-window.c index 9163cfd1c..904dfc149 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -166,7 +166,7 @@ static EggActionGroupEntry ephy_menu_entries [] = { { "GoLocation", N_("_Location..."), NULL, "<control>L", N_("Go to a specified location"), G_CALLBACK (window_cmd_go_location), NULL }, - { "GoHistory", N_("_History"), EPHY_STOCK_HISTORY, "<control>H", + { "GoHistory", N_("H_istory"), EPHY_STOCK_HISTORY, "<control>H", N_("Go to an already visited page"), G_CALLBACK (window_cmd_go_history), NULL }, { "GoBookmarks", N_("_Bookmarks"), EPHY_STOCK_BOOKMARKS, "<control>B", @@ -191,6 +191,9 @@ static EggActionGroupEntry ephy_menu_entries [] = { G_CALLBACK (window_cmd_tabs_detach), NULL }, /* Help menu */ + {"HelpContents", N_("_Contents"), GTK_STOCK_HELP, "F1", + N_("Display web browser help"), + G_CALLBACK (window_cmd_help_contents), NULL }, { "HelpAbout", N_("_About"), GNOME_STOCK_ABOUT, NULL, N_("Display credits for the web browser creators"), G_CALLBACK (window_cmd_help_about), NULL }, diff --git a/src/window-commands.c b/src/window-commands.c index 3518cf953..d03b4438e 100644 --- a/src/window-commands.c +++ b/src/window-commands.c @@ -646,6 +646,13 @@ window_cmd_edit_toolbar (EggAction *action, ephy_editable_toolbar_edit (EPHY_EDITABLE_TOOLBAR (toolbar)); } +void +window_cmd_help_contents (EggAction *action, + EphyWindow *window) +{ + /* FIXME: Need to implement */ +} + void window_cmd_help_about (EggAction *action, EphyWindow *window) diff --git a/src/window-commands.h b/src/window-commands.h index d14304d19..aa1b6a2e7 100644 --- a/src/window-commands.h +++ b/src/window-commands.h @@ -131,6 +131,9 @@ void window_cmd_edit_prefs (EggAction *action, void window_cmd_edit_toolbar (EggAction *action, EphyWindow *window); +void window_cmd_help_contents (EggAction *action, + EphyWindow *window); + void window_cmd_help_about (EggAction *action, EphyWindow *window); |