From 16b0cbaf01e356007d3257ece00d407aa13138f7 Mon Sep 17 00:00:00 2001
From: Peter Harvey <peter.a.harvey@gmail.com>
Date: Thu, 9 Feb 2006 10:29:24 +0000
Subject: data/ui/epiphany-bookmark-editor-ui.xml

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

	* data/ui/epiphany-bookmark-editor-ui.xml
	* src/bookmarks/ephy-bookmarks-editor.c

	Restore the 'Show on Toolbar' functionality, implemented very
	differently now.
---
 data/ui/epiphany-bookmark-editor-ui.xml | 70 +++++++++++++++++----------------
 1 file changed, 37 insertions(+), 33 deletions(-)

(limited to 'data')

diff --git a/data/ui/epiphany-bookmark-editor-ui.xml b/data/ui/epiphany-bookmark-editor-ui.xml
index 79bb82e49..b62b5b9c9 100644
--- a/data/ui/epiphany-bookmark-editor-ui.xml
+++ b/data/ui/epiphany-bookmark-editor-ui.xml
@@ -2,56 +2,60 @@
 <menubar>
 
 <menu name="FileMenu" action="File">
- 	<menuitem name="FileNewTopic" action="NewTopic"/>
-	<separator name="FileSep1"/>
-        <menuitem name="FileOpenInWindow" action="OpenInWindow"/>
-	<menuitem name="FileOpenInTab" action="OpenInTab"/>
-	<separator name="FileSep2"/>
-	<menuitem name="FileRename" action="Rename"/>
-	<menuitem name="FileDelete" action="Delete"/>
-	<separator name="FileSep3"/>
-	<menuitem name="FileProperties" action="Properties"/>
-	<separator name="FileSep4"/>
-	<menuitem name="FileImport" action="Import"/>
-	<menuitem name="FileExport" action="Export"/>
-	<separator name="FileSep5"/>
-	<menuitem name="FileClose" action="Close"/>
+ 	<menuitem action="NewTopic"/>
+	<separator/>
+        <menuitem action="OpenInWindow"/>
+	<menuitem action="OpenInTab"/>
+	<separator/>
+	<menuitem action="Rename"/>
+	<menuitem action="Delete"/>
+	<separator/>
+	<menuitem action="ShowOnToolbar"/>
+	<menuitem action="Properties"/>
+	<separator/>
+	<menuitem action="Import"/>
+	<menuitem action="Export"/>
+	<separator/>
+	<menuitem action="Close"/>
 </menu>
 
 <menu name="EditMenu" action="Edit">
-	<menuitem name="EditCut" action="Cut"/>
-	<menuitem name="EditCopy" action="Copy"/>
-	<menuitem name="EditPaste" action="Paste"/>
-	<menuitem name="EditSelectAll" action="SelectAll"/>
+	<menuitem action="Cut"/>
+	<menuitem action="Copy"/>
+	<menuitem action="Paste"/>
+	<menuitem action="SelectAll"/>
 </menu>
 
 <menu name="ViewMenu" action="View">
-	<menuitem name="ViewTitleMenu" action="ViewTitle"/>
-	<menuitem name="ViewTitleAddressMenu" action="ViewTitleAddress"/>
+	<menuitem action="ViewTitle"/>
+	<menuitem action="ViewTitleAddress"/>
 </menu>
 
 <menu name="HelpMenu" action="Help">
-	<menuitem name="HelpContents" action="HelpContents"/>
-	<menuitem name="HelpAbout" action="HelpAbout"/>
+	<menuitem action="HelpContents"/>
+	<menuitem action="HelpAbout"/>
 </menu>
 
 </menubar>
 
 <popup name="EphyBookmarkEditorPopup" action="PopupAction">
-	<menuitem name="OpenInWindowBMK" action="OpenInWindow"/>
-	<menuitem name="OpenInTabBMK" action="OpenInTab"/>
-	<separator name="BookmarksPopupSep1"/>
-	<menuitem name="CopyBMK" action="Copy"/>
-	<separator name="BookmarksPopupSep2"/>
-	<menuitem name="RenameBMK" action="Rename"/>
-	<menuitem name="DeleteBMK" action="Delete"/>
-	<separator name="BookmarksPopupSep3"/>
-	<menuitem name="BMKProperties" action="Properties"/>
+	<menuitem action="OpenInWindow"/>
+	<menuitem action="OpenInTab"/>
+	<separator/>
+	<menuitem action="Copy"/>
+	<separator/>
+	<menuitem action="Rename"/>
+	<menuitem action="Delete"/>
+	<separator/>
+	<menuitem action="ShowOnToolbar"/>
+	<menuitem action="Properties"/>
 </popup>
 
 <popup name="EphyBookmarkKeywordPopup" action="PopupAction">
-	<menuitem name="RenameTPC" action="Rename"/>
-	<menuitem name="DeleteTPC" action="Delete"/>
+	<menuitem action="Rename"/>
+	<menuitem action="Delete"/>
+	<separator/>
+	<menuitem action="ShowOnToolbar"/>
 </popup>
 
 </ui>
-- 
cgit v1.2.3