Bug 221597,221599: remove toolkit and browser dependencies to chrome://communicator/content/pref/pref-charset.xul by copying it to the toolkit and renaming it as customizeCharset.xul.

2003-10-26 04:03:29 +00:00 · 2003-10-26 04:03:29 +00:00 · 27226ee2a0
--- a/browser/base/content/browser-doctype.inc
+++ b/browser/base/content/browser-doctype.inc
@ -5,7 +5,7 @@
 %browserDTD;
 <!ENTITY % globalRegionDTD SYSTEM "chrome://global-region/locale/region.dtd">
 %globalRegionDTD;
-<!ENTITY % charsetDTD SYSTEM "chrome://global/locale/charset.dtd" >
+<!ENTITY % charsetDTD SYSTEM "chrome://global/locale/charsetOverlay.dtd" >
 %charsetDTD;
 ]>

--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@ -198,7 +198,7 @@
                            <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')"/>
+                    <menuitem name="charsetCustomize" accesskey="&charsetCustomize.accesskey;" label="&charsetCustomize.label;" oncommand="window.openDialog('chrome://global/content/customizeCharset.xul','PrefWindow', 'chrome,modal=yes,resizable=yes', 'browser')"/>
                    </menupopup>
                </menu>
                <menuseparator/>
--- a/browser/components/prefwindow/content/pref-charset.xul
+++ b/browser/components/prefwindow/content/pref-charset.xul
@ -1,80 +0,0 @@
-<?xml version="1.0"?> <!-- -*- Mode: SGML; indent-tabs-mode: nil; -*- -->
-
-# The contents of this file are subject to the Netscape Public License
-# Version 1.1 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-# 
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-# 
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1999 Netscape Communications Corporation.  All Rights
-# Reserved.
-
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> 
-<?xml-stylesheet href="chrome://communicator/skin/sidebar/customize.css" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-charset.dtd" >
-
-<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="&charset.customize.title.label;"
-        onload="Init();"
-        ondialogaccept="return Save();"
-        persist="width height"
-        headertitle="&charset.customize.left.header;"
-        width="500" height="394">
-
-  <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-charset.js"/>
-  <script type="application/x-javascript">
-  <![CDATA[
-    var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
-    observerService.notifyObservers(null, "charsetmenu-selected", "other");
-  ]]>
-  </script>
-  
-  <!-- The two-pane -->
-  <hbox flex="1">
-    <vbox flex="1">
-      <label value="&charset.customize.additional.label;"/>
-      <!-- Available Charsets Tree -->
-      <listbox id="available_charsets" flex="1" seltype="multiple"
-            onselect="SelectAvailableCharset();" 
-            ondblclick="AddAvailableCharset();"/>
-      
-      <separator class="thin"/>
-      
-      <hbox align="center">
-        <button id="add_button" oncommand="AddAvailableCharset();"
-                label="&charset.customize.add.label;" disabled="true"/>
-      </hbox>
-    </vbox>
-    
-    <separator orient="vertical"/>
-    
-    <vbox flex="1">
-      <label value="&charset.customize.current.label;"/>
-      <listbox id="active_charsets" flex="1" seltype="multiple"
-            onselect="SelectActiveCharset();"
-            ondblclick="RemoveActiveCharset();"/>
-      
-      <separator class="thin"/>
-      <hbox align="center">
-        <button id="remove_button" oncommand="RemoveActiveCharset();"
-                disabled="true"
-                label="&charset.customize.remove.label;"/>
-      </hbox>
-    </vbox> 
-    <vbox>
-      <spacer flex="1"/>
-      <button id="up_button" class="up small" disabled="true"
-              oncommand="MoveUp();"/>
-      <button id="down_button" class="down small" disabled="true"
-              oncommand="MoveDown();"/>
-      <spacer flex="1"/>
-    </vbox>
-  </hbox>
-</dialog>
--- a/browser/components/prefwindow/locale/pref-charset.dtd
+++ b/browser/components/prefwindow/locale/pref-charset.dtd
@ -1,39 +0,0 @@
-#  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 Mozilla Communicator.
-#  
-#  The Initial Developer of the Original Code is Netscape
-#  Communications Corp. Portions created by Netscape Communications
-#  Corp. are Copyright (C) 1999 Netscape Communications Corp. All
-#  Rights Reserved.
-#  
-#  Contributor(s): Stephen Lamm <slamm@netscape.com>
-
-<!-- extracted from ./pref-charset.xul -->
-
-<!-- LOCALIZATION NOTE  Charset Coding Preferences Dialog: Do NOT localize the term "Character Coding"  -->
-<!ENTITY charset.customize.title.label			    "Customize Character Coding">
-<!ENTITY charset.customize.left.header			    "Character Coding">
-<!ENTITY charset.customize.right.header			    "Select Supported Charsets">
-<!ENTITY charset.customize.current.label        "Active Character Codings:">
-<!ENTITY charset.customize.reorder.label        "Reorder">
-<!ENTITY charset.customize.remove.label         "Remove">
-<!ENTITY charset.customize.additional.label     "Available Character Codings:">
-<!ENTITY charset.customize.add.label            "Add">
-<!ENTITY charset.customize.cancel.label		      "Cancel">
-<!ENTITY charset.customize.save.label           "Save">
-<!ENTITY charset.customize.save.popup           "Please restart the browser for changes to take effect...">
-<!ENTITY charset.customize.moveUp.label         "Up">
-<!ENTITY charset.customize.moveUp.accesskey     "u">
-<!ENTITY charset.customize.moveDown.label       "Down">
-<!ENTITY charset.customize.moveDown.accesskey   "d">
-
-
--- a/toolkit/content/charsetOverlay.xul
+++ b/toolkit/content/charsetOverlay.xul
@ -1,6 +1,6 @@
 <?xml version="1.0"?> 

-<!DOCTYPE  window SYSTEM "chrome://global/locale/charset.dtd">
+<!DOCTYPE  window SYSTEM "chrome://global/locale/charsetOverlay.dtd">

 <overlay id="charsetOverlay"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@ -102,7 +102,7 @@
                <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')"/>
+        <menuitem name="charsetCustomize" accesskey="&charsetCustomize.accesskey;" label="&charsetCustomize.label;" oncommand="window.openDialog('chrome://global/content/customizeCharset.xul','PrefWindow', 'chrome,modal=yes,resizable=yes', 'browser')"/>
        </menupopup>
    </menu>

@ -200,7 +200,7 @@
                <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')"/>
+        <menuitem name="charsetCustomize" accesskey="&charsetCustomize.accesskey;" label="&charsetCustomize.label;" oncommand="window.openDialog('chrome://global/content/customizeCharset.xul','PrefWindow', 'chrome,modal=yes,resizable=yes', 'browser')"/>
        </menupopup>
    </menu>

@ -215,7 +215,7 @@
        </template>

        <menupopup>
-        <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', 'mailedit')"/>
+        <menuitem name="charsetCustomize" accesskey="&charsetCustomize.accesskey;" label="&charsetCustomize.label;" oncommand="window.openDialog('chrome://global/content/customizeCharset.xul','PrefWindow', 'chrome,modal=yes,resizable=yes', 'mailedit')"/>
        <menuseparator />
        </menupopup>
    </menu>
@ -314,7 +314,7 @@
                <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')"/>
+        <menuitem name="charsetCustomize" accesskey="&charsetCustomize.accesskey;" label="&charsetCustomize.label;" oncommand="window.openDialog('chrome://global/content/customizeCharset.xul','PrefWindow', 'chrome,modal=yes,resizable=yes', 'browser')"/>
        </menupopup>
    </menu>

--- a/browser/components/prefwindow/content/pref-charset.js
+++ b/browser/components/prefwindow/content/pref-charset.js
--- a/toolkit/content/customizeCharset.xul
+++ b/toolkit/content/customizeCharset.xul
@ -0,0 +1,103 @@
+# -*- Mode: HTML -*-
+# ***** 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 mozilla.org charset encoding.
+# 
+# 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):
+#     Stephen Lamm <slamm@netscape.com>
+#     Pierre Chanial <p_ch@verizon.net>
+#
+# 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 ***** -->
+
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
+<?xml-stylesheet href="chrome://global/skin/arrow.css" type="text/css"?> 
+
+<!DOCTYPE dialog SYSTEM "chrome://global/locale/customizeCharset.dtd">
+
+<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="&title.label;"
+        onload="Init();"
+        ondialogaccept="return Save();"
+        persist="width height"
+        headertitle="&left.header;"
+        width="500" height="394">
+
+  <script type="application/x-javascript" src="chrome://global/content/customizeCharset.js"/>
+  <script type="application/x-javascript">
+  <![CDATA[
+    var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
+    observerService.notifyObservers(null, "charsetmenu-selected", "other");
+  ]]>
+  </script>
+  
+  <!-- The two-pane -->
+  <hbox flex="1">
+    <vbox flex="1">
+      <label value="&additional.label;"/>
+      <!-- Available Charsets Tree -->
+      <listbox id="available_charsets" flex="1" seltype="multiple"
+            onselect="SelectAvailableCharset();" 
+            ondblclick="AddAvailableCharset();"/>
+      
+      <separator class="thin"/>
+      
+      <hbox align="center">
+        <button id="add_button" oncommand="AddAvailableCharset();"
+                label="&add.label;" disabled="true"/>
+      </hbox>
+    </vbox>
+    
+    <separator orient="vertical"/>
+    
+    <vbox flex="1">
+      <label value="&current.label;"/>
+      <listbox id="active_charsets" flex="1" seltype="multiple"
+            onselect="SelectActiveCharset();"
+            ondblclick="RemoveActiveCharset();"/>
+      
+      <separator class="thin"/>
+      <hbox align="center">
+        <button id="remove_button" oncommand="RemoveActiveCharset();"
+                disabled="true"
+                label="&remove.label;"/>
+      </hbox>
+    </vbox> 
+    <vbox>
+      <spacer flex="1"/>
+      <button id="up_button" class="up" disabled="true"
+              oncommand="MoveUp();"/>
+      <button id="down_button" class="down" disabled="true"
+              oncommand="MoveDown();"/>
+      <spacer flex="1"/>
+    </vbox>
+  </hbox>
+</dialog>
--- a/toolkit/jar.mn
+++ b/toolkit/jar.mn
@ -9,6 +9,8 @@ toolkit.jar:
 +        content/global/charsetOverlay.xul                  (content/charsetOverlay.xul) 
 +        content/global/commonDialog.js                     (content/commonDialog.js) 
 +        content/global/commonDialog.xul                    (content/commonDialog.xul) 
+*        content/global/customizeCharset.js                 (content/customizeCharset.js)
+*        content/global/customizeCharset.xul                (content/customizeCharset.xul)
         content/global/customizeToolbar.css                (content/customizeToolbar.css)
 *        content/global/customizeToolbar.js                 (content/customizeToolbar.js)
 *        content/global/customizeToolbar.xul                (content/customizeToolbar.xul)
@ -79,9 +81,10 @@ en-US.jar:
 +        locale/en-US/global/brand.dtd                      (locale/brand.dtd)
 *+       locale/en-US/global/brand.properties               (locale/brand.properties)
 +        locale/en-US/global/build.dtd                      (locale/build.dtd)
-+        locale/en-US/global/charset.dtd                    (locale/charset.dtd)
+        locale/en-US/global/charsetOverlay.dtd             (locale/charsetOverlay.dtd)
 +        locale/en-US/global/commonDialog.dtd               (locale/commonDialog.dtd)
 +        locale/en-US/global/commonDialogs.properties       (locale/commonDialogs.properties)
+*+       locale/en-US/global/customizeCharset.dtd           (locale/customizeCharset.dtd)
 +        locale/en-US/global/customizeToolbar.dtd           (locale/customizeToolbar.dtd)
 +        locale/en-US/global/customizeToolbar.properties    (locale/customizeToolbar.properties)
 +        locale/en-US/global/editMenuOverlay.dtd            (locale/editMenuOverlay.dtd)
@ -96,7 +99,7 @@ en-US.jar:
 +        locale/en-US/global/tabbrowser.dtd                 (locale/widgets/tabbrowser.dtd)
 +        locale/en-US/global/textcontext.dtd                (locale/widgets/textcontext.dtd)
 +        locale/en-US/global/wizard.properties              (locale/widgets/wizard.properties)
-+        locale/en-US/global/charsetOverlay.dtd             (obsolete/locale/charsetOverlay.dtd) 
+        locale/en-US/global/charset.dtd                    (obsolete/locale/charset.dtd) 
 *+       locale/en-US/global/dialogOverlay.dtd              (obsolete/locale/dialogOverlay.dtd) 
 +        locale/en-US/global/nsTreeSorting.properties       (obsolete/locale/nsTreeSorting.properties)
 +        locale/en-US/global/wizardManager.properties       (obsolete/locale/wizardManager.properties) 
--- a/toolkit/locale/charset.dtd
+++ b/toolkit/locale/charset.dtd
@ -1,18 +0,0 @@
-<!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">
--- a/toolkit/obsolete/locale/charsetOverlay.dtd
+++ b/toolkit/obsolete/locale/charsetOverlay.dtd
--- a/toolkit/locale/customizeCharset.dtd
+++ b/toolkit/locale/customizeCharset.dtd
@ -38,20 +38,9 @@
 #***** END LICENSE BLOCK ***** -->

 # LOCALIZATION NOTE  Charset Coding Preferences Dialog: Do NOT localize the term "Character Coding"
-<!ENTITY charset.customize.title.label			    "Customize Character Coding">
-<!ENTITY charset.customize.left.header			    "Character Coding">
-<!ENTITY charset.customize.right.header			    "Select Supported Charsets">
-<!ENTITY charset.customize.current.label        "Active Character Codings:">
-<!ENTITY charset.customize.reorder.label        "Reorder">
-<!ENTITY charset.customize.remove.label         "Remove">
-<!ENTITY charset.customize.additional.label     "Available Character Codings:">
-<!ENTITY charset.customize.add.label            "Add">
-<!ENTITY charset.customize.cancel.label		      "Cancel">
-<!ENTITY charset.customize.save.label           "Save">
-<!ENTITY charset.customize.save.popup           "Please restart the browser for changes to take effect...">
-<!ENTITY charset.customize.moveUp.label         "Move Up">
-<!ENTITY charset.customize.moveUp.accesskey     "U">
-<!ENTITY charset.customize.moveDown.label       "Move Down">
-<!ENTITY charset.customize.moveDown.accesskey   "D">
-
-
+<!ENTITY title.label      "Customize Character Coding">
+<!ENTITY left.header      "Character Coding">
+<!ENTITY current.label    "Active Character Codings:">
+<!ENTITY remove.label     "Remove">
+<!ENTITY additional.label "Available Character Codings:">
+<!ENTITY add.label        "Add">
--- a/toolkit/skin/win/jar.mn
+++ b/toolkit/skin/win/jar.mn
@ -1,4 +1,5 @@
 classic.jar:
+*+ skin/classic/global/arrow.css
 *+ skin/classic/global/autocomplete.css
 +  skin/classic/global/browser.css
 +  skin/classic/global/checkbox.css
@ -13,7 +14,6 @@ classic.jar:
 +  skin/classic/global/listbox.css
 +  skin/classic/global/menulist.css
 +  skin/classic/global/popup.css
-+  skin/classic/communicator/printing.css
 +  skin/classic/global/progressmeter.css
 +  skin/classic/global/radio.css
 +  skin/classic/global/scrollbars.css
@ -62,10 +62,6 @@ classic.jar:
 +  skin/classic/global/icons/Restore.gif                          (icons/Restore.gif)
 +  skin/classic/global/icons/Close.gif                            (icons/Close.gif)
 +  skin/classic/global/icons/close-button.gif                     (icons/close-button.gif)
-+  skin/classic/global/icons/Landscape.png                        (icons/Landscape.png)
-+  skin/classic/global/icons/Landscape-small.png                  (icons/Landscape-small.png)
-+  skin/classic/global/icons/Portrait.png                         (icons/Portrait.png)
-+  skin/classic/global/icons/Portrait-small.png                   (icons/Portrait-small.png)
 +  skin/classic/global/menu/Menu-arrow-disabled.png               (menu/Menu-arrow-disabled.png)
 +  skin/classic/global/menu/Menu-arrow-hover.png                  (menu/Menu-arrow-hover.png)
 +  skin/classic/global/menu/Menu-arrow.png                        (menu/Menu-arrow.png)