Bug 1441668 - Replace editMenuOverlay.xul in SeaMonkey with preprocessed includes. r=IanN
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Tue, 14 Apr 2020 19:59:04 +0200
changeset 38847 e0aed4844492f59d12953ede3baa57a126b0087b
parent 38846 af4dc99a4b6a50c57bf0bbfaa1f1af9c53e373ed
child 38848 dc4ab600181bbb9a679dfed7a399b80fa500eded
push id401
push userclokep@gmail.com
push dateMon, 01 Jun 2020 20:41:59 +0000
reviewersIanN
bugs1441668, 1439766
Bug 1441668 - Replace editMenuOverlay.xul in SeaMonkey with preprocessed includes. r=IanN Port Bug 1439766 "Remove editMenuOverlay.xul".
suite/components/console/content/console.xul
suite/components/downloads/content/downloadmanager.xul
suite/components/places/content/bookmarksPanel.xul
suite/components/places/content/history-panel.xul
suite/components/places/content/places.xul
--- a/suite/components/console/content/console.xul
+++ b/suite/components/console/content/console.xul
@@ -3,43 +3,39 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/console/console.css" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/content/console/console.css" type="text/css"?>
 
-<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
 
-<!DOCTYPE window [
-  <!ENTITY % console SYSTEM "chrome://communicator/locale/console/console.dtd"> %console;
-]>
+<!DOCTYPE window SYSTEM "chrome://communicator/locale/console/console.dtd" >
 
 <window id="JSConsoleWindow"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&errorConsole.title;"
         windowtype="suite:console"
         width="640"
         height="480"
         screenX="10"
         screenY="10"
         persist="screenX screenY width height sizemode"
         onclose="return closeWindow(false);">
 
   <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
   <script type="application/javascript" src="chrome://communicator/content/console/console.js"/>
   <script type="application/javascript" src="chrome://global/content/viewSourceUtils.js"/>
+  <script src="chrome://global/content/editMenuOverlay.js"/>
 
   <stringbundle id="ConsoleBundle" src="chrome://communicator/locale/console/console.properties"/>
 
-  <commandset id="editMenuCommands"/>
-
   <commandset id="consoleCommands">
     <commandset id="tasksCommands"/>
     <command id="cmd_close" oncommand="closeWindow(true);"/>
   </commandset>
 
   <keyset id="consoleKeys">
     <keyset id="tasksKeys"/>
     <key id="key_close"
--- a/suite/components/downloads/content/downloadmanager.xul
+++ b/suite/components/downloads/content/downloadmanager.xul
@@ -3,23 +3,20 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/downloads/downloadmanager.css" type="text/css"?>
 
 <?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
-<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 
 <!DOCTYPE window [
 <!ENTITY % downloadsDTD SYSTEM "chrome://communicator/locale/downloads/downloadmanager.dtd">
 %downloadsDTD;
-<!ENTITY % editMenuOverlayDTD SYSTEM "chrome://global/locale/editMenuOverlay.dtd">
-%editMenuOverlayDTD;
 <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
 %globalDTD;
 ]>
 
 <window id="downloadManager"
         title="&downloadManager.title;" statictitle="&downloadManager.title;"
         onload="dmStartup();" onunload="dmShutdown();"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -34,31 +31,31 @@
   <script type="application/javascript"
           src="chrome://communicator/content/downloads/downloadmanager.js"/>
   <script type="application/javascript"
           src="chrome://communicator/content/downloads/DownloadProgressListener.js"/>
   <script type="application/javascript"
           src="chrome://communicator/content/downloads/treeView.js"/>
   <script type="application/javascript"
           src="chrome://global/content/contentAreaUtils.js"/>
+  <script src="chrome://global/content/editMenuOverlay.js"/>
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="dmBundle"
                   src="chrome://communicator/locale/downloads/downloadmanager.properties"/>
   </stringbundleset>
 
   <commandset id="dlWinCommands">
     <commandset id="tasksCommands">
       <!-- File Menu -->
       <command id="cmd_close" oncommand="window.close()"/>
       <!-- Search Box -->
       <command id="cmd_search_focus"
                oncommand="gSearchBox.focus();"/>
     </commandset>
-    <commandset id="editMenuCommands"/>
     <commandset id="commandUpdate_Downloads"
                 commandupdater="true"
                 events="focus,tree-select"
                 oncommandupdate="dlTreeController.onCommandUpdate()"/>
 
     <commandset id="downloadCommands">
       <command id="cmd_play"
                oncommand="goDoCommand('cmd_play');"/>
@@ -153,17 +150,17 @@
                 label="&cmd.copyDownloadLink.label;"
                 accesskey="&cmd.copyDownloadLink.accesskey;"
                 command="cmd_copyLocation"/>
       <menuitem id="dlContext-properties"
                 label="&cmd.properties.label;"
                 accesskey="&cmd.properties.accesskey;"
                 command="cmd_properties"/>
       <menuseparator/>
-      <menuitem id="cMenu_selectAll"/>
+      <menuitem id="context-selectall"/>
     </menupopup>
   </popupset>
 
   <vbox id="titlebar"/>
 
   <toolbox id="download-toolbox">
     <menubar id="download-menubar"
              grippytooltiptext="&menuBar.tooltip;">
--- a/suite/components/places/content/bookmarksPanel.xul
+++ b/suite/components/places/content/bookmarksPanel.xul
@@ -3,35 +3,35 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/sidebar/sidebarListView.css" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/content/places/places.css"?>
 <?xml-stylesheet href="chrome://communicator/skin/places/bookmarks.css"?>
 
-<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/places/placesOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 
 <!DOCTYPE page SYSTEM "chrome://communicator/locale/places/places.dtd">
 
 <page id="bookmarksPanel"
       xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="init();"
       onunload="SidebarUtils.setMouseoverURL('');">
 
   <script type="application/javascript"
           src="chrome://communicator/content/bookmarks/sidebarUtils.js"/>
   <script type="application/javascript"
           src="chrome://communicator/content/bookmarks/bookmarksPanel.js"/>
+  <script src="chrome://global/content/editMenuOverlay.js"/>
+  
 
   <commandset id="placesCommands"/>
-  <commandset id="editMenuCommands"/>
   <menupopup id="placesContext"/>
 
   <!-- Bookmarks and history tooltip -->
   <tooltip id="bhTooltip"/>
 
   <hbox id="sidebar-search-container" align="center">
     <textbox id="search-box" flex="1" type="search"
              placeholder="&bookmarksSearch.placeholder;"
--- a/suite/components/places/content/history-panel.xul
+++ b/suite/components/places/content/history-panel.xul
@@ -3,46 +3,48 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/sidebar/sidebarListView.css" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/content/places/places.css"?>
 <?xml-stylesheet href="chrome://communicator/skin/places/bookmarks.css"?>
 
-<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/places/placesOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 
 <!DOCTYPE page [
 <!ENTITY % placesDTD SYSTEM "chrome://communicator/locale/places/places.dtd">
 %placesDTD;
+<!ENTITY % editMenuOverlayDTD SYSTEM "chrome://global/locale/editMenuOverlay.dtd">
+%editMenuOverlayDTD;
 ]>
 
 <!-- we need to keep id="history-panel" for upgrade and switching
      between versions of the browser -->
 
 <page id="history-panel" orient="vertical"
       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="HistorySidebarInit();"
       onunload="SidebarUtils.setMouseoverURL('');">
 
   <script type="application/javascript"
           src="chrome://communicator/content/bookmarks/sidebarUtils.js"/>
   <script type="application/javascript"
           src="chrome://communicator/content/places/history-panel.js"/>
+  <script src="chrome://global/content/editMenuOverlay.js"/>
 
-  <commandset id="editMenuCommands"/>
   <commandset id="placesCommands"/>
 
-  <keyset id="editMenuKeys">
+#include ../../../../../toolkit/content/editMenuKeys.inc.xul
 #ifdef XP_MACOSX
+  <keyset id="editMenuKeysExtra">
     <key id="key_delete2" keycode="VK_BACK" command="cmd_delete"/>
+  </keyset>
 #endif
-  </keyset>
 
   <!-- required to overlay the context menu -->
   <menupopup id="placesContext"/>
 
   <!-- Bookmarks and history tooltip -->
   <tooltip id="bhTooltip"/>
 
   <hbox id="sidebar-search-container">
--- a/suite/components/places/content/places.xul
+++ b/suite/components/places/content/places.xul
@@ -10,17 +10,16 @@
 <?xml-stylesheet href="chrome://communicator/skin/"?>
 <?xml-stylesheet href="chrome://communicator/skin/places/bookmarks.css"?>
 <?xml-stylesheet href="chrome://communicator/skin/places/organizer.css"?>
 
 <?xul-overlay href="chrome://communicator/content/places/editBookmarkOverlay.xul"?>
 
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
-<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/places/placesOverlay.xul"?>
 
 <!DOCTYPE window [
 <!ENTITY % placesDTD SYSTEM "chrome://communicator/locale/places/places.dtd">
 %placesDTD;
 <!ENTITY % editMenuOverlayDTD SYSTEM "chrome://global/locale/editMenuOverlay.dtd">
 %editMenuOverlayDTD;
 <!ENTITY % navDTD SYSTEM "chrome://navigator/locale/navigator.dtd">
@@ -38,22 +37,22 @@
         screenX="10" screenY="10"
         toggletoolbar="true"
         persist="width height screenX screenY sizemode">
 
   <script type="application/javascript"
           src="chrome://communicator/content/places/places.js"/>
   <script type="application/javascript"
           src="chrome://communicator/content/places/editBookmarkOverlay.js"/>
+  <script src="chrome://global/content/editMenuOverlay.js"/>
 
   <stringbundleset id="placesStringSet">
     <stringbundle id="brandStrings" src="chrome://branding/locale/brand.properties"/>
   </stringbundleset>
 
-  <commandset id="editMenuCommands"/>
   <commandset id="placesCommands"/>
   <commandset id="tasksCommands"/>
 
   <commandset id="organizerCommandSet">
     <command id="OrganizerCommand_find:all"
              oncommand="PlacesSearchBox.findAll();"/>
     <command id="OrganizerCommand_export"
              oncommand="PlacesOrganizer.exportBookmarks();"/>
@@ -90,21 +89,23 @@
          command="OrganizerCommand:Back"
          modifiers="accel"/>
     <key id="placesKey_goForwardKb"
          keycode="VK_RIGHT"
          command="OrganizerCommand:Forward"
          modifiers="accel"/>
   </keyset>
 
-  <keyset id="editMenuKeys">
+#include ../../../../../toolkit/content/editMenuKeys.inc.xul
 #ifdef XP_MACOSX
+  <keyset id="editMenuKeysExtra">
     <key id="key_delete2" keycode="VK_BACK" command="cmd_delete"/>
+  </keyset>
 #endif
-  </keyset>
+
   <keyset id="tasksKeys">
     <key id="key_close2" disabled="true"/>
   </keyset>
 
   <popupset id="placesPopupset">
     <menupopup id="placesContext"/>
     <menupopup id="placesColumnsContext"
                onpopupshowing="ViewMenu.fillWithColumns(event, null, null, 'checkbox', null);"