Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 05:45:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

r=bienvenu. Fixes for 16998, 40401, 47946, 47948, 48098, 45272, 45403. Sort by Flag and Unread columns,

Browse Source 
Clean up View | Messages menu. Remove folder property menu items.  Remove Newsgroup menu items and branded mail menu item.
Fixed Account tooltip. Make new button work in Select Addresses dialog.
This commit is contained in:
putterman%netscape.com 2000-08-13 17:04:46 +00:00
parent 749a05e9ee
commit 9069f52889
17 changed files with 65 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mailnews/addrbook/resources/content/abSelectAddressesDialog.js
View File

@ -202,4 +202,3 @@ function RemoveSelectedFromBucket()
}
}
}

18
mailnews/base/resources/content/commandglue.js
View File

@ -370,7 +370,7 @@ function FindThreadPaneColumnBySortResource(sortID)
return "PriorityColumn";
else if(sortID == "http://home.netscape.com/NC-rdf#Size")
return "SizeColumn";
else if(sortID == "http://home.netscape.com/NC-rdf#HasUnreadMessages")
else if(sortID == "http://home.netscape.com/NC-rdf#IsUnread")
return "UnreadButtonColumn";
else if(sortID == "http://home.netscape.com/NC-rdf#TotalUnreadMessages")
return "UnreadColumn";
@ -455,22 +455,6 @@ function UpdateSortIndicator(column,sortDirection)
column = "SenderColumn";
}
//Sorting by UnreadButtonColumn and FlaggedButtonColumn causes
//display problems in their respective column headers, so we disable
//the changing of their header appearances. (We also need to remove the
//sort indicator from the other columns, because sorting by FlaggedButton
//and UnreadButton is still taking place, only not being indicated.)
if(column == "UnreadButtonColumn" || column == "FlaggedButtonColumn"){
var treecell = treerow.getElementsByTagName("treecell");
// Loop through each treecell...
var node_count = treecell.length;
for (var i=0; i < node_count; i++)
{
treecell[i].removeAttribute('sortDirection');
}
return;
}
var id = column + "Header";
if (treerow)

31
mailnews/base/resources/content/mail3PaneWindowCommands.js
View File

@ -271,10 +271,14 @@ var DefaultController =
case "cmd_sortByStatus":
case "cmd_sortByRead":
case "cmd_sortByOrderReceived":
case "cmd_sortByThread":
case "cmd_viewAllMsgs":
case "cmd_viewUnreadMsgs":
return true;
case "cmd_sortByThread":
return (messageView.viewType != viewShowUnread);
break;
case "cmd_viewUnreadMsgs":
return (messageView.showThreads == false);
break;
case "cmd_undo":
case "cmd_redo":
return SetupUndoRedoCommand(command);
@ -649,8 +653,6 @@ function FillInFolderTooltip(cellNode)
var db = folderTree.database;
var nameProperty = RDF.GetResource('http://home.netscape.com/NC-rdf#Name');
var unreadCountProperty = RDF.GetResource('http://home.netscape.com/NC-rdf#TotalUnreadMessages');
var totalCountProperty = RDF.GetResource('http://home.netscape.com/NC-rdf#TotalMessages');
var nameResult;
try {
@ -664,20 +666,19 @@ function FillInFolderTooltip(cellNode)
nameResult = nameResult.QueryInterface(Components.interfaces.nsIRDFLiteral);
var name = nameResult.Value;
var unreadCountResult = db.GetTarget(folderResource, unreadCountProperty , true);
unreadCountResult = unreadCountResult.QueryInterface(Components.interfaces.nsIRDFLiteral);
var unreadCount = unreadCountResult.Value;
if(unreadCount == "")
unreadCount = "0";
var msgFolder = folderResource.QueryInterface(Components.interfaces.nsIMsgFolder);
var unreadCount = msgFolder.getNumUnread(false);
if(unreadCount < 0)
unreadCount = 0;
var totalCountResult = db.GetTarget(folderResource, totalCountProperty , true);
totalCountResult = totalCountResult.QueryInterface(Components.interfaces.nsIRDFLiteral);
var totalCount = totalCountResult.Value;
if(totalCount == "")
totalCount = "0";
var totalCount = msgFolder.getTotalMessages(false);
if(totalCount < 0)
totalCount = 0;
var textNode = document.getElementById("foldertooltipText");
var folderTooltip = name + " (" + unreadCount + "/" + totalCount +")";
var folderTooltip = name;
if(!msgFolder.isServer)
folderTooltip += " (" + unreadCount + "/" + totalCount +")";
textNode.setAttribute('value', folderTooltip);
return true;

35
mailnews/base/resources/content/mailContextMenus.js
View File

@ -209,9 +209,6 @@ function fillFolderPaneContextMenu()
ShowMenuItem("folderPaneContext-searchMessages", (numSelected<=1));
EnableMenuItem("folderPaneContext-searchMessages", false);
ShowMenuItem("folderPaneContext-sep-search", (numSelected<=1));
SetupPropertiesMenuItem(targetFolder, numSelected, isServer, serverType, specialFolder);
return(true);
}
@ -286,38 +283,6 @@ function SetupNewMenuItem(targetFolder, numSelected, isServer, serverType, speci
}
function SetupPropertiesMenuItem(targetFolder, numSelected, isServer, serverType, specialFolder)
{
ShowMenuItem("folderPaneContext-properties", (numSelected <=1));
EnableMenuItem("folderPaneContext-properties", false);
if(isServer)
{
SetMenuItemValue("folderPaneContext-properties", Bundle.GetStringFromName("accountProperties"));
}
else if(specialFolder == 'Inbox')
{
SetMenuItemValue("folderPaneContext-properties", Bundle.GetStringFromName("inboxProperties"));
}
else if(specialFolder == 'Trash')
{
SetMenuItemValue("folderPaneContext-properties", Bundle.GetStringFromName("trashProperties"));
}
else if(specialFolder == 'Unsent Messages')
{
SetMenuItemValue("folderPaneContext-properties", Bundle.GetStringFromName("unsentMessagesProperties"));
}
else if(serverType == 'nntp')
{
SetMenuItemValue("folderPaneContext-properties", Bundle.GetStringFromName("newsgroupProperties"));
}
else
{
SetMenuItemValue("folderPaneContext-properties", Bundle.GetStringFromName("folderProperties"));
}
}
function ShowMenuItem(id, showItem)
{
var item = document.getElementById(id);

1
mailnews/base/resources/content/mailTasksOverlay.xul
View File

@ -55,7 +55,6 @@
<menupopup id="taskPopup">
<menuitem position="2" value="&messengerCmd.label;" accesskey="&messengerCmd.accesskey;" oncommand="toMessengerWindow()"/>
<menuitem position="3" value="&newsgroupsCmd.label;" accesskey="&newsgroupsCmd.accesskey;" disabled="true" oncommand="toNewsgroups()"/>
</menupopup>
</overlay>

4
mailnews/base/resources/content/mailWindowOverlay.js
View File

@ -417,11 +417,7 @@ function MsgGetFlaggedMsg() {}
function MsgSelectThread() {}
function MsgSelectFlaggedMsg() {}
function MsgShowFolders(){}
function MsgFolderProperties() {}
function MsgShowLocationbar() {}
function MsgViewThreadsUnread() {}
function MsgViewWatchedThreadsUnread() {}
function MsgViewIgnoreThread() {}
function MsgViewAttachInline() {}
function MsgWrapLongLines() {}
function MsgIncreaseFont() {}

5
mailnews/base/resources/content/mailWindowOverlay.xul
View File

@ -409,7 +409,6 @@ Rights Reserved.
<menuitem value="&filtersCmd.label;"
accesskey="&filtersCmd.accesskey;"
oncommand="MsgFilters();"/>
<menuitem value="&folderPropsCmd.label;" accesskey="&folderPropsCmd.accesskey;" disabled="true" oncommand="MsgFolderProperties();"/>
<menuseparator/>
<menuitem value="&accountManagerCmd.label;" accesskey="&accountManagerCmd.accesskey;" oncommand="MsgAccountManager();"/>
<menuitem id="menu_preferences" oncommand="goPreferences('messenger.xul', 'chrome://messenger/content/pref-mailnews.xul','mailnews')"/>
@ -452,10 +451,6 @@ Rights Reserved.
<menupopup>
<menuitem value="&allMsgsCmd.label;" accesskey="&allMsgsCmd.accesskey;" disabled="true" observes="cmd_viewAllMsgs"/>
<menuitem value="&unreadMsgsCmd.label;" accesskey="&unreadMsgsCmd.accesskey;" disabled="true" observes="cmd_viewUnreadMsgs"/>
<menuitem value="&threadsWithUnreadMsgsCmd.label;" accesskey="&threadsWithUnreadMsgsCmd.accesskey;" disabled="true" oncommand="MsgViewThreadsUnread();"/>
<menuitem value="&watchedThreadsMsgsCmd.label;" accesskey="&watchedThreadsMsgsCmd.accesskey;" disabled="true" oncommand="MsgViewWatchedThreadsUnread();"/>
<menuseparator/>
<menuitem value="&ignoreThreadMsgsCmd.label;" accesskey="&ignoreThreadMsgsCmd.accesskey;" disabled="true" oncommand="MsgViewIgnoreThread();"/>
</menupopup>
</menu>
<menu id="viewheadersmenu" value="&headersMenu.label;" accesskey="&headersMenu.accesskey;">

7
mailnews/base/resources/content/manifest.rdf
View File

@ -28,6 +28,7 @@
<RDF:li resource="chrome://messenger/content/mail3PaneWindowVertLayout.xul"/>
<RDF:li resource="chrome://messenger/content/messengercompose/messengercompose.xul"/>
<RDF:li resource="chrome://messenger/content/addressbook/addressbook.xul"/>
<RDF:li resource="chrome://messenger/content/addressbook/abSelectAddressesDialog.xul"/>
<RDF:li resource="chrome://editor/content/editor.xul"/>
</RDF:Seq>
@ -90,6 +91,12 @@
<RDF:li>chrome://messenger/content/mailABOverlay.xul</RDF:li>
</RDF:Seq>
<!-- messenger items for Select Addresses dialog -->
<RDF:Seq about="chrome://messenger/content/addressbook/abSelectAddressesDialog.xul">
<RDF:li>chrome://messenger/content/mailOverlay.xul</RDF:li>
</RDF:Seq>
<!-- messenger items for Composer -->
<RDF:Seq about="chrome://editor/content/editor.xul">
<RDF:li>chrome://messenger/content/mailEditorOverlay.xul</RDF:li>

5
mailnews/base/resources/content/messenger.xul
View File

@ -287,11 +287,6 @@ Rights Reserved.
value="&folderContextSearchMessages.label;"
accesskey="&folderContextSearchMessages.accesskey;"
oncommand="MsgSearchMessages();"/>
<menuseparator id="folderPaneContext-sep-search"/>
<menuitem id="folderPaneContext-properties"
value="&folderContextProperties.label;"
accesskey="&folderContextProperties.accesskey;"
oncommand="MsgFolderProperties();"/>
</popup>
<popup id="emailAddressPopup" popupanchor="bottomleft">
<menuitem value="&AddToAddressBook.label;"

7
mailnews/base/resources/content/threadPane.js
View File

@ -131,7 +131,7 @@ function MsgSortByOrderReceived()
function MsgSortByRead()
{
SortThreadPane('UnreadButtonColumn', 'http://home.netscape.com/NC-rdf#HasUnreadMessages','http://home.netscape.com/NC-rdf#Date', true, null);
SortThreadPane('UnreadButtonColumn', 'http://home.netscape.com/NC-rdf#IsUnread','http://home.netscape.com/NC-rdf#Date', true, null);
}
function MsgSortByTotal()
@ -161,6 +161,11 @@ function ChangeThreadView()
}
else if(currentView == 'unthreaded')
{
//if we're in unread messages view, don't allow to go into threaded mode because
//we don't support it.
if(messageView.viewType == viewShowUnread)
return;
ShowThreads(true);
if(folder)
folder.setAttribute('threaded', "true");

8
mailnews/base/resources/content/threadPane.xul
View File

@ -85,11 +85,11 @@ Rights Reserved.
<treecol persist="hidden width" flex="7" id="SubjectColumn" rdf:resource="http://home.netscape.com/NC-rdf#Subject"/>
<splitter class="tree-splitter"/>
<treecol persist="hidden width" flex="4" id="AuthorColumn" rdf:resource="http://home.netscape.com/NC-rdf#Sender"/>
<treecol persist="hidden width" id="UnreadButtonColumn"/>
<treecol persist="hidden width" id="UnreadButtonColumn" rdf:resource="http://home.netscape.com/NC-rdf#IsUnread"/>
<treecol persist="hidden width" flex="2" id="DateColumn" rdf:resource="http://home.netscape.com/NC-rdf#Date"/>
<splitter class="tree-splitter"/>
<treecol persist="hidden width" flex="1" id="PriorityColumn" rdf:resource="http://home.netscape.com/NC-rdf#Priority"/>
<treecol persist="hidden width" id="FlaggedButtonColumn"/>
<treecol persist="hidden width" id="FlaggedButtonColumn" rdf:resource="http://home.netscape.com/NC-rdf#Flagged"/>
<treecol persist="hidden width" flex="1" id="StatusColumn" rdf:resource="http://home.netscape.com/NC-rdf#Status"/>
<splitter class="tree-splitter"/>
<treecol persist="hidden width" flex="1" id="SizeColumn" rdf:resource="http://home.netscape.com/NC-rdf#Size"/>
@ -106,10 +106,10 @@ Rights Reserved.
<treecell display="Thread" onclick="return top.ChangeThreadView();" class="treecell-header treecell-inset-header threadColumnHeader" tooltip="aTooltip" tooltiptext="&threadColumnHeader.tooltip;" id="ThreadColumnHeader"/>
<treecell class="treecell-header treecell-inset-header sortDirectionIndicator" value="&subjectColumn.label;" onclick="return top.MsgSortBySubject();" id="SubjectColumnHeader"/>
<treecell class="treecell-header treecell-inset-header sortDirectionIndicator" onclick="return top.MsgSortBySender();" value="&senderColumn.label;" id="SenderColumnHeader"/>
<treecell class="treecell-header treecell-header-image treecell-inset-header readColumnHeader sortDirectionIndicator" display="Read" onclick="return top.MsgSortByRead();" id="UnreadButtonColumnHeader"/>
<treecell class="treecell-header treecell-header-image treecell-inset-header readColumnHeader" display="Read" onclick="return top.MsgSortByRead();" id="UnreadButtonColumnHeader"/>
<treecell class="treecell-header treecell-inset-header sortDirectionIndicator" value="&dateColumn.label;" onclick="return top.MsgSortByDate();" id="DateColumnHeader"/>
<treecell class="treecell-header treecell-inset-header sortDirectionIndicator" value="&priorityColumn.label;" onclick="return top.MsgSortByPriority();" id="PriorityColumnHeader"/>
<treecell class="treecell-header treecell-header-image treecell-inset-header flagColumnHeader sortDirectionIndicator" display="Flag" onclick="return top.MsgSortByFlagged();" id="FlaggedButtonColumnHeader"/>
<treecell class="treecell-header treecell-header-image treecell-inset-header flagColumnHeader" display="Flag" onclick="return top.MsgSortByFlagged();" id="FlaggedButtonColumnHeader"/>
<treecell class="treecell-header treecell-inset-header sortDirectionIndicator" value="&statusColumn.label;" onclick="return top.MsgSortByStatus();" id="StatusColumnHeader"/>
<treecell class="treecell-header treecell-inset-header sortDirectionIndicator" value="&sizeColumn.label;" onclick="return top.MsgSortBySize();" id="SizeColumnHeader"/>
<treecell class="treecell-header treecell-inset-header sortDirectionIndicator" value="&unreadColumn.label;" onclick="return top.MsgSortByUnread();" id="UnreadColumnHeader"/>

6
mailnews/base/resources/locale/en-US/mailTasksOverlay.dtd
View File

@ -1,9 +1,7 @@
<!-- LOCALIZATION NOTE (messengerCmd.label): DONT_TRANSLATE -->
<!ENTITY messengerCmd.label "&vendorShortName; Mail">
<!ENTITY messengerCmd.label "Mail">
<!ENTITY messengerCmd.accesskey "m">
<!ENTITY newsgroupsCmd.label "Newsgroups">
<!ENTITY newsgroupsCmd.accesskey "n">
<!ENTITY taskMessenger.tooltip "&brandShortName; Mail">
<!ENTITY taskMessenger.tooltip "Mail">

16
mailnews/base/resources/locale/en-US/messenger.dtd
View File

@ -107,7 +107,7 @@ Rights Reserved.
<!ENTITY sortMenu.accesskey "o">
<!ENTITY sortByDateCmd.label "by Date">
<!ENTITY sortByDateCmd.accesskey "e">
<!ENTITY sortByFlagCmd.label ".by Flag">
<!ENTITY sortByFlagCmd.label "by Flag">
<!ENTITY sortByFlagCmd.accesskey "f">
<!ENTITY sortByPriorityCmd.label "by Priority">
<!ENTITY sortByPriorityCmd.accesskey "p">
@ -119,15 +119,15 @@ Rights Reserved.
<!ENTITY sortByStatusCmd.accesskey "by Status">
<!ENTITY sortBySubjectCmd.label "by Subject">
<!ENTITY sortBySubjectCmd.accesskey "s">
<!ENTITY sortByUnreadCmd.label ".by Unread">
<!ENTITY sortByUnreadCmd.label "by Unread">
<!ENTITY sortByUnreadCmd.accesskey "u">
<!ENTITY sortByOrderReceivedCmd.label "by Order Received">
<!ENTITY sortByOrderReceivedCmd.accesskey "o">
<!ENTITY msgsMenu.label ".Messages">
<!ENTITY msgsMenu.label "Messages">
<!ENTITY msgsMenu.accesskey "m">
<!ENTITY threadsMsgsCmd.label "Threaded">
<!ENTITY threadsMsgsCmd.accesskey "t">
<!ENTITY allMsgsCmd.label ".All">
<!ENTITY allMsgsCmd.label "All">
<!ENTITY allMsgsCmd.accesskey "a">
<!ENTITY expandOrCollapseMenu.label "Expand/Collapse">
<!ENTITY expandOrCollapseMenu.accesskey "x">
@ -135,14 +135,8 @@ Rights Reserved.
<!ENTITY expandAllThreadsCmd.accesskey "e">
<!ENTITY collapseAllThreadsCmd.label "Collapse All Threads">
<!ENTITY collapseAllThreadsCmd.accesskey "c">
<!ENTITY unreadMsgsCmd.label ".Unread">
<!ENTITY unreadMsgsCmd.label "Unread">
<!ENTITY unreadMsgsCmd.accesskey "u">
<!ENTITY threadsWithUnreadMsgsCmd.label ".Threads with Unread">
<!ENTITY threadsWithUnreadMsgsCmd.accesskey "t">
<!ENTITY watchedThreadsMsgsCmd.label ".Watched Threads with Unread">
<!ENTITY watchedThreadsMsgsCmd.accesskey "w">
<!ENTITY ignoreThreadMsgsCmd.label ".Ignored Threads">
<!ENTITY ignoreThreadMsgsCmd.accesskey "i">
<!ENTITY headersMenu.label "Headers">
<!ENTITY headersMenu.accesskey "h">
<!ENTITY headersAllCmd.label "All">

6
mailnews/base/resources/locale/en-US/messenger.properties
View File

@ -33,12 +33,6 @@ removeNewsAccount=Remove News Account...
removeFolder=Remove Folder...
newFolder=New Folder...
newSubfolder=New Subfolder...
accountProperties=Account Properties...
inboxProperties=Inbox Properties...
trashProperties=Trash Can Properties...
unsentMessagesProperties=Unsent Folder Properties...
newsgroupProperties=Newsgroup Properties...
folderProperties=Folder Properties...
titleNewsPreHost=on
titleMailPreHost=for
# LOCALIZATION NOTES(HTMLFiles): Only translate "Files" in the line below

27
mailnews/base/src/nsMsgMessageDataSource.cpp
View File

@ -59,6 +59,7 @@ nsIRDFResource* nsMsgMessageDataSource::kNC_Date= nsnull;
nsIRDFResource* nsMsgMessageDataSource::kNC_Status= nsnull;
nsIRDFResource* nsMsgMessageDataSource::kNC_StatusString= nsnull;
nsIRDFResource* nsMsgMessageDataSource::kNC_Flagged= nsnull;
nsIRDFResource* nsMsgMessageDataSource::kNC_FlaggedSort= nsnull;
nsIRDFResource* nsMsgMessageDataSource::kNC_Priority= nsnull;
nsIRDFResource* nsMsgMessageDataSource::kNC_PriorityString= nsnull;
nsIRDFResource* nsMsgMessageDataSource::kNC_PrioritySort= nsnull;
@ -68,6 +69,7 @@ nsIRDFResource* nsMsgMessageDataSource::kNC_Total = nsnull;
nsIRDFResource* nsMsgMessageDataSource::kNC_Unread = nsnull;
nsIRDFResource* nsMsgMessageDataSource::kNC_MessageChild = nsnull;
nsIRDFResource* nsMsgMessageDataSource::kNC_IsUnread = nsnull;
nsIRDFResource* nsMsgMessageDataSource::kNC_IsUnreadSort = nsnull;
nsIRDFResource* nsMsgMessageDataSource::kNC_HasAttachment = nsnull;
nsIRDFResource* nsMsgMessageDataSource::kNC_IsImapDeleted = nsnull;
nsIRDFResource* nsMsgMessageDataSource::kNC_MessageType = nsnull;
@ -109,6 +111,7 @@ nsMsgMessageDataSource::nsMsgMessageDataSource()
rdf->GetResource(NC_RDF_STATUS, &kNC_Status);
rdf->GetResource(NC_RDF_STATUS_STRING, &kNC_StatusString);
rdf->GetResource(NC_RDF_FLAGGED, &kNC_Flagged);
rdf->GetResource(NC_RDF_FLAGGED_SORT, &kNC_FlaggedSort);
rdf->GetResource(NC_RDF_PRIORITY, &kNC_Priority);
rdf->GetResource(NC_RDF_PRIORITY_STRING, &kNC_PriorityString);
rdf->GetResource(NC_RDF_PRIORITY_SORT, &kNC_PrioritySort);
@ -118,6 +121,7 @@ nsMsgMessageDataSource::nsMsgMessageDataSource()
rdf->GetResource(NC_RDF_TOTALUNREADMESSAGES, &kNC_Unread);
rdf->GetResource(NC_RDF_MESSAGECHILD, &kNC_MessageChild);
rdf->GetResource(NC_RDF_ISUNREAD, &kNC_IsUnread);
rdf->GetResource(NC_RDF_ISUNREAD_SORT, &kNC_IsUnreadSort);
rdf->GetResource(NC_RDF_HASATTACHMENT, &kNC_HasAttachment);
rdf->GetResource(NC_RDF_ISIMAPDELETED, &kNC_IsImapDeleted);
rdf->GetResource(NC_RDF_MESSAGETYPE, &kNC_MessageType);
@ -156,6 +160,7 @@ nsMsgMessageDataSource::~nsMsgMessageDataSource (void)
NS_RELEASE2(kNC_Status, refcnt);
NS_RELEASE2(kNC_StatusString, refcnt);
NS_RELEASE2(kNC_Flagged, refcnt);
NS_RELEASE2(kNC_FlaggedSort, refcnt);
NS_RELEASE2(kNC_Priority, refcnt);
NS_RELEASE2(kNC_PriorityString, refcnt);
NS_RELEASE2(kNC_PrioritySort, refcnt);
@ -165,6 +170,7 @@ nsMsgMessageDataSource::~nsMsgMessageDataSource (void)
NS_RELEASE2(kNC_Unread, refcnt);
NS_RELEASE2(kNC_MessageChild, refcnt);
NS_RELEASE2(kNC_IsUnread, refcnt);
NS_RELEASE2(kNC_IsUnreadSort, refcnt);
NS_RELEASE2(kNC_HasAttachment, refcnt);
NS_RELEASE2(kNC_IsImapDeleted, refcnt);
NS_RELEASE2(kNC_MessageType, refcnt);
@ -1062,7 +1068,9 @@ nsMsgMessageDataSource::createMessageNode(nsIMessage *message,
else if ((kNC_StatusString == property))
rv = createMessageStatusNode(message, target, PR_TRUE);
else if ((kNC_Flagged == property))
rv = createMessageFlaggedNode(message, target);
rv = createMessageFlaggedNode(message, target, PR_FALSE);
else if ((kNC_FlaggedSort == property))
rv = createMessageFlaggedNode(message, target, PR_TRUE);
else if ((kNC_Priority == property))
rv = createMessagePriorityNode(message, target, PR_FALSE);
else if ((kNC_PriorityString == property))
@ -1078,7 +1086,9 @@ nsMsgMessageDataSource::createMessageNode(nsIMessage *message,
else if ((kNC_Unread == property))
rv = createMessageUnreadNode(message, target);
else if((kNC_IsUnread == property))
rv = createMessageIsUnreadNode(message, target);
rv = createMessageIsUnreadNode(message, target, PR_FALSE);
else if((kNC_IsUnreadSort == property))
rv = createMessageIsUnreadNode(message, target, PR_TRUE);
else if((kNC_HasAttachment == property))
rv = createMessageHasAttachmentNode(message, target);
else if((kNC_IsImapDeleted == property))
@ -1243,7 +1253,7 @@ nsMsgMessageDataSource::createMessageStatusNode(nsIMessage *message,
}
nsresult
nsMsgMessageDataSource::createMessageIsUnreadNode(nsIMessage *message, nsIRDFNode **target)
nsMsgMessageDataSource::createMessageIsUnreadNode(nsIMessage *message, nsIRDFNode **target, PRBool sort)
{
nsresult rv;
PRUint32 flags;
@ -1251,9 +1261,9 @@ nsMsgMessageDataSource::createMessageIsUnreadNode(nsIMessage *message, nsIRDFNod
if(NS_FAILED(rv))
return rv;
if(flags & MSG_FLAG_READ)
*target = kFalseLiteral;
*target = sort ? kHighestSortLiteral : kFalseLiteral;
else
*target = kTrueLiteral;
*target = sort ? kLowestSortLiteral : kTrueLiteral;
NS_IF_ADDREF(*target);
return NS_OK;
@ -1335,19 +1345,18 @@ nsMsgMessageDataSource::createMessageOrderReceivedSortNode(nsIMessage *message,
nsresult
nsMsgMessageDataSource::createMessageFlaggedNode(nsIMessage *message,
nsIRDFNode **target)
nsIRDFNode **target, PRBool sort)
{
nsresult rv;
PRUint32 flags;
rv = message->GetFlags(&flags);
if(NS_FAILED(rv))
return rv;
*target = kEmptyStringLiteral;
if(flags & MSG_FLAG_MARKED)
*target = kFlaggedLiteral;
*target = sort ? kHighestSortLiteral : kFlaggedLiteral;
else
*target = kUnflaggedLiteral;
*target = sort ? kLowestSortLiteral : kUnflaggedLiteral;
NS_IF_ADDREF(*target);
return NS_OK;
}

6
mailnews/base/src/nsMsgMessageDataSource.h
View File

@ -146,7 +146,7 @@ protected:
nsresult createStatusNodeFromFlag(PRUint32 flags, /*nsAutoString &statusStr*/ nsIRDFNode **node, PRBool needDisplayString);
nsresult createMessageFlaggedNode(nsIMessage *message,
nsIRDFNode **target);
nsIRDFNode **target, PRBool sort);
nsresult createFlaggedStringFromFlag(PRUint32 flags, nsAutoString &statusStr);
nsresult createMessagePriorityNode(nsIMessage *message,
@ -158,7 +158,7 @@ protected:
nsresult createMessageSizeNode(nsIMessage *message, nsIRDFNode **target, PRBool sort);
nsresult createMessageIsUnreadNode(nsIMessage *message, nsIRDFNode **target);
nsresult createMessageIsUnreadNode(nsIMessage *message, nsIRDFNode **target, PRBool sort);
nsresult createMessageHasAttachmentNode(nsIMessage *message, nsIRDFNode **target);
nsresult createMessageIsImapDeletedNode(nsIMessage *message, nsIRDFNode **target);
nsresult createMessageMessageTypeNode(nsIMessage *message, nsIRDFNode **target);
@ -228,6 +228,7 @@ protected:
static nsIRDFResource* kNC_Status;
static nsIRDFResource* kNC_StatusString;
static nsIRDFResource* kNC_Flagged;
static nsIRDFResource* kNC_FlaggedSort;
static nsIRDFResource* kNC_Priority;
static nsIRDFResource* kNC_PriorityString;
static nsIRDFResource* kNC_PrioritySort;
@ -237,6 +238,7 @@ protected:
static nsIRDFResource* kNC_Unread;
static nsIRDFResource* kNC_MessageChild;
static nsIRDFResource* kNC_IsUnread;
static nsIRDFResource* kNC_IsUnreadSort;
static nsIRDFResource* kNC_HasAttachment;
static nsIRDFResource* kNC_IsImapDeleted;
static nsIRDFResource* kNC_MessageType;

2
mailnews/base/src/nsMsgRDFUtils.h
View File

@ -85,6 +85,8 @@ typedef struct _nsMsgRDFNotification {
#define NC_RDF_ORDERRECEIVED_SORT NC_NAMESPACE_URI "OrderReceived?sort=true"
#define NC_RDF_PRIORITY_SORT NC_NAMESPACE_URI "Priority?sort=true"
#define NC_RDF_SIZE_SORT NC_NAMESPACE_URI "Size?sort=true"
#define NC_RDF_ISUNREAD_SORT NC_NAMESPACE_URI "IsUnread?sort=true"
#define NC_RDF_FLAGGED_SORT NC_NAMESPACE_URI "Flagged?sort=true"
#define NC_RDF_NAME_SORT NC_NAMESPACE_URI "Name?sort=true"
#define NC_RDF_FOLDERTREENAME_SORT NC_NAMESPACE_URI "FolderTreeName?sort=true"