Add a help menu and associated "Contents" and "About" menu entries. Add a

2003-04-14  David Bordoley <bordoley@msu.edu>

	* data/ui/epiphany-bookmark-editor-ui.xml.in:
	* src/bookmarks/ephy-bookmarks-editor.c: (cmd_help_contents),
	(ephy_bookmarks_editor_update_menu), (ephy_bookmarks_editor_dispose),
	(ephy_bookmarks_editor_node_selected_cb), (keyword_node_selected_cb),
	(build_search_box):

	Add a help menu and associated "Contents" and "About" menu entries.
	Add a focus_monitor to the search entry. Only pass an editor
	to update_menu. Update the sensitivity and label of
	"Open in New Window/Tab(s)" based on focus and selection. Translators,
	if this causes problems with mneumonics, please give suggestions for
	other letters to use.

	* src/window-commands.c: (window_cmd_help_about):
	* src/window-commands.h:

	Take a GtkWidget instead of an EphyWindow as the
	callback data so that the about function can be used
	in the bme.

	* src/ephy-window.c: (setup_window):

	Setup short toolbar labels for "Bookmark Page...",
	"Save As...", "Print...", and "Open..." so that these
	items don't have elipses on the toolbar.

1 files changed, 10 insertions, 1 deletions

diff --git a/src/ephy-window.c b/src/ephy-window.c
index 457c4bd8b..07b456910 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -408,6 +408,7 @@ static void
 setup_window (EphyWindow *window)
 {
 	EggActionGroup *action_group;
+	EggAction *action;
 	EggMenuMerge *merge;
 	int i;
 
@@ -439,7 +440,15 @@ setup_window (EphyWindow *window)
 				      ephy_menu_n_entries);
 	egg_menu_merge_insert_action_group (merge, action_group, 0);
 	window->priv->action_group = action_group;
-
+	action = egg_action_group_get_action (action_group, "FileOpen");
+	g_object_set (action, "short_label", N_("Open"), NULL);
+	action = egg_action_group_get_action (action_group, "FileSaveAs");
+	g_object_set (action, "short_label", N_("Save As"), NULL);
+	action = egg_action_group_get_action (action_group, "FilePrint");
+	g_object_set (action, "short_label", N_("Print"), NULL);
+	action = egg_action_group_get_action (action_group, "FileBookmarkPage");
+	g_object_set (action, "short_label", N_("Bookmark"), NULL);
+	
 	action_group = egg_action_group_new ("PopupsActions");
 	egg_action_group_add_actions (action_group, ephy_popups_entries,
 				      ephy_popups_n_entries);