-rw-r--r-- | kmicromail/opiemail.cpp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index 915b3e8..6e54bf4 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp | |||
@@ -1,11 +1,15 @@ | |||
1 | // CHANGED 2004-09-31 Lutz Rogowski | 1 | // CHANGED 2004-09-31 Lutz Rogowski |
2 | // CHANGED 2004-08-06 Lutz Rogowski | 2 | // CHANGED 2004-08-06 Lutz Rogowski |
3 | 3 | ||
4 | |||
5 | #define protected public | ||
6 | #include <qwidget.h> | ||
7 | #undef protected | ||
4 | #include "koprefsdialog.h" | 8 | #include "koprefsdialog.h" |
5 | #include <kapplication.h> | 9 | #include <kapplication.h> |
6 | #include <libkdepim/externalapphandler.h> | 10 | #include <libkdepim/externalapphandler.h> |
7 | #include <libkdepim/kpimglobalprefs.h> | 11 | #include <libkdepim/kpimglobalprefs.h> |
8 | #ifdef MINIKDE_KDIALOG_H | 12 | #ifdef MINIKDE_KDIALOG_H |
9 | #undef MINIKDE_KDIALOG_H | 13 | #undef MINIKDE_KDIALOG_H |
10 | #endif | 14 | #endif |
11 | #include "settingsdialog.h" | 15 | #include "settingsdialog.h" |
@@ -17,16 +21,17 @@ | |||
17 | #include "selectstore.h" | 21 | #include "selectstore.h" |
18 | #include "selectsmtp.h" | 22 | #include "selectsmtp.h" |
19 | #include "accountitem.h" | 23 | #include "accountitem.h" |
20 | #include "klocale.h" | 24 | #include "klocale.h" |
21 | 25 | ||
22 | #include <qmessagebox.h> | 26 | #include <qmessagebox.h> |
23 | #include <qtimer.h> | 27 | #include <qtimer.h> |
24 | #include <qcursor.h> | 28 | #include <qcursor.h> |
29 | #include <qtextbrowser.h> | ||
25 | #include <qregexp.h> | 30 | #include <qregexp.h> |
26 | #include <qpe/global.h> | 31 | #include <qpe/global.h> |
27 | 32 | ||
28 | #ifdef DESKTOP_VERSION | 33 | #ifdef DESKTOP_VERSION |
29 | #include <qapplication.h> | 34 | #include <qapplication.h> |
30 | #else | 35 | #else |
31 | #include <qpe/qpeapplication.h> | 36 | #include <qpe/qpeapplication.h> |
32 | #endif | 37 | #endif |
@@ -36,25 +41,27 @@ | |||
36 | #include "koprefs.h" | 41 | #include "koprefs.h" |
37 | 42 | ||
38 | //using namespace Opie::Core; | 43 | //using namespace Opie::Core; |
39 | 44 | ||
40 | OpieMail::OpieMail( QWidget *parent, const char *name ) | 45 | OpieMail::OpieMail( QWidget *parent, const char *name ) |
41 | : MainWindow( parent, name) //, WStyle_ContextHelp ) | 46 | : MainWindow( parent, name) //, WStyle_ContextHelp ) |
42 | { | 47 | { |
43 | settings = new Settings(); | 48 | settings = new Settings(); |
44 | 49 | tb = 0; | |
45 | setIcon(SmallIcon( "kmicromail" ) ); | 50 | setIcon(SmallIcon( "kmicromail" ) ); |
46 | folderView->populate( settings->getAccounts() ); | 51 | folderView->populate( settings->getAccounts() ); |
47 | 52 | ||
48 | } | 53 | } |
49 | 54 | ||
50 | OpieMail::~OpieMail() | 55 | OpieMail::~OpieMail() |
51 | { | 56 | { |
52 | if (settings) delete settings; | 57 | if (settings) delete settings; |
58 | if ( tb ) | ||
59 | delete tb; | ||
53 | } | 60 | } |
54 | 61 | ||
55 | void OpieMail::appMessage(const QCString &msg, const QByteArray &data) | 62 | void OpieMail::appMessage(const QCString &msg, const QByteArray &data) |
56 | { | 63 | { |
57 | 64 | ||
58 | } | 65 | } |
59 | #include <stdlib.h> | 66 | #include <stdlib.h> |
60 | void OpieMail::message(const QCString &msg, const QByteArray &data) | 67 | void OpieMail::message(const QCString &msg, const QByteArray &data) |
@@ -298,16 +305,23 @@ void OpieMail::replyMail() | |||
298 | } | 305 | } |
299 | delete settings; | 306 | delete settings; |
300 | 307 | ||
301 | } | 308 | } |
302 | void OpieMail::closeViewMail(ViewMail * vm) | 309 | void OpieMail::closeViewMail(ViewMail * vm) |
303 | { | 310 | { |
304 | vm->hide(); | 311 | vm->hide(); |
305 | } | 312 | } |
313 | |||
314 | void OpieMail::slotDownloadMail( ) | ||
315 | { | ||
316 | qDebug("slotDownloadMail( ) "); | ||
317 | } | ||
318 | |||
319 | |||
306 | void OpieMail::deleteAndDisplayNextMail(ViewMail * vm) | 320 | void OpieMail::deleteAndDisplayNextMail(ViewMail * vm) |
307 | { | 321 | { |
308 | QListViewItem*item = mailView->currentItem(); | 322 | QListViewItem*item = mailView->currentItem(); |
309 | if (!item ) { | 323 | if (!item ) { |
310 | closeViewMail(vm); | 324 | closeViewMail(vm); |
311 | return; | 325 | return; |
312 | } | 326 | } |
313 | RecMailP mail = ((MailListViewItem*)item)->data(); | 327 | RecMailP mail = ((MailListViewItem*)item)->data(); |
@@ -350,16 +364,17 @@ void OpieMail::displayMail() | |||
350 | readMail.setMail( mail ); | 364 | readMail.setMail( mail ); |
351 | #ifndef DESKTOP_VERSION | 365 | #ifndef DESKTOP_VERSION |
352 | readMail.showMaximized(); | 366 | readMail.showMaximized(); |
353 | #else | 367 | #else |
354 | readMail.resize( 640, 480); | 368 | readMail.resize( 640, 480); |
355 | #endif | 369 | #endif |
356 | connect( &readMail,SIGNAL( showNextMail(ViewMail *) ), this, SLOT( displayNextMail(ViewMail *) ) ); | 370 | connect( &readMail,SIGNAL( showNextMail(ViewMail *) ), this, SLOT( displayNextMail(ViewMail *) ) ); |
357 | connect( &readMail,SIGNAL( deleteAndDisplayNextMail(ViewMail *) ), this, SLOT(deleteAndDisplayNextMail(ViewMail *) ) ); | 371 | connect( &readMail,SIGNAL( deleteAndDisplayNextMail(ViewMail *) ), this, SLOT(deleteAndDisplayNextMail(ViewMail *) ) ); |
372 | connect( &readMail,SIGNAL( signalDownloadMail() ), this, SLOT( slotDownloadMail() ) ); | ||
358 | 373 | ||
359 | readMail.exec(); | 374 | readMail.exec(); |
360 | 375 | ||
361 | if ( readMail.deleted ) | 376 | if ( readMail.deleted ) |
362 | { | 377 | { |
363 | folderView->refreshCurrent(); | 378 | folderView->refreshCurrent(); |
364 | } | 379 | } |
365 | else | 380 | else |