#72279, "Need visual indicators for Watched, Killed threads"

r=andreww, sr=hewitt on the themes stuff.  r=sspitzer, sr=bienvenu on the mail changes.

mailnews/base/src/nsMsgDBView.cpp

@@ -83,6 +83,8 @@ nsIAtom * nsMsgDBView::kNewsMsgAtom = nsnull;
 nsIAtom * nsMsgDBView::kImapDeletedMsgAtom = nsnull;
 nsIAtom * nsMsgDBView::kAttachMsgAtom = nsnull;
 nsIAtom * nsMsgDBView::kHasUnreadAtom = nsnull;
+nsIAtom * nsMsgDBView::kWatchThreadAtom = nsnull;
+nsIAtom * nsMsgDBView::kIgnoreThreadAtom = nsnull;
 
 nsIAtom * nsMsgDBView::mLabelPrefColorAtoms[PREF_LABELS_MAX] = {nsnull, nsnull, nsnull, nsnull, nsnull};
 
@@ -153,6 +155,8 @@ void nsMsgDBView::InitializeAtomsAndLiterals()
   kImapDeletedMsgAtom = NS_NewAtom("imapdeleted");
   kAttachMsgAtom = NS_NewAtom("attach");
   kHasUnreadAtom = NS_NewAtom("hasUnread");
+  kWatchThreadAtom = NS_NewAtom("watch");
+  kIgnoreThreadAtom = NS_NewAtom("ignore");
 
 #ifdef SUPPORT_PRIORITY_COLORS
   kHighestPriorityAtom = NS_NewAtom("priority-highest");
@@ -194,6 +198,8 @@ nsMsgDBView::~nsMsgDBView()
     NS_IF_RELEASE(kImapDeletedMsgAtom);
     NS_IF_RELEASE(kAttachMsgAtom);
     NS_IF_RELEASE(kHasUnreadAtom);
+    NS_IF_RELEASE(kWatchThreadAtom);
+    NS_IF_RELEASE(kIgnoreThreadAtom);
 
 #ifdef SUPPORT_PRIORITY_COLORS
     NS_IF_RELEASE(kHighestPriorityAtom);
@@ -1064,6 +1070,12 @@ NS_IMETHODIMP nsMsgDBView::GetCellProperties(PRInt32 aRow, const PRUnichar *colI
   if (flags & MSG_FLAG_ATTACHMENT) 
     properties->AppendElement(kAttachMsgAtom);
 
+  if (flags & MSG_FLAG_WATCHED) 
+    properties->AppendElement(kWatchThreadAtom);
+
+  if (flags & MSG_FLAG_IGNORED) 
+    properties->AppendElement(kIgnoreThreadAtom);
+
   if ((mDeleteModel == nsMsgImapDeleteModels::IMAPDelete) && (flags & MSG_FLAG_IMAP_DELETED)) 
     properties->AppendElement(kImapDeletedMsgAtom);
 

mailnews/base/src/nsMsgDBView.h

@@ -113,6 +113,8 @@ protected:
   static nsIAtom* kImapDeletedMsgAtom;
   static nsIAtom* kAttachMsgAtom;
   static nsIAtom* kHasUnreadAtom;
+  static nsIAtom* kWatchThreadAtom;
+  static nsIAtom* kIgnoreThreadAtom;
 
 #ifdef SUPPORT_PRIORITY_COLORS
   static nsIAtom* kHighestPriorityAtom;

mailnews/base/src/nsMsgWindow.cpp

@@ -476,7 +476,7 @@ NS_IMETHODIMP nsMsgWindow::CanHandleContent(const char * aContentType,
 
 {
   // the mail window knows nothing about the default content types
-  // it's docshell can handle...ask the content area if it can handle
+  // its docshell can handle...ask the content area if it can handle
   // the content type...
   
   nsCOMPtr<nsIDocShell> messageWindowDocShell; 

themes/classic/jar.mn

@@ -224,6 +224,22 @@ classic.jar:
   skin/classic/messenger/icons/unreadmail.gif                           (messenger/icons/unreadmail.gif)
   skin/classic/messenger/icons/unthreadcol.gif                          (messenger/icons/unthreadcol.gif)
   skin/classic/messenger/icons/btn1.gif                                 (messenger/icons/btn1.gif)
+  skin/classic/messenger/icons/thread-closed-eye.gif                    (messenger/icons/thread-closed-eye.gif)
+  skin/classic/messenger/icons/thread-closed-kill.gif                   (messenger/icons/thread-closed-kill.gif)
+  skin/classic/messenger/icons/thread-closed-offl-eye.gif               (messenger/icons/thread-closed-offl-eye.gif)
+  skin/classic/messenger/icons/thread-closed-offl-kill.gif              (messenger/icons/thread-closed-offl-kill.gif)
+  skin/classic/messenger/icons/thread-new-closed-eye.gif                (messenger/icons/thread-new-closed-eye.gif)
+  skin/classic/messenger/icons/thread-new-closed-kill.gif               (messenger/icons/thread-new-closed-kill.gif)
+  skin/classic/messenger/icons/thread-new-closed-offl-eye.gif           (messenger/icons/thread-new-closed-offl-eye.gif)
+  skin/classic/messenger/icons/thread-new-closed-offl-kill.gif          (messenger/icons/thread-new-closed-offl-kill.gif)
+  skin/classic/messenger/icons/thread-new-open-eye.gif                  (messenger/icons/thread-new-open-eye.gif)
+  skin/classic/messenger/icons/thread-new-open-kill.gif                 (messenger/icons/thread-new-open-kill.gif)
+  skin/classic/messenger/icons/thread-new-open-offl-eye.gif             (messenger/icons/thread-new-open-offl-eye.gif)
+  skin/classic/messenger/icons/thread-new-open-offl-kill.gif            (messenger/icons/thread-new-open-offl-kill.gif)
+  skin/classic/messenger/icons/thread-open-eye.gif                      (messenger/icons/thread-open-eye.gif)
+  skin/classic/messenger/icons/thread-open-kill.gif                     (messenger/icons/thread-open-kill.gif)
+  skin/classic/messenger/icons/thread-open-offl-eye.gif                 (messenger/icons/thread-open-offl-eye.gif)
+  skin/classic/messenger/icons/thread-open-offl-kill.gif                (messenger/icons/thread-open-offl-kill.gif)
   skin/classic/messenger/icons/server-news-new.gif                      (messenger/icons/server-news-new.gif)
   skin/classic/messenger/addressbook/abResultsPane.css                  (messenger/addressbook/abResultsPane.css)
   skin/classic/messenger/addressbook/addressPanes.css                   (messenger/addressbook/addressPanes.css)

themes/classic/messenger/threadPane.css

@@ -219,6 +219,73 @@ outlinerchildren:-moz-outliner-image(subjectCol, news, offl) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-offl.gif");
 }
 
+/* ..... new thread icons for watch and ignore ..... */
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, watch) {
+  list-style-image: url("chrome://messenger/skin/thread-closed-eye.gif");
+}
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, ignore) {
+  list-style-image: url("chrome://messenger/skin/thread-closed-kill.gif");
+}
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, watch, offline) {
+  list-style-image: url("chrome://messenger/skin/thread-closed-offl-eye.gif");
+}
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, ignore, offline) {
+  list-style-image: url("chrome://messenger/skin/thread-closed-offl-kill.gif");
+}
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, hasUnread, watch) {
+  list-style-image: url("chrome://messenger/skin/thread-new-closed-eye.gif");
+}
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, hasUnread, ignore) {
+  list-style-image: url("chrome://messenger/skin/thread-new-closed-kill.gif");
+}
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, hasUnread, watch, offline) {
+  list-style-image: url("chrome://messenger/skin/thread-new-closed-offl-eye.gif");
+}
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, hasUnread, ignore, offline) {
+  list-style-image: url("chrome://messenger/skin/thread-new-closed-offl-kill.gif");
+}
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, hasUnread, watch, open) {
+  list-style-image: url("chrome://messenger/skin/thread-new-open-eye.gif");
+}
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, hasUnread, ignore, open) {
+  list-style-image: url("chrome://messenger/skin/thread-new-open-kill.gif");
+}
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, hasUnread, watch, open, offline) {
+  list-style-image: url("chrome://messenger/skin/thread-new-open-offl-eye.gif");
+}
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, hasUnread, ignore, open, offline) {
+  list-style-image: url("chrome://messenger/skin/thread-new-open-offl-kill.gif");
+}
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, watch, open) {
+  list-style-image: url("chrome://messenger/skin/thread-open-eye.gif");
+}
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, ignore, open) {
+  list-style-image: url("chrome://messenger/skin/thread-open-kill.gif");
+}
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, watch, open, offline) {
+  list-style-image: url("chrome://messenger/skin/thread-open-offl-eye.gif");
+}
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, ignore, open, offline) {
+  list-style-image: url("chrome://messenger/skin/thread-open-offl-kill.gif");
+}
+
+
 #sizeCol,
 #unreadCol,
 #totalCol {

themes/modern/jar.mn

@@ -338,6 +338,22 @@ modern.jar:
   skin/modern/messenger/icons/thread-open.gif                      (messenger/icons/thread-open.gif)
   skin/modern/messenger/icons/threadcol-threaded.gif               (messenger/icons/threadcol-threaded.gif)
   skin/modern/messenger/icons/threadcol-unthreaded.gif             (messenger/icons/threadcol-unthreaded.gif)
+  skin/modern/messenger/icons/thread-closed-eye.gif                (messenger/icons/thread-closed-eye.gif)
+  skin/modern/messenger/icons/thread-closed-kill.gif               (messenger/icons/thread-closed-kill.gif)
+  skin/modern/messenger/icons/thread-closed-offl-eye.gif           (messenger/icons/thread-closed-offl-eye.gif)
+  skin/modern/messenger/icons/thread-closed-offl-kill.gif          (messenger/icons/thread-closed-offl-kill.gif)
+  skin/modern/messenger/icons/thread-new-closed-eye.gif            (messenger/icons/thread-new-closed-eye.gif)
+  skin/modern/messenger/icons/thread-new-closed-kill.gif           (messenger/icons/thread-new-closed-kill.gif)
+  skin/modern/messenger/icons/thread-new-closed-offl-eye.gif       (messenger/icons/thread-new-closed-offl-eye.gif)
+  skin/modern/messenger/icons/thread-new-closed-offl-kill.gif      (messenger/icons/thread-new-closed-offl-kill.gif)
+  skin/modern/messenger/icons/thread-new-open-eye.gif              (messenger/icons/thread-new-open-eye.gif)
+  skin/modern/messenger/icons/thread-new-open-kill.gif             (messenger/icons/thread-new-open-kill.gif)
+  skin/modern/messenger/icons/thread-new-open-offl-eye.gif         (messenger/icons/thread-new-open-offl-eye.gif)
+  skin/modern/messenger/icons/thread-new-open-offl-kill.gif        (messenger/icons/thread-new-open-offl-kill.gif)
+  skin/modern/messenger/icons/thread-open-eye.gif                  (messenger/icons/thread-open-eye.gif)
+  skin/modern/messenger/icons/thread-open-kill.gif                 (messenger/icons/thread-open-kill.gif)
+  skin/modern/messenger/icons/thread-open-offl-eye.gif             (messenger/icons/thread-open-offl-eye.gif)
+  skin/modern/messenger/icons/thread-open-offl-kill.gif            (messenger/icons/thread-open-offl-kill.gif)
   skin/modern/messenger/icons/btn1.gif                             (messenger/icons/btn1.gif)
   skin/modern/messenger/messengercompose/messengercompose.css      (messenger/messengercompose/messengercompose.css)
   skin/modern/messenger/messengercompose/icons/mast-msgcomp.gif    (messenger/messengercompose/icons/mast-msgcomp.gif)

themes/modern/messenger/threadPane.css

@@ -123,6 +123,72 @@ outlinerchildren:-moz-outliner-image(threadCol, container, hasUnread, open) {
   list-style-image: url("chrome://messenger/skin/icons/thread-new-open.gif");
 }
 
+/* ::::: new thread icons for watch and ignore ::::: */
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, watch) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-closed-eye.gif");
+}
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, ignore) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-closed-kill.gif");
+}
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, watch, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-closed-offl-eye.gif");
+}
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, ignore, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-closed-offl-kill.gif");
+}
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, hasUnread, watch) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-new-closed-eye.gif");
+}
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, hasUnread, ignore) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-new-closed-kill.gif");
+}
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, hasUnread, watch, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-new-closed-offl-eye.gif");
+}
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, hasUnread, ignore, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-new-closed-offl-kill.gif");
+}
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, hasUnread, watch, open) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-new-open-eye.gif");
+}
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, hasUnread, ignore, open) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-new-open-kill.gif");
+}
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, hasUnread, watch, open, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-new-open-offl-eye.gif");
+}
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, hasUnread, ignore, open, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-new-open-offl-kill.gif");
+}
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, watch, open) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-open-eye.gif");
+}
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, ignore, open) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-open-kill.gif");
+}
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, watch, open, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-open-offl-eye.gif");
+}
+
+outlinerchildren:-moz-outliner-image(news, threadCol, container, ignore, open, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-open-offl-kill.gif");
+}
+
 /* ..... read column ..... */
 
 outlinercol.readColumnHeader {