From 49f108d4c2d9be7f24a12d3d91016ec5762c3c53 Mon Sep 17 00:00:00 2001
From: "blakeross%telocity.com" <blakeross%telocity.com>
Date: Fri, 5 Apr 2002 02:45:55 +0000
Subject: [PATCH] getting rid of charsetOverlay.xul

---
 browser/base/resources/content/browser.xul    |   2 +-
 .../resources/content/navigatorOverlay.xul    | 100 +++++++++++++++++-
 browser/base/resources/locale/navigator.dtd   |  20 ++++
 3 files changed, 119 insertions(+), 3 deletions(-)

diff --git a/browser/base/resources/content/browser.xul b/browser/base/resources/content/browser.xul
index 6b819cef9dae..3cdcbb42bb5c 100644
--- a/browser/base/resources/content/browser.xul
+++ b/browser/base/resources/content/browser.xul
@@ -77,7 +77,7 @@ Contributor(s): ______________________________________. -->
   <script type="application/x-javascript" src="chrome://browser/content/browser-2.js"/>
   <script type="application/x-javascript" src="chrome://browser/content/navigatorDD.js"/>
   <script type="application/x-javascript" src="chrome://browser/content/sessionHistoryUI.js"/>
-
+  <script type="application/x-javascript" src="chrome://global/content/charsetOverlay.js"/>
   <script type="application/x-javascript" src="chrome://browser/content/policy/policy.js"/>
 
   <!-- hook for stringbundle overlays -->
diff --git a/browser/base/resources/content/navigatorOverlay.xul b/browser/base/resources/content/navigatorOverlay.xul
index e7a894dfc219..b2d4e9b6e005 100644
--- a/browser/base/resources/content/navigatorOverlay.xul
+++ b/browser/base/resources/content/navigatorOverlay.xul
@@ -26,7 +26,6 @@
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
-<?xul-overlay href="chrome://global/content/charsetOverlay.xul"?>
 <?xul-overlay href="chrome://browser/content/platformNavigationBindings.xul"?>
 
 <!DOCTYPE window [
@@ -225,7 +224,104 @@
             <menuitem id="menu_textZoomOther" type="radio" name="textZoom" accesskey="&textZoomOtherCmd.accesskey;" oncommand="setTextZoomOther();"/>
           </menupopup>
         </menu>
-        <menu id="charsetMenu" observes="isImage"/>
+        <menu id="charsetMenu" label="&charsetMenu.label;" accesskey="&charsetMenu.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserCharsetMenuRoot" oncommand="MultiplexHandler(event)"
+              onpopupshowing="CreateMenu('browser');UpdateMenus(event)" onpopupshown="CreateMenu('more-menu');"
+              observes="isImage">
+            <template>
+                <rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
+                    <menupopup>
+                    <menuseparator uri="..." />
+                    </menupopup>
+                </rule>
+                <rule>
+                    <menupopup>
+                    <menuitem type="radio" name="charsetGroup" checked="rdf:http://home.netscape.com/NC-rdf#Checked" uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                    </menupopup>
+                </rule>
+            </template>
+    
+            <menupopup>
+            <menu label="&charsetMenuAutodet.label;" accesskey="&charsetMenuAutodet.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserAutodetMenuRoot">
+                <template>
+                    <rule rdf:type="http://home.netscape.com/NC-rdf#CharsetDetector">
+                        <menupopup>
+                        <menuitem type="radio" name="detectorGroup" checked="rdf:http://home.netscape.com/NC-rdf#Checked" uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                        </menupopup>
+                    </rule>
+                </template>
+                <menupopup>
+                </menupopup>
+            </menu>
+            <menu label="&charsetMenuMore.label;" accesskey="&charsetMenuMore.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserMoreCharsetMenuRoot">
+                <template>
+                    <rule>
+                        <menupopup>
+                        <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                        </menupopup>
+                    </rule>
+                </template>
+                <menupopup>
+                    <menu label="&charsetMenuMore1.label;" accesskey="&charsetMenuMore1.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserMore1CharsetMenuRoot">
+                        <template>
+                            <rule>
+                                <menupopup>
+                                <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                                </menupopup>
+                            </rule>
+                        </template>
+                        <menupopup>
+                        </menupopup>
+                    </menu>
+                    <menu label="&charsetMenuMore2.label;" accesskey="&charsetMenuMore2.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserMore2CharsetMenuRoot">
+                        <template>
+                            <rule>
+                                <menupopup>
+                                <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                                </menupopup>
+                            </rule>
+                        </template>
+                        <menupopup>
+                        </menupopup>
+                    </menu>
+                    <menu label="&charsetMenuMore3.label;" accesskey="&charsetMenuMore3.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserMore3CharsetMenuRoot">
+                        <template>
+                            <rule>
+                                <menupopup>
+                                <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                                </menupopup>
+                            </rule>
+                        </template>
+                        <menupopup>
+                        </menupopup>
+                    </menu>
+                    <menu label="&charsetMenuMore4.label;" accesskey="&charsetMenuMore4.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserMore4CharsetMenuRoot">
+                        <template>
+                            <rule>
+                                <menupopup>
+                                <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                                </menupopup>
+                            </rule>
+                        </template>
+                        <menupopup>
+                        </menupopup>
+                    </menu>
+                    <menu label="&charsetMenuMore5.label;" accesskey="&charsetMenuMore5.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserMore5CharsetMenuRoot">
+                        <template>
+                            <rule>
+                                <menupopup>
+                                <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                                </menupopup>
+                            </rule>
+                        </template>
+                        <menupopup>
+                        </menupopup>
+                    </menu>
+                    <menuseparator />
+                </menupopup>
+            </menu>
+            <menuitem name="charsetCustomize" accesskey="&charsetCustomize.accesskey;" label="&charsetCustomize.label;" oncommand="window.openDialog('chrome://communicator/content/pref/pref-charset.xul','PrefWindow', 'chrome,modal=yes,resizable=yes', 'browser')"/>
+            </menupopup>
+        </menu>
         <menuseparator/>
         <menu label="&applyTheme.label;" accesskey="&applyTheme.accesskey;">
           <menupopup datasources="rdf:chrome" ref="urn:mozilla:skin:root" oncommand="applyTheme(event.target)">
diff --git a/browser/base/resources/locale/navigator.dtd b/browser/base/resources/locale/navigator.dtd
index 0b56739519ab..850be777b87c 100644
--- a/browser/base/resources/locale/navigator.dtd
+++ b/browser/base/resources/locale/navigator.dtd
@@ -173,3 +173,23 @@
 <!ENTITY textZoomMenu.accesskey         "z">
 <!ENTITY textZoomOtherCmd.accesskey     "o">
 
+<!-- extracted from charsetOverlay.xul -->
+<!ENTITY charsetMenu.label        "Character Coding">
+<!ENTITY charsetMenu.accesskey        "C">
+<!ENTITY charsetMenuAutodet.label     "Auto-Detect">
+<!ENTITY charsetMenuAutodet.accesskey     "a">
+<!ENTITY charsetMenuMore.label        "More">
+<!ENTITY charsetMenuMore.accesskey        "m">
+<!ENTITY charsetMenuMore1.label       "West European">
+<!ENTITY charsetMenuMore1.accesskey       "w">
+<!ENTITY charsetMenuMore2.label       "East European">
+<!ENTITY charsetMenuMore2.accesskey       "E">
+<!ENTITY charsetMenuMore3.label       "East Asian">
+<!ENTITY charsetMenuMore3.accesskey       "A">
+<!ENTITY charsetMenuMore4.label       "SE &amp; SW Asian">
+<!ENTITY charsetMenuMore4.accesskey       "S">
+<!ENTITY charsetMenuMore5.label       "Middle Eastern">
+<!ENTITY charsetMenuMore5.accesskey       "m">
+<!ENTITY charsetCustomize.label       "Customize...">
+<!ENTITY charsetCustomize.accesskey       "c">
+