Bug 1424601 - Restore the Preferences bindings/styles after their removal in toolkit in bug 1379338. rs=jorgk

--HG--
rename : mail/components/preferences/preferences.xml => mail/components/preferences/aboutPreferences.xml

mail/base/content/messenger.css

@@ -331,7 +331,7 @@ splitmenu {
 
 preftab,
 preftab:root /* override :root */ {
-  -moz-binding: url("chrome://messenger/content/preferences/preferences.xml#preftab");
+  -moz-binding: url("chrome://messenger/content/preferences/aboutPreferences.xml#preftab");
   -moz-box-orient: vertical;
 }
 

mail/components/preferences/aboutPreferences.xml

@@ -17,7 +17,7 @@
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <binding id="preftab"
-           extends="chrome://global/content/bindings/preferences.xml#prefwindow">
+           extends="chrome://messenger/content/preferences/preferences.xml#prefwindow">
     <resources>
       <stylesheet src="chrome://global/skin/preferences.css"/>
     </resources>

mail/components/preferences/attachmentReminder.xul

@@ -5,6 +5,7 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://global/skin/"?>
+<?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
 <!DOCTYPE prefwindow [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 %brandDTD;

mail/components/preferences/colors.xul

@@ -6,9 +6,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-#ifdef XP_MACOSX
 <?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
-#endif
 
 <!DOCTYPE prefwindow SYSTEM "chrome://messenger/locale/preferences/colors.dtd" >
 

mail/components/preferences/connection.xul

@@ -8,6 +8,7 @@
 <!DOCTYPE prefwindow SYSTEM "chrome://messenger/locale/preferences/connection.dtd">
 
 <?xml-stylesheet href="chrome://global/skin/"?>
+<?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
 
 <prefwindow id="ConnectionsDialog" type="child"
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"

mail/components/preferences/fonts.xul

@@ -1,15 +1,12 @@
 <?xml version="1.0"?>
-
+<!-- -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-# -*- 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
-# 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
-# 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/. -->
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 <?xml-stylesheet href="chrome://global/skin/"?>
 <?xml-stylesheet href="chrome://messenger/content/charsetList.css"?>
-#ifdef XP_MACOSX
 <?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
-#endif
 
 <!DOCTYPE prefwindow [
 <!ENTITY % fontsDTD SYSTEM "chrome://messenger/locale/preferences/fonts.dtd" >

mail/components/preferences/jar.mn

@@ -5,8 +5,10 @@
 messenger.jar:
 *   content/messenger/preferences/preferences.xul
 *   content/messenger/preferences/aboutPreferences.xul
-    content/messenger/preferences/preferences.xml
+    content/messenger/preferences/aboutPreferences.xml
+    content/messenger/preferences/preferences.css
     content/messenger/preferences/preferences.js
+*   content/messenger/preferences/preferences.xml       (../../../common/bindings/preferences.xml)
     content/messenger/preferences/preferencesTab.xul
     content/messenger/preferences/preferencesTab.js
 *   content/messenger/preferences/general.xul
@@ -24,14 +26,14 @@ messenger.jar:
     content/messenger/preferences/compose.js
     content/messenger/preferences/privacy.xul
     content/messenger/preferences/privacy.js
-*   content/messenger/preferences/sendoptions.xul
+    content/messenger/preferences/sendoptions.xul
     content/messenger/preferences/sendoptions.js
     content/messenger/preferences/security.xul
     content/messenger/preferences/security.js
     content/messenger/preferences/advanced.js
 *   content/messenger/preferences/advanced.xul
     content/messenger/preferences/receipts.js
-*   content/messenger/preferences/receipts.xul
+    content/messenger/preferences/receipts.xul
     content/messenger/preferences/connection.js
 *   content/messenger/preferences/connection.xul
     content/messenger/preferences/downloads.js
@@ -45,7 +47,7 @@ messenger.jar:
     content/messenger/preferences/handlers.css
     content/messenger/preferences/actionsshared.js
     content/messenger/preferences/fonts.js
-*   content/messenger/preferences/fonts.xul
+    content/messenger/preferences/fonts.xul
 #ifndef XP_MACOSX
     content/messenger/preferences/notifications.xul
 #endif

mail/components/preferences/preferences.css

@@ -0,0 +1,51 @@
+/* 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/. */
+
+prefwindow,
+prefwindow:root /* override :root */ {
+  -moz-binding: url("chrome://messenger/content/preferences/preferences.xml#prefwindow");
+  -moz-box-orient: vertical;
+}
+
+prefpane {
+  -moz-binding: url("chrome://messenger/content/preferences/preferences.xml#prefpane");
+  -moz-box-orient: vertical;
+}
+
+prefwindow > .paneDeckContainer {
+  overflow: hidden;
+}
+
+prefpane > .content-box {
+  overflow: hidden;
+}
+
+prefwindow[type="child"] > .paneDeckContainer {
+  overflow: -moz-hidden-unscrollable;
+}
+
+prefwindow[type="child"] > prefpane > .content-box {
+  -moz-box-flex: 1;
+  overflow: -moz-hidden-unscrollable;
+}
+
+preferences {
+  -moz-binding: url("chrome://messenger/content/preferences/preferences.xml#preferences");
+  visibility: collapse;
+}
+
+preference {
+  -moz-binding: url("chrome://messenger/content/preferences/preferences.xml#preference");
+  visibility: collapse;
+}
+
+radio[pane] {
+  -moz-binding: url("chrome://messenger/content/preferences/preferences.xml#panebutton") !important;
+  -moz-box-orient: vertical;
+  -moz-box-align: center;
+}
+
+prefwindow[chromehidden~="toolbar"] .chromeclass-toolbar {
+  display: none;
+}

mail/components/preferences/receipts.xul

@@ -1,14 +1,11 @@
 <?xml version="1.0"?>
-
+<!-- -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-# -*- 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
-# 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
-# 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/. -->
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-#ifdef XP_MACOSX
 <?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
-#endif
 
 <!DOCTYPE prefwindow [
 <!ENTITY % receiptsDTD SYSTEM "chrome://messenger/locale/preferences/receipts.dtd">

mail/components/preferences/sendoptions.xul

@@ -1,13 +1,11 @@
 <?xml version="1.0"?>
-# -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+<!-- -*- 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
+   - 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
+   - 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/.
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://global/skin/"?>
-#ifdef XP_MACOSX
 <?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
-#endif
 
 <!DOCTYPE prefwindow [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >

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

@@ -1,12 +1,65 @@
-/*
+/* This Source Code Form is subject to the terms of the Mozilla Public
-# -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-# This Source Code Form is subject to the terms of the Mozilla Public
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-# 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/.
+@import url("chrome://messenger/content/preferences/preferences.css");
-*/
 
 /* Global Styles */
 
+prefwindow {
+  -moz-appearance: window;
+  background-color: -moz-Dialog;
+  color: -moz-DialogText;
+  font: message-box;
+  padding: 0;
+}
+
+prefpane {
+  padding: 8px;
+}
+
+prefwindow[type="child"] {
+  padding: 8px;
+}
+
+prefwindow[type="child"] > prefpane {
+  padding: 0;
+}
+
+.prefWindow-dlgbuttons {
+  padding-bottom: 8px;
+  padding-inline-start: 8px;
+  padding-inline-end: 8px;
+}
+
+prefwindow[type="child"] .prefWindow-dlgbuttons {
+  padding: 0;
+}
+
+radio[pane] {
+  -moz-appearance: none;
+  min-width: 4.5em;
+  margin: 0;
+  padding: 3px;
+  color: -moz-FieldText;
+}
+
+.paneSelector {
+  -moz-appearance: listbox;
+  margin: 8px 8px 0;
+  padding: 0;
+}
+
+.paneButtonIcon {
+  width: 32px;
+  height: 32px;
+}
+
+radio[pane][selected="true"] {
+  background-color: Highlight;
+  color: HighlightText;
+}
+
 radio[pane=paneGeneral] {
   list-style-image: url("chrome://messenger/skin/preferences/general.png");
 }
@@ -17,7 +70,7 @@ 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"); /*FIXME*/
+  list-style-image: url("chrome://messenger/skin/preferences/chat.png");
 }
 radio[pane=panePrivacy] {
   list-style-image: url("chrome://messenger/skin/preferences/privacy.png");

mail/themes/osx/jar.mn

@@ -120,6 +120,8 @@ classic.jar:
   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

@@ -1,9 +1,75 @@
-/*
+/* This Source Code Form is subject to the terms of the Mozilla Public
-# -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-# This Source Code Form is subject to the terms of the Mozilla Public
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-# 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/.
+@import url("chrome://messenger/content/preferences/preferences.css");
-*/
+
+/* Global Styles */
+
+prefwindow {
+  -moz-appearance: dialog;
+  background-color: #ffffff;
+  color: -moz-DialogText;
+  font: -moz-dialog;
+  padding: 0;
+}
+
+prefwindow[type="child"] {
+  padding-top: 18px;
+  padding-bottom: 15px;
+  padding-inline-start: 18px;
+  padding-inline-end: 20px;
+}
+
+prefpane {
+  padding: 12px;
+}
+
+prefwindow[type="child"] > prefpane {
+  padding: 0;
+}
+
+.prefWindow-dlgbuttons {
+  margin: 0 12px 12px;
+  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"] {
+  -moz-border-image: url("chrome://messenger/skin/preferences/panebutton-active.png") 0 2 fill repeat stretch;
+}
+
+radio[pane][selected="true"]:-moz-window-inactive {
+  -moz-border-image: url("chrome://messenger/skin/preferences/panebutton-inactive.png") 0 2 fill repeat stretch;
+}
+
+.paneButtonLabel {
+  margin: 0 !important;
+}
 
 .windowDialog {
   padding: 12px;
@@ -25,14 +91,6 @@ prefwindow:not([type="child"]) {
   padding: 0 !important;
 }
 
-prefpane {
-  padding: 12px;
-}
-
-.paneSelector {
-  list-style-image: url("chrome://messenger/skin/preferences/mail-options.png");
-}
-
 radio[pane=paneGeneral] {
   -moz-image-region: rect(0px, 32px, 32px, 0px)
 }

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

@@ -2,10 +2,76 @@
  * 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/. */
 
+@import url("chrome://messenger/content/preferences/preferences.css");
+
 /* Global Styles */
 
+prefwindow {
+  -moz-appearance: window;
+  background-color: -moz-Dialog;
+  color: -moz-DialogText;
+  font: message-box;
+  padding: 0;
+}
+
+prefpane {
+  padding-top: 8px;
+  padding-bottom: 10px;
+  padding-inline-start: 8px;
+  padding-inline-end: 10px;
+}
+
+prefwindow[type="child"] {
+  padding-top: 8px;
+  padding-bottom: 10px;
+  padding-inline-start: 8px;
+  padding-inline-end: 10px;
+}
+
+prefwindow[type="child"] > prefpane {
+  padding: 0;
+}
+
+.prefWindow-dlgbuttons {
+  padding-bottom: 10px;
+  padding-inline-start: 8px;
+  padding-inline-end: 10px;
+}
+
+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;
+  margin: 0;
   padding-inline-start: 0;
+  background-color: -moz-Field;
+  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] {