author | harlekin <harlekin> | 2004-01-04 02:35:03 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2004-01-04 02:35:03 (UTC) |
commit | d93529cebc9ea9ab4adf674e93e204f5a53d8906 (patch) (unidiff) | |
tree | 727ebb146a3518a2303d515c8e3e5e093397b9dc /noncore/net | |
parent | 55df8c221c43d81f6132d033553a173276954f7c (diff) | |
download | opie-d93529cebc9ea9ab4adf674e93e204f5a53d8906.zip opie-d93529cebc9ea9ab4adf674e93e204f5a53d8906.tar.gz opie-d93529cebc9ea9ab4adf674e93e204f5a53d8906.tar.bz2 |
adapt build system to lib etc and get it build
-rw-r--r-- | noncore/net/mail/config.in | 2 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/.cvsignore | 6 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/config.in | 4 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/libmailwrapper.pro | 44 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/mailwrapper.cpp | 15 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/settings.cpp | 36 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/smtpwrapper.cpp | 4 | ||||
-rw-r--r-- | noncore/net/mail/mail.pro | 26 | ||||
-rw-r--r-- | noncore/net/mail/mainwindow.cpp | 7 |
9 files changed, 99 insertions, 45 deletions
diff --git a/noncore/net/mail/config.in b/noncore/net/mail/config.in index 43ecc6f..b5173ae 100644 --- a/noncore/net/mail/config.in +++ b/noncore/net/mail/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config MAIL3 | 1 | config MAIL3 |
2 | boolean "opie-mail3 (a mail client)" | 2 | boolean "opie-mail3 (a mail client)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && LIBMAILWRAPPER |
diff --git a/noncore/net/mail/libmailwrapper/.cvsignore b/noncore/net/mail/libmailwrapper/.cvsignore new file mode 100644 index 0000000..581c299 --- a/dev/null +++ b/noncore/net/mail/libmailwrapper/.cvsignore | |||
@@ -0,0 +1,6 @@ | |||
1 | logindialogui.cpp | ||
2 | logindialogui.h | ||
3 | sendmailprogressui.cpp | ||
4 | sendmailprogressui.h | ||
5 | .moc | ||
6 | Makefile | ||
diff --git a/noncore/net/mail/libmailwrapper/config.in b/noncore/net/mail/libmailwrapper/config.in new file mode 100644 index 0000000..790891e --- a/dev/null +++ b/noncore/net/mail/libmailwrapper/config.in | |||
@@ -0,0 +1,4 @@ | |||
1 | config LIBMAILWRAPPER | ||
2 | boolean "libmailwrapper ( wrapper arround libetpan needed by mail3" | ||
3 | default "y" | ||
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | ||
diff --git a/noncore/net/mail/libmailwrapper/libmailwrapper.pro b/noncore/net/mail/libmailwrapper/libmailwrapper.pro new file mode 100644 index 0000000..4b4a4f1 --- a/dev/null +++ b/noncore/net/mail/libmailwrapper/libmailwrapper.pro | |||
@@ -0,0 +1,44 @@ | |||
1 | TEMPLATE = lib | ||
2 | CONFIG += qt warn_on debug | ||
3 | |||
4 | HEADERS = mailwrapper.h \ | ||
5 | imapwrapper.h \ | ||
6 | mailtypes.h \ | ||
7 | pop3wrapper.h \ | ||
8 | abstractmail.h \ | ||
9 | smtpwrapper.h \ | ||
10 | genericwrapper.h \ | ||
11 | mboxwrapper.h \ | ||
12 | settings.h \ | ||
13 | logindialog.h \ | ||
14 | sendmailprogress.h | ||
15 | |||
16 | SOURCES = imapwrapper.cpp \ | ||
17 | mailwrapper.cpp \ | ||
18 | mailtypes.cpp \ | ||
19 | pop3wrapper.cpp \ | ||
20 | abstractmail.cpp \ | ||
21 | smtpwrapper.cpp \ | ||
22 | genericwrapper.cpp \ | ||
23 | mboxwrapper.cpp \ | ||
24 | settings.cpp \ | ||
25 | logindialog.cpp \ | ||
26 | sendmailprogress.cpp | ||
27 | |||
28 | INTERFACES = logindialogui.ui \ | ||
29 | sendmailprogressui.ui | ||
30 | |||
31 | |||
32 | INCLUDEPATH += $(OPIEDIR)/include | ||
33 | |||
34 | CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) | ||
35 | contains( CONFTEST, y ){ | ||
36 | LIBS += -lqpe -letpan -lssl -lcrypto -liconv | ||
37 | }else{ | ||
38 | LIBS += -lqpe -letpan -lssl -lcrypto | ||
39 | } | ||
40 | |||
41 | DESTDIR = $(OPIEDIR)/lib$(PROJMAK) | ||
42 | TARGET = mailwrapper | ||
43 | |||
44 | include ( $(OPIEDIR)/include.pro ) | ||
diff --git a/noncore/net/mail/libmailwrapper/mailwrapper.cpp b/noncore/net/mail/libmailwrapper/mailwrapper.cpp index 9398823..75b9343 100644 --- a/noncore/net/mail/libmailwrapper/mailwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/mailwrapper.cpp | |||
@@ -2,18 +2,29 @@ | |||
2 | #include <sys/stat.h> | 2 | #include <sys/stat.h> |
3 | #include <sys/types.h> | 3 | #include <sys/types.h> |
4 | #include <unistd.h> | 4 | #include <unistd.h> |
5 | #include <fcntl.h> | 5 | #include <fcntl.h> |
6 | #include <string.h> | 6 | #include <string.h> |
7 | #include <qdir.h> | 7 | #include <qdir.h> |
8 | 8 | ||
9 | #include "mailwrapper.h" | 9 | #include "mailwrapper.h" |
10 | #include "logindialog.h" | 10 | //#include "logindialog.h" |
11 | #include "defines.h" | 11 | //#include "defines.h" |
12 | |||
13 | #define UNDEFINED 64 | ||
14 | #define MAXLINE 76 | ||
15 | #define UTF16MASK 0x03FFUL | ||
16 | #define UTF16SHIFT 10 | ||
17 | #define UTF16BASE 0x10000UL | ||
18 | #define UTF16HIGHSTART 0xD800UL | ||
19 | #define UTF16HIGHEND 0xDBFFUL | ||
20 | #define UTF16LOSTART 0xDC00UL | ||
21 | #define UTF16LOEND 0xDFFFUL | ||
22 | |||
12 | 23 | ||
13 | Attachment::Attachment( DocLnk lnk ) | 24 | Attachment::Attachment( DocLnk lnk ) |
14 | { | 25 | { |
15 | doc = lnk; | 26 | doc = lnk; |
16 | size = QFileInfo( doc.file() ).size(); | 27 | size = QFileInfo( doc.file() ).size(); |
17 | } | 28 | } |
18 | 29 | ||
19 | Folder::Folder(const QString&tmp_name, const QString&sep ) | 30 | Folder::Folder(const QString&tmp_name, const QString&sep ) |
diff --git a/noncore/net/mail/libmailwrapper/settings.cpp b/noncore/net/mail/libmailwrapper/settings.cpp index 17aa1b0..c5187f5 100644 --- a/noncore/net/mail/libmailwrapper/settings.cpp +++ b/noncore/net/mail/libmailwrapper/settings.cpp | |||
@@ -1,15 +1,25 @@ | |||
1 | #include <stdlib.h> | 1 | #include <stdlib.h> |
2 | #include <qdir.h> | 2 | #include <qdir.h> |
3 | 3 | ||
4 | #include <qpe/config.h> | 4 | #include <qpe/config.h> |
5 | 5 | ||
6 | #include "settings.h" | 6 | #include "settings.h" |
7 | #include "defines.h" | 7 | //#include "defines.h" |
8 | |||
9 | #define IMAP_PORT "143" | ||
10 | #define IMAP_SSL_PORT "993" | ||
11 | #define SMTP_PORT "25" | ||
12 | #define SMTP_SSL_PORT "465" | ||
13 | #define POP3_PORT "110" | ||
14 | #define POP3_SSL_PORT "995" | ||
15 | #define NNTP_PORT "119" | ||
16 | #define NNTP_SSL_PORT "563" | ||
17 | |||
8 | 18 | ||
9 | Settings::Settings() | 19 | Settings::Settings() |
10 | : QObject() | 20 | : QObject() |
11 | { | 21 | { |
12 | updateAccounts(); | 22 | updateAccounts(); |
13 | } | 23 | } |
14 | 24 | ||
15 | void Settings::checkDirectory() | 25 | void Settings::checkDirectory() |
@@ -57,40 +67,40 @@ void Settings::updateAccounts() | |||
57 | } | 67 | } |
58 | 68 | ||
59 | QStringList smtp = dir.entryList( "smtp-*" ); | 69 | QStringList smtp = dir.entryList( "smtp-*" ); |
60 | for ( it = smtp.begin(); it != smtp.end(); it++ ) { | 70 | for ( it = smtp.begin(); it != smtp.end(); it++ ) { |
61 | qDebug( "Added SMTP account" ); | 71 | qDebug( "Added SMTP account" ); |
62 | SMTPaccount *account = new SMTPaccount( (*it).replace(0, 5, "") ); | 72 | SMTPaccount *account = new SMTPaccount( (*it).replace(0, 5, "") ); |
63 | accounts.append( account ); | 73 | accounts.append( account ); |
64 | } | 74 | } |
65 | 75 | ||
66 | QStringList nntp = dir.entryList( "nntp-*" ); | 76 | QStringList nntp = dir.entryList( "nntp-*" ); |
67 | for ( it = nntp.begin(); it != nntp.end(); it++ ) { | 77 | for ( it = nntp.begin(); it != nntp.end(); it++ ) { |
68 | qDebug( "Added NNTP account" ); | 78 | qDebug( "Added NNTP account" ); |
69 | NNTPaccount *account = new NNTPaccount( (*it).replace(0, 5, "") ); | 79 | NNTPaccount *account = new NNTPaccount( (*it).replace(0, 5, "") ); |
70 | accounts.append( account ); | 80 | accounts.append( account ); |
71 | } | 81 | } |
72 | 82 | ||
73 | readAccounts(); | 83 | readAccounts(); |
74 | } | 84 | } |
75 | 85 | ||
76 | void Settings::saveAccounts() | 86 | void Settings::saveAccounts() |
77 | { | 87 | { |
78 | checkDirectory(); | 88 | checkDirectory(); |
79 | Account *it; | 89 | Account *it; |
80 | 90 | ||
81 | for ( it = accounts.first(); it; it = accounts.next() ) { | 91 | for ( it = accounts.first(); it; it = accounts.next() ) { |
82 | it->save(); | 92 | it->save(); |
83 | } | 93 | } |
84 | } | 94 | } |
85 | 95 | ||
86 | void Settings::readAccounts() | 96 | void Settings::readAccounts() |
87 | { | 97 | { |
88 | checkDirectory(); | 98 | checkDirectory(); |
89 | Account *it; | 99 | Account *it; |
90 | 100 | ||
91 | for ( it = accounts.first(); it; it = accounts.next() ) { | 101 | for ( it = accounts.first(); it; it = accounts.next() ) { |
92 | it->read(); | 102 | it->read(); |
93 | } | 103 | } |
94 | } | 104 | } |
95 | 105 | ||
96 | Account::Account() | 106 | Account::Account() |
@@ -125,17 +135,17 @@ IMAPaccount::IMAPaccount( QString filename ) | |||
125 | type = "IMAP"; | 135 | type = "IMAP"; |
126 | port = IMAP_PORT; | 136 | port = IMAP_PORT; |
127 | } | 137 | } |
128 | 138 | ||
129 | QString IMAPaccount::getUniqueFileName() | 139 | QString IMAPaccount::getUniqueFileName() |
130 | { | 140 | { |
131 | int num = 0; | 141 | int num = 0; |
132 | QString unique; | 142 | QString unique; |
133 | 143 | ||
134 | QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" ); | 144 | QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" ); |
135 | 145 | ||
136 | QStringList imap = dir.entryList( "imap-*" ); | 146 | QStringList imap = dir.entryList( "imap-*" ); |
137 | do { | 147 | do { |
138 | unique.setNum( num++ ); | 148 | unique.setNum( num++ ); |
139 | } while ( imap.contains( "imap-" + unique ) > 0 ); | 149 | } while ( imap.contains( "imap-" + unique ) > 0 ); |
140 | 150 | ||
141 | return unique; | 151 | return unique; |
@@ -159,17 +169,17 @@ void IMAPaccount::read() | |||
159 | prefix = conf->readEntry("MailPrefix",""); | 169 | prefix = conf->readEntry("MailPrefix",""); |
160 | if (prefix.isNull()) prefix = ""; | 170 | if (prefix.isNull()) prefix = ""; |
161 | } | 171 | } |
162 | 172 | ||
163 | void IMAPaccount::save() | 173 | void IMAPaccount::save() |
164 | { | 174 | { |
165 | qDebug( "saving " + getFileName() ); | 175 | qDebug( "saving " + getFileName() ); |
166 | Settings::checkDirectory(); | 176 | Settings::checkDirectory(); |
167 | 177 | ||
168 | Config *conf = new Config( getFileName(), Config::File ); | 178 | Config *conf = new Config( getFileName(), Config::File ); |
169 | conf->setGroup( "IMAP Account" ); | 179 | conf->setGroup( "IMAP Account" ); |
170 | conf->writeEntry( "Account", accountName ); | 180 | conf->writeEntry( "Account", accountName ); |
171 | conf->writeEntry( "Server", server ); | 181 | conf->writeEntry( "Server", server ); |
172 | conf->writeEntry( "Port", port ); | 182 | conf->writeEntry( "Port", port ); |
173 | conf->writeEntry( "SSL", ssl ); | 183 | conf->writeEntry( "SSL", ssl ); |
174 | conf->writeEntry( "User", user ); | 184 | conf->writeEntry( "User", user ); |
175 | conf->writeEntryCrypt( "Password", password ); | 185 | conf->writeEntryCrypt( "Password", password ); |
@@ -202,17 +212,17 @@ POP3account::POP3account( QString filename ) | |||
202 | type = "POP3"; | 212 | type = "POP3"; |
203 | port = POP3_PORT; | 213 | port = POP3_PORT; |
204 | } | 214 | } |
205 | 215 | ||
206 | QString POP3account::getUniqueFileName() | 216 | QString POP3account::getUniqueFileName() |
207 | { | 217 | { |
208 | int num = 0; | 218 | int num = 0; |
209 | QString unique; | 219 | QString unique; |
210 | 220 | ||
211 | QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" ); | 221 | QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" ); |
212 | 222 | ||
213 | QStringList imap = dir.entryList( "pop3-*" ); | 223 | QStringList imap = dir.entryList( "pop3-*" ); |
214 | do { | 224 | do { |
215 | unique.setNum( num++ ); | 225 | unique.setNum( num++ ); |
216 | } while ( imap.contains( "pop3-" + unique ) > 0 ); | 226 | } while ( imap.contains( "pop3-" + unique ) > 0 ); |
217 | 227 | ||
218 | return unique; | 228 | return unique; |
@@ -229,17 +239,17 @@ void POP3account::read() | |||
229 | user = conf->readEntry( "User" ); | 239 | user = conf->readEntry( "User" ); |
230 | password = conf->readEntryCrypt( "Password" ); | 240 | password = conf->readEntryCrypt( "Password" ); |
231 | } | 241 | } |
232 | 242 | ||
233 | void POP3account::save() | 243 | void POP3account::save() |
234 | { | 244 | { |
235 | qDebug( "saving " + getFileName() ); | 245 | qDebug( "saving " + getFileName() ); |
236 | Settings::checkDirectory(); | 246 | Settings::checkDirectory(); |
237 | 247 | ||
238 | Config *conf = new Config( getFileName(), Config::File ); | 248 | Config *conf = new Config( getFileName(), Config::File ); |
239 | conf->setGroup( "POP3 Account" ); | 249 | conf->setGroup( "POP3 Account" ); |
240 | conf->writeEntry( "Account", accountName ); | 250 | conf->writeEntry( "Account", accountName ); |
241 | conf->writeEntry( "Server", server ); | 251 | conf->writeEntry( "Server", server ); |
242 | conf->writeEntry( "Port", port ); | 252 | conf->writeEntry( "Port", port ); |
243 | conf->writeEntry( "SSL", ssl ); | 253 | conf->writeEntry( "SSL", ssl ); |
244 | conf->writeEntry( "User", user ); | 254 | conf->writeEntry( "User", user ); |
245 | conf->writeEntryCrypt( "Password", password ); | 255 | conf->writeEntryCrypt( "Password", password ); |
@@ -276,17 +286,17 @@ SMTPaccount::SMTPaccount( QString filename ) | |||
276 | type = "SMTP"; | 286 | type = "SMTP"; |
277 | port = SMTP_PORT; | 287 | port = SMTP_PORT; |
278 | } | 288 | } |
279 | 289 | ||
280 | QString SMTPaccount::getUniqueFileName() | 290 | QString SMTPaccount::getUniqueFileName() |
281 | { | 291 | { |
282 | int num = 0; | 292 | int num = 0; |
283 | QString unique; | 293 | QString unique; |
284 | 294 | ||
285 | QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" ); | 295 | QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" ); |
286 | 296 | ||
287 | QStringList imap = dir.entryList( "smtp-*" ); | 297 | QStringList imap = dir.entryList( "smtp-*" ); |
288 | do { | 298 | do { |
289 | unique.setNum( num++ ); | 299 | unique.setNum( num++ ); |
290 | } while ( imap.contains( "smtp-" + unique ) > 0 ); | 300 | } while ( imap.contains( "smtp-" + unique ) > 0 ); |
291 | 301 | ||
292 | return unique; | 302 | return unique; |
@@ -304,17 +314,17 @@ void SMTPaccount::read() | |||
304 | user = conf->readEntry( "User" ); | 314 | user = conf->readEntry( "User" ); |
305 | password = conf->readEntryCrypt( "Password" ); | 315 | password = conf->readEntryCrypt( "Password" ); |
306 | } | 316 | } |
307 | 317 | ||
308 | void SMTPaccount::save() | 318 | void SMTPaccount::save() |
309 | { | 319 | { |
310 | qDebug( "saving " + getFileName() ); | 320 | qDebug( "saving " + getFileName() ); |
311 | Settings::checkDirectory(); | 321 | Settings::checkDirectory(); |
312 | 322 | ||
313 | Config *conf = new Config( getFileName(), Config::File ); | 323 | Config *conf = new Config( getFileName(), Config::File ); |
314 | conf->setGroup( "SMTP Account" ); | 324 | conf->setGroup( "SMTP Account" ); |
315 | conf->writeEntry( "Account", accountName ); | 325 | conf->writeEntry( "Account", accountName ); |
316 | conf->writeEntry( "Server", server ); | 326 | conf->writeEntry( "Server", server ); |
317 | conf->writeEntry( "Port", port ); | 327 | conf->writeEntry( "Port", port ); |
318 | conf->writeEntry( "SSL", ssl ); | 328 | conf->writeEntry( "SSL", ssl ); |
319 | conf->writeEntry( "Login", login ); | 329 | conf->writeEntry( "Login", login ); |
320 | conf->writeEntry( "User", user ); | 330 | conf->writeEntry( "User", user ); |
@@ -349,17 +359,17 @@ NNTPaccount::NNTPaccount( QString filename ) | |||
349 | type = "NNTP"; | 359 | type = "NNTP"; |
350 | port = NNTP_PORT; | 360 | port = NNTP_PORT; |
351 | } | 361 | } |
352 | 362 | ||
353 | QString NNTPaccount::getUniqueFileName() | 363 | QString NNTPaccount::getUniqueFileName() |
354 | { | 364 | { |
355 | int num = 0; | 365 | int num = 0; |
356 | QString unique; | 366 | QString unique; |
357 | 367 | ||
358 | QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" ); | 368 | QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" ); |
359 | 369 | ||
360 | QStringList imap = dir.entryList( "nntp-*" ); | 370 | QStringList imap = dir.entryList( "nntp-*" ); |
361 | do { | 371 | do { |
362 | unique.setNum( num++ ); | 372 | unique.setNum( num++ ); |
363 | } while ( imap.contains( "nntp-" + unique ) > 0 ); | 373 | } while ( imap.contains( "nntp-" + unique ) > 0 ); |
364 | 374 | ||
365 | return unique; | 375 | return unique; |
@@ -377,17 +387,17 @@ void NNTPaccount::read() | |||
377 | user = conf->readEntry( "User" ); | 387 | user = conf->readEntry( "User" ); |
378 | password = conf->readEntryCrypt( "Password" ); | 388 | password = conf->readEntryCrypt( "Password" ); |
379 | } | 389 | } |
380 | 390 | ||
381 | void NNTPaccount::save() | 391 | void NNTPaccount::save() |
382 | { | 392 | { |
383 | qDebug( "saving " + getFileName() ); | 393 | qDebug( "saving " + getFileName() ); |
384 | Settings::checkDirectory(); | 394 | Settings::checkDirectory(); |
385 | 395 | ||
386 | Config *conf = new Config( getFileName(), Config::File ); | 396 | Config *conf = new Config( getFileName(), Config::File ); |
387 | conf->setGroup( "NNTP Account" ); | 397 | conf->setGroup( "NNTP Account" ); |
388 | conf->writeEntry( "Account", accountName ); | 398 | conf->writeEntry( "Account", accountName ); |
389 | conf->writeEntry( "Server", server ); | 399 | conf->writeEntry( "Server", server ); |
390 | conf->writeEntry( "Port", port ); | 400 | conf->writeEntry( "Port", port ); |
391 | conf->writeEntry( "SSL", ssl ); | 401 | conf->writeEntry( "SSL", ssl ); |
392 | conf->writeEntry( "Login", login ); | 402 | conf->writeEntry( "Login", login ); |
393 | conf->writeEntry( "User", user ); | 403 | conf->writeEntry( "User", user ); |
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp index 7e03af9..b9c4ff2 100644 --- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp | |||
@@ -12,19 +12,21 @@ | |||
12 | 12 | ||
13 | #include <libetpan/libetpan.h> | 13 | #include <libetpan/libetpan.h> |
14 | 14 | ||
15 | #include "smtpwrapper.h" | 15 | #include "smtpwrapper.h" |
16 | #include "mailwrapper.h" | 16 | #include "mailwrapper.h" |
17 | #include "mboxwrapper.h" | 17 | #include "mboxwrapper.h" |
18 | #include "logindialog.h" | 18 | #include "logindialog.h" |
19 | #include "mailtypes.h" | 19 | #include "mailtypes.h" |
20 | #include "defines.h" | 20 | //#include "defines.h" |
21 | #include "sendmailprogress.h" | 21 | #include "sendmailprogress.h" |
22 | 22 | ||
23 | #define USER_AGENT "OpieMail v0.1" | ||
24 | |||
23 | progressMailSend*SMTPwrapper::sendProgress = 0; | 25 | progressMailSend*SMTPwrapper::sendProgress = 0; |
24 | 26 | ||
25 | SMTPwrapper::SMTPwrapper( Settings *s ) | 27 | SMTPwrapper::SMTPwrapper( Settings *s ) |
26 | : QObject() | 28 | : QObject() |
27 | { | 29 | { |
28 | settings = s; | 30 | settings = s; |
29 | Config cfg( "mail" ); | 31 | Config cfg( "mail" ); |
30 | cfg.setGroup( "Status" ); | 32 | cfg.setGroup( "Status" ); |
diff --git a/noncore/net/mail/mail.pro b/noncore/net/mail/mail.pro index 2c15a7b..69e1450 100644 --- a/noncore/net/mail/mail.pro +++ b/noncore/net/mail/mail.pro | |||
@@ -1,76 +1,52 @@ | |||
1 | CONFIG += qt warn_on debug quick-app | 1 | CONFIG += qt warn_on debug quick-app |
2 | 2 | ||
3 | HEADERS = defines.h \ | 3 | HEADERS = defines.h \ |
4 | logindialog.h \ | ||
5 | settings.h \ | ||
6 | editaccounts.h \ | 4 | editaccounts.h \ |
7 | mailwrapper.h \ | ||
8 | composemail.h \ | 5 | composemail.h \ |
9 | accountview.h \ | 6 | accountview.h \ |
10 | mainwindow.h \ | 7 | mainwindow.h \ |
11 | viewmail.h \ | 8 | viewmail.h \ |
12 | viewmailbase.h \ | 9 | viewmailbase.h \ |
13 | opiemail.h \ | 10 | opiemail.h \ |
14 | imapwrapper.h \ | ||
15 | mailtypes.h \ | ||
16 | mailistviewitem.h \ | 11 | mailistviewitem.h \ |
17 | pop3wrapper.h \ | ||
18 | abstractmail.h \ | ||
19 | settingsdialog.h \ | 12 | settingsdialog.h \ |
20 | statuswidget.h \ | 13 | statuswidget.h \ |
21 | smtpwrapper.h \ | ||
22 | genericwrapper.h \ | ||
23 | mboxwrapper.h \ | ||
24 | sendmailprogress.h \ | ||
25 | newmaildir.h | 14 | newmaildir.h |
26 | 15 | ||
27 | SOURCES = main.cpp \ | 16 | SOURCES = main.cpp \ |
28 | opiemail.cpp \ | 17 | opiemail.cpp \ |
29 | mainwindow.cpp \ | 18 | mainwindow.cpp \ |
30 | accountview.cpp \ | 19 | accountview.cpp \ |
31 | composemail.cpp \ | 20 | composemail.cpp \ |
32 | mailwrapper.cpp \ | ||
33 | imapwrapper.cpp \ | ||
34 | addresspicker.cpp \ | 21 | addresspicker.cpp \ |
35 | editaccounts.cpp \ | 22 | editaccounts.cpp \ |
36 | logindialog.cpp \ | ||
37 | viewmail.cpp \ | 23 | viewmail.cpp \ |
38 | viewmailbase.cpp \ | 24 | viewmailbase.cpp \ |
39 | settings.cpp \ | ||
40 | mailtypes.cpp \ | ||
41 | pop3wrapper.cpp \ | ||
42 | abstractmail.cpp \ | ||
43 | settingsdialog.cpp \ | 25 | settingsdialog.cpp \ |
44 | statuswidget.cpp \ | 26 | statuswidget.cpp \ |
45 | smtpwrapper.cpp \ | ||
46 | genericwrapper.cpp \ | ||
47 | mboxwrapper.cpp \ | ||
48 | sendmailprogress.cpp \ | ||
49 | newmaildir.cpp | 27 | newmaildir.cpp |
50 | 28 | ||
51 | INTERFACES = editaccountsui.ui \ | 29 | INTERFACES = editaccountsui.ui \ |
52 | selectmailtypeui.ui \ | 30 | selectmailtypeui.ui \ |
53 | imapconfigui.ui \ | 31 | imapconfigui.ui \ |
54 | pop3configui.ui \ | 32 | pop3configui.ui \ |
55 | nntpconfigui.ui \ | 33 | nntpconfigui.ui \ |
56 | smtpconfigui.ui \ | 34 | smtpconfigui.ui \ |
57 | addresspickerui.ui \ | 35 | addresspickerui.ui \ |
58 | logindialogui.ui \ | ||
59 | composemailui.ui \ | 36 | composemailui.ui \ |
60 | settingsdialogui.ui \ | 37 | settingsdialogui.ui \ |
61 | statuswidgetui.ui \ | 38 | statuswidgetui.ui \ |
62 | sendmailprogressui.ui \ | ||
63 | newmaildirui.ui | 39 | newmaildirui.ui |
64 | 40 | ||
65 | INCLUDEPATH += $(OPIEDIR)/include | 41 | INCLUDEPATH += $(OPIEDIR)/include |
66 | 42 | ||
67 | CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) | 43 | CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) |
68 | contains( CONFTEST, y ){ | 44 | contains( CONFTEST, y ){ |
69 | LIBS += -lqpe -letpan -lssl -lcrypto -lopie -liconv | 45 | LIBS += -lqpe -letpan -lssl -lcrypto -lopie -liconv |
70 | }else{ | 46 | }else{ |
71 | LIBS += -lqpe -letpan -lssl -lcrypto -lopie | 47 | LIBS += -lqpe -lopie -llibmailwrapper |
72 | } | 48 | } |
73 | 49 | ||
74 | TARGET = opiemail | 50 | TARGET = opiemail |
75 | 51 | ||
76 | include ( $(OPIEDIR)/include.pro ) | 52 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp index 2a74286..6511b1f 100644 --- a/noncore/net/mail/mainwindow.cpp +++ b/noncore/net/mail/mainwindow.cpp | |||
@@ -14,16 +14,17 @@ | |||
14 | #include "viewmail.h" | 14 | #include "viewmail.h" |
15 | #include "mailtypes.h" | 15 | #include "mailtypes.h" |
16 | #include "mailistviewitem.h" | 16 | #include "mailistviewitem.h" |
17 | 17 | ||
18 | 18 | ||
19 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | 19 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) |
20 | : QMainWindow( parent, name, flags ) | 20 | : QMainWindow( parent, name, flags ) |
21 | { | 21 | { |
22 | |||
22 | setCaption( tr( "Mail" ) ); | 23 | setCaption( tr( "Mail" ) ); |
23 | setToolBarsMovable( false ); | 24 | setToolBarsMovable( false ); |
24 | 25 | ||
25 | toolBar = new QToolBar( this ); | 26 | toolBar = new QToolBar( this ); |
26 | menuBar = new QMenuBar( toolBar ); | 27 | menuBar = new QMenuBar( toolBar ); |
27 | mailMenu = new QPopupMenu( menuBar ); | 28 | mailMenu = new QPopupMenu( menuBar ); |
28 | menuBar->insertItem( tr( "Mail" ), mailMenu ); | 29 | menuBar->insertItem( tr( "Mail" ), mailMenu ); |
29 | settingsMenu = new QPopupMenu( menuBar ); | 30 | settingsMenu = new QPopupMenu( menuBar ); |
@@ -111,24 +112,24 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
111 | statusWidget = new StatusWidget( wrapperBox ); | 112 | statusWidget = new StatusWidget( wrapperBox ); |
112 | statusWidget->hide(); | 113 | statusWidget->hide(); |
113 | 114 | ||
114 | layout->addWidget( mailView ); | 115 | layout->addWidget( mailView ); |
115 | layout->setStretchFactor( folderView, 1 ); | 116 | layout->setStretchFactor( folderView, 1 ); |
116 | layout->setStretchFactor( mailView, 2 ); | 117 | layout->setStretchFactor( mailView, 2 ); |
117 | 118 | ||
118 | slotAdjustLayout(); | 119 | slotAdjustLayout(); |
119 | 120 | ||
120 | QPEApplication::setStylusOperation( mailView->viewport(),QPEApplication::RightOnHold); | 121 | QPEApplication::setStylusOperation( mailView->viewport(),QPEApplication::RightOnHold); |
121 | QPEApplication::setStylusOperation( folderView->viewport(),QPEApplication::RightOnHold); | 122 | QPEApplication::setStylusOperation( folderView->viewport(),QPEApplication::RightOnHold); |
122 | 123 | ||
123 | connect( mailView, SIGNAL( mouseButtonClicked(int, QListViewItem *,const QPoint&,int ) ),this, | 124 | connect( mailView, SIGNAL( mouseButtonClicked(int, QListViewItem *,const QPoint&,int ) ),this, |
124 | SLOT( mailLeftClicked( int, QListViewItem *,const QPoint&,int ) ) ); | 125 | SLOT( mailLeftClicked( int, QListViewItem *,const QPoint&,int ) ) ); |
125 | connect( mailView, SIGNAL( mouseButtonPressed(int, QListViewItem *,const QPoint&,int ) ),this, | 126 | connect( mailView, SIGNAL( mouseButtonPressed(int, QListViewItem *,const QPoint&,int ) ),this, |
126 | SLOT( mailHold( int, QListViewItem *,const QPoint&,int ) ) ); | 127 | SLOT( mailHold( int, QListViewItem *,const QPoint&,int ) ) ); |
127 | connect(folderView, SIGNAL(refreshMailview(QList<RecMail>*)),this,SLOT(refreshMailView(QList<RecMail>*))); | 128 | connect(folderView, SIGNAL(refreshMailview(QList<RecMail>*)),this,SLOT(refreshMailView(QList<RecMail>*))); |
128 | 129 | ||
129 | QTimer::singleShot( 1000, this, SLOT( slotAdjustColumns() ) ); | 130 | QTimer::singleShot( 1000, this, SLOT( slotAdjustColumns() ) ); |
130 | } | 131 | } |
131 | 132 | ||
132 | 133 | ||
133 | void MainWindow::slotAdjustLayout() { | 134 | void MainWindow::slotAdjustLayout() { |
134 | 135 | ||