From cbccb0edeaa90948433f559a16d8490c8ad3f97e Mon Sep 17 00:00:00 2001
From: Peter Harvey <peter.a.harvey@gmail.com>
Date: Mon, 30 Jan 2006 22:13:07 +0000
Subject: data/ui/epiphany-ui.xml src/ephy-lockdown.c src/ephy-toolbar.c

2006-01-30  Peter Harvey  <peter.a.harvey@gmail.com>

	* data/ui/epiphany-ui.xml
	* src/ephy-lockdown.c
	* src/ephy-toolbar.c
	* src/ephy-window.c
	* lib/egg/egg-editable-toolbar.c
	* lib/egg/egg-editable-toolbar.h

	Add a Toolbars submenu with per-toolbar hide/show items.
---
 data/ui/epiphany-ui.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'data')

diff --git a/data/ui/epiphany-ui.xml b/data/ui/epiphany-ui.xml
index 2e0ef6fd2..45a520e34 100644
--- a/data/ui/epiphany-ui.xml
+++ b/data/ui/epiphany-ui.xml
@@ -32,13 +32,16 @@
 	<separator name="EditSep3"/>
 	<menuitem name="EditPersonalDataMenu" action="EditPersonalData"/>
 <!--	<menuitem name="EditCertificatesMenu" action="EditCertificates"/> -->
-	<menuitem name="EditToolbarMenu" action="EditToolbar"/>
 	<menuitem name="EditPrefsMenu" action="EditPrefs"/> 
 </menu>
 
 <menu name="ViewMenu" action="View">
 	<placeholder name="ViewTogglesGroup" position="top">
+		<menu name="ToolbarMenu" action="Toolbar">
+		<menuitem name="ViewToolbarEditorMenu" action="ViewToolbarEditor"/>
 		<menuitem name="ViewToolbarMenu" action="ViewToolbar"/>
+		<separator name="ToolbarSep1"/>
+		</menu>
 		<menuitem name="ViewStatusbarMenu" action="ViewStatusbar"/>
 	</placeholder>
 	<separator name="ViewSep1"/>
@@ -165,6 +168,12 @@
         <menuitem name="TabDetachENP" action="TabsDetach"/>
 </popup>
 
+<popup name="ToolbarPopup">
+	<separator/>
+        <menuitem action="ViewToolbarEditor"/>
+	<separator/>
+</popup>
+
 <accelerator name="AlwaysStopAccel" action="ViewAlwaysStop"/>
 <accelerator name="BrowseWithCaretAccel" action="BrowseWithCaret"/>
 
-- 
cgit v1.2.3