From ade53ab2fdcec609ca42b1277be1f8889bafbaa7 Mon Sep 17 00:00:00 2001
From: Xan Lopez <xan@igalia.com>
Date: Tue, 10 Jan 2012 17:02:10 +0100
Subject: Use the new Shell global menu for global actions

And remove them from the existing menubar.
---
 data/ui/Makefile.am                  |  1 +
 data/ui/epiphany-application-menu.ui | 24 ++++++++++++++++++++++++
 data/ui/epiphany-ui.xml              | 10 ----------
 3 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 data/ui/epiphany-application-menu.ui

(limited to 'data')

diff --git a/data/ui/Makefile.am b/data/ui/Makefile.am
index 9778f79d9..17797b8b5 100644
--- a/data/ui/Makefile.am
+++ b/data/ui/Makefile.am
@@ -12,6 +12,7 @@ gladedir = $(pkgdatadir)/glade
 glade_DATA = \
 	certificate-dialogs.ui		\
 	epiphany.ui			\
+	epiphany-application-menu.ui	\
 	form-signing-dialog.ui		\
 	prefs-dialog.ui			\
 	print.ui
diff --git a/data/ui/epiphany-application-menu.ui b/data/ui/epiphany-application-menu.ui
new file mode 100644
index 000000000..62f214092
--- /dev/null
+++ b/data/ui/epiphany-application-menu.ui
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <menu id='app-menu'>
+    <section>
+      <item label='_New Window' action='app.new' accel='<Primary>n' />
+    </section>
+    <section>
+      <item label='_Bookmarks' action='app.bookmarks' accel='<Primary>b' />
+      <item label='_History' action='app.history' accel='<Primary>h' />
+    </section>
+    <section>
+      <item label='Preferences' action='app.preferences' />
+      <item label='Personal Data' action='app.pdm' />
+    </section>
+    <section>
+      <item label='_Help' action='app.help' accel='<Primary>h' />
+      <item label='_About' action='app.about' accel='<Primary>a' />
+    </section>
+    <section>      
+      <item label='_Quit' action='app.quit' accel='<Primary>q' />
+    </section>
+  </menu>
+</interface>
+
diff --git a/data/ui/epiphany-ui.xml b/data/ui/epiphany-ui.xml
index 1e5e1215a..30ea17671 100644
--- a/data/ui/epiphany-ui.xml
+++ b/data/ui/epiphany-ui.xml
@@ -2,7 +2,6 @@
 	<menubar>
 		<menu name="FileMenu" action="File">  
 			<menuitem name="FileNewTabMenu" action="FileNewTab"/>
-			<menuitem name="FileNewWindowMenu" action="FileNewWindow"/>
 			<menuitem name="FileOpenMenu" action="FileOpen"/>
 			<separator name="FileSep1"/>	
 			<menuitem name="FileSaveAsMenu" action="FileSaveAs"/>
@@ -30,9 +29,6 @@
 			<menuitem name="EditFindMenu" action="EditFind"/>
 			<menuitem name="EditFindNextMenu" action="EditFindNext"/> 
 			<menuitem name="EditFindPrevMenu" action="EditFindPrev"/>
-			<separator name="EditSep3"/>
-			<menuitem name="EditPersonalDataMenu" action="EditPersonalData"/>
-			<menuitem name="EditPrefsMenu" action="EditPrefs"/> 
 		</menu>
 
 		<menu name="ViewMenu" action="View">
@@ -57,16 +53,10 @@
 
 		<menu name="BookmarksMenu" action="Bookmarks">
 			<menuitem name="BookmarksAddBookmarkMenu" action="FileBookmarkPage"/>
-			<menuitem name="BookmarksEditMenu" action="GoBookmarks"/>
 			<separator name="BookmarksSep1"/>
 		</menu>
 
 		<menu name="ToolsMenu" action="Tools"/>
-
-		<menu name="HelpMenu" action="Help">
-			<menuitem name="HelpContentsMenu" action="HelpContents"/>
-			<menuitem name="HelpAboutMenu" action="HelpAbout"/>
-		</menu>
 	</menubar>
 
 	<popup name="EphyInputPopup" action="PopupAction">
-- 
cgit v1.2.3