From 12457c76828787701f0152ad76ff65453a0545c3 Mon Sep 17 00:00:00 2001
From: "davidm%netscape.com" <davidm%netscape.com>
Date: Thu, 9 Sep 1999 04:47:21 +0000
Subject: [PATCH] Move menus over into navigatorOverlay.xul. Hook up some of
 the keybindings

---
 suite/browser/navigator.xul                  | 94 ++++----------------
 xpfe/browser/resources/content/navigator.xul | 94 ++++----------------
 2 files changed, 32 insertions(+), 156 deletions(-)

diff --git a/suite/browser/navigator.xul b/suite/browser/navigator.xul
index 3e9cd0d15d7c..8a3f93e6f629 100644
--- a/suite/browser/navigator.xul
+++ b/suite/browser/navigator.xul
@@ -26,6 +26,7 @@ Contributor(s): ______________________________________. -->
 <?xml-stylesheet href="chrome://bookmarks/skin/" type="text/css"?> 
 <?xul-overlay href="chrome://global/content/tasksOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
+<?xul-overlay href="chrome://navigator/content/navigatorOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://navigator/locale/navigator.dtd" >
 <window id="main-window" xmlns:html="http://www.w3.org/TR/REC-html40"
@@ -53,10 +54,7 @@ Contributor(s): ______________________________________. -->
  </window>
 </popup>
 
-<!-- This is for test purposes. -->
-<keyset>
-    <key id="openKey" key="x" command="true" onkeypress="BrowserOpenWindow()"/>
-</keyset>
+
 
 <html:script language="javascript">
   var gBookmarkPopup = null;
@@ -125,7 +123,14 @@ Contributor(s): ______________________________________. -->
   <!-- Interim hack to transition from nsIXULWindowCallbacks/ShowWindowWithArgs -->
   <broadcaster id="dialog.start" ready="false"/>
   <observes element="dialog.start" attribute="ready" onchange="onLoadWithArgs()"/>
-    
+  
+  	
+	<!-- keys are appended from the overlay -->
+  <keyset id="defaultBrowserKeySet"/>
+  
+  <broadcasterset id="browserbroadcasterset">
+	</broadcasterset>
+	
   <!-- HELLO!! IS ANYONE READING THIS?  In case you are reading this,
        note that this menubar is copied verbatim in hiddenWindow.xul.
        Please do be so kind as to reflect any changes made into that
@@ -133,41 +138,8 @@ Contributor(s): ______________________________________. -->
        will let us use included files. -->
    <toolbox id="main-toolbox">
     <menubar chromeclass="menubar">
-      <menu accesskey="f" value="&fileMenu.label;">
-        <menupopup>
-          <menuitem value="&browserCmd.label;" oncommand="BrowserNewWindow();"/>
-		           <menu value="&newMenu.label;">
-              <menupopup>
-                <menuitem value="&newMailCmd.label;" oncommand="MsgNewMessage();"/>
-                  <menuseparator />
-                  <menuitem value="&newBlankPageCmd.label;" oncommand="BrowserNewEditorWindow();"/>
-                  <menuitem value="&newPageFromTemplateCmd.label;" oncommand="BrowserNewWindow();"/>
-                  <menuitem value="&newPageFromDraftCmd.label;" oncommand="BrowserNewWindow();"/>
-              </menupopup>
-            </menu>
-
-          <menuitem value="&openCmd.label;" oncommand="BrowserOpenWindow();" key="openKey"/>
-          <menuitem value="&openFileCmd.label;" oncommand="BrowserOpenFileWindow();"/>
-          <menuseparator/>
-          <menuitem value="&sendPageCmd.label;" oncommand="BrowserReload();"/>
-          <menuitem value="&editPageCmd.label;" oncommand="BrowserEditPage(window.content.location.href);" />
-          <menuseparator />
-          <menu value="&offlineMenu.label;">
-            <menupopup>
-              <menuitem value="&offlineGoOfflineCmd.label;" oncommand="BrowserReload();"/>
-              <menuseparator />
-              <menuitem value="&offlineSynchronizeCmd.label;" oncommand="BrowserReload();"/>
-            </menupopup>
-          </menu>
-          <menuseparator/>
-          <menuitem value="&printSetupCmd.label;" oncommand=";"/>
-          <menuitem value="&printPreviewCmd.label;" oncommand=""/>
-          <menuitem value="&printCmd.label;" oncommand="BrowserPrint()"/>
-          <menuseparator />
-          <menuitem value="&closeCmd.label;" oncommand="BrowserClose();"/>
-          <menuitem value="&quitCmd.label;" oncommand="BrowserExit();"/>
-      </menupopup>
-    </menu>
+     
+     <menu id="fileMenu"/>
 
 	<menu accesskey="e" value="&editMenu.label;">
 	  <menupopup>
@@ -327,11 +299,6 @@ Contributor(s): ______________________________________. -->
 		  <menuitem value="&findOnCmd.label;" oncommand="BrowserFind();"/>
 		  <menuitem value="&findAgainCmd.label;" oncommand="BrowserFindAgain();"/>
 		  <menuseparator />
-		  <menuitem value="&searchParentCmd.label;" oncommand="BrowserReload();"/>
-		  <menuitem value="&searchParenet2Cmd.label;" oncommand="BrowserReload();"/>
-		  <menuitem value="&appSpecificCmd.label;" oncommand="BrowserReload();"/>
-		  <menuitem value="&appSpecificCmd.label;" oncommand="BrowserReload();"/>
-		  <menuseparator />
 		  <menuitem value="&searchBookmarksHistoryCmd.label;" oncommand="OpenSearch('find', null);"/>
 		  <menuitem value="&searchInternetCmd.label;" oncommand="OpenSearch('internet', null);"/>
 		  <menuitem value="&searchAllMailCmd.label;" oncommand="OpenSearch('mail', null);"/>
@@ -340,39 +307,10 @@ Contributor(s): ______________________________________. -->
 		  <menuitem value="&searchComputerCmd.label;" oncommand="BrowserReload();"/>
 	  </menupopup>
     </menu>
-    <menu accesskey="g" id="gomenu" value="&goMenu.label;">
-	  <menupopup>
-		  <menuitem id="menuitem-back" value="&goBackCmd.label;" oncommand="BrowserBack();"/>
-		  <menuitem id="menuitem-forward" value="&goForwardCmd.label;" oncommand="BrowserForward();" />
-		  <menuitem value="&goHomeCmd.label;" oncommand="BrowserHome();"/>
-		  <menuseparator />
-	  </menupopup>
-    </menu>
-    <menu accesskey="b" value="&bookmarksMenu.label;"
-                           datasources="rdf:bookmarks rdf:files rdf:find rdf:internetsearch" id="BookmarksMenu" ref="NC:BookmarksRoot">
-		<template>
-			<rule iscontainer="true">
-			  <menupopup>
-				<menu uri="..." value="rdf:http://home.netscape.com/NC-rdf#Name"/>
-			  </menupopup>
-			</rule>
-			<rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
-			  <menupopup> 
-				<menuseparator uri="..." />
-			  </menupopup>
-			</rule>
-			<rule>
-			  <menupopup>
-				<menuitem uri="..." value="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="OpenBookmarkURL(event.target, 'BookmarksMenu')" />
-			  </menupopup>
-			</rule>
-		</template>
-		<menupopup>
-			<menuitem value="&addCurPageCmd.label;" oncommand="BrowserAddBookmark(window.content.location.href,window.content.document.title);"/>
-			<menuitem value="&manBookmarksCmd.label;" oncommand="BrowserEditBookmarks();"/>
-			<menuseparator/>
-		</menupopup>
-    </menu>
+  
+  	<menu id = "gomenu" />
+  	<menu id="BookmarksMenu" />
+   
   
   <menu accesskey="t" id="tasksMenu"/>
   <menu accesskey="h" id="helpMenu"/>
diff --git a/xpfe/browser/resources/content/navigator.xul b/xpfe/browser/resources/content/navigator.xul
index 3e9cd0d15d7c..8a3f93e6f629 100644
--- a/xpfe/browser/resources/content/navigator.xul
+++ b/xpfe/browser/resources/content/navigator.xul
@@ -26,6 +26,7 @@ Contributor(s): ______________________________________. -->
 <?xml-stylesheet href="chrome://bookmarks/skin/" type="text/css"?> 
 <?xul-overlay href="chrome://global/content/tasksOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
+<?xul-overlay href="chrome://navigator/content/navigatorOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://navigator/locale/navigator.dtd" >
 <window id="main-window" xmlns:html="http://www.w3.org/TR/REC-html40"
@@ -53,10 +54,7 @@ Contributor(s): ______________________________________. -->
  </window>
 </popup>
 
-<!-- This is for test purposes. -->
-<keyset>
-    <key id="openKey" key="x" command="true" onkeypress="BrowserOpenWindow()"/>
-</keyset>
+
 
 <html:script language="javascript">
   var gBookmarkPopup = null;
@@ -125,7 +123,14 @@ Contributor(s): ______________________________________. -->
   <!-- Interim hack to transition from nsIXULWindowCallbacks/ShowWindowWithArgs -->
   <broadcaster id="dialog.start" ready="false"/>
   <observes element="dialog.start" attribute="ready" onchange="onLoadWithArgs()"/>
-    
+  
+  	
+	<!-- keys are appended from the overlay -->
+  <keyset id="defaultBrowserKeySet"/>
+  
+  <broadcasterset id="browserbroadcasterset">
+	</broadcasterset>
+	
   <!-- HELLO!! IS ANYONE READING THIS?  In case you are reading this,
        note that this menubar is copied verbatim in hiddenWindow.xul.
        Please do be so kind as to reflect any changes made into that
@@ -133,41 +138,8 @@ Contributor(s): ______________________________________. -->
        will let us use included files. -->
    <toolbox id="main-toolbox">
     <menubar chromeclass="menubar">
-      <menu accesskey="f" value="&fileMenu.label;">
-        <menupopup>
-          <menuitem value="&browserCmd.label;" oncommand="BrowserNewWindow();"/>
-		           <menu value="&newMenu.label;">
-              <menupopup>
-                <menuitem value="&newMailCmd.label;" oncommand="MsgNewMessage();"/>
-                  <menuseparator />
-                  <menuitem value="&newBlankPageCmd.label;" oncommand="BrowserNewEditorWindow();"/>
-                  <menuitem value="&newPageFromTemplateCmd.label;" oncommand="BrowserNewWindow();"/>
-                  <menuitem value="&newPageFromDraftCmd.label;" oncommand="BrowserNewWindow();"/>
-              </menupopup>
-            </menu>
-
-          <menuitem value="&openCmd.label;" oncommand="BrowserOpenWindow();" key="openKey"/>
-          <menuitem value="&openFileCmd.label;" oncommand="BrowserOpenFileWindow();"/>
-          <menuseparator/>
-          <menuitem value="&sendPageCmd.label;" oncommand="BrowserReload();"/>
-          <menuitem value="&editPageCmd.label;" oncommand="BrowserEditPage(window.content.location.href);" />
-          <menuseparator />
-          <menu value="&offlineMenu.label;">
-            <menupopup>
-              <menuitem value="&offlineGoOfflineCmd.label;" oncommand="BrowserReload();"/>
-              <menuseparator />
-              <menuitem value="&offlineSynchronizeCmd.label;" oncommand="BrowserReload();"/>
-            </menupopup>
-          </menu>
-          <menuseparator/>
-          <menuitem value="&printSetupCmd.label;" oncommand=";"/>
-          <menuitem value="&printPreviewCmd.label;" oncommand=""/>
-          <menuitem value="&printCmd.label;" oncommand="BrowserPrint()"/>
-          <menuseparator />
-          <menuitem value="&closeCmd.label;" oncommand="BrowserClose();"/>
-          <menuitem value="&quitCmd.label;" oncommand="BrowserExit();"/>
-      </menupopup>
-    </menu>
+     
+     <menu id="fileMenu"/>
 
 	<menu accesskey="e" value="&editMenu.label;">
 	  <menupopup>
@@ -327,11 +299,6 @@ Contributor(s): ______________________________________. -->
 		  <menuitem value="&findOnCmd.label;" oncommand="BrowserFind();"/>
 		  <menuitem value="&findAgainCmd.label;" oncommand="BrowserFindAgain();"/>
 		  <menuseparator />
-		  <menuitem value="&searchParentCmd.label;" oncommand="BrowserReload();"/>
-		  <menuitem value="&searchParenet2Cmd.label;" oncommand="BrowserReload();"/>
-		  <menuitem value="&appSpecificCmd.label;" oncommand="BrowserReload();"/>
-		  <menuitem value="&appSpecificCmd.label;" oncommand="BrowserReload();"/>
-		  <menuseparator />
 		  <menuitem value="&searchBookmarksHistoryCmd.label;" oncommand="OpenSearch('find', null);"/>
 		  <menuitem value="&searchInternetCmd.label;" oncommand="OpenSearch('internet', null);"/>
 		  <menuitem value="&searchAllMailCmd.label;" oncommand="OpenSearch('mail', null);"/>
@@ -340,39 +307,10 @@ Contributor(s): ______________________________________. -->
 		  <menuitem value="&searchComputerCmd.label;" oncommand="BrowserReload();"/>
 	  </menupopup>
     </menu>
-    <menu accesskey="g" id="gomenu" value="&goMenu.label;">
-	  <menupopup>
-		  <menuitem id="menuitem-back" value="&goBackCmd.label;" oncommand="BrowserBack();"/>
-		  <menuitem id="menuitem-forward" value="&goForwardCmd.label;" oncommand="BrowserForward();" />
-		  <menuitem value="&goHomeCmd.label;" oncommand="BrowserHome();"/>
-		  <menuseparator />
-	  </menupopup>
-    </menu>
-    <menu accesskey="b" value="&bookmarksMenu.label;"
-                           datasources="rdf:bookmarks rdf:files rdf:find rdf:internetsearch" id="BookmarksMenu" ref="NC:BookmarksRoot">
-		<template>
-			<rule iscontainer="true">
-			  <menupopup>
-				<menu uri="..." value="rdf:http://home.netscape.com/NC-rdf#Name"/>
-			  </menupopup>
-			</rule>
-			<rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
-			  <menupopup> 
-				<menuseparator uri="..." />
-			  </menupopup>
-			</rule>
-			<rule>
-			  <menupopup>
-				<menuitem uri="..." value="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="OpenBookmarkURL(event.target, 'BookmarksMenu')" />
-			  </menupopup>
-			</rule>
-		</template>
-		<menupopup>
-			<menuitem value="&addCurPageCmd.label;" oncommand="BrowserAddBookmark(window.content.location.href,window.content.document.title);"/>
-			<menuitem value="&manBookmarksCmd.label;" oncommand="BrowserEditBookmarks();"/>
-			<menuseparator/>
-		</menupopup>
-    </menu>
+  
+  	<menu id = "gomenu" />
+  	<menu id="BookmarksMenu" />
+   
   
   <menu accesskey="t" id="tasksMenu"/>
   <menu accesskey="h" id="helpMenu"/>