Bug 435079 - Migrate Composer's New Page Settings prefs to the new prefpane. Also removed 2 unused files (pref-publish.xul and pref-publish.dtd). r+sr=Neil.

git-svn-id: svn://10.0.0.236/trunk@253012 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/editor/ui/composer/content/editorPrefsOverlay.xul

@@ -34,7 +34,11 @@
               url="chrome://editor/content/pref-composer.xul"
               helpTopic="composer_prefs_general">
       <treechildren id="composerChildren">
-      <!-- XXX Move pref panes from below to here as they are migrated -->
+        <treeitem id="editingItem"
+                  label="&editing.label;"
+                  prefpane="editing_pane"
+                  url="chrome://editor/content/pref-editing.xul"
+                  helpTopic="composer_prefs_newpage"/>
         <treeitem id="toolbarsItem"
                   label="&toolbars.label;"
                   prefpane="toolbars_pane"
@@ -50,20 +54,12 @@
       <treerow>       
         <treecell label="Migrated: &compose.label;"/> 
       </treerow>
-      <!-- XXX Move these up as we migrate the panels -->
       <treechildren>
         <treeitem>
           <treerow>
-            <treecell url="chrome://editor/content/pref-editing.xul" label="&editing.label;"/> 
+            <treecell label="Migrated: &editing.label;"/> 
           </treerow>
         </treeitem>
-        <!--     
-        <treeitem>
-          <treerow>
-            <treecell url="chrome://editor/content/pref-publish.xul" label="&publish.label;"/> 
-          </treerow>
-        </treeitem>  
-        -->
         <treeitem>
           <treerow>
             <treecell label="Migrated: &toolbars.label;"/> 

mozilla/editor/ui/composer/content/pref-composer.js

@@ -20,6 +20,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
+ *   Stefan Hermes <stefanh@inbox.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either of the GNU General Public License Version 2 or later (the "GPL"),
@@ -34,119 +35,60 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-// This is mostly a modified version of code in EdColorProps.xul
 
-// Initialize in case we can't get them from prefs???
+var gPrefService = Components.classes["@mozilla.org/preferences-service;1"]
-var defaultTextColor = "#000000";
+                             .getService(Components.interfaces.nsIPrefBranch2);
-var defaultLinkColor = "#000099";
+const browserPrefsObserver =
-var defaultActiveColor = "#000099";
+{
-var defaultVisitedColor = "#990099";
+  observe: function(aSubject, aTopic, aData)
-var defaultBackgroundColor = "#FFFFFF";
+  {
+    if (aTopic != "nsPref:changed" || document.getElementById("editor.use_custom_colors").value)
+      return;
 
-var customTextColor;
+    switch (aData)
-var customLinkColor;
+    {
-var customActiveColor;
+      case "browser.anchor_color":
-var customVisitedColor;
+        SetColorPreview("linkText", gPrefService.getCharPref(aData));
-var customBackgroundColor;
+        break;
-var previewBGColor;
+      case "browser.active_color":
-var backgroundImage = "";
+        SetColorPreview("activeLinkText", gPrefService.getCharPref(aData));
-
+        break;
-// Strings we use often
+      case "browser.visited_color":
-const styleStr =       "style";
+        SetColorPreview("visitedLinkText", gPrefService.getCharPref(aData));
-const textStr =        "text";
+        break;
-const linkStr =        "link";
+      default:
-const vlinkStr =       "vlink";
+        SetBgAndFgColors(gPrefService.getBoolPref("browser.display.use_system_colors"))
-const alinkStr =       "alink";
+    }
-const bgcolorStr =     "bgcolor";
+  }
-const backgroundStr =  "background";
+};
-const colorStyle =     "color: ";
-const backColorStyle = "background-color: ";
-const backImageStyle = "; background-image: url(";
-
-var browserColors;
-var dialog;
 
 function Startup()
 {
-  gDialog.ColorPreview = document.getElementById("ColorPreview");
+  // Add browser prefs observers
-  gDialog.NormalText = document.getElementById("NormalText");
+  gPrefService.addObserver("browser.display.use_system_colors", browserPrefsObserver, false);
-  gDialog.LinkText = document.getElementById("LinkText");
+  gPrefService.addObserver("browser.display.foreground_color", browserPrefsObserver, false);
-  gDialog.ActiveLinkText = document.getElementById("ActiveLinkText");
+  gPrefService.addObserver("browser.display.background_color", browserPrefsObserver, false);
-  gDialog.VisitedLinkText = document.getElementById("VisitedLinkText");
+  gPrefService.addObserver("browser.anchor_color", browserPrefsObserver, false);
-  gDialog.DefaultColorsRadio = document.getElementById("DefaultColorsRadio");
+  gPrefService.addObserver("browser.active_color", browserPrefsObserver, false);
-  gDialog.CustomColorsRadio = document.getElementById("CustomColorsRadio");
+  gPrefService.addObserver("browser.visited_color", browserPrefsObserver, false);
-  gDialog.BackgroundImageInput = document.getElementById("BackgroundImageInput");
 
-  // The data elements that hold the pref values
+  // Add event listener so we can remove our observers
-  gDialog.NormalData = document.getElementById("textData");
+  window.addEventListener("unload", WindowOnUnload, false);
-  gDialog.LinkData = document.getElementById("linkData");
+  UpdateDependent(document.getElementById("editor.use_custom_colors").value);
-  gDialog.ActiveLinkData = document.getElementById("aLinkData");
-  gDialog.VisitedLinkData = document.getElementById("fLinkData");
-  gDialog.BackgroundColorData = document.getElementById("backgroundColorData");
-  gDialog.BackgroundImageData = document.getElementById("backgroundImageData");
-
-  browserColors = GetDefaultBrowserColors();
-
-  // Use author's browser pref colors passed into dialog
-  defaultTextColor = browserColors.TextColor;
-  defaultLinkColor = browserColors.LinkColor;
-  defaultActiveColor = browserColors.ActiveLinkColor;
-  defaultVisitedColor =  browserColors.VisitedLinkColor;
-  defaultBackgroundColor=  browserColors.BackgroundColor;
-
-  // Get the colors and image set by prefs init code 
-  customTextColor = gDialog.NormalData.getAttribute("value"); 
-  customLinkColor = gDialog.LinkData.getAttribute("value");
-  customActiveColor = gDialog.ActiveLinkData.getAttribute("value");
-  customVisitedColor = gDialog.VisitedLinkData.getAttribute("value");
-  customBackgroundColor = gDialog.BackgroundColorData.getAttribute("value");
-  backgroundImage = gDialog.BackgroundImageData.getAttribute("value");
-  if (backgroundImage)
-    gDialog.BackgroundImageInput.value = backgroundImage;
-
-  // "value" attribute value is a string conversion of boolean!
-  if( document.getElementById( "useCustomColors" ).value == "true" )
-    UseCustomColors();
-  else
-    UseDefaultColors();
-
-  return true;
 }
 
-function GetColorAndUpdate(ColorWellID)
+function GetColorAndUpdatePref(aType, aButtonID)
 {
-  // Only allow selecting when in custom mode
-  if (!gDialog.CustomColorsRadio.selected) return;
-
-  var colorWell = document.getElementById(ColorWellID);
-  if (!colorWell) return;
-
   // Don't allow a blank color, i.e., using the "default"
   var colorObj = { NoDefault:true, Type:"", TextColor:0, PageColor:0, Cancel:false };
+  var preference = document.getElementById("editor." + aButtonID + "_color");
 
-  switch( ColorWellID )
+  if (aButtonID == "background")
-  {
+    colorObj.PageColor = preference.value;
-    case "textCW":
+  else
-      colorObj.Type = "Text";
+    colorObj.TextColor = preference.value;
-      colorObj.TextColor = customTextColor;
+
-      break;
+  colorObj.Type = aType;
-    case "linkCW":
-      colorObj.Type = "Link";
-      colorObj.TextColor = customLinkColor;
-      break;
-    case "activeCW":
-      colorObj.Type = "ActiveLink";
-      colorObj.TextColor = customActiveColor;
-      break;
-    case "visitedCW":
-      colorObj.Type = "VisitedLink";
-      colorObj.TextColor = customVisitedColor;
-      break;
-    case "backgroundCW":
-      colorObj.Type = "Page";
-      colorObj.PageColor = customBackgroundColor;
-      break;
-  }
 
   window.openDialog("chrome://editor/content/EdColorPicker.xul", "_blank", "chrome,close,titlebar,modal", "", colorObj);
 
@@ -154,162 +96,126 @@ function GetColorAndUpdate(ColorWellID)
   if (colorObj.Cancel)
     return;
 
-  var color = "";
+  // Update preference with picked color
-  switch( ColorWellID )
+  if (aType == "Page")
-  {
+    preference.value = colorObj.BackgroundColor;
-    case "textCW":
+  else
-      color = customTextColor = colorObj.TextColor;
+    preference.value = colorObj.TextColor;
-      gDialog.NormalData.setAttribute("value", color); 
-      break;
-    case "linkCW":
-      color = customLinkColor = colorObj.TextColor;
-      gDialog.LinkData.setAttribute("value", color);
-      break;
-    case "activeCW":
-      color = customActiveColor = colorObj.TextColor;
-      gDialog.ActiveLinkData.setAttribute("value", color);
-      break;
-    case "visitedCW":
-      color = customVisitedColor = colorObj.TextColor;
-      gDialog.VisitedLinkData.setAttribute("value", color);
-      break;
-    case "backgroundCW":
-      color = customBackgroundColor = colorObj.BackgroundColor;
-      gDialog.BackgroundColorData.setAttribute("value", color);
-      break;
-  }
-  setColorWell(ColorWellID, color); 
-  SetColorPreview(ColorWellID, color);
 }
 
-function SetColorPreview(ColorWellID, color)
+function UpdateDependent(aCustomEnabled)
 {
-  switch( ColorWellID )
+  ToggleElements(aCustomEnabled);
-  {
-    case "textCW":
-      gDialog.NormalText.setAttribute(styleStr,colorStyle+color);
-      break;
-    case "linkCW":
-      gDialog.LinkText.setAttribute(styleStr,colorStyle+color);
-      break;
-    case "activeCW":
-      gDialog.ActiveLinkText.setAttribute(styleStr,colorStyle+color);
-      break;
-    case "visitedCW":
-      gDialog.VisitedLinkText.setAttribute(styleStr,colorStyle+color);
-      break;
-    case "backgroundCW":
-      // Must combine background color and image style values
-      var styleValue = backColorStyle+color;
-      if (backgroundImage)
-        styleValue += ";"+backImageStyle+backgroundImage+");";
 
-      gDialog.ColorPreview.setAttribute(styleStr,styleValue);
+  if (aCustomEnabled)
-      previewBGColor = color;
+  { // Set current editor colors on preview and buttons
-      break;
+    SetColors("textCW", "normalText", document.getElementById("editor.text_color").value);
+    SetColors("linkCW", "linkText", document.getElementById("editor.link_color").value);
+    SetColors("activeCW", "activeLinkText", document.getElementById("editor.active_link_color").value);
+    SetColors("visitedCW", "visitedLinkText", document.getElementById("editor.followed_link_color").value);
+    SetColors("backgroundCW", "ColorPreview", document.getElementById("editor.background_color").value);
+  }
+  else
+  { // Set current browser colors on preview
+    SetBgAndFgColors(gPrefService.getBoolPref("browser.display.use_system_colors"));
+    SetColorPreview("linkText", gPrefService.getCharPref("browser.anchor_color"));
+    SetColorPreview("activeLinkText", gPrefService.getCharPref("browser.active_color"));
+    SetColorPreview("visitedLinkText", gPrefService.getCharPref("browser.visited_color"));
   }
 }
 
-function UseCustomColors()
+function ToggleElements(aCustomEnabled)
 {
-  SetElementEnabledById("TextButton", true);
+  var buttons = document.getElementById("color-rows").getElementsByTagName("button");
-  SetElementEnabledById("LinkButton", true);
-  SetElementEnabledById("ActiveLinkButton", true);
-  SetElementEnabledById("VisitedLinkButton", true);
-  SetElementEnabledById("BackgroundButton", true);
-  SetElementEnabledById("Text", true);
-  SetElementEnabledById("Link", true);
-  SetElementEnabledById("Active", true);
-  SetElementEnabledById("Visited", true);
-  SetElementEnabledById("Background", true);
   
-  SetColorPreview("textCW",       customTextColor);
+  for (var i = 0; i < buttons.length; i++)
-  SetColorPreview("linkCW",       customLinkColor);
+  {
-  SetColorPreview("activeCW",     customActiveColor);
+    let isLocked = CheckLocked(buttons[i].id);
-  SetColorPreview("visitedCW",    customVisitedColor);
+    buttons[i].disabled = !aCustomEnabled || isLocked;
-  SetColorPreview("backgroundCW", customBackgroundColor);
+    buttons[i].previousSibling.disabled = !aCustomEnabled || isLocked;
-
+    buttons[i].firstChild.setAttribute("default", !aCustomEnabled || isLocked);
-  setColorWell("textCW",          customTextColor);
+  }
-  setColorWell("linkCW",          customLinkColor);
-  setColorWell("activeCW",        customActiveColor);
-  setColorWell("visitedCW",       customVisitedColor);
-  setColorWell("backgroundCW",    customBackgroundColor);
-
-  gDialog.NormalData.setAttribute("value",          customTextColor); 
-  gDialog.LinkData.setAttribute("value",            customLinkColor);
-  gDialog.ActiveLinkData.setAttribute("value",      customActiveColor);
-  gDialog.VisitedLinkData.setAttribute("value",     customVisitedColor);
-  gDialog.BackgroundColorData.setAttribute("value", customBackgroundColor);
 }
 
-function UseDefaultColors()
+function CheckLocked(aButtonID)
 {
-  SetColorPreview("textCW",       defaultTextColor);
+  return document.getElementById("editor." + aButtonID + "_color").locked;
-  SetColorPreview("linkCW",       defaultLinkColor);
+}
-  SetColorPreview("activeCW",     defaultActiveColor);
-  SetColorPreview("visitedCW",    defaultVisitedColor);
-  SetColorPreview("backgroundCW", defaultBackgroundColor);
 
-  // Setting to blank color will remove color from buttons,
+// Updates preview and button color when a editor color pref change
-  setColorWell("textCW",       "");
+function UpdateColors(aColorWellID, aPreviewID, aColor)
-  setColorWell("linkCW",       "");
+{
-  setColorWell("activeCW",     "");
+  // Only show editor colors from prefs if we're in custom mode
-  setColorWell("visitedCW",    "");
+  if (!document.getElementById("editor.use_custom_colors").value)
-  setColorWell("backgroundCW", "");
+    return;
 
-  // Disable color buttons and labels
+  SetColors(aColorWellID, aPreviewID, aColor)
-  SetElementEnabledById("TextButton", false);
+}
-  SetElementEnabledById("LinkButton", false);
-  SetElementEnabledById("ActiveLinkButton", false);
-  SetElementEnabledById("VisitedLinkButton", false);
-  SetElementEnabledById("BackgroundButton", false);
-  SetElementEnabledById("Text", false);
-  SetElementEnabledById("Link", false);
-  SetElementEnabledById("Active", false);
-  SetElementEnabledById("Visited", false);
-  SetElementEnabledById("Background", false);
 
-  // Note that we leave custom colors set even if 
+function SetColors(aColorWellID, aPreviewID, aColor)
-  //  custom colors pref is false (we just ignore the colors)
+{
+  SetColorWell(aColorWellID, aColor);
+  SetColorPreview(aPreviewID, aColor);
+}
+
+function SetColorWell(aColorWellID, aColor)
+{
+  document.getElementById(aColorWellID).style.backgroundColor = aColor;
+}
+
+function SetColorPreview(aPreviewID, aColor)
+{
+  if (aPreviewID == "ColorPreview")
+    document.getElementById(aPreviewID).style.backgroundColor = aColor;
+  else
+    document.getElementById(aPreviewID).style.color = aColor;
+}
+
+function UpdateBgImagePreview(aImage)
+{
+  var colorPreview = document.getElementById("ColorPreview");
+  colorPreview.style.backgroundImage = aImage && "url(" + aImage + ")";
+}
+
+// Sets browser background/foreground colors
+function SetBgAndFgColors(aSysPrefEnabled)
+{
+  if (aSysPrefEnabled)
+  { // Use system colors
+    SetColorPreview("normalText", "windowtext");
+    SetColorPreview("ColorPreview", "window");
+  }
+  else
+  {
+    SetColorPreview("normalText", gPrefService.getCharPref("browser.display.foreground_color"));
+    SetColorPreview("ColorPreview", gPrefService.getCharPref("browser.display.background_color"));
+  }
 }
 
 function ChooseImageFile()
 {
-  // Get a local image file, converted into URL format
+  const nsIFilePicker = Components.interfaces.nsIFilePicker;
-  var fileName = GetLocalFileURL("img");
+  var fp = Components.classes["@mozilla.org/filepicker;1"]
-  if (fileName)
+                     .createInstance(nsIFilePicker);
+  var editorBundle = document.getElementById("bundle_editor");
+  var title = editorBundle.getString("SelectImageFile");
+  fp.init(window, title, nsIFilePicker.modeOpen);
+  fp.appendFilters(nsIFilePicker.filterImages);
+  if (fp.show() == nsIFilePicker.returnOK)
+    document.getElementById("editor.default_background_image").value = fp.fileURL.spec;
+
+  var textbox = document.getElementById("backgroundImageInput");
+  textbox.focus();
+  textbox.select();
+}
+
+function WindowOnUnload()
 {
-    gDialog.BackgroundImageInput.value = fileName;
+  gPrefService.removeObserver("browser.display.use_system_colors", browserPrefsObserver, false);
-    ValidateAndPreviewImage(true);
+  gPrefService.removeObserver("browser.display.foreground_color", browserPrefsObserver, false);
+  gPrefService.removeObserver("browser.display.background_color", browserPrefsObserver, false);
+  gPrefService.removeObserver("browser.anchor_color", browserPrefsObserver, false);
+  gPrefService.removeObserver("browser.active_color", browserPrefsObserver, false);
+  gPrefService.removeObserver("browser.visited_color", browserPrefsObserver, false);
+  window.removeEventListener("unload", WindowOnUnload, false);
 }
-  SetTextboxFocus(gDialog.BackgroundImageInput);
-}
-
-function ChangeBackgroundImage()
-{
-  // Don't show error message for image while user is typing
-  ValidateAndPreviewImage(false);
-}
-
-function ValidateAndPreviewImage(ShowErrorMessage)
-{
-  // First make a string with just background color
-  var styleValue = backColorStyle+previewBGColor+";";
-
-  var image = TrimString(gDialog.BackgroundImageInput.value);
-  if (image)
-  {
-    backgroundImage = image;
-    // Append image style
-    styleValue += backImageStyle+backgroundImage+");";
-  }
-  else
-    backgroundImage = "";
-
-  // Set style on preview (removes image if not valid)
-  gDialog.ColorPreview.setAttribute(styleStr, styleValue);
-  
-  // Set the pref data so pref code saves it 
-  gDialog.BackgroundImageData.setAttribute("value", backgroundImage ? backgroundImage : "");
-}
-

mozilla/editor/ui/composer/content/pref-editing.xul

@@ -39,27 +39,59 @@
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
-<!DOCTYPE page SYSTEM "chrome://editor/locale/pref-editing.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://editor/locale/pref-editing.dtd">
 
-<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-      onload="parent.initPanel('chrome://editor/content/pref-editing.xul');"
+  <prefpane id="editing_pane"
-      headertitle="&pref.editing.title;">
+            label="&pref.editing.title;"
+            script="chrome://editor/content/pref-composer.js">
 
-  <script lanugage="JavaScript">
+    <preferences id="editing_preferences">
-  <![CDATA[
+      <preference id="editor.author"
-   var _elementIDs = ["editorAuthor", "useCustomColors", "textData", "linkData", "aLinkData", "fLinkData", "backgroundColorData", "backgroundImageData"];
+                  name="editor.author"
-  ]]>
+                  type="string"/>
-  </script>
+      <preference id="editor.use_custom_colors"
+                  name="editor.use_custom_colors"
+                  type="bool"
+                  onchange="UpdateDependent(this.value);"/>
+      <preference id="editor.text_color"
+                  name="editor.text_color"
+                  type="string"
+                  onchange="UpdateColors('textCW', 'normalText', this.value);"/>
+      <preference id="editor.link_color"
+                  name="editor.link_color"
+                  type="string"
+                  onchange="UpdateColors('linkCW', 'linkText', this.value);"/>
+      <preference id="editor.active_link_color"
+                  name="editor.active_link_color"
+                  type="string"
+                  onchange="UpdateColors('activeCW', 'activeLinkText', this.value);"/>
+      <preference id="editor.followed_link_color"
+                  name="editor.followed_link_color"
+                  type="string"
+                  onchange="UpdateColors('visitedCW', 'visitedLinkText', this.value);"/>
+      <preference id="editor.background_color"
+                  name="editor.background_color"
+                  type="string"
+                  onchange="UpdateColors('backgroundCW', 'ColorPreview', this.value);"/>
+      <preference id="editor.default_background_image"
+                  name="editor.default_background_image"
+                  type="string"
+                  onchange="UpdateBgImagePreview(this.value);"/>
+    </preferences>
 
-  <script type="application/x-javascript" src="chrome://editor/content/pref-composer.js"/>
+    <stringbundle id="bundle_editor"
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.js"/>
+                  src="chrome://editor/locale/editor.properties"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
 
     <vbox>
-    <label value="&authorName.label;" accesskey="&authorName.accesskey;" control="editorAuthor"/>
+      <label value="&authorName.label;" 
+             accesskey="&authorName.accesskey;"
+             control="editorAuthor">
+      </label>
       <hbox>
-      <textbox id="editorAuthor" flex="1"
+        <textbox id="editorAuthor"
-               prefstring="editor.author"/>
+                 flex="1"
+                 preference="editor.author"/>
         <spacer flex="1"/>
       </hbox>
     </vbox>
@@ -67,87 +99,117 @@
     <groupbox align="start">
       <caption label="&pageColorHeader;"/> 
       <radiogroup id="useCustomColors"
-                preftype="bool" prefstring="editor.use_custom_colors">
+                  preference="editor.use_custom_colors">
-      <radio id="DefaultColorsRadio"
+        <radio id="defaultColorsRadio"
                value="false" 
                label="&defaultColorsRadio.label;" 
-          accesskey="&defaultColors.accesskey;"
+               accesskey="&defaultColors.accesskey;"/>
-          oncommand="UseDefaultColors();"/>
+        <radio id="customColorsRadio" 
-      <radio id="CustomColorsRadio" 
+               value="true"
-          value="true" label="&customColorsRadio.label;"
+               label="&customColorsRadio.label;"
-          accesskey="&customColors.accesskey;" 
+               accesskey="&customColors.accesskey;"/>
-          oncommand="UseCustomColors()"/>
       </radiogroup>
       <hbox class="indent">
         <grid>
           <columns><column/><column/></columns>
-        <rows>
+          <rows id="color-rows">
             <row align="center">
-            <label id="Text" value="&normalText.label;&colon.character;" 
+              <label id="textLabel"
-                   accesskey="&normalText.accesskey;" control="TextButton"/>
+                     value="&normalText.label;&colon.character;" 
-            <button id="TextButton" class="color-button" oncommand="GetColorAndUpdate('textCW');">
+                     accesskey="&normalText.accesskey;"
+                     control="text"/>
+              <button id="text"
+                      class="color-button"
+                      oncommand="GetColorAndUpdatePref('Text', 'text');">
                 <spacer id="textCW" class="color-well"/>
               </button>
-            <data id="textData" pref="true" preftype="color" prefstring="editor.text_color" prefattribute="value" wsm_attributes="value"/>
             </row>
             <row align="center">
-            <label id="Link" value="&linkText.label;&colon.character;" 
+              <label id="linkLabel"
-                   accesskey="&linkText.accesskey;" control="LinkButton"/>
+                     value="&linkText.label;&colon.character;" 
-            <button id="LinkButton" class="color-button" oncommand="GetColorAndUpdate('linkCW');">
+                     accesskey="&linkText.accesskey;"
+                     control="link"/>
+              <button id="link"
+                      class="color-button"
+                      oncommand="GetColorAndUpdatePref('Link', 'link');">
                 <spacer id="linkCW" class="color-well"/>
               </button>
-            <data id="linkData" pref="true" preftype="color" prefstring="editor.link_color" prefattribute="value" wsm_attributes="value"/>
             </row>
             <row align="center">
-            <label id="Active" value="&activeLinkText.label;&colon.character;" 
+              <label id="activeLinkLabel"
-                   accesskey="&activeLinkText.accesskey;" control="ActiveLinkButton"/>
+                     value="&activeLinkText.label;&colon.character;" 
-            <button id="ActiveLinkButton" class="color-button" oncommand="GetColorAndUpdate('activeCW');">
+                     accesskey="&activeLinkText.accesskey;"
+                     control="active_link"/>
+              <button id="active_link"
+                      class="color-button"
+                      oncommand="GetColorAndUpdatePref('ActiveLink', 'active_link');">
                 <spacer id="activeCW" class="color-well"/>
               </button>
-            <data id="aLinkData" pref="true" preftype="color" prefstring="editor.active_link_color" prefattribute="value" wsm_attributes="value"/>
             </row>
             <row align="center">
-            <label id="Visited" value ="&visitedLinkText.label;&colon.character;" 
+              <label id="visitedLinkLabel"
-                   accesskey="&visitedLinkText.accesskey;" control="VisitedLinkButton"/>
+                     value ="&visitedLinkText.label;&colon.character;" 
-            <button id="VisitedLinkButton" class="color-button" oncommand="GetColorAndUpdate('visitedCW');">
+                     accesskey="&visitedLinkText.accesskey;"
+                     control="followed_link"/>
+              <button id="followed_link"
+                      class="color-button"
+                      oncommand="GetColorAndUpdatePref('VisitedLink', 'followed_link');">
                 <spacer id="visitedCW" class="color-well"/>
               </button>
-            <data id="fLinkData" pref="true" preftype="color" prefstring="editor.followed_link_color" prefattribute="value" wsm_attributes="value"/>
             </row>
             <row align="center">
-            <label id="Background" value="&background.label;"
+              <label id="backgroundLabel"
-                   accesskey="&background.accesskey;" control="BackgroundButton"/>
+                     value="&background.label;"
-            <button id="BackgroundButton" class="color-button" oncommand="GetColorAndUpdate('backgroundCW');">
+                     accesskey="&background.accesskey;"
+                     control="background"/>
+              <button id="background"
+                      class="color-button"
+                      oncommand="GetColorAndUpdatePref('Page', 'background');">
                 <spacer id="backgroundCW" class="color-well"/>
               </button>
-            <data id="backgroundColorData" pref="true" preftype="color" prefstring="editor.background_color" prefattribute="value" wsm_attributes="value"/>
             </row>
           </rows>
         </grid>
-      <vbox id="ColorPreview" flex="1">
+        <vbox id="ColorPreview"
+              flex="1">
           <spacer flex="1"/>
-        <label class="larger" id="NormalText"      value="&normalText.label;"/>
+          <label id="normalText"
+                 class="larger"
+                 value="&normalText.label;"/>
           <spacer flex="1"/>
-        <label class="larger" id="LinkText"        value="&linkText.label;"/>
+          <label id="linkText"
+                 class="larger"
+                 value="&linkText.label;"/>
           <spacer flex="1"/>
-        <label class="larger" id="ActiveLinkText"  value="&activeLinkText.label;"/>
+          <label id="activeLinkText"
+                 class="larger"
+                 value="&activeLinkText.label;"/>
           <spacer flex="1"/>
-        <label class="larger" id="VisitedLinkText" value="&visitedLinkText.label;"/>
+          <label id="visitedLinkText"
+                 class="larger"
+                 value="&visitedLinkText.label;"/>
           <spacer flex="1"/>
         </vbox>
         <spacer flex="1"/>
       </hbox>
       <spacer class="spacer"/>
-    <label value="&backgroundImage.label;" accesskey="&backgroundImage.accesskey;" control="BackgroundImageInput"/>
+      <label id="backgroundImageLabel"
+             value="&backgroundImage.label;"
+             accesskey="&backgroundImage.accesskey;"
+             control="backgroundImageInput">
+      </label>
       <hbox align="center">
-      <textbox id="BackgroundImageInput" oninput="ChangeBackgroundImage();" style="min-width: 23em" flex="1" class="uri-element">
+        <textbox id="backgroundImageInput"
-        <observes element="backgroundImageData" attribute="disabled"/>
+                 class="uri-element"
-      </textbox>
+                 preference="editor.default_background_image"
-      <button label="&chooseFile.label;" accesskey="&chooseFile.accesskey;"
+                 style="min-width: 23em;"
-              oncommand="ChooseImageFile()">
+                 flex="1"/>
-        <observes element="backgroundImageData" attribute="disabled"/>
+        <button label="&chooseFile.label;"
+                accesskey="&chooseFile.accesskey;"
+                oncommand="ChooseImageFile();">
+          <observes element="backgroundImageInput" attribute="disabled"/>
         </button>
-      <data id="backgroundImageData" preftype="string" prefstring="editor.default_background_image" prefattribute="value"/>
       </hbox>
     </groupbox>
-</page>
+  </prefpane>
+</overlay>

mozilla/editor/ui/composer/content/pref-publish.xul

@@ -1,95 +0,0 @@
-<?xml version="1.0"?> 
-<!-- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
- The Original Code is Mozilla Communicator client code, released
- March 31, 1998.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corporation.
- Portions created by the Initial Developer are Copyright (C) 1998-1999
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
-
- Alternatively, the contents of this file may be used under the terms of
- either of the GNU General Public License Version 2 or later (the "GPL"),
- or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the GPL or the LGPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
-
-<!DOCTYPE page SYSTEM "chrome://editor/locale/pref-publish.dtd" >
-<page xmlns:html="http://www.w3.org/1999/xhtml"
-      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      title="&pref.publish.title;"
-      onload="if( parent.handle ) parent.handle.onpageload( 'pref-publish' ); else parent.queuedTag = 'pref-publish';">
-
-<html:div flex="100%">
-<html:div id="top">
-		<html:span id="lefttext">&composerHeader.label;</html:span>
-</html:div>
-
-
-<html:table>
-  <html:tr>
-    <html:td>
-    	<html:input name="author" type="checkbox" id="editorPublishKeepImages"
-                  pref="true" preftype="bool" prefstring="editor.publish_keep_images" />
-      <html:label for="editorPublishKeepImages">&maintainCheckbox.label;</html:label>
-			<html:br />&adjustDesc.label;       
-		</html:td>
-  </html:tr>
-	<html:tr>
-    <html:td>
-			<html:input name="autosave" type="checkbox" id="editorPublishKeepLinks"
-                  pref="true" preftype="bool" prefstring="editor.publish_keep_links"/>
-      <html:label for="editorPublishKeepLinks">&keepCheck.label;</html:label>
-			<html:br />&saveDesc.label;
-		</html:td>
-  </html:tr>
-	&tip.label;
-</html:table>
-&defaultHeader.label;
-<html:table>
-  <html:tr>
-    <html:td>&publishFtp.label;</html:td>
-  </html:tr>
-	<html:tr>
-    <html:td>
-      <html:input name="autosave" type="text" id="composerPublish"
-                  pref="true" preftype="string" prefstring="composer.publish" size="30"/>
-		</html:td>
-  </html:tr>         
-	<html:tr>
-    <html:td>&publishhtp.label;</html:td>
-  </html:tr>
-	<html:tr>
-    <html:td>
-		  <html:input name="autosave" type="text" id="composerBrowse"
-                  pref="true" preftype="string" prefstring="composer.browse" size="30"/>
-		</html:td>
-  </html:tr>
-</html:table>
-</html:div>
-</page>

mozilla/editor/ui/jar.mn

@@ -26,7 +26,6 @@ comm.jar:
       content/editor/pref-editing.xul                          (composer/content/pref-editing.xul) 
       content/editor/pref-composer.js                          (composer/content/pref-composer.js) 
       content/editor/pref-composer.xul                         (composer/content/pref-composer.xul) 
-      content/editor/pref-publish.xul                          (composer/content/pref-publish.xul) 
       content/editor/editorSmileyOverlay.xul                   (composer/content/editorSmileyOverlay.xul) 
       content/editor/editorPrefsOverlay.xul                    (composer/content/editorPrefsOverlay.xul) 
       content/editor/editorNavigatorOverlay.xul                (composer/content/editorNavigatorOverlay.xul) 

mozilla/editor/ui/locales/en-US/chrome/composer/pref-publish.dtd

@@ -1,21 +0,0 @@
-<!-- extracted from content/pref-publish.xul -->
-
-<!--LOCALIZATION NOTE : FILE The Publish preferences screen -->
-<!ENTITY  pref.publish.title     "Publish">
-<!ENTITY  composerHeader.label   "Publish">
-<!ENTITY  maintainCheckbox.label "Maintain links">
-<!ENTITY  keepCheck.label        "Keep images with page">
-
-<!--LOCALIZATION NOTE (adjustDesc.label): Attempt to maintain approximate line length, linefeeds and white space -->
-<!ENTITY  adjustDesc.label       "Adjust links to work from the page's location. (Links to local pages will work when
-			          local versions exist.)           ">
-<!--LOCALIZATION NOTE (saveDesc.label): Attempt to maintain approximate line length, linefeeds and white space -->
-<!ENTITY  saveDesc.label         "Save copies of images to the page's location.  Images will always
-				  appear in local versions of the page and when the page is published.">
-<!ENTITY  tip.label              "Tip: Check both options if you will be using remote publishing.">
-<!ENTITY  defaultHeader.label    "Default publishing location">
-<!--LOCALIZATION NOTE (publishFtp.label): Edit box appears beside this label -->
-<!ENTITY  publishFtp.label       "If publishing to a FTP site, enter the HTTP address to browse to:">
-<!--LOCALIZATION NOTE (publishhtp.label): Edit box appears beside this label -->
-<!ENTITY  publishhtp.label       "If publishing to a FTP site, enter the HTTP address to browse to:">
-

mozilla/editor/ui/locales/jar.mn

@@ -41,7 +41,6 @@
   locale/@AB_CD@/editor/pref-toolbars.dtd                    (%chrome/composer/pref-toolbars.dtd)
   locale/@AB_CD@/editor/pref-editing.dtd                     (%chrome/composer/pref-editing.dtd)
   locale/@AB_CD@/editor/pref-composer.dtd                    (%chrome/composer/pref-composer.dtd)
-  locale/@AB_CD@/editor/pref-publish.dtd                     (%chrome/composer/pref-publish.dtd)
   locale/@AB_CD@/editor/EdLinkChecker.dtd                    (%chrome/dialogs/EdLinkChecker.dtd)
   locale/@AB_CD@/editor/EditorPageProperties.dtd             (%chrome/dialogs/EditorPageProperties.dtd)
   locale/@AB_CD@/editor/EditorSnapToGrid.dtd                 (%chrome/dialogs/EditorSnapToGrid.dtd)

mozilla/suite/themes/classic/editor/EditorDialog.css

@@ -100,8 +100,8 @@ groupbox {
 }
 
 .color-well[default="true"] {
-  border: 1px solid transparent;
+  border: 1px solid transparent !important;
-  background-color: inherit;
+  background-color: inherit !important;
 }
 
 .color-button {

mozilla/suite/themes/modern/editor/EditorDialog.css

@@ -198,8 +198,8 @@ tree.list {
 }
 
 .color-well[default="true"] {
-  border: 1px solid transparent;
+  border: 1px solid transparent !important;
-  background-color: inherit;
+  background-color: inherit !important;
 }
 
 /* ::::: color picker dialog ::::: */