-rw-r--r-- | noncore/unsupported/mailit/emailclient.cpp | 322 | ||||
-rw-r--r-- | noncore/unsupported/mailit/emaillistitem.cpp | 73 | ||||
-rw-r--r-- | noncore/unsupported/mailit/emaillistitem.h | 3 | ||||
-rw-r--r-- | noncore/unsupported/mailit/mailit.pro | 6 | ||||
-rw-r--r-- | noncore/unsupported/mailit/mailitwindow.h | 1 | ||||
-rw-r--r-- | noncore/unsupported/mailit/main.cpp | 10 |
6 files changed, 234 insertions, 181 deletions
diff --git a/noncore/unsupported/mailit/emailclient.cpp b/noncore/unsupported/mailit/emailclient.cpp index 90664bb..8359acf 100644 --- a/noncore/unsupported/mailit/emailclient.cpp +++ b/noncore/unsupported/mailit/emailclient.cpp | |||
@@ -43,8 +43,8 @@ MailAccount* AccountList::dupl(MailAccount *in) | |||
43 | EmailClient::EmailClient( QWidget* parent, const char* name, WFlags fl ) | 43 | EmailClient::EmailClient( QWidget* parent, const char* name, WFlags fl ) |
44 | : QMainWindow( parent, name, fl ) | 44 | : QMainWindow( parent, name, fl ) |
45 | { | 45 | { |
46 | emailHandler = new EmailHandler(); | 46 | emailHandler = new EmailHandler(); |
47 | addressList = new AddressList(); | 47 | addressList = new AddressList(); |
48 | 48 | ||
49 | sending = FALSE; | 49 | sending = FALSE; |
50 | receiving = FALSE; | 50 | receiving = FALSE; |
@@ -53,19 +53,19 @@ EmailClient::EmailClient( QWidget* parent, const char* name, WFlags fl ) | |||
53 | accountIdCount = 1; | 53 | accountIdCount = 1; |
54 | allAccounts = FALSE; | 54 | allAccounts = FALSE; |
55 | 55 | ||
56 | init(); | 56 | init(); |
57 | 57 | ||
58 | 58 | ||
59 | 59 | ||
60 | connect(emailHandler, SIGNAL(mailSent()), this, SLOT(mailSent()) ); | 60 | connect(emailHandler, SIGNAL(mailSent()), this, SLOT(mailSent()) ); |
61 | 61 | ||
62 | connect(emailHandler, SIGNAL(smtpError(int,const QString &)), this, | 62 | connect(emailHandler, SIGNAL(smtpError(int,const QString &)), this, |
63 | SLOT(smtpError(int,const QString &)) ); | 63 | SLOT(smtpError(int,const QString &)) ); |
64 | connect(emailHandler, SIGNAL(popError(int,const QString &)), this, | 64 | connect(emailHandler, SIGNAL(popError(int,const QString &)), this, |
65 | SLOT(popError(int,const QString &)) ); | 65 | SLOT(popError(int,const QString &)) ); |
66 | 66 | ||
67 | connect(inboxView, SIGNAL(doubleClicked(QListViewItem *)), this, SLOT(inboxItemSelected()) ); | 67 | connect(inboxView, SIGNAL(doubleClicked(QListViewItem *)), this, SLOT(inboxItemSelected()) ); |
68 | connect(outboxView, SIGNAL(doubleClicked(QListViewItem *)), this, SLOT(outboxItemSelected()) ); | 68 | connect(outboxView, SIGNAL(doubleClicked(QListViewItem *)), this, SLOT(outboxItemSelected()) ); |
69 | 69 | ||
70 | connect(inboxView, SIGNAL(pressed(QListViewItem *)), this, SLOT(inboxItemPressed()) ); | 70 | connect(inboxView, SIGNAL(pressed(QListViewItem *)), this, SLOT(inboxItemPressed()) ); |
71 | connect(inboxView, SIGNAL(clicked(QListViewItem *)), this, SLOT(inboxItemReleased()) ); | 71 | connect(inboxView, SIGNAL(clicked(QListViewItem *)), this, SLOT(inboxItemReleased()) ); |
@@ -75,18 +75,18 @@ EmailClient::EmailClient( QWidget* parent, const char* name, WFlags fl ) | |||
75 | connect(emailHandler, SIGNAL(mailTransfered(int)), this, | 75 | connect(emailHandler, SIGNAL(mailTransfered(int)), this, |
76 | SLOT(allMailArrived(int)) ); | 76 | SLOT(allMailArrived(int)) ); |
77 | 77 | ||
78 | mailconf = new Config("mailit"); | 78 | mailconf = new Config("mailit"); |
79 | //In case Synchronize is not defined in settings.txt | 79 | //In case Synchronize is not defined in settings.txt |
80 | 80 | ||
81 | readSettings(); | 81 | readSettings(); |
82 | 82 | ||
83 | updateAccounts(); | 83 | updateAccounts(); |
84 | 84 | ||
85 | lineShift = "\n"; | 85 | lineShift = "\n"; |
86 | readMail(); | 86 | readMail(); |
87 | lineShift = "\r\n"; | 87 | lineShift = "\r\n"; |
88 | 88 | ||
89 | mailboxView->setCurrentTab(0); //ensure that inbox has focus | 89 | mailboxView->setCurrentTab(0); //ensure that inbox has focus |
90 | 90 | ||
91 | /*channel = new QCopChannel( "QPE/Application/mailit", this ); | 91 | /*channel = new QCopChannel( "QPE/Application/mailit", this ); |
92 | connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), | 92 | connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), |
@@ -105,8 +105,8 @@ EmailClient::~EmailClient() | |||
105 | saveMail(getPath(FALSE) + "outbox.txt", outboxView); | 105 | saveMail(getPath(FALSE) + "outbox.txt", outboxView); |
106 | saveSettings(); | 106 | saveSettings(); |
107 | 107 | ||
108 | mailconf->write(); | 108 | mailconf->write(); |
109 | delete mailconf; | 109 | delete mailconf; |
110 | 110 | ||
111 | } | 111 | } |
112 | 112 | ||
@@ -114,7 +114,7 @@ void EmailClient::init() | |||
114 | { | 114 | { |
115 | initStatusBar(this); | 115 | initStatusBar(this); |
116 | 116 | ||
117 | setToolBarsMovable(FALSE); | 117 | setToolBarsMovable(FALSE); |
118 | 118 | ||
119 | bar = new QToolBar(this); | 119 | bar = new QToolBar(this); |
120 | QWhatsThis::add(bar,tr("Main operation toolbar")); | 120 | QWhatsThis::add(bar,tr("Main operation toolbar")); |
@@ -128,5 +128,5 @@ void EmailClient::init() | |||
128 | QPopupMenu *configure = new QPopupMenu(mb); | 128 | QPopupMenu *configure = new QPopupMenu(mb); |
129 | mb->insertItem( tr( "Accounts" ), configure); | 129 | mb->insertItem( tr( "Accounts" ), configure); |
130 | 130 | ||
131 | selectAccountMenu = new QPopupMenu(mb); | 131 | selectAccountMenu = new QPopupMenu(mb); |
132 | editAccountMenu = new QPopupMenu(mb); | 132 | editAccountMenu = new QPopupMenu(mb); |
@@ -143,5 +143,5 @@ void EmailClient::init() | |||
143 | 143 | ||
144 | getMailButton->setPopup(selectAccountMenu); | 144 | getMailButton->setPopup(selectAccountMenu); |
145 | 145 | ||
146 | sendMailButton = new QAction(tr("Send mail"), Resource::loadPixmap("mailit/sendqueue"), QString::null, 0, this, 0); | 146 | sendMailButton = new QAction(tr("Send mail"), Resource::loadPixmap("mailit/sendqueue"), QString::null, 0, this, 0); |
147 | connect(sendMailButton, SIGNAL(activated()), this, SLOT(sendQuedMail()) ); | 147 | connect(sendMailButton, SIGNAL(activated()), this, SLOT(sendQuedMail()) ); |
@@ -149,5 +149,5 @@ void EmailClient::init() | |||
149 | sendMailButton->addTo(mail); | 149 | sendMailButton->addTo(mail); |
150 | sendMailButton->setWhatsThis("Send mail queued in the outbox"); | 150 | sendMailButton->setWhatsThis("Send mail queued in the outbox"); |
151 | 151 | ||
152 | composeButton = new QAction(tr("Compose"), Resource::loadPixmap("new"), QString::null, 0, this, 0); | 152 | composeButton = new QAction(tr("Compose"), Resource::loadPixmap("new"), QString::null, 0, this, 0); |
153 | connect(composeButton, SIGNAL(activated()), this, SLOT(compose()) ); | 153 | connect(composeButton, SIGNAL(activated()), this, SLOT(compose()) ); |
@@ -155,5 +155,5 @@ void EmailClient::init() | |||
155 | composeButton->addTo(mail); | 155 | composeButton->addTo(mail); |
156 | composeButton->setWhatsThis("Compose a new mail"); | 156 | composeButton->setWhatsThis("Compose a new mail"); |
157 | 157 | ||
158 | cancelButton = new QAction(tr("Cancel transfer"), Resource::loadPixmap("close"), QString::null, 0, this, 0); | 158 | cancelButton = new QAction(tr("Cancel transfer"), Resource::loadPixmap("close"), QString::null, 0, this, 0); |
159 | connect(cancelButton, SIGNAL(activated()), this, SLOT(cancel()) ); | 159 | connect(cancelButton, SIGNAL(activated()), this, SLOT(cancel()) ); |
@@ -162,11 +162,11 @@ void EmailClient::init() | |||
162 | cancelButton->setEnabled(FALSE); | 162 | cancelButton->setEnabled(FALSE); |
163 | cancelButton->setWhatsThis("Stop the currently active mail transfer"); | 163 | cancelButton->setWhatsThis("Stop the currently active mail transfer"); |
164 | 164 | ||
165 | 165 | ||
166 | deleteButton = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), QString::null, 0, this, 0 ); | 166 | deleteButton = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), QString::null, 0, this, 0 ); |
167 | connect( deleteButton, SIGNAL( activated() ), this, SLOT( deleteItem() ) ); | 167 | connect( deleteButton, SIGNAL( activated() ), this, SLOT( deleteItem() ) ); |
168 | deleteButton->addTo(bar); | 168 | deleteButton->addTo(bar); |
169 | deleteButton->setWhatsThis("Remove the currently selected eMail(s)"); | 169 | deleteButton->setWhatsThis("Remove the currently selected eMail(s)"); |
170 | 170 | ||
171 | mailboxView = new OTabWidget( this, "mailboxView" ); | 171 | mailboxView = new OTabWidget( this, "mailboxView" ); |
172 | 172 | ||
@@ -206,7 +206,7 @@ void EmailClient::init() | |||
206 | grid_3->addWidget( outboxView, 0, 0 ); | 206 | grid_3->addWidget( outboxView, 0, 0 ); |
207 | mailboxView->addTab( widget_2,"mailit/outbox", tr( "Outbox" ) ); | 207 | mailboxView->addTab( widget_2,"mailit/outbox", tr( "Outbox" ) ); |
208 | 208 | ||
209 | setCentralWidget(mailboxView); | 209 | setCentralWidget(mailboxView); |
210 | 210 | ||
211 | } | 211 | } |
212 | 212 | ||
@@ -215,5 +215,5 @@ void EmailClient::initStatusBar(QWidget* parent) | |||
215 | statusBar = new QStatusBar(parent); | 215 | statusBar = new QStatusBar(parent); |
216 | statusBar->setSizeGripEnabled(FALSE); | 216 | statusBar->setSizeGripEnabled(FALSE); |
217 | 217 | ||
218 | status1Label = new QLabel( tr("Idle"), statusBar); | 218 | status1Label = new QLabel( tr("Idle"), statusBar); |
219 | status2Label = new QLabel("", statusBar); | 219 | status2Label = new QLabel("", statusBar); |
@@ -222,5 +222,5 @@ void EmailClient::initStatusBar(QWidget* parent) | |||
222 | connect(emailHandler, SIGNAL(updateSmtpStatus(const QString &)), | 222 | connect(emailHandler, SIGNAL(updateSmtpStatus(const QString &)), |
223 | status2Label, SLOT(setText(const QString &)) ); | 223 | status2Label, SLOT(setText(const QString &)) ); |
224 | 224 | ||
225 | progressBar = new QProgressBar(statusBar); | 225 | progressBar = new QProgressBar(statusBar); |
226 | 226 | ||
@@ -261,10 +261,10 @@ void EmailClient::enqueMail(const Email &mail) | |||
261 | return; | 261 | return; |
262 | } | 262 | } |
263 | 263 | ||
264 | if (accountList.count() > 0) { | 264 | if (accountList.count() > 0) { |
265 | currentAccount = accountList.first(); | 265 | currentAccount = accountList.first(); |
266 | qWarning("using account " + currentAccount->name); | 266 | qWarning("using account " + currentAccount->name); |
267 | } | 267 | } |
268 | 268 | ||
269 | Email addMail = mail; | 269 | Email addMail = mail; |
270 | addMail.from = currentAccount->name; | 270 | addMail.from = currentAccount->name; |
@@ -272,7 +272,7 @@ void EmailClient::enqueMail(const Email &mail) | |||
272 | addMail.rawMail.prepend("From: \"" + addMail.from + "\" <" + addMail.fromMail + ">\n"); | 272 | addMail.rawMail.prepend("From: \"" + addMail.from + "\" <" + addMail.fromMail + ">\n"); |
273 | item = new EmailListItem(outboxView, addMail, false); | 273 | item = new EmailListItem(outboxView, addMail, false); |
274 | 274 | ||
275 | mailboxView->setCurrentTab(1); | 275 | mailboxView->setCurrentTab(1); |
276 | 276 | ||
277 | } | 277 | } |
278 | 278 | ||
@@ -282,5 +282,5 @@ void EmailClient::sendQuedMail() | |||
282 | 282 | ||
283 | if (accountList.count() == 0) { | 283 | if (accountList.count() == 0) { |
284 | QMessageBox::warning(qApp->activeWindow(), "No account selected", "You must create an account", "OK\n"); | 284 | QMessageBox::warning(qApp->activeWindow(), tr("No account selected"), tr("You must create an account"), "OK\n"); |
285 | return; | 285 | return; |
286 | } | 286 | } |
@@ -314,5 +314,5 @@ void EmailClient::mailSent() | |||
314 | sending = FALSE; | 314 | sending = FALSE; |
315 | sendMailButton->setEnabled(TRUE); | 315 | sendMailButton->setEnabled(TRUE); |
316 | 316 | ||
317 | quedMessages.clear(); | 317 | quedMessages.clear(); |
318 | outboxView->clear(); //should be moved to an sentBox | 318 | outboxView->clear(); //should be moved to an sentBox |
@@ -320,13 +320,13 @@ void EmailClient::mailSent() | |||
320 | 320 | ||
321 | void EmailClient::getNewMail() { | 321 | void EmailClient::getNewMail() { |
322 | 322 | ||
323 | if (accountList.count() == 0) { | 323 | if (accountList.count() == 0) { |
324 | QMessageBox::warning(qApp->activeWindow(),"No account selected", | 324 | QMessageBox::warning(qApp->activeWindow(),tr("No account selected"), |
325 | "You must create an account", "OK\n"); | 325 | tr("You must create an account"), "OK\n"); |
326 | return; | 326 | return; |
327 | } | 327 | } |
328 | 328 | ||
329 | setMailAccount(); | 329 | setMailAccount(); |
330 | 330 | ||
331 | receiving = TRUE; | 331 | receiving = TRUE; |
332 | previewingMail = TRUE; | 332 | previewingMail = TRUE; |
@@ -334,8 +334,8 @@ void EmailClient::getNewMail() { | |||
334 | cancelButton->setEnabled(TRUE); | 334 | cancelButton->setEnabled(TRUE); |
335 | selectAccountMenu->setEnabled(FALSE); | 335 | selectAccountMenu->setEnabled(FALSE); |
336 | 336 | ||
337 | status1Label->setText(currentAccount->accountName + " headers"); | 337 | status1Label->setText(currentAccount->accountName + " headers"); |
338 | progressBar->reset(); | 338 | progressBar->reset(); |
339 | 339 | ||
340 | //get any previous mails not downloaded and add to queue | 340 | //get any previous mails not downloaded and add to queue |
341 | /*mailDownloadList.clear(); | 341 | /*mailDownloadList.clear(); |
@@ -349,7 +349,7 @@ void EmailClient::getNewMail() { | |||
349 | item = (EmailListItem *) item->nextSibling(); | 349 | item = (EmailListItem *) item->nextSibling(); |
350 | }*/ | 350 | }*/ |
351 | 351 | ||
352 | emailHandler->getMailHeaders(); | 352 | emailHandler->getMailHeaders(); |
353 | 353 | ||
354 | } | 354 | } |
355 | 355 | ||
@@ -358,5 +358,5 @@ void EmailClient::getAllNewMail() | |||
358 | allAccounts = TRUE; | 358 | allAccounts = TRUE; |
359 | currentAccount = accountList.first(); | 359 | currentAccount = accountList.first(); |
360 | getNewMail(); | 360 | getNewMail(); |
361 | } | 361 | } |
362 | 362 | ||
@@ -368,55 +368,55 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk) | |||
368 | emailHandler->parse( mail.rawMail, lineShift, &newMail); | 368 | emailHandler->parse( mail.rawMail, lineShift, &newMail); |
369 | mailconf->setGroup(newMail.id); | 369 | mailconf->setGroup(newMail.id); |
370 | 370 | ||
371 | if (fromDisk) | 371 | if (fromDisk) |
372 | { | 372 | { |
373 | 373 | ||
374 | newMail.downloaded = mailconf->readBoolEntry("downloaded"); | 374 | newMail.downloaded = mailconf->readBoolEntry("downloaded"); |
375 | newMail.size = mailconf->readNumEntry("size"); | 375 | newMail.size = mailconf->readNumEntry("size"); |
376 | newMail.serverId = mailconf->readNumEntry("serverid"); | 376 | newMail.serverId = mailconf->readNumEntry("serverid"); |
377 | newMail.fromAccountId = mailconf->readNumEntry("fromaccountid"); | 377 | newMail.fromAccountId = mailconf->readNumEntry("fromaccountid"); |
378 | } | 378 | } |
379 | else | 379 | else |
380 | { //mail arrived from server | 380 | { //mail arrived from server |
381 | 381 | ||
382 | newMail.serverId = mail.serverId; | 382 | newMail.serverId = mail.serverId; |
383 | newMail.size = mail.size; | 383 | newMail.size = mail.size; |
384 | newMail.downloaded = mail.downloaded; | 384 | newMail.downloaded = mail.downloaded; |
385 | 385 | ||
386 | newMail.fromAccountId = emailHandler->getAccount()->id; | 386 | newMail.fromAccountId = emailHandler->getAccount()->id; |
387 | mailconf->writeEntry("fromaccountid", newMail.fromAccountId); | 387 | mailconf->writeEntry("fromaccountid", newMail.fromAccountId); |
388 | } | 388 | } |
389 | 389 | ||
390 | //add if read or not | 390 | //add if read or not |
391 | newMail.read = mailconf->readBoolEntry("mailread"); | 391 | newMail.read = mailconf->readBoolEntry("mailread"); |
392 | 392 | ||
393 | //check if new mail | 393 | //check if new mail |
394 | if ( (thisMailId = mailconf->readNumEntry("internalmailid", -1)) == -1) { | 394 | if ( (thisMailId = mailconf->readNumEntry("internalmailid", -1)) == -1) { |
395 | thisMailId = mailIdCount; | 395 | thisMailId = mailIdCount; |
396 | mailIdCount++; | 396 | mailIdCount++; |
397 | 397 | ||
398 | //set server count, so that if the user aborts, the new | 398 | //set server count, so that if the user aborts, the new |
399 | //header is not reloaded | 399 | //header is not reloaded |
400 | if ((currentAccount)&&(currentAccount->synchronize)) | 400 | if ((currentAccount)&&(currentAccount->synchronize)) |
401 | currentAccount->lastServerMailCount++; | 401 | currentAccount->lastServerMailCount++; |
402 | 402 | ||
403 | mailconf->writeEntry("internalmailid", thisMailId); | 403 | mailconf->writeEntry("internalmailid", thisMailId); |
404 | mailconf->writeEntry("downloaded", newMail.downloaded); | 404 | mailconf->writeEntry("downloaded", newMail.downloaded); |
405 | mailconf->writeEntry("size", (int) newMail.size); | 405 | mailconf->writeEntry("size", (int) newMail.size); |
406 | mailconf->writeEntry("serverid", newMail.serverId); | 406 | mailconf->writeEntry("serverid", newMail.serverId); |
407 | 407 | ||
408 | //addressList->addContact(newMail.fromMail, newMail.from); | 408 | //addressList->addContact(newMail.fromMail, newMail.from); |
409 | } | 409 | } |
410 | 410 | ||
411 | mailconf->writeEntry("downloaded", newMail.downloaded); | 411 | mailconf->writeEntry("downloaded", newMail.downloaded); |
412 | 412 | ||
413 | QString stringMailId; | 413 | QString stringMailId; |
414 | stringMailId.setNum(thisMailId); | 414 | stringMailId.setNum(thisMailId); |
415 | //see if any attatchments needs to be stored | 415 | //see if any attatchments needs to be stored |
416 | 416 | ||
417 | for ( ePtr=newMail.files.first(); ePtr != 0; ePtr=newMail.files.next() ) { | 417 | for ( ePtr=newMail.files.first(); ePtr != 0; ePtr=newMail.files.next() ) { |
418 | QString stringId; | 418 | QString stringId; |
419 | stringId.setNum(ePtr->id); | 419 | stringId.setNum(ePtr->id); |
420 | 420 | ||
421 | int id = mailconf->readNumEntry("enclosureid_" + stringId); | 421 | int id = mailconf->readNumEntry("enclosureid_" + stringId); |
422 | if (id != ePtr->id) { //new entry | 422 | if (id != ePtr->id) { //new entry |
@@ -427,5 +427,5 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk) | |||
427 | mailconf->writeEntry("saved_" + stringId, ePtr->saved); | 427 | mailconf->writeEntry("saved_" + stringId, ePtr->saved); |
428 | mailconf->writeEntry("installed_" + stringId, FALSE); | 428 | mailconf->writeEntry("installed_" + stringId, FALSE); |
429 | 429 | ||
430 | ePtr->name = stringMailId + "_" + stringId; | 430 | ePtr->name = stringMailId + "_" + stringId; |
431 | ePtr->path = getPath(TRUE); | 431 | ePtr->path = getPath(TRUE); |
@@ -445,16 +445,16 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk) | |||
445 | ePtr->name = mailconf->readEntry("filename_" + stringId); | 445 | ePtr->name = mailconf->readEntry("filename_" + stringId); |
446 | ePtr->path = mailconf->readEntry("path_" + stringId); | 446 | ePtr->path = mailconf->readEntry("path_" + stringId); |
447 | } | 447 | } |
448 | } | 448 | } |
449 | } | 449 | } |
450 | 450 | ||
451 | bool found=false; | 451 | bool found=false; |
452 | 452 | ||
453 | if (!fromDisk) | 453 | if (!fromDisk) |
454 | { | 454 | { |
455 | 455 | ||
456 | Email *mailPtr; | 456 | Email *mailPtr; |
457 | item = (EmailListItem *) inboxView->firstChild(); | 457 | item = (EmailListItem *) inboxView->firstChild(); |
458 | while ((item != NULL)&&(!found)) | 458 | while ((item != NULL)&&(!found)) |
459 | { | 459 | { |
460 | mailPtr = item->getMail(); | 460 | mailPtr = item->getMail(); |
@@ -473,10 +473,10 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk) | |||
473 | // { | 473 | // { |
474 | // item->setPixmap(0, Resource::loadPixmap("mailit/attach")); | 474 | // item->setPixmap(0, Resource::loadPixmap("mailit/attach")); |
475 | // } | 475 | // } |
476 | /*if (!newMail.downloaded) | 476 | /*if (!newMail.downloaded) |
477 | mailDownloadList.sizeInsert(newMail.serverId, newMail.size);*/ | 477 | mailDownloadList.sizeInsert(newMail.serverId, newMail.size);*/ |
478 | 478 | ||
479 | mailboxView->setCurrentTab(0); | 479 | mailboxView->setCurrentTab(0); |
480 | 480 | ||
481 | } | 481 | } |
482 | 482 | ||
@@ -496,10 +496,10 @@ void EmailClient::allMailArrived(int /*count*/) | |||
496 | selectAccountMenu->setEnabled(TRUE); | 496 | selectAccountMenu->setEnabled(TRUE); |
497 | status1Label->setText("Idle"); | 497 | status1Label->setText("Idle"); |
498 | 498 | ||
499 | progressBar->reset(); | 499 | progressBar->reset(); |
500 | return; | 500 | return; |
501 | } | 501 | } |
502 | //} | 502 | //} |
503 | 503 | ||
504 | // all headers downloaded from server, start downloading remaining mails | 504 | // all headers downloaded from server, start downloading remaining mails |
505 | previewingMail = FALSE; | 505 | previewingMail = FALSE; |
@@ -507,5 +507,5 @@ void EmailClient::allMailArrived(int /*count*/) | |||
507 | progressBar->reset(); | 507 | progressBar->reset(); |
508 | 508 | ||
509 | 509 | ||
510 | mailboxView->setCurrentTab(0); | 510 | mailboxView->setCurrentTab(0); |
511 | } | 511 | } |
@@ -522,5 +522,5 @@ void EmailClient::smtpError(int code, const QString & Msg) | |||
522 | { | 522 | { |
523 | QString temp; | 523 | QString temp; |
524 | 524 | ||
525 | if (code == ErrUnknownResponse) { | 525 | if (code == ErrUnknownResponse) { |
526 | temp = tr("<qt>Unknown response from server</qt>"); | 526 | temp = tr("<qt>Unknown response from server</qt>"); |
@@ -534,5 +534,5 @@ void EmailClient::smtpError(int code, const QString & Msg) | |||
534 | temp = tr("<qt>socket packet error</qt>"); | 534 | temp = tr("<qt>socket packet error</qt>"); |
535 | } | 535 | } |
536 | 536 | ||
537 | if (code != ErrCancel) { | 537 | if (code != ErrCancel) { |
538 | QMessageBox::warning(qApp->activeWindow(), "Sending error", temp, "OK\n"); | 538 | QMessageBox::warning(qApp->activeWindow(), "Sending error", temp, "OK\n"); |
@@ -540,5 +540,5 @@ void EmailClient::smtpError(int code, const QString & Msg) | |||
540 | status2Label->setText("Aborted by user"); | 540 | status2Label->setText("Aborted by user"); |
541 | } | 541 | } |
542 | 542 | ||
543 | sending = FALSE; | 543 | sending = FALSE; |
544 | sendMailButton->setEnabled(TRUE); | 544 | sendMailButton->setEnabled(TRUE); |
@@ -550,5 +550,5 @@ void EmailClient::popError(int code, const QString & Msg) | |||
550 | { | 550 | { |
551 | QString temp; | 551 | QString temp; |
552 | 552 | ||
553 | if (code == ErrUnknownResponse) { | 553 | if (code == ErrUnknownResponse) { |
554 | temp = tr("<qt>Unknown response from server</qt>"); | 554 | temp = tr("<qt>Unknown response from server</qt>"); |
@@ -563,5 +563,5 @@ void EmailClient::popError(int code, const QString & Msg) | |||
563 | } else if (code == QSocket::ErrSocketRead) { | 563 | } else if (code == QSocket::ErrSocketRead) { |
564 | temp = tr("<qt>socket packet error</qt>"); | 564 | temp = tr("<qt>socket packet error</qt>"); |
565 | } | 565 | } |
566 | 566 | ||
567 | if (code != ErrCancel) { | 567 | if (code != ErrCancel) { |
@@ -571,5 +571,5 @@ void EmailClient::popError(int code, const QString & Msg) | |||
571 | status2Label->setText("Aborted by user"); | 571 | status2Label->setText("Aborted by user"); |
572 | } | 572 | } |
573 | 573 | ||
574 | receiving = FALSE; | 574 | receiving = FALSE; |
575 | getMailButton->setEnabled(TRUE); | 575 | getMailButton->setEnabled(TRUE); |
@@ -581,5 +581,5 @@ void EmailClient::inboxItemSelected() | |||
581 | { | 581 | { |
582 | //killTimer(timerID); | 582 | //killTimer(timerID); |
583 | 583 | ||
584 | item = (EmailListItem*) inboxView->selectedItem(); | 584 | item = (EmailListItem*) inboxView->selectedItem(); |
585 | if (item != NULL) { | 585 | if (item != NULL) { |
@@ -591,5 +591,5 @@ void EmailClient::outboxItemSelected() | |||
591 | { | 591 | { |
592 | //killTimer(timerID); | 592 | //killTimer(timerID); |
593 | 593 | ||
594 | item = (EmailListItem*) outboxView->selectedItem(); | 594 | item = (EmailListItem*) outboxView->selectedItem(); |
595 | if (item != NULL) { | 595 | if (item != NULL) { |
@@ -606,10 +606,10 @@ void EmailClient::readMail() | |||
606 | 606 | ||
607 | QFile f(getPath(FALSE) + "inbox.txt"); | 607 | QFile f(getPath(FALSE) + "inbox.txt"); |
608 | 608 | ||
609 | if ( f.open(IO_ReadOnly) ) { // file opened successfully | 609 | if ( f.open(IO_ReadOnly) ) { // file opened successfully |
610 | QTextStream t( &f ); // use a text stream | 610 | QTextStream t( &f ); // use a text stream |
611 | s = t.read(); | 611 | s = t.read(); |
612 | f.close(); | 612 | f.close(); |
613 | 613 | ||
614 | start = 0; | 614 | start = 0; |
615 | del = "\n.\n"; | 615 | del = "\n.\n"; |
@@ -618,5 +618,5 @@ void EmailClient::readMail() | |||
618 | if (stop == -1) | 618 | if (stop == -1) |
619 | stop = s.length() - del.length(); | 619 | stop = s.length() - del.length(); |
620 | 620 | ||
621 | mail.rawMail = s.mid(start, stop + del.length() - start ); | 621 | mail.rawMail = s.mid(start, stop + del.length() - start ); |
622 | start = stop + del.length(); | 622 | start = stop + del.length(); |
@@ -624,5 +624,5 @@ void EmailClient::readMail() | |||
624 | } | 624 | } |
625 | } | 625 | } |
626 | 626 | ||
627 | QFile fo(getPath(FALSE) + "outbox.txt"); | 627 | QFile fo(getPath(FALSE) + "outbox.txt"); |
628 | if ( fo.open(IO_ReadOnly) ) { // file opened successfully | 628 | if ( fo.open(IO_ReadOnly) ) { // file opened successfully |
@@ -630,5 +630,5 @@ void EmailClient::readMail() | |||
630 | s = t.read(); | 630 | s = t.read(); |
631 | fo.close(); | 631 | fo.close(); |
632 | 632 | ||
633 | start = 0; | 633 | start = 0; |
634 | del = "\n.\n"; | 634 | del = "\n.\n"; |
@@ -637,5 +637,5 @@ void EmailClient::readMail() | |||
637 | if (stop == -1) | 637 | if (stop == -1) |
638 | stop = s.length() - del.length(); | 638 | stop = s.length() - del.length(); |
639 | 639 | ||
640 | mail.rawMail = s.mid(start, stop + del.length() - start ); | 640 | mail.rawMail = s.mid(start, stop + del.length() - start ); |
641 | start = stop + del.length(); | 641 | start = stop + del.length(); |
@@ -644,5 +644,5 @@ void EmailClient::readMail() | |||
644 | mail.received = false; | 644 | mail.received = false; |
645 | enqueMail(mail); | 645 | enqueMail(mail); |
646 | 646 | ||
647 | } | 647 | } |
648 | } | 648 | } |
@@ -653,5 +653,5 @@ void EmailClient::saveMail(const QString &fileName, QListView *view) | |||
653 | QFile f(fileName); | 653 | QFile f(fileName); |
654 | Email *mail; | 654 | Email *mail; |
655 | 655 | ||
656 | if (! f.open(IO_WriteOnly) ) { | 656 | if (! f.open(IO_WriteOnly) ) { |
657 | qWarning("could not open file"); | 657 | qWarning("could not open file"); |
@@ -663,8 +663,8 @@ void EmailClient::saveMail(const QString &fileName, QListView *view) | |||
663 | mail = item->getMail(); | 663 | mail = item->getMail(); |
664 | t << mail->rawMail; | 664 | t << mail->rawMail; |
665 | 665 | ||
666 | mailconf->setGroup(mail->id); | 666 | mailconf->setGroup(mail->id); |
667 | mailconf->writeEntry("mailread", mail->read); | 667 | mailconf->writeEntry("mailread", mail->read); |
668 | 668 | ||
669 | item = (EmailListItem *) item->nextSibling(); | 669 | item = (EmailListItem *) item->nextSibling(); |
670 | } | 670 | } |
@@ -677,17 +677,17 @@ QString EmailClient::getPath(bool enclosurePath) | |||
677 | QString basePath = "qtmail"; | 677 | QString basePath = "qtmail"; |
678 | QString enclosures = "enclosures"; | 678 | QString enclosures = "enclosures"; |
679 | 679 | ||
680 | QDir dir = (QString(getenv("HOME")) + "/Applications/" + basePath); | 680 | QDir dir = (QString(getenv("HOME")) + "/Applications/" + basePath); |
681 | if ( !dir.exists() ) | 681 | if ( !dir.exists() ) |
682 | dir.mkdir( dir.path() ); | 682 | dir.mkdir( dir.path() ); |
683 | 683 | ||
684 | if (enclosurePath) { | 684 | if (enclosurePath) { |
685 | dir = (QString(getenv("HOME")) + "/Applications/" + basePath + "/" + enclosures); | 685 | dir = (QString(getenv("HOME")) + "/Applications/" + basePath + "/" + enclosures); |
686 | 686 | ||
687 | if ( !dir.exists() ) | 687 | if ( !dir.exists() ) |
688 | dir.mkdir( dir.path() ); | 688 | dir.mkdir( dir.path() ); |
689 | 689 | ||
690 | return (dir.path() + "/"); | 690 | return (dir.path() + "/"); |
691 | 691 | ||
692 | } | 692 | } |
693 | return (dir.path() + "/"); | 693 | return (dir.path() + "/"); |
@@ -697,11 +697,11 @@ void EmailClient::readSettings() | |||
697 | { | 697 | { |
698 | int y,acc_count; | 698 | int y,acc_count; |
699 | 699 | ||
700 | mailconf->setGroup("mailitglobal"); | 700 | mailconf->setGroup("mailitglobal"); |
701 | acc_count=mailconf->readNumEntry("Accounts",0); | 701 | acc_count=mailconf->readNumEntry("Accounts",0); |
702 | 702 | ||
703 | for (int accountPos = 0;accountPos<acc_count ; accountPos++) | 703 | for (int accountPos = 0;accountPos<acc_count ; accountPos++) |
704 | { | 704 | { |
705 | mailconf->setGroup("Account_"+QString::number(accountPos+1)); //Account numbers start at 1 ... | 705 | mailconf->setGroup("Account_"+QString::number(accountPos+1)); //Account numbers start at 1 ... |
706 | account.accountName = mailconf->readEntry("AccName",""); | 706 | account.accountName = mailconf->readEntry("AccName",""); |
707 | account.name = mailconf->readEntry("UserName",""); | 707 | account.name = mailconf->readEntry("UserName",""); |
@@ -715,21 +715,21 @@ void EmailClient::readSettings() | |||
715 | account.lastServerMailCount = 0; | 715 | account.lastServerMailCount = 0; |
716 | account.synchronize = FALSE; | 716 | account.synchronize = FALSE; |
717 | 717 | ||
718 | account.synchronize = (mailconf->readEntry("Synchronize","No")=="Yes"); | 718 | account.synchronize = (mailconf->readEntry("Synchronize","No")=="Yes"); |
719 | if (account.synchronize) | 719 | if (account.synchronize) |
720 | { | 720 | { |
721 | mailconf->readNumEntry("LASTSERVERMAILCOUNT",0); | 721 | mailconf->readNumEntry("LASTSERVERMAILCOUNT",0); |
722 | } | 722 | } |
723 | 723 | ||
724 | accountList.append(&account); | 724 | accountList.append(&account); |
725 | } | 725 | } |
726 | 726 | ||
727 | mailconf->setGroup("mailitglobal"); | 727 | mailconf->setGroup("mailitglobal"); |
728 | 728 | ||
729 | if ( (y = mailconf->readNumEntry("mailidcount", -1)) != -1) | 729 | if ( (y = mailconf->readNumEntry("mailidcount", -1)) != -1) |
730 | { | 730 | { |
731 | mailIdCount = y; | 731 | mailIdCount = y; |
732 | } | 732 | } |
733 | if ( (y = mailconf->readNumEntry("accountidcount", -1)) != -1) | 733 | if ( (y = mailconf->readNumEntry("accountidcount", -1)) != -1) |
734 | { | 734 | { |
735 | accountIdCount = y; | 735 | accountIdCount = y; |
@@ -742,13 +742,13 @@ void EmailClient::saveSettings() | |||
742 | MailAccount *accountPtr; | 742 | MailAccount *accountPtr; |
743 | 743 | ||
744 | 744 | ||
745 | if (!mailconf) | 745 | if (!mailconf) |
746 | { | 746 | { |
747 | qWarning("could not save settings"); | 747 | qWarning("could not save settings"); |
748 | return; | 748 | return; |
749 | } | 749 | } |
750 | 750 | ||
751 | for (accountPtr = accountList.first(); accountPtr != 0; | 751 | for (accountPtr = accountList.first(); accountPtr != 0; |
752 | accountPtr = accountList.next()) | 752 | accountPtr = accountList.next()) |
753 | { | 753 | { |
754 | mailconf->setGroup("Account_"+QString::number(++acc_count)); | 754 | mailconf->setGroup("Account_"+QString::number(++acc_count)); |
@@ -761,16 +761,16 @@ void EmailClient::saveSettings() | |||
761 | mailconf->writeEntry("SMTPServer",accountPtr->smtpServer); | 761 | mailconf->writeEntry("SMTPServer",accountPtr->smtpServer); |
762 | mailconf->writeEntry("AccountId",accountPtr->id); | 762 | mailconf->writeEntry("AccountId",accountPtr->id); |
763 | if (accountPtr->synchronize) | 763 | if (accountPtr->synchronize) |
764 | { | 764 | { |
765 | mailconf->writeEntry("Synchronize","Yes"); | 765 | mailconf->writeEntry("Synchronize","Yes"); |
766 | mailconf->writeEntry("HeaderLimit",accountPtr->syncLimit); | 766 | mailconf->writeEntry("HeaderLimit",accountPtr->syncLimit); |
767 | mailconf->writeEntry("LastServerMailCount",accountPtr->lastServerMailCount); | 767 | mailconf->writeEntry("LastServerMailCount",accountPtr->lastServerMailCount); |
768 | } | 768 | } |
769 | else | 769 | else |
770 | { | 770 | { |
771 | mailconf->writeEntry("Synchronize", "No"); | 771 | mailconf->writeEntry("Synchronize", "No"); |
772 | } | 772 | } |
773 | } | 773 | } |
774 | 774 | ||
775 | mailconf->setGroup("mailitglobal"); | 775 | mailconf->setGroup("mailitglobal"); |
776 | mailconf->writeEntry("Accounts",acc_count); | 776 | mailconf->writeEntry("Accounts",acc_count); |
@@ -786,5 +786,5 @@ void EmailClient::selectAccount(int id) | |||
786 | getNewMail(); | 786 | getNewMail(); |
787 | } else { | 787 | } else { |
788 | emit newCaption("Mailit ! No account defined"); | 788 | emit newCaption( tr("Mailit ! No account defined") ); |
789 | } | 789 | } |
790 | } | 790 | } |
@@ -793,5 +793,5 @@ void EmailClient::editAccount(int id) | |||
793 | { | 793 | { |
794 | MailAccount *newAccount; | 794 | MailAccount *newAccount; |
795 | 795 | ||
796 | editAccountView = new EditAccount(this, "account", TRUE); | 796 | editAccountView = new EditAccount(this, "account", TRUE); |
797 | if (id == newAccountId) { //new account | 797 | if (id == newAccountId) { //new account |
@@ -802,8 +802,8 @@ void EmailClient::editAccount(int id) | |||
802 | editAccountView->setAccount(newAccount, FALSE); | 802 | editAccountView->setAccount(newAccount, FALSE); |
803 | } | 803 | } |
804 | 804 | ||
805 | editAccountView->showMaximized(); | 805 | editAccountView->showMaximized(); |
806 | editAccountView->exec(); | 806 | editAccountView->exec(); |
807 | 807 | ||
808 | if (editAccountView->result() == QDialog::Accepted) { | 808 | if (editAccountView->result() == QDialog::Accepted) { |
809 | if (id == newAccountId) { | 809 | if (id == newAccountId) { |
@@ -816,5 +816,5 @@ void EmailClient::editAccount(int id) | |||
816 | } | 816 | } |
817 | } | 817 | } |
818 | 818 | ||
819 | delete editAccountView; | 819 | delete editAccountView; |
820 | } | 820 | } |
@@ -824,10 +824,10 @@ void EmailClient::deleteAccount(int id) | |||
824 | MailAccount *newAccount; | 824 | MailAccount *newAccount; |
825 | QString message; | 825 | QString message; |
826 | 826 | ||
827 | newAccount = accountList.at(id); | 827 | newAccount = accountList.at(id); |
828 | message = "Delete account:\n" + newAccount->accountName; | 828 | message = tr("Delete account:\n") + newAccount->accountName; |
829 | switch( QMessageBox::warning( this, "Mailit", message, | 829 | switch( QMessageBox::warning( this, "Mailit", message, |
830 | "Yes", "No", 0, 0, 1 ) ) { | 830 | "Yes", "No", 0, 0, 1 ) ) { |
831 | 831 | ||
832 | case 0: accountList.remove(id); | 832 | case 0: accountList.remove(id); |
833 | updateAccounts(); | 833 | updateAccounts(); |
@@ -841,5 +841,5 @@ void EmailClient::updateAccounts() | |||
841 | { | 841 | { |
842 | MailAccount *accountPtr; | 842 | MailAccount *accountPtr; |
843 | 843 | ||
844 | //rebuild menus, clear all first | 844 | //rebuild menus, clear all first |
845 | editAccountMenu->clear(); | 845 | editAccountMenu->clear(); |
@@ -847,12 +847,12 @@ void EmailClient::updateAccounts() | |||
847 | deleteAccountMenu->clear(); | 847 | deleteAccountMenu->clear(); |
848 | 848 | ||
849 | newAccountId = editAccountMenu->insertItem("New", this, | 849 | newAccountId = editAccountMenu->insertItem( tr("New"), this, |
850 | SLOT(editAccount(int)) ); | 850 | SLOT(editAccount(int)) ); |
851 | editAccountMenu->insertSeparator(); | 851 | editAccountMenu->insertSeparator(); |
852 | 852 | ||
853 | idCount = 0; | 853 | idCount = 0; |
854 | for (accountPtr = accountList.first(); accountPtr != 0; | 854 | for (accountPtr = accountList.first(); accountPtr != 0; |
855 | accountPtr = accountList.next()) { | 855 | accountPtr = accountList.next()) { |
856 | 856 | ||
857 | editAccountMenu->insertItem(accountPtr->accountName, | 857 | editAccountMenu->insertItem(accountPtr->accountName, |
858 | this, SLOT(editAccount(int)), 0, idCount); | 858 | this, SLOT(editAccount(int)), 0, idCount); |
@@ -869,9 +869,9 @@ void EmailClient::deleteMail(EmailListItem *mailItem, bool &inbox) | |||
869 | Email *mPtr; | 869 | Email *mPtr; |
870 | Enclosure *ePtr; | 870 | Enclosure *ePtr; |
871 | 871 | ||
872 | if (inbox) | 872 | if (inbox) |
873 | { | 873 | { |
874 | mPtr = mailItem->getMail(); | 874 | mPtr = mailItem->getMail(); |
875 | 875 | ||
876 | //if mail is in queue for download, remove it from | 876 | //if mail is in queue for download, remove it from |
877 | //queue if possible | 877 | //queue if possible |
@@ -880,8 +880,8 @@ void EmailClient::deleteMail(EmailListItem *mailItem, bool &inbox) | |||
880 | mailDownloadList.remove(mPtr->serverId, mPtr->size); | 880 | mailDownloadList.remove(mPtr->serverId, mPtr->size); |
881 | } | 881 | } |
882 | 882 | ||
883 | mailconf->setGroup(mPtr->id); | 883 | mailconf->setGroup(mPtr->id); |
884 | mailconf->clearGroup(); | 884 | mailconf->clearGroup(); |
885 | 885 | ||
886 | //delete any temporary attatchemnts storing | 886 | //delete any temporary attatchemnts storing |
887 | for ( ePtr=mPtr->files.first(); ePtr != 0; ePtr=mPtr->files.next() ) { | 887 | for ( ePtr=mPtr->files.first(); ePtr != 0; ePtr=mPtr->files.next() ) { |
@@ -891,6 +891,6 @@ void EmailClient::deleteMail(EmailListItem *mailItem, bool &inbox) | |||
891 | } | 891 | } |
892 | inboxView->takeItem(mailItem); | 892 | inboxView->takeItem(mailItem); |
893 | } | 893 | } |
894 | else | 894 | else |
895 | { | 895 | { |
896 | outboxView->takeItem(mailItem); | 896 | outboxView->takeItem(mailItem); |
@@ -906,5 +906,5 @@ void EmailClient::setMailSize(int size) | |||
906 | void EmailClient::setTotalSize(int /*size*/) | 906 | void EmailClient::setTotalSize(int /*size*/) |
907 | { | 907 | { |
908 | 908 | ||
909 | } | 909 | } |
910 | 910 | ||
@@ -924,16 +924,16 @@ void EmailClient::deleteItem() | |||
924 | bool inbox=mailboxView->currentTab()==0; | 924 | bool inbox=mailboxView->currentTab()==0; |
925 | QListView* box; | 925 | QListView* box; |
926 | 926 | ||
927 | EmailListItem* eli; | 927 | EmailListItem* eli; |
928 | // int pos; | 928 | // int pos; |
929 | 929 | ||
930 | inbox ? box=inboxView : box=outboxView; | 930 | inbox ? box=inboxView : box=outboxView; |
931 | 931 | ||
932 | eli=(EmailListItem*)box->selectedItem(); | 932 | eli=(EmailListItem*)box->selectedItem(); |
933 | 933 | ||
934 | if (eli) | 934 | if (eli) |
935 | { | 935 | { |
936 | box->setSelected(eli->itemBelow(),true); //select the previous item | 936 | box->setSelected(eli->itemBelow(),true); //select the previous item |
937 | 937 | ||
938 | deleteMail(eli,(bool&)inbox); //remove mail entry | 938 | deleteMail(eli,(bool&)inbox); //remove mail entry |
939 | } | 939 | } |
@@ -953,19 +953,19 @@ void EmailClient::inboxItemReleased() | |||
953 | { | 953 | { |
954 | //killTimer(timerID); | 954 | //killTimer(timerID); |
955 | 955 | ||
956 | 956 | ||
957 | QPopupMenu *action = new QPopupMenu(this); | 957 | QPopupMenu *action = new QPopupMenu(this); |
958 | 958 | ||
959 | int reply=0; | 959 | int reply=0; |
960 | 960 | ||
961 | action->insertItem(tr( "Reply To" ),this,SLOT(reply())); | 961 | action->insertItem(tr( "Reply To" ),this,SLOT(reply())); |
962 | action->insertItem( tr( "Reply All" ),this,SLOT(replyAll())); | 962 | action->insertItem( tr( "Reply All" ),this,SLOT(replyAll())); |
963 | action->insertItem( tr( "Forward" ), this,SLOT(forward())); | 963 | action->insertItem( tr( "Forward" ), this,SLOT(forward())); |
964 | action->insertItem( tr( "Remove Mail" ), this,SLOT(remove())); | 964 | action->insertItem( tr( "Remove Mail" ), this,SLOT(remove())); |
965 | 965 | ||
966 | action->exec(QCursor::pos()); | 966 | action->exec(QCursor::pos()); |
967 | 967 | ||
968 | if (action) delete action; | 968 | if (action) delete action; |
969 | 969 | ||
970 | }*/ | 970 | }*/ |
971 | 971 | ||
@@ -978,19 +978,19 @@ Email* EmailClient::getCurrentMail() | |||
978 | return NULL; | 978 | return NULL; |
979 | } | 979 | } |
980 | 980 | ||
981 | void EmailClient::download(Email* mail) | 981 | void EmailClient::download(Email* mail) |
982 | { | 982 | { |
983 | MailAccount* acc=0; | 983 | MailAccount* acc=0; |
984 | 984 | ||
985 | tempMailDownloadList.clear(); | 985 | tempMailDownloadList.clear(); |
986 | tempMailDownloadList.sizeInsert(mail->serverId, mail->size); | 986 | tempMailDownloadList.sizeInsert(mail->serverId, mail->size); |
987 | 987 | ||
988 | acc=accountList.at(mail->fromAccountId-1); | 988 | acc=accountList.at(mail->fromAccountId-1); |
989 | if (acc) | 989 | if (acc) |
990 | { | 990 | { |
991 | emailHandler->setAccount(*acc); | 991 | emailHandler->setAccount(*acc); |
992 | emailHandler->getMailByList(&tempMailDownloadList); | 992 | emailHandler->getMailByList(&tempMailDownloadList); |
993 | } | 993 | } |
994 | else | 994 | else |
995 | QMessageBox::warning(qApp->activeWindow(), | 995 | QMessageBox::warning(qApp->activeWindow(), |
996 | tr("No account associated"), tr("There is no active account \nassociated to this mail\n it can not be downloaded"), "Abort\n"); | 996 | tr("No account associated"), tr("There is no active account \nassociated to this mail\n it can not be downloaded"), "Abort\n"); |
@@ -1003,7 +1003,7 @@ void EmailClient::receive(const QCString& /*msg*/, const QByteArray& /*data*/) | |||
1003 | //QDialog qd(qApp->activeWindow(),"Getting mail",true); | 1003 | //QDialog qd(qApp->activeWindow(),"Getting mail",true); |
1004 | QVBoxLayout *vbProg = new QVBoxLayout( &qd ); | 1004 | QVBoxLayout *vbProg = new QVBoxLayout( &qd ); |
1005 | 1005 | ||
1006 | initStatusBar(&qd); | 1006 | initStatusBar(&qd); |
1007 | 1007 | ||
1008 | if (statusBar==0) | 1008 | if (statusBar==0) |
1009 | { | 1009 | { |
@@ -1019,21 +1019,21 @@ void EmailClient::receive(const QCString& /*msg*/, const QByteArray& /*data*/) | |||
1019 | } | 1019 | } |
1020 | else if (msg=="compose()") | 1020 | else if (msg=="compose()") |
1021 | { | 1021 | { |
1022 | QDialog qd(qApp->activeWindow(),"Getting mail",true); | 1022 | QDialog qd(qApp->activeWindow(),"Getting mail",true); |
1023 | 1023 | ||
1024 | WriteMail wm(&qd,"write new mail"); | 1024 | WriteMail wm(&qd,"write new mail"); |
1025 | QVBoxLayout vbProg( &qd ); | 1025 | QVBoxLayout vbProg( &qd ); |
1026 | 1026 | ||
1027 | wm.showMaximized(); | 1027 | wm.showMaximized(); |
1028 | vbProg.addWidget(&wm); | 1028 | vbProg.addWidget(&wm); |
1029 | 1029 | ||
1030 | qd.showMaximized(); | 1030 | qd.showMaximized(); |
1031 | 1031 | ||
1032 | emit composeRequested(); | 1032 | emit composeRequested(); |
1033 | qd.exec(); | 1033 | qd.exec(); |
1034 | 1034 | ||
1035 | QMessageBox::warning(qApp->activeWindow(),tr("Info"), tr("Info"), "OK\n"); | 1035 | QMessageBox::warning(qApp->activeWindow(),tr("Info"), tr("Info"), "OK\n"); |
1036 | } | 1036 | } |
1037 | 1037 | ||
1038 | else if (msg=="dialog()") | 1038 | else if (msg=="dialog()") |
1039 | { | 1039 | { |
diff --git a/noncore/unsupported/mailit/emaillistitem.cpp b/noncore/unsupported/mailit/emaillistitem.cpp index fc9f766..a25f93a 100644 --- a/noncore/unsupported/mailit/emaillistitem.cpp +++ b/noncore/unsupported/mailit/emaillistitem.cpp | |||
@@ -26,7 +26,7 @@ EmailListItem::EmailListItem(QListView *parent, Email mailIn, bool inbox) | |||
26 | { | 26 | { |
27 | QString temp; | 27 | QString temp; |
28 | 28 | ||
29 | mail = mailIn; | 29 | mail = mailIn; |
30 | 30 | ||
31 | if (inbox) { | 31 | if (inbox) { |
32 | setText(0, mail.from); | 32 | setText(0, mail.from); |
@@ -39,11 +39,12 @@ EmailListItem::EmailListItem(QListView *parent, Email mailIn, bool inbox) | |||
39 | } | 39 | } |
40 | setText(1, mail.subject); | 40 | setText(1, mail.subject); |
41 | setText(2,mail.date); | 41 | // setText(2,mail.date); |
42 | 42 | setText(2,dateFromULCString(mail.date)); | |
43 | |||
43 | if (mailIn.files.count()>0) | 44 | if (mailIn.files.count()>0) |
44 | { | 45 | { |
45 | setPixmap(0, Resource::loadPixmap("mailit/attach")); | 46 | setPixmap(0, Resource::loadPixmap("mailit/attach")); |
46 | } | 47 | } |
47 | 48 | ||
48 | selected = FALSE; | 49 | selected = FALSE; |
49 | } | 50 | } |
@@ -83,5 +84,5 @@ void EmailListItem::paintCell( QPainter *p, const QColorGroup &cg, | |||
83 | if (!mail.downloaded) | 84 | if (!mail.downloaded) |
84 | _cg.setColor( QColorGroup::Text, Qt::red); | 85 | _cg.setColor( QColorGroup::Text, Qt::red); |
85 | 86 | ||
86 | /* if (selected) { | 87 | /* if (selected) { |
87 | _cg.setColor(QColorGroup::Base, Qt::blue); | 88 | _cg.setColor(QColorGroup::Base, Qt::blue); |
@@ -93,7 +94,65 @@ void EmailListItem::paintCell( QPainter *p, const QColorGroup &cg, | |||
93 | } | 94 | } |
94 | } | 95 | } |
95 | */ | 96 | */ |
96 | QListViewItem::paintCell( p, _cg, column, width, alignment ); | 97 | QListViewItem::paintCell( p, _cg, column, width, alignment ); |
97 | 98 | ||
98 | _cg.setColor( QColorGroup::Text, c ); | 99 | _cg.setColor( QColorGroup::Text, c ); |
99 | } | 100 | } |
101 | |||
102 | /* | ||
103 | * Converts an E-Mail date (ULC) RFC 2822 conform to a QDateTime. | ||
104 | * Returning a QString with formatting of "YYYY-MM-DD HH:MM:SS" | ||
105 | * (zodiac: This method was tested with more than 300 inbox mails, | ||
106 | * it didn't slow down the loading of mail-it.) | ||
107 | */ | ||
108 | QString EmailListItem::dateFromULCString( QString ulcDate ) | ||
109 | { | ||
110 | QString sTemp, sTime; | ||
111 | int iPos, iDay, iMon=1, iYear; | ||
112 | |||
113 | iPos=ulcDate.find(','); | ||
114 | if (iPos) { // it has a day-of-week | ||
115 | ulcDate=ulcDate.remove(0,++iPos); //.stripWhiteSpace(); | ||
116 | } | ||
117 | |||
118 | QStringList dateEntries = QStringList::split(" ",ulcDate,FALSE); | ||
119 | QStringList::Iterator iter = dateEntries.begin(); | ||
120 | |||
121 | // Get day as DD | ||
122 | iDay = (*iter++).toInt(); | ||
123 | |||
124 | // Get month as string Mmm | ||
125 | sTemp = (*iter++); | ||
126 | if (sTemp =="Jan") {iMon=1;} else | ||
127 | if (sTemp =="Feb") {iMon=2;} else | ||
128 | if (sTemp =="Mar") {iMon=3;} else | ||
129 | if (sTemp =="Apr") {iMon=4;} else | ||
130 | if (sTemp =="May") {iMon=5;} else | ||
131 | if (sTemp =="Jun") {iMon=6;} else | ||
132 | if (sTemp =="Jul") {iMon=7;} else | ||
133 | if (sTemp =="Aug") {iMon=8;} else | ||
134 | if (sTemp =="Sep") {iMon=9;} else | ||
135 | if (sTemp =="Oct") {iMon=10;} else | ||
136 | if (sTemp =="Nov") {iMon=11;} else | ||
137 | if (sTemp =="Dec") {iMon=12;} | ||
138 | |||
139 | // Get year as YYYY or YY | ||
140 | iYear = (*iter++).toInt(); | ||
141 | |||
142 | QDate date = QDate(iYear, iMon, iDay); | ||
143 | |||
144 | // Convert timestring into a QTime | ||
145 | QStringList timeEntries = QStringList::split(":",(*iter++),FALSE); | ||
146 | QStringList::Iterator iterTime = timeEntries.begin(); | ||
147 | iYear=(*iterTime++).toInt(); // var reuse.. *cough* | ||
148 | iMon=(*iterTime++).toInt(); | ||
149 | iDay=(*iterTime++).toInt(); | ||
150 | QTime time = QTime(iYear,iMon,iDay); | ||
151 | |||
152 | return QString::number(date.year())+"-" | ||
153 | +QString::number(date.month()).rightJustify(2,'0')+"-" | ||
154 | +QString::number(date.day()).rightJustify(2,'0')+" " | ||
155 | +time.toString(); | ||
156 | } | ||
157 | |||
158 | |||
diff --git a/noncore/unsupported/mailit/emaillistitem.h b/noncore/unsupported/mailit/emaillistitem.h index 642932c..129a774 100644 --- a/noncore/unsupported/mailit/emaillistitem.h +++ b/noncore/unsupported/mailit/emaillistitem.h | |||
@@ -33,5 +33,5 @@ public: | |||
33 | bool isItemSelected(); | 33 | bool isItemSelected(); |
34 | bool itemSelected(); | 34 | bool itemSelected(); |
35 | 35 | ||
36 | protected: | 36 | protected: |
37 | void paintCell( QPainter *p, const QColorGroup &cg, | 37 | void paintCell( QPainter *p, const QColorGroup &cg, |
@@ -40,4 +40,5 @@ private: | |||
40 | Email mail; | 40 | Email mail; |
41 | bool selected; | 41 | bool selected; |
42 | QString dateFromULCString( QString ulc ); | ||
42 | }; | 43 | }; |
43 | 44 | ||
diff --git a/noncore/unsupported/mailit/mailit.pro b/noncore/unsupported/mailit/mailit.pro index 5e9a83a..0224886 100644 --- a/noncore/unsupported/mailit/mailit.pro +++ b/noncore/unsupported/mailit/mailit.pro | |||
@@ -1,5 +1,4 @@ | |||
1 | TEMPLATE = app | ||
2 | TARGET = mailit | 1 | TARGET = mailit |
3 | CONFIG = qt warn_on release | 2 | CONFIG = qt warn_on release quick-app |
4 | HEADERS = emailclient.h \ | 3 | HEADERS = emailclient.h \ |
5 | emailhandler.h \ | 4 | emailhandler.h \ |
@@ -38,7 +37,4 @@ DEPENDPATH += $(OPIEDIR)/include | |||
38 | LIBS += -lqpe -lopie | 37 | LIBS += -lqpe -lopie |
39 | # -lssl | 38 | # -lssl |
40 | MOC_DIR=qpeobj | ||
41 | OBJECTS_DIR=qpeobj | ||
42 | DESTDIR=$(OPIEDIR)/bin | ||
43 | 39 | ||
44 | TRANSLATIONS = ../../../i18n/de/mailit.ts \ | 40 | TRANSLATIONS = ../../../i18n/de/mailit.ts \ |
diff --git a/noncore/unsupported/mailit/mailitwindow.h b/noncore/unsupported/mailit/mailitwindow.h index e818d32..11e56b9 100644 --- a/noncore/unsupported/mailit/mailitwindow.h +++ b/noncore/unsupported/mailit/mailitwindow.h | |||
@@ -34,4 +34,5 @@ class MailItWindow: public QMainWindow | |||
34 | Q_OBJECT | 34 | Q_OBJECT |
35 | public: | 35 | public: |
36 | static QString appName() { return QString::fromLatin1("mailit"); } | ||
36 | MailItWindow(QWidget *parent = 0, const char *name = 0, WFlags fl = 0); | 37 | MailItWindow(QWidget *parent = 0, const char *name = 0, WFlags fl = 0); |
37 | ~MailItWindow(); | 38 | ~MailItWindow(); |
diff --git a/noncore/unsupported/mailit/main.cpp b/noncore/unsupported/mailit/main.cpp index 3a3e1fc..71f8877 100644 --- a/noncore/unsupported/mailit/main.cpp +++ b/noncore/unsupported/mailit/main.cpp | |||
@@ -21,9 +21,5 @@ | |||
21 | #include "mailitwindow.h" | 21 | #include "mailitwindow.h" |
22 | 22 | ||
23 | int main(int argc, char* argv[]) | 23 | #include <opie/oapplicationfactory.h> |
24 | { | 24 | |
25 | QPEApplication a( argc, argv ); | 25 | OPIE_EXPORT_APP( OApplicationFactory<MailItWindow> ) \ No newline at end of file |
26 | MailItWindow mw(0, 0); | ||
27 | a.showMainDocumentWidget(&mw); | ||
28 | return a.exec(); | ||
29 | } | ||