From a33043c1b5e9acd1ea168e7ad10f960d866dd7b7 Mon Sep 17 00:00:00 2001
From: "mconnor%myrealbox.com" <mconnor%myrealbox.com>
Date: Sat, 22 May 2004 20:59:00 +0000
Subject: [PATCH] bug 241079 - Fix DOMi bustage and remove unused/non-working
 menu items, patch by Steffen Wilberg (steffen.wilberg@web.de), r=mconnor

---
 .../inspector/content/inspector.xul           | 87 +++++++++++++++++++
 .../inspector/content/popupOverlay.xul        | 81 +++++++++++++++++
 .../inspector/content/toolboxOverlay.xul      | 59 +++++++++++++
 browser/extensions/inspector/jar.mn           |  3 +
 4 files changed, 230 insertions(+)
 create mode 100644 browser/extensions/inspector/content/inspector.xul
 create mode 100644 browser/extensions/inspector/content/popupOverlay.xul
 create mode 100644 browser/extensions/inspector/content/toolboxOverlay.xul

diff --git a/browser/extensions/inspector/content/inspector.xul b/browser/extensions/inspector/content/inspector.xul
new file mode 100644
index 000000000000..d8e823e7522a
--- /dev/null
+++ b/browser/extensions/inspector/content/inspector.xul
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is DOM Inspector.
+   -
+   - The Initial Developer of the Original Code is
+   - Netscape Communications Corporation.
+   - Portions created by the Initial Developer are Copyright (C) 2003
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<!DOCTYPE window [
+  <!ENTITY % dtd1 SYSTEM "chrome://inspector/locale/inspector.dtd"> %dtd1;
+  <!ENTITY % dtd2 SYSTEM "chrome://inspector/content/util.dtd"> %dtd2;
+  <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd"> %browserDTD;
+]>
+
+<?xul-overlay href="chrome://inspector/content/inspectorOverlay.xul"?>
+<?xul-overlay href="chrome://inspector/content/toolboxOverlay.xul"?>
+<?xul-overlay href="chrome://inspector/content/popupOverlay.xul"?>
+<?xul-overlay href="chrome://inspector/content/commandOverlay.xul"?>
+<?xul-overlay href="chrome://inspector/content/keysetOverlay.xul"?>
+<?xul-overlay href="chrome://inspector/content/statusbarOverlay.xul"?>
+
+<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
+
+<?xml-stylesheet href="chrome://inspector/skin/inspectorWindow.css"?>
+
+<window id="winInspectorMain" title="&Inspector.title;"
+        width="640" height="480"
+        persist="screenX screenY width height maximized"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <popupset id="aTooltipSet"/>
+
+  <popupset id="ppsGlobalPopupset"/>
+  <popupset id="ppsViewerPopupset"/>
+
+  <keyset id="ksGlobalKeyset"/>
+  <commandset id="cmdsGlobalCommands"/>
+
+  <commandset id="tasksCommands">
+    <command id="cmd_quit"/>
+  </commandset>
+
+  <keyset id="tasksKeys">
+    <key id="key_closeInspector" key="&closeCmd.key;" command="cmdClose"
+         modifiers="accel"/>
+  </keyset>
+
+  <toolbox id="tbxInsToolbox">
+    <menubar id="mbrInspectorMain"/>
+    <toolbar id="tbInspectorPrimary"/>
+  </toolbox>
+
+  <vbox id="bxInspectorMain" flex="1"/>
+
+  <!--
+  <statusbar id="status-bar"/>
+  -->
+</window>
diff --git a/browser/extensions/inspector/content/popupOverlay.xul b/browser/extensions/inspector/content/popupOverlay.xul
new file mode 100644
index 000000000000..68516dfcdda3
--- /dev/null
+++ b/browser/extensions/inspector/content/popupOverlay.xul
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE overlay [
+  <!ENTITY % dtd1 SYSTEM "chrome://inspector/locale/inspector.dtd"> %dtd1;
+  <!ENTITY % dtd2 SYSTEM "chrome://inspector/content/util.dtd"> %dtd2;
+]>
+
+<?xul-overlay href="chrome://inspector/content/editingOverlay.xul"?>
+
+<overlay id="ovPopupsMain"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <popupset id="ppsGlobalPopupset">
+    <popup id="ppSearchResults">
+      <!--
+        <menuitem id="ppSearchResults-view" label="&cmdViewSearchItem.label;" observes="cmdViewSearchItem"/>
+        <menuitem id="ppSearchResults-edit" label="&cmdEditSearchItem.label;" observes="cmdEditSearchItem"/>
+      -->
+      <menuseparator id="ppSearchResults-insertion"/>
+      <menuitem id="ppSearchResults-copyLine" label="&cmdCopySearchItemLine.label;" observes="cmdCopySearchItemLine"/>
+      <menuitem id="ppSearchResults-copyAll" label="&cmdCopySearchItemAll.label;" observes="cmdCopySearchItemAll"/>
+      <menuitem id="ppSearchResults-save" label="&cmdSaveSearchItemText.label;" observes="cmdSaveSearchItemText"/>
+      <menuseparator/>
+      <menuitem id="ppSearchResults-clear" label="&cmdClearSearch.label;" observes="cmdClearSearch"/>
+      <menuitem id="ppSearchResults-hide" label="&cmdHideSearchItems.label;" observes="cmdToggleSearch"/>
+    </popup>
+  </popupset>
+
+  <menupopup id="menu_FilePopup">
+    <menu oncommand="inspector.goToWindow(event.target);"
+      id="mnWindowsFile" label="&mnWindows.label;" accesskey="&mnWindows.accesskey;"
+      datasources="rdf:window-mediator" ref="NC:WindowMediatorRoot">
+      <template>
+        <rule>
+          <menupopup>
+            <menuitem uri="rdf:*" label="&NC-rdf;KeyIndex &NC-rdf;Name" accesskey="&NC-rdf;KeyIndex"/>
+          </menupopup>
+        </rule>
+      </template>
+    </menu>
+    <menuitem label="&cmdShowOpenURLDialog.label;" accesskey="&cmdShowOpenURLDialog.accesskey;"
+              observes="cmdShowOpenURLDialog"/>
+    <menuseparator/>
+    <menuitem label="&cmdClose.label;" accesskey="&cmdClose.accesskey;"
+              observes="cmdClose" key="key_closeInspector"/>
+  </menupopup>
+
+  <menupopup id="mppEdit">
+    <menuitem id="mnEditUndo"/>
+    <menuitem id="mnEditRedo"/>
+    <menuseparator/>
+    <menuitem id="mnEditCut"/>
+    <menuitem id="mnEditCopy"/>
+    <menuitem id="mnEditPaste"/>
+    <menuseparator/>
+    <menuitem id="mnEditInsert"/>
+    <menuitem id="mnEditDelete"/>
+  </menupopup>
+
+  <menupopup id="mppSearch">
+    <!--
+    <menuseparator/>
+    <menu label="&mnSearchPlugins.label;" accesskey="&mnSearchPlugins.accesskey;">
+      <menupopup id="mppSearchPlugins">
+        <menuitem label="&cmdRunSearch.label;" accesskey="&cmdRunSearch.accesskey;" observes="cmdRunSearch"/>
+      </menupopup>
+    </menu>
+    -->
+  </menupopup>
+
+  <menupopup id="mppView" >
+    <menuitem class="menuitem-iconic" type="checkbox" label="&cmdToggleBrowser.label;" observes="cmdToggleBrowser"/>
+    <!--
+    <menuitem class="menuitem-iconic" type="checkbox" label="&cmdToggleSearch.label;" observes="cmdToggleSearch"/>
+    -->
+    <menuseparator/>
+  </menupopup>
+
+  <popupset id="ppsViewerPopupset"/>
+
+</overlay>
diff --git a/browser/extensions/inspector/content/toolboxOverlay.xul b/browser/extensions/inspector/content/toolboxOverlay.xul
new file mode 100644
index 000000000000..fa55b6466f58
--- /dev/null
+++ b/browser/extensions/inspector/content/toolboxOverlay.xul
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE overlay [
+  <!ENTITY % dtd1 SYSTEM "chrome://inspector/locale/inspector.dtd"> %dtd1;
+  <!ENTITY % dtd2 SYSTEM "chrome://inspector/content/util.dtd"> %dtd2;
+]>
+
+<overlay id="ovToolbox"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <popupset id="ppsGlobalPopupset"/>
+
+  <menubar id="mbrInspectorMain">
+
+    <menu id="mnFile" label="&mnFile.label;" accesskey="&mnFile.accesskey;">
+      <menupopup id="menu_FilePopup"/>
+    </menu>
+
+    <menu id="mnEdit" label="&mnEdit.label;" accesskey="&mnEdit.accesskey;">
+      <menupopup id="mppEdit"/>
+    </menu>
+
+    <menu id="mnSearch" label="&mnSearch.label;" accesskey="&mnSearch.accesskey;">
+      <menupopup id="mppSearch"/>
+    </menu>
+
+    <menu id="mnView" label="&mnView.label;" accesskey="&mnView.accesskey;">
+      <menupopup id="mppView"/>
+    </menu>
+
+  </menubar>
+
+  <toolbar id="tbInspectorPrimary" class="chromeclass-toolbar">
+
+    <hbox id="bxURLBar" flex="1">
+      <toolbarbutton id="btnSelecting" type="checkbox" observes="cmd:selectByClick"
+              tooltiptext="&btnSelecting.tooltip;"/>
+
+      <toolbarbutton id="btnFind" observes="cmd:find"
+              tooltiptext="&btnFind.tooltip;"/>
+
+      <hbox id="bxURLBarContainer" flex="1">
+        <hbox align="center" flex="1">
+          <textbox id="tfURLBar" type="autocomplete" flex="1"
+            searchSessions="history" timeout="50" maxrows="6"
+            observes="cmdGotoURL">
+            <image id="imgURLBarIcon"/>
+
+          </textbox>
+        </hbox>
+
+      </hbox>
+
+      <toolbarbutton label="&btnInspect.label;" observes="cmdGotoURL"/>
+    </hbox>
+
+  </toolbar>
+
+</overlay>
diff --git a/browser/extensions/inspector/jar.mn b/browser/extensions/inspector/jar.mn
index ac5ba72014f3..0103c46dd8cc 100644
--- a/browser/extensions/inspector/jar.mn
+++ b/browser/extensions/inspector/jar.mn
@@ -1,6 +1,9 @@
 inspector.jar:
 *+ content/inspector/contents.rdf                                      (content/contents.rdf)
++  content/inspector/inspector.xul                                     (content/inspector.xul)
 +  content/inspector/tasksOverlay.xul                                  (content/tasksOverlay.xul)
++  content/inspector/toolboxOverlay.xul                                (content/toolboxOverlay.xul)
++  content/inspector/popupOverlay.xul                                  (content/popupOverlay.xul)
 *+ locale/en-US/inspector/contents.rdf                                 (locale/contents.rdf)
 +  locale/en-US/inspector/tasksOverlay.dtd                             (locale/tasksOverlay.dtd)
 +  icon.png                                                            (content/inspector.gif)
\ No newline at end of file