*** empty log message ***

browser/components/prefwindow/content/pref-fonts.js

@@ -212,6 +212,10 @@ function Startup()
     if ( parent.hPrefWindow.getPrefIsLocked( "browser.display.languageList" ) ) {
       disableAllFontElements();
     }
+    getColorFromWellAndSetValue("foregroundtextmenu");
+    getColorFromWellAndSetValue("backgroundmenu");
+    getColorFromWellAndSetValue("unvisitedlinkmenu");
+    getColorFromWellAndSetValue("visitedlinkmenu");
   }
 
 function listElement( aListID )
@@ -666,14 +670,4 @@ function setColorWell(aPicker)
     picker.color = color;
     return color;
   }     
-
-  function Startup()
-  {
-    getColorFromWellAndSetValue("foregroundtextmenu");
-    getColorFromWellAndSetValue("backgroundmenu");
-    getColorFromWellAndSetValue("unvisitedlinkmenu");
-    getColorFromWellAndSetValue("visitedlinkmenu");
-
-    return true;
-  }                   
   

browser/components/prefwindow/content/pref-fonts.xul

@@ -22,16 +22,16 @@
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-fonts.dtd" >
+<!DOCTYPE window SYSTEM "chrome://browser/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://browser/content/pref/pref-fonts.xul');"
       headertitle="&lHeader;">
 
   <stringbundle id="bundle_prefutilities"
                 src="chrome://communicator/locale/pref/prefutilities.properties"/>
   <script type="application/x-javascript" src="chrome://browser/content/pref/pref-colors.js"/>
   <script type="application/x-javascript" 
-          src="chrome://communicator/content/pref/pref-fonts.js"/>
+          src="chrome://browser/content/pref/pref-fonts.js"/>
   <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["selectLangs", "foregroundText", "background", "browserUseSystemColors", "unvisitedLinks", "visitedLinks", "browserUnderlineAnchors", "browserUseDocumentColors"];

browser/components/prefwindow/content/preftree.xul

@@ -47,11 +47,6 @@
         <treecell url="chrome://browser/content/pref/pref-fonts.xul" label="&fonts.label;"/> 
       </treerow>
     </treeitem>
-    <treeitem>
-      <treerow>
-        <treecell url="chrome://browser/content/pref/pref-colors.xul" label="&colors.label;"/> 
-      </treerow>
-    </treeitem>
     <treeitem id="themes-panel">
       <treerow>
         <treecell url="chrome://browser/content/pref/pref-themes.xul" label="&themes.label;"/> 

browser/components/prefwindow/locale/pref-fonts.dtd

@@ -82,3 +82,33 @@
 <!ENTITY  calibrate.instructions                  "The length of the line above is:">
 <!ENTITY  units.inches                            "inches">
 <!ENTITY  units.centimetres                       "centimeters">
+<!-- extracted from content/pref-colors.xul -->
+
+<!-- LOCALIZATION NOTE : FILE Color management prefs -->
+<!ENTITY  lHeader                         "Colors">
+<!ENTITY  color                           "Text and Background">
+<!ENTITY  textColor.label                 "Text:">
+<!ENTITY  textColor.accesskey             "t">
+<!ENTITY  backgroundColor.label           "Background:">
+<!ENTITY  backgroundColor.accesskey       "b">
+<!ENTITY  useSystemColors.label           "Use system colors">
+<!ENTITY  useSystemColors.accesskey       "s">
+
+<!ENTITY  underlineLinks.label            "Underline links">
+<!ENTITY  underlineLinks.accesskey        "u">
+<!ENTITY  links                           "Link Colors">
+<!ENTITY  linkColor.label                 "Unvisited Links:">
+<!ENTITY  linkColor.accesskey             "l">
+<!ENTITY  visitedLinkColor.label          "Visited Links:">
+<!ENTITY  visitedLinkColor.accesskey      "v">
+<!-- LOCALIZATION NOTE (someProvColors): This is the start of a sentence and will be followed by the following radio buttons. -->
+<!ENTITY  someProvColors                  "When a web page provides its own colors and background">
+<!-- LOCALIZATION NOTE (alwaysUseDocColors.label): This is option one, and it appends to 'someProvColors' above. -->
+<!ENTITY  alwaysUseDocumentColors.label   "Always use the colors and background specified by the web page">
+<!ENTITY  alwaysUseDocumentColors.accesskey "a">
+<!-- LOCALIZATION NOTE (ignoreDocColors.label): This is option two, and it appends to 'someProvColors' above.  -->
+<!ENTITY  useMyColors.label               "Use my chosen colors, ignoring the colors and background image specified">
+<!ENTITY  useMyColors.accesskey           "i">
+<!ENTITY  viewsource                      "View Source Window">
+<!ENTITY  syntaxHighlight.label           "Enable syntax highlighting">
+<!ENTITY  syntaxHighlight.accesskey       "e">