Bug 1465061 - Make all preferences in-content and remove stand-alone options window. r=jorgk

calendar/base/content/preferences/categories.js

@@ -19,7 +19,6 @@ var gCategoriesPane = {
 
     mCategoryDialog: null,
     mWinProp: null,
-    mLoadInContent: false,
 
     /**
      * Initialize the categories pref pane. Sets up dialog controls to show the
@@ -62,12 +61,7 @@ var gCategoriesPane = {
         this.mWinProp = "centerscreen, chrome, resizable=no";
         if (AppConstants.platform != "linux") {
             this.mWinProp += ", modal";
-        }
-
-        this.mLoadInContent = Preferences.get(
-            "mail.preferences.inContent",
-            false
-        );
+        };
     },
 
     /**
@@ -127,11 +121,7 @@ var gCategoriesPane = {
             category: "",
             color: null
         };
-        if (this.mLoadInContent) {
-            gSubDialog.open(this.mCategoryDialog, "resizable=no", params);
-        } else {
-            window.openDialog(this.mCategoryDialog, "addCategory", this.mWinProp, params);
-        }
+        gSubDialog.open(this.mCategoryDialog, "resizable=no", params);
     },
 
     /**
@@ -148,11 +138,7 @@ var gCategoriesPane = {
             color: currentColor
         };
         if (list.selectedItem) {
-            if (this.mLoadInContent) {
-                gSubDialog.open(this.mCategoryDialog, "resizable=no", params);
-            } else {
-                window.openDialog(this.mCategoryDialog, "editCategory", this.mWinProp, params);
-            }
+            gSubDialog.open(this.mCategoryDialog, "resizable=no", params);
         }
     },
 

mail/app/profile/all-thunderbird.js

@@ -244,9 +244,6 @@ pref("browser.preferences.animateFadeIn", true);
 pref("browser.preferences.animateFadeIn", false);
 #endif
 
-// load the Preferences in a tab
-pref("mail.preferences.inContent", false);
-
 pref("browser.download.show_plugins_in_list", false);
 pref("browser.download.hide_plugins_without_extensions", true);
 

mail/base/content/mailCore.js

@@ -407,32 +407,7 @@ function toSanitize()
  */
 function openOptionsDialog(aPaneID, aTabID, aOtherArgs)
 {
-  let loadInContent = Services.prefs.getBoolPref("mail.preferences.inContent");
-  // Load the prefs in a tab?
-  if (loadInContent) {
-    // Yes, load the prefs in a tab
-    openPreferencesTab(aPaneID, aTabID, aOtherArgs);
-  } else {
-    // No, load the prefs in a dialog
-    let win = Services.wm.getMostRecentWindow("Mail:Preferences");
-    if (win) {
-      // the dialog is already open
-      win.focus();
-      if (aPaneID) {
-        let prefWindow = win.document.getElementById("MailPreferences");
-        win.selectPaneAndTab(prefWindow, aPaneID, aTabID);
-      }
-    } else {
-      // the dialog must be created
-      let instantApply = Services.prefs
-                                 .getBoolPref("browser.preferences.instantApply");
-      let features = "chrome,titlebar,toolbar,centerscreen" +
-                     (instantApply ? ",dialog=no" : ",modal");
-
-      window.openDialog("chrome://messenger/content/preferences/preferences.xul",
-                        "Preferences", features, aPaneID, aTabID, aOtherArgs);
-    }
-  }
+  openPreferencesTab(aPaneID, aTabID, aOtherArgs);
 }
 
 function openAddonsMgr(aView)

mail/components/preferences/advanced.js

@@ -15,8 +15,6 @@ var gAdvancedPane = {
   mShellServiceWorking: false,
   mBundle: null,
 
-  _loadInContent: Services.prefs.getBoolPref("mail.preferences.inContent"),
-
   init: function ()
   {
     this.mPane = document.getElementById("paneAdvanced");
@@ -169,25 +167,13 @@ var gAdvancedPane = {
       return;
 
     // otherwise, bring up the default client dialog
-    if (this._loadInContent) {
-      gSubDialog.open("chrome://messenger/content/systemIntegrationDialog.xul",
-                      "resizable=no", "calledFromPrefs");
-    } else {
-      window.openDialog("chrome://messenger/content/systemIntegrationDialog.xul",
-                        "SystemIntegration",
-                        "modal,centerscreen,chrome,resizable=no", "calledFromPrefs");
-    }
+    gSubDialog.open("chrome://messenger/content/systemIntegrationDialog.xul",
+                    "resizable=no", "calledFromPrefs");
   },
 
   showConfigEdit: function()
   {
-    if (this._loadInContent) {
-      gSubDialog.open("chrome://global/content/config.xul");
-    } else {
-      document.documentElement.openWindow("Preferences:ConfigManager",
-                                          "chrome://global/content/config.xul",
-                                          "", null);
-    }
+    gSubDialog.open("chrome://global/content/config.xul");
   },
 
   /**
@@ -382,13 +368,7 @@ updateWritePrefs: function ()
 
   showUpdates: function ()
   {
-    if (this._loadInContent) {
-      gSubDialog.open("chrome://mozapps/content/update/history.xul");
-    } else {
-      var prompter = Cc["@mozilla.org/updates/update-prompt;1"]
-                       .createInstance(Ci.nsIUpdatePrompt);
-      prompter.showUpdateHistory(window);
-    }
+    gSubDialog.open("chrome://mozapps/content/update/history.xul");
   },
 
   updateCompactOptions: function(aCompactEnabled)
@@ -409,14 +389,8 @@ updateWritePrefs: function ()
    */
   showReturnReceipts: function()
   {
-    if (this._loadInContent) {
-      gSubDialog.open("chrome://messenger/content/preferences/receipts.xul",
-                      "resizable=no");
-    } else {
-      document.documentElement
-              .openSubDialog("chrome://messenger/content/preferences/receipts.xul",
-                             "", null);
-    }
+    gSubDialog.open("chrome://messenger/content/preferences/receipts.xul",
+                    "resizable=no");
   },
 
   /**
@@ -424,14 +398,8 @@ updateWritePrefs: function ()
    */
   showConnections: function ()
   {
-    if (this._loadInContent) {
-      gSubDialog.open("chrome://messenger/content/preferences/connection.xul",
-                      "resizable=no");
-    } else {
-      document.documentElement
-              .openSubDialog("chrome://messenger/content/preferences/connection.xul",
-                             "", null);
-    }
+    gSubDialog.open("chrome://messenger/content/preferences/connection.xul",
+                    "resizable=no");
   },
 
   /**
@@ -439,14 +407,8 @@ updateWritePrefs: function ()
    */
   showOffline: function()
   {
-    if (this._loadInContent) {
-      gSubDialog.open("chrome://messenger/content/preferences/offline.xul",
-                      "resizable=no");
-    } else {
-      document.documentElement
-              .openSubDialog("chrome://messenger/content/preferences/offline.xul",
-                             "", null);
-    }
+    gSubDialog.open("chrome://messenger/content/preferences/offline.xul",
+                    "resizable=no");
   },
 
   /**
@@ -454,13 +416,7 @@ updateWritePrefs: function ()
    */
   showCertificates: function ()
   {
-    if (this._loadInContent) {
-      gSubDialog.open("chrome://pippki/content/certManager.xul");
-    } else {
-      document.documentElement.openWindow("mozilla:certmanager",
-                                          "chrome://pippki/content/certManager.xul",
-                                          "", null);
-    }
+    gSubDialog.open("chrome://pippki/content/certManager.xul");
   },
 
   /**
@@ -491,13 +447,7 @@ updateWritePrefs: function ()
    */
   showSecurityDevices: function ()
   {
-    if (this._loadInContent) {
-      gSubDialog.open("chrome://pippki/content/device_manager.xul");
-    } else {
-      document.documentElement.openWindow("mozilla:devicemanager",
-                                          "chrome://pippki/content/device_manager.xul",
-                                          "", null);
-    }
+    gSubDialog.open("chrome://pippki/content/device_manager.xul");
   },
 
   /**

mail/components/preferences/applications.js

@@ -850,8 +850,6 @@ var gApplicationsPane = {
   _handlerSvc   : Cc["@mozilla.org/uriloader/handler-service;1"]
                     .getService(Ci.nsIHandlerService),
 
-  _loadInContent: Services.prefs.getBoolPref("mail.preferences.inContent"),
-
   //**************************************************************************//
   // Initialization & Destruction
 
@@ -1576,15 +1574,9 @@ var gApplicationsPane = {
     var typeItem = this._list.selectedItem;
     var handlerInfo = this._handledTypes[typeItem.type];
 
-    if (this._loadInContent) {
-      gSubDialog.open(
-        "chrome://messenger/content/preferences/applicationManager.xul",
-        "resizable=no", handlerInfo);
-    } else {
-      document.documentElement.openSubDialog(
-        "chrome://messenger/content/preferences/applicationManager.xul",
-        "", handlerInfo);
-    };
+    gSubDialog.open(
+      "chrome://messenger/content/preferences/applicationManager.xul",
+      "resizable=no", handlerInfo);
 
     // Rebuild the actions menu so that we revert to the previous selection,
     // or "Always ask" if the previous default application has been removed
@@ -1639,14 +1631,8 @@ var gApplicationsPane = {
       params.filename      = null;
       params.handlerApp    = null;
 
-      if (this._loadInContent) {
-        gSubDialog.open("chrome://global/content/appPicker.xul",
-                        "resizable=no", params);
-      } else {
-        window.openDialog("chrome://global/content/appPicker.xul", null,
-                          "chrome,modal,centerscreen,titlebar,dialog=yes",
-                          params);
-      };
+      gSubDialog.open("chrome://global/content/appPicker.xul",
+                      "resizable=no", params);
 
       if (params.handlerApp &&
           params.handlerApp.executable &&

mail/components/preferences/compose.js

@@ -10,8 +10,6 @@ var gComposePane = {
   mSpellChecker: null,
   mDictCount : 0,
 
-  _loadInContent: Services.prefs.getBoolPref("mail.preferences.inContent"),
-
   init: function ()
   {
     this.enableAutocomplete();
@@ -49,25 +47,13 @@ var gComposePane = {
 
   sendOptionsDialog: function()
   {
-    if (this._loadInContent) {
-      gSubDialog.open("chrome://messenger/content/preferences/sendoptions.xul");
-    } else {
-      document.documentElement
-              .openSubDialog("chrome://messenger/content/preferences/sendoptions.xul",
-                             "", null);
-    }
+    gSubDialog.open("chrome://messenger/content/preferences/sendoptions.xul");
   },
 
   attachmentReminderOptionsDialog: function()
   {
-    if (this._loadInContent) {
-      gSubDialog.open("chrome://messenger/content/preferences/attachmentReminder.xul",
-                      "resizable=no");
-    } else {
-      document.documentElement
-              .openSubDialog("chrome://messenger/content/preferences/attachmentReminder.xul",
-                             "", null);
-    }
+    gSubDialog.open("chrome://messenger/content/preferences/attachmentReminder.xul",
+                    "resizable=no");
   },
 
   updateAutosave: function()
@@ -106,12 +92,7 @@ var gComposePane = {
 
   editDirectories: function()
   {
-    if (this._loadInContent) {
-      gSubDialog.open("chrome://messenger/content/addressbook/pref-editdirectories.xul");
-    } else {
-      window.openDialog("chrome://messenger/content/addressbook/pref-editdirectories.xul",
-                        "editDirectories", "chrome,modal=yes,resizable=no", null);
-    }
+    gSubDialog.open("chrome://messenger/content/addressbook/pref-editdirectories.xul");
   },
 
   initAbDefaultStartupDir: function() {

mail/components/preferences/display.js

@@ -7,8 +7,6 @@ var gDisplayPane = {
   mInitialized: false,
   mTagListBox:  null,
 
-  _loadInContent: Services.prefs.getBoolPref("mail.preferences.inContent"),
-
   init: function ()
   {
     if (!(("arguments" in window) && window.arguments[1])) {
@@ -191,13 +189,7 @@ var gDisplayPane = {
    */
   configureFonts: function ()
   {
-    if (this._loadInContent) {
-      gSubDialog.open("chrome://messenger/content/preferences/fonts.xul");
-    } else {
-      document.documentElement
-              .openSubDialog("chrome://messenger/content/preferences/fonts.xul",
-                             "", null);
-    }
+    gSubDialog.open("chrome://messenger/content/preferences/fonts.xul");
   },
 
   /**
@@ -206,14 +198,8 @@ var gDisplayPane = {
    */
   configureColors: function ()
   {
-    if (this._loadInContent) {
-      gSubDialog.open("chrome://messenger/content/preferences/colors.xul",
-                      "resizable=no");
-    } else {
-      document.documentElement
-              .openSubDialog("chrome://messenger/content/preferences/colors.xul",
-                             "", null);
-    }
+    gSubDialog.open("chrome://messenger/content/preferences/colors.xul",
+                    "resizable=no");
   },
 
 
@@ -258,32 +244,16 @@ var gDisplayPane = {
     {
       var tagElToEdit = this.mTagListBox.getItemAtIndex(index);
       var args = {result: "", keyToEdit: tagElToEdit.getAttribute("value"), okCallback: editTagCallback};
-      if (this._loadInContent) {
-        let dialog = gSubDialog.open("chrome://messenger/content/newTagDialog.xul",
-                                     "resizable=no", args);
-      } else {
-        let dialog = window.openDialog(
-                    "chrome://messenger/content/newTagDialog.xul",
-                    "",
-                    "centerscreen,chrome,titlebar,modal",
-                    args);
-      }
+      let dialog = gSubDialog.open("chrome://messenger/content/newTagDialog.xul",
+                                   "resizable=no", args);
     }
   },
 
   addTag: function()
   {
     var args = {result: "", okCallback: addTagCallback};
-    if (this._loadInContent) {
-      let dialog = gSubDialog.open("chrome://messenger/content/newTagDialog.xul",
-                                   "resizable=no", args);
-    } else {
-      let dialog = window.openDialog(
-                   "chrome://messenger/content/newTagDialog.xul",
-                   "",
-                   "centerscreen,chrome,titlebar,modal",
-                   args);
-    }
+    let dialog = gSubDialog.open("chrome://messenger/content/newTagDialog.xul",
+                                 "resizable=no", args);
   },
 
   onSelect: function()

mail/components/preferences/general.js

@@ -7,8 +7,6 @@ var gGeneralPane = {
   mPane: null,
   mStartPageUrl: "",
 
-  _loadInContent: Services.prefs.getBoolPref("mail.preferences.inContent"),
-
   init: function ()
   {
     this.mPane = document.getElementById("paneGeneral");
@@ -52,26 +50,14 @@ var gGeneralPane = {
 
   customizeMailAlert: function()
   {
-    if (this._loadInContent) {
-      gSubDialog.open("chrome://messenger/content/preferences/notifications.xul",
-                      "resizable=no");
-    } else {
-      document.documentElement
-              .openSubDialog("chrome://messenger/content/preferences/notifications.xul",
-                              "", null);
-    }
+    gSubDialog.open("chrome://messenger/content/preferences/notifications.xul",
+                    "resizable=no");
   },
 
   configureDockOptions: function()
   {
-    if (this._loadInContent) {
-      gSubDialog.open("chrome://messenger/content/preferences/dockoptions.xul",
-                      "resizable=no");
-    } else {
-      document.documentElement
-              .openSubDialog("chrome://messenger/content/preferences/dockoptions.xul",
-                              "", null);
-    }
+    gSubDialog.open("chrome://messenger/content/preferences/dockoptions.xul",
+                    "resizable=no");
   },
 
   convertURLToLocalFile: function(aFileURL)

mail/components/preferences/jar.mn

@@ -3,7 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 messenger.jar:
-*   content/messenger/preferences/preferences.xul
 *   content/messenger/preferences/aboutPreferences.xul
     content/messenger/preferences/aboutPreferences.xml
     content/messenger/preferences/preferences.css

mail/components/preferences/preferences.xul

@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-# -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#ifdef XP_WIN
-#define USE_WIN_TITLE_STYLE
-#endif
-
-<?xml-stylesheet href="chrome://global/skin/global.css"?>
-<?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
-<?xml-stylesheet href="chrome://messenger/content/messenger.css"?>
-<?xml-stylesheet href="chrome://messenger/skin/messenger.css"?>
-<?xml-stylesheet href="chrome://messenger/skin/filefield.css"?>
-<?xml-stylesheet href="chrome://messenger/content/preferences/handlers.css"?>
-<?xml-stylesheet href="chrome://messenger/skin/preferences/applications.css"?>
-
-#include doctype.inc
-
-<prefwindow type="prefwindow"
-            id="MailPreferences"
-            windowtype="Mail:Preferences"
-#ifdef USE_WIN_TITLE_STYLE
-            title="&prefWindow.titleWin;"
-#else
-#ifdef XP_UNIX
-#ifndef XP_MACOSX
-            title="&prefWindow.titleGNOME;"
-#endif
-#endif
-#endif
-            xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-#ifdef USE_WIN_TITLE_STYLE
-            style="&prefWindow.styleWindows;">
-#else
-#ifdef XP_MACOSX
-            style="&prefWindow.styleMac;">
-#else
-            style="&prefWindow.styleGNOME;">
-#endif
-#endif
-  <stringbundle id="bundleBrand" src="chrome://branding/locale/brand.properties"/>
-  <stringbundle id="bundlePreferences"
-                src="chrome://messenger/locale/preferences/preferences.properties"/>
-
-  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript" src="chrome://communicator/content/contentAreaClick.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/preferences/preferences.js"/>
-
-#include general.inc.xul
-#include display.inc.xul
-#include compose.inc.xul
-#include chat.inc.xul
-#include privacy.inc.xul
-#include security.inc.xul
-#include applications.inc.xul
-#include advanced.inc.xul
-</prefwindow>

mail/components/preferences/privacy.js

@@ -5,8 +5,6 @@
 
 var gPrivacyPane = {
 
-  _loadInContent: Services.prefs.getBoolPref("mail.preferences.inContent"),
-
   init: function()
   {
   },
@@ -74,14 +72,8 @@ var gPrivacyPane = {
                    permissionType : "cookie",
                    windowTitle    : bundle.getString("cookiepermissionstitle"),
                    introText      : bundle.getString("cookiepermissionstext") };
-    if (this._loadInContent) {
-      gSubDialog.open("chrome://messenger/content/preferences/permissions.xul",
-                      null, params);
-    } else {
-      document.documentElement.openWindow("mailnews:permissions",
-                        "chrome://messenger/content/preferences/permissions.xul",
-                        "", params);
-    }
+    gSubDialog.open("chrome://messenger/content/preferences/permissions.xul",
+                    null, params);
   },
 
   /**
@@ -89,12 +81,7 @@ var gPrivacyPane = {
    */
   showCookies: function(aCategory)
   {
-    if (this._loadInContent) {
-      gSubDialog.open("chrome://messenger/content/preferences/cookies.xul");
-    } else {
-      document.documentElement.openWindow("mailnews:cookies",
-        "chrome://messenger/content/preferences/cookies.xul", "", null);
-    }
+    gSubDialog.open("chrome://messenger/content/preferences/cookies.xul");
   },
 
   /**
@@ -149,13 +136,7 @@ var gPrivacyPane = {
                    permissionType : "image",
                    windowTitle    : bundle.getString("imagepermissionstitle"),
                    introText      : bundle.getString("imagepermissionstext") };
-    if (this._loadInContent) {
-      gSubDialog.open("chrome://messenger/content/preferences/permissions.xul",
-                      null, params);
-    } else {
-      document.documentElement.openWindow("mailnews:permissions",
-        "chrome://messenger/content/preferences/permissions.xul", "", params);
-    }
+    gSubDialog.open("chrome://messenger/content/preferences/permissions.xul",
+                    null, params);
   },
-
 };

mail/components/preferences/security.js

@@ -9,8 +9,6 @@ var gSecurityPane = {
   mPane: null,
   mInitialized: false,
 
-  _loadInContent: Services.prefs.getBoolPref("mail.preferences.inContent"),
-
   init: function ()
   {
     this.mPane = document.getElementById("paneSecurity");
@@ -52,13 +50,7 @@ var gSecurityPane = {
 
   openJunkLog: function()
   {
-    if (this._loadInContent) {
-      gSubDialog.open("chrome://messenger/content/junkLog.xul");
-    } else {
-      document.documentElement.openWindow("mailnews:junklog",
-                                          "chrome://messenger/content/junkLog.xul",
-                                          "", null);
-    }
+    gSubDialog.open("chrome://messenger/content/junkLog.xul");
   },
 
   resetTrainingData: function()
@@ -143,14 +135,8 @@ var gSecurityPane = {
                             bundle.getString("pw_change2empty_in_fips_mode"));
     }
     else {
-      if (this._loadInContent) {
-        gSubDialog.open("chrome://mozapps/content/preferences/removemp.xul",
-                        null, null, this._initMasterPasswordUI.bind(this));
-      } else {
-        document.documentElement
-                .openSubDialog("chrome://mozapps/content/preferences/removemp.xul",
-                               "", null);
-      }
+      gSubDialog.open("chrome://mozapps/content/preferences/removemp.xul",
+                      null, null, this._initMasterPasswordUI.bind(this));
     }
     this._initMasterPasswordUI();
   },
@@ -160,15 +146,8 @@ var gSecurityPane = {
    */
   changeMasterPassword: function ()
   {
-    if (this._loadInContent) {
-      gSubDialog.open("chrome://mozapps/content/preferences/changemp.xul",
-                      null, null, this._initMasterPasswordUI.bind(this));
-    } else {
-      document.documentElement
-              .openSubDialog("chrome://mozapps/content/preferences/changemp.xul",
-                             "", null);
-      this._initMasterPasswordUI();
-    }
+    gSubDialog.open("chrome://mozapps/content/preferences/changemp.xul",
+                    null, null, this._initMasterPasswordUI.bind(this));
   },
 
   /**
@@ -177,14 +156,7 @@ var gSecurityPane = {
    */
   showPasswords: function ()
   {
-    if (this._loadInContent) {
-      gSubDialog.open("chrome://passwordmgr/content/passwordManager.xul");
-    } else {
-      document.documentElement
-              .openWindow("Toolkit:PasswordManager",
-                          "chrome://passwordmgr/content/passwordManager.xul",
-                          "", null);
-    }
+    gSubDialog.open("chrome://passwordmgr/content/passwordManager.xul");
   },
 
   updateDownloadedPhishingListState: function()

mail/themes/linux/jar.mn

@@ -100,18 +100,7 @@ classic.jar:
   skin/classic/messenger-newsblog/icons/server-rss.png        (mail/newsblog/server-rss.png)
   skin/classic/messenger/preferences/alwaysAsk.png            (mail/preferences/alwaysAsk.png)
   skin/classic/messenger/preferences/preferences.css          (mail/preferences/preferences.css)
-  skin/classic/messenger/preferences/general.png              (mail/preferences/general.png)
-  skin/classic/messenger/preferences/display.png              (mail/preferences/display.png)
-  skin/classic/messenger/preferences/composition.png          (mail/preferences/composition.png)
-  skin/classic/messenger/preferences/privacy.png              (mail/preferences/privacy.png)
-  skin/classic/messenger/preferences/security.png             (mail/preferences/security.png)
-  skin/classic/messenger/preferences/attachments.png          (mail/preferences/attachments.png)
   skin/classic/messenger/preferences/applications.css         (mail/preferences/applications.css)
-  skin/classic/messenger/preferences/advanced.png             (mail/preferences/advanced.png)
-  skin/classic/messenger/preferences/chat.png                 (mail/preferences/chat.png)
-  skin/classic/messenger/preferences/background.png           (mail/preferences/background.png)
-  skin/classic/messenger/preferences/hover.png                (mail/preferences/hover.png)
-  skin/classic/messenger/preferences/selected.png             (mail/preferences/selected.png)
   skin/classic/messenger/preferences/auth-error.png           (mail/preferences/auth-error.png)
   skin/classic/messenger/preferences/dialog.css               (mail/preferences/dialog.css)
   skin/classic/messenger/preferences/aboutPreferences.css     (mail/preferences/aboutPreferences.css)

mail/themes/linux/mail/preferences/preferences.css

@@ -56,36 +56,6 @@ radio[pane] {
   height: 32px;
 }
 
-radio[pane][selected="true"] {
-  background-color: Highlight;
-  color: HighlightText;
-}
-
-radio[pane=paneGeneral] {
-  list-style-image: url("chrome://messenger/skin/preferences/general.png");
-}
-radio[pane=paneDisplay] {
-  list-style-image: url("chrome://messenger/skin/preferences/display.png");
-}
-radio[pane=paneCompose] {
-  list-style-image: url("chrome://messenger/skin/preferences/composition.png");
-}
-radio[pane=paneChat] {
-  list-style-image: url("chrome://messenger/skin/preferences/chat.png");
-}
-radio[pane=panePrivacy] {
-  list-style-image: url("chrome://messenger/skin/preferences/privacy.png");
-}
-radio[pane=paneSecurity] {
-  list-style-image: url("chrome://messenger/skin/preferences/security.png");
-}
-radio[pane=paneApplications] {
-  list-style-image: url("chrome://messenger/skin/preferences/attachments.png");
-}
-radio[pane=paneAdvanced] {
-  list-style-image: url("chrome://messenger/skin/preferences/advanced.png");
-}
-
 menulist > .menulist-label-box > .menulist-icon[src] {
   margin-inline-start: 5px;
   margin-inline-end: 5px;

mail/themes/osx/jar.mn

@@ -121,10 +121,6 @@ classic.jar:
   skin/classic/messenger/preferences/saveFile.png                (mail/preferences/saveFile.png)
   skin/classic/messenger/preferences/preferences.css             (mail/preferences/preferences.css)
   skin/classic/messenger/preferences/applications.css            (mail/preferences/applications.css)
-  skin/classic/messenger/preferences/mail-options.png            (mail/preferences/mail-options.png)
-  skin/classic/messenger/preferences/mail-options@2x.png         (mail/preferences/mail-options@2x.png)
-  skin/classic/messenger/preferences/panebutton-active.png       (mail/preferences/panebutton-active.png)
-  skin/classic/messenger/preferences/panebutton-inactive.png     (mail/preferences/panebutton-inactive.png)
   skin/classic/messenger/preferences/auth-error.png              (mail/preferences/auth-error.png)
   skin/classic/messenger/preferences/dialog.css                  (mail/preferences/dialog.css)
   skin/classic/messenger/preferences/aboutPreferences.css        (mail/preferences/aboutPreferences.css)

mail/themes/osx/mail/preferences/preferences.css

@@ -35,39 +35,6 @@ prefwindow[type="child"] > prefpane {
   padding-top: 0 !important;
 }
 
-.paneSelector {
-  font: message-box;
-  padding: 1px 4px;
-  -moz-appearance: toolbar;
-  margin: 0;
-  list-style-image: url("chrome://messenger/skin/preferences/mail-options.png");
-}
-
-radio[pane] {
-  border: solid transparent;
-  border-width: 0 2px;
-  padding: 5px 4px 3px;
-  margin: 0;
-  -moz-appearance: none;
-  text-shadow: rgba(255, 255, 255, 0.4) 0 1px;
-}
-
-radio[pane]:active:hover {
-  text-shadow: none;
-}
-
-radio[pane]:active:hover > .paneButtonIcon {
-  filter: brightness(0.55);
-}
-
-radio[pane][selected="true"] {
-  border-image: url("chrome://messenger/skin/preferences/panebutton-active.png") 0 2 fill repeat stretch;
-}
-
-radio[pane][selected="true"]:-moz-window-inactive {
-  border-image: url("chrome://messenger/skin/preferences/panebutton-inactive.png") 0 2 fill repeat stretch;
-}
-
 .paneButtonLabel {
   margin: 0 !important;
 }
@@ -92,81 +59,6 @@ prefwindow:not([type="child"]) {
   padding: 0 !important;
 }
 
-radio[pane=paneGeneral] {
-  -moz-image-region: rect(0px, 32px, 32px, 0px)
-}
-
-radio[pane=paneDisplay] {
-  -moz-image-region: rect(0px, 64px, 32px, 32px)
-}
-
-radio[pane=paneCompose] {
-  -moz-image-region: rect(0px, 96px, 32px, 64px)
-}
-
-radio[pane=paneChat] {
-  -moz-image-region: rect(0px, 288px, 32px, 256px);
-}
-
-radio[pane=panePrivacy] {
-  -moz-image-region: rect(0px, 320px, 32px, 288px);
-}
-
-radio[pane=paneSecurity] {
-  -moz-image-region: rect(0px, 128px, 32px, 96px);
-}
-
-radio[pane=paneApplications] {
-  -moz-image-region: rect(0px, 160px, 32px, 128px);
-}
-
-radio[pane=paneAdvanced] {
-  -moz-image-region: rect(0px, 256px, 32px, 224px)
-}
-
-@media (min-resolution: 2dppx) {
-  .paneSelector {
-    list-style-image: url("chrome://messenger/skin/preferences/mail-options@2x.png");
-  }
-
-  radio[pane=paneGeneral] {
-    -moz-image-region: rect(0px, 64px, 64px, 0px)
-  }
-
-  radio[pane=paneDisplay] {
-    -moz-image-region: rect(0px, 128px, 64px, 64px)
-  }
-
-  radio[pane=paneCompose] {
-    -moz-image-region: rect(0px, 192px, 64px, 128px)
-  }
-
-  radio[pane=paneChat] {
-    -moz-image-region: rect(0px, 576px, 64px, 512px);
-  }
-
-  radio[pane=panePrivacy] {
-    -moz-image-region: rect(0px, 640px, 64px, 576px);
-  }
-
-  radio[pane=paneSecurity] {
-    -moz-image-region: rect(0px, 256px, 64px, 192px);
-  }
-
-  radio[pane=paneApplications] {
-    -moz-image-region: rect(0px, 320px, 64px, 256px);
-  }
-
-  radio[pane=paneAdvanced] {
-    -moz-image-region: rect(0px, 512px, 64px, 448px)
-  }
-
-  .paneButtonIcon {
-    width: 32px;
-    height: 32px;
-  }
-}
-
 /* Attachments Pane */
 #MailPreferences[animated="true"] #handlersView {
   height: 17em;

mail/themes/windows/jar.mn

@@ -92,21 +92,13 @@ classic.jar:
   skin/classic/messenger/messengercompose/noise.png           (mail/compose/noise.png)
   skin/classic/messenger/downloads/aboutDownloads.css         (mail/downloads/aboutDownloads.css)
   skin/classic/messenger/preferences/aboutPreferences.css     (mail/preferences/aboutPreferences.css)
-  skin/classic/messenger/preferences/advanced.png             (mail/preferences/advanced.png)
   skin/classic/messenger/preferences/alwaysAsk.png            (mail/preferences/alwaysAsk.png)
   skin/classic/messenger/preferences/application.png          (mail/preferences/application.png)
   skin/classic/messenger/preferences/applications.css         (mail/preferences/applications.css)
-  skin/classic/messenger/preferences/attachments.png          (mail/preferences/attachments.png)
   skin/classic/messenger/preferences/auth-error.png           (mail/preferences/auth-error.png)
-  skin/classic/messenger/preferences/chat.png                 (mail/preferences/chat.png)
-  skin/classic/messenger/preferences/composition.png          (mail/preferences/composition.png)
   skin/classic/messenger/preferences/dialog.css               (mail/preferences/dialog.css)
-  skin/classic/messenger/preferences/display.png              (mail/preferences/display.png)
-  skin/classic/messenger/preferences/general.png              (mail/preferences/general.png)
   skin/classic/messenger/preferences/preferences.css          (mail/preferences/preferences.css)
-  skin/classic/messenger/preferences/privacy.png              (mail/preferences/privacy.png)
   skin/classic/messenger/preferences/saveFile.png             (mail/preferences/saveFile.png)
-  skin/classic/messenger/preferences/security.png             (mail/preferences/security.png)
   skin/classic/messenger/smime/msgCompSMIMEOverlay.css        (mail/smime/msgCompSMIMEOverlay.css)
   skin/classic/messenger/smime/msgHdrViewSMIMEOverlay.css     (mail/smime/msgHdrViewSMIMEOverlay.css)
   skin/classic/messenger/smime/msgReadSMIMEOverlay.css        (mail/smime/msgReadSMIMEOverlay.css)

mail/themes/windows/mail/preferences/preferences.css

@@ -41,14 +41,7 @@ prefwindow[type="child"] > prefpane {
 
 prefwindow[type="child"] .prefWindow-dlgbuttons {
   padding: 0;
-}
 
-radio[pane] {
-  -moz-appearance: none;
-  margin: 0 1px;
-  padding: 1px 3px;
-  min-width: 4.5em;
-}
 
 .paneSelector {
   border-bottom: 2px groove ThreeDFace;
@@ -58,28 +51,6 @@ radio[pane] {
   color: -moz-FieldText;
 }
 
-.paneButtonIcon {
-  width: 32px;
-  height: 32px;
-}
-
-radio[pane]:hover {
-  background-color: #e0e8f6;
-  color: black;
-  -moz-appearance: none;
-}
-
-radio[pane][selected="true"] {
-  background-color: #c1d2ee;
-  color: black;
-  -moz-appearance: none;
-}
-
-radio[pane] {
-  padding-top: 5px;
-  min-width: 80px;
-}
-
 @media (-moz-windows-default-theme) {
   menulist > .menulist-label-box > .menulist-icon[src] {
     margin-inline-start: 7px;
@@ -87,31 +58,6 @@ radio[pane] {
   }
 }
 
-radio[pane=paneGeneral] {
-  list-style-image: url("chrome://messenger/skin/preferences/general.png");
-}
-radio[pane=paneDisplay] {
-  list-style-image: url("chrome://messenger/skin/preferences/display.png");
-}
-radio[pane=paneCompose] {
-  list-style-image: url("chrome://messenger/skin/preferences/composition.png");
-}
-radio[pane=paneChat] {
-  list-style-image: url("chrome://messenger/skin/preferences/chat.png");
-}
-radio[pane=panePrivacy] {
-  list-style-image: url("chrome://messenger/skin/preferences/privacy.png");
-}
-radio[pane=paneSecurity] {
-  list-style-image: url("chrome://messenger/skin/preferences/security.png");
-}
-radio[pane=paneApplications] {
-  list-style-image: url("chrome://messenger/skin/preferences/attachments.png");
-}
-radio[pane=paneAdvanced] {
-  list-style-image: url("chrome://messenger/skin/preferences/advanced.png");
-}
-
 /* Attachments Pane */
 #MailPreferences[animated="true"] #handlersView {
   height: 25em;