author | harlekin <harlekin> | 2004-01-06 12:33:20 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2004-01-06 12:33:20 (UTC) |
commit | a1270a04613d9adbd72c41ae1cde4683b036eebd (patch) (unidiff) | |
tree | 0ba4084bb84bd7e9e75fe1918f5b0b5cf0059410 | |
parent | 1c484a5dfcea2e7e3dc4774c706ca03cab229d40 (diff) | |
download | opie-a1270a04613d9adbd72c41ae1cde4683b036eebd.zip opie-a1270a04613d9adbd72c41ae1cde4683b036eebd.tar.gz opie-a1270a04613d9adbd72c41ae1cde4683b036eebd.tar.bz2 |
less icons
-rw-r--r-- | noncore/net/mail/defines.h | 5 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/pop3wrapper.cpp | 17 | ||||
-rw-r--r-- | noncore/net/mail/mainwindow.cpp | 8 | ||||
-rw-r--r-- | noncore/net/mail/taskbarapplet/mailapplet.cpp | 1 | ||||
-rw-r--r-- | noncore/net/mail/viewmailbase.cpp | 2 | ||||
-rw-r--r-- | pics/mail/abort.png | bin | 702 -> 0 bytes | |||
-rw-r--r-- | pics/mail/configure.png | bin | 697 -> 0 bytes | |||
-rw-r--r-- | pics/mail/delete.png | bin | 626 -> 0 bytes | |||
-rw-r--r-- | pics/mail/deletemail.png | bin | 679 -> 0 bytes | |||
-rw-r--r-- | pics/mail/editsettings.png | bin | 697 -> 0 bytes | |||
-rw-r--r-- | pics/mail/find.png | bin | 809 -> 0 bytes | |||
-rw-r--r-- | pics/mail/folder.png | bin | 767 -> 0 bytes | |||
-rw-r--r-- | pics/mail/mailchecker.png | bin | 832 -> 0 bytes | |||
-rw-r--r-- | pics/mail/reload.png | bin | 699 -> 0 bytes | |||
-rw-r--r-- | pics/mail/savemail.png | bin | 757 -> 0 bytes | |||
-rw-r--r-- | pics/mail/searchmails.png | bin | 820 -> 0 bytes |
16 files changed, 16 insertions, 17 deletions
diff --git a/noncore/net/mail/defines.h b/noncore/net/mail/defines.h index 36c85c7..ebe8e08 100644 --- a/noncore/net/mail/defines.h +++ b/noncore/net/mail/defines.h | |||
@@ -2,16 +2,13 @@ | |||
2 | #define DEFINE_CONSTANTS_H | 2 | #define DEFINE_CONSTANTS_H |
3 | 3 | ||
4 | #include <qpe/resource.h> | 4 | #include <qpe/resource.h> |
5 | 5 | ||
6 | #define USER_AGENT "OpieMail v0.1" | 6 | #define USER_AGENT "OpieMail v0.3" |
7 | 7 | ||
8 | #define PIC_COMPOSEMAIL "mail/composemail" | 8 | #define PIC_COMPOSEMAIL "mail/composemail" |
9 | #define PIC_SENDQUEUED "mail/sendqueued" | 9 | #define PIC_SENDQUEUED "mail/sendqueued" |
10 | #define PIC_SHOWFOLDERS "mail/showfolders" | 10 | #define PIC_SHOWFOLDERS "mail/showfolders" |
11 | #define PIC_SEARCHMAILS "mail/searchmails" | ||
12 | #define PIC_EDITSETTINGS "mail/editsettings" | ||
13 | #define PIC_EDITACCOUNTS "mail/editaccounts" | ||
14 | #define PIC_SYNC "mail/sync" | 11 | #define PIC_SYNC "mail/sync" |
15 | #define PIC_IMAPFOLDER "mail/imapfolder" | 12 | #define PIC_IMAPFOLDER "mail/imapfolder" |
16 | #define PIC_MBOXFOLDER "mail/mboxfolder" | 13 | #define PIC_MBOXFOLDER "mail/mboxfolder" |
17 | #define PIC_POP3FOLDER "mail/pop3folder" | 14 | #define PIC_POP3FOLDER "mail/pop3folder" |
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp index ec4dcd2..cceb22e 100644 --- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp +++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp | |||
@@ -38,9 +38,9 @@ RecBody POP3wrapper::fetchBody( const RecMail &mail ) | |||
38 | { | 38 | { |
39 | int err = MAILPOP3_NO_ERROR; | 39 | int err = MAILPOP3_NO_ERROR; |
40 | char *message = 0; | 40 | char *message = 0; |
41 | size_t length = 0; | 41 | size_t length = 0; |
42 | 42 | ||
43 | login(); | 43 | login(); |
44 | if ( !m_pop3 ) { | 44 | if ( !m_pop3 ) { |
45 | return RecBody(); | 45 | return RecBody(); |
46 | } | 46 | } |
@@ -50,13 +50,13 @@ RecBody POP3wrapper::fetchBody( const RecMail &mail ) | |||
50 | if (mail.Msgsize()>HARD_MSG_SIZE_LIMIT) { | 50 | if (mail.Msgsize()>HARD_MSG_SIZE_LIMIT) { |
51 | qDebug("Message to large: %i",mail.Msgsize()); | 51 | qDebug("Message to large: %i",mail.Msgsize()); |
52 | return body; | 52 | return body; |
53 | } | 53 | } |
54 | 54 | ||
55 | QFile msg_cache(msgTempName); | 55 | QFile msg_cache(msgTempName); |
56 | 56 | ||
57 | cleanMimeCache(); | 57 | cleanMimeCache(); |
58 | 58 | ||
59 | if (mail.getNumber()!=last_msg_id) { | 59 | if (mail.getNumber()!=last_msg_id) { |
60 | if (msg_cache.exists()) { | 60 | if (msg_cache.exists()) { |
61 | msg_cache.remove(); | 61 | msg_cache.remove(); |
62 | } | 62 | } |
@@ -87,13 +87,13 @@ RecBody POP3wrapper::fetchBody( const RecMail &mail ) | |||
87 | msg_data->msg_message = message; | 87 | msg_data->msg_message = message; |
88 | msg_data->msg_length = strlen(message); | 88 | msg_data->msg_length = strlen(message); |
89 | } | 89 | } |
90 | body = parseMail(mailmsg); | 90 | body = parseMail(mailmsg); |
91 | 91 | ||
92 | /* clean up */ | 92 | /* clean up */ |
93 | if (mailmsg) mailmessage_free(mailmsg); | 93 | if (mailmsg) mailmessage_free(mailmsg); |
94 | if (message) free(message); | 94 | if (message) free(message); |
95 | 95 | ||
96 | return body; | 96 | return body; |
97 | } | 97 | } |
98 | 98 | ||
99 | void POP3wrapper::listMessages(const QString &, QList<RecMail> &target ) | 99 | void POP3wrapper::listMessages(const QString &, QList<RecMail> &target ) |
@@ -152,8 +152,9 @@ void POP3wrapper::login() | |||
152 | return; | 152 | return; |
153 | } | 153 | } |
154 | err = mailfolder_connect(m_folder); | 154 | err = mailfolder_connect(m_folder); |
155 | if (err != MAIL_NO_ERROR) { | 155 | if (err != MAIL_NO_ERROR) { |
156 | qDebug( QString( "FEHLERNUMMER %1" ).arg( err ) ); | ||
156 | Global::statusMessage(tr("Error initializing folder")); | 157 | Global::statusMessage(tr("Error initializing folder")); |
157 | mailfolder_free(m_folder); | 158 | mailfolder_free(m_folder); |
158 | m_folder = 0; | 159 | m_folder = 0; |
159 | mailstorage_free(m_pop3); | 160 | mailstorage_free(m_pop3); |
@@ -213,9 +214,9 @@ int POP3wrapper::deleteAllMail(const Folder*) | |||
213 | Global::statusMessage(tr("Error deleting mail %1").arg(i+1)); | 214 | Global::statusMessage(tr("Error deleting mail %1").arg(i+1)); |
214 | res=0; | 215 | res=0; |
215 | } | 216 | } |
216 | break; | 217 | break; |
217 | } | 218 | } |
218 | return res; | 219 | return res; |
219 | } | 220 | } |
220 | 221 | ||
221 | void POP3wrapper::statusFolder(folderStat&target_stat,const QString&) | 222 | void POP3wrapper::statusFolder(folderStat&target_stat,const QString&) |
@@ -236,9 +237,9 @@ encodedString* POP3wrapper::fetchRawBody(const RecMail&mail) | |||
236 | encodedString*res = 0; | 237 | encodedString*res = 0; |
237 | mailmessage * mailmsg = 0; | 238 | mailmessage * mailmsg = 0; |
238 | int err = mailsession_get_message(m_folder->fld_session, mail.getNumber(), &mailmsg); | 239 | int err = mailsession_get_message(m_folder->fld_session, mail.getNumber(), &mailmsg); |
239 | err = mailmessage_fetch(mailmsg,&target,&length); | 240 | err = mailmessage_fetch(mailmsg,&target,&length); |
240 | if (mailmsg) mailmessage_free(mailmsg); | 241 | if (mailmsg) mailmessage_free(mailmsg); |
241 | if (target) { | 242 | if (target) { |
242 | res = new encodedString(target,length); | 243 | res = new encodedString(target,length); |
243 | } | 244 | } |
244 | return res; | 245 | return res; |
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp index 43d02e7..3c659e4 100644 --- a/noncore/net/mail/mainwindow.cpp +++ b/noncore/net/mail/mainwindow.cpp | |||
@@ -63,26 +63,26 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
63 | connect(showFolders, SIGNAL( toggled( bool ) ), | 63 | connect(showFolders, SIGNAL( toggled( bool ) ), |
64 | SLOT( slotShowFolders( bool ) ) ); | 64 | SLOT( slotShowFolders( bool ) ) ); |
65 | 65 | ||
66 | /* | 66 | /* |
67 | searchMails = new QAction( tr( "Search mails" ), ICON_SEARCHMAILS, | 67 | searchMails = new QAction( tr( "Search mails" ), QIconSet( Resource::loadPixmap("find") ), |
68 | 0, 0, this ); | 68 | 0, 0, this ); |
69 | searchMails->addTo( toolBar ); | 69 | searchMails->addTo( toolBar ); |
70 | searchMails->addTo( mailMenu ); | 70 | searchMails->addTo( mailMenu ); |
71 | */ | 71 | */ |
72 | 72 | ||
73 | deleteMails = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("mail/delete")), 0, 0, this); | 73 | deleteMails = new QAction(tr("Delete Mail"), QIconSet( Resource::loadPixmap("trash")), 0, 0, this); |
74 | deleteMails->addTo( toolBar ); | 74 | deleteMails->addTo( toolBar ); |
75 | deleteMails->addTo( mailMenu ); | 75 | deleteMails->addTo( mailMenu ); |
76 | connect( deleteMails, SIGNAL( activated() ), | 76 | connect( deleteMails, SIGNAL( activated() ), |
77 | SLOT( slotDeleteMail() ) ); | 77 | SLOT( slotDeleteMail() ) ); |
78 | 78 | ||
79 | editSettings = new QAction( tr( "Edit settings" ), ICON_EDITSETTINGS, | 79 | editSettings = new QAction( tr( "Edit settings" ), QIconSet( Resource::loadPixmap("SettingsIcon") ) , |
80 | 0, 0, this ); | 80 | 0, 0, this ); |
81 | editSettings->addTo( settingsMenu ); | 81 | editSettings->addTo( settingsMenu ); |
82 | connect( editSettings, SIGNAL( activated() ), | 82 | connect( editSettings, SIGNAL( activated() ), |
83 | SLOT( slotEditSettings() ) ); | 83 | SLOT( slotEditSettings() ) ); |
84 | editAccounts = new QAction( tr( "Configure accounts" ), ICON_EDITACCOUNTS, | 84 | editAccounts = new QAction( tr( "Configure accounts" ), QIconSet( Resource::loadPixmap("mail/editaccounts") ) , |
85 | 0, 0, this ); | 85 | 0, 0, this ); |
86 | editAccounts->addTo( settingsMenu ); | 86 | editAccounts->addTo( settingsMenu ); |
87 | 87 | ||
88 | //setCentralWidget( view ); | 88 | //setCentralWidget( view ); |
diff --git a/noncore/net/mail/taskbarapplet/mailapplet.cpp b/noncore/net/mail/taskbarapplet/mailapplet.cpp index a261d14..991b5fb 100644 --- a/noncore/net/mail/taskbarapplet/mailapplet.cpp +++ b/noncore/net/mail/taskbarapplet/mailapplet.cpp | |||
@@ -48,8 +48,9 @@ void MailApplet::paintEvent( QPaintEvent* ) { | |||
48 | p.drawPixmap( 0, 0, Resource::loadPixmap( "mail/inbox" ) ); | 48 | p.drawPixmap( 0, 0, Resource::loadPixmap( "mail/inbox" ) ); |
49 | QFont f( "vera", AppLnk::smallIconSize() ); | 49 | QFont f( "vera", AppLnk::smallIconSize() ); |
50 | QFontMetrics fm( f ); | 50 | QFontMetrics fm( f ); |
51 | p.setFont( f ); | 51 | p.setFont( f ); |
52 | p.setPen( Qt::blue ); | ||
52 | p.drawText( AppLnk::smallIconSize()/3, AppLnk::smallIconSize() - 2, QString::number( m_newMails ) ); | 53 | p.drawText( AppLnk::smallIconSize()/3, AppLnk::smallIconSize() - 2, QString::number( m_newMails ) ); |
53 | return; | 54 | return; |
54 | 55 | ||
55 | } | 56 | } |
diff --git a/noncore/net/mail/viewmailbase.cpp b/noncore/net/mail/viewmailbase.cpp index 0e994d4..153ba9d 100644 --- a/noncore/net/mail/viewmailbase.cpp +++ b/noncore/net/mail/viewmailbase.cpp | |||
@@ -47,9 +47,9 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) | |||
47 | showHtml = new QAction( tr( "Show Html" ), QIconSet( Resource::loadPixmap( "mail/html" ) ), 0, 0, this, 0, true ); | 47 | showHtml = new QAction( tr( "Show Html" ), QIconSet( Resource::loadPixmap( "mail/html" ) ), 0, 0, this, 0, true ); |
48 | showHtml->addTo( toolbar ); | 48 | showHtml->addTo( toolbar ); |
49 | showHtml->addTo( mailmenu ); | 49 | showHtml->addTo( mailmenu ); |
50 | 50 | ||
51 | deleteMail = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("mail/delete")), 0, 0, this); | 51 | deleteMail = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("trash")), 0, 0, this); |
52 | deleteMail->addTo(toolbar); | 52 | deleteMail->addTo(toolbar); |
53 | deleteMail->addTo(mailmenu); | 53 | deleteMail->addTo(mailmenu); |
54 | 54 | ||
55 | QVBox *view = new QVBox(this); | 55 | QVBox *view = new QVBox(this); |
diff --git a/pics/mail/abort.png b/pics/mail/abort.png deleted file mode 100644 index 13d0588..0000000 --- a/pics/mail/abort.png +++ b/dev/null | |||
Binary files differ | |||
diff --git a/pics/mail/configure.png b/pics/mail/configure.png deleted file mode 100644 index 9bbde25..0000000 --- a/pics/mail/configure.png +++ b/dev/null | |||
Binary files differ | |||
diff --git a/pics/mail/delete.png b/pics/mail/delete.png deleted file mode 100644 index 3d3daf2..0000000 --- a/pics/mail/delete.png +++ b/dev/null | |||
Binary files differ | |||
diff --git a/pics/mail/deletemail.png b/pics/mail/deletemail.png deleted file mode 100644 index 78a5f62..0000000 --- a/pics/mail/deletemail.png +++ b/dev/null | |||
Binary files differ | |||
diff --git a/pics/mail/editsettings.png b/pics/mail/editsettings.png deleted file mode 100644 index 9bbde25..0000000 --- a/pics/mail/editsettings.png +++ b/dev/null | |||
Binary files differ | |||
diff --git a/pics/mail/find.png b/pics/mail/find.png deleted file mode 100644 index 0dbfa0b..0000000 --- a/pics/mail/find.png +++ b/dev/null | |||
Binary files differ | |||
diff --git a/pics/mail/folder.png b/pics/mail/folder.png deleted file mode 100644 index 0c980dc..0000000 --- a/pics/mail/folder.png +++ b/dev/null | |||
Binary files differ | |||
diff --git a/pics/mail/mailchecker.png b/pics/mail/mailchecker.png deleted file mode 100644 index 7fb36b1..0000000 --- a/pics/mail/mailchecker.png +++ b/dev/null | |||
Binary files differ | |||
diff --git a/pics/mail/reload.png b/pics/mail/reload.png deleted file mode 100644 index 3bfff11..0000000 --- a/pics/mail/reload.png +++ b/dev/null | |||
Binary files differ | |||
diff --git a/pics/mail/savemail.png b/pics/mail/savemail.png deleted file mode 100644 index a44dd1f..0000000 --- a/pics/mail/savemail.png +++ b/dev/null | |||
Binary files differ | |||
diff --git a/pics/mail/searchmails.png b/pics/mail/searchmails.png deleted file mode 100644 index 21dc83e..0000000 --- a/pics/mail/searchmails.png +++ b/dev/null | |||
Binary files differ | |||