Use more efficient command structure, refactor commands, broadcasters and keys, remove unused attributes, do some other optimization (72923). Landing navigator part only; this should help new window opening and some other areas. r=ben sr=hyatt

2006-05-17 02:29:13 +00:00 · 2006-05-17 02:29:13 +00:00 · 5f836094fa
--- a/suite/common/pref/pref-advanced.xul
+++ b/suite/common/pref/pref-advanced.xul
@ -20,14 +20,14 @@
   Contributor(s): 
  -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-advanced.dtd" >

 <window xmlns:html="http://www.w3.org/1999/xhtml"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        class="color-dialog"
-        align="vertical" title="&window.title;"
+        orient="vertical"
        onload="parent.initPanel(panel);">

  <script type="application/x-javascript">
--- a/suite/common/pref/pref-appearance.xul
+++ b/suite/common/pref/pref-appearance.xul
@ -23,7 +23,7 @@
  -->

 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>

 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
--- a/suite/common/pref/pref-applications-edit.xul
+++ b/suite/common/pref/pref-applications-edit.xul
@ -23,6 +23,7 @@
  -->

 <?xml-stylesheet href="chrome://communicator/skin/"?>
+<?xml-stylesheet href="chrome://communicator/skin/prefpanels.css" type="text/css"?>

 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

@ -34,11 +35,9 @@
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        title="&editType.label;"
        onload="Startup();">
-
-  <stringbundle id="bundle_prefApplications"
-                src="chrome://communicator/locale/pref/pref-applications.properties"/>
+    <stringbundle id="bundle_prefApplications"
+                  src="chrome://communicator/locale/pref/pref-applications.properties"/>
  <script type="application/x-javascript" src="chrome://communicator/content/pref/overrideHandler.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
  <script type="application/x-javascript">
  <![CDATA[
    var gExtensionLabel   = null;
@ -158,8 +157,8 @@
          var titleMsg = gPrefApplicationsBundle.getString("handlerExistsTitle");
          var dialogMsg = gPrefApplicationsBundle.getString("handlerExists");
          dialogMsg = dialogMsg.replace(/%mime%/g, gMIMEField.value);
-          var commonDialogService = nsJSComponentManager.getService("@mozilla.org/appshell/commonDialogs;1",
-                                                                    "nsICommonDialogs");
+          var commonDialogService = Components.classes["@mozilla.org/appshell/commonDialogs;1"]
+                                              .getService(Components.interfaces.nsICommonDialogs);
          var replace = commonDialogService.Confirm(window, titleMsg, dialogMsg);
          if (!replace)
            window.close();
@ -231,7 +230,7 @@
  ]]>
  </script>
  
-  <keyset id="keyset"/>
+  <keyset id="dialogKeys"/>
  
  <box autostretch="never">
    <image id="largeIcon" class="file-icon-large" style="width: 32px; height: 32px;"/>
--- a/suite/common/pref/pref-applications.js
+++ b/suite/common/pref/pref-applications.js
@ -26,8 +26,8 @@ function removeType()
  var titleMsg = gPrefApplicationsBundle.getString("removeHandlerTitle");
  var dialogMsg = gPrefApplicationsBundle.getString("removeHandler");
  dialogMsg = dialogMsg.replace(/%n/g, "\n");
-  var commonDialogService = nsJSComponentManager.getService("@mozilla.org/appshell/commonDialogs;1",
-                                                              "nsICommonDialogs");
+  var commonDialogService = Components.classes["@mozilla.org/appshell/commonDialogs;1"]
+                                      .getService(Components.interfaces.nsICommonDialogs);
  var remove = commonDialogService.Confirm(window, titleMsg, dialogMsg);
  if (remove) {
    var uri = gTree.selectedItems[0].id;
--- a/suite/common/pref/pref-applications.xul
+++ b/suite/common/pref/pref-applications.xul
@ -23,7 +23,7 @@
  -->

 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-applications.dtd" >

@ -31,15 +31,13 @@
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
        class="color-dialog"
-        style="-moz-user-focus: ignore;"
-        title="&window.title;" align="vertical"
+        orient="vertical"
        onload="parent.initPanel('chrome://communicator/content/pref/pref-applications.xul');">

  <stringbundle id="bundle_prefApplications"
                src="chrome://communicator/locale/pref/pref-applications.properties"/>
  <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-applications.js"/>
  <script type="application/x-javascript" src="chrome://communicator/content/pref/overrideHandler.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
        
  <box class="box-smallheader" title="&lHeader;"/>

--- a/suite/common/pref/pref-cache.xul
+++ b/suite/common/pref/pref-cache.xul
@ -21,13 +21,13 @@
   Contributor(s): 
  -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-cache.dtd" >
 <window xmlns:html="http://www.w3.org/1999/xhtml"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        class="color-dialog"
-        orient="vertical" title="&title.label;"
+        orient="vertical"
        onload="parent.initPanel('chrome://communicator/content/pref/pref-cache.xul');">

  <script type="application/x-javascript">
--- a/suite/common/pref/pref-charset.xul
+++ b/suite/common/pref/pref-charset.xul
@ -38,8 +38,6 @@

  <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-charset.js"/>
  
-  <keyset id="keyset"/>
-  
 <!-- 
  <box class="box-smallheader" title="&charset.customize.left.header;" id="confirm_text" value="&charset.customize.save.popup;"/>
 -->
--- a/suite/common/pref/pref-colors.xul
+++ b/suite/common/pref/pref-colors.xul
@ -23,7 +23,7 @@
  -->

 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
 <?xul-overlay href="chrome://communicator/content/pref/platformPrefOverlay.xul"?>

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-colors.dtd" >
@ -31,7 +31,6 @@
 <window xmlns:html="http://www.w3.org/1999/xhtml"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        class="color-dialog"
-        title="&window.title;" 
        orient="vertical"
        onload="parent.initPanel('chrome://communicator/content/pref/pref-colors.xul');">

--- a/suite/common/pref/pref-cookies.xul
+++ b/suite/common/pref/pref-cookies.xul
@ -0,0 +1,107 @@
+<?xml version="1.0"?> 
+
+<!--
+   The contents of this file are subject to the Netscape 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/NPL/
+    
+   implied. See the License for the specific language governing
+   rights and limitations under the License.
+    
+   The Original Code is Mozilla Communicator client code, released
+   March 31, 1998.
+   
+   The Initial Developer of the Original Code is Netscape
+   Communications Corporation. Portions created by Netscape are
+   Copyright (C) 1998-1999 Netscape Communications Corporation. All
+   Rights Reserved.
+   
+   Contributor(s):
+     Håkan Waara <hwaara@chello.se>
+     Peter Annema <disttsc@bart.nl>
+  -->
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
+
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % prefCookieDTD SYSTEM "chrome://communicator/locale/pref/pref-cookies.dtd" >
+%prefCookieDTD;
+]>
+
+<window xmlns:html="http://www.w3.org/1999/xhtml" id="cookieWindow"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        class="color-dialog"
+        orient="vertical"
+        onload="init();">
+          
+  <script type="application/x-javascript">
+  <![CDATA[
+  
+  var _elementIDs = ["networkCookieBehaviour", "networkWarnAboutCookies"];
+
+  function init()
+  {
+    parent.initPanel('chrome://communicator/content/pref/pref-cookies.xul'); 
+
+    var enabled = document.getElementById("networkCookieBehaviour").value != "2";
+    setWarnAboutCookiesEnabled(enabled);
+  }
+      
+  function viewCookies() 
+  {
+    window.openDialog("chrome://communicator/content/wallet/CookieViewer.xul","","modal=yes,chrome,resizable=yes", 0);
+  }  
+
+  function viewTutorial() 
+  {
+    window.openDialog
+      ("chrome://communicator/content/wallet/privacy.xul","","modal=yes,chrome,resizable=yes,height=400,width=600", 0);
+  }  
+ 
+  function setWarnAboutCookiesEnabled(aEnabled)
+  {
+    document.getElementById("networkWarnAboutCookies").disabled = !aEnabled;
+  }
+
+  ]]>
+  </script>   
+
+  <box class="box-smallheader" id="cookieHeader" title="&lHeader;"/>
+
+  <titledbox orient="vertical">
+    <label value="&cookiePolicy.label;"/>
+
+    <html>&cookieDetails;</html>
+
+    <radiogroup id="networkCookieBehaviour" orient="vertical" autostretch="never"
+                pref="true" preftype="int" prefstring="network.cookie.cookieBehavior"
+                prefattribute="value">
+
+      <radio group="networkCookieBehaviour" value="2" label="&disableCookies.label;" 
+             accesskey="&disableCookies.accesskey;" oncommand="setWarnAboutCookiesEnabled(false);"/>
+      <radio group="networkCookieBehaviour" value="0" label="&accAllCookiesRadio.label;" 
+             accesskey="&accAllCookiesRadio.accesskey;" oncommand="setWarnAboutCookiesEnabled(true);"/>
+      <radio group="networkCookieBehaviour" value="1" label="&accOrgCookiesRadio.label;" 
+             accesskey="&accOrgCookiesRadio.accesskey;" oncommand="setWarnAboutCookiesEnabled(true);"/>
+
+    </radiogroup>
+
+    <separator/>
+    <box autostretch="never">
+      <checkbox id="networkWarnAboutCookies" label="&warnAboutCookies.label;" accesskey="&warnAboutCookies.accesskey;"
+                pref="true" preftype="bool" prefstring="network.cookie.warnAboutCookies"
+                prefattribute="checked"/>
+    </box>
+
+    <separator/>
+
+    <box autostretch="never" halign="right">
+      <button class="dialog" label="&viewCookies.label;" accesskey="&viewCookies.accesskey;" oncommand="viewCookies();"/>
+      <button class="dialog" label="&viewTutorial.label;" accesskey="&viewTutorial.accesskey;" oncommand="viewTutorial();"/>
+    </box>              
+  </titledbox>
+
+</window>
--- a/suite/common/pref/pref-debug.xul
+++ b/suite/common/pref/pref-debug.xul
@ -21,7 +21,7 @@
   Contributor(s): 
  -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-debug.dtd" >

--- a/suite/common/pref/pref-debug1.xul
+++ b/suite/common/pref/pref-debug1.xul
@ -21,7 +21,7 @@
   Contributor(s): 
  -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-debug1.dtd" >

--- a/suite/common/pref/pref-debug2.xul
+++ b/suite/common/pref/pref-debug2.xul
@ -21,7 +21,7 @@
   Contributor(s): 
  -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-debug2.dtd" >

--- a/suite/common/pref/pref-download.xul
+++ b/suite/common/pref/pref-download.xul
@ -22,14 +22,14 @@
  -->

 <?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>

 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-download.dtd" >

 <window xmlns:html="http://www.w3.org/1999/xhtml"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        class="dialog"
-        align="vertical" title="&title.label;"
+        orient="vertical"
        onload="if( parent.handle ) parent.handle.onpageload( 'pref-download' ); else parent.queuedTag = 'pref-download';">

  <script type="application/x-javascript">
--- a/suite/common/pref/pref-fonts.xul
+++ b/suite/common/pref/pref-fonts.xul
@ -21,14 +21,13 @@
   Contributor(s): 
  -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-fonts.dtd" >
 <window id="fontPanel"
        xmlns:html="http://www.w3.org/1999/xhtml"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        class="color-dialog"
-        title="&window.title;" 
        orient="vertical"
        onload="parent.initPanel('chrome://communicator/content/pref/pref-fonts.xul');">

--- a/suite/common/pref/pref-history.xul
+++ b/suite/common/pref/pref-history.xul
@ -23,14 +23,14 @@
  -->

 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-history.dtd" >

-<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
+<window xmlns:html="http://www.w3.org/1999/xhtml"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        class="color-dialog"
-        orient="vertical" title="&title.label;"
+        orient="vertical"
        onload="parent.initPanel('chrome://communicator/content/pref/pref-history.xul');">

  <script type="application/x-javascript">
@ -54,7 +54,10 @@

  function onHistoryOK()
  {
-    var maxSize = document.getElementById('shistMax').value;
+    var data = parent.hPrefWindow.wsm.dataManager.pageData["chrome://communicator/content/pref/pref-history.xul"];
+    if ( "GetFields" in window )
+      data = GetFields();
+    var maxSize = data.shistMax;
    if (maxSize < 0) {
      // Don't bother calling in to the component if the value is illegal.
      // I need a way to enforce proper value and/or stop the pref
@ -70,6 +73,13 @@
    }
  }
  
+  function GetFields() {
+    var data = {};
+    data.shistMax = document.getElementById('shistMax').value;
+    return data;
+  }
+
+
  function prefClearGlobalHistory()
  {
    var globalHistory = Components.classes["@mozilla.org/browser/global-history;1"]
--- a/suite/common/pref/pref-images.xul
+++ b/suite/common/pref/pref-images.xul
@ -0,0 +1,119 @@
+<?xml version="1.0"?> 
+
+<!--
+   The contents of this file are subject to the Netscape 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/NPL/
+    
+   implied. See the License for the specific language governing
+   rights and limitations under the License.
+    
+   The Original Code is Mozilla Communicator client code, released
+   March 31, 1998.
+   
+   The Initial Developer of the Original Code is Netscape
+   Communications Corporation. Portions created by Netscape are
+   Copyright (C) 1998-1999 Netscape Communications Corporation. All
+   Rights Reserved.
+   
+   Contributor(s): 
+     Håkan Waara <hwaara@chello.se>
+     Peter Annema <disttsc@bart.nl>
+  -->
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
+
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % prefImagesDTD SYSTEM "chrome://communicator/locale/pref/pref-images.dtd" >
+%prefImagesDTD;
+]>
+
+<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml" id="imagesWindow"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        class="color-dialog"
+        orient="vertical"
+        onload="init();">
+          
+  <script type="application/x-javascript">
+  <![CDATA[
+  
+  var _elementIDs = ["accOrgImages", "networkImageBehaviour", "networkImageWarnAboutImages"];
+
+  function init()
+  {
+    parent.initPanel('chrome://communicator/content/pref/pref-images.xul');
+
+    imageBlockingEnabled();
+
+    var enabled = document.getElementById("networkImageBehaviour").value != "2";
+    setWarnAboutImagesEnabled(enabled);
+  }
+
+  // Present finer control over image loading to the user.
+  // enable image blocker if "imageblocker.enabled" pref is true
+  function imageBlockingEnabled()
+  {
+    if (parent.hPrefWindow.getPref("bool", "imageblocker.enabled"))
+      document.getElementById("haveImageBlocking").removeAttribute("hidden");
+  }
+
+  function viewImages() 
+  {
+    window.openDialog("chrome://communicator/content/wallet/CookieViewer.xul","",
+                      "modal=yes,chrome,resizable=yes", 2);
+  }
+
+  function setWarnAboutImagesEnabled(aEnabled)
+  {
+    document.getElementById("networkImageWarnAboutImages").disabled = !aEnabled;
+  }
+ 
+  ]]>
+  </script>
+
+  <broadcaster id="haveImageBlocking" hidden="true"/>
+
+  <box class="box-smallheader" id="imagesHeader" title="&lHeader;"/>
+
+  <titledbox orient="vertical" id="imagesArea">
+    <label value="&imageBlocking.label;"/>
+
+    <html>&imageDetails;</html>
+
+    <radiogroup id="networkImageBehaviour" orient="vertical" autostretch="never"
+                pref="true" preftype="int" prefstring="network.image.imageBehavior"
+                prefattribute="value">
+      <radio group="networkImageBehaviour" value="2" label="&disableImages.label;"
+             accesskey="&disableImages.accesskey;"
+             oncommand="setWarnAboutImagesEnabled(false);"/>
+      <radio group="networkImageBehaviour" value="0" label="&accAllImagesRadio.label;"
+             accesskey="&accAllImagesRadio.accesskey;"
+             oncommand="setWarnAboutImagesEnabled(true);"/>
+      <radio group="networkImageBehaviour" value="1" label="&accOrgImagesRadio.label;"
+             accesskey="&accOrgImagesRadio.accesskey;"
+             id="accOrgImages" observes="haveImageBlocking"
+             oncommand="setWarnAboutImagesEnabled(true);"/>
+    </radiogroup>
+
+    <separator observes="haveImageBlocking"/>
+    <box autostretch="never">
+      <checkbox id="networkImageWarnAboutImages" label="&warnAboutImages.label;"
+                accesskey="&warnAboutImages.accesskey;" observes="haveImageBlocking"
+                pref="true" preftype="bool" prefattribute="checked"
+                prefstring="network.image.warnAboutImages"/>
+    </box>
+
+    <separator observes="haveImageBlocking"/>
+
+    <box autostretch="never" halign="right">
+      <button class="dialog" id="viewImages" label="&viewImages.label;"
+              accesskey="&viewImages.accesskey;" oncommand="viewImages();"
+              observes="haveImageBlocking"/>
+    </box>
+
+  </titledbox>
+
+</window>
--- a/suite/common/pref/pref-languages-add.xul
+++ b/suite/common/pref/pref-languages-add.xul
@ -39,7 +39,7 @@
  <!-- XXX: Replace strres.js when pref-languages is converted -->
  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>

-  <keyset id="keyset"/>
+  <keyset id="dialogKeys"/>
  
  <html>&languages.customize.prefAddLangDescript;</html>
  <separator class="thin"/>
--- a/suite/common/pref/pref-languages.xul
+++ b/suite/common/pref/pref-languages.xul
@ -27,7 +27,6 @@
  xmlns:html="http://www.w3.org/1999/xhtml"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  class="color-dialog"
-  title="&languages.customize.window.title;" 
  onload="Init();" orient="vertical">

  <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-languages.js"/>
--- a/suite/common/pref/pref-mousewheel.xul
+++ b/suite/common/pref/pref-mousewheel.xul
@ -24,7 +24,7 @@
  -->

 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
  

 <!DOCTYPE window [
--- a/suite/common/pref/pref-navigator.xul
+++ b/suite/common/pref/pref-navigator.xul
@ -22,15 +22,15 @@
  -->

 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
 <?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-navigator.dtd" >

-<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
+<window xmlns:html="http://www.w3.org/1999/xhtml"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        class="color-dialog"
-        orient="vertical" title="&title.label;"
+        orient="vertical"
        onload="parent.initPanel('chrome://communicator/content/pref/pref-navigator.xul');">

  <stringbundle id="bundle_prefutilities" src="chrome://communicator/locale/pref/prefutilities.properties"/>
--- a/suite/common/pref/pref-offline.xul
+++ b/suite/common/pref/pref-offline.xul
@ -22,14 +22,13 @@
   Contributor(s): 
  -->
 <?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>

 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-offline.dtd" >
 <window xmlns:html="http://www.w3.org/1999/xhtml"
 		    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        class="dialog"
-        title="&title.label;"
-        align="vertical"
+        orient="vertical"
  		  onload="if( parent.handle ) parent.handle.onpageload( 'pref-offline' ); else parent.queuedTag = 'pref-offline';">

  <box class="box-smallheader" title="&lHeader;" description="&rHeader;"/>
--- a/suite/common/pref/pref-policies.xul
+++ b/suite/common/pref/pref-policies.xul
@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-policies.dtd">

--- a/suite/common/pref/pref-proxies.xul
+++ b/suite/common/pref/pref-proxies.xul
@ -24,7 +24,7 @@
       -Added a syntax example for the "no proxy" field.
  -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-proxies.dtd" >
 <window xmlns:html="http://www.w3.org/1999/xhtml"
--- a/suite/common/pref/pref-search.xul
+++ b/suite/common/pref/pref-search.xul
@ -21,13 +21,13 @@
   Contributor(s): Robert John Churchill (rjc@netscape.com)
  -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-search.dtd" >
-<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
+<window xmlns:html="http://www.w3.org/1999/xhtml"
        class="color-dialog"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="parent.initPanel('chrome://communicator/content/pref/pref-search.xul');checkEngine()"  title="&title.label;"
+        onload="parent.initPanel('chrome://communicator/content/pref/pref-search.xul');checkEngine()"
        orient="vertical">

  <script type="application/x-javascript">
--- a/suite/common/pref/pref-smart_browsing.xul
+++ b/suite/common/pref/pref-smart_browsing.xul
@ -23,7 +23,8 @@
  -->

 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/prefpanels.css" type="text/css"?>

 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@ -35,7 +36,6 @@
 <window xmlns:html="http://www.w3.org/1999/xhtml"
        class="color-dialog"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="&title.label;" 
        orient="vertical"
        onload="parent.initPanel('chrome://communicator/content/pref/pref-smart_browsing.xul');">

--- a/suite/common/pref/pref-smartupdate.xul
+++ b/suite/common/pref/pref-smartupdate.xul
@ -1,14 +1,13 @@
 <?xml version="1.0"?> 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-smartupdate.dtd" >
 
 <window xmlns:html="http://www.w3.org/1999/xhtml"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        class="color-dialog"
-        align="vertical" 
-        title="&title.label;"
+        orient="vertical"
        onload="parent.initPanel('chrome://communicator/content/pref/pref-smartupdate.xul');">
  
  <script type="application/x-javascript">
--- a/suite/common/pref/pref-themes.xul
+++ b/suite/common/pref/pref-themes.xul
@ -22,8 +22,9 @@
  -->

 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/prefpanels.css" type="text/css"?>

-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>

@ -38,7 +39,6 @@
  <stringbundle id="bundle_prefutilities"
                src="chrome://communicator/locale/pref/prefutilities.properties"/>
  <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-themes.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
        
  <box class="box-smallheader" title="&lHeader;"/>

--- a/suite/common/pref/pref-winhooks.xul
+++ b/suite/common/pref/pref-winhooks.xul
@ -23,8 +23,7 @@
  -->

 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
-  
+<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>

 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@ -77,7 +76,7 @@
                <checkbox id="isHandlingHTTPS"  label="&https.label;" accesskey="&https.accesskey;" class="indent"/>
                <checkbox id="isHandlingFTP"    label="&ftp.label;" accesskey="&ftp.accesskey;" class="indent"/>
                <checkbox id="isHandlingCHROME" label="&chrome.label;" accesskey="&chrome.accesskey;" class="indent"/>
-		 <checkbox id="isHandlingGOPHER" value="&gopher.label;" accesskey="&gopher.accesskey;" class="indent"/>
+		 <checkbox id="isHandlingGOPHER" label="&gopher.label;" accesskey="&gopher.accesskey;" class="indent"/>
            </box>
        </titledbox>
        <!-- Misc -->
--- a/suite/common/pref/pref.xul
+++ b/suite/common/pref/pref.xul
@ -47,7 +47,7 @@
  <script type="application/x-javascript" src="chrome://global/content/nsWidgetStateManager.js"/>
  <script type="application/x-javascript" src="chrome://communicator/content/pref/nsPrefWindow.js"/>

-  <keyset id="keyset"/>
+  <keyset id="dialogKeys"/>

  <box flex="1">
    <!-- tree sidebar -->
--- a/suite/locales/en-US/chrome/common/pref/pref-advanced.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-advanced.dtd
@ -1,7 +1,5 @@

 <!--LOCALIZATION NOTE : FILE 'Advanced' prefs settings -->
-<!ENTITY window.title                 "Advanced">
-
 <!ENTITY lHeader                      "Advanced">

 <!ENTITY advancedTitle.label          "Enable features that help interpret web pages">
--- a/suite/locales/en-US/chrome/common/pref/pref-appearance.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-appearance.dtd
@ -1,7 +1,6 @@
 <!-- extracted from content/pref-appearance.xul -->

 <!--LOCALIZATION NOTE : FILE The Appearance prefs dialog.  -->
-<!ENTITY window.title "Appearance">
 <!ENTITY lHeader "Appearance">
 <!--LOCALIZATION NOTE (onStartLegend.label): Don't translate "&brandShortName;".
    Place &brandShortName; in the phrase where the name of the application should
--- a/suite/locales/en-US/chrome/common/pref/pref-applications.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-applications.dtd
@ -1,7 +1,6 @@
 <!-- extracted from content/pref-applications.xul -->

 <!--LOCALIZATION NOTE : FILE The Applications prefs dialog -->
-<!ENTITY window.title                   "Advanced">
 <!ENTITY lHeader                        "Helper Applications">
 <!ENTITY descript                       "Specify which application should handle each file type">
 <!ENTITY fileTypes.label                "File types:">
--- a/suite/locales/en-US/chrome/common/pref/pref-cache.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-cache.dtd
@ -1,7 +1,6 @@
 <!-- extracted from content/pref-cache.xul -->

 <!--LOCALIZATION NOTE : FILE Cache prefs dialog -->
-<!ENTITY  title.label                   "Cache">
 <!ENTITY  lHeader                       "Cache">
 <!ENTITY  cacheTitle.label              "Set Cache Size">
 <!ENTITY  cachePara                     "The cache keeps copies of frequently visited web pages on your hard disk. This reduces the amount of time you are connected to the Internet. (Clicking Reload always shows you the latest version of a page.)">
--- a/suite/locales/en-US/chrome/common/pref/pref-colors.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-colors.dtd
@ -1,7 +1,6 @@
 <!-- extracted from content/pref-colors.xul -->

 <!-- LOCALIZATION NOTE : FILE Color management prefs -->
-<!ENTITY  window.title                    "Colors">
 <!ENTITY  lHeader                         "Colors">
 <!ENTITY  color                           "Text and Background">
 <!ENTITY  textColor.label                 "Text:">
--- a/suite/locales/en-US/chrome/common/pref/pref-cookies.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-cookies.dtd
@ -0,0 +1,27 @@
+<!ENTITY lHeader                        "Cookies">
+
+<!-- cookies -->
+
+<!ENTITY cookiePolicy.label             "Cookie Acceptance Policy">
+
+<!ENTITY accAllCookiesRadio.label       "Enable all cookies">
+<!ENTITY accAllCookiesRadio.accesskey   "a">
+
+<!ENTITY accOrgCookiesRadio.label       "Enable cookies for the originating web site only">
+<!ENTITY accOrgCookiesRadio.accesskey   "o">
+
+<!ENTITY disableCookies.label           "Disable cookies">
+<!ENTITY disableCookies.accesskey       "r">
+
+<!ENTITY warnAboutCookies.label         "Warn me before storing a cookie">
+<!ENTITY warnAboutCookies.accesskey     "w">
+
+<!ENTITY cookieDetails                  "Cookies are small pieces of information that some web sites ask to store on your computer. If you enable cookies, your browser will accept a web site's cookies automatically when you visit the site. Such cookies are sent back to the web site on future visits.">
+
+<!ENTITY viewCookies.label              "View Stored Cookies">
+<!ENTITY viewCookies.accesskey          "v">
+
+<!ENTITY viewTutorial.label              "More Information">
+<!ENTITY viewTutorial.accesskey          "m">
+
+
--- a/suite/locales/en-US/chrome/common/pref/pref-debug.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-debug.dtd
@ -1,7 +1,6 @@
 <!-- extracted from content/pref-debug.xul -->

 <!--LOCALIZATION NOTE : FILE DONT_TRANSLATE This file should not be translated -->
-<!ENTITY window.title "Debug">

 <!ENTITY lHeader "Debug General">
 <!ENTITY rHeader "General debugging preferences">
--- a/suite/locales/en-US/chrome/common/pref/pref-debug1.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-debug1.dtd
@ -1,7 +1,6 @@
 <!-- extracted from content/pref-debug.xul -->

 <!--LOCALIZATION NOTE : FILE DONT_TRANSLATE This file should not be translated -->
-<!ENTITY window.title "Debug">

 <!ENTITY lHeader "Debug Events">
 <!ENTITY rHeader "Event debugging preferences">
--- a/suite/locales/en-US/chrome/common/pref/pref-debug2.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-debug2.dtd
@ -1,7 +1,6 @@
 <!-- extracted from content/pref-debug.xul -->

 <!--LOCALIZATION NOTE : FILE DONT_TRANSLATE This file should not be translated -->
-<!ENTITY window.title "Debug">

 <!ENTITY lHeader "Debug Networking">
 <!ENTITY rHeader "Network debugging preferences">
--- a/suite/locales/en-US/chrome/common/pref/pref-download.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-download.dtd
@ -1,7 +1,6 @@
 <!-- extracted from content/pref-download.xul -->

 <!--LOCALIZATION NOTE : FILE 'Download' prefs dialog. Handles options for reading mail/news offline -->
-<!ENTITY  title.label "Download">
 <!ENTITY  lHeader "Download">
 <!ENTITY  rHeader "Choose settings for sending messages offline">
 <!ENTITY  downOnlyCheck "Download only unread messages">
--- a/suite/locales/en-US/chrome/common/pref/pref-fonts.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-fonts.dtd
@ -1,7 +1,6 @@
 <!-- extracted from content/pref-fonts.xul -->

 <!-- LOCALIZATION NOTE : FILE 'Fonts' prefs dialog -->
-<!ENTITY  window.title                            "Fonts">
 <!ENTITY  lHeader                                 "Fonts">
 <!ENTITY  displayFonts                            "Default Fonts for Displaying Web Pages">

--- a/suite/locales/en-US/chrome/common/pref/pref-history.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-history.dtd
@ -1,4 +1,3 @@
-<!ENTITY  title.label               "History">
 <!ENTITY  lHeader                   "History">

 <!ENTITY  header3.label             "Browsing History">
--- a/suite/locales/en-US/chrome/common/pref/pref-images.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-images.dtd
@ -0,0 +1,21 @@
+<!ENTITY lHeader                        "Images">
+
+<!ENTITY imageBlocking.label            "Image Blocking">
+
+<!--LOCALIZATION NOTE (onStartLegend.label): Don't translate "&brandShortName;".
+    Place "&brandShortName;" in the phrase where the name of the application should
+	 appear
+-->
+<!ENTITY imageDetails                   "Specify how &brandShortName; handles images on web pages.">
+
+<!ENTITY accAllImagesRadio.label        "Accept all images">
+<!ENTITY accAllImagesRadio.accesskey    "i">
+<!ENTITY accOrgImagesRadio.label        "Accept images that come from the originating server only">
+<!ENTITY accOrgImagesRadio.accesskey    "n">
+<!ENTITY disableImages.label            "Do not load any images">
+<!ENTITY disableImages.accesskey        "y">
+<!ENTITY warnAboutImages.label          "Alert me before downloading an image">
+<!ENTITY warnAboutImages.accesskey      "e">
+<!ENTITY viewImagesExplanation.label    "View list of sites about which image acceptance information is stored">
+<!ENTITY viewImages.label               "View Image Permissions">
+<!ENTITY viewImages.accesskey           "p">
--- a/suite/locales/en-US/chrome/common/pref/pref-languages.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-languages.dtd
@ -1,7 +1,6 @@
 <!-- LOCALIZATION NOTE : FILE 'Languages' preferences dialog -->

 <!ENTITY  languages.customize.prefLangDescript          "Web pages are sometimes available in more than one language. Choose languages for displaying web pages, in order of preference.">
-<!ENTITY languages.customize.window.title               "Languages">
 <!ENTITY languages.customize.lHeader                    "Languages">
 <!ENTITY languages.customize.rHeader                    "Languages in which webpages are displayed">
 <!ENTITY langtitle.label                                "Languages for Web Pages">
--- a/suite/locales/en-US/chrome/common/pref/pref-navigator.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-navigator.dtd
@ -1,5 +1,3 @@
-
-<!ENTITY  title.label               "Navigator">
 <!ENTITY  lHeader                   "Navigator">

 <!ENTITY  navRadio                  "When Navigator starts up, display">
--- a/suite/locales/en-US/chrome/common/pref/pref-offline.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-offline.dtd
@ -1,7 +1,6 @@
 <!-- extracted from content/pref-offline.xul -->

 <!--LOCALIZATION NOTE : FILE The 'Offline' preferences dialog -->
-<!ENTITY title.label "Offline">
 <!ENTITY lHeader "Offline">
 <!ENTITY rHeader "Startup State">
 <!ENTITY descipt1 "Mozilla can start in either online or offline modes. When online you have full 
--- a/suite/locales/en-US/chrome/common/pref/pref-proxies.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-proxies.dtd
@ -1,7 +1,6 @@
 <!-- extracted from content/pref-proxies.xul -->

 <!--LOCALIZATION NOTE : FILE The Proxies preferences dialog -->
-<!ENTITY  title.label                   "Proxies Panel">
 <!ENTITY  lHeader                       "Proxies">
 <!ENTITY  proxyTitle.label              "Configure Proxies to Access the Internet">
 <!ENTITY  networkHeader.label           "A network proxy provides additional security between your computer and the Internet. Proxies can also increase performance between multiple networks, by using caches to reduce traffic.">
--- a/suite/locales/en-US/chrome/common/pref/pref-search.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-search.dtd
@ -1,8 +1,6 @@
 <!-- extracted from content/pref-search.xul -->

 <!-- LOCALIZATION NOTE : FILE The Search prefs dialog -->
-<!-- LOCALIZATION NOTE (title.label): DONT_TRANSLATE -->
-<!ENTITY  title.label                     "Internet Search">

 <!--LOCALIZATION NOTE (lHeader): Translate "Search" according to Netscape glossary -->
 <!ENTITY  lHeader                         "Internet Search">
--- a/suite/locales/en-US/chrome/common/pref/pref-smart_browsing.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-smart_browsing.dtd
@ -1,8 +1,6 @@
 <!-- extracted from content/pref-smart_browsing.xul -->

 <!--LOCALIZATION NOTE : FILE The SmartBrowsing prefs dialog -->
-<!--LOCALIZATION NOTE (title.label): DONT_TRANSLATE -->
-<!ENTITY  title.label                           "Smart Browsing">
 <!ENTITY  lHeader                               "Smart Browsing">

 <!--LOCALIZATION NOTE (lHeader): Translate "What's Related" according to Netscape glossary -->
--- a/suite/locales/en-US/chrome/common/pref/pref-smartupdate.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-smartupdate.dtd
@ -1,5 +1,4 @@
 <!--LOCALIZATION NOTE : FILE UI for Software Updates prefs -->
-<!ENTITY title.label                          "Software Installation">
 <!ENTITY lHeader                              "Software Installation">
 <!ENTITY smartTitle.label                     "Manage Software Installations and Updates">
 <!ENTITY enableSU.label                       "Enable software installation. (You will be prompted for each update.)">