Bug 514829: [gnomestripe] the old style folder icons are used in a number of places (those where folder.png is referred to). ui-r=clarkbw, r=philor, sr=standard8, a=standard8

2009-09-09 18:17:00 +03:00 · 2009-09-09 18:17:00 +03:00 · 1a02e61a62
--- a/mail/themes/gnomestripe/jar.mn
+++ b/mail/themes/gnomestripe/jar.mn
@ -108,7 +108,6 @@ classic.jar:
  skin/classic/messenger/icons/cancel.png                     (mail/icons/cancel.png)
  skin/classic/messenger/icons/mail-toolbar.png               (mail/icons/mail-toolbar.png)
  skin/classic/messenger/icons/mail-toolbar-small.png         (mail/icons/mail-toolbar-small.png)
-  skin/classic/messenger/icons/folder.png                     (mail/icons/folder.png)
  skin/classic/messenger/icons/folder-pane.png                (mail/icons/folder-pane.png)
  skin/classic/messenger/icons/folder-blank.png               (mail/icons/folder-blank.png)
  skin/classic/messenger/icons/folder-new-star.png            (mail/icons/folder-new-star.png)
--- a/mail/themes/gnomestripe/mail/folderMenus.css
+++ b/mail/themes/gnomestripe/mail/folderMenus.css
@ -20,6 +20,7 @@
 * the Initial Developer. All Rights Reserved.
 *
 * Contributor(s):
+ *   Magnus Melin <mkmelin+mozilla@iki.fi>
 *
 * Alternatively, the contents of this file may be used under the terms of
 * either the GNU General Public License Version 2 or later (the "GPL"), or
@ -41,95 +42,96 @@

@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");

-/* ::::: folder icons for menus ::::: */
+/* ::::: Folder icons for menus   ::::: */

+/* Folders */
 .folderMenuItem {
-  list-style-image: url("chrome://messenger/skin/icons/folder.png");
-  -moz-image-region: rect(0 16px 16px 0);
-}
-
-.folderMenuItem[open="true"] {
-  -moz-image-region: rect(0 32px 16px 16px);
+  list-style-image: url("moz-icon://stock/gtk-directory?size=menu");
 }

 /* Newsgroup */
 .folderMenuItem[ServerType="nntp"] {
-  -moz-image-region: rect(0 160px 16px 144px);
+  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  -moz-image-region: rect(208px 16px 224px 0px);
 }

 /* Feed */
 .folderMenuItem[ServerType="rss"] {
-  list-style-image: url("chrome://messenger-newsblog/skin/icons/rss-feed.png");
-  -moz-image-region: rect(0 16px 16px 0);
+  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  -moz-image-region: rect(112px 16px 128px 0px);
 }

-/* Resets list-style-image for Feed Trash and Virtual folders */
-.folderMenuItem[ServerType="rss"][SpecialFolder="Trash"],
-.folderMenuItem[ServerType="rss"][SpecialFolder="Virtual"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder.png");
-}
-
-/* ..... special folders ..... */
-
 .folderMenuItem[SpecialFolder="Inbox"] {
-  -moz-image-region: rect(0 48px 16px 32px);
+  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  -moz-image-region: rect(64px 16px 80px 0px);
 }

 .folderMenuItem[SpecialFolder="Sent"] {
-  -moz-image-region: rect(0 64px 16px 48px);
+  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  -moz-image-region: rect(144px 16px 160px 0px);
 }

 .folderMenuItem[SpecialFolder="Outbox"] {
-  -moz-image-region: rect(0 80px 16px 64px);
+  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  -moz-image-region: rect(96px 16px 112px 0px);
 }

-.folderMenuItem[SpecialFolder="Drafts"] {
-  -moz-image-region: rect(0 96px 16px 80px);
+.folderMenuItem[SpecialFolder="Drafts"] { 
+  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  -moz-image-region: rect(48px 16px 64px 0px);
 }

-.folderMenuItem[SpecialFolder="Templates"] {
-  -moz-image-region: rect(0 112px 16px 96px);
+.folderMenuItem[SpecialFolder="Templates"] { 
+  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  -moz-image-region: rect(160px 16px 176px 0px);
 }

 .folderMenuItem[SpecialFolder="Junk"] {
-  -moz-image-region: rect(0 128px 16px 112px);
+  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  -moz-image-region: rect(80px 16px 96px 0px);
 }

 .folderMenuItem[SpecialFolder="Trash"] {
-  -moz-image-region: rect(0 144px 16px 128px);
+  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  -moz-image-region: rect(176px 16px 192px 0px);
+}
+
+.folderMenuItem[SpecialFolder="Archive"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  -moz-image-region: rect(192px 16px 208px 0px);
 }

 .folderMenuItem[SpecialFolder="Virtual"] {
-  -moz-image-region: rect(0 176px 16px 160px);
+  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  -moz-image-region: rect(128px 16px 144px 0px);
+
 }

-/* ..... servers ..... */
-
+/** IMAP/POP/movemail account nodes */
 .folderMenuItem[IsServer="true"] {
-  list-style-image: url("chrome://messenger/skin/icons/server.png");
-  -moz-image-region: rect(0 16px 16px 0);
+  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  -moz-image-region: rect(16px 16px 32px 0px);
 }

-.folderMenuItem[IsServer="true"][ServerType="imap"][IsSecure="true"],
-.folderMenuItem[IsServer="true"][ServerType="pop3"][IsSecure="true"] {
-  -moz-image-region: rect(0 32px 16px 16px);
-}
-
-/* Local folders */
+/* Local folders account node */
 .folderMenuItem[IsServer="true"][ServerType="none"] {
-  -moz-image-region: rect(0 48px 16px 32px);
+  -moz-image-region: rect(0px 16px 16px 0px);
 }

 /* News server */
 .folderMenuItem[IsServer="true"][ServerType="nntp"] {
-  -moz-image-region: rect(0 64px 16px 48px);
+  list-style-image: url("chrome://messenger/skin/icons/server.png");
+  -moz-image-region: rect(0px 64px 16px 48px);
 }

+/** Secure news server */
 .folderMenuItem[IsServer="true"][ServerType="nntp"][IsSecure="true"] {
-  -moz-image-region: rect(0 80px 16px 64px) !important;
+  list-style-image: url("chrome://messenger/skin/icons/server.png");
+  -moz-image-region: rect(0px 80px 16px 64px);
 }

-/* Feed server */
+/* Feed account node */
 .folderMenuItem[IsServer="true"][ServerType="rss"] {
-  list-style-image: url("chrome://messenger-newsblog/skin/icons/server-rss.png");
+  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  -moz-image-region: rect(32px 16px 48px 0px);
 }
--- a/mail/themes/gnomestripe/mail/folderPane.css
+++ b/mail/themes/gnomestripe/mail/folderPane.css
@ -11,9 +11,7 @@ treechildren::-moz-tree-image(folderNameCol) {
  -moz-background-origin: border;
  background-image: url("moz-icon://stock/gtk-directory?size=menu");
  list-style-image: url("chrome://messenger/skin/icons/folder-blank.png");
-}

-treechildren::-moz-tree-image(folderNameCol) {
  -moz-margin-end: 2px;
 }

@ -27,24 +25,6 @@ treechildren::-moz-tree-image(folderNameCol, selected, open, newMessages-true) {
  list-style-image: url("chrome://messenger/skin/icons/folder-new-star.png");
 }

-/* ..... Newsgroup ..... */
-
-.tabmail-tab[type="folder"][ServerType="nntp"] > .tab-image-middle > .tab-icon-image,
-treechildren::-moz-tree-image(folderNameCol, serverType-nntp) {
-  background-image: none;
-  list-style-image: url("chrome://messenger/skin/icons/folder.png");
-  -moz-image-region: rect(0 160px 16px 144px);
-}
-
-/* ..... Feed ..... */
-
-.tabmail-tab[type="folder"][ServerType="rss"] > .tab-image-middle > .tab-icon-image,
-treechildren::-moz-tree-image(folderNameCol, serverType-rss) {
-  background-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  background-position: left -112px;
-  list-style-image: url("chrome://messenger/skin/icons/folder-blank.png");
-}
-
 treechildren::-moz-tree-image(folderNameCol, serverType-rss, newMessages-true) {
  background-image: url("chrome://messenger/skin/icons/folder-pane.png");
  background-position: left -112px;
@ -157,13 +137,24 @@ treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual) {
  list-style-image: url("chrome://messenger/skin/icons/folder-blank.png");
 }

-/* .....  Newsgroup .....  */
-.tabmail-tab[type="folder"][ServerType="nntp"] > .tab-image-middle > .tab-icon-image {
+/* ..... Newsgroup ..... */
+
+.tabmail-tab[type="folder"][ServerType="nntp"] > .tab-image-middle > .tab-icon-image,
+treechildren::-moz-tree-image(folderNameCol, serverType-nntp) {
  background-image: url("chrome://messenger/skin/icons/folder-pane.png");
  background-position: left -208px;
  list-style-image: url("chrome://messenger/skin/icons/folder-blank.png");
 }

+/* ..... Feed ..... */
+
+.tabmail-tab[type="folder"][ServerType="rss"] > .tab-image-middle > .tab-icon-image,
+treechildren::-moz-tree-image(folderNameCol, serverType-rss) {
+  background-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  background-position: left -112px;
+  list-style-image: url("chrome://messenger/skin/icons/folder-blank.png");
+}
+
 /* ..... Account nodes ..... */
 .tabmail-tab[type="folder"][IsServer="true"] > .tab-image-middle > .tab-icon-image {
  -moz-margin-start: 0px;
@ -199,16 +190,20 @@ treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual) {
  -moz-image-region: rect(0 80px 16px 64px);
 }

-treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual, newMessages-true) {
-  list-style-image: url("chrome://messenger/skin/icons/folder.png");
-  -moz-image-region: rect(16px 176px 32px 160px);
-}
-
 treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true),
 treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true) {
  font-weight: bold;
 }

+treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true) {
+  background-position: left -16px;
+  list-style-image: url("chrome://messenger/skin/icons/folder-new-star.png");
+}
+
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual, newMessages-true) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-new-star.png");
+}
+
 /* ..... Mail server  ..... */

 treechildren::-moz-tree-image(folderNameCol, isServer-true) {
@ -217,11 +212,6 @@ treechildren::-moz-tree-image(folderNameCol, isServer-true) {
  list-style-image: url("chrome://messenger/skin/icons/folder-blank.png");
 }

-treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true) {
-  background-position: left -16px;
-  list-style-image: url("chrome://messenger/skin/icons/folder-new-star.png");
-}
-
 /* ..... Secure mail server ..... */

 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-pop3, isSecure-true),
--- a/mail/themes/gnomestripe/mail/icons/folder.png
+++ b/mail/themes/gnomestripe/mail/icons/folder.png
--- a/mail/themes/gnomestripe/mail/msgSelectOffline.css
+++ b/mail/themes/gnomestripe/mail/msgSelectOffline.css
@ -20,9 +20,10 @@
 * the Initial Developer. All Rights Reserved.
 *
 * Contributor(s):
- *   Joe Hewitt (hewitt@netscape.com)
- *   Håkan Waara (hwaara@chello.se)
- *   Jan Varga (varga@nixcorp.com)
+ *   Joe Hewitt <hewitt@netscape.com>
+ *   Håkan Waara <hwaara@chello.se>
+ *   Jan Varga <varga@nixcorp.com>
+ *   Magnus Melin <mkmelin+mozilla@iki.fi>
 *
 * Alternatively, the contents of this file may be used under the terms of
 * either the GNU General Public License Version 2 or later (the "GPL"), or
@ -39,150 +40,14 @@
 * ***** END LICENSE BLOCK ***** */

 /* ===== msgSelectOffline.css =================================================
-  == Styles for the Offline Use dialog.
-  ======================================================================= */
+   == The dialog where you select which folders to enable for offline use.
+   ========================================================================== */

@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/folderPane.css");

@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");

-/* ::::: Mail Folders ::::: */
-
-treechildren::-moz-tree-image(folderNameCol) {
-  -moz-margin-end: 2px;
-  list-style-image: url("chrome://messenger/skin/icons/folder.png");
-  -moz-image-region: rect(0 16px 16px 0);
-}
-
-treechildren::-moz-tree-image(folderNameCol, newMessages-true) {
-  -moz-image-region: rect(16px 16px 32px 0);
-}
-
-/* ..... Inbox ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox) {
-  -moz-image-region: rect(0 48px 16px 32px);
-}
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox, newMessages-true) {
-  -moz-image-region: rect(16px 48px 32px 32px);
-}
-
-/* ..... Sent ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Sent) {
-  -moz-image-region: rect(0 64px 16px 48px);
-}
-
-/* ..... Unsent ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Outbox) {
-  -moz-image-region: rect(0 80px 16px 64px);
-}
-
-/* ..... Drafts ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Drafts) {
-  -moz-image-region: rect(0 96px 16px 80px);
-}
-
-/* ..... Templates ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Templates) {
-  -moz-image-region: rect(0 112px 16px 96px);
-}
-
-/* ..... Junk ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Junk) {
-  -moz-image-region: rect(0 128px 16px 112px);
-}
-
-/* ..... Trash ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Trash) {
-  -moz-image-region: rect(0 144px 16px 128px);
-}
-
-/* ..... Shared folders .....
-
-treechildren::-moz-tree-image(folderNameCol, imapShared-true) {
-  -moz-image-region: rect(0 192px 16px 176px);
-}
-
-*/
-
-/* ..... Mail server  ..... */
-
-treechildren::-moz-tree-image(folderNameCol, isServer-true) {
-  list-style-image: url("chrome://messenger/skin/icons/server.png");
-  -moz-image-region: rect(0 16px 16px 0);
-}
-
-treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true) {
-  -moz-image-region: rect(16px 16px 32px 0);
-}
-
-treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true),
-treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true) {
-  font-weight: bold;
-}
-
-/* ..... Secure mail server ..... */
-
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-pop3, isSecure-true),
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-imap, isSecure-true) {
-  -moz-image-region: rect(0 32px 16px 16px);
-}
-
-treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true, isSecure-true) {
-  -moz-image-region: rect(16px 32px 32px 16px);
-}
-
-/* ..... Local folders ..... */
-
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-none) {
-  -moz-image-region: rect(0 48px 16px 32px);
-}
-
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-none, biffState-NewMail) {
-  -moz-image-region: rect(16px 48px 32px 32px);
-}
-
-/* ..... News server ..... */
-
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp) {
-  -moz-image-region: rect(0 64px 16px 48px) !important;
-}
-
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp, isSecure-true) {
-  -moz-image-region: rect(0 80px 16px 64px) !important;
-}
-
-/* ..... Newsgroup ..... */
-
-treechildren::-moz-tree-image(folderNameCol, serverType-nntp) {
-  -moz-image-region: rect(0 160px 16px 144px);
-}
-
-/* ::::: All Servers ::::: */
-
-treechildren::-moz-tree-cell-text(closed, subfoldersHaveUnreadMessages-true) {
-  font-weight: bold;
-}
-
-treechildren::-moz-tree-cell-text(folderNameCol, isServer-true),
-treechildren::-moz-tree-cell-text(hasUnreadMessages-true) {
-  font-weight: bold;
-}
-
-treechildren::-moz-tree-cell-text(folderNameCol, noSelect-true) {
-  color: gray;
-  font-style: italic;
-}
-
-/* ::::: Download Icons ::::: */
-
 treechildren::-moz-tree-image(syncCol) {
  list-style-image: url("chrome://messenger/skin/icons/notchecked.gif");
 }
--- a/mail/themes/gnomestripe/mail/newsblog/feed-subscriptions.css
+++ b/mail/themes/gnomestripe/mail/newsblog/feed-subscriptions.css
@ -36,9 +36,9 @@
 *
 * ***** END LICENSE BLOCK ****** */

-/* ::::: Feed Subscription UI icons :::::: */
+/* ::::: Feed Subscription styling :::::: */

-#subscriptionsDialog { 
+#subscriptionsDialog {
  padding: 0px;
 }

@ -47,18 +47,22 @@
 }

 #subscriptionChildren::-moz-tree-image(folderNameCol) {
-  -moz-margin-end: 2px;
-  list-style-image: url("chrome://messenger-newsblog/skin/icons/rss-feed.png");
-  -moz-image-region: rect(0 16px 16px 0);
+  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  -moz-image-region: rect(128px 16px 144px 0px);
 }

 #subscriptionChildren::-moz-tree-image(folderNameCol, container) {
-  list-style-image: url("chrome://messenger/skin/icons/folder.png");
-  -moz-image-region: rect(0 16px 16px 0);
-}
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-color: transparent;
+  background-attachment: scroll;
+  -moz-background-clip: border;
+  -moz-background-inline-policy: continuous;
+  -moz-background-origin: border;
+  background-image: url("moz-icon://stock/gtk-directory?size=menu");
+  list-style-image: url("chrome://messenger/skin/icons/folder-blank.png");

-#subscriptionChildren::-moz-tree-image(folderNameCol, container, open) {
-  -moz-image-region: rect(0 32px 16px 16px);
+  -moz-margin-end: 2px;
 }

 #rssFeedInfoBox {
@ -69,6 +73,6 @@
 }

 #backgroundBox {
-  background-color: #FFFFFF; 
+  background-color: #FFFFFF;
  opacity: 0.5;
 }
--- a/mail/themes/gnomestripe/mail/subscribe.css
+++ b/mail/themes/gnomestripe/mail/subscribe.css
@ -3,6 +3,7 @@
  ======================================================================= */

@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/folderMenus.css");

@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");

@ -28,35 +29,28 @@ treechildren::-moz-tree-cell-text(nameColumn, Subscribable-false) {
  font-style: italic;
 }

-/* ::::: Folders :::::: */
-
+/* IMAP Folders*/
 treechildren::-moz-tree-image(nameColumn) {
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-color: transparent;
+  background-attachment: scroll;
+  -moz-background-clip: border;
+  -moz-background-inline-policy: continuous;
+  -moz-background-origin: border;
+  background-image: url("moz-icon://stock/gtk-directory?size=menu");
+  list-style-image: url("chrome://messenger/skin/icons/folder-blank.png");
+
  -moz-margin-end: 2px;
-  list-style-image: url("chrome://messenger/skin/icons/folder.png");
-  -moz-image-region: rect(0 16px 16px 0);
 }

+/* Newsgroups */
 treechildren::-moz-tree-image(nameColumn, ServerType-nntp),
 treechildren::-moz-tree-image(nameColumn2, nntp) {
+  background-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  background-position: left -208px;
+  list-style-image: url("chrome://messenger/skin/icons/folder-blank.png");
+
  -moz-margin-end: 2px;
-  -moz-image-region: rect(0 160px 16px 144px);
 }

-/* ::::: Servers :::::: */
-
-.subscribeMenuItem {
-  list-style-image: url("chrome://messenger/skin/icons/server.png");
-  -moz-image-region: rect(0 16px 16px 0);
-}
-
-.subscribeMenuItem[ServerType="imap"][IsSecure="true"] {
-  -moz-image-region: rect(0 32px 16px 16px);
-}
-
-.subscribeMenuItem[ServerType="nntp"] {
-  -moz-image-region: rect(0 64px 16px 48px);
-}
-
-.subscribeMenuItem[ServerType="nntp"][IsSecure="true"] {
-  -moz-image-region: rect(0 80px 16px 64px);
-}
--- a/mailnews/base/search/content/FilterEditor.xul
+++ b/mailnews/base/search/content/FilterEditor.xul
@ -38,6 +38,7 @@
 ***** END LICENSE BLOCK ***** -->

 <?xml-stylesheet href="chrome://messenger/skin/filterDialog.css" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/folderPane.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>

 <?xul-overlay href="chrome://messenger/content/searchTermOverlay.xul"?>