From 681caf5d2d743db2d6dc88a6cea848d58fe344ea Mon Sep 17 00:00:00 2001
From: "ben%netscape.com" <ben%netscape.com>
Date: Sun, 30 Apr 2000 02:49:07 +0000
Subject: [PATCH] skinnability fixes for addrbook, mailcompose, messenger,
 mailnews prefpanels

---
 .../resources/content/pref-addressing.xul     |  2 +-
 .../resources/content/addressbook.xul         | 21 +++++++------
 .../resources/content/pref-diskspace.xul      |  2 +-
 .../prefs/resources/content/pref-mailnews.xul |  2 +-
 .../prefs/resources/content/pref-receipts.xul |  2 +-
 .../content/pref-viewing_messages.xul         |  2 +-
 .../resources/content/mailWindowOverlay.xul   | 30 +++++++++----------
 .../content/pref-composing_messages.xul       |  2 +-
 .../resources/content/pref-formatting.xul     |  2 +-
 .../resources/content/messengercompose.xul    | 29 ++++++++----------
 10 files changed, 44 insertions(+), 50 deletions(-)

diff --git a/mailnews/addrbook/prefs/resources/content/pref-addressing.xul b/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
index 179cb29a5bfa..dc67ee422f6c 100644
--- a/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
+++ b/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
@@ -17,7 +17,7 @@
   ]]>
   </script>  
     
-  <box class="box-smallheader" title="&pane.title;" description="&pane.description;"/>
+  <box class="box-smallheader" title="&pane.title;"/>
 
   <titledbox orient="vertical">
     <title><text value="&pinpoint.label;"/></title>
diff --git a/mailnews/addrbook/resources/content/addressbook.xul b/mailnews/addrbook/resources/content/addressbook.xul
index 2aeb09573fad..9729f89f624c 100644
--- a/mailnews/addrbook/resources/content/addressbook.xul
+++ b/mailnews/addrbook/resources/content/addressbook.xul
@@ -18,6 +18,7 @@ Communications Corporation. Portions created by Netscape are
  Copyright (C) 1998-1999 Netscape Communications Corporation. All
 Rights Reserved.
 --> 
+<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://messenger/skin/addressbook/addressbook.css" type="text/css"?> 
 
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
@@ -217,14 +218,14 @@ Rights Reserved.
 	
 	<!-- toolbar -->
 	<toolbox>
-		<toolbar class="standard" id="abToolbar" persist="collapsed">
+		<toolbar class="toolbar-primary" id="abToolbar" persist="collapsed">
 			<box id="toolbar_button_box">
-				<button class="key-toolbar left" orient="vertical" id="button_newcard" value="&newcardButton.label;" onclick="AbNewCard()"/>
-				<button class="key-toolbar left" orient="vertical" id="button_newlist" value="&newlistButton.label;" disabled="true" onclick="AbNewList()"/>
+				<button class="button-toolbar-2 top" orient="vertical" id="button_newcard" value="&newcardButton.label;" onclick="AbNewCard()"/>
+				<button class="button-toolbar-2 top" orient="vertical" id="button_newlist" value="&newlistButton.label;" disabled="true" onclick="AbNewList()"/>
             	<toolbarseparator/>
-				<button class="toolbar left" orient="vertical" id="button_editcard" value="&editButton.label;" onclick="AbEditCard()"/>
-				<button class="toolbar left" orient="vertical" id="button_newmessage" value="&newmsgButton.label;" onclick="AbNewMessage()"/>
-				<button class="toolbar left" orient="vertical" id="button_delete" disabled="true" value="&deleteButton.label;" onclick="goDoCommand('button_delete')"/>
+				<button class="button-toolbar-2 top" orient="vertical" id="button_editcard" value="&editButton.label;" onclick="AbEditCard()"/>
+				<button class="button-toolbar-2 top" orient="vertical" id="button_newmessage" value="&newmsgButton.label;" onclick="AbNewMessage()"/>
+				<button class="button-toolbar-2 top" orient="vertical" id="button_delete" disabled="true" value="&deleteButton.label;" onclick="goDoCommand('button_delete')"/>
 
 				<box align="vertical" flex="100%">
 					<spring flex="1"/> 
@@ -237,11 +238,9 @@ Rights Reserved.
 				<titledbutton id="button_search" class="other28" align="top" value="&searchButton.label;" disabled="true" onclick="AbSearch()"/-->
 			</box>
 
-			<box id="toolbar_throbber_box" align="vertical">
-				<titledbutton id="Throbber" onclick='goClickThrobber("addressbook.throbber.url")'>
-					<observes element="broadcaster_throbber" attribute="busy"/>
-				</titledbutton>
-			</box>
+      <button class="plain" id="navigator-throbber" oncommand='goClickThrobber("addressbook.throbber.url")'>
+        <observes element="broadcaster_throbber" attribute="busy"/>
+      </button>
 		</toolbar>
 	</toolbox>
 
diff --git a/mailnews/base/prefs/resources/content/pref-diskspace.xul b/mailnews/base/prefs/resources/content/pref-diskspace.xul
index e72274e14aae..b75a558da859 100644
--- a/mailnews/base/prefs/resources/content/pref-diskspace.xul
+++ b/mailnews/base/prefs/resources/content/pref-diskspace.xul
@@ -19,7 +19,7 @@
   ]]>
   </script>
 
-  <box class="box-smallheader" title="&pane.title;" description="&pane.description;"/>
+  <box class="box-smallheader" title="&pane.title;"/>
 
 	<titledbox orient="vertical">
 		<title><text value="&allMsg.label;"/></title>
diff --git a/mailnews/base/prefs/resources/content/pref-mailnews.xul b/mailnews/base/prefs/resources/content/pref-mailnews.xul
index 75077312b7fc..4fff2c42b89c 100644
--- a/mailnews/base/prefs/resources/content/pref-mailnews.xul
+++ b/mailnews/base/prefs/resources/content/pref-mailnews.xul
@@ -22,7 +22,7 @@
   <script language="javascript" src="chrome://global/content/strres.js"></script>
   <script language="javascript" src="chrome://communicator/content/pref/prefutilities.js"></script>
   
-  <box class="box-smallheader" title="&pane.title;" description="&pane.description;"/>
+  <box class="box-smallheader" title="&pane.title;"/>
 
   <titledbox orient="vertical">
     <title><text value="&windowSettings.label;"/></title>
diff --git a/mailnews/base/prefs/resources/content/pref-receipts.xul b/mailnews/base/prefs/resources/content/pref-receipts.xul
index b30337840506..acb11f98299c 100644
--- a/mailnews/base/prefs/resources/content/pref-receipts.xul
+++ b/mailnews/base/prefs/resources/content/pref-receipts.xul
@@ -23,7 +23,7 @@
   </script>
 
 
-  <box class="box-smallheader" title="&pane.title;" description="&pane.description;"/>
+  <box class="box-smallheader" title="&pane.title;"/>
 
   <titledbox orient="vertical">
     <title><text value="&requestReceipt.label;"/></title>
diff --git a/mailnews/base/prefs/resources/content/pref-viewing_messages.xul b/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
index 5ebb3f2733d4..41de49106341 100644
--- a/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
+++ b/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
@@ -53,7 +53,7 @@
   <script language="javascript" src="chrome://global/content/strres.js"></script>
   <script language="javascript" src="chrome://communicator/content/pref/prefutilities.js"></script>
 
-  <box class="box-smallheader" title="&pane.title;" description="&pane.description;"/>
+  <box class="box-smallheader" title="&pane.title;"/>
 
   <titledbox orient="vertical">
 	  <title><text value="&displayWidth.label;"/></title>
diff --git a/mailnews/base/resources/content/mailWindowOverlay.xul b/mailnews/base/resources/content/mailWindowOverlay.xul
index b9f880b5a183..a15c9afcb387 100644
--- a/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -500,17 +500,17 @@ Rights Reserved.
 </menubar>
 
 <toolbox id="mailToolbarToolbox">
-	<toolbar id="msgToolbar" class="decorated main-bar chromeclass-toolbar" persist="collapsed">
+	<toolbar class="toolbar-primary chromeclass-toolbar" id="msgToolbar" persist="collapsed">
 		<box id="toolbar_button_box">
-			<button class="key-toolbar left" orient="vertical" id="button_getmsg" value="&getMsgButton.label;" onclick="MsgGetMessage()"/>
-			<button class="key-toolbar left" orient="vertical" id="button_newmsg" value="&newMsgButton.label;" onclick="MsgNewMessage(event)"/>
+			<button class="button-toolbar-2 top" id="button_getmsg" value="&getMsgButton.label;" onclick="MsgGetMessage()"/>
+			<button class="button-toolbar-2 top" id="button_newmsg" value="&newMsgButton.label;" onclick="MsgNewMessage(event)"/>
 			<toolbarseparator/>
-			<button class="key-toolbar left" orient="vertical" id="button_reply" value="&replyButton.label;" onclick="MsgReplyMessage(event)"/>
-			<button class="key-toolbar left" orient="vertical" id="button_replyall" value="&replyAllButton.label;" onclick="MsgReplyToAllMessage(event)"/>
-			<button class="key-toolbar left" orient="vertical" id="button_forward" value="&forwardButton.label;" onclick="MsgForwardMessage(event)"/>
+			<button class="button-toolbar-2 top" id="button_reply" value="&replyButton.label;" onclick="MsgReplyMessage(event)"/>
+			<button class="button-toolbar-2 top" id="button_replyall" value="&replyAllButton.label;" onclick="MsgReplyToAllMessage(event)"/>
+			<button class="button-toolbar-2 top" id="button_forward" value="&forwardButton.label;" onclick="MsgForwardMessage(event)"/>
 			<toolbarseparator/>
 			<menu id="FileButtonMenu" datasources="rdf:null" rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild">
-				<button class="toolbar left" orient="vertical" id="button_file" value="&fileButton.label;"/>
+				<button class="button-toolbar-2 top" id="button_file" value="&fileButton.label;"/>
 				<template> 
 					<rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
 						<menupopup>
@@ -558,17 +558,15 @@ Rights Reserved.
 				</template>
 				<menupopup/>
 			</menu>
-			<button class="toolbar left" orient="vertical" id="button_next" value="&nextButton.label;" onclick="MsgNextUnreadMessage()"/>
-			<button class="toolbar left" orient="vertical" id="button_delete" disabled="true" value="&deleteButton.label;" onclick="goDoCommand('button_delete')"/>
-			<button class="toolbar left" orient="vertical" id="button_print" value="&printButton.label;" onclick="PrintEnginePrint()"/>
-			<button class="toolbar left" orient="vertical" id="button_stop" value="&stopButton.label;" onclick="MsgStop();"/>
+			<button class="button-toolbar-2 top" id="button_next" value="&nextButton.label;" onclick="MsgNextUnreadMessage()"/>
+			<button class="button-toolbar-2 top" id="button_delete" disabled="true" value="&deleteButton.label;" onclick="goDoCommand('button_delete')"/>
+			<button class="button-toolbar-2 top" id="button_print" value="&printButton.label;" onclick="PrintEnginePrint()"/>
+			<button class="button-toolbar-2 top" id="button_stop" value="&stopButton.label;" onclick="MsgStop();"/>
 			<spring flex="100%"/>
 		</box>
-		<box id="toolbar_throbber_box" align="vertical">
-			<titledbutton id="Throbber" onclick='goClickThrobber("messenger.throbber.url")'>
-				<observes element="Messenger:Throbber" attribute="busy"/>
-			</titledbutton>
-		</box>
+    <button class="plain" id="navigator-throbber" oncommand='goClickThrobber("messenger.throbber.url")'>
+      <observes element="Messenger:Throbber" attribute="busy"/>
+    </button>
 	</toolbar>
 </toolbox>
 
diff --git a/mailnews/compose/prefs/resources/content/pref-composing_messages.xul b/mailnews/compose/prefs/resources/content/pref-composing_messages.xul
index cec4d2b0f84b..4950995154d6 100644
--- a/mailnews/compose/prefs/resources/content/pref-composing_messages.xul
+++ b/mailnews/compose/prefs/resources/content/pref-composing_messages.xul
@@ -36,7 +36,7 @@
   ]]>
   </script>  
     
-  <box class="box-smallheader" title="&pane.title;" description="&pane.description;"/>
+  <box class="box-smallheader" title="&pane.title;"/>
 
 	<titledbox orient="vertical">
 		<title><text value="&forwardReply.label;"/></title>
diff --git a/mailnews/compose/prefs/resources/content/pref-formatting.xul b/mailnews/compose/prefs/resources/content/pref-formatting.xul
index 95114f9715fa..d6adc63b9e68 100644
--- a/mailnews/compose/prefs/resources/content/pref-formatting.xul
+++ b/mailnews/compose/prefs/resources/content/pref-formatting.xul
@@ -17,7 +17,7 @@
   ]]>
   </script>  
     
-  <box class="box-smallheader" title="&pane.title;" description="&pane.description;"/>
+  <box class="box-smallheader" title="&pane.title;"/>
 
   <titledbox orient="vertical">
     <title><html>&sendMail.label;</html></title>
diff --git a/mailnews/compose/resources/content/messengercompose.xul b/mailnews/compose/resources/content/messengercompose.xul
index 329a1c9d3d8e..e47b0765cda1 100644
--- a/mailnews/compose/resources/content/messengercompose.xul
+++ b/mailnews/compose/resources/content/messengercompose.xul
@@ -1,4 +1,5 @@
 <?xml version="1.0"?> 
+<?xul-overlay href="chrome://global/content/charsetOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/tasksOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/messengercompose/addressingWidgetOverlay.xul"?>
@@ -26,8 +27,6 @@ Copyright (C) 1998-1999 Netscape Communications Corporation. All
 Rights Reserved.
 -->
 
-<?xul-overlay href="chrome://global/content/charsetOverlay.xul"?>
-
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/messengercompose/messengercompose.dtd">
 
 <window id="main-window" xmlns:html="http://www.w3.org/TR/REC-html40"
@@ -271,6 +270,7 @@ END of Deprecated -->
 	</menupopup>
     </menu>
 
+
 	<!-- entire menus comes from editorOverlay -->
 	<menu id="insertMenu"/>
 	
@@ -372,25 +372,22 @@ END of Deprecated -->
 	<spring flex="100%"/>
   </menubar>
   <toolbox>
-    <toolbar id="composeToolbar" class="standard" persist="collapsed">
+    <toolbar class="toolbar-primary" id="composeToolbar" persist="collapsed">
 		<box id="toolbar_button_box">
-	 		<button class="key-toolbar left" orient="vertical" id="button_send" value="&sendButton.label;" onclick="SendMessage()"/>
+	 		<button class="button-toolbar-2 top" id="button_send" value="&sendButton.label;" onclick="SendMessage()"/>
             <toolbarseparator/>
-	 		<button class="toolbar left" orient="vertical" id="button_address" value="&addressButton.label;" onclick="SelectAddress()"/>
-	 		<button class="toolbar left" orient="vertical" id="button_attach" value="&attachButton.label;" onclick="AttachFile()"/>
-	 		<button class="toolbar left" orient="vertical" id="button_quote" disabled="true" value="&quoteButton.label;" onclick="QuoteMessage()"/>
-	 		<!--button class="toolbar left" orient="vertical" id="button_spelling" value="&spellingButton.label;" onclick="Spelling()"/-->
+	 		<button class="button-toolbar-2 top" id="button_address" value="&addressButton.label;" onclick="SelectAddress()"/>
+	 		<button class="button-toolbar-2 top" id="button_attach" value="&attachButton.label;" onclick="AttachFile()"/>
+	 		<button class="button-toolbar-2 top" id="button_quote" disabled="true" value="&quoteButton.label;" onclick="QuoteMessage()"/>
+	 		<!--button class="button-toolbar-2 top" orient="vertical" id="button_spelling" value="&spellingButton.label;" onclick="Spelling()"/-->
             <toolbarseparator/>
-	 		<button class="toolbar left" orient="vertical" id="button_save" value="&saveButton.label;" onclick="SaveAsDraft()"/>
-	 		<button class="toolbar left" orient="vertical" id="button_stop" disabled="true" value="&stopButton.label;" onclick="Stop()"/>
+	 		<button class="button-toolbar-2 top" id="button_save" value="&saveButton.label;" onclick="SaveAsDraft()"/>
+	 		<button class="button-toolbar-2 top" id="button_stop" disabled="true" value="&stopButton.label;" onclick="Stop()"/>
 	    	<spring flex="100%"/>
 		</box>
-
-		<box id="toolbar_throbber_box" align="vertical">
-			<titledbutton id="Throbber" onclick='goClickThrobber("compose.throbber.url")'>
-				<observes element="broadcaster_throbber" attribute="busy"/>
-			</titledbutton>
-		</box>
+    <button class="plain" id="navigator-throbber" oncommand='goClickThrobber("compose.throbber.url")'>
+      <observes element="broadcaster_throbber" attribute="busy"/>
+    </button>
 	</toolbar>
 
 	<toolbar id="MsgHeadersToolbar" persist="collapsed">