-rw-r--r-- | noncore/net/mail/accountitem.cpp | 6 | ||||
-rw-r--r-- | noncore/net/mail/addresspicker.cpp | 6 | ||||
-rw-r--r-- | noncore/net/mail/composemail.cpp | 9 | ||||
-rw-r--r-- | noncore/net/mail/config.in | 6 | ||||
-rw-r--r-- | noncore/net/mail/defines.h | 33 | ||||
-rw-r--r-- | noncore/net/mail/mailistviewitem.cpp | 14 | ||||
-rw-r--r-- | noncore/net/mail/mainwindow.cpp | 29 | ||||
-rw-r--r-- | noncore/net/mail/opiemail.cpp | 7 | ||||
-rw-r--r-- | noncore/net/mail/viewmailbase.cpp | 24 |
9 files changed, 71 insertions, 63 deletions
diff --git a/noncore/net/mail/accountitem.cpp b/noncore/net/mail/accountitem.cpp index f7fdccd..f3f2182 100644 --- a/noncore/net/mail/accountitem.cpp +++ b/noncore/net/mail/accountitem.cpp | |||
@@ -7,17 +7,19 @@ | |||
7 | 7 | ||
8 | #include <libmailwrapper/mailtypes.h> | 8 | #include <libmailwrapper/mailtypes.h> |
9 | #include <libmailwrapper/abstractmail.h> | 9 | #include <libmailwrapper/abstractmail.h> |
10 | #include <libmailwrapper/mailwrapper.h> | 10 | #include <libmailwrapper/mailwrapper.h> |
11 | |||
11 | /* OPIE */ | 12 | /* OPIE */ |
12 | #include <opie2/odebug.h> | 13 | #include <opie2/odebug.h> |
14 | #include <opie2/oresource.h> | ||
13 | #include <qpe/qpeapplication.h> | 15 | #include <qpe/qpeapplication.h> |
16 | using namespace Opie::Core; | ||
14 | 17 | ||
15 | /* QT */ | 18 | /* QT */ |
16 | #include <qpopupmenu.h> | 19 | #include <qpopupmenu.h> |
17 | #include <qmessagebox.h> | 20 | #include <qmessagebox.h> |
18 | 21 | ||
19 | using namespace Opie::Core; | ||
20 | #define SETPIX(x) if (!account->getOffline()) {setPixmap( 0,x);} else {setPixmap( 0, PIXMAP_OFFLINE );} | 22 | #define SETPIX(x) if (!account->getOffline()) {setPixmap( 0,x);} else {setPixmap( 0, PIXMAP_OFFLINE );} |
21 | /** | 23 | /** |
22 | * POP3 Account stuff | 24 | * POP3 Account stuff |
23 | */ | 25 | */ |
@@ -897,9 +899,9 @@ void MHfolderItem::initName() | |||
897 | else if (bName.lower() == "inbox") | 899 | else if (bName.lower() == "inbox") |
898 | { | 900 | { |
899 | setPixmap( 0, PIXMAP_INBOXFOLDER); | 901 | setPixmap( 0, PIXMAP_INBOXFOLDER); |
900 | } else if (bName.lower() == "drafts") { | 902 | } else if (bName.lower() == "drafts") { |
901 | setPixmap(0, Resource::loadPixmap("edit")); | 903 | setPixmap(0, Opie::Core::OResource::loadPixmap("edit", Opie::Core::OResource::SmallIcon)); |
902 | } else { | 904 | } else { |
903 | setPixmap( 0, PIXMAP_MBOXFOLDER ); | 905 | setPixmap( 0, PIXMAP_MBOXFOLDER ); |
904 | } | 906 | } |
905 | setText( 0, bName ); | 907 | setText( 0, bName ); |
diff --git a/noncore/net/mail/addresspicker.cpp b/noncore/net/mail/addresspicker.cpp index 50c82e5..4e328d4 100644 --- a/noncore/net/mail/addresspicker.cpp +++ b/noncore/net/mail/addresspicker.cpp | |||
@@ -3,9 +3,9 @@ | |||
3 | 3 | ||
4 | /* OPIE */ | 4 | /* OPIE */ |
5 | #include <opie2/ocontactaccess.h> | 5 | #include <opie2/ocontactaccess.h> |
6 | #include <opie2/opimcontact.h> | 6 | #include <opie2/opimcontact.h> |
7 | #include <qpe/resource.h> | 7 | #include <opie2/oresource.h> |
8 | #include <qpe/qpeapplication.h> | 8 | #include <qpe/qpeapplication.h> |
9 | 9 | ||
10 | /* QT */ | 10 | /* QT */ |
11 | #include <qpushbutton.h> | 11 | #include <qpushbutton.h> |
@@ -17,10 +17,10 @@ | |||
17 | 17 | ||
18 | AddressPicker::AddressPicker( QWidget *parent, const char *name, bool modal, WFlags flags ) | 18 | AddressPicker::AddressPicker( QWidget *parent, const char *name, bool modal, WFlags flags ) |
19 | : AddressPickerUI( parent, name, modal, flags ) | 19 | : AddressPickerUI( parent, name, modal, flags ) |
20 | { | 20 | { |
21 | okButton->setIconSet( Resource::loadPixmap( "enter" ) ); | 21 | okButton->setIconSet( Opie::Core::OResource::loadPixmap( "enter", Opie::Core::OResource::SmallIcon ) ); |
22 | cancelButton->setIconSet( Resource::loadPixmap( "editdelete" ) ); | 22 | cancelButton->setIconSet( Opie::Core::OResource::loadPixmap( "editdelete", Opie::Core::OResource::SmallIcon ) ); |
23 | 23 | ||
24 | connect(okButton, SIGNAL(clicked()), SLOT(accept())); | 24 | connect(okButton, SIGNAL(clicked()), SLOT(accept())); |
25 | connect(cancelButton, SIGNAL(clicked()), SLOT(close())); | 25 | connect(cancelButton, SIGNAL(clicked()), SLOT(close())); |
26 | Opie::OPimContactAccess::List::Iterator it; | 26 | Opie::OPimContactAccess::List::Iterator it; |
diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp index 154c1d5..9d04de3 100644 --- a/noncore/net/mail/composemail.cpp +++ b/noncore/net/mail/composemail.cpp | |||
@@ -8,19 +8,18 @@ | |||
8 | 8 | ||
9 | /* OPIE */ | 9 | /* OPIE */ |
10 | #include <opie2/ofiledialog.h> | 10 | #include <opie2/ofiledialog.h> |
11 | #include <opie2/odebug.h> | 11 | #include <opie2/odebug.h> |
12 | #include <qpe/resource.h> | 12 | #include <opie2/oresource.h> |
13 | #include <qpe/config.h> | 13 | #include <qpe/config.h> |
14 | #include <qpe/global.h> | 14 | #include <qpe/global.h> |
15 | #include <qpe/contact.h> | 15 | #include <qpe/contact.h> |
16 | using namespace Opie::Core; | ||
17 | using namespace Opie::Ui; | ||
16 | 18 | ||
17 | /* QT */ | 19 | /* QT */ |
18 | #include <qt.h> | 20 | #include <qt.h> |
19 | 21 | ||
20 | |||
21 | using namespace Opie::Core; | ||
22 | using namespace Opie::Ui; | ||
23 | ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags ) | 22 | ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags ) |
24 | : ComposeMailUI( parent, name, modal, flags ) | 23 | : ComposeMailUI( parent, name, modal, flags ) |
25 | { | 24 | { |
26 | settings = s; | 25 | settings = s; |
@@ -298,9 +297,9 @@ AttachViewItem::AttachViewItem( QListView *parent, Attachment *att ) | |||
298 | { | 297 | { |
299 | attachment = att; | 298 | attachment = att; |
300 | odebug << att->getMimeType() << oendl; | 299 | odebug << att->getMimeType() << oendl; |
301 | setPixmap( 0, attachment->getDocLnk().pixmap().isNull() ? | 300 | setPixmap( 0, attachment->getDocLnk().pixmap().isNull() ? |
302 | Resource::loadPixmap( "UnknownDocument-14" ) : | 301 | OResource::loadPixmap( "UnknownDocument", OResource::SmallIcon ) : |
303 | attachment->getDocLnk().pixmap() ); | 302 | attachment->getDocLnk().pixmap() ); |
304 | setText( 0, att->getName().isEmpty() ? att->getFileName() : att->getName() ); | 303 | setText( 0, att->getName().isEmpty() ? att->getFileName() : att->getName() ); |
305 | setText( 1, QString::number( att->getSize() ) ); | 304 | setText( 1, QString::number( att->getSize() ) ); |
306 | } | 305 | } |
diff --git a/noncore/net/mail/config.in b/noncore/net/mail/config.in index f7fce91..b18feb7 100644 --- a/noncore/net/mail/config.in +++ b/noncore/net/mail/config.in | |||
@@ -2,9 +2,9 @@ source noncore/net/mail/libmailwrapper/config.in | |||
2 | 2 | ||
3 | config MAIL3 | 3 | config MAIL3 |
4 | boolean "opie-mail3 (a mail client)" | 4 | boolean "opie-mail3 (a mail client)" |
5 | default "y" | 5 | default "y" |
6 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2PIM && LIBOPIE2MM && LIBMAILWRAPPER | 6 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBOPIE2MM && LIBMAILWRAPPER |
7 | comment "opie-mail3 needs a libqpe, libopie2core, libopie2pim and the libmailwrapper" | 7 | comment "opie-mail3 needs a libqpe, libopie2core, libopie2ui, libopie2pim and the libmailwrapper" |
8 | depends ! ( ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2PIM && LIBOPIE2MM && LIBMAILWRAPPER ) | 8 | depends ! ( ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBOPIE2MM && LIBMAILWRAPPER ) |
9 | 9 | ||
10 | source noncore/net/mail/taskbarapplet/config.in | 10 | source noncore/net/mail/taskbarapplet/config.in |
diff --git a/noncore/net/mail/defines.h b/noncore/net/mail/defines.h index 50d63dd..36ac5a1 100644 --- a/noncore/net/mail/defines.h +++ b/noncore/net/mail/defines.h | |||
@@ -1,8 +1,9 @@ | |||
1 | #ifndef DEFINE_CONSTANTS_H | 1 | #ifndef DEFINE_CONSTANTS_H |
2 | #define DEFINE_CONSTANTS_H | 2 | #define DEFINE_CONSTANTS_H |
3 | 3 | ||
4 | #include <qpe/resource.h> | 4 | #include <opie2/oresource.h> |
5 | using namespace Opie::Core; | ||
5 | 6 | ||
6 | #define USER_AGENT "OpieMail v0.3" | 7 | #define USER_AGENT "OpieMail v0.3" |
7 | 8 | ||
8 | #define PIC_COMPOSEMAIL "mail/composemail" | 9 | #define PIC_COMPOSEMAIL "mail/composemail" |
@@ -18,24 +19,24 @@ | |||
18 | 19 | ||
19 | #define PIC_OFFLINE "mail/notconnected" | 20 | #define PIC_OFFLINE "mail/notconnected" |
20 | #define PIC_DOCUMENT "DocsIcon" | 21 | #define PIC_DOCUMENT "DocsIcon" |
21 | 22 | ||
22 | #define ICON_COMPOSEMAIL QIconSet( Resource::loadPixmap( PIC_COMPOSEMAIL ) ) | 23 | #define ICON_COMPOSEMAIL QIconSet( OResource::loadPixmap( PIC_COMPOSEMAIL, OResource::SmallIcon ) ) |
23 | #define ICON_SENDQUEUED QIconSet( Resource::loadPixmap( PIC_SENDQUEUED ) ) | 24 | #define ICON_SENDQUEUED QIconSet( OResource::loadPixmap( PIC_SENDQUEUED, OResource::SmallIcon ) ) |
24 | #define ICON_SHOWFOLDERS QIconSet( Resource::loadPixmap( PIC_SHOWFOLDERS ) ) | 25 | #define ICON_SHOWFOLDERS QIconSet( OResource::loadPixmap( PIC_SHOWFOLDERS, OResource::SmallIcon ) ) |
25 | #define ICON_SEARCHMAILS QIconSet( Resource::loadPixmap( PIC_SEARCHMAILS ) ) | 26 | #define ICON_SEARCHMAILS QIconSet( OResource::loadPixmap( PIC_SEARCHMAILS, OResource::SmallIcon ) ) |
26 | #define ICON_EDITSETTINGS QIconSet( Resource::loadPixmap( PIC_EDITSETTINGS ) ) | 27 | #define ICON_EDITSETTINGS QIconSet( OResource::loadPixmap( PIC_EDITSETTINGS, OResource::SmallIcon ) ) |
27 | #define ICON_EDITACCOUNTS QIconSet( Resource::loadPixmap( PIC_EDITACCOUNTS ) ) | 28 | #define ICON_EDITACCOUNTS QIconSet( OResource::loadPixmap( PIC_EDITACCOUNTS, OResource::SmallIcon ) ) |
28 | #define ICON_SYNC QIconSet( Resource::loadPixmap( PIC_SYNC ) ) | 29 | #define ICON_SYNC QIconSet( OResource::loadPixmap( PIC_SYNC, OResource::SmallIcon ) ) |
29 | #define ICON_READMAIL QIconSet( Resource::loadPixmap( PIC_DOCUMENT)) | 30 | #define ICON_READMAIL QIconSet( OResource::loadPixmap( PIC_DOCUMENT, OResource::SmallIcon) ) |
30 | 31 | ||
31 | #define PIXMAP_IMAPFOLDER QPixmap( Resource::loadPixmap( PIC_IMAPFOLDER ) ) | 32 | #define PIXMAP_IMAPFOLDER QPixmap( OResource::loadPixmap( PIC_IMAPFOLDER, OResource::SmallIcon ) ) |
32 | #define PIXMAP_POP3FOLDER QPixmap( Resource::loadPixmap( PIC_POP3FOLDER ) ) | 33 | #define PIXMAP_POP3FOLDER QPixmap( OResource::loadPixmap( PIC_POP3FOLDER, OResource::SmallIcon ) ) |
33 | #define PIXMAP_INBOXFOLDER QPixmap( Resource::loadPixmap( PIC_INBOXFOLDER) ) | 34 | #define PIXMAP_INBOXFOLDER QPixmap( OResource::loadPixmap( PIC_INBOXFOLDER, OResource::SmallIcon ) ) |
34 | #define PIXMAP_MBOXFOLDER QPixmap( Resource::loadPixmap( PIC_MBOXFOLDER ) ) | 35 | #define PIXMAP_MBOXFOLDER QPixmap( OResource::loadPixmap( PIC_MBOXFOLDER, OResource::SmallIcon ) ) |
35 | #define PIXMAP_OUTBOXFOLDER QPixmap( Resource::loadPixmap( PIC_OUTBOXFOLDER) ) | 36 | #define PIXMAP_OUTBOXFOLDER QPixmap( OResource::loadPixmap( PIC_OUTBOXFOLDER, OResource::SmallIcon ) ) |
36 | #define PIXMAP_LOCALFOLDER QPixmap( Resource::loadPixmap( PIC_LOCALFOLDER) ) | 37 | #define PIXMAP_LOCALFOLDER QPixmap( OResource::loadPixmap( PIC_LOCALFOLDER, OResource::SmallIcon ) ) |
37 | #define PIXMAP_OFFLINE QPixmap( Resource::loadPixmap( PIC_OFFLINE) ) | 38 | #define PIXMAP_OFFLINE QPixmap( OResource::loadPixmap( PIC_OFFLINE, OResource::SmallIcon ) ) |
38 | 39 | ||
39 | #define IMAP_PORT "143" | 40 | #define IMAP_PORT "143" |
40 | #define IMAP_SSL_PORT "993" | 41 | #define IMAP_SSL_PORT "993" |
41 | #define SMTP_PORT "25" | 42 | #define SMTP_PORT "25" |
diff --git a/noncore/net/mail/mailistviewitem.cpp b/noncore/net/mail/mailistviewitem.cpp index d3a0723..5254616 100644 --- a/noncore/net/mail/mailistviewitem.cpp +++ b/noncore/net/mail/mailistviewitem.cpp | |||
@@ -1,25 +1,29 @@ | |||
1 | #include "mailistviewitem.h" | 1 | #include "mailistviewitem.h" |
2 | #include <libmailwrapper/abstractmail.h> | 2 | #include <libmailwrapper/abstractmail.h> |
3 | #include <qtextstream.h> | 3 | |
4 | #include <qpe/resource.h> | 4 | /* OPIE */ |
5 | #include <opie2/oresource.h> | ||
5 | #include <qpe/timestring.h> | 6 | #include <qpe/timestring.h> |
6 | 7 | ||
8 | /* QT */ | ||
9 | #include <qtextstream.h> | ||
10 | |||
7 | MailListViewItem::MailListViewItem(QListView * parent, MailListViewItem * item ) | 11 | MailListViewItem::MailListViewItem(QListView * parent, MailListViewItem * item ) |
8 | :QListViewItem(parent,item),mail_data() | 12 | :QListViewItem(parent,item),mail_data() |
9 | { | 13 | { |
10 | } | 14 | } |
11 | 15 | ||
12 | void MailListViewItem::showEntry() | 16 | void MailListViewItem::showEntry() |
13 | { | 17 | { |
14 | if ( mail_data->getFlags().testBit( FLAG_ANSWERED ) == true) { | 18 | if ( mail_data->getFlags().testBit( FLAG_ANSWERED ) == true) { |
15 | setPixmap( 0, Resource::loadPixmap( "mail/kmmsgreplied") ); | 19 | setPixmap( 0, Opie::Core::OResource::loadPixmap( "mail/kmmsgreplied", Opie::Core::OResource::SmallIcon ) ); |
16 | } else if ( mail_data->getFlags().testBit( FLAG_SEEN ) == true ) { | 20 | } else if ( mail_data->getFlags().testBit( FLAG_SEEN ) == true ) { |
17 | /* I think it looks nicer if there are not such a lot of icons but only on mails | 21 | /* I think it looks nicer if there are not such a lot of icons but only on mails |
18 | replied or new - Alwin*/ | 22 | replied or new - Alwin*/ |
19 | //setPixmap( 0, Resource::loadPixmap( "mail/kmmsgunseen") ); | 23 | //setPixmap( 0, Opie::Core::OResource::loadPixmap( "mail/kmmsgunseen", Opie::Core::OResource::SmallIcon ) ); |
20 | } else { | 24 | } else { |
21 | setPixmap( 0, Resource::loadPixmap( "mail/kmmsgnew") ); | 25 | setPixmap( 0, Opie::Core::OResource::loadPixmap( "mail/kmmsgnew", Opie::Core::OResource::SmallIcon ) ); |
22 | } | 26 | } |
23 | double s = mail_data->Msgsize(); | 27 | double s = mail_data->Msgsize(); |
24 | int w; | 28 | int w; |
25 | w=0; | 29 | w=0; |
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp index b587424..bce4c0d 100644 --- a/noncore/net/mail/mainwindow.cpp +++ b/noncore/net/mail/mainwindow.cpp | |||
@@ -1,23 +1,24 @@ | |||
1 | #include <qlabel.h> | 1 | #include "defines.h" |
2 | #include <qvbox.h> | 2 | #include "mainwindow.h" |
3 | #include <qheader.h> | ||
4 | #include <qtimer.h> | ||
5 | #include <qlayout.h> | ||
6 | 3 | ||
4 | /* OPIE */ | ||
7 | #include <opie2/odebug.h> | 5 | #include <opie2/odebug.h> |
6 | #include <opie2/oresource.h> | ||
8 | #include <qpe/qpeapplication.h> | 7 | #include <qpe/qpeapplication.h> |
9 | #include <qpe/qcopenvelope_qws.h> | 8 | #include <qpe/qcopenvelope_qws.h> |
10 | |||
11 | #include "defines.h" | ||
12 | #include "mainwindow.h" | ||
13 | |||
14 | using namespace Opie::Core; | 9 | using namespace Opie::Core; |
15 | 10 | ||
11 | /* QT */ | ||
12 | #include <qlabel.h> | ||
13 | #include <qvbox.h> | ||
14 | #include <qheader.h> | ||
15 | #include <qtimer.h> | ||
16 | #include <qlayout.h> | ||
17 | |||
16 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | 18 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) |
17 | : QMainWindow( parent, name, flags ) | 19 | : QMainWindow( parent, name, flags ) |
18 | { | 20 | { |
19 | |||
20 | setCaption( tr( "Mail" ) ); | 21 | setCaption( tr( "Mail" ) ); |
21 | setToolBarsMovable( false ); | 22 | setToolBarsMovable( false ); |
22 | 23 | ||
23 | toolBar = new QToolBar( this ); | 24 | toolBar = new QToolBar( this ); |
@@ -94,26 +95,26 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
94 | connect(showFolders, SIGNAL( toggled(bool) ), | 95 | connect(showFolders, SIGNAL( toggled(bool) ), |
95 | SLOT( slotShowFolders(bool) ) ); | 96 | SLOT( slotShowFolders(bool) ) ); |
96 | 97 | ||
97 | /* | 98 | /* |
98 | searchMails = new QAction( tr( "Search mails" ), QIconSet( Resource::loadPixmap("find") ), | 99 | searchMails = new QAction( tr( "Search mails" ), OResource::loadPixmap("find", OResource::SmallIcon ), |
99 | 0, 0, this ); | 100 | 0, 0, this ); |
100 | searchMails->addTo( toolBar ); | 101 | searchMails->addTo( toolBar ); |
101 | searchMails->addTo( mailMenu ); | 102 | searchMails->addTo( mailMenu ); |
102 | */ | 103 | */ |
103 | 104 | ||
104 | deleteMails = new QAction(tr("Delete Mail"), QIconSet( Resource::loadPixmap("trash")), 0, 0, this); | 105 | deleteMails = new QAction(tr("Delete Mail"), OResource::loadPixmap("trash", OResource::SmallIcon ), 0, 0, this); |
105 | deleteMails->addTo( toolBar ); | 106 | deleteMails->addTo( toolBar ); |
106 | deleteMails->addTo( mailMenu ); | 107 | deleteMails->addTo( mailMenu ); |
107 | connect( deleteMails, SIGNAL( activated() ), | 108 | connect( deleteMails, SIGNAL( activated() ), |
108 | SLOT( slotDeleteMail() ) ); | 109 | SLOT( slotDeleteMail() ) ); |
109 | 110 | ||
110 | editSettings = new QAction( tr( "Edit settings" ), QIconSet( Resource::loadPixmap("SettingsIcon") ) , | 111 | editSettings = new QAction( tr( "Edit settings" ), OResource::loadPixmap("SettingsIcon", OResource::SmallIcon ) , |
111 | 0, 0, this ); | 112 | 0, 0, this ); |
112 | editSettings->addTo( settingsMenu ); | 113 | editSettings->addTo( settingsMenu ); |
113 | connect( editSettings, SIGNAL( activated() ), | 114 | connect( editSettings, SIGNAL( activated() ), |
114 | SLOT( slotEditSettings() ) ); | 115 | SLOT( slotEditSettings() ) ); |
115 | editAccounts = new QAction( tr( "Configure accounts" ), QIconSet( Resource::loadPixmap("mail/editaccounts") ) , | 116 | editAccounts = new QAction( tr( "Configure accounts" ), OResource::loadPixmap("mail/editaccounts", OResource::SmallIcon ) , |
116 | 0, 0, this ); | 117 | 0, 0, this ); |
117 | editAccounts->addTo( settingsMenu ); | 118 | editAccounts->addTo( settingsMenu ); |
118 | 119 | ||
119 | 120 | ||
diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp index fb8877a..e07ed6f 100644 --- a/noncore/net/mail/opiemail.cpp +++ b/noncore/net/mail/opiemail.cpp | |||
@@ -10,23 +10,22 @@ | |||
10 | 10 | ||
11 | #include <libmailwrapper/smtpwrapper.h> | 11 | #include <libmailwrapper/smtpwrapper.h> |
12 | #include <libmailwrapper/mailtypes.h> | 12 | #include <libmailwrapper/mailtypes.h> |
13 | #include <libmailwrapper/abstractmail.h> | 13 | #include <libmailwrapper/abstractmail.h> |
14 | |||
14 | /* OPIE */ | 15 | /* OPIE */ |
15 | #include <opie2/odebug.h> | 16 | #include <opie2/odebug.h> |
16 | #include <qpe/resource.h> | ||
17 | #include <qpe/qpeapplication.h> | 17 | #include <qpe/qpeapplication.h> |
18 | #include <qpe/config.h> | 18 | #include <qpe/config.h> |
19 | using namespace Opie::Core; | ||
19 | 20 | ||
20 | /* QT */ | 21 | /* QT */ |
21 | #include <qmap.h> | 22 | #include <qmap.h> |
22 | #include <qvaluelist.h> | 23 | #include <qvaluelist.h> |
23 | 24 | ||
24 | /* UNIX */ | 25 | /* UNIX */ |
25 | #include <signal.h> | 26 | #include <signal.h> |
26 | 27 | ||
27 | using namespace Opie::Core; | ||
28 | |||
29 | typedef QMapNode<QString,QString> tkeyvalues; | 28 | typedef QMapNode<QString,QString> tkeyvalues; |
30 | typedef QValueList<tkeyvalues> tvaluelist; | 29 | typedef QValueList<tkeyvalues> tvaluelist; |
31 | 30 | ||
32 | class ValueExplode | 31 | class ValueExplode |
@@ -277,9 +276,9 @@ void OpieMail::displayMail() | |||
277 | folderView->refreshCurrent(); | 276 | folderView->refreshCurrent(); |
278 | } | 277 | } |
279 | else | 278 | else |
280 | { | 279 | { |
281 | ( (MailListViewItem*)item )->setPixmap( 0, Resource::loadPixmap( "" ) ); | 280 | ( (MailListViewItem*)item )->setPixmap( 0, QPixmap() ); |
282 | } | 281 | } |
283 | } | 282 | } |
284 | 283 | ||
285 | void OpieMail::slotDeleteMail() | 284 | void OpieMail::slotDeleteMail() |
diff --git a/noncore/net/mail/viewmailbase.cpp b/noncore/net/mail/viewmailbase.cpp index 65ad0d6..9e17439 100644 --- a/noncore/net/mail/viewmailbase.cpp +++ b/noncore/net/mail/viewmailbase.cpp | |||
@@ -1,17 +1,19 @@ | |||
1 | #include "viewmailbase.h" | ||
2 | |||
3 | /* OPIE */ | ||
4 | #include <opie2/oresource.h> | ||
5 | using namespace Opie::Core; | ||
6 | |||
7 | /* QT */ | ||
1 | #include <qtextbrowser.h> | 8 | #include <qtextbrowser.h> |
2 | #include <qlistview.h> | 9 | #include <qlistview.h> |
3 | #include <qaction.h> | 10 | #include <qaction.h> |
4 | #include <qlabel.h> | 11 | #include <qlabel.h> |
5 | #include <qvbox.h> | 12 | #include <qvbox.h> |
6 | |||
7 | #include <qtoolbar.h> | 13 | #include <qtoolbar.h> |
8 | #include <qlayout.h> | 14 | #include <qlayout.h> |
9 | #include <qmenubar.h> | 15 | #include <qmenubar.h> |
10 | #include <qpe/resource.h> | ||
11 | |||
12 | #include "viewmailbase.h" | ||
13 | //#include "opendiag.h" | ||
14 | 16 | ||
15 | ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) | 17 | ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) |
16 | : QMainWindow(parent, name, fl) | 18 | : QMainWindow(parent, name, fl) |
17 | { | 19 | { |
@@ -27,32 +29,32 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) | |||
27 | QLabel *spacer = new QLabel(toolbar); | 29 | QLabel *spacer = new QLabel(toolbar); |
28 | spacer->setBackgroundMode(QWidget::PaletteButton); | 30 | spacer->setBackgroundMode(QWidget::PaletteButton); |
29 | toolbar->setStretchableWidget(spacer); | 31 | toolbar->setStretchableWidget(spacer); |
30 | 32 | ||
31 | reply = new QAction(tr("Reply"), QIconSet(Resource::loadPixmap("mail/reply")), 0, 0, this); | 33 | reply = new QAction(tr("Reply"), OResource::loadPixmap("mail/reply", OResource::SmallIcon), 0, 0, this); |
32 | reply->addTo(toolbar); | 34 | reply->addTo(toolbar); |
33 | reply->addTo(mailmenu); | 35 | reply->addTo(mailmenu); |
34 | 36 | ||
35 | forward = new QAction(tr("Forward"), QIconSet(Resource::loadPixmap("mail/forward")), 0, 0, this); | 37 | forward = new QAction(tr("Forward"), OResource::loadPixmap("mail/forward", OResource::SmallIcon), 0, 0, this); |
36 | forward->addTo(toolbar); | 38 | forward->addTo(toolbar); |
37 | forward->addTo(mailmenu); | 39 | forward->addTo(mailmenu); |
38 | 40 | ||
39 | attachbutton = new QAction(tr("Attachments"), QIconSet(Resource::loadPixmap("mail/attach")), 0, 0, this, 0, true); | 41 | attachbutton = new QAction(tr("Attachments"), OResource::loadPixmap("mail/attach", OResource::SmallIcon), 0, 0, this, 0, true); |
40 | attachbutton->addTo(toolbar); | 42 | attachbutton->addTo(toolbar); |
41 | attachbutton->addTo(mailmenu); | 43 | attachbutton->addTo(mailmenu); |
42 | connect(attachbutton, SIGNAL(toggled(bool)), SLOT(slotChangeAttachview(bool))); | 44 | connect(attachbutton, SIGNAL(toggled(bool)), SLOT(slotChangeAttachview(bool))); |
43 | 45 | ||
44 | 46 | ||
45 | showHtml = new QAction( tr( "Show Html" ), QIconSet( Resource::loadPixmap( "mail/html" ) ), 0, 0, this, 0, true ); | 47 | showHtml = new QAction( tr( "Show Html" ), OResource::loadPixmap( "mail/html", OResource::SmallIcon ), 0, 0, this, 0, true ); |
46 | showHtml->addTo( toolbar ); | 48 | showHtml->addTo( toolbar ); |
47 | showHtml->addTo( mailmenu ); | 49 | showHtml->addTo( mailmenu ); |
48 | 50 | ||
49 | showPicsInline= new QAction(tr("Show image preview inline"), QIconSet(Resource::loadPixmap("pixmap")), 0, 0, this); | 51 | showPicsInline= new QAction(tr("Show image preview inline"), OResource::loadPixmap("pixmap", OResource::SmallIcon), 0, 0, this); |
50 | showPicsInline->setToggleAction(true); | 52 | showPicsInline->setToggleAction(true); |
51 | showPicsInline->addTo(toolbar); | 53 | showPicsInline->addTo(toolbar); |
52 | showPicsInline->addTo(mailmenu); | 54 | showPicsInline->addTo(mailmenu); |
53 | 55 | ||
54 | deleteMail = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("trash")), 0, 0, this); | 56 | deleteMail = new QAction(tr("Delete Mail"), OResource::loadPixmap("trash", OResource::SmallIcon), 0, 0, this); |
55 | deleteMail->addTo(toolbar); | 57 | deleteMail->addTo(toolbar); |
56 | deleteMail->addTo(mailmenu); | 58 | deleteMail->addTo(mailmenu); |
57 | 59 | ||
58 | QVBox * view = new QVBox(this); | 60 | QVBox * view = new QVBox(this); |