author | zautrix <zautrix> | 2004-10-30 17:07:04 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-30 17:07:04 (UTC) |
commit | 28df10a0eb5ff343191755a06391bc6ce2fd84b0 (patch) (unidiff) | |
tree | 930882e7400006887d68fd434939e3a376b8631b /kmicromail/opiemail.cpp | |
parent | c8662dc632987a317386b923e24acb9507859528 (diff) | |
download | kdepimpi-28df10a0eb5ff343191755a06391bc6ce2fd84b0.zip kdepimpi-28df10a0eb5ff343191755a06391bc6ce2fd84b0.tar.gz kdepimpi-28df10a0eb5ff343191755a06391bc6ce2fd84b0.tar.bz2 |
ompi fixes
-rw-r--r-- | kmicromail/opiemail.cpp | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index e088b9e..ca3faaf 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp | |||
@@ -1,8 +1,9 @@ | |||
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 | #include "koprefsdialog.h" | 4 | #include "koprefsdialog.h" |
5 | #include <kapplication.h> | ||
5 | #include <libkdepim/externalapphandler.h> | 6 | #include <libkdepim/externalapphandler.h> |
6 | #include <libkdepim/kpimglobalprefs.h> | 7 | #include <libkdepim/kpimglobalprefs.h> |
7 | #ifdef MINIKDE_KDIALOG_H | 8 | #ifdef MINIKDE_KDIALOG_H |
8 | #undef MINIKDE_KDIALOG_H | 9 | #undef MINIKDE_KDIALOG_H |
@@ -30,13 +31,8 @@ | |||
30 | #endif | 31 | #endif |
31 | #include <libmailwrapper/smtpwrapper.h> | 32 | #include <libmailwrapper/smtpwrapper.h> |
32 | #include <libmailwrapper/mailtypes.h> | 33 | #include <libmailwrapper/mailtypes.h> |
33 | #include <libmailwrapper/abstractmail.h> | 34 | #include <libmailwrapper/abstractmail.h> |
34 | /* OPIE */ | ||
35 | //#include <qpe/resource.h> | ||
36 | //#include <qpe/qpeapplication.h> | ||
37 | |||
38 | /* QT */ | ||
39 | 35 | ||
40 | //using namespace Opie::Core; | 36 | //using namespace Opie::Core; |
41 | 37 | ||
42 | OpieMail::OpieMail( QWidget *parent, const char *name ) | 38 | OpieMail::OpieMail( QWidget *parent, const char *name ) |
@@ -220,23 +216,25 @@ void OpieMail::slotSearchMails() | |||
220 | } | 216 | } |
221 | 217 | ||
222 | void OpieMail::slotEditSettings() | 218 | void OpieMail::slotEditSettings() |
223 | { | 219 | { |
224 | #if 0 | 220 | |
225 | SettingsDialog settingsDialog( this, 0, true, WStyle_ContextHelp ); | ||
226 | settingsDialog.showMaximized(); | ||
227 | settingsDialog.exec(); | ||
228 | #endif | ||
229 | KOPrefsDialog settingsDialog( this, "koprefs", true ); | 221 | KOPrefsDialog settingsDialog( this, "koprefs", true ); |
222 | #ifndef DESKTOP_VERSION | ||
230 | settingsDialog.showMaximized(); | 223 | settingsDialog.showMaximized(); |
224 | #endif | ||
231 | settingsDialog.exec(); | 225 | settingsDialog.exec(); |
226 | |||
227 | // KApplication::execDialog(settingsDialog); | ||
232 | } | 228 | } |
233 | 229 | ||
234 | void OpieMail::slotEditAccounts() | 230 | void OpieMail::slotEditAccounts() |
235 | { | 231 | { |
236 | EditAccounts eaDialog( settings, this, 0, true ); | 232 | EditAccounts eaDialog( settings, this, 0, true ); |
237 | eaDialog.slotAdjustColumns(); | 233 | eaDialog.slotAdjustColumns(); |
234 | #ifndef DESKTOP_VERSION | ||
238 | eaDialog.showMaximized(); | 235 | eaDialog.showMaximized(); |
236 | #endif | ||
239 | eaDialog.exec(); | 237 | eaDialog.exec(); |
240 | if ( settings ) delete settings; | 238 | if ( settings ) delete settings; |
241 | settings = new Settings(); | 239 | settings = new Settings(); |
242 | 240 | ||
@@ -251,9 +249,13 @@ void OpieMail::displayMail() | |||
251 | RecBodyP body = folderView->fetchBody(mail); | 249 | RecBodyP body = folderView->fetchBody(mail); |
252 | ViewMail readMail( this,"", Qt::WType_Modal ); | 250 | ViewMail readMail( this,"", Qt::WType_Modal ); |
253 | readMail.setBody( body ); | 251 | readMail.setBody( body ); |
254 | readMail.setMail( mail ); | 252 | readMail.setMail( mail ); |
253 | #ifndef DESKTOP_VERSION | ||
255 | readMail.showMaximized(); | 254 | readMail.showMaximized(); |
255 | #else | ||
256 | readMail.resize( 640, 480); | ||
257 | #endif | ||
256 | readMail.exec(); | 258 | readMail.exec(); |
257 | 259 | ||
258 | if ( readMail.deleted ) | 260 | if ( readMail.deleted ) |
259 | { | 261 | { |
@@ -471,7 +473,11 @@ void OpieMail::reEditMail() | |||
471 | 473 | ||
472 | ComposeMail compose( settings, this, 0, true ); | 474 | ComposeMail compose( settings, this, 0, true ); |
473 | compose.reEditMail(((MailListViewItem*)mailView->currentItem() )->data()); | 475 | compose.reEditMail(((MailListViewItem*)mailView->currentItem() )->data()); |
474 | compose.slotAdjustColumns(); | 476 | compose.slotAdjustColumns(); |
477 | #ifndef DESKTOP_VERSION | ||
475 | compose.showMaximized(); | 478 | compose.showMaximized(); |
479 | #else | ||
480 | compose.resize(640,480); | ||
481 | #endif | ||
476 | compose.exec(); | 482 | compose.exec(); |
477 | } | 483 | } |