From 2ac2990e960b9a207102cf292b330ac587e5b8bb Mon Sep 17 00:00:00 2001 From: "sspitzer%netscape.com" Date: Thu, 5 Apr 2001 08:13:37 +0000 Subject: [PATCH] rest of fix for #74808. the icon in the subject column should only have the green arrow if the message is new, not if the message is unread. sr=bienvenu git-svn-id: svn://10.0.0.236/trunk@91439 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mailnews/base/src/nsMsgDBView.cpp | 6 ++++++ mozilla/mailnews/base/src/nsMsgDBView.h | 1 + mozilla/themes/classic/messenger/mac/threadPane.css | 4 ++-- mozilla/themes/classic/messenger/win/threadPane.css | 4 ++-- mozilla/themes/modern/messenger/threadPane.css | 4 ++-- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/mozilla/mailnews/base/src/nsMsgDBView.cpp b/mozilla/mailnews/base/src/nsMsgDBView.cpp index cc1aa9e3b89..3dccb56f61f 100644 --- a/mozilla/mailnews/base/src/nsMsgDBView.cpp +++ b/mozilla/mailnews/base/src/nsMsgDBView.cpp @@ -52,6 +52,7 @@ nsIAtom * nsMsgDBView::kLowestPriorityAtom = nsnull; nsIAtom * nsMsgDBView::kLowPriorityAtom = nsnull; nsIAtom * nsMsgDBView::kUnreadMsgAtom = nsnull; +nsIAtom * nsMsgDBView::kNewMsgAtom = nsnull; nsIAtom * nsMsgDBView::kReadMsgAtom = nsnull; nsIAtom * nsMsgDBView::kOfflineMsgAtom = nsnull; nsIAtom * nsMsgDBView::kFlaggedMsgAtom = nsnull; @@ -106,6 +107,7 @@ nsMsgDBView::nsMsgDBView() void nsMsgDBView::InitializeAtomsAndLiterals() { kUnreadMsgAtom = NS_NewAtom("unread"); + kNewMsgAtom = NS_NewAtom("new"); kReadMsgAtom = NS_NewAtom("read"); kOfflineMsgAtom = NS_NewAtom("offline"); kFlaggedMsgAtom = NS_NewAtom("flagged"); @@ -141,6 +143,7 @@ nsMsgDBView::~nsMsgDBView() if (gInstanceCount <= 0) { NS_IF_RELEASE(kUnreadMsgAtom); + NS_IF_RELEASE(kNewMsgAtom); NS_IF_RELEASE(kReadMsgAtom); NS_IF_RELEASE(kOfflineMsgAtom); NS_IF_RELEASE(kFlaggedMsgAtom); @@ -697,6 +700,9 @@ NS_IMETHODIMP nsMsgDBView::GetCellProperties(PRInt32 aRow, const PRUnichar *colI else properties->AppendElement(kReadMsgAtom); + if (flags & MSG_FLAG_NEW) + properties->AppendElement(kNewMsgAtom); + if (flags & MSG_FLAG_OFFLINE) properties->AppendElement(kOfflineMsgAtom); diff --git a/mozilla/mailnews/base/src/nsMsgDBView.h b/mozilla/mailnews/base/src/nsMsgDBView.h index 37971dfa97f..fd4bedff9c8 100644 --- a/mozilla/mailnews/base/src/nsMsgDBView.h +++ b/mozilla/mailnews/base/src/nsMsgDBView.h @@ -76,6 +76,7 @@ protected: // atoms used for styling the view. we're going to have a lot of // these so i'm going to make them static. static nsIAtom* kUnreadMsgAtom; + static nsIAtom* kNewMsgAtom; static nsIAtom* kReadMsgAtom; static nsIAtom* kOfflineMsgAtom; static nsIAtom* kFlaggedMsgAtom; diff --git a/mozilla/themes/classic/messenger/mac/threadPane.css b/mozilla/themes/classic/messenger/mac/threadPane.css index 096da512ea2..04c0e63f0a5 100644 --- a/mozilla/themes/classic/messenger/mac/threadPane.css +++ b/mozilla/themes/classic/messenger/mac/threadPane.css @@ -148,7 +148,7 @@ outlinerbody:-moz-outliner-image(subjectCol) { list-style-image: url("chrome://messenger/skin/message-mail.gif"); } -outlinerbody:-moz-outliner-image(subjectCol, unread) { +outlinerbody:-moz-outliner-image(subjectCol, new) { list-style-image: url("chrome://messenger/skin/message-mail-new.gif"); } @@ -164,7 +164,7 @@ outlinerbody:-moz-outliner-image(subjectCol, news) { list-style-image: url("chrome://messenger/skin/message-news.gif"); } -outlinerbody:-moz-outliner-image(subjectCol, news, unread) { +outlinerbody:-moz-outliner-image(subjectCol, news, new) { list-style-image: url("chrome://messenger/skin/message-news-new.gif"); } diff --git a/mozilla/themes/classic/messenger/win/threadPane.css b/mozilla/themes/classic/messenger/win/threadPane.css index 096da512ea2..04c0e63f0a5 100644 --- a/mozilla/themes/classic/messenger/win/threadPane.css +++ b/mozilla/themes/classic/messenger/win/threadPane.css @@ -148,7 +148,7 @@ outlinerbody:-moz-outliner-image(subjectCol) { list-style-image: url("chrome://messenger/skin/message-mail.gif"); } -outlinerbody:-moz-outliner-image(subjectCol, unread) { +outlinerbody:-moz-outliner-image(subjectCol, new) { list-style-image: url("chrome://messenger/skin/message-mail-new.gif"); } @@ -164,7 +164,7 @@ outlinerbody:-moz-outliner-image(subjectCol, news) { list-style-image: url("chrome://messenger/skin/message-news.gif"); } -outlinerbody:-moz-outliner-image(subjectCol, news, unread) { +outlinerbody:-moz-outliner-image(subjectCol, news, new) { list-style-image: url("chrome://messenger/skin/message-news-new.gif"); } diff --git a/mozilla/themes/modern/messenger/threadPane.css b/mozilla/themes/modern/messenger/threadPane.css index c0b217c5473..c92307adcdf 100644 --- a/mozilla/themes/modern/messenger/threadPane.css +++ b/mozilla/themes/modern/messenger/threadPane.css @@ -148,7 +148,7 @@ outlinerbody:-moz-outliner-image(subjectCol) { list-style-image: url("chrome://messenger/skin/icons/message-mail.gif"); } -outlinerbody:-moz-outliner-image(subjectCol, unread) { +outlinerbody:-moz-outliner-image(subjectCol, new) { list-style-image: url("chrome://messenger/skin/icons/message-mail-new.gif"); } @@ -164,7 +164,7 @@ outlinerbody:-moz-outliner-image(subjectCol, news) { list-style-image: url("chrome://messenger/skin/icons/message-news.gif"); } -outlinerbody:-moz-outliner-image(subjectCol, news, unread) { +outlinerbody:-moz-outliner-image(subjectCol, news, new) { list-style-image: url("chrome://messenger/skin/icons/message-news-new.gif"); }