From c66ab87ed9b35bfafa1ad6aba79419d153e29de7 Mon Sep 17 00:00:00 2001
From: Peter Harvey <peter.a.harvey@gmail.com>
Date: Tue, 21 Feb 2006 13:44:16 +0000
Subject: data/ui/epiphany-fs-toolbar.xml lib/egg/egg-toolbars-model.c

2006-02-21  Peter Harvey  <peter.a.harvey@gmail.com>

	* data/ui/epiphany-fs-toolbar.xml
	* lib/egg/egg-toolbars-model.c
	* lib/egg/egg-toolbars-model.h

	Added "editable" attribute for toolbars.

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

	Many improvements to toolbar menus. Includes
	changes to show visibility toggles in multiple
	locations.

	* lib/ephy-stock-icons.c
	* lib/ephy-stock-icons.h

	Additional stock icon for drag and drop.

	* src/bookmarks/ephy-bookmarks-ui.c

	Make 'customize toolbar' invisible when editing.

	* src/ephy-shell.c

	Mark the full-screen toolbar as non-removable.
---
 data/ui/epiphany-fs-toolbar.xml |  2 +-
 data/ui/epiphany-ui.xml         | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'data')

diff --git a/data/ui/epiphany-fs-toolbar.xml b/data/ui/epiphany-fs-toolbar.xml
index 67ca03ff4..db1648422 100644
--- a/data/ui/epiphany-fs-toolbar.xml
+++ b/data/ui/epiphany-fs-toolbar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <toolbars version="1.0">
-<toolbar name="Toolbar" style="icons-only">
+<toolbar name="Toolbar" style="icons-only" editable="false">
 	<toolitem name="NavigationBack"/>
 	<toolitem name="NavigationForward"/>
 	<toolitem name="ViewStop"/>
diff --git a/data/ui/epiphany-ui.xml b/data/ui/epiphany-ui.xml
index 45a520e34..4887cbb07 100644
--- a/data/ui/epiphany-ui.xml
+++ b/data/ui/epiphany-ui.xml
@@ -38,9 +38,13 @@
 <menu name="ViewMenu" action="View">
 	<placeholder name="ViewTogglesGroup" position="top">
 		<menu name="ToolbarMenu" action="Toolbar">
-		<menuitem name="ViewToolbarEditorMenu" action="ViewToolbarEditor"/>
+		<separator/>
+		<placeholder name="ViewToolbarsGroup" position="top">
+		</placeholder>
+		<separator/>
 		<menuitem name="ViewToolbarMenu" action="ViewToolbar"/>
-		<separator name="ToolbarSep1"/>
+		<menuitem name="ViewToolbarEditorMenu" action="ViewToolbarEditor"/>
+		<separator/>
 		</menu>
 		<menuitem name="ViewStatusbarMenu" action="ViewStatusbar"/>
 	</placeholder>
@@ -169,6 +173,16 @@
 </popup>
 
 <popup name="ToolbarPopup">
+	<placeholder name="SpecificItemsGroup">
+	</placeholder>
+	<separator/>
+     	<menuitem action="MoveToolItem"/>
+ 	<menuitem action="RemoveToolItem"/>    
+	<separator/>
+	<menuitem action="RemoveToolbar"/>
+	<separator/>
+	<placeholder name="ViewToolbarsGroup">
+	</placeholder>
 	<separator/>
         <menuitem action="ViewToolbarEditor"/>
 	<separator/>
-- 
cgit v1.2.3