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 | |||
@@ -1,29 +1,26 @@ | |||
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 <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" |
18 | #define PIC_INBOXFOLDER "mail/inbox" | 15 | #define PIC_INBOXFOLDER "mail/inbox" |
19 | #define PIC_OUTBOXFOLDER "mail/outbox" | 16 | #define PIC_OUTBOXFOLDER "mail/outbox" |
20 | #define PIC_LOCALFOLDER "mail/localfolder" | 17 | #define PIC_LOCALFOLDER "mail/localfolder" |
21 | 18 | ||
22 | #define ICON_COMPOSEMAIL QIconSet( Resource::loadPixmap( PIC_COMPOSEMAIL ) ) | 19 | #define ICON_COMPOSEMAIL QIconSet( Resource::loadPixmap( PIC_COMPOSEMAIL ) ) |
23 | #define ICON_SENDQUEUED QIconSet( Resource::loadPixmap( PIC_SENDQUEUED ) ) | 20 | #define ICON_SENDQUEUED QIconSet( Resource::loadPixmap( PIC_SENDQUEUED ) ) |
24 | #define ICON_SHOWFOLDERS QIconSet( Resource::loadPixmap( PIC_SHOWFOLDERS ) ) | 21 | #define ICON_SHOWFOLDERS QIconSet( Resource::loadPixmap( PIC_SHOWFOLDERS ) ) |
25 | #define ICON_SEARCHMAILS QIconSet( Resource::loadPixmap( PIC_SEARCHMAILS ) ) | 22 | #define ICON_SEARCHMAILS QIconSet( Resource::loadPixmap( PIC_SEARCHMAILS ) ) |
26 | #define ICON_EDITSETTINGS QIconSet( Resource::loadPixmap( PIC_EDITSETTINGS ) ) | 23 | #define ICON_EDITSETTINGS QIconSet( Resource::loadPixmap( PIC_EDITSETTINGS ) ) |
27 | #define ICON_EDITACCOUNTS QIconSet( Resource::loadPixmap( PIC_EDITACCOUNTS ) ) | 24 | #define ICON_EDITACCOUNTS QIconSet( Resource::loadPixmap( PIC_EDITACCOUNTS ) ) |
28 | #define ICON_SYNC QIconSet( Resource::loadPixmap( PIC_SYNC ) ) | 25 | #define ICON_SYNC QIconSet( Resource::loadPixmap( PIC_SYNC ) ) |
29 | 26 | ||
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 | |||
@@ -26,86 +26,86 @@ POP3wrapper::~POP3wrapper() | |||
26 | QFile msg_cache(msgTempName); | 26 | QFile msg_cache(msgTempName); |
27 | if (msg_cache.exists()) { | 27 | if (msg_cache.exists()) { |
28 | msg_cache.remove(); | 28 | msg_cache.remove(); |
29 | } | 29 | } |
30 | } | 30 | } |
31 | 31 | ||
32 | void POP3wrapper::pop3_progress( size_t current, size_t maximum ) | 32 | void POP3wrapper::pop3_progress( size_t current, size_t maximum ) |
33 | { | 33 | { |
34 | qDebug( "POP3: %i of %i", current, maximum ); | 34 | qDebug( "POP3: %i of %i", current, maximum ); |
35 | } | 35 | } |
36 | 36 | ||
37 | RecBody POP3wrapper::fetchBody( const RecMail &mail ) | 37 | 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 | } |
47 | 47 | ||
48 | RecBody body; | 48 | RecBody body; |
49 | mailmessage * mailmsg; | 49 | mailmessage * mailmsg; |
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 | } |
63 | msg_cache.open(IO_ReadWrite|IO_Truncate); | 63 | msg_cache.open(IO_ReadWrite|IO_Truncate); |
64 | last_msg_id = mail.getNumber(); | 64 | last_msg_id = mail.getNumber(); |
65 | err = mailsession_get_message(m_folder->fld_session, mail.getNumber(), &mailmsg); | 65 | err = mailsession_get_message(m_folder->fld_session, mail.getNumber(), &mailmsg); |
66 | err = mailmessage_fetch(mailmsg,&message,&length); | 66 | err = mailmessage_fetch(mailmsg,&message,&length); |
67 | msg_cache.writeBlock(message,length); | 67 | msg_cache.writeBlock(message,length); |
68 | } else { | 68 | } else { |
69 | QString msg=""; | 69 | QString msg=""; |
70 | msg_cache.open(IO_ReadOnly); | 70 | msg_cache.open(IO_ReadOnly); |
71 | message = new char[4096]; | 71 | message = new char[4096]; |
72 | memset(message,0,4096); | 72 | memset(message,0,4096); |
73 | while (msg_cache.readBlock(message,4095)>0) { | 73 | while (msg_cache.readBlock(message,4095)>0) { |
74 | msg+=message; | 74 | msg+=message; |
75 | memset(message,0,4096); | 75 | memset(message,0,4096); |
76 | } | 76 | } |
77 | delete message; | 77 | delete message; |
78 | message = (char*)malloc(msg.length()+1*sizeof(char)); | 78 | message = (char*)malloc(msg.length()+1*sizeof(char)); |
79 | memset(message,0,msg.length()+1); | 79 | memset(message,0,msg.length()+1); |
80 | memcpy(message,msg.latin1(),msg.length()); | 80 | memcpy(message,msg.latin1(),msg.length()); |
81 | /* transform to libetpan stuff */ | 81 | /* transform to libetpan stuff */ |
82 | mailmsg = mailmessage_new(); | 82 | mailmsg = mailmessage_new(); |
83 | mailmessage_init(mailmsg, NULL, data_message_driver, 0, strlen(message)); | 83 | mailmessage_init(mailmsg, NULL, data_message_driver, 0, strlen(message)); |
84 | generic_message_t * msg_data; | 84 | generic_message_t * msg_data; |
85 | msg_data = (generic_message_t *)mailmsg->msg_data; | 85 | msg_data = (generic_message_t *)mailmsg->msg_data; |
86 | msg_data->msg_fetched = 1; | 86 | msg_data->msg_fetched = 1; |
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 ) |
100 | { | 100 | { |
101 | login(); | 101 | login(); |
102 | if (!m_pop3) return; | 102 | if (!m_pop3) return; |
103 | uint32_t res_messages,res_recent,res_unseen; | 103 | uint32_t res_messages,res_recent,res_unseen; |
104 | mailsession_status_folder(m_folder->fld_session,"INBOX",&res_messages,&res_recent,&res_unseen); | 104 | mailsession_status_folder(m_folder->fld_session,"INBOX",&res_messages,&res_recent,&res_unseen); |
105 | parseList(target,m_folder->fld_session,"INBOX"); | 105 | parseList(target,m_folder->fld_session,"INBOX"); |
106 | Global::statusMessage( tr("Mailbox contains %1 mail(s)").arg(res_messages)); | 106 | Global::statusMessage( tr("Mailbox contains %1 mail(s)").arg(res_messages)); |
107 | } | 107 | } |
108 | 108 | ||
109 | void POP3wrapper::login() | 109 | void POP3wrapper::login() |
110 | { | 110 | { |
111 | /* we'll hold the line */ | 111 | /* we'll hold the line */ |
@@ -140,32 +140,33 @@ void POP3wrapper::login() | |||
140 | m_pop3=mailstorage_new(NULL); | 140 | m_pop3=mailstorage_new(NULL); |
141 | int conntype = (ssl?CONNECTION_TYPE_TLS:CONNECTION_TYPE_PLAIN); | 141 | int conntype = (ssl?CONNECTION_TYPE_TLS:CONNECTION_TYPE_PLAIN); |
142 | 142 | ||
143 | pop3_mailstorage_init(m_pop3,(char*)server,port,NULL,conntype,POP3_AUTH_TYPE_PLAIN, | 143 | pop3_mailstorage_init(m_pop3,(char*)server,port,NULL,conntype,POP3_AUTH_TYPE_PLAIN, |
144 | (char*)user,(char*)pass,0,0,0); | 144 | (char*)user,(char*)pass,0,0,0); |
145 | 145 | ||
146 | m_folder = mailfolder_new(m_pop3, NULL, NULL); | 146 | m_folder = mailfolder_new(m_pop3, NULL, NULL); |
147 | 147 | ||
148 | if (m_folder==0) { | 148 | if (m_folder==0) { |
149 | Global::statusMessage(tr("Error initializing folder")); | 149 | Global::statusMessage(tr("Error initializing folder")); |
150 | mailstorage_free(m_pop3); | 150 | mailstorage_free(m_pop3); |
151 | m_pop3 = NULL; | 151 | m_pop3 = NULL; |
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); |
160 | m_pop3 = 0; | 161 | m_pop3 = 0; |
161 | } | 162 | } |
162 | } | 163 | } |
163 | 164 | ||
164 | void POP3wrapper::logout() | 165 | void POP3wrapper::logout() |
165 | { | 166 | { |
166 | int err = MAILPOP3_NO_ERROR; | 167 | int err = MAILPOP3_NO_ERROR; |
167 | if ( m_pop3 == NULL ) return; | 168 | if ( m_pop3 == NULL ) return; |
168 | mailfolder_free(m_folder); | 169 | mailfolder_free(m_folder); |
169 | m_folder = 0; | 170 | m_folder = 0; |
170 | mailstorage_free(m_pop3); | 171 | mailstorage_free(m_pop3); |
171 | m_pop3 = 0; | 172 | m_pop3 = 0; |
@@ -201,50 +202,50 @@ int POP3wrapper::deleteAllMail(const Folder*) | |||
201 | if (!m_pop3) return 0; | 202 | if (!m_pop3) return 0; |
202 | int res = 1; | 203 | int res = 1; |
203 | 204 | ||
204 | uint32_t result = 0; | 205 | uint32_t result = 0; |
205 | int err = mailsession_messages_number(m_folder->fld_session,NULL,&result); | 206 | int err = mailsession_messages_number(m_folder->fld_session,NULL,&result); |
206 | if (err != MAIL_NO_ERROR) { | 207 | if (err != MAIL_NO_ERROR) { |
207 | Global::statusMessage(tr("Error getting folder info")); | 208 | Global::statusMessage(tr("Error getting folder info")); |
208 | return 0; | 209 | return 0; |
209 | } | 210 | } |
210 | for (unsigned int i = 0; i < result; ++i) { | 211 | for (unsigned int i = 0; i < result; ++i) { |
211 | err = mailsession_remove_message(m_folder->fld_session,i+1); | 212 | err = mailsession_remove_message(m_folder->fld_session,i+1); |
212 | if (err != MAIL_NO_ERROR) { | 213 | if (err != MAIL_NO_ERROR) { |
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&) |
222 | { | 223 | { |
223 | login(); | 224 | login(); |
224 | target_stat.message_count = 0; | 225 | target_stat.message_count = 0; |
225 | target_stat.message_unseen = 0; | 226 | target_stat.message_unseen = 0; |
226 | target_stat.message_recent = 0; | 227 | target_stat.message_recent = 0; |
227 | if (!m_pop3) return; | 228 | if (!m_pop3) return; |
228 | int r = mailsession_status_folder(m_folder->fld_session,0,&target_stat.message_count, | 229 | int r = mailsession_status_folder(m_folder->fld_session,0,&target_stat.message_count, |
229 | &target_stat.message_recent,&target_stat.message_unseen); | 230 | &target_stat.message_recent,&target_stat.message_unseen); |
230 | } | 231 | } |
231 | 232 | ||
232 | encodedString* POP3wrapper::fetchRawBody(const RecMail&mail) | 233 | encodedString* POP3wrapper::fetchRawBody(const RecMail&mail) |
233 | { | 234 | { |
234 | char*target=0; | 235 | char*target=0; |
235 | size_t length=0; | 236 | size_t length=0; |
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; |
245 | } | 246 | } |
246 | 247 | ||
247 | const QString&POP3wrapper::getType()const | 248 | const QString&POP3wrapper::getType()const |
248 | { | 249 | { |
249 | return account->getType(); | 250 | return account->getType(); |
250 | } | 251 | } |
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 | |||
@@ -51,50 +51,50 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
51 | /* | 51 | /* |
52 | syncFolders = new QAction( tr( "Sync mailfolders" ), ICON_SYNC, | 52 | syncFolders = new QAction( tr( "Sync mailfolders" ), ICON_SYNC, |
53 | 0, 0, this ); | 53 | 0, 0, this ); |
54 | syncFolders->addTo( toolBar ); | 54 | syncFolders->addTo( toolBar ); |
55 | syncFolders->addTo( mailMenu ); | 55 | syncFolders->addTo( mailMenu ); |
56 | */ | 56 | */ |
57 | 57 | ||
58 | showFolders = new QAction( tr( "Show/Hide folders" ), ICON_SHOWFOLDERS, | 58 | showFolders = new QAction( tr( "Show/Hide folders" ), ICON_SHOWFOLDERS, |
59 | 0, 0, this, 0, true ); | 59 | 0, 0, this, 0, true ); |
60 | showFolders->addTo( toolBar ); | 60 | showFolders->addTo( toolBar ); |
61 | showFolders->addTo( mailMenu ); | 61 | showFolders->addTo( mailMenu ); |
62 | showFolders->setOn( true ); | 62 | showFolders->setOn( true ); |
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 ); |
89 | 89 | ||
90 | QVBox* wrapperBox = new QVBox( this ); | 90 | QVBox* wrapperBox = new QVBox( this ); |
91 | setCentralWidget( wrapperBox ); | 91 | setCentralWidget( wrapperBox ); |
92 | 92 | ||
93 | QWidget *view = new QWidget( wrapperBox ); | 93 | QWidget *view = new QWidget( wrapperBox ); |
94 | 94 | ||
95 | layout = new QBoxLayout ( view, QBoxLayout::LeftToRight ); | 95 | layout = new QBoxLayout ( view, QBoxLayout::LeftToRight ); |
96 | 96 | ||
97 | folderView = new AccountView( view ); | 97 | folderView = new AccountView( view ); |
98 | folderView->header()->hide(); | 98 | folderView->header()->hide(); |
99 | folderView->setRootIsDecorated( true ); | 99 | folderView->setRootIsDecorated( true ); |
100 | folderView->addColumn( tr( "Mailbox" ) ); | 100 | folderView->addColumn( tr( "Mailbox" ) ); |
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 | |||
@@ -36,32 +36,33 @@ MailApplet::MailApplet( QWidget *parent ) | |||
36 | } | 36 | } |
37 | 37 | ||
38 | 38 | ||
39 | MailApplet::~MailApplet() { | 39 | MailApplet::~MailApplet() { |
40 | if ( m_statusMail ) | 40 | if ( m_statusMail ) |
41 | delete m_statusMail; | 41 | delete m_statusMail; |
42 | if ( m_config ) | 42 | if ( m_config ) |
43 | delete m_config; | 43 | delete m_config; |
44 | } | 44 | } |
45 | 45 | ||
46 | void MailApplet::paintEvent( QPaintEvent* ) { | 46 | void MailApplet::paintEvent( QPaintEvent* ) { |
47 | QPainter p( this ); | 47 | QPainter p( this ); |
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 | } |
56 | 57 | ||
57 | void MailApplet::mouseReleaseEvent( QMouseEvent* e ) { | 58 | void MailApplet::mouseReleaseEvent( QMouseEvent* e ) { |
58 | slotClicked(); | 59 | slotClicked(); |
59 | } | 60 | } |
60 | 61 | ||
61 | void MailApplet::slotClicked() { | 62 | void MailApplet::slotClicked() { |
62 | QCopEnvelope e( "QPE/System", "execute(QString)" ); | 63 | QCopEnvelope e( "QPE/System", "execute(QString)" ); |
63 | e << QString( "opiemail" ); | 64 | e << QString( "opiemail" ); |
64 | 65 | ||
65 | ODevice *device = ODevice::inst(); | 66 | ODevice *device = ODevice::inst(); |
66 | if ( !device-> ledList().isEmpty() ) { | 67 | if ( !device-> ledList().isEmpty() ) { |
67 | OLed led = ( device->ledList().contains( Led_Mail ) ) ? Led_Mail : device->ledList()[0]; | 68 | OLed led = ( device->ledList().contains( Led_Mail ) ) ? Led_Mail : device->ledList()[0]; |
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 | |||
@@ -35,33 +35,33 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) | |||
35 | reply->addTo(mailmenu); | 35 | reply->addTo(mailmenu); |
36 | 36 | ||
37 | forward = new QAction(tr("Forward"), QIconSet(Resource::loadPixmap("mail/forward")), 0, 0, this); | 37 | forward = new QAction(tr("Forward"), QIconSet(Resource::loadPixmap("mail/forward")), 0, 0, this); |
38 | forward->addTo(toolbar); | 38 | forward->addTo(toolbar); |
39 | forward->addTo(mailmenu); | 39 | forward->addTo(mailmenu); |
40 | 40 | ||
41 | attachbutton = new QAction(tr("Attachments"), QIconSet(Resource::loadPixmap("mail/attach")), 0, 0, this, 0, true); | 41 | attachbutton = new QAction(tr("Attachments"), QIconSet(Resource::loadPixmap("mail/attach")), 0, 0, this, 0, true); |
42 | attachbutton->addTo(toolbar); | 42 | attachbutton->addTo(toolbar); |
43 | attachbutton->addTo(mailmenu); | 43 | attachbutton->addTo(mailmenu); |
44 | connect(attachbutton, SIGNAL(toggled(bool)), SLOT(slotChangeAttachview(bool))); | 44 | connect(attachbutton, SIGNAL(toggled(bool)), SLOT(slotChangeAttachview(bool))); |
45 | 45 | ||
46 | 46 | ||
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); |
56 | setCentralWidget(view); | 56 | setCentralWidget(view); |
57 | 57 | ||
58 | attachments = new QListView(view); | 58 | attachments = new QListView(view); |
59 | attachments->setMinimumHeight(90); | 59 | attachments->setMinimumHeight(90); |
60 | attachments->setMaximumHeight(90); | 60 | attachments->setMaximumHeight(90); |
61 | attachments->setAllColumnsShowFocus(true); | 61 | attachments->setAllColumnsShowFocus(true); |
62 | attachments->addColumn("Mime Type", 60); | 62 | attachments->addColumn("Mime Type", 60); |
63 | attachments->addColumn(tr("Description"), 100); | 63 | attachments->addColumn(tr("Description"), 100); |
64 | attachments->addColumn(tr("Filename"), 80); | 64 | attachments->addColumn(tr("Filename"), 80); |
65 | attachments->addColumn(tr("Size"), 80); | 65 | attachments->addColumn(tr("Size"), 80); |
66 | attachments->setSorting(-1); | 66 | attachments->setSorting(-1); |
67 | attachments->hide(); | 67 | attachments->hide(); |
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 | |||