From e98a7f1ed8a2746f8f7f1c28e96695b3b21af656 Mon Sep 17 00:00:00 2001
From: "blakeross%telocity.com" <blakeross%telocity.com>
Date: Tue, 6 Aug 2002 03:17:24 +0000
Subject: [PATCH] *** empty log message ***

---
 .../prefwindow/content/pref-colors.js         | 40 --------
 .../prefwindow/content/pref-colors.xul        | 96 -------------------
 .../prefwindow/content/pref-fonts.js          | 40 ++++++++
 .../prefwindow/content/pref-fonts.xul         | 58 ++++++++++-
 browser/components/prefwindow/jar.mn          |  3 -
 5 files changed, 97 insertions(+), 140 deletions(-)
 delete mode 100644 browser/components/prefwindow/content/pref-colors.js
 delete mode 100644 browser/components/prefwindow/content/pref-colors.xul

diff --git a/browser/components/prefwindow/content/pref-colors.js b/browser/components/prefwindow/content/pref-colors.js
deleted file mode 100644
index e80e658c3bde..000000000000
--- a/browser/components/prefwindow/content/pref-colors.js
+++ /dev/null
@@ -1,40 +0,0 @@
-function setColorWell(aPicker)
-{
-  var colorRef = aPicker.nextSibling;                // colour value is held here
-  colorRef.setAttribute( "value", aPicker.color );
-}
-
-  function setColorWellSr(menu,otherId,setbackground)
-  {
-    // Find the colorWell and colorPicker in the hierarchy.
-    var colorWell = menu.firstChild;
-    var colorPicker = menu.firstChild.nextSibling.nextSibling.firstChild;
-    var colorRef = menu.nextSibling;                // colour value is held here
-  
-    // Extract color from colorPicker and assign to colorWell.
-    var color = colorPicker.getAttribute('color');
-    // set colour values in the display 
-    setColorFromPicker( colorWell, color );
-    // set the colour value internally for use in prefwindow
-    colorRef.setAttribute( "value", color );
-  }
-
-  function getColorFromWellAndSetValue(aPickerId)
-  {
-    var picker = document.getElementById(aPickerId);
-    var colorRef  = picker.nextSibling;
-    var color = colorRef.getAttribute("value");
-    picker.color = color;
-    return color;
-  }     
-
-  function Startup()
-  {
-    getColorFromWellAndSetValue("foregroundtextmenu");
-    getColorFromWellAndSetValue("backgroundmenu");
-    getColorFromWellAndSetValue("unvisitedlinkmenu");
-    getColorFromWellAndSetValue("visitedlinkmenu");
-
-    return true;
-  }                   
-  
diff --git a/browser/components/prefwindow/content/pref-colors.xul b/browser/components/prefwindow/content/pref-colors.xul
deleted file mode 100644
index f062c2b02424..000000000000
--- a/browser/components/prefwindow/content/pref-colors.xul
+++ /dev/null
@@ -1,96 +0,0 @@
-<?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/
-    
-   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 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): 
-     Ben Goodger <ben@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://browser/content/pref/platformPrefOverlay.xul"?>
-
-<!DOCTYPE window SYSTEM "chrome://browser/locale/pref/pref-colors.dtd" >
-
-<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://browser/content/pref/pref-colors.xul');"
-      headertitle="&lHeader;">
-
-  <script type="application/x-javascript">
-  <![CDATA[
-    var _elementIDs = ["foregroundText", "background", "browserUseSystemColors", "unvisitedLinks", "visitedLinks", "browserUnderlineAnchors", "browserUseDocumentColors"];
-  ]]>
-  </script>
-  
-  <script type="application/x-javascript" src="chrome://browser/content/pref/pref-colors.js"/>
-
-  <hbox>
-    <groupbox flex="1" id="pageColours">
-      <caption label="&color;"/>
-      <hbox align="center">
-        <label value="&textColor.label;" accesskey="&textColor.accesskey;" control="foregroundtextmenu"/>
-        <spacer flex="1"/>
-        <colorpicker type="button" id="foregroundtextmenu" palettename="standard" onchange="setColorWell(this)"/> 
-        <data id="foregroundText" preftype="color" prefstring="browser.display.foreground_color" prefattribute="value" wsm_attributes="value"/>
-      </hbox>
-      <hbox align="center" style="margin-top: 5px">
-        <label value="&backgroundColor.label;" accesskey="&backgroundColor.accesskey;" control="backgroundmenu"/>
-        <spacer flex="1"/>
-        <colorpicker type="button" id="backgroundmenu" palettename="standard" onchange="setColorWell(this)"/> 
-        <data id="background" preftype="color" prefstring="browser.display.background_color" prefattribute="value" wsm_attributes="value"/>
-      </hbox>
-      <separator class="thin"/>
-      <hbox align="center">
-        <checkbox id="browserUseSystemColors" label="&useSystemColors.label;" accesskey="&useSystemColors.accesskey;"
-                  prefstring="browser.display.use_system_colors"/>
-      </hbox>
-    </groupbox>
-      
-    <groupbox flex="1">
-      <caption label="&links;"/>
-      <hbox align="center">
-        <label value="&linkColor.label;" accesskey="&linkColor.accesskey;" control="unvisitedlinkmenu"/>
-        <spacer flex="1"/>
-        <colorpicker type="button" id="unvisitedlinkmenu" palettename="standard" onchange="setColorWell(this)"/> 
-        <data id="unvisitedLinks" preftype="string" prefstring="browser.anchor_color" prefattribute="value" wsm_attributes="value"/>
-      </hbox>
-      <hbox align="center" style="margin-top: 5px">
-        <label value="&visitedLinkColor.label;" accesskey="&visitedLinkColor.accesskey;" control="visitedlinkmenu"/>
-        <spacer flex="1"/>
-        <colorpicker type="button" id="visitedlinkmenu" palettename="standard" onchange="setColorWell(this)"/> 
-        <data id="visitedLinks" preftype="string" prefstring="browser.visited_color" prefattribute="value" wsm_attributes="value"/>
-      </hbox>
-      <separator class="thin"/>
-      <hbox align="center">
-        <checkbox id="browserUnderlineAnchors" label="&underlineLinks.label;" accesskey="&underlineLinks.accesskey;"
-                  prefstring="browser.underline_anchors"/>
-      </hbox>
-    </groupbox>
-  </hbox>
-  
-  <groupbox>
-    <caption label="&someProvColors;"/>
-  
-    <radiogroup id="browserUseDocumentColors"
-                preftype="bool" prefstring="browser.display.use_document_colors">
-      <radio value="true" label="&alwaysUseDocumentColors.label;" accesskey="&alwaysUseDocumentColors.accesskey;"/>
-      <radio value="false" label="&useMyColors.label;" accesskey="&useMyColors.accesskey;"/>        
-    </radiogroup>
-    
-  </groupbox>
-</page>
diff --git a/browser/components/prefwindow/content/pref-fonts.js b/browser/components/prefwindow/content/pref-fonts.js
index b1f6033e4c15..0b0209fa8d07 100644
--- a/browser/components/prefwindow/content/pref-fonts.js
+++ b/browser/components/prefwindow/content/pref-fonts.js
@@ -637,3 +637,43 @@ function disableAllFontElements()
       }
   }
 
+function setColorWell(aPicker)
+{
+  var colorRef = aPicker.nextSibling;                // colour value is held here
+  colorRef.setAttribute( "value", aPicker.color );
+}
+
+  function setColorWellSr(menu,otherId,setbackground)
+  {
+    // Find the colorWell and colorPicker in the hierarchy.
+    var colorWell = menu.firstChild;
+    var colorPicker = menu.firstChild.nextSibling.nextSibling.firstChild;
+    var colorRef = menu.nextSibling;                // colour value is held here
+  
+    // Extract color from colorPicker and assign to colorWell.
+    var color = colorPicker.getAttribute('color');
+    // set colour values in the display 
+    setColorFromPicker( colorWell, color );
+    // set the colour value internally for use in prefwindow
+    colorRef.setAttribute( "value", color );
+  }
+
+  function getColorFromWellAndSetValue(aPickerId)
+  {
+    var picker = document.getElementById(aPickerId);
+    var colorRef  = picker.nextSibling;
+    var color = colorRef.getAttribute("value");
+    picker.color = color;
+    return color;
+  }     
+
+  function Startup()
+  {
+    getColorFromWellAndSetValue("foregroundtextmenu");
+    getColorFromWellAndSetValue("backgroundmenu");
+    getColorFromWellAndSetValue("unvisitedlinkmenu");
+    getColorFromWellAndSetValue("visitedlinkmenu");
+
+    return true;
+  }                   
+  
diff --git a/browser/components/prefwindow/content/pref-fonts.xul b/browser/components/prefwindow/content/pref-fonts.xul
index 039aaeb07560..3d1c3a520043 100644
--- a/browser/components/prefwindow/content/pref-fonts.xul
+++ b/browser/components/prefwindow/content/pref-fonts.xul
@@ -29,11 +29,12 @@
 
   <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"/>
   <script type="application/x-javascript">
   <![CDATA[
-    var _elementIDs = ["selectLangs"];
+    var _elementIDs = ["selectLangs", "foregroundText", "background", "browserUseSystemColors", "unvisitedLinks", "visitedLinks", "browserUnderlineAnchors", "browserUseDocumentColors"];
   ]]>
   </script>
  
@@ -286,4 +287,59 @@
     </menulist>
 
   </hbox>
+  <hbox>
+    <groupbox flex="1" id="pageColours">
+      <caption label="&color;"/>
+      <hbox align="center">
+        <label value="&textColor.label;" accesskey="&textColor.accesskey;" control="foregroundtextmenu"/>
+        <spacer flex="1"/>
+        <colorpicker type="button" id="foregroundtextmenu" palettename="standard" onchange="setColorWell(this)"/> 
+        <data id="foregroundText" preftype="color" prefstring="browser.display.foreground_color" prefattribute="value" wsm_attributes="value"/>
+      </hbox>
+      <hbox align="center" style="margin-top: 5px">
+        <label value="&backgroundColor.label;" accesskey="&backgroundColor.accesskey;" control="backgroundmenu"/>
+        <spacer flex="1"/>
+        <colorpicker type="button" id="backgroundmenu" palettename="standard" onchange="setColorWell(this)"/> 
+        <data id="background" preftype="color" prefstring="browser.display.background_color" prefattribute="value" wsm_attributes="value"/>
+      </hbox>
+      <separator class="thin"/>
+      <hbox align="center">
+        <checkbox id="browserUseSystemColors" label="&useSystemColors.label;" accesskey="&useSystemColors.accesskey;"
+                  prefstring="browser.display.use_system_colors"/>
+      </hbox>
+    </groupbox>
+      
+    <groupbox flex="1">
+      <caption label="&links;"/>
+      <hbox align="center">
+        <label value="&linkColor.label;" accesskey="&linkColor.accesskey;" control="unvisitedlinkmenu"/>
+        <spacer flex="1"/>
+        <colorpicker type="button" id="unvisitedlinkmenu" palettename="standard" onchange="setColorWell(this)"/> 
+        <data id="unvisitedLinks" preftype="string" prefstring="browser.anchor_color" prefattribute="value" wsm_attributes="value"/>
+      </hbox>
+      <hbox align="center" style="margin-top: 5px">
+        <label value="&visitedLinkColor.label;" accesskey="&visitedLinkColor.accesskey;" control="visitedlinkmenu"/>
+        <spacer flex="1"/>
+        <colorpicker type="button" id="visitedlinkmenu" palettename="standard" onchange="setColorWell(this)"/> 
+        <data id="visitedLinks" preftype="string" prefstring="browser.visited_color" prefattribute="value" wsm_attributes="value"/>
+      </hbox>
+      <separator class="thin"/>
+      <hbox align="center">
+        <checkbox id="browserUnderlineAnchors" label="&underlineLinks.label;" accesskey="&underlineLinks.accesskey;"
+                  prefstring="browser.underline_anchors"/>
+      </hbox>
+    </groupbox>
+  </hbox>
+  
+  <groupbox>
+    <caption label="&someProvColors;"/>
+  
+    <radiogroup id="browserUseDocumentColors"
+                preftype="bool" prefstring="browser.display.use_document_colors">
+      <radio value="true" label="&alwaysUseDocumentColors.label;" accesskey="&alwaysUseDocumentColors.accesskey;"/>
+      <radio value="false" label="&useMyColors.label;" accesskey="&useMyColors.accesskey;"/>        
+    </radiogroup>
+    
+  </groupbox>
+
 </page>
diff --git a/browser/components/prefwindow/jar.mn b/browser/components/prefwindow/jar.mn
index b85d2dde0da8..5d3ff86b352e 100644
--- a/browser/components/prefwindow/jar.mn
+++ b/browser/components/prefwindow/jar.mn
@@ -8,8 +8,6 @@ browser.jar:
     content/browser/pref/overrideHandler.js                (content/overrideHandler.js)
     content/browser/pref/pref-cache.js                     (content/pref-cache.js)
     content/browser/pref/pref-cache.xul                    (content/pref-cache.xul)
-    content/browser/pref/pref-colors.js                    (content/pref-colors.js)
-    content/browser/pref/pref-colors.xul                   (content/pref-colors.xul)
     content/browser/pref/pref-download.xul                 (content/pref-download.xul)
     content/browser/pref/pref-help.js                      (content/pref-help.js)
     content/browser/pref/pref-themes.xul                   (content/pref-themes.xul)
@@ -56,7 +54,6 @@ en-US.jar:
     locale/en-US/browser/pref/pref-applications-edit.dtd   (locale/pref-applications-edit.dtd)
     locale/en-US/browser/pref/pref-cache.dtd               (locale/pref-cache.dtd)
     locale/en-US/browser/pref/pref-charset.dtd             (locale/pref-charset.dtd)
-    locale/en-US/browser/pref/pref-colors.dtd              (locale/pref-colors.dtd)
     locale/en-US/browser/pref/pref-themes.dtd              (locale/pref-themes.dtd)
     locale/en-US/browser/pref/pref-debug.dtd               (locale/pref-debug.dtd)
     locale/en-US/browser/pref/pref-debug1.dtd              (locale/pref-debug1.dtd)