From bce1b3b905310800ce379517cd5c3e538ce4a3c0 Mon Sep 17 00:00:00 2001
From: "blakeross%telocity.com" <blakeross%telocity.com>
Date: Wed, 17 May 2006 02:31:51 +0000
Subject: [PATCH] 114258 - pref panel header binding, dialogoverlay.css
 shouldn't have to be included in each panel. r=ben sr=hewitt

114268 - unnecessarily setting localname attribute on all pref-based elements when loading pref panels. r=ben sr=hewitt
---
 suite/common/pref/nsPrefWindow.js         | 11 +++---
 suite/common/pref/pref-advanced.xul       |  6 ++--
 suite/common/pref/pref-appearance.xul     |  6 ++--
 suite/common/pref/pref-applications.xul   |  6 ++--
 suite/common/pref/pref-cache.xul          |  6 ++--
 suite/common/pref/pref-colors.xul         |  6 ++--
 suite/common/pref/pref-debug.xul          |  6 ++--
 suite/common/pref/pref-debug1.xul         |  8 ++---
 suite/common/pref/pref-debug2.xul         |  8 ++---
 suite/common/pref/pref-fonts.xul          |  8 ++---
 suite/common/pref/pref-history.xul        |  8 ++---
 suite/common/pref/pref-languages.xul      |  9 ++---
 suite/common/pref/pref-mousewheel.xul     |  9 ++---
 suite/common/pref/pref-navigator.xul      |  6 ++--
 suite/common/pref/pref-offline.xul        |  6 ++--
 suite/common/pref/pref-policies.xul       |  7 ++--
 suite/common/pref/pref-proxies.xul        |  6 ++--
 suite/common/pref/pref-search.xul         |  6 ++--
 suite/common/pref/pref-security.xul       |  5 ++-
 suite/common/pref/pref-smart_browsing.xul |  6 ++--
 suite/common/pref/pref-smartupdate.xul    |  9 ++---
 suite/common/pref/pref-tabs.xul           | 39 +++++++--------------
 suite/common/pref/pref-themes.js          | 42 ++++++++---------------
 suite/common/pref/pref-themes.xul         | 11 +++---
 suite/common/pref/pref-winhooks.xul       |  6 ++--
 suite/common/pref/pref.xul                | 12 ++++---
 26 files changed, 93 insertions(+), 165 deletions(-)

diff --git a/suite/common/pref/nsPrefWindow.js b/suite/common/pref/nsPrefWindow.js
index 3862673c62cb..546338667b92 100644
--- a/suite/common/pref/nsPrefWindow.js
+++ b/suite/common/pref/nsPrefWindow.js
@@ -45,7 +45,7 @@ function nsPrefWindow( frame_id )
 
   this.contentFrame   = frame_id
   this.wsm            = new nsWidgetStateManager( frame_id );
-  this.wsm.attributes = ["preftype", "prefstring", "prefattribute", "disabled", "localname"];
+  this.wsm.attributes = ["preftype", "prefstring", "prefattribute", "disabled"];
   this.pref           = null;
   
   this.cancelHandlers = [];
@@ -193,9 +193,9 @@ nsPrefWindow.prototype =
                   {
                 for( var elementID in pageData )
                   {
+                    if (elementID == "initialized") continue;
                     var itemObject = pageData[elementID];
-                    if (typeof(itemObject) != "object") break;
-                    if ( "prefstring" in itemObject && itemObject.prefstring  )
+                    if ( "prefstring" in itemObject && itemObject.prefstring )
                       {
                         var elt = itemObject.localname;
                         var prefattribute = itemObject.prefattribute;
@@ -283,6 +283,9 @@ nsPrefWindow.prototype =
       onpageload: 
         function ( aPageTag )
           {
+            var header = document.getElementById("header");
+            header.setAttribute("title",
+                                window.frames[this.contentFrame].document.documentElement.getAttribute("headertitle"));
             if( !(aPageTag in this.wsm.dataManager.pageData) )
               {
                 var prefElements = window.frames[this.contentFrame].document.getElementsByAttribute( "prefstring", "*" );
@@ -335,7 +338,7 @@ nsPrefWindow.prototype =
                     root[prefattribute] = prefvalue;              
                     var isPrefLocked = this.getPrefIsLocked(prefstring);
                     if (isPrefLocked)
-                      root.disabled="true";
+                      root.disabled = "true";
                     root.localname = prefElements[i].localName;
                   }
               }      
diff --git a/suite/common/pref/pref-advanced.xul b/suite/common/pref/pref-advanced.xul
index 19db5a4c483e..997e477aa73b 100644
--- a/suite/common/pref/pref-advanced.xul
+++ b/suite/common/pref/pref-advanced.xul
@@ -20,12 +20,12 @@
    Contributor(s): 
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-advanced.dtd" >
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://communicator/content/pref/pref-advanced.xul');">
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-advanced.xul');"
+      headertitle="&lHeader;">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -129,8 +129,6 @@
   ]]>
   </script>
 
-  <hbox class="box-smallheader" title="&lHeader;"/>
-
   <groupbox id="advancedSettings" align="start">
     <caption label="&advancedTitle.label;"/>
     <vbox align="start" id="contentEnablingBox">
diff --git a/suite/common/pref/pref-appearance.xul b/suite/common/pref/pref-appearance.xul
index 1b1fbcf8c444..6ccb8c65b96f 100644
--- a/suite/common/pref/pref-appearance.xul
+++ b/suite/common/pref/pref-appearance.xul
@@ -23,7 +23,6 @@
   -->
 
 <?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" >
@@ -32,7 +31,8 @@
 %prefAppearanceDTD;
 ]>
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel(panel);">
+      onload="parent.initPanel(panel);"
+      headertitle="&lHeader;">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -75,8 +75,6 @@
   ]]>
   </script>
           
-  <hbox class="box-smallheader" title="&lHeader;"/>
-
   <groupbox id="generalStartupPreferences" align="start">
     <caption label="&onStartLegend.label;"/>
     <!-- XXX remove when navigator overlays.rdf works -->
diff --git a/suite/common/pref/pref-applications.xul b/suite/common/pref/pref-applications.xul
index 3cefdfe93fdf..cedd403a58f6 100644
--- a/suite/common/pref/pref-applications.xul
+++ b/suite/common/pref/pref-applications.xul
@@ -23,21 +23,19 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-applications.dtd" >
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-      onload="parent.initPanel('chrome://communicator/content/pref/pref-applications.xul');">
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-applications.xul');"
+      headertitle="&lHeader;">
 
   <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"/>
         
-  <hbox class="box-smallheader" title="&lHeader;"/>
-
   <groupbox flex="1">
     <caption label="&descript;"/>
     <label value="&fileTypes.label;"/>
diff --git a/suite/common/pref/pref-cache.xul b/suite/common/pref/pref-cache.xul
index dafaf6d0db12..bbd461f722e7 100644
--- a/suite/common/pref/pref-cache.xul
+++ b/suite/common/pref/pref-cache.xul
@@ -21,11 +21,11 @@
    Contributor(s): 
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-cache.dtd" >
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://communicator/content/pref/pref-cache.xul');">
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-cache.xul');"
+      headertitle="&lHeader;">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -37,8 +37,6 @@
                 src="chrome://communicator/locale/pref/prefutilities.properties"/>
   <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-cache.js"/>
 
-  <hbox class="box-smallheader" title="&lHeader;"/>
-
   <groupbox>
     <caption label="&cacheTitle.label;"/>
     
diff --git a/suite/common/pref/pref-colors.xul b/suite/common/pref/pref-colors.xul
index d68f9fa0ed80..e49e2f971a7d 100644
--- a/suite/common/pref/pref-colors.xul
+++ b/suite/common/pref/pref-colors.xul
@@ -23,13 +23,13 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?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" >
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://communicator/content/pref/pref-colors.xul');">
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-colors.xul');"
+      headertitle="&lHeader;">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -39,8 +39,6 @@
   
   <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-colors.js"/>
 
-  <hbox class="box-smallheader" title="&lHeader;"/>
-
   <hbox>
     <groupbox flex="1" id="pageColours">
       <caption label="&color;"/>
diff --git a/suite/common/pref/pref-debug.xul b/suite/common/pref/pref-debug.xul
index f6bfd6523015..fcc7f23cb79d 100644
--- a/suite/common/pref/pref-debug.xul
+++ b/suite/common/pref/pref-debug.xul
@@ -21,12 +21,12 @@
    Contributor(s): 
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-debug.dtd" >
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://communicator/content/pref/pref-debug.xul');">
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-debug.xul');"
+      headertitle="&lHeader;">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -38,8 +38,6 @@
   ]]>
   </script>
         
-  <hbox class="box-smallheader" title="&lHeader;"/>
-  
   <groupbox align="start">
     <caption label="&widgetRendering.label;"/>
     <checkbox id="nglayoutDebugWindow" label="&debugWindow.label;"
diff --git a/suite/common/pref/pref-debug1.xul b/suite/common/pref/pref-debug1.xul
index 7582136b0820..1e7b12fae490 100644
--- a/suite/common/pref/pref-debug1.xul
+++ b/suite/common/pref/pref-debug1.xul
@@ -21,12 +21,12 @@
    Contributor(s): 
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-debug1.dtd" >
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://communicator/content/pref/pref-debug1.xul');">
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-debug1.xul');"
+      headertitle="&lHeader;">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -37,9 +37,7 @@
                        "layoutReflowDumpFrameByFrameCounts" ];
   ]]>
   </script>
-        
-  <hbox class="box-smallheader" title="&lHeader;"/>
-  
+
   <!-- nothing on this page has accesskeys because this is a temporary debug
        panel and you can damn well click the widgets! -->
 
diff --git a/suite/common/pref/pref-debug2.xul b/suite/common/pref/pref-debug2.xul
index fca0b716c537..bab54a390895 100644
--- a/suite/common/pref/pref-debug2.xul
+++ b/suite/common/pref/pref-debug2.xul
@@ -21,12 +21,12 @@
    Contributor(s): 
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-debug2.dtd" >
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://communicator/content/pref/pref-debug2.xul');">
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-debug2.xul');"
+      headertitle="&lHeader;">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -35,9 +35,7 @@
                        "nglayoutDebugDisableXULCache", "browserEnableCache", "browserEnableDiskCache", ];
   ]]>
   </script>
-        
-  <hbox class="box-smallheader" title="&lHeader;"/>
-  
+
   <!-- nothing on this page has accesskeys because this is a temporary debug
        panel and you can damn well click the widgets! -->
 
diff --git a/suite/common/pref/pref-fonts.xul b/suite/common/pref/pref-fonts.xul
index c34474319887..c8d389be4e1c 100644
--- a/suite/common/pref/pref-fonts.xul
+++ b/suite/common/pref/pref-fonts.xul
@@ -21,11 +21,11 @@
    Contributor(s): 
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-fonts.dtd" >
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://communicator/content/pref/pref-fonts.xul');">
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-fonts.xul');"
+      headertitle="&lHeader;">
 
   <stringbundle id="bundle_prefutilities"
                 src="chrome://communicator/locale/pref/prefutilities.properties"/>
@@ -36,9 +36,7 @@
     var _elementIDs = ["selectLangs"];
   ]]>
   </script>
-
-  <hbox class="box-smallheader" title="&lHeader;"/>
-  
+ 
   <groupbox>
     <caption>
       <label value="&language.label;" 
diff --git a/suite/common/pref/pref-history.xul b/suite/common/pref/pref-history.xul
index cdb04b6b3cfd..ae0e539eff90 100644
--- a/suite/common/pref/pref-history.xul
+++ b/suite/common/pref/pref-history.xul
@@ -23,12 +23,12 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-history.dtd" >
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://communicator/content/pref/pref-history.xul');">
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-history.xul');"
+      headertitle="&lHeader;">
 
   <script type="application/x-javascript">
 
@@ -97,9 +97,7 @@
   }
   ]]>
   </script>
-
-  <hbox class="box-smallheader" title="&lHeader;"/>
-  
+ 
   <groupbox>
     <caption label="&header3.label;"/>
     <description>&historyPages.label;</description>
diff --git a/suite/common/pref/pref-languages.xul b/suite/common/pref/pref-languages.xul
index c1d3d695f61a..bf23e148dc7b 100644
--- a/suite/common/pref/pref-languages.xul
+++ b/suite/common/pref/pref-languages.xul
@@ -19,12 +19,12 @@
 -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-languages.dtd" >
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="Init();">
+      onload="Init();"
+      headertitle="&languages.customize.lHeader;">
 
   <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-languages.js"/>
   <!-- XXX: Replace strres.js when pref-languages.js is converted -->
@@ -43,11 +43,6 @@
                 prefstring="intl.accept_languages"/>
 
                 
-    <hbox class="box-smallheader" title="&languages.customize.lHeader;"/>
-    <!--
-      description="&languages.customize.rHeader;    
-    -->
-
   <groupbox flex="1">
     <caption label="&langtitle.label;"/>
 
diff --git a/suite/common/pref/pref-mousewheel.xul b/suite/common/pref/pref-mousewheel.xul
index e1b906c9c6b3..bd32e035fbb9 100644
--- a/suite/common/pref/pref-mousewheel.xul
+++ b/suite/common/pref/pref-mousewheel.xul
@@ -23,9 +23,7 @@
   sspitzer@netscape.com
   -->
 
-<?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/" type="text/css"?> 
 
 <!DOCTYPE window [
 <!ENTITY % platformDTD SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd" >
@@ -35,7 +33,8 @@
 ]>
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://communicator/content/pref/pref-mousewheel.xul');">
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-mousewheel.xul');"
+      headertitle="&title.label;">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -82,8 +81,6 @@
   ]]>
   </script>
 
-  <hbox class="box-smallheader" title="&title.label;"/>
-
     <hbox align="center">
       <label value="&mouseWheelPanel.label;" accesskey="&mouseWheelPanel.accesskey;" 
              control="mouseWheelMode"/>
diff --git a/suite/common/pref/pref-navigator.xul b/suite/common/pref/pref-navigator.xul
index 0bb44abe0a0e..b7b02dc2e15c 100644
--- a/suite/common/pref/pref-navigator.xul
+++ b/suite/common/pref/pref-navigator.xul
@@ -22,13 +22,13 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?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" >
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://communicator/content/pref/pref-navigator.xul');">
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-navigator.xul');"
+      headertitle="&lHeader;">
 
   <stringbundle id="bundle_prefutilities" src="chrome://communicator/locale/pref/prefutilities.properties"/>
   <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-navigator.js"/>
@@ -42,8 +42,6 @@
   ]]>
   </script>
   
-  <hbox class="box-smallheader" title="&lHeader;"/>
-
   <!-- navigator starts with -->  
   <groupbox>
     <caption label="&navRadio;"/>
diff --git a/suite/common/pref/pref-offline.xul b/suite/common/pref/pref-offline.xul
index 8b8dfb593ff6..45e9b34b8593 100644
--- a/suite/common/pref/pref-offline.xul
+++ b/suite/common/pref/pref-offline.xul
@@ -23,7 +23,6 @@
  
   -->
 <?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" >
@@ -33,7 +32,8 @@
 ]>
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://communicator/content/pref/pref-offline.xul');">
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-offline.xul');"
+      headertitle="&boxHeader;">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -57,8 +57,6 @@
 
   </script>
 
-<hbox class="box-smallheader" id="OfflineHeader" title="&boxHeader;"/>
-
 <groupbox>
     <caption label="&rHeader;"/>
 
diff --git a/suite/common/pref/pref-policies.xul b/suite/common/pref/pref-policies.xul
index f0b28cfe1228..01de1b6d42fc 100644
--- a/suite/common/pref/pref-policies.xul
+++ b/suite/common/pref/pref-policies.xul
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <?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" >
@@ -10,7 +9,8 @@
 ]>
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://communicator/content/pref/pref-policies.xul');">
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-policies.xul');"
+      headertitle="&lHeader;">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -19,9 +19,6 @@
   ]]>  
   </script>
 
-
-  <hbox class="box-smallheader" title="&lHeader;"/>
-
   <groupbox>
   
     <description>&zoneIntro.label;</description>
diff --git a/suite/common/pref/pref-proxies.xul b/suite/common/pref/pref-proxies.xul
index 0ac0e68e05a6..6d4b52be5525 100644
--- a/suite/common/pref/pref-proxies.xul
+++ b/suite/common/pref/pref-proxies.xul
@@ -24,11 +24,11 @@
        -Added a syntax example for the "no proxy" field.
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-proxies.dtd" >
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://communicator/content/pref/pref-proxies.xul');">
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-proxies.xul');"
+      headertitle="&lHeader;">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -47,8 +47,6 @@
                 src="chrome://pref/locale/prefutilities.properties"/>
   <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-proxies.js"/>
   
-  <hbox class="box-smallheader" title="&lHeader;"/>
-
   <groupbox flex="1">
     <caption label="&proxyTitle.label;"/>
 
diff --git a/suite/common/pref/pref-search.xul b/suite/common/pref/pref-search.xul
index af6d62c96671..e59974f4cc30 100755
--- a/suite/common/pref/pref-search.xul
+++ b/suite/common/pref/pref-search.xul
@@ -21,11 +21,11 @@
    Contributor(s): Robert John Churchill (rjc@netscape.com)
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-search.dtd" >
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://communicator/content/pref/pref-search.xul');checkEngine()">
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-search.xul');checkEngine()"
+      headertitle="&lHeader;">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -34,8 +34,6 @@
   </script> 
   <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-search.js"/>      
         
-  <hbox class="box-smallheader" title="&lHeader;"/>
-
   <groupbox>
     <caption label="&legendHeader;"/>
 
diff --git a/suite/common/pref/pref-security.xul b/suite/common/pref/pref-security.xul
index a5830b94e625..8b8310041d95 100644
--- a/suite/common/pref/pref-security.xul
+++ b/suite/common/pref/pref-security.xul
@@ -21,11 +21,11 @@
    -  Terry Hayes <thayes@netscape.com>
    -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-security.dtd" >
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://communicator/content/pref/pref-security.xul');">
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-security.xul');"
+      headertitle="&lHeader;">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -33,7 +33,6 @@
   ]]>
   </script>
   
-  <hbox class="box-smallheader" title="&lHeader;" />
   <description> &rContent1;</description>
   <description> &rContent2;</description>
   <!-- Overlays add UI here -->
diff --git a/suite/common/pref/pref-smart_browsing.xul b/suite/common/pref/pref-smart_browsing.xul
index b65f7fd63b96..75be9e5cd687 100644
--- a/suite/common/pref/pref-smart_browsing.xul
+++ b/suite/common/pref/pref-smart_browsing.xul
@@ -24,7 +24,6 @@
   -->
 
 <?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"?>
 
 <!DOCTYPE window [
@@ -35,7 +34,8 @@
 ]>
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://communicator/content/pref/pref-smart_browsing.xul');">
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-smart_browsing.xul');"
+      headertitle="&lHeader;">
 
   <stringbundle id="bundle_region"
                 src="chrome://global-region/locale/region.properties"/>
@@ -52,8 +52,6 @@
   ]]>
   </script>
         
-  <hbox class="box-smallheader" title="&lHeader;"/>
-
   <groupbox flex="1">
     <caption label="&whatsRelated.label;"/>
 
diff --git a/suite/common/pref/pref-smartupdate.xul b/suite/common/pref/pref-smartupdate.xul
index 65204d9cbf1a..598529cd0067 100644
--- a/suite/common/pref/pref-smartupdate.xul
+++ b/suite/common/pref/pref-smartupdate.xul
@@ -1,21 +1,18 @@
 <?xml version="1.0"?> 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-smartupdate.dtd" >
  
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://communicator/content/pref/pref-smartupdate.xul');">
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-smartupdate.xul');"
+      headertitle="&lHeader;">
   
   <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["XPInstallEnabled"];
   ]]>
   </script>
-        
-        
-  <hbox class="box-smallheader" title="&lHeader;"/>
-    
+   
   <groupbox align="start">
     <caption label="&smartTitle.label;"/>
     <checkbox id="XPInstallEnabled" label="&enableSU.label;" accesskey="&enableSU.accesskey;"
diff --git a/suite/common/pref/pref-tabs.xul b/suite/common/pref/pref-tabs.xul
index d50d7d03c029..990dbf11a074 100644
--- a/suite/common/pref/pref-tabs.xul
+++ b/suite/common/pref/pref-tabs.xul
@@ -22,19 +22,12 @@
   -->
 
 <?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/globalOverlay.xul"?>
-<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-tabs.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"
-        onload="parent.initPanel('chrome://communicator/content/pref/pref-tabs.xul');">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-tabs.xul');"
+      headertitle="&tabHeader.label;">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -42,41 +35,33 @@
   ]]>
   </script>
   
-  <hbox class="box-smallheader" title="&tabHeader.label;"/>
-
-  <groupbox id="generalTabPreferences" orient="vertical" align="start">
+  <groupbox id="generalTabPreferences" align="start">
     <caption label="&tabDisplay.label;"/>
     <checkbox id="tabStrip"
               label="&autoHide.label;" 
-              pref="true" preftype="bool" prefstring="browser.tabs.autoHide"
-              prefattribute="checked"/>
+              prefstring="browser.tabs.autoHide"/>
     <checkbox id="tabBackground"
               label="&background.label;" 
-              pref="true" preftype="bool" prefstring="browser.tabs.loadInBackground"
-              prefattribute="checked"/>
+              prefstring="browser.tabs.loadInBackground"/>
   </groupbox>
 
-  <groupbox id="useTabPreferences" orient="vertical" align="start">
+  <groupbox id="useTabPreferences" align="start">
     <caption label="&openTabs.label;"/>
       <checkbox id="middleClick"
                 label="&middleClick.label;" 
-                pref="true" preftype="bool" prefstring="browser.tabs.opentabfor.middleclick"
-                prefattribute="checked"/>
+                prefstring="browser.tabs.opentabfor.middleclick"/>
 
       <checkbox id="windowOpen"
                 label="&windowOpen.label;" 
-                pref="true" preftype="bool" prefstring="browser.tabs.opentabfor.windowopen"
-                prefattribute="checked"/>
+                prefstring="browser.tabs.opentabfor.windowopen"/>
 
       <checkbox id="bookmarkClick"
                 label="&bookmarks.label;" 
-                pref="true" preftype="bool" prefstring="browser.tabs.opentabfor.bookmarks"
-                prefattribute="checked"/>
+                prefstring="browser.tabs.opentabfor.bookmarks"/>
 
       <checkbox id="urlBar"
                 label="&urlbar.label;" 
-                pref="true" preftype="bool" prefstring="browser.tabs.opentabfor.urlbar"
-                prefattribute="checked"/>
+                prefstring="browser.tabs.opentabfor.urlbar"/>
   </groupbox>
 
-</window>
+</page>
diff --git a/suite/common/pref/pref-themes.js b/suite/common/pref/pref-themes.js
index da43d87fa7c0..8bc16b11863d 100644
--- a/suite/common/pref/pref-themes.js
+++ b/suite/common/pref/pref-themes.js
@@ -2,8 +2,6 @@
 // Theme Selector
 // ( 05/09/2000, Ben Goodger <ben@netscape.com> )
 
-var gPrefutilitiesBundle;
-var gBrandBundle;
 var gShowDescription = true;
 
 const DEBUG_USE_PROFILE = true;
@@ -22,19 +20,12 @@ const kPrefSvc = Components.classes[kPrefSvcContractID].getService(kPrefSvcIID);
 
 function Startup()
 {
-  gPrefutilitiesBundle = document.getElementById("bundle_prefutilities");
-  gBrandBundle = document.getElementById("bundle_brand");
-
   var tree = document.getElementById( "skinsTree" );
   var theSkinKids = document.getElementById("theSkinKids");
   if (theSkinKids.hasChildNodes() && theSkinKids.firstChild)
     tree.selectItem(theSkinKids.firstChild);
-  try {
-    var strbundle = srGetStrBundle("chrome://navigator/locale/navigator.properties");
-  }
-  catch(e) {
-  }
-  var showSkinsDescription = strbundle.GetStringFromName("showskinsdescription");
+  var navbundle = document.getElementById("bundle_navigator");
+  var showSkinsDescription = navbundle.getString("showskinsdescription");
   if( showSkinsDescription == "false" )
   {
     gShowDescription = false;
@@ -57,18 +48,12 @@ function applySkin()
   observerService.notifyObservers(null, "skin-selected", null);
 
   var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService(Components.interfaces.nsIPromptService);
-  try {
-    var strbundle = srGetStrBundle("chrome://navigator/locale/navigator.properties");
-    var brandbundle = srGetStrBundle("chrome://global/locale/brand.properties");
-  }
-  catch(e) {
-    return;
-  }
-  
   if (promptService) {
-    var dialogTitle = strbundle.GetStringFromName("switchskinstitle");
-    var brandName = brandbundle.GetStringFromName("brandShortName");
-    var msg = strbundle.formatStringFromName("switchskins",
+    var navbundle = document.getElementById("bundle_navigator");
+    var brandbundle = document.getElementById("bundle_brand");
+    var dialogTitle = navbundle.getString("switchskinstitle");
+    var brandName = brandbundle.getString("brandShortName");
+    var msg = navbundle.formatStringFromName("switchskins",
                                              [brandName],
                                              1);
     promptService.alert(window, dialogTitle, msg);
@@ -94,6 +79,8 @@ function themeSelect()
   if (!tree)
     return;
 
+  var prefbundle = document.getElementById("bundle_prefutilities");
+
   var selectedItem = tree.selectedItems.length ? tree.selectedItems[0] : null;
   var applyButton = document.getElementById("applySkin");
   if (selectedItem && selectedItem.getAttribute("skin") == "true") {
@@ -115,8 +102,8 @@ function themeSelect()
     var descText = document.createTextNode(selectedItem.getAttribute("description"));
     var description = document.getElementById("description");
     var uninstallButton = document.getElementById("uninstallSkin");
-    var applyLabel = gPrefutilitiesBundle.getString("applyThemePrefix");
-    var uninstallLabel = gPrefutilitiesBundle.getString("uninstallThemePrefix");
+    var applyLabel = prefbundle.getString("applyThemePrefix");
+    var uninstallLabel = prefbundle.getString("uninstallThemePrefix");
 
     while (description.hasChildNodes())
       description.removeChild(description.firstChild);
@@ -146,7 +133,8 @@ function themeSelect()
       uninstallButton.label = uninstallLabel;
     }
     else {
-      applyLabel = gPrefutilitiesBundle.getString("applyThemePrefix");
+      var brandbundle = document.getElementById("bundle_brand");
+      applyLabel = prefbundle.getString("applyThemePrefix");
       applyLabel = applyLabel.replace(/%theme_name%/, themeName);
       applyButton.label = applyLabel;
       applyButton.disabled = selectedSkin == skinName;
@@ -157,10 +145,10 @@ function themeSelect()
       applyButton.setAttribute("disabled", true);
       uninstallButton.disabled = selectedSkin == skinName;
 
-      var newText = gPrefutilitiesBundle.getString("oldTheme");
+      var newText = prefbundle.getString("oldTheme");
       newText = newText.replace(/%theme_name%/, themeName);
       
-      newText = newText.replace(/%brand%/g, gBrandBundle.getString("brandShortName"));
+      newText = newText.replace(/%brand%/g, brandbundle.getString("brandShortName"));
 
       if( gShowDescription )  {
         descText = document.createTextNode(newText);
diff --git a/suite/common/pref/pref-themes.xul b/suite/common/pref/pref-themes.xul
index cfdc5b7df630..2d73e57a443e 100644
--- a/suite/common/pref/pref-themes.xul
+++ b/suite/common/pref/pref-themes.xul
@@ -22,26 +22,23 @@
   -->
 
 <?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/globalOverlay.xul"?>
-<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
-
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-themes.dtd" >
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="Startup()">
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-themes.xul'); Startup()"
+      headertitle="&lHeader;">
 
   <stringbundle id="bundle_prefutilities"
                 src="chrome://communicator/locale/pref/prefutilities.properties"/>
   <stringbundle id="bundle_brand"
                 src="chrome://global/locale/brand.properties"/>
+  <stringbundle id="bundle_navigator"
+                src="chrome://navigator/locale/navigator.properties"/>
 
   <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-themes.js"/>
         
-  <hbox class="box-smallheader" title="&lHeader;"/>
-
   <description>&skinIntro.label;</description>
   
   <description>&installedThemes.label;</description>
diff --git a/suite/common/pref/pref-winhooks.xul b/suite/common/pref/pref-winhooks.xul
index 643b9531ec5d..7b6e9a1b85d0 100644
--- a/suite/common/pref/pref-winhooks.xul
+++ b/suite/common/pref/pref-winhooks.xul
@@ -23,7 +23,6 @@
   -->
 
 <?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" >
@@ -35,11 +34,10 @@
 ]>
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://communicator/content/pref/pref-winhooks.xul');">
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-winhooks.xul');"
+      headertitle="&title.label;">
 
     <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-winhooks.js"/>
-    
-    <hbox class="box-smallheader" title="&title.label;"/>
 
     <!-- File types -->
     <label value="&files.text;"/>
diff --git a/suite/common/pref/pref.xul b/suite/common/pref/pref.xul
index b78b556d5e77..6d556841c81d 100644
--- a/suite/common/pref/pref.xul
+++ b/suite/common/pref/pref.xul
@@ -1,5 +1,6 @@
 <?xml version="1.0"?> 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> 
+<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
 
 <?xul-overlay href="chrome://communicator/content/pref/preftree.xul"?>
 
@@ -53,14 +54,15 @@
   <script type="application/x-javascript" src="chrome://help/content/help.js"/>
 
   <hbox flex="1">
-    <vbox flex="19">
+    <vbox>
       <label value="&categoryHeader;"/>
       <!-- tree sidebar -->
-      <tree id="prefsTree" style="width: 0px" flex="1"/>
+      <tree id="prefsTree" style="width: 14em !important;" flex="1"/>
     </vbox>
-
-    <iframe id="panelFrame" name="panelFrame" style="width:0px" flex="81"/>
-
+    <vbox flex="1">
+      <hbox id="header" class="box-smallheader"/>
+      <iframe id="panelFrame" name="panelFrame" style="width:0px" flex="1"/>
+   </vbox>
   </hbox>
 
    <script type="application/x-javascript">