summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/accountview.cpp12
-rw-r--r--noncore/net/mail/defines.h6
-rw-r--r--pics/mail/imapfolder.pngbin767 -> 470 bytes
-rw-r--r--pics/mail/inbox.pngbin616 -> 783 bytes
-rw-r--r--pics/mail/localfolder.pngbin0 -> 736 bytes
-rw-r--r--pics/mail/mboxfolder.pngbin0 -> 473 bytes
-rw-r--r--pics/mail/outbox.pngbin0 -> 769 bytes
-rw-r--r--pics/mail/pop3folder.pngbin701 -> 520 bytes
8 files changed, 13 insertions, 5 deletions
diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp
index 6bc8b8b..59e8bc0 100644
--- a/noncore/net/mail/accountview.cpp
+++ b/noncore/net/mail/accountview.cpp
@@ -294,33 +294,33 @@ RecBody AccountView::fetchBody(const RecMail&aMail)
{
QListViewItem*item = selectedItem ();
if (!item) return RecBody();
AccountViewItem *view = static_cast<AccountViewItem *>(item);
return view->fetchBody(aMail);
}
/**
* MBOX Account stuff
*/
MBOXviewItem::MBOXviewItem( const QString&aPath, QListView *parent )
: AccountViewItem( parent )
{
m_Path = aPath;
wrapper = AbstractMail::getWrapper( m_Path );
- setPixmap( 0, PIXMAP_POP3FOLDER );
+ setPixmap( 0, PIXMAP_LOCALFOLDER );
setText( 0, " Local Folders" );
setOpen( true );
}
MBOXviewItem::~MBOXviewItem()
{
delete wrapper;
}
AbstractMail *MBOXviewItem::getWrapper()
{
return wrapper;
}
void MBOXviewItem::refresh( QList<RecMail> & )
{
@@ -345,35 +345,37 @@ void MBOXviewItem::refresh( QList<RecMail> & )
RecBody MBOXviewItem::fetchBody( const RecMail &mail )
{
qDebug( "POP3 fetchBody" );
return wrapper->fetchBody( mail );
}
MBOXfolderItem::~MBOXfolderItem()
{
delete folder;
}
MBOXfolderItem::MBOXfolderItem( Folder *folderInit, MBOXviewItem *parent , QListViewItem*after )
: AccountViewItem( parent,after )
{
folder = folderInit;
mbox = parent;
- if (folder->getDisplayName().lower()!="inbox") {
- setPixmap( 0, PIXMAP_POP3FOLDER );
- } else {
+ if (folder->getDisplayName().lower() == "outgoing") {
+ setPixmap( 0, PIXMAP_OUTBOXFOLDER );
+ } else if (folder->getDisplayName().lower() == "inbox") {
setPixmap( 0, PIXMAP_INBOXFOLDER);
- }
+ } else {
+ setPixmap( 0, PIXMAP_MBOXFOLDER );
+ }
setText( 0, folder->getDisplayName() );
}
void MBOXfolderItem::refresh(QList<RecMail>&target)
{
if (folder->may_select())
mbox->getWrapper()->listMessages( folder->getName(),target );
}
RecBody MBOXfolderItem::fetchBody(const RecMail&aMail)
{
return mbox->getWrapper()->fetchBody(aMail);
}
diff --git a/noncore/net/mail/defines.h b/noncore/net/mail/defines.h
index d9cdab0..36c85c7 100644
--- a/noncore/net/mail/defines.h
+++ b/noncore/net/mail/defines.h
@@ -1,45 +1,51 @@
#ifndef DEFINE_CONSTANTS_H
#define DEFINE_CONSTANTS_H
#include <qpe/resource.h>
#define USER_AGENT "OpieMail v0.1"
#define PIC_COMPOSEMAIL "mail/composemail"
#define PIC_SENDQUEUED "mail/sendqueued"
#define PIC_SHOWFOLDERS "mail/showfolders"
#define PIC_SEARCHMAILS "mail/searchmails"
#define PIC_EDITSETTINGS "mail/editsettings"
#define PIC_EDITACCOUNTS "mail/editaccounts"
#define PIC_SYNC "mail/sync"
#define PIC_IMAPFOLDER "mail/imapfolder"
+#define PIC_MBOXFOLDER "mail/mboxfolder"
#define PIC_POP3FOLDER "mail/pop3folder"
#define PIC_INBOXFOLDER "mail/inbox"
+#define PIC_OUTBOXFOLDER "mail/outbox"
+#define PIC_LOCALFOLDER "mail/localfolder"
#define ICON_COMPOSEMAIL QIconSet( Resource::loadPixmap( PIC_COMPOSEMAIL ) )
#define ICON_SENDQUEUED QIconSet( Resource::loadPixmap( PIC_SENDQUEUED ) )
#define ICON_SHOWFOLDERS QIconSet( Resource::loadPixmap( PIC_SHOWFOLDERS ) )
#define ICON_SEARCHMAILS QIconSet( Resource::loadPixmap( PIC_SEARCHMAILS ) )
#define ICON_EDITSETTINGS QIconSet( Resource::loadPixmap( PIC_EDITSETTINGS ) )
#define ICON_EDITACCOUNTS QIconSet( Resource::loadPixmap( PIC_EDITACCOUNTS ) )
#define ICON_SYNC QIconSet( Resource::loadPixmap( PIC_SYNC ) )
#define PIXMAP_IMAPFOLDER QPixmap( Resource::loadPixmap( PIC_IMAPFOLDER ) )
#define PIXMAP_POP3FOLDER QPixmap( Resource::loadPixmap( PIC_POP3FOLDER ) )
#define PIXMAP_INBOXFOLDER QPixmap( Resource::loadPixmap( PIC_INBOXFOLDER) )
+#define PIXMAP_MBOXFOLDER QPixmap( Resource::loadPixmap( PIC_MBOXFOLDER ) )
+#define PIXMAP_OUTBOXFOLDER QPixmap( Resource::loadPixmap( PIC_OUTBOXFOLDER) )
+#define PIXMAP_LOCALFOLDER QPixmap( Resource::loadPixmap( PIC_LOCALFOLDER) )
#define IMAP_PORT "143"
#define IMAP_SSL_PORT "993"
#define SMTP_PORT "25"
#define SMTP_SSL_PORT "465"
#define POP3_PORT "110"
#define POP3_SSL_PORT "995"
#define NNTP_PORT "119"
#define NNTP_SSL_PORT "563"
/* used for decoding imapfoldername */
#define UNDEFINED 64
#define MAXLINE 76
#define UTF16MASK 0x03FFUL
#define UTF16SHIFT 10
#define UTF16BASE 0x10000UL
diff --git a/pics/mail/imapfolder.png b/pics/mail/imapfolder.png
index 0c980dc..f7a2901 100644
--- a/pics/mail/imapfolder.png
+++ b/pics/mail/imapfolder.png
Binary files differ
diff --git a/pics/mail/inbox.png b/pics/mail/inbox.png
index 662573d..b34f5fe 100644
--- a/pics/mail/inbox.png
+++ b/pics/mail/inbox.png
Binary files differ
diff --git a/pics/mail/localfolder.png b/pics/mail/localfolder.png
new file mode 100644
index 0000000..6b0ac61
--- a/dev/null
+++ b/pics/mail/localfolder.png
Binary files differ
diff --git a/pics/mail/mboxfolder.png b/pics/mail/mboxfolder.png
new file mode 100644
index 0000000..5012829
--- a/dev/null
+++ b/pics/mail/mboxfolder.png
Binary files differ
diff --git a/pics/mail/outbox.png b/pics/mail/outbox.png
new file mode 100644
index 0000000..3c81b43
--- a/dev/null
+++ b/pics/mail/outbox.png
Binary files differ
diff --git a/pics/mail/pop3folder.png b/pics/mail/pop3folder.png
index fad29f4..65baa24 100644
--- a/pics/mail/pop3folder.png
+++ b/pics/mail/pop3folder.png
Binary files differ