Add Toolbar toggle to document context menu in fullscreen mode.

2005-01-12  Christian Persch  <chpe@cvs.gnome.org>

	* data/ui/epiphany-ui.xml:

	Add Toolbar toggle to document context menu in fullscreen mode.

	* lib/egg/egg-editable-toolbar.c: (set_fixed_style),
	(update_fixed), (egg_editable_toolbar_set_fixed):
	* lib/egg/egg-editable-toolbar.h:

	Changed to allow setting a toolbar as fixed, not just one item.

	* lib/widgets/ephy-search-entry.h:

	Add _ prefixed struct declarations.

	* po/POTFILES.in:

	Updated.

	* src/Makefile.am:
	A src/ephy-fullscreen-popup.c:
	A src/ephy-fullscreen-popup.h:
	* src/ephy-history-window.c:
	* src/ephy-shell.c: (ephy_shell_new_tab):
	A src/ephy-toolbar.c:
	A src/ephy-toolbar.h:
	* src/ephy-window.c: (destroy_fullscreen_popup),
	(ephy_window_destroy), (exit_fullscreen_clicked_cb),
	(get_toolbar_visibility), (sync_chromes_visibility),
	(ephy_window_fullscreen), (ephy_window_unfullscreen),
	(sync_tab_address), (sync_tab_icon), (sync_tab_navigation),
	(sync_tab_security), (sync_tab_load_status), (sync_tab_zoom),
	(show_embed_popup), (modal_alert_cb), (ephy_window_focus_in_event),
	(ephy_window_focus_out_event), (ephy_window_init),
	(ephy_window_activate_location):
	R src/toolbar.c:
	R src/toolbar.h:
	* src/window-commands.c: (window_cmd_load_location):

	Implemented in-toolbar exit button, and integrated status indicator in
	the exit fullscreen popup. Moved toolbar.[ch] to ephy-toolbar.[ch] for
	namespace correcness, and much-needed code cleanup.

1 files changed, 33 insertions, 3 deletions

diff --git a/data/ui/epiphany-ui.xml b/data/ui/epiphany-ui.xml
index a5dc99572..520dfeb6b 100644
--- a/data/ui/epiphany-ui.xml
+++ b/data/ui/epiphany-ui.xml
@@ -116,20 +116,50 @@
 	<menuitem name="BookmarkPageDP" action="ContextBookmarkPage"/>
 </popup>
 
+<popup name="EphyFullscreenDocumentPopup" action="PopupAction">
+	<menuitem name="GoBackFSDP" action="GoBack"/>
+	<menuitem name="GoForwardFSDP" action="GoForward"/>
+	<menuitem name="GoReloadFSDP" action="ViewReload"/>
+	<separator />
+	<menuitem name="EditCopyFSDP" action="EditCopy"/>
+	<separator />
+	<menuitem name="SavePageAsFSDP" action="FileSaveAs"/>
+	<menuitem name="SaveBackgroundAsFSDP" action="SaveBackgroundAs"/>
+	<menuitem name="BookmarkPageFSDP" action="ContextBookmarkPage"/>
+	<separator />
+	<menuitem name="ViewToolbarFSDP" action="ViewToolbar"/>
+</popup>
+
 <popup name="EphyFramedDocumentPopup" action="PopupAction">
 	<menuitem name="GoBackFDP" action="GoBack"/>
 	<menuitem name="GoForwardFDP" action="GoForward"/>
 	<menuitem name="GoReloadFDP" action="ViewReload"/>
-	<separator name="FDPSep1"/>
+	<separator />
 	<menuitem name="EditCopyFDP" action="EditCopy"/>
-	<separator name="FDPSep2"/>
+	<separator />
 	<menuitem name="SavePageAsFDP" action="FileSaveAs"/>
 	<menuitem name="SaveBackgroundAsFDP" action="SaveBackgroundAs"/>
 	<menuitem name="BookmarkPageFDP" action="ContextBookmarkPage"/>
-	<separator name="FDBSep3"/>
+	<separator />
 	<menuitem name="OpenFrameFDP" action="OpenFrame"/>
 </popup>
 
+<popup name="EphyFullscreenFramedDocumentPopup" action="PopupAction">
+	<menuitem name="GoBackFSFDP" action="GoBack"/>
+	<menuitem name="GoForwardFSFDP" action="GoForward"/>
+	<menuitem name="GoReloadFSFDP" action="ViewReload"/>
+	<separator />
+	<menuitem name="EditCopyFSFDP" action="EditCopy"/>
+	<separator />
+	<menuitem name="SavePageAsFSFDP" action="FileSaveAs"/>
+	<menuitem name="SaveBackgroundAsFSFDP" action="SaveBackgroundAs"/>
+	<menuitem name="BookmarkPageFSFDP" action="ContextBookmarkPage"/>
+	<separator />
+	<menuitem name="OpenFrameFSFDP" action="OpenFrame"/>
+	<separator />
+	<menuitem name="ViewToolbarFSFDP" action="ViewToolbar"/>
+</popup>
+
 <popup name="EphyLinkPopup" action="PopupAction">
 	<menuitem name="OpenLinkLP" action="OpenLink"/>
         <menuitem name="OpenLinkInNewWindowLP" action="OpenLinkInNewWindow"/>