Bug 1289794 - Integrate consoleoverlay files. r=IanN a=IanN

2016-09-03 11:58:21 +02:00 · 2016-09-03 11:58:21 +02:00 · 56ee06ae3b
--- a/suite/common/console/console.xul
+++ b/suite/common/console/console.xul
@ -9,6 +9,9 @@
 <?xml-stylesheet href="chrome://communicator/content/console/console.css" type="text/css"?>

 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
+<?xul-overlay href="chrome://global/content/globalOverlay.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;
@ -18,8 +21,10 @@
        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"
+        width="640"
+        height="480"
+        screenX="10"
+        screenY="10"
        persist="screenX screenY width height sizemode"
        onclose="return closeWindow(false);">

@ -32,71 +37,177 @@
  <commandset id="editMenuCommands"/>

  <commandset id="consoleCommands">
-    <command id="cmd_close" oncommand="closeWindow(true)"/>
+    <commandset id="tasksCommands"/>
+    <command id="cmd_close" oncommand="closeWindow(true);"/>
  </commandset>

  <keyset id="consoleKeys">
-    <key id="key_close" key="&closeCmd.commandkey;" modifiers="accel"
+    <keyset id="tasksKeys"/>
+    <key id="key_close"
+         key="&closeCmd.commandkey;"
+         modifiers="accel"
         command="cmd_close"/>
-    <key id="key_close2" keycode="VK_ESCAPE" command="cmd_close"/>
-    <key id="key_focus1" key="&focus1.commandkey;" modifiers="accel"
-         oncommand="gTextBoxEval.focus()"/>
-    <key id="key_focus2" key="&focus2.commandkey;" modifiers="alt"
-         oncommand="gTextBoxEval.focus()"/>
+    <key id="key_close2"
+         disabled="true"
+         keycode="VK_ESCAPE"
+         command="cmd_close"/>
+    <key id="key_focus1"
+         key="&focus1.commandkey;"
+         modifiers="accel"
+         oncommand="gTextBoxEval.focus();"/>
+    <key id="key_focus2"
+         key="&focus2.commandkey;"
+         modifiers="alt"
+         oncommand="gTextBoxEval.focus();"/>
+    <key id="key_copy"/>
  </keyset>

  <popupset id="ContextMenus">
    <menupopup id="ConsoleContext">
-      <menuitem type="radio" id="Console:sortAscend"
-                label="&sortFirst.label;" accesskey="&sortFirst.accesskey;"
+      <menuitem type="radio"
+                id="Console:sortAscend"
+                label="&sortFirst.label;"
+                accesskey="&sortFirst.accesskey;"
                oncommand="changeSortOrder('forward');"/>
-      <menuitem type="radio" id="Console:sortDescend"
-                label="&sortLast.label;" accesskey="&sortLast.accesskey;"
+      <menuitem type="radio"
+                id="Console:sortDescend"
+                label="&sortLast.label;"
+                accesskey="&sortLast.accesskey;"
                oncommand="changeSortOrder('reverse');"/>
      <menuseparator/>
-      <menuitem id="menu_copy_cm" command="cmd_copy"
-                label="&copyCmd.label;" accesskey="&copyCmd.accesskey;"/>
+      <menuitem id="menu_copy_cm"
+                label="&copyCmd.label;"
+                accesskey="&copyCmd.accesskey;"
+                command="cmd_copy"/>
    </menupopup>
  </popupset>

  <toolbox id="console-toolbox">
-    <toolbar class="chromeclass-toolbar" id="ToolbarMode">
+    <menubar id="main-menubar"
+             class="chromeclass-menubar"
+             grippytooltiptext="&menuBar.tooltip;">
+      <menu id="menu_File">
+        <menupopup id="menu_FilePopup">
+          <menuitem id="menu_close"/>
+        </menupopup>
+      </menu>
+
+      <menu id="menu_Edit">
+        <menupopup>
+          <menuitem id="menu_copy"/>
+        </menupopup>
+      </menu>
+
+      <menu id="menu_View">
+        <menupopup>
+          <menu label="&toolbarsCmd.label;"
+                accesskey="&toolbarsCmd.accesskey;">
+            <menupopup>
+              <menuitem id="toggleToolbarMode"
+                        type="checkbox"
+                        checked="true"
+                        label="&toolbarMode.label;"
+                        accesskey="&toolbarMode.accesskey;"
+                        oncommand="goToggleToolbar('ToolbarMode','toggleToolbarMode');"/>
+              <menuitem id="toggleToolbarEval"
+                        type="checkbox"
+                        checked="true"
+                        label="&toolbarEval.label;"
+                        accesskey="&toolbarEval.accesskey;"
+                        oncommand="goToggleToolbar('ToolbarEval','toggleToolbarEval');"/>
+            </menupopup>
+          </menu>
+          <menuseparator/>
+          <menuitem type="radio" observes="Console:sortAscend"/>
+          <menuitem type="radio" observes="Console:sortDescend"/>
+        </menupopup>
+      </menu>
+
+      <!-- tasks menu filled from tasksOverlay -->
+      <menu id="tasksMenu"/>
+
+      <!-- window menu filled from tasksOverlay -->
+      <menu id="windowMenu"/>
+
+      <!-- help menu filled from globalOverlay -->
+      <menu id="menu_Help"/>
+    </menubar>
+
+    <toolbar class="chromeclass-toolbar"
+             id="ToolbarMode"
+             grippytooltiptext="&modeToolbar.tooltip;">
      <hbox id="viewGroup">
-        <toolbarbutton type="radio" group="mode" id="Console:modeAll"
-                       label="&all.label;" accesskey="&all.accesskey;"
+        <toolbarbutton type="radio"
+                       group="mode"
+                       id="Console:modeAll"
+                       label="&all.label;"
+                       accesskey="&all.accesskey;"
                       oncommand="changeMode('All');"/>
-        <toolbarbutton type="radio" group="mode" id="Console:modeErrors"
-                       label="&errors.label;" accesskey="&errors.accesskey;"
+        <toolbarbutton type="radio"
+                       group="mode"
+                       id="Console:modeErrors"
+                       label="&errors.label;"
+                       accesskey="&errors.accesskey;"
                       oncommand="changeMode('Errors');"/>
-        <toolbarbutton type="radio" group="mode" id="Console:modeWarnings"
-                       label="&warnings.label;" accesskey="&warnings.accesskey;"
+        <toolbarbutton type="radio"
+                       group="mode"
+                       id="Console:modeWarnings"
+                       label="&warnings.label;"
+                       accesskey="&warnings.accesskey;"
                       oncommand="changeMode('Warnings');"/>
-        <toolbarbutton type="radio" group="mode" id="Console:modeMessages"
-                     label="&messages.label;" accesskey="&messages.accesskey;"
-                     oncommand="changeMode('Messages');"/>
+        <toolbarbutton type="radio"
+                       group="mode"
+                       id="Console:modeMessages"
+                       label="&messages.label;"
+                       accesskey="&messages.accesskey;"
+                       oncommand="changeMode('Messages');"/>
      </hbox>
      <toolbarseparator/>
-      <toolbarbutton id="Console:clear" oncommand="clearConsole();"
-                     label="&clear.label;" accesskey="&clear.accesskey;"/>
+      <toolbarbutton id="Console:clear"
+                     label="&clear.label;"
+                     accesskey="&clear.accesskey;"
+                     oncommand="clearConsole();"/>
    </toolbar>

-    <toolbar class="chromeclass-toolbar" id="ToolbarEval" align="center" nowindowdrag="true">
-      <label value="&codeEval.label;" accesskey="&codeEval.accesskey;" control="TextboxEval"/>
-      <textbox id="TextboxEval" class="toolbar" value="" onkeypress="onEvalKeyPress(event)" flex="1"/>
-      <toolbarbutton id="ButtonEval" label="&evaluate.label;"
-                     accesskey="&evaluate.accesskey;" oncommand="evaluateTypein()"/>
+    <toolbar class="chromeclass-toolbar"
+             id="ToolbarEval"
+             align="center"
+             nowindowdrag="true"
+             grippytooltiptext="&entryToolbar.tooltip;">
+      <label value="&codeEval.label;"
+             accesskey="&codeEval.accesskey;"
+             control="TextboxEval"/>
+      <textbox id="TextboxEval"
+               class="toolbar"
+               flex="1"
+               value=""
+               onkeypress="onEvalKeyPress(event);"/>
+      <toolbarbutton id="ButtonEval"
+                     label="&evaluate.label;"
+                     accesskey="&evaluate.accesskey;"
+                     oncommand="evaluateTypein();"/>
    </toolbar>
+
  </toolbox>

-  <vbox id="ConsoleBox" class="console-box" flex="1" context="ConsoleContext" persist="sortOrder"/>
+  <vbox id="ConsoleBox"
+        class="console-box"
+        flex="1"
+        context="ConsoleContext"
+        persist="sortOrder"/>

-  <iframe name="Evaluator" id="Evaluator" collapsed="true"/>
+  <iframe name="Evaluator"
+          id="Evaluator"
+          collapsed="true"/>

  <statusbar>
    <statusbarpanel flex="1" pack="start">
      <label value="&filter2.label;" control="Filter"/>
-      <textbox accesskey="&filter2.accesskey;" type="search"
-               id="Filter" oncommand="changeFilter();"/>
+      <textbox type="search"
+               id="Filter"
+               accesskey="&filter2.accesskey;"
+               oncommand="changeFilter();"/>
    </statusbarpanel>
  </statusbar>
+
 </window>
--- a/suite/common/consoleOverlay.xul
+++ b/suite/common/consoleOverlay.xul
@ -1,95 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- 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"?>
-
-<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
-<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
-<?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
-
-<!DOCTYPE overlay [
-
-<!ENTITY % consoleOverlayDTD SYSTEM "chrome://communicator/locale/consoleOverlay.dtd">
-%consoleOverlayDTD;
-
-]>
-
-<overlay id="consoleOverlay"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <commandset id="consoleCommands">
-    <commandset id="tasksCommands"/>
-  </commandset>
-
-  <keyset id="consoleKeys">
-    <keyset id="tasksKeys"/>
-    <key id="key_copy"/>
-    <key id="key_close2" disabled="true"/>
-  </keyset>
-
-  <toolbox id="console-toolbox">
-    <menubar id="main-menubar" class="chromeclass-menubar"
-             grippytooltiptext="&menuBar.tooltip;" position="1">
-      <menu id="menu_File">
-        <menupopup id="menu_FilePopup">
-          <menuitem id="menu_close"/>
-        </menupopup>
-      </menu>
-
-      <menu id="menu_Edit">
-        <menupopup>
-          <menuitem id="menu_copy"/>
-        </menupopup>
-      </menu>
-
-      <menu id="menu_View">
-        <menupopup>
-          <menu label="&toolbarsCmd.label;" accesskey="&toolbarsCmd.accesskey;">
-            <menupopup>
-              <menuitem id="toggleToolbarMode" type="checkbox" checked="true"
-                        oncommand="goToggleToolbar('ToolbarMode','toggleToolbarMode');"
-                        label="&toolbarMode.label;"
-                        accesskey="&toolbarMode.accesskey;"/>
-              <menuitem id="toggleToolbarEval" type="checkbox" checked="true"
-                        oncommand="goToggleToolbar('ToolbarEval','toggleToolbarEval');"
-                        label="&toolbarEval.label;"
-                        accesskey="&toolbarEval.accesskey;"/>
-            </menupopup>
-          </menu>
-          <menuseparator/>
-          <menuitem type="radio" observes="Console:sortAscend"/>
-          <menuitem type="radio" observes="Console:sortDescend"/>
-        </menupopup>
-      </menu>
-
-      <!-- tasks menu filled from tasksOverlay -->
-      <menu id="tasksMenu"/>
-
-      <!-- window menu filled from tasksOverlay -->
-      <menu id="windowMenu"/>
-
-      <!-- help menu filled from globalOverlay -->
-      <menu id="menu_Help"/>
-    </menubar>
-
-    <toolbar id="ToolbarMode" grippytooltiptext="&modeToolbar.tooltip;">
-      <hbox id="viewGroup">
-        <toolbarbutton id="Console:modeAll" accesskey="&all.accesskey;"/>
-        <toolbarbutton id="Console:modeErrors" accesskey="&errors.accesskey;"/>
-        <toolbarbutton id="Console:modeWarnings" accesskey="&warnings.accesskey;"/>
-        <toolbarbutton id="Console:modeMessages" accesskey="&messages.accesskey;"/>
-      </hbox>
-      <toolbarbutton id="Console:clear" accesskey="&clear.accesskey;"/>
-    </toolbar>
-
-    <toolbar id="ToolbarEval" grippytooltiptext="&entryToolbar.tooltip;">
-      <toolbarbutton id="ButtonEval" accesskey="&evaluate.accesskey;"/>
-    </toolbar>
-  </toolbox>
-
-  <textbox id="Filter" accesskey="&filter2.accesskey;"/>
-
-</overlay>
--- a/suite/common/jar.mn
+++ b/suite/common/jar.mn
@ -3,7 +3,6 @@ comm.jar:
 % content help %content/communicator/helpviewer/
 % override chrome://global/content/license.html chrome://communicator/content/license.html
 % override chrome://mozapps/content/profile/profileSelection.xul chrome://communicator/content/profile/profileSelection.xul
-% overlay chrome://communicator/content/console/console.xul chrome://communicator/content/consoleOverlay.xul
 % overlay chrome://global/content/viewSource.xul chrome://communicator/content/viewSourceOverlay.xul
 % overlay chrome://global/content/viewPartialSource.xul chrome://communicator/content/viewSourceOverlay.xul
 % overlay chrome://help/content/help.xul chrome://communicator/content/helpOverlay.xul
@ -64,7 +63,6 @@ comm.jar:
   content/communicator/certError.xml
   content/communicator/charsetOverlay.xul
   content/communicator/communicator.css
-   content/communicator/consoleOverlay.xul
   content/communicator/contentAreaClick.js
   content/communicator/contentAreaContextOverlay.xul
   content/communicator/defaultClientDialog.js
--- a/suite/locales/en-US/chrome/common/console/console.dtd
+++ b/suite/locales/en-US/chrome/common/console/console.dtd
@ -2,36 +2,46 @@
   - 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/. -->

-<!ENTITY errorConsole.title "Error Console">
+<!ENTITY errorConsole.title   "Error Console">

-<!ENTITY errFile.label   "Source File:">
-<!ENTITY errLine.label   "Line:">
-<!ENTITY errColumn.label "Column:">
+<!ENTITY errFile.label        "Source File:">
+<!ENTITY errLine.label        "Line:">
+<!ENTITY errColumn.label      "Column:">

-<!ENTITY all.label          "All">
-<!ENTITY all.accesskey      "A">
-<!ENTITY errors.label       "Errors">
-<!ENTITY errors.accesskey   "E">
-<!ENTITY warnings.label     "Warnings">
-<!ENTITY warnings.accesskey "W">
-<!ENTITY messages.label     "Messages">
-<!ENTITY messages.accesskey "M">
-<!ENTITY clear.label        "Clear">
-<!ENTITY clear.accesskey    "C">
-<!ENTITY codeEval.label     "Code:">
-<!ENTITY codeEval.accesskey "o">
-<!ENTITY evaluate.label     "Evaluate">
-<!ENTITY evaluate.accesskey "v">
-<!ENTITY filter2.label      "Filter:">
-<!ENTITY filter2.accesskey  "F">
+<!ENTITY all.label            "All">
+<!ENTITY all.accesskey        "A">
+<!ENTITY errors.label         "Errors">
+<!ENTITY errors.accesskey     "r">
+<!ENTITY warnings.label       "Warnings">
+<!ENTITY warnings.accesskey   "n">
+<!ENTITY messages.label       "Messages">
+<!ENTITY messages.accesskey   "M">
+<!ENTITY clear.label          "Clear">
+<!ENTITY clear.accesskey      "l">
+<!ENTITY codeEval.label       "Code:">
+<!ENTITY codeEval.accesskey   "o">
+<!ENTITY evaluate.label       "Evaluate">
+<!ENTITY evaluate.accesskey   "u">
+<!ENTITY filter2.label        "Filter:">
+<!ENTITY filter2.accesskey    "i">

-<!ENTITY copyCmd.label       "Copy">
-<!ENTITY copyCmd.accesskey   "C">
-<!ENTITY copyCmd.commandkey  "C">
-<!ENTITY sortFirst.label     "First > Last Sort Order">
-<!ENTITY sortFirst.accesskey "f">
-<!ENTITY sortLast.label      "Last > First Sort Order">
-<!ENTITY sortLast.accesskey  "l">
-<!ENTITY closeCmd.commandkey "w">
-<!ENTITY focus1.commandkey   "l">
-<!ENTITY focus2.commandkey   "d">
+<!ENTITY copyCmd.label         "Copy">
+<!ENTITY copyCmd.accesskey     "C">
+<!ENTITY copyCmd.commandkey    "C">
+<!ENTITY sortFirst.label       "First > Last Sort Order">
+<!ENTITY sortFirst.accesskey   "f">
+<!ENTITY sortLast.label        "Last > First Sort Order">
+<!ENTITY sortLast.accesskey    "l">
+<!ENTITY closeCmd.commandkey   "w">
+<!ENTITY focus1.commandkey     "l">
+<!ENTITY focus2.commandkey     "d">
+
+<!ENTITY menuBar.tooltip       "Menu Bar">
+<!ENTITY modeToolbar.tooltip   "Mode Toolbar">
+<!ENTITY entryToolbar.tooltip  "Javascript Entry Toolbar">
+<!ENTITY toolbarsCmd.label     "Show/Hide">
+<!ENTITY toolbarsCmd.accesskey "w">
+<!ENTITY toolbarMode.label     "Mode">
+<!ENTITY toolbarMode.accesskey "M">
+<!ENTITY toolbarEval.label     "JavaScript Entry">
+<!ENTITY toolbarEval.accesskey "J">
--- a/suite/locales/en-US/chrome/common/consoleOverlay.dtd
+++ b/suite/locales/en-US/chrome/common/consoleOverlay.dtd
@ -1,21 +0,0 @@
-<!-- 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/. -->
-
-<!ENTITY menuBar.tooltip       "Menu Bar">
-<!ENTITY modeToolbar.tooltip   "Mode Toolbar">
-<!ENTITY entryToolbar.tooltip  "Javascript Entry Toolbar">
-<!ENTITY toolbarsCmd.label     "Show/Hide">
-<!ENTITY toolbarsCmd.accesskey "w">
-<!ENTITY toolbarMode.label     "Mode">
-<!ENTITY toolbarMode.accesskey "M">
-<!ENTITY toolbarEval.label     "JavaScript Entry">
-<!ENTITY toolbarEval.accesskey "J">
-
-<!ENTITY all.accesskey         "A">
-<!ENTITY errors.accesskey      "r">
-<!ENTITY warnings.accesskey    "n">
-<!ENTITY messages.accesskey    "M">
-<!ENTITY clear.accesskey       "l">
-<!ENTITY evaluate.accesskey    "u">
-<!ENTITY filter2.accesskey     "i">
--- a/suite/locales/jar.mn
+++ b/suite/locales/jar.mn
@ -26,7 +26,6 @@
  locale/@AB_CD@/branding/aboutRights.properties                            (%chrome/branding/aboutRights.properties)
  locale/@AB_CD@/communicator/askViewZoom.dtd                               (%chrome/common/askViewZoom.dtd)
  locale/@AB_CD@/communicator/certError.dtd                                 (%chrome/common/certError.dtd)
-  locale/@AB_CD@/communicator/consoleOverlay.dtd                            (%chrome/common/consoleOverlay.dtd)
  locale/@AB_CD@/communicator/contentAreaCommands.dtd                       (%chrome/common/contentAreaCommands.dtd)
  locale/@AB_CD@/communicator/contentAreaCommands.properties                (%chrome/common/contentAreaCommands.properties)
  locale/@AB_CD@/communicator/defaultClientDialog.dtd                       (%chrome/common/defaultClientDialog.dtd)