Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-03 12:35:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Sort FolderPane.

Browse Source
This commit is contained in:
putterman%netscape.com 1999-08-27 03:48:32 +00:00
parent 6f900d6aec
commit b66321649f
2 changed files with 67 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
mailnews/base/src/nsMsgFolderDataSource.cpp
View File

@ -272,16 +272,16 @@ NS_IMETHODIMP nsMsgFolderDataSource::GetTargets(nsIRDFResource* source,
nsCOMPtr<nsIEnumerator> subFolders;
rv = folder->GetSubFolders(getter_AddRefs(subFolders));
if (NS_SUCCEEDED(rv))
{
nsAdapterEnumerator* cursor =
new nsAdapterEnumerator(subFolders);
if (cursor == nsnull)
return NS_ERROR_OUT_OF_MEMORY;
NS_ADDREF(cursor);
*targets = cursor;
rv = NS_OK;
}
if(NS_SUCCEEDED(rv))
{
nsAdapterEnumerator* cursor =
new nsAdapterEnumerator(subFolders);
if (cursor == nsnull)
return NS_ERROR_OUT_OF_MEMORY;
NS_ADDREF(cursor);
*targets = cursor;
rv = NS_OK;
}
}
else if ((kNC_MessageChild == property))
{
@ -736,9 +736,11 @@ nsresult nsMsgFolderDataSource::createFolderNode(nsIMsgFolder* folder,
nsIRDFNode** target)
{
nsresult rv = NS_RDF_NO_VALUE;
if ((kNC_Name == property))
rv = createFolderNameNode(folder, target);
if (peqSort(kNC_Name, property))
rv = createFolderNameNode(folder, target, PR_TRUE);
else if (kNC_Name == property)
rv = createFolderNameNode(folder, target, PR_FALSE);
else if ((kNC_SpecialFolder == property))
rv = createFolderSpecialNode(folder,target);
else if ((kNC_ServerType == property))
@ -763,13 +765,31 @@ nsresult nsMsgFolderDataSource::createFolderNode(nsIMsgFolder* folder,
nsresult nsMsgFolderDataSource::createFolderNameNode(nsIMsgFolder *folder,
nsIRDFNode **target)
nsIRDFNode **target, PRBool sort)
{
PRUnichar *name;
nsresult rv = folder->GetName(&name);
if (NS_FAILED(rv)) return rv;
nsString nameString(name);
createNode(nameString, target);
if(!sort)
{
createNode(nameString, target);
}
else
{
PRInt32 order;
rv = GetFolderSortOrder(folder, &order);
if(NS_FAILED(rv))
return rv;
char * orderString = PR_smprintf("%d", order);
if(!orderString)
return NS_ERROR_OUT_OF_MEMORY;
nameString.Insert(orderString, 0);
PR_smprintf_free(orderString);
}
createNode(nameString, target);
delete[] name;
return NS_OK;
}
@ -1164,6 +1184,35 @@ nsresult nsMsgFolderDataSource::DoFolderHasAssertion(nsIMsgFolder *folder,
}
nsresult nsMsgFolderDataSource::GetFolderSortOrder(nsIMsgFolder *folder, PRInt32* order)
{
nsresult rv;
PRUint32 flags;
rv = folder->GetFlags(&flags);
if(NS_FAILED(rv)) return rv;
if(flags & MSG_FOLDER_FLAG_INBOX)
*order = 0;
else if(flags & MSG_FOLDER_FLAG_QUEUE)
*order = 1;
else if(flags & MSG_FOLDER_FLAG_DRAFTS)
*order = 2;
else if(flags & MSG_FOLDER_FLAG_TEMPLATES)
*order = 3;
else if(flags & MSG_FOLDER_FLAG_SENTMAIL)
*order = 4;
else if(flags & MSG_FOLDER_FLAG_TRASH)
*order = 5;
else
*order = 6;
return NS_OK;
}
nsresult
NS_NewMsgFolderDataSource(const nsIID& iid, void **result)
{

4
mailnews/base/src/nsMsgFolderDataSource.h
View File

@ -125,7 +125,7 @@ protected:
nsresult createFolderNode(nsIMsgFolder *folder, nsIRDFResource* property,
nsIRDFNode **target);
nsresult createFolderNameNode(nsIMsgFolder *folder, nsIRDFNode **target);
nsresult createFolderNameNode(nsIMsgFolder *folder, nsIRDFNode **target, PRBool sort);
nsresult createFolderSpecialNode(nsIMsgFolder *folder, nsIRDFNode **target);
nsresult createFolderServerTypeNode(nsIMsgFolder *folder,
nsIRDFNode **target);
@ -161,6 +161,8 @@ protected:
nsresult GetBiffStateString(PRUint32 biffState, nsCAutoString & biffStateStr);
nsresult GetFolderSortOrder(nsIMsgFolder *folder, PRInt32* order);
static nsIRDFResource* kNC_Child;
static nsIRDFResource* kNC_MessageChild;
static nsIRDFResource* kNC_Folder;