Bug 652371 - Make use of utilityOverlay's menu_View r=neil
authorIan Neal <iann_cvs@blueyonder.co.uk>
Mon, 25 Apr 2011 21:04:02 +0100
changeset 7609 227ee418e968c038b3c92f55cd7eda99c0bb0674
parent 7608 2e67f19621cdafd034bb3f49b4cc46270dd7861c
child 7610 d00d90aa7fed14ffaca412385a7e1d709f267436
push idunknown
push userunknown
push dateunknown
reviewersneil
bugs652371
Bug 652371 - Make use of utilityOverlay's menu_View r=neil
editor/ui/composer/content/editor.xul
editor/ui/locales/en-US/chrome/composer/editor.dtd
suite/browser/navigatorOverlay.xul
suite/debugQA/content/debugQATextEditorShell.xul
suite/locales/en-US/chrome/browser/navigator.dtd
suite/locales/en-US/chrome/common/utilityOverlay.dtd
--- a/editor/ui/composer/content/editor.xul
+++ b/editor/ui/composer/content/editor.xul
@@ -164,17 +164,17 @@
     <key keycode="VK_TAB" modifiers="control,shift" oncommand="return true;"/>
   </keyset>
 
   <toolbox class="toolbox-top" id="EditorToolbox">
   <menubar id="main-menubar" class="chromeclass-menubar" persist="collapsed" grippytooltiptext="&menuBar.tooltip;">
     <menu id="fileMenu"/>
     <menu id="editMenu"/>
 
-    <menu id="viewMenu" label="&viewMenu.label;" accesskey="&viewMenu.accesskey;">
+    <menu id="menu_View">
     <!-- id pulls in "Show Sidebar" item from sidebarOverlay -->
     <menupopup id="menu_View_Popup">
       <menu id="menu_Toolbars">
         <menupopup id="view_toolbars_popup"> 
           <menuitem id="viewComposerToolbar" label="&compositionToolbarCmd.label;" type="checkbox" accesskey="&compositionToolbarCmd.accesskey;" command="cmd_viewCompToolbar"  />
           <menuitem id="viewFormatToolbar"   label="&formattingToolbarCmd.label;"  type="checkbox" accesskey="&formattingToolbarCmd.accesskey;"  command="cmd_viewFormatToolbar" />
           <menuitem id="viewEditModeToolbar" label="&editmodeToolbarCmd.label;"    type="checkbox" accesskey="&editmodeToolbarCmd.accesskey;"    command="cmd_viewEditModeToolbar" />
           <menuitem id="menu_showTaskbar"/>
--- a/editor/ui/locales/en-US/chrome/composer/editor.dtd
+++ b/editor/ui/locales/en-US/chrome/composer/editor.dtd
@@ -51,18 +51,16 @@
 <!ENTITY exportToTextCmd.label "Export to Text…">
 <!ENTITY exportToTextCmd.accesskey "T">
 <!ENTITY previewCmd.label "Browse Page">
 <!ENTITY previewCmd.accesskey "w">
 <!ENTITY sendPageCmd.label "Send Page…">
 <!ENTITY sendPageCmd.accesskey "d">
 
 <!-- View menu items -->
-<!ENTITY viewMenu.label "View">
-<!ENTITY viewMenu.accesskey "V">
 <!ENTITY compositionToolbarCmd.label "Composition Toolbar">
 <!ENTITY compositionToolbarCmd.accesskey "C">
 <!ENTITY formattingToolbarCmd.label "Format Toolbar">
 <!ENTITY formattingToolbarCmd.accesskey "F">
 <!ENTITY editmodeToolbarCmd.label "Edit Mode Toolbar">
 <!ENTITY editmodeToolbarCmd.accesskey "E">
 
 <!-- Format menu items -->
--- a/suite/browser/navigatorOverlay.xul
+++ b/suite/browser/navigatorOverlay.xul
@@ -307,17 +307,17 @@
         <menuseparator id="textfieldDirection-separator" hidden="true"/>
         <menuitem id="textfieldDirection-swap" hidden="true"/>
 
         <menuseparator id="menu_PrefsSeparator"/> 
         <menuitem id="menu_preferences" oncommand="goPreferences('navigator_pane')"/>
       </menupopup>
     </menu>
 
-    <menu id="menu_View" accesskey="&viewMenu.accesskey;" label="&viewMenu.label;">
+    <menu id="menu_View">
       <menupopup id="menu_View_Popup">
         <menu label="&toolbarsCmd.label;" accesskey="&toolbarsCmd.accesskey;" id="menu_Toolbars">
           <menupopup id="view_toolbars_popup"
                      onpopupshowing="updateToolbarStates(event);"
                      oncommand="onViewToolbarCommand(event);">
             <menuitem id="menuitem_showhide_tabbar" label="&tabbarCmd.label;" accesskey="&tabbarCmd.accesskey;" class="menuitem-iconic" type="checkbox" oncommand="showHideTabbar();" checked="true"/>
             <menuitem label="&taskbarCmd.label;" accesskey="&taskbarCmd.accesskey;" class="menuitem-iconic" type="checkbox" observes="cmd_viewtaskbar" />
             <menuitem label="&componentbarCmd.label;" accesskey="&componentbarCmd.accesskey;" class="menuitem-iconic" type="checkbox" observes="cmd_viewcomponentbar"/>
--- a/suite/debugQA/content/debugQATextEditorShell.xul
+++ b/suite/debugQA/content/debugQATextEditorShell.xul
@@ -105,19 +105,17 @@
     <key id="showHideSidebar"/>
   </keyset>
 
   <toolbox id="EditorToolbox">
     <menubar id="main-menubar" class="chromeclass-menubar">
       <menu id="fileMenu"/>
       <menu id="editMenu"/>
 
-      <menu id="viewMenu"
-            label="&viewMenu.label;"
-            accesskey="&viewMenu.accesskey;">
+      <menu id="menu_View">
         <!-- id pulls in "Show Sidebar" item from sidebarOverlay -->
         <menupopup id="menu_View_Popup">
           <menu id="menu_Toolbars">
             <menupopup id="view_toolbars_popup">
               <menuitem id="viewComposerToolbar"
                         type="checkbox"
                         label="&compositionToolbarCmd.label;"
                         accesskey="&compositionToolbarCmd.accesskey;"
--- a/suite/locales/en-US/chrome/browser/navigator.dtd
+++ b/suite/locales/en-US/chrome/browser/navigator.dtd
@@ -35,19 +35,16 @@
 <!ENTITY printSetupCmd.label "Page Setup…">
 <!ENTITY printSetupCmd.accesskey "u">
 <!ENTITY printPreviewCmd.label "Print Preview">
 <!ENTITY printPreviewCmd.accesskey "v">
 <!ENTITY printCmd.label "Print…">
 <!ENTITY printCmd.accesskey "p">
 <!ENTITY printCmd.commandkey "p">
 
-<!ENTITY viewMenu.label "View">
-<!ENTITY viewMenu.accesskey "v">
-
 <!ENTITY toolbarsCmd.label "Show/Hide">
 <!ENTITY toolbarsCmd.accesskey "w">
 <!ENTITY navbarCmd.label "Navigation Toolbar">
 <!ENTITY navbarCmd.accesskey "N">
 <!ENTITY personalbarCmd.label "Personal Toolbar">
 <!ENTITY personalbarCmd.accesskey "p">
 <!ENTITY tabbarCmd.label "Tab Bar">
 <!ENTITY tabbarCmd.accesskey "T">
--- a/suite/locales/en-US/chrome/common/utilityOverlay.dtd
+++ b/suite/locales/en-US/chrome/common/utilityOverlay.dtd
@@ -56,17 +56,17 @@
 <!ENTITY preferencesCmd.key					"E">  
 <!ENTITY preferencesCmd.accesskey			"e"> 
 <!ENTITY findTypeTextCmd.label "Find Text As You Type">
 <!ENTITY findTypeTextCmd.accesskey "x">
 <!ENTITY findTypeLinksCmd.label "Find Links As You Type">
 <!ENTITY findTypeLinksCmd.accesskey "k">
 
 <!ENTITY viewMenu.label					"View"> 
-<!ENTITY viewMenu.accesskey				"v"> 
+<!ENTITY viewMenu.accesskey               "V">
 <!ENTITY viewToolbarsMenu.label				"Show/Hide"> 
 <!ENTITY viewToolbarsMenu.accesskey			"w"> 
 <!ENTITY showTaskbarCmd.label					"Status Bar">  
 <!ENTITY showTaskbarCmd.accesskey				"S"> 
 
 <!ENTITY helpMenu.label					"Help"> 
 <!ENTITY helpMenu.accesskey				"h">