summaryrefslogtreecommitdiff
Unidiff
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
@@ -304,13 +304,13 @@ RecBody AccountView::fetchBody(const RecMail&aMail)
304 304
305MBOXviewItem::MBOXviewItem( const QString&aPath, QListView *parent ) 305MBOXviewItem::MBOXviewItem( const QString&aPath, QListView *parent )
306 : AccountViewItem( parent ) 306 : AccountViewItem( parent )
307{ 307{
308 m_Path = aPath; 308 m_Path = aPath;
309 wrapper = AbstractMail::getWrapper( m_Path ); 309 wrapper = AbstractMail::getWrapper( m_Path );
310 setPixmap( 0, PIXMAP_POP3FOLDER ); 310 setPixmap( 0, PIXMAP_LOCALFOLDER );
311 setText( 0, " Local Folders" ); 311 setText( 0, " Local Folders" );
312 setOpen( true ); 312 setOpen( true );
313} 313}
314 314
315MBOXviewItem::~MBOXviewItem() 315MBOXviewItem::~MBOXviewItem()
316{ 316{
@@ -355,17 +355,19 @@ MBOXfolderItem::~MBOXfolderItem()
355 355
356MBOXfolderItem::MBOXfolderItem( Folder *folderInit, MBOXviewItem *parent , QListViewItem*after ) 356MBOXfolderItem::MBOXfolderItem( Folder *folderInit, MBOXviewItem *parent , QListViewItem*after )
357 : AccountViewItem( parent,after ) 357 : AccountViewItem( parent,after )
358{ 358{
359 folder = folderInit; 359 folder = folderInit;
360 mbox = parent; 360 mbox = parent;
361 if (folder->getDisplayName().lower()!="inbox") { 361 if (folder->getDisplayName().lower() == "outgoing") {
362 setPixmap( 0, PIXMAP_POP3FOLDER ); 362 setPixmap( 0, PIXMAP_OUTBOXFOLDER );
363 } else { 363 } else if (folder->getDisplayName().lower() == "inbox") {
364 setPixmap( 0, PIXMAP_INBOXFOLDER); 364 setPixmap( 0, PIXMAP_INBOXFOLDER);
365 } 365 } else {
366 setPixmap( 0, PIXMAP_MBOXFOLDER );
367 }
366 setText( 0, folder->getDisplayName() ); 368 setText( 0, folder->getDisplayName() );
367} 369}
368 370
369void MBOXfolderItem::refresh(QList<RecMail>&target) 371void MBOXfolderItem::refresh(QList<RecMail>&target)
370{ 372{
371 if (folder->may_select()) 373 if (folder->may_select())
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
@@ -10,26 +10,32 @@
10#define PIC_SHOWFOLDERS "mail/showfolders" 10#define PIC_SHOWFOLDERS "mail/showfolders"
11#define PIC_SEARCHMAILS "mail/searchmails" 11#define PIC_SEARCHMAILS "mail/searchmails"
12#define PIC_EDITSETTINGS "mail/editsettings" 12#define PIC_EDITSETTINGS "mail/editsettings"
13#define PIC_EDITACCOUNTS "mail/editaccounts" 13#define PIC_EDITACCOUNTS "mail/editaccounts"
14#define PIC_SYNC "mail/sync" 14#define PIC_SYNC "mail/sync"
15#define PIC_IMAPFOLDER "mail/imapfolder" 15#define PIC_IMAPFOLDER "mail/imapfolder"
16#define PIC_MBOXFOLDER "mail/mboxfolder"
16#define PIC_POP3FOLDER "mail/pop3folder" 17#define PIC_POP3FOLDER "mail/pop3folder"
17#define PIC_INBOXFOLDER "mail/inbox" 18#define PIC_INBOXFOLDER "mail/inbox"
19#define PIC_OUTBOXFOLDER "mail/outbox"
20#define PIC_LOCALFOLDER "mail/localfolder"
18 21
19#define ICON_COMPOSEMAIL QIconSet( Resource::loadPixmap( PIC_COMPOSEMAIL ) ) 22#define ICON_COMPOSEMAIL QIconSet( Resource::loadPixmap( PIC_COMPOSEMAIL ) )
20#define ICON_SENDQUEUED QIconSet( Resource::loadPixmap( PIC_SENDQUEUED ) ) 23#define ICON_SENDQUEUED QIconSet( Resource::loadPixmap( PIC_SENDQUEUED ) )
21#define ICON_SHOWFOLDERS QIconSet( Resource::loadPixmap( PIC_SHOWFOLDERS ) ) 24#define ICON_SHOWFOLDERS QIconSet( Resource::loadPixmap( PIC_SHOWFOLDERS ) )
22#define ICON_SEARCHMAILS QIconSet( Resource::loadPixmap( PIC_SEARCHMAILS ) ) 25#define ICON_SEARCHMAILS QIconSet( Resource::loadPixmap( PIC_SEARCHMAILS ) )
23#define ICON_EDITSETTINGS QIconSet( Resource::loadPixmap( PIC_EDITSETTINGS ) ) 26#define ICON_EDITSETTINGS QIconSet( Resource::loadPixmap( PIC_EDITSETTINGS ) )
24#define ICON_EDITACCOUNTS QIconSet( Resource::loadPixmap( PIC_EDITACCOUNTS ) ) 27#define ICON_EDITACCOUNTS QIconSet( Resource::loadPixmap( PIC_EDITACCOUNTS ) )
25#define ICON_SYNC QIconSet( Resource::loadPixmap( PIC_SYNC ) ) 28#define ICON_SYNC QIconSet( Resource::loadPixmap( PIC_SYNC ) )
26 29
27#define PIXMAP_IMAPFOLDER QPixmap( Resource::loadPixmap( PIC_IMAPFOLDER ) ) 30#define PIXMAP_IMAPFOLDER QPixmap( Resource::loadPixmap( PIC_IMAPFOLDER ) )
28#define PIXMAP_POP3FOLDER QPixmap( Resource::loadPixmap( PIC_POP3FOLDER ) ) 31#define PIXMAP_POP3FOLDER QPixmap( Resource::loadPixmap( PIC_POP3FOLDER ) )
29#define PIXMAP_INBOXFOLDER QPixmap( Resource::loadPixmap( PIC_INBOXFOLDER) ) 32#define PIXMAP_INBOXFOLDER QPixmap( Resource::loadPixmap( PIC_INBOXFOLDER) )
33#define PIXMAP_MBOXFOLDER QPixmap( Resource::loadPixmap( PIC_MBOXFOLDER ) )
34#define PIXMAP_OUTBOXFOLDER QPixmap( Resource::loadPixmap( PIC_OUTBOXFOLDER) )
35#define PIXMAP_LOCALFOLDER QPixmap( Resource::loadPixmap( PIC_LOCALFOLDER) )
30 36
31#define IMAP_PORT "143" 37#define IMAP_PORT "143"
32#define IMAP_SSL_PORT "993" 38#define IMAP_SSL_PORT "993"
33#define SMTP_PORT "25" 39#define SMTP_PORT "25"
34#define SMTP_SSL_PORT "465" 40#define SMTP_SSL_PORT "465"
35#define POP3_PORT "110" 41#define POP3_PORT "110"
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