diff --git a/mozilla/mail/app/icons/windows/abcardWindow.ico b/mozilla/mail/app/icons/windows/abcardWindow.ico
index 1055081b87b..e78a15c42bd 100644
Binary files a/mozilla/mail/app/icons/windows/abcardWindow.ico and b/mozilla/mail/app/icons/windows/abcardWindow.ico differ
diff --git a/mozilla/mail/app/icons/windows/addressbookWindow.ico b/mozilla/mail/app/icons/windows/addressbookWindow.ico
index 1055081b87b..e78a15c42bd 100644
Binary files a/mozilla/mail/app/icons/windows/addressbookWindow.ico and b/mozilla/mail/app/icons/windows/addressbookWindow.ico differ
diff --git a/mozilla/mail/app/icons/windows/msgcomposeWindow.ico b/mozilla/mail/app/icons/windows/msgcomposeWindow.ico
index 91ad21292c5..a6d5c8e6f28 100644
Binary files a/mozilla/mail/app/icons/windows/msgcomposeWindow.ico and b/mozilla/mail/app/icons/windows/msgcomposeWindow.ico differ
diff --git a/mozilla/mail/app/profile/mailnews.js b/mozilla/mail/app/profile/mailnews.js
index 29b50bcb428..cec9a105b8e 100644
--- a/mozilla/mail/app/profile/mailnews.js
+++ b/mozilla/mail/app/profile/mailnews.js
@@ -463,7 +463,15 @@ pref("mail.content_disposition_type", 0);
pref("mailnews.show_send_progress", true); //Will show a progress dialog when saving or sending a message
pref("mail.server.default.retainBy", 1);
-pref("mailnews.ui.junk.firstuse", true);
+pref("mailnews.ui.junk.firstuse", true);
+
+// for manual upgrades of certain UI features.
+// 1 -> 2 is for the thread pane tree landing, to hide the
+// labels column, see msgMail3PaneWindow.js
+// 2 -> 3 is for the junk status column
+// 3 -> 4 is for the sender column
+// 4 -> 5 is for the attachment column
+pref("mailnews.ui.threadpane.version", 1);
//If set to a number greater than 0, msg compose windows will be recycled in order to open them quickly
pref("mail.compose.max_recycled_windows", 1);
diff --git a/mozilla/mail/base/content/commandglue.js b/mozilla/mail/base/content/commandglue.js
index b0e1d01ffe1..e0122399a9f 100644
--- a/mozilla/mail/base/content/commandglue.js
+++ b/mozilla/mail/base/content/commandglue.js
@@ -507,7 +507,10 @@ function ConvertColumnIDToSortType(columnID)
break;
case "idCol":
sortKey = nsMsgViewSortType.byId;
- break;
+ break;
+ case "attachmentCol":
+ sortKey = nsMsgViewSortType.byAttachments;
+ break;
default:
dump("unsupported sort column: " + columnID + "\n");
sortKey = 0;
@@ -568,6 +571,9 @@ function ConvertSortTypeToColumnID(sortKey)
case nsMsgViewSortType.byJunkStatus:
columnID = "junkStatusCol";
break;
+ case nsMsgViewSortType.byAttachments:
+ columnID = "attachmentCol";
+ break;
default:
dump("unsupported sort key: " + sortKey + "\n");
columnID = null;
diff --git a/mozilla/mail/base/content/hiddenWindow.js b/mozilla/mail/base/content/hiddenWindow.js
index 89a96af3114..3ae867e4600 100755
--- a/mozilla/mail/base/content/hiddenWindow.js
+++ b/mozilla/mail/base/content/hiddenWindow.js
@@ -49,7 +49,7 @@ function hiddenWindowStartup()
'sortByDateMenuitem', 'sortByFlagMenuitem', 'sortByOrderReceivedMenuitem', 'sortByPriorityMenuitem',
'sortBySenderMenuitem', 'sortByRecipientMenuitem', 'sortBySenderOrRecipientMenuitem', 'sortBySizeMenuitem',
'sortByStatusMenuitem', 'sortBySubjectMenuitem', 'sortByThreadMenuitem', 'sortByUnreadMenuitem',
- 'sortByLabelMenuitem', 'sortByJunkStatusMenuitem', 'sortAscending', 'sortDescending',
+ 'sortByLabelMenuitem', 'sortByJunkStatusMenuitem', 'sortByAttachmentsMenuitem', 'sortAscending', 'sortDescending',
'viewThreaded', 'viewAll', 'viewUnread', 'viewLabelMenuItem1',
'viewUnread', 'viewLabelMenuItem1', 'viewLabelMenuItem2', 'viewLabelMenuItem3',
'viewLabelMenuItem4', 'viewLabelMenuItem5', 'viewCreateCustomView', 'viewallheaders',
diff --git a/mozilla/mail/base/content/mailWindowOverlay.js b/mozilla/mail/base/content/mailWindowOverlay.js
index 59017fe9b30..a91717abd29 100644
--- a/mozilla/mail/base/content/mailWindowOverlay.js
+++ b/mozilla/mail/base/content/mailWindowOverlay.js
@@ -245,7 +245,8 @@ function InitViewSortByMenu()
setSortByMenuItemCheckState("sortByLabelMenuitem", (sortType == nsMsgViewSortType.byLabel));
setSortByMenuItemCheckState("sortByJunkStatusMenuitem", (sortType == nsMsgViewSortType.byJunkStatus));
setSortByMenuItemCheckState("sortBySenderMenuitem", (sortType == nsMsgViewSortType.byAuthor));
- setSortByMenuItemCheckState("sortByRecipientMenuitem", (sortType == nsMsgViewSortType.byRecipient));
+ setSortByMenuItemCheckState("sortByRecipientMenuitem", (sortType == nsMsgViewSortType.byRecipient));
+ setSortByMenuItemCheckState("sortByAttachmentsMenuitem", (sortType == nsMsgViewSortType.byAttachments));
var sortOrder = gDBView.sortOrder;
@@ -1695,7 +1696,6 @@ function SetUpToolbarButtons(uri)
// pop, and news. for now, just tweak it based on if it is news or not.
var forNews = isNewsURI(uri);
- if(!gMarkButton) gMarkButton = document.getElementById("button-mark");
if(!gDeleteButton) gDeleteButton = document.getElementById("button-delete");
var buttonToHide = null;
@@ -1703,10 +1703,8 @@ function SetUpToolbarButtons(uri)
if (forNews) {
buttonToHide = gDeleteButton;
- buttonToShow = gMarkButton;
}
else {
- buttonToHide = gMarkButton;
buttonToShow = gDeleteButton;
}
diff --git a/mozilla/mail/base/content/mailWindowOverlay.xul b/mozilla/mail/base/content/mailWindowOverlay.xul
index 1b151d05c28..016a7b45567 100644
--- a/mozilla/mail/base/content/mailWindowOverlay.xul
+++ b/mozilla/mail/base/content/mailWindowOverlay.xul
@@ -1147,6 +1147,7 @@
+
@@ -1678,17 +1679,6 @@
notjunk_tooltiptext="¬JunkButton.tooltip;"/>
-
-
-
-
-
-
-
-
-
-
@@ -1697,7 +1687,19 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mozilla/mail/base/content/messenger.xul b/mozilla/mail/base/content/messenger.xul
index 2f628a50d18..ecb0a3de435 100644
--- a/mozilla/mail/base/content/messenger.xul
+++ b/mozilla/mail/base/content/messenger.xul
@@ -93,9 +93,9 @@
commandupdater="true"
events="focus"
oncommandupdate="FocusRingUpdate_Mail()"/>
-
+
#ifdef XP_MACOSX
-
+
#endif
@@ -259,12 +259,16 @@
class="treecol-image threadColumnHeader" currentView="unthreaded"
display="&threadColumn.label;" tooltiptext="&threadColumn.tooltip;"/>
+
+
-
-
+
+
-
+
diff --git a/mozilla/mail/base/content/msgMail3PaneWindow.js b/mozilla/mail/base/content/msgMail3PaneWindow.js
index 60442028a40..64077c81dee 100644
--- a/mozilla/mail/base/content/msgMail3PaneWindow.js
+++ b/mozilla/mail/base/content/msgMail3PaneWindow.js
@@ -920,7 +920,8 @@ function AddToSession()
function InitPanes()
{
- OnLoadFolderPane();
+ OnLoadFolderPane();
+ OnLoadThreadPane();
SetupCommandUpdateHandlers();
}
@@ -963,6 +964,69 @@ function OnLoadFolderPane()
folderTree.addEventListener("click",FolderPaneOnClick,true);
folderTree.addEventListener("mousedown",TreeOnMouseDown,true);
}
+
+// builds prior to 12-08-2001 did not have the labels column
+// in the thread pane. so if a user ran an old build, and then
+// upgraded, they get the new column, and this causes problems.
+// We're trying to avoid a similar problem to bug #96979.
+// to work around this, we hide the column once, using the
+// "mailnews.ui.threadpane.version" pref.
+function UpgradeThreadPaneUI()
+{
+ var labelCol;
+ var threadPaneUIVersion;
+
+ try {
+
+ threadPaneUIVersion = pref.getIntPref("mailnews.ui.threadpane.version");
+
+ if (threadPaneUIVersion < 5) {
+ var threadTree = document.getElementById("threadTree");
+ var junkCol = document.getElementById("junkStatusCol");
+ var beforeCol;
+
+ if (threadPaneUIVersion < 4) {
+
+ if (threadPaneUIVersion < 3) {
+
+ // in thunderbird, we are inserting the junk column just before the
+ // date column.
+ var dateCol = document.getElementById("dateCol");
+ threadTree._reorderColumn(junkCol, dateCol, true);
+
+ // hide labels column by default
+ if (threadPaneUIVersion == 1) {
+ labelCol = document.getElementById("labelCol");
+ labelCol.setAttribute("hidden", "true");
+ }
+ }
+
+ var senderCol = document.getElementById("senderCol");
+ var recipientCol = document.getElementById("recipientCol");
+ threadTree._reorderColumn(recipientCol, junkCol, true);
+ threadTree._reorderColumn(senderCol, recipientCol, true);
+
+ } // version 4 upgrades
+
+ // version 5 adds a new column called attachments
+ var attachmentCol = document.getElementById("attachmentCol");
+ var subjectCol = document.getElementById("subjectCol");
+
+ threadTree._reorderColumn(attachmentCol, subjectCol, true);
+
+ pref.setIntPref("mailnews.ui.threadpane.version", 5);
+
+ } // version 5 upgrades
+ }
+ catch (ex) {
+ dump("UpgradeThreadPane: ex = " + ex + "\n");
+ }
+}
+
+function OnLoadThreadPane()
+{
+ UpgradeThreadPaneUI();
+}
function GetFolderDatasource()
{
diff --git a/mozilla/mail/base/jar.mn b/mozilla/mail/base/jar.mn
index 565a74a3aeb..337d4628027 100644
--- a/mozilla/mail/base/jar.mn
+++ b/mozilla/mail/base/jar.mn
@@ -38,7 +38,8 @@ classic.jar:
+ skin/classic/messenger/accountCentral.css (skin/accountCentral.css)
+ skin/classic/messenger/messageHeader.css (skin/messageHeader.css)
+ skin/classic/messenger/mailWindow1.css (skin/mailWindow1.css)
-+ skin/classic/messenger/junkMail.css (skin/junkMail.css)
++ skin/classic/messenger/junkMail.css (skin/junkMail.css)
++ skin/classic/messenger/folderMenus.css (skin/folderMenus.css)
+ skin/classic/messenger/searchDialog.css (skin/searchDialog.css)
+ skin/classic/messenger/icons/new-mail-alert.png (skin/icons/new-mail-alert.png)
skin/classic/messenger/icons/mail-toolbar.png (skin/icons/mail-toolbar.png)
@@ -48,10 +49,48 @@ classic.jar:
skin/classic/messenger/icons/throbber.gif (skin/icons/throbber.gif)
skin/classic/messenger/icons/throbber-small.gif (skin/icons/throbber-small.gif)
skin/classic/messenger/icons/throbber-small.png (skin/icons/throbber-small.png)
- skin/classic/messenger/icons/mail-16.gif (skin/icons/mail-16.gif)
skin/classic/messenger/icons/junkbar.png (skin/icons/junkbar.png)
+ skin/classic/messenger/icons/folder-junk.png (skin/icons/folder-junk.png)
-
+ skin/classic/messenger/icons/folder-closed.png (skin/icons/folder-closed.png)
+ skin/classic/messenger/icons/folder-draft.png (skin/icons/folder-draft.png)
+ skin/classic/messenger/icons/folder-inbox-new.png (skin/icons/folder-inbox-new.png)
+ skin/classic/messenger/icons/folder-inbox.png (skin/icons/folder-inbox.png)
+ skin/classic/messenger/icons/folder-new-closed.png (skin/icons/folder-new-closed.png)
+ skin/classic/messenger/icons/folder-open.png (skin/icons/folder-open.png)
+ skin/classic/messenger/icons/folder-new-open.png (skin/icons/folder-new-open.png)
+ skin/classic/messenger/icons/folder-outbox.png (skin/icons/folder-outbox.png)
+ skin/classic/messenger/icons/folder-sent.png (skin/icons/folder-sent.png)
+ skin/classic/messenger/icons/folder-template.png (skin/icons/folder-template.png)
+ skin/classic/messenger/icons/folder-trash.png (skin/icons/folder-trash.png)
+ skin/classic/messenger/icons/message-mail-forwarded.png (skin/icons/message-mail-forwarded.png)
+ skin/classic/messenger/icons/message-mail-forwarded-read.png (skin/icons/message-mail-forwarded-read.png)
+ skin/classic/messenger/icons/message-mail-replied.png (skin/icons/message-mail-replied.png)
+ skin/classic/messenger/icons/message-mail-replied-read.png (skin/icons/message-mail-replied-read.png)
+ skin/classic/messenger/icons/message-mail-replied-forw.png (skin/icons/message-mail-replied-forw.png)
+ skin/classic/messenger/icons/message-mail-replied-forw-read.png (skin/icons/message-mail-replied-forw-read.png)
+ skin/classic/messenger/icons/message-mail.png (skin/icons/message-mail.png)
+ skin/classic/messenger/icons/message-mail-imapdelete.png (skin/icons/message-mail-imapdelete.png)
+ skin/classic/messenger/icons/message-mail-new.png (skin/icons/message-mail-new.png)
+ skin/classic/messenger/icons/message-mail-read.png (skin/icons/message-mail-read.png)
+ skin/classic/messenger/icons/message-news.png (skin/icons/message-news.png)
+ skin/classic/messenger/icons/attachment-col.png (skin/icons/attachment-col.png)
+ skin/classic/messenger/icons/attachment.png (skin/icons/attachment.png)
+ skin/classic/messenger/icons/junk-col.png (skin/icons/junk-col.png)
+ skin/classic/messenger/icons/thread-col.png (skin/icons/thread-col.png)
+ skin/classic/messenger/icons/flag-col.png (skin/icons/flag-col.png)
+ skin/classic/messenger/icons/flag.png (skin/icons/flag.png)
+ skin/classic/messenger/icons/server-mail.png (skin/icons/server-mail.png)
+ skin/classic/messenger/icons/server-mail-new.png (skin/icons/server-mail-new.png)
+ skin/classic/messenger/icons/server-remote-lock.png (skin/icons/server-remote-lock.png)
+ skin/classic/messenger/icons/server-remote-lock-new.png (skin/icons/server-remote-lock-new.png)
+ skin/classic/messenger/icons/server-local.png (skin/icons/server-local.png)
+ skin/classic/messenger/icons/server-news.png (skin/icons/server-news.png)
+ skin/classic/messenger/icons/server-news-lock.png (skin/icons/server-news-lock.png)
+ skin/classic/messenger/icons/folder-newsgroup.png (skin/icons/folder-newsgroup.png)
+ skin/classic/messenger/icons/message-news-new.png (skin/icons/message-news-new.png)
+ skin/classic/messenger/icons/readcol.png (skin/icons/readcol.png)
+ skin/classic/messenger/icons/unreadmail.png (skin/icons/unreadmail.png)
+
comm.jar:
*+ content/navigator/viewSource.xul (content/viewSource.xul)
+ content/navigator/contents.rdf (content/navigator.rdf)
diff --git a/mozilla/mail/base/locale/messenger.dtd b/mozilla/mail/base/locale/messenger.dtd
index e33cf453c08..7c11c4d977b 100644
--- a/mozilla/mail/base/locale/messenger.dtd
+++ b/mozilla/mail/base/locale/messenger.dtd
@@ -127,6 +127,8 @@
+
+
@@ -349,10 +351,10 @@
-
-
-
-
+
+
+
+
@@ -494,6 +496,7 @@
+
@@ -513,6 +516,7 @@
+
diff --git a/mozilla/mail/base/skin/folderMenus.css b/mozilla/mail/base/skin/folderMenus.css
new file mode 100755
index 00000000000..068d11344eb
--- /dev/null
+++ b/mozilla/mail/base/skin/folderMenus.css
@@ -0,0 +1,98 @@
+/*
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ */
+
+/* ===== folderMenus.css ================================================
+ == Icons for menus which represent mail folder.
+ ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: folder icons for menus ::::: */
+
+.folderMenuItem {
+ list-style-image: url("chrome://messenger/skin/icons/folder-closed.png");
+}
+
+.folderMenuItem[open="true"] {
+list-style-image: url("chrome://messenger/skin/icons/folder-open.png");
+}
+
+/* ..... special folders ..... */
+
+.folderMenuItem[SpecialFolder="Inbox"] {
+ list-style-image: url("chrome://messenger/skin/icons/folder-inbox.png");
+}
+
+.folderMenuItem[SpecialFolder="Sent"] {
+ list-style-image: url("chrome://messenger/skin/icons/folder-sent.png");
+}
+
+.folderMenuItem[SpecialFolder="Drafts"] {
+ list-style-image: url("chrome://messenger/skin/icons/folder-draft.png");
+}
+
+
+.folderMenuItem[SpecialFolder="Templates"] {
+ list-style-image: url("chrome://messenger/skin/icons/folder-template.png");
+}
+
+.folderMenuItem[SpecialFolder="Junk"] {
+ list-style-image: url("chrome://messenger/skin/icons/folder-junk.png");
+}
+
+.folderMenuItem[SpecialFolder="Trash"] {
+ list-style-image: url("chrome://messenger/skin/icons/folder-trash.png");
+}
+
+.folderMenuItem[IsServer="true"] {
+ list-style-image: url("chrome://messenger/skin/icons/server-mail.png");
+}
+
+/* IMAP folders */
+.folderMenuItem[IsServer="true"][ServerType="imap"][IsSecure="true"] {
+ list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
+}
+
+/* POP3 folders */
+.folderMenuItem[IsServer="true"][ServerType="pop3"][IsSecure="true"] {
+ list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
+}
+
+/* Local Servers */
+.folderMenuItem[IsServer="true"][ServerType="none"] {
+ list-style-image: url("chrome://messenger/skin/icons/server-local.png");
+}
+
+/* News folders */
+.folderMenuItem[ServerType="nntp"] {
+ list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.png");
+}
+
+.folderMenuItem[IsServer="true"][ServerType="nntp"][IsSecure="true"] {
+ list-style-image: url("chrome://messenger/skin/icons/server-news-lock.png");
+}
+
+.folderMenuItem[IsServer="true"][ServerType="nntp"] {
+ list-style-image: url("chrome://messenger/skin/icons/server-news.png");
+}
+
diff --git a/mozilla/mail/base/skin/icons/attachment-col.png b/mozilla/mail/base/skin/icons/attachment-col.png
new file mode 100755
index 00000000000..0d91506ed9a
Binary files /dev/null and b/mozilla/mail/base/skin/icons/attachment-col.png differ
diff --git a/mozilla/mail/base/skin/icons/attachment.png b/mozilla/mail/base/skin/icons/attachment.png
new file mode 100755
index 00000000000..89842af2129
Binary files /dev/null and b/mozilla/mail/base/skin/icons/attachment.png differ
diff --git a/mozilla/mail/base/skin/icons/flag-col.png b/mozilla/mail/base/skin/icons/flag-col.png
new file mode 100755
index 00000000000..a280f139ac8
Binary files /dev/null and b/mozilla/mail/base/skin/icons/flag-col.png differ
diff --git a/mozilla/mail/base/skin/icons/flag.png b/mozilla/mail/base/skin/icons/flag.png
new file mode 100755
index 00000000000..d7f975cb0c3
Binary files /dev/null and b/mozilla/mail/base/skin/icons/flag.png differ
diff --git a/mozilla/mail/base/skin/icons/folder-closed.png b/mozilla/mail/base/skin/icons/folder-closed.png
new file mode 100755
index 00000000000..e758fdfb812
Binary files /dev/null and b/mozilla/mail/base/skin/icons/folder-closed.png differ
diff --git a/mozilla/mail/base/skin/icons/folder-draft.png b/mozilla/mail/base/skin/icons/folder-draft.png
new file mode 100755
index 00000000000..5392c8516fe
Binary files /dev/null and b/mozilla/mail/base/skin/icons/folder-draft.png differ
diff --git a/mozilla/mail/base/skin/icons/folder-inbox-new.png b/mozilla/mail/base/skin/icons/folder-inbox-new.png
new file mode 100755
index 00000000000..0e1ac334f03
Binary files /dev/null and b/mozilla/mail/base/skin/icons/folder-inbox-new.png differ
diff --git a/mozilla/mail/base/skin/icons/folder-inbox.png b/mozilla/mail/base/skin/icons/folder-inbox.png
new file mode 100755
index 00000000000..1082b8e1248
Binary files /dev/null and b/mozilla/mail/base/skin/icons/folder-inbox.png differ
diff --git a/mozilla/mail/base/skin/icons/folder-junk.png b/mozilla/mail/base/skin/icons/folder-junk.png
index 2ad9961f13e..ed39e191176 100644
Binary files a/mozilla/mail/base/skin/icons/folder-junk.png and b/mozilla/mail/base/skin/icons/folder-junk.png differ
diff --git a/mozilla/mail/base/skin/icons/folder-new-closed.png b/mozilla/mail/base/skin/icons/folder-new-closed.png
new file mode 100755
index 00000000000..9d983cc94bb
Binary files /dev/null and b/mozilla/mail/base/skin/icons/folder-new-closed.png differ
diff --git a/mozilla/mail/base/skin/icons/folder-new-open.png b/mozilla/mail/base/skin/icons/folder-new-open.png
new file mode 100755
index 00000000000..59fa91eb7c8
Binary files /dev/null and b/mozilla/mail/base/skin/icons/folder-new-open.png differ
diff --git a/mozilla/mail/base/skin/icons/folder-newsgroup.png b/mozilla/mail/base/skin/icons/folder-newsgroup.png
new file mode 100755
index 00000000000..629a5aefc6f
Binary files /dev/null and b/mozilla/mail/base/skin/icons/folder-newsgroup.png differ
diff --git a/mozilla/mail/base/skin/icons/folder-open.png b/mozilla/mail/base/skin/icons/folder-open.png
new file mode 100755
index 00000000000..918d3e300f6
Binary files /dev/null and b/mozilla/mail/base/skin/icons/folder-open.png differ
diff --git a/mozilla/mail/base/skin/icons/folder-outbox.png b/mozilla/mail/base/skin/icons/folder-outbox.png
new file mode 100755
index 00000000000..df0d1f21f31
Binary files /dev/null and b/mozilla/mail/base/skin/icons/folder-outbox.png differ
diff --git a/mozilla/mail/base/skin/icons/folder-sent.png b/mozilla/mail/base/skin/icons/folder-sent.png
new file mode 100755
index 00000000000..dddc1cceb44
Binary files /dev/null and b/mozilla/mail/base/skin/icons/folder-sent.png differ
diff --git a/mozilla/mail/base/skin/icons/folder-template.png b/mozilla/mail/base/skin/icons/folder-template.png
new file mode 100755
index 00000000000..91406fd9a5d
Binary files /dev/null and b/mozilla/mail/base/skin/icons/folder-template.png differ
diff --git a/mozilla/mail/base/skin/icons/folder-trash.png b/mozilla/mail/base/skin/icons/folder-trash.png
new file mode 100755
index 00000000000..946e5d1f9b8
Binary files /dev/null and b/mozilla/mail/base/skin/icons/folder-trash.png differ
diff --git a/mozilla/mail/base/skin/icons/junk-col.png b/mozilla/mail/base/skin/icons/junk-col.png
new file mode 100755
index 00000000000..84428a9b647
Binary files /dev/null and b/mozilla/mail/base/skin/icons/junk-col.png differ
diff --git a/mozilla/mail/base/skin/icons/mail-toolbar-small.png b/mozilla/mail/base/skin/icons/mail-toolbar-small.png
index c2ad67d8b38..1f6976218a2 100644
Binary files a/mozilla/mail/base/skin/icons/mail-toolbar-small.png and b/mozilla/mail/base/skin/icons/mail-toolbar-small.png differ
diff --git a/mozilla/mail/base/skin/icons/mail-toolbar.png b/mozilla/mail/base/skin/icons/mail-toolbar.png
index e82f0076393..bc42d9733ae 100644
Binary files a/mozilla/mail/base/skin/icons/mail-toolbar.png and b/mozilla/mail/base/skin/icons/mail-toolbar.png differ
diff --git a/mozilla/mail/base/skin/icons/message-mail-forwarded-read.png b/mozilla/mail/base/skin/icons/message-mail-forwarded-read.png
new file mode 100755
index 00000000000..9095855af33
Binary files /dev/null and b/mozilla/mail/base/skin/icons/message-mail-forwarded-read.png differ
diff --git a/mozilla/mail/base/skin/icons/message-mail-forwarded.png b/mozilla/mail/base/skin/icons/message-mail-forwarded.png
new file mode 100755
index 00000000000..895794727b9
Binary files /dev/null and b/mozilla/mail/base/skin/icons/message-mail-forwarded.png differ
diff --git a/mozilla/mail/base/skin/icons/message-mail-imapdelete.png b/mozilla/mail/base/skin/icons/message-mail-imapdelete.png
new file mode 100755
index 00000000000..562f4f3c779
Binary files /dev/null and b/mozilla/mail/base/skin/icons/message-mail-imapdelete.png differ
diff --git a/mozilla/mail/base/skin/icons/message-mail-new.png b/mozilla/mail/base/skin/icons/message-mail-new.png
new file mode 100755
index 00000000000..3691cb7f4d4
Binary files /dev/null and b/mozilla/mail/base/skin/icons/message-mail-new.png differ
diff --git a/mozilla/mail/base/skin/icons/message-mail-read.png b/mozilla/mail/base/skin/icons/message-mail-read.png
new file mode 100755
index 00000000000..17d5784cca5
Binary files /dev/null and b/mozilla/mail/base/skin/icons/message-mail-read.png differ
diff --git a/mozilla/mail/base/skin/icons/message-mail-replied-forw-read.png b/mozilla/mail/base/skin/icons/message-mail-replied-forw-read.png
new file mode 100755
index 00000000000..9c7652e8c48
Binary files /dev/null and b/mozilla/mail/base/skin/icons/message-mail-replied-forw-read.png differ
diff --git a/mozilla/mail/base/skin/icons/message-mail-replied-forw.png b/mozilla/mail/base/skin/icons/message-mail-replied-forw.png
new file mode 100755
index 00000000000..520f3cbc1e3
Binary files /dev/null and b/mozilla/mail/base/skin/icons/message-mail-replied-forw.png differ
diff --git a/mozilla/mail/base/skin/icons/message-mail-replied-read.png b/mozilla/mail/base/skin/icons/message-mail-replied-read.png
new file mode 100755
index 00000000000..e50e0474272
Binary files /dev/null and b/mozilla/mail/base/skin/icons/message-mail-replied-read.png differ
diff --git a/mozilla/mail/base/skin/icons/message-mail-replied.png b/mozilla/mail/base/skin/icons/message-mail-replied.png
new file mode 100755
index 00000000000..ed0d0ad4f4f
Binary files /dev/null and b/mozilla/mail/base/skin/icons/message-mail-replied.png differ
diff --git a/mozilla/mail/base/skin/icons/message-mail.png b/mozilla/mail/base/skin/icons/message-mail.png
new file mode 100755
index 00000000000..c58e0993a31
Binary files /dev/null and b/mozilla/mail/base/skin/icons/message-mail.png differ
diff --git a/mozilla/mail/base/skin/icons/message-news-new.png b/mozilla/mail/base/skin/icons/message-news-new.png
new file mode 100755
index 00000000000..e39e9f1e678
Binary files /dev/null and b/mozilla/mail/base/skin/icons/message-news-new.png differ
diff --git a/mozilla/mail/base/skin/icons/message-news.png b/mozilla/mail/base/skin/icons/message-news.png
new file mode 100755
index 00000000000..2079edc30cd
Binary files /dev/null and b/mozilla/mail/base/skin/icons/message-news.png differ
diff --git a/mozilla/mail/base/skin/icons/readcol.png b/mozilla/mail/base/skin/icons/readcol.png
new file mode 100755
index 00000000000..4de60f3ad5f
Binary files /dev/null and b/mozilla/mail/base/skin/icons/readcol.png differ
diff --git a/mozilla/mail/base/skin/icons/server-local.png b/mozilla/mail/base/skin/icons/server-local.png
new file mode 100755
index 00000000000..a3b4a32101c
Binary files /dev/null and b/mozilla/mail/base/skin/icons/server-local.png differ
diff --git a/mozilla/mail/base/skin/icons/server-mail-new.png b/mozilla/mail/base/skin/icons/server-mail-new.png
new file mode 100755
index 00000000000..df021b8a240
Binary files /dev/null and b/mozilla/mail/base/skin/icons/server-mail-new.png differ
diff --git a/mozilla/mail/base/skin/icons/server-mail.png b/mozilla/mail/base/skin/icons/server-mail.png
new file mode 100755
index 00000000000..9d3455b36f2
Binary files /dev/null and b/mozilla/mail/base/skin/icons/server-mail.png differ
diff --git a/mozilla/mail/base/skin/icons/server-news-lock.png b/mozilla/mail/base/skin/icons/server-news-lock.png
new file mode 100755
index 00000000000..0fee96fd6b5
Binary files /dev/null and b/mozilla/mail/base/skin/icons/server-news-lock.png differ
diff --git a/mozilla/mail/base/skin/icons/server-news.png b/mozilla/mail/base/skin/icons/server-news.png
new file mode 100755
index 00000000000..b5a511b9062
Binary files /dev/null and b/mozilla/mail/base/skin/icons/server-news.png differ
diff --git a/mozilla/mail/base/skin/icons/server-remote-lock-new.png b/mozilla/mail/base/skin/icons/server-remote-lock-new.png
new file mode 100755
index 00000000000..66f0aa230a4
Binary files /dev/null and b/mozilla/mail/base/skin/icons/server-remote-lock-new.png differ
diff --git a/mozilla/mail/base/skin/icons/server-remote-lock.png b/mozilla/mail/base/skin/icons/server-remote-lock.png
new file mode 100755
index 00000000000..1d6197e7385
Binary files /dev/null and b/mozilla/mail/base/skin/icons/server-remote-lock.png differ
diff --git a/mozilla/mail/base/skin/icons/thread-col.png b/mozilla/mail/base/skin/icons/thread-col.png
new file mode 100755
index 00000000000..1eddebe8d03
Binary files /dev/null and b/mozilla/mail/base/skin/icons/thread-col.png differ
diff --git a/mozilla/mail/base/skin/icons/unreadmail.png b/mozilla/mail/base/skin/icons/unreadmail.png
new file mode 100755
index 00000000000..4c418bc7963
Binary files /dev/null and b/mozilla/mail/base/skin/icons/unreadmail.png differ
diff --git a/mozilla/mail/base/skin/mailWindow1.css b/mozilla/mail/base/skin/mailWindow1.css
index ea379c6c9f2..fa3bb396752 100644
--- a/mozilla/mail/base/skin/mailWindow1.css
+++ b/mozilla/mail/base/skin/mailWindow1.css
@@ -34,45 +34,53 @@
treechildren::-moz-tree-image(folderNameCol) {
margin-right: 2px;
- list-style-image: url("chrome://messenger/skin/icons/folder-closed.gif");
+ list-style-image: url("chrome://messenger/skin/icons/folder-closed.png");
}
+
+treechildren::-moz-tree-image(folderNameCol, selected, open) {
+ list-style-image: url("chrome://messenger/skin/icons/folder-open.png");
+}
+
+treechildren::-moz-tree-image(folderNameCol, selected, open, newMessages-true) {
+ list-style-image: url("chrome://messenger/skin/icons/folder-new-open.png");
+}
treechildren::-moz-tree-image(folderNameCol, newMessages-true) {
- list-style-image: url("chrome://messenger/skin/icons/folder-new-closed.gif");
+ list-style-image: url("chrome://messenger/skin/icons/folder-new-closed.png");
}
/* ..... Inbox ..... */
treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox) {
- list-style-image: url("chrome://messenger/skin/icons/folder-inbox.gif");
+ list-style-image: url("chrome://messenger/skin/icons/folder-inbox.png");
}
treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox, newMessages-true) {
- list-style-image: url("chrome://messenger/skin/icons/folder-inbox-new.gif");
+ list-style-image: url("chrome://messenger/skin/icons/folder-inbox-new.png");
}
/* ..... Sent ..... */
treechildren::-moz-tree-image(folderNameCol, specialFolder-Sent) {
- list-style-image: url("chrome://messenger/skin/icons/folder-sent.gif");
+ list-style-image: url("chrome://messenger/skin/icons/folder-sent.png");
}
/* ..... Unsent ..... */
treechildren::-moz-tree-image(folderNameCol, specialFolder-Unsent Messages) {
- list-style-image: url("chrome://messenger/skin/icons/folder-outbox.gif");
+ list-style-image: url("chrome://messenger/skin/icons/folder-outbox.png");
}
/* ..... Drafts ..... */
treechildren::-moz-tree-image(folderNameCol, specialFolder-Drafts) {
- list-style-image: url("chrome://messenger/skin/icons/folder-draft.gif");
+ list-style-image: url("chrome://messenger/skin/icons/folder-draft.png");
}
/* ..... Templates ..... */
treechildren::-moz-tree-image(folderNameCol, specialFolder-Templates) {
- list-style-image: url("chrome://messenger/skin/icons/folder-template.gif");
+ list-style-image: url("chrome://messenger/skin/icons/folder-template.png");
}
/* ..... Junk ..... */
@@ -84,15 +92,17 @@ treechildren::-moz-tree-image(folderNameCol, specialFolder-Junk) {
/* ..... Trash ..... */
treechildren::-moz-tree-image(folderNameCol, specialFolder-Trash) {
- list-style-image: url("chrome://messenger/skin/icons/folder-trash.gif");
+ list-style-image: url("chrome://messenger/skin/icons/folder-trash.png");
}
+
+/* ..... Servers ..... */
treechildren::-moz-tree-image(folderNameCol, isServer-true) {
- list-style-image: url("chrome://messenger/skin/icons/server-mail.gif");
+ list-style-image: url("chrome://messenger/skin/icons/server-mail.png");
}
treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true) {
- list-style-image: url("chrome://messenger/skin/icons/server-mail-new.gif");
+ list-style-image: url("chrome://messenger/skin/icons/server-mail-new.png");
}
treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true),
@@ -108,29 +118,33 @@ treechildren::-moz-tree-image(folderNameCol, imapShared-true) {
/* ..... Server Folders ..... */
treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-pop3, isSecure-true) {
- list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.gif");
+ list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
}
treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-imap, isSecure-true) {
- list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.gif");
-}
+ list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
+}
+
+treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true, isSecure-true) {
+ list-style-image: url("chrome://messenger/skin/icons/server-remote-lock-new.png");
+}
treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-none) {
- list-style-image: url("chrome://messenger/skin/icons/server-local.gif");
+ list-style-image: url("chrome://messenger/skin/icons/server-local.png");
}
/* ..... News Folders ..... */
treechildren::-moz-tree-image(folderNameCol, serverType-nntp) {
- list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.gif");
+ list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.png");
}
treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp) {
- list-style-image: url("chrome://messenger/skin/icons/server-news.gif");
+ list-style-image: url("chrome://messenger/skin/icons/server-news.png");
}
treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp, isSecure-true) {
- list-style-image: url("chrome://messenger/skin/icons/server-news-lock.gif");
+ list-style-image: url("chrome://messenger/skin/icons/server-news-lock.png");
}
/* ::::: All Servers ::::: */
@@ -180,15 +194,16 @@ treechildren::-moz-tree-cell-text(container, closed, hasUnread, read) {
/* ..... thread column ..... */
treecol.threadColumnHeader {
- list-style-image: url("chrome://messenger/skin/icons/unthreadcol.gif");
+ list-style-image: url("chrome://messenger/skin/icons/thread-col.png");
+ padding-right: 3px;
}
treecol.threadColumnHeader[sortDirection="ascending"] {
- list-style-image: url("chrome://messenger/skin/icons/threadcol.gif");
+ list-style-image: url("chrome://messenger/skin/icons/thread-col.png");
}
treecol.threadColumnHeader[sortDirection="descending"] {
- list-style-image: url("chrome://messenger/skin/icons/threadcol.gif");
+ list-style-image: url("chrome://messenger/skin/icons/thread-col.png");
}
treechildren::-moz-tree-image(threadCol, container) {
@@ -210,7 +225,9 @@ treechildren::-moz-tree-image(threadCol, container, hasUnread, open) {
/* ..... read column ..... */
treecol.readColumnHeader {
- list-style-image: url("chrome://messenger/skin/icons/readcol.gif");
+ list-style-image: url("chrome://messenger/skin/icons/readcol.png");
+ padding-right: 5px;
+ padding-bottom: 5px;
}
treechildren::-moz-tree-image(unreadButtonColHeader) {
@@ -218,13 +235,25 @@ treechildren::-moz-tree-image(unreadButtonColHeader) {
}
treechildren::-moz-tree-image(unreadButtonColHeader, unread) {
- list-style-image: url("chrome://messenger/skin/icons/unreadmail.gif");
+ list-style-image: url("chrome://messenger/skin/icons/unreadmail.png");
+}
+
+/* ..... attachment column ..... */
+
+treecol.attachmentColumnHeader {
+ list-style-image: url("chrome://messenger/skin/icons/attachment-col.png");
+ padding-right: 5px;
+}
+
+treechildren::-moz-tree-image(attachmentCol, attach) {
+ list-style-image: url("chrome://messenger/skin/icons/attachment.png");
}
/* ..... flag column ..... */
treecol.flagColumnHeader {
- list-style-image: url("chrome://messenger/skin/icons/flagcol.gif");
+ list-style-image: url("chrome://messenger/skin/icons/flag-col.png");
+ padding-right: 5px;
}
treechildren::-moz-tree-image(flaggedCol) {
@@ -232,59 +261,52 @@ treechildren::-moz-tree-image(flaggedCol) {
}
treechildren::-moz-tree-image(flaggedCol, flagged) {
- list-style-image: url("chrome://messenger/skin/icons/flaggedmail.gif");
+ list-style-image: url("chrome://messenger/skin/icons/flag.png");
}
/* ..... junkStatus column ..... */
treecol.junkStatusHeader {
- list-style-image: url("chrome://messenger/skin/icons/folder-junk.png");
- padding: 0px 4px 0px 0px;
+ list-style-image: url("chrome://messenger/skin/icons/junk-col.png");
+ padding-right: 5px;
}
/* "unknown" now looks like "not junk". see bug #182386 */
treechildren::-moz-tree-image(junkStatusCol) {
list-style-image: url("chrome://messenger/skin/icons/readmail.gif");
padding-left: 0px;
- padding-right: 4px;
}
treechildren::-moz-tree-image(junkStatusCol, junk) {
list-style-image: url("chrome://messenger/skin/icons/folder-junk.png");
- margin-right: -1px;
}
treechildren::-moz-tree-image(junkStatusCol, notjunk) {
list-style-image: url("chrome://messenger/skin/icons/readmail.gif");
padding-left: 0px;
- padding-right: 4px;
}
/* ..... subject column ..... */
treechildren::-moz-tree-image(subjectCol) {
margin-right: 2px;
- list-style-image: url("chrome://messenger/skin/icons/message-mail.gif");
+ list-style-image: url("chrome://messenger/skin/icons/message-mail.png ");
}
+
+treechildren::-moz-tree-image(subjectCol, read) {
+ list-style-image: url("chrome://messenger/skin/icons/message-mail-read.png");
+}
treechildren::-moz-tree-image(subjectCol, new) {
- list-style-image: url("chrome://messenger/skin/icons/message-mail-new.gif");
-}
-
-treechildren::-moz-tree-image(subjectCol, attach) {
- list-style-image: url("chrome://messenger/skin/icons/message-mail-attach.gif");
+ list-style-image: url("chrome://messenger/skin/icons/message-mail-new.png");
}
treechildren::-moz-tree-image(subjectCol, imapdeleted) {
- list-style-image: url("chrome://messenger/skin/icons/message-mail-imapdelete.gif");
+ list-style-image: url("chrome://messenger/skin/icons/message-mail-imapdelete.png");
}
treechildren::-moz-tree-image(subjectCol, news) {
- list-style-image: url("chrome://messenger/skin/icons/message-news.gif");
-}
-
-treechildren::-moz-tree-image(subjectCol, news, attach) {
- list-style-image: url("chrome://messenger/skin/icons/message-news-attach.gif");
+ list-style-image: url("chrome://messenger/skin/icons/message-news.png");
}
treechildren::-moz-tree-image(subjectCol, news, attach, offline) {
@@ -292,12 +314,32 @@ treechildren::-moz-tree-image(subjectCol, news, attach, offline) {
}
treechildren::-moz-tree-image(subjectCol, news, new) {
- list-style-image: url("chrome://messenger/skin/icons/message-news-new.gif");
+ list-style-image: url("chrome://messenger/skin/icons/message-news-new.png");
}
-treechildren::-moz-tree-image(subjectCol, news, new, attach) {
- list-style-image: url("chrome://messenger/skin/icons/message-news-new-attach.gif");
-}
+treechildren::-moz-tree-image(subjectCol, forwarded) {
+ list-style-image: url("chrome://messenger/skin/icons/message-mail-forwarded.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, forwarded, read) {
+ list-style-image: url("chrome://messenger/skin/icons/message-mail-forwarded-read.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, replied) {
+ list-style-image: url("chrome://messenger/skin/icons/message-mail-replied.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, replied, read) {
+ list-style-image: url("chrome://messenger/skin/icons/message-mail-replied-read.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, replied, forwarded) {
+ list-style-image: url("chrome://messenger/skin/icons/message-mail-replied-forw.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, replied, forwarded,read) {
+ list-style-image: url("chrome://messenger/skin/icons/message-mail-replied-forw-read.png");
+}
/* ..... new thread icons for watch and ignore ..... */
diff --git a/mozilla/mail/base/skin/primaryToolbar.css b/mozilla/mail/base/skin/primaryToolbar.css
index 1d84157ff1b..cdf3cffdfa8 100644
--- a/mozilla/mail/base/skin/primaryToolbar.css
+++ b/mozilla/mail/base/skin/primaryToolbar.css
@@ -54,189 +54,186 @@ toolbar[mode="text"] .toolbarbutton-text {
}
#button-getmsg {
- -moz-image-region: rect(0px 32px 32px 0px);
+ -moz-image-region: rect(0px 30px 30px 0px);
}
#button-getmsg:hover {
- -moz-image-region: rect(32px 32px 64px 0px);
+ -moz-image-region: rect(30px 30px 60px 0px);
}
#button-getmsg[disabled] {
- -moz-image-region: rect(64px 32px 96px 0px) !important;
+ -moz-image-region: rect(60px 30px 90px 0px) !important;
}
#button-newmsg {
- -moz-image-region: rect(0px 64px 32px 32px);
+ -moz-image-region: rect(0px 60px 30px 30px);
}
#button-newmsg:hover {
- -moz-image-region: rect(32px 64px 64px 32px);
+ -moz-image-region: rect(30px 60px 60px 30px);
}
#button-newmsg[disabled] {
- -moz-image-region: rect(64px 64px 96px 32px) !important;
+ -moz-image-region: rect(60px 60px 90px 30px) !important;
}
#button-address {
- -moz-image-region: rect(0px 96px 32px 64px);
+ -moz-image-region: rect(0px 90px 30px 60px);
}
#button-address:hover {
- -moz-image-region: rect(32px 96px 64px 64px);
+ -moz-image-region: rect(30px 90px 60px 60px);
}
#button-address[disabled="true"] {
- -moz-image-region: rect(64px 96px 96px 64px) !important;
+ -moz-image-region: rect(60px 90px 90px 60px) !important;
}
#button-reply {
- -moz-image-region: rect(0px 128px 32px 96px);
+ -moz-image-region: rect(0px 120px 30px 90px);
}
#button-reply:hover {
- -moz-image-region: rect(32px 128px 64px 96px);
+ -moz-image-region: rect(30px 120px 60px 90px);
}
#button-reply[disabled] {
- -moz-image-region: rect(64px 128px 96px 96px) !important;
+ -moz-image-region: rect(60px 120px 90px 90px) !important;
}
#button-replyall {
- -moz-image-region: rect(0px 160px 32px 128px);
+ -moz-image-region: rect(0px 150px 30px 120px);
}
#button-replyall:hover {
- -moz-image-region: rect(32px 160px 64px 128px);
+ -moz-image-region: rect(30px 150px 60px 120px);
}
#button-replyall[disabled] {
- -moz-image-region: rect(64px 160px 96px 128px) !important;
+ -moz-image-region: rect(60px 150px 90px 120px) !important;
}
#button-forward {
- -moz-image-region: rect(0px 192px 32px 160px);
+ -moz-image-region: rect(0px 180px 30px 150px);
}
#button-forward:hover {
- -moz-image-region: rect(32px 192px 64px 160px);
+ -moz-image-region: rect(30px 180px 60px 150px);
}
#button-forward[disabled] {
- -moz-image-region: rect(64px 192px 96px 160px) !important;
+ -moz-image-region: rect(60px 180px 90px 150px) !important;
}
#button-delete {
- -moz-image-region: rect(0px 224px 32px 192px);
+ -moz-image-region: rect(0px 210px 30px 180px);
}
#button-delete:hover {
- -moz-image-region: rect(32px 224px 64px 192px);
+ -moz-image-region: rect(30px 210px 60px 180px);
}
#button-delete[disabled] {
- -moz-image-region: rect(64px 224px 96px 192px) !important;
+ -moz-image-region: rect(60px 210px 90px 180px) !important;
}
#button-junk{
- -moz-image-region: rect(0px 256px 32px 224px);
+ -moz-image-region: rect(0px 240px 30px 210px);
}
#button-junk:hover {
- -moz-image-region: rect(32px 256px 64px 224px);
+ -moz-image-region: rect(30px 240px 60px 210px);
}
#button-junk[disabled="true"] {
- -moz-image-region: rect(64px 256px 96px 224px) !important;
+ -moz-image-region: rect(60px 240px 90px 210px) !important;
}
#button-print {
- -moz-image-region: rect(0px 288px 32px 256px);
+ -moz-image-region: rect(0px 270px 30px 240px);
}
#button-print[buttonover] {
- -moz-image-region: rect(32px 288px 64px 256px);
+ -moz-image-region: rect(30px 270px 60px 240px);
}
#button-print[buttondown] {
- -moz-image-region: rect(32px 288px 64px 256px);
+ -moz-image-region: rect(30px 270px 60px 240px);
}
#button-print[disabled] {
- -moz-image-region: rect(64px 288px 96px 256px) !important;
+ -moz-image-region: rect(60px 270px 90px 240px) !important;
}
#button-stop {
- -moz-image-region: rect(0px 320px 32px 288px);
+ -moz-image-region: rect(0px 300px 30px 270px);
}
#button-stop:hover {
- -moz-image-region: rect(32px 320px 64px 288px);
+ -moz-image-region: rect(30px 300px 60px 270px);
}
#button-stop[disabled="true"] {
- -moz-image-region: rect(64px 320px 96px 288px) !important;
+ -moz-image-region: rect(60px 300px 90px 270px) !important;
}
#button-file {
- -moz-image-region: rect(0px 352px 32px 320px);
+ -moz-image-region: rect(0px 330px 30px 300px);
}
#button-file:hover {
- -moz-image-region: rect(32px 352px 64px 320px);
+ -moz-image-region: rect(30px 330px 60px 300px);
}
#button-file:hover:active,
#button-file[open] {
- -moz-image-region: rect(32px 352px 64px 320px);
+ -moz-image-region: rect(30px 330px 60px 300px);
}
#button-file[disabled] {
- -moz-image-region: rect(64px 352px 96px 320px) !important;
+ -moz-image-region: rect(60px 330px 90px 300px) !important;
}
#button-next {
- -moz-image-region: rect(0px 384px 32px 352px);
+ -moz-image-region: rect(0px 360px 30px 330px);
}
#button-next:hover {
- -moz-image-region: rect(32px 384px 64px 352px);
+ -moz-image-region: rect(30px 360px 60px 330px);
}
#button-next[disabled] {
- -moz-image-region: rect(64px 384px 96px 352px) !important;
+ -moz-image-region: rect(60px 360px 90px 330px) !important;
}
#button-previous {
- -moz-image-region: rect(0px 416px 32px 384px);
+ -moz-image-region: rect(0px 390px 30px 360px);
}
#button-previous:hover {
- -moz-image-region: rect(32px 416px 64px 384px);
+ -moz-image-region: rect(30px 390px 60px 360px);
}
#button-previous[disabled] {
- -moz-image-region: rect(64px 416px 96px 384px) !important;
+ -moz-image-region: rect(60px 390px 90px 360px) !important;
}
-/* No mark button in thunderbird
#button-mark {
- -moz-image-region: rect(336px 23px 357px 0);
+ -moz-image-region: rect(0px 420px 30px 390px);
}
#button-mark[buttonover] {
- -moz-image-region: rect(336px 46px 357px 23px);
+ -moz-image-region: rect(30px 420px 60px 390px);
}
#button-mark[buttondown] {
- -moz-image-region: rect(336px 69px 357px 46px);
+ -moz-image-region: rect(30px 420px 60px 390px);
}
#button-mark[disabled] {
- -moz-image-region: rect(336px 92px 357px 69px) !important;
+ -moz-image-region: rect(60px 420px 90px 390px) !important;
}
-*/
-
/* ::::: small primary toolbar buttons ::::: */
@@ -410,6 +407,18 @@ toolbar[iconsize="small"] #button-previous[disabled] {
-moz-image-region: rect(40px 260px 60px 240px) !important;
}
+toolbar[iconsize="small"] #button-mark {
+ -moz-image-region: rect(0px 280px 20px 260px);
+}
+
+toolbar[iconsize="small"] #button-mark:hover {
+ -moz-image-region: rect(20px 280px 40px 260px);
+}
+
+toolbar[iconsize="small"] #button-mark[disabled] {
+ -moz-image-region: rect(40px 280px 60px 260px) !important;
+}
+
/* Smaller padding on small toolbar buttons */
toolbar[iconsize="small"] .toolbarbutton-1 {
diff --git a/mozilla/mail/base/skin/searchDialog.css b/mozilla/mail/base/skin/searchDialog.css
index e0a0c1028e4..9e0334d4c34 100644
--- a/mozilla/mail/base/skin/searchDialog.css
+++ b/mozilla/mail/base/skin/searchDialog.css
@@ -78,125 +78,154 @@ treechildren::-moz-tree-cell-text(container, closed, hasUnread, read) {
/* ..... thread column ..... */
-treecol.threadColumnHeader {
- list-style-image: url("chrome://messenger/skin/icons/unthreadcol.gif");
-}
-
-treecol.threadColumnHeader[sortDirection="ascending"] {
- list-style-image: url("chrome://messenger/skin/icons/threadcol.gif");
-}
-
-treecol.threadColumnHeader[sortDirection="descending"] {
- list-style-image: url("chrome://messenger/skin/icons/threadcol.gif");
-}
-
-treechildren::-moz-tree-image(threadCol, container) {
- list-style-image: url("chrome://messenger/skin/icons/thread-closed.gif");
-}
-
-treechildren::-moz-tree-image(threadCol, container, open) {
- list-style-image: url("chrome://messenger/skin/icons/thread-open.gif");
-}
-
-treechildren::-moz-tree-image(threadCol, container, hasUnread) {
- list-style-image: url("chrome://messenger/skin/icons/thread-new-closed.gif");
-}
-
-treechildren::-moz-tree-image(threadCol, container, hasUnread, open) {
- list-style-image: url("chrome://messenger/skin/icons/thread-new-open.gif");
+treecol.threadColumnHeader {
+ list-style-image: url("chrome://messenger/skin/icons/thread-col.png");
+ padding-right: 3px;
+}
+
+treecol.threadColumnHeader[sortDirection="ascending"] {
+ list-style-image: url("chrome://messenger/skin/icons/thread-col.png");
+}
+
+treecol.threadColumnHeader[sortDirection="descending"] {
+ list-style-image: url("chrome://messenger/skin/icons/thread-col.png");
+}
+
+treechildren::-moz-tree-image(threadCol, container) {
+ list-style-image: url("chrome://messenger/skin/icons/thread-closed.gif");
+}
+
+treechildren::-moz-tree-image(threadCol, container, open) {
+ list-style-image: url("chrome://messenger/skin/icons/thread-open.gif");
+}
+
+treechildren::-moz-tree-image(threadCol, container, hasUnread) {
+ list-style-image: url("chrome://messenger/skin/icons/thread-new-closed.gif");
+}
+
+treechildren::-moz-tree-image(threadCol, container, hasUnread, open) {
+ list-style-image: url("chrome://messenger/skin/icons/thread-new-open.gif");
}
/* ..... read column ..... */
-treecol.readColumnHeader {
- list-style-image: url("chrome://messenger/skin/icons/readcol.gif");
+treecol.readColumnHeader {
+ list-style-image: url("chrome://messenger/skin/icons/readcol.png");
+ padding-right: 5px;
+ padding-bottom: 5px;
+}
+
+treechildren::-moz-tree-image(unreadButtonColHeader) {
+ list-style-image: url("chrome://messenger/skin/icons/readmail.gif");
+}
+
+treechildren::-moz-tree-image(unreadButtonColHeader, unread) {
+ list-style-image: url("chrome://messenger/skin/icons/unreadmail.png");
}
-treechildren::-moz-tree-image(unreadButtonColHeader) {
- list-style-image: url("chrome://messenger/skin/icons/readmail.gif");
-}
+/* ..... attachment column ..... */
+
+treecol.attachmentColumnHeader {
+ list-style-image: url("chrome://messenger/skin/icons/attachment-col.png");
+ padding-right: 5px;
+}
+
+treechildren::-moz-tree-image(attachmentCol, attach) {
+ list-style-image: url("chrome://messenger/skin/icons/attachment.png");
+}
+
+/* ..... flag column ..... */
+
+treecol.flagColumnHeader {
+ list-style-image: url("chrome://messenger/skin/icons/flag-col.png");
+ padding-right: 5px;
+}
+
+treechildren::-moz-tree-image(flaggedCol) {
+ list-style-image: url("chrome://messenger/skin/icons/readmail.gif");
+}
+
+treechildren::-moz-tree-image(flaggedCol, flagged) {
+ list-style-image: url("chrome://messenger/skin/icons/flag.png");
+}
-treechildren::-moz-tree-image(unreadButtonColHeader, unread) {
- list-style-image: url("chrome://messenger/skin/icons/unreadmail.gif");
-}
-
-/* ..... flag column ..... */
-
-treecol.flagColumnHeader {
- list-style-image: url("chrome://messenger/skin/icons/flagcol.gif");
-}
-
-treechildren::-moz-tree-image(flaggedCol) {
- list-style-image: url("chrome://messenger/skin/icons/readmail.gif");
-}
-
-treechildren::-moz-tree-image(flaggedCol, flagged) {
- list-style-image: url("chrome://messenger/skin/icons/flaggedmail.gif");
-}
/* ..... junkStatus column ..... */
-
-treecol.junkStatusHeader {
- list-style-image: url("chrome://messenger/skin/icons/folder-junk.png");
- padding: 0px 4px 0px 0px;
-}
-
-/* "unknown" now looks like "not junk". see bug #182386 */
-treechildren::-moz-tree-image(junkStatusCol) {
- list-style-image: url("chrome://messenger/skin/icons/readmail.gif");
- padding-left: 0px;
- padding-right: 4px;
-}
-
-treechildren::-moz-tree-image(junkStatusCol, junk) {
- list-style-image: url("chrome://messenger/skin/icons/folder-junk.png");
- margin-right: -1px;
-}
-
-treechildren::-moz-tree-image(junkStatusCol, notjunk) {
- list-style-image: url("chrome://messenger/skin/icons/readmail.gif");
- padding-left: 0px;
- padding-right: 4px;
-}
+
+treecol.junkStatusHeader {
+ list-style-image: url("chrome://messenger/skin/icons/junk-col.png");
+ padding-right: 5px;
+}
+
+/* "unknown" now looks like "not junk". see bug #182386 */
+treechildren::-moz-tree-image(junkStatusCol) {
+ list-style-image: url("chrome://messenger/skin/icons/readmail.gif");
+ padding-left: 0px;
+}
+
+treechildren::-moz-tree-image(junkStatusCol, junk) {
+ list-style-image: url("chrome://messenger/skin/icons/folder-junk.png");
+}
+
+treechildren::-moz-tree-image(junkStatusCol, notjunk) {
+ list-style-image: url("chrome://messenger/skin/icons/readmail.gif");
+ padding-left: 0px;
+}
/* ..... subject column ..... */
-treechildren::-moz-tree-image(subjectCol) {
- margin-right: 2px;
- list-style-image: url("chrome://messenger/skin/icons/message-mail.gif");
-}
-
-treechildren::-moz-tree-image(subjectCol, new) {
- list-style-image: url("chrome://messenger/skin/icons/message-mail-new.gif");
-}
-
-treechildren::-moz-tree-image(subjectCol, attach) {
- list-style-image: url("chrome://messenger/skin/icons/message-mail-attach.gif");
-}
-
-treechildren::-moz-tree-image(subjectCol, imapdeleted) {
- list-style-image: url("chrome://messenger/skin/icons/message-mail-imapdelete.gif");
-}
-
-treechildren::-moz-tree-image(subjectCol, news) {
- list-style-image: url("chrome://messenger/skin/icons/message-news.gif");
-}
-
-treechildren::-moz-tree-image(subjectCol, news, attach) {
- list-style-image: url("chrome://messenger/skin/icons/message-news-attach.gif");
-}
-
-treechildren::-moz-tree-image(subjectCol, news, attach, offline) {
- list-style-image: url("chrome://messenger/skin/icons/message-news-attach-offl.gif");
-}
-
-treechildren::-moz-tree-image(subjectCol, news, new) {
- list-style-image: url("chrome://messenger/skin/icons/message-news-new.gif");
-}
-
-treechildren::-moz-tree-image(subjectCol, news, new, attach) {
- list-style-image: url("chrome://messenger/skin/icons/message-news-new-attach.gif");
-}
+treechildren::-moz-tree-image(subjectCol) {
+ margin-right: 2px;
+ list-style-image: url("chrome://messenger/skin/icons/message-mail.png ");
+}
+
+treechildren::-moz-tree-image(subjectCol, read) {
+ list-style-image: url("chrome://messenger/skin/icons/message-mail-read.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, new) {
+ list-style-image: url("chrome://messenger/skin/icons/message-mail-new.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, imapdeleted) {
+ list-style-image: url("chrome://messenger/skin/icons/message-mail-imapdelete.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, news) {
+ list-style-image: url("chrome://messenger/skin/icons/message-news.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, news, attach, offline) {
+ list-style-image: url("chrome://messenger/skin/icons/message-news-attach-offl.gif");
+}
+
+treechildren::-moz-tree-image(subjectCol, news, new) {
+ list-style-image: url("chrome://messenger/skin/icons/message-news-new.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, forwarded) {
+ list-style-image: url("chrome://messenger/skin/icons/message-mail-forwarded.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, forwarded, read) {
+ list-style-image: url("chrome://messenger/skin/icons/message-mail-forwarded-read.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, replied) {
+ list-style-image: url("chrome://messenger/skin/icons/message-mail-replied.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, replied, read) {
+ list-style-image: url("chrome://messenger/skin/icons/message-mail-replied-read.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, replied, forwarded) {
+ list-style-image: url("chrome://messenger/skin/icons/message-mail-replied-forw.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, replied, forwarded,read) {
+ list-style-image: url("chrome://messenger/skin/icons/message-mail-replied-forw-read.png");
+}
/* ..... new thread icons for watch and ignore ..... */
diff --git a/mozilla/mail/components/addrbook/jar.mn b/mozilla/mail/components/addrbook/jar.mn
index f8377662d5a..bf0a15bc665 100644
--- a/mozilla/mail/components/addrbook/jar.mn
+++ b/mozilla/mail/components/addrbook/jar.mn
@@ -2,8 +2,12 @@ classic.jar:
+ skin/classic/messenger/addressbook/addressbook.css (skin/addressbook.css)
+ skin/classic/messenger/addressbook/abContactsPanel.css (skin/abContactsPanel.css)
+ skin/classic/messenger/addressbook/cardDialog.css (skin/cardDialog.css)
- skin/classic/messenger/addressbook/icons/addressbook-16.gif (skin/icons/addressbook-16.gif)
-
+ skin/classic/messenger/addressbook/icons/abcard.png (skin/icons/abcard.png)
+ skin/classic/messenger/addressbook/icons/addrbook.png (skin/icons/addrbook.png)
+ skin/classic/messenger/addressbook/icons/ablist.png (skin/icons/ablist.png)
+ skin/classic/messenger/addressbook/icons/addressbook-toolbar.png (skin/icons/addressbook-toolbar.png)
+ skin/classic/messenger/addressbook/icons/addressbook-toolbar-small.png (skin/icons/addressbook-toolbar-small.png)
+
messenger.jar:
*+ content/messenger/addressbook/abCardViewOverlay.js (content/abCardViewOverlay.js)
*+ content/messenger/addressbook/addressbook.js (content/addressbook.js)
diff --git a/mozilla/mail/components/addrbook/skin/addressbook.css b/mozilla/mail/components/addrbook/skin/addressbook.css
index 7b5058dd0ca..d7eb7a1e870 100644
--- a/mozilla/mail/components/addrbook/skin/addressbook.css
+++ b/mozilla/mail/components/addrbook/skin/addressbook.css
@@ -33,19 +33,15 @@
/* ::::: tools menu icon ::::: */
.icon-mail16 {
- list-style-image: url("chrome://messenger/skin/icons/mail-16.gif");
+ list-style-image: url("chrome://messenger/skin/icons/message-mail.png");
}
/* ::::: primary toolbar buttons ::::: */
-.toolbarbutton-1 {
- list-style-image: url("chrome://messenger/skin/icons/btn1.gif");
- min-width: 47px;
- -moz-box-orient: vertical;
-}
-
-.toolbarbutton-1[type="menu"] > .toolbarbutton-menu-dropmarker {
- display: none;
+.toolbarbutton-1 {
+ -moz-box-orient: vertical;
+ min-width: 0px;
+ list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
}
toolbar[mode="icons"] .toolbarbutton-text {
@@ -61,112 +57,212 @@ toolbar[mode="text"] .toolbarbutton-text {
padding: 0 !important;
margin: 3px 5px !important;
}
+
+#button-newcard {
+ list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
+ -moz-image-region: rect(0px 30px 30px 0px);
+}
+
+#button-newcard:hover {
+ -moz-image-region: rect(30px 30px 60px 0px);
+}
+
+#button-newcard:hover:active {
+ -moz-image-region: rect(30px 30px 60px 0px);
+}
+
+#button-newcard[disabled="true"] {
+ -moz-image-region: rect(60px 30px 90px 0px) !important;
+}
+
+#button-newlist {
+ list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
+ -moz-image-region: rect(0px 60px 30px 30px);
+}
+
+#button-newlist:hover {
+ -moz-image-region: rect(30px 60px 60px 30px);
+}
+
+#button-newlist[disabled="true"] {
+ -moz-image-region: rect(60px 60px 90px 30px) !important;
+}
+
+#button-editcard {
+ list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
+ -moz-image-region: rect(0px 90px 30px 60px);
+}
+
+#button-editcard:hover {
+ -moz-image-region: rect(30px 90px 60px 60px);
+}
+
+#button-editcard[disabled="true"] {
+ -moz-image-region: rect(60px 90px 90px 60px) !important;
+}
-#button-newcard {
- -moz-image-region: rect(0px 23px 21px 0px);
-}
-
-#button-newcard:hover {
- -moz-image-region: rect(0px 46px 21px 23px);
-}
-
-#button-newcard:hover:active {
- -moz-image-region: rect(0px 69px 21px 46px);
-}
-
-#button-newcard[disabled] {
- -moz-image-region: rect(0px 92px 21px 69px) !important;
-}
-
-#button-newlist {
- -moz-image-region: rect(21px 46px 42px 23px);
-}
-
-#button-newlist:hover {
- -moz-image-region: rect(21px 23px 42px 0px);
-}
-
-#button-newlist:hover:active {
- -moz-image-region: rect(21px 69px 42px 46px);
-}
-
-#button-newlist[disabled] {
- -moz-image-region: rect(21px 92px 42px 69px) !important;
-}
-
-#button-editcard {
- -moz-image-region: rect(42px 23px 63px 0px);
-}
-
-#button-editcard:hover {
- -moz-image-region: rect(42px 46px 63px 23px);
-}
-
-#button-editcard:hover:active {
- -moz-image-region: rect(42px 69px 63px 46px);
-}
-
-#button-editcard[disabled] {
- -moz-image-region: rect(42px 92px 63px 69px) !important;
-}
-
-#button-newmessage {
- -moz-image-region: rect(126px 23px 147px 0px);
+#button-newmessage {
+ list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
+ -moz-image-region: rect(0px 120px 30px 90px);
}
#button-newmessage:hover {
- -moz-image-region: rect(126px 46px 147px 23px);
-}
-
-#button-newmessage:hover:active {
- -moz-image-region: rect(126px 69px 147px 46px);
+ -moz-image-region: rect(30px 120px 60px 90px);
}
#button-newmessage[disabled] {
- -moz-image-region: rect(126px 92px 147px 69px) !important;
+ -moz-image-region: rect(60px 120px 90px 90px) !important;
}
-#button-newim {
- list-style-image: url("chrome://messenger/skin/addressbook/icons/im.gif");
+#button-newim {
+ list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
+ -moz-image-region: rect(0px 150px 30px 120px);
}
#button-newim:hover {
- list-style-image: url("chrome://messenger/skin/addressbook/icons/im-hov.gif");
-}
-
-#button-newim:hover:active {
- list-style-image: url("chrome://messenger/skin/addressbook/icons/im-act.gif");
+ -moz-image-region: rect(30px 150px 60px 120px);
}
#button-newim[disabled] {
- list-style-image: url("chrome://messenger/skin/addressbook/icons/im-dis.gif");
+ -moz-image-region: rect(60px 150px 90px 120px) !important;
}
-#button-delete {
- -moz-image-region: rect(210px 23px 231px 0px);
+#button-delete {
+ list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
+ -moz-image-region: rect(0px 180px 30px 150px);
}
#button-delete:hover {
- -moz-image-region: rect(210px 46px 231px 23px);
+ -moz-image-region: rect(30px 180px 60px 150px);
}
-#button-delete:hover:active {
- -moz-image-region: rect(210px 69px 231px 46px);
-}
-
#button-delete[disabled] {
- -moz-image-region: rect(210px 92px 231px 69px) !important;
+ -moz-image-region: rect(60px 180px 90px 150px) !important;
}
+
+/* ::::: small primary toolbar buttons ::::: */
+
+toolbar[iconsize="small"] .toolbarbutton-1 {
+ list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png");
+}
+
+toolbar[iconsize="small"] #button-newcard {
+ list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png");
+ -moz-image-region: rect(0px 20px 20px 0px);
+}
+
+toolbar[iconsize="small"] #button-newcard:hover {
+ -moz-image-region: rect(20px 20px 40px 0px);
+}
+
+toolbar[iconsize="small"] #button-newcard[disabled] {
+ -moz-image-region: rect(40px 20px 60px 0px) !important;
+}
+
+toolbar[iconsize="small"] #button-newlist {
+ list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png");
+ -moz-image-region: rect(0px 40px 20px 20px);
+}
+
+toolbar[iconsize="small"] #button-newlist:hover {
+ -moz-image-region: rect(20px 40px 40px 20px);
+}
+
+toolbar[iconsize="small"] #button-newlist[disabled] {
+ -moz-image-region: rect(40px 40px 60px 20px) !important;
+}
+
+toolbar[iconsize="small"] #button-editcard {
+ list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png");
+ -moz-image-region: rect(0px 60px 20px 40px);
+}
+
+toolbar[iconsize="small"] #button-editcard:hover {
+ -moz-image-region: rect(20px 60px 40px 40px);
+}
+
+toolbar[iconsize="small"] #button-editcard[disabled="true"] {
+ -moz-image-region: rect(40px 60px 60px 40px) !important;
+}
+
+toolbar[iconsize="small"] #button-newmessage {
+ list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png");
+ -moz-image-region: rect(0px 80px 20px 60px);
+}
+
+toolbar[iconsize="small"] #button-newmessage:hover {
+ -moz-image-region: rect(20px 80px 40px 60px);
+}
+
+toolbar[iconsize="small"] #button-newmessage[disabled] {
+ -moz-image-region: rect(40px 80px 60px 60px) !important;
+}
+
+toolbar[iconsize="small"] #button-newim {
+ list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png");
+ -moz-image-region: rect(0px 100px 20px 80px);
+}
+
+toolbar[iconsize="small"] #button-newim:hover {
+ -moz-image-region: rect(20px 100px 40px 80px);
+}
+
+toolbar[iconsize="small"] #button-newim[disabled] {
+ -moz-image-region: rect(40px 100px 60px 80px) !important;
+}
+
+toolbar[iconsize="small"] #button-delete {
+ list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png");
+ -moz-image-region: rect(0px 120px 20px 100px);
+}
+
+toolbar[iconsize="small"] #button-delete:hover {
+ -moz-image-region: rect(20px 120px 40px 100px);
+}
+
+toolbar[iconsize="small"] #button-delete[disabled] {
+ -moz-image-region: rect(40px 120px 60px 100px) !important;
+}
+
+toolbar[iconsize="small"] .toolbarbutton-1 {
+ padding: 2px;
+}
+
+toolbar[iconsize="small"] .toolbarbutton-1:hover:active,
+toolbar[iconsize="small"] .toolbarbutton-1[open="true"] {
+ padding: 3px 1px 1px 3px;
+}
+
+toolbar[iconsize="small"] .toolbarbutton-1[disabled="true"],
+toolbar[iconsize="small"] .toolbarbutton-1[disabled="true"]:hover,
+toolbar[iconsize="small"] .toolbarbutton-1[disabled="true"]:hover:active,
+toolbar[iconsize="small"] .toolbarbutton-1[disabled="true"][open="true"] {
+ padding: 2px;
+}
+
+toolbar[iconsize="small"] .toolbarbutton-1[checked="true"] {
+ padding: 3px 1px 1px 3px !important;
+}
+
+toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"],
+toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"]:hover,
+toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"]:hover:active,
+toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"][open="true"],
+toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"][disabled="true"],
+toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"][disabled="true"]:hover,
+toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"][disabled="true"]:hover:active {
+ padding: 0;
+}
/* ::::: directory pane icons ::::: */
treechildren::-moz-tree-image(DirCol) {
margin-right: 2px;
- list-style-image: url("chrome://messenger/skin/addressbook/icons/addrbook.gif");
+ list-style-image: url("chrome://messenger/skin/addressbook/icons/addrbook.png");
}
treechildren::-moz-tree-image(DirCol, IsMailList-true) {
- list-style-image: url("chrome://messenger/skin/addressbook/icons/ablist.gif");
+ list-style-image: url("chrome://messenger/skin/addressbook/icons/ablist.png");
}
treechildren::-moz-tree-image(DirCol, IsRemote-true) {
@@ -194,12 +290,12 @@ treechildren::-moz-tree-image(DirCol, IsRemote-true, IsSecure-true) {
treechildren::-moz-tree-image(GeneratedName) {
margin-right: 2px;
- list-style-image: url("chrome://messenger/skin/addressbook/icons/abcard.gif");
+ list-style-image: url("chrome://messenger/skin/addressbook/icons/abcard.png");
}
treechildren::-moz-tree-image(GeneratedName, MailList) {
margin-right: 2px;
- list-style-image: url("chrome://messenger/skin/addressbook/icons/ablist.gif");
+ list-style-image: url("chrome://messenger/skin/addressbook/icons/ablist.png");
}
/* ::::: card view pane ::::: */
diff --git a/mozilla/mail/components/addrbook/skin/icons/abcard.png b/mozilla/mail/components/addrbook/skin/icons/abcard.png
new file mode 100755
index 00000000000..addb6861f3b
Binary files /dev/null and b/mozilla/mail/components/addrbook/skin/icons/abcard.png differ
diff --git a/mozilla/mail/components/addrbook/skin/icons/ablist.png b/mozilla/mail/components/addrbook/skin/icons/ablist.png
new file mode 100755
index 00000000000..fec26747923
Binary files /dev/null and b/mozilla/mail/components/addrbook/skin/icons/ablist.png differ
diff --git a/mozilla/mail/components/addrbook/skin/icons/addrbook.png b/mozilla/mail/components/addrbook/skin/icons/addrbook.png
new file mode 100755
index 00000000000..b17c5f3bf25
Binary files /dev/null and b/mozilla/mail/components/addrbook/skin/icons/addrbook.png differ
diff --git a/mozilla/mail/components/addrbook/skin/icons/addressbook-toolbar-small.png b/mozilla/mail/components/addrbook/skin/icons/addressbook-toolbar-small.png
new file mode 100755
index 00000000000..965eafd9cda
Binary files /dev/null and b/mozilla/mail/components/addrbook/skin/icons/addressbook-toolbar-small.png differ
diff --git a/mozilla/mail/components/addrbook/skin/icons/addressbook-toolbar.png b/mozilla/mail/components/addrbook/skin/icons/addressbook-toolbar.png
new file mode 100755
index 00000000000..925bc72d02d
Binary files /dev/null and b/mozilla/mail/components/addrbook/skin/icons/addressbook-toolbar.png differ
diff --git a/mozilla/mail/components/compose/content/messengercompose.xul b/mozilla/mail/components/compose/content/messengercompose.xul
index 0de2d2381ea..9ffafe37dec 100644
--- a/mozilla/mail/components/compose/content/messengercompose.xul
+++ b/mozilla/mail/components/compose/content/messengercompose.xul
@@ -546,6 +546,21 @@
id="quoteButton" label=""eButton.label;"
tooltiptext=""eButton.tooltip;"
command="cmd_quoteMessage"/>
+
+
+
+
+
+