-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,12 +1,13 @@ // CHANGED 2004-09-31 Lutz Rogowski // CHANGED 2004-08-06 Lutz Rogowski #include "koprefsdialog.h" +#include <kapplication.h> #include <libkdepim/externalapphandler.h> #include <libkdepim/kpimglobalprefs.h> #ifdef MINIKDE_KDIALOG_H #undef MINIKDE_KDIALOG_H #endif #include "settingsdialog.h" #include "opiemail.h" #include "editaccounts.h" @@ -26,21 +27,16 @@ #ifdef DESKTOP_VERSION #include <qapplication.h> #else #include <qpe/qpeapplication.h> #endif #include <libmailwrapper/smtpwrapper.h> #include <libmailwrapper/mailtypes.h> #include <libmailwrapper/abstractmail.h> -/* OPIE */ -//#include <qpe/resource.h> -//#include <qpe/qpeapplication.h> - -/* QT */ //using namespace Opie::Core; OpieMail::OpieMail( QWidget *parent, const char *name ) : MainWindow( parent, name) //, WStyle_ContextHelp ) { settings = new Settings(); @@ -216,48 +212,54 @@ void OpieMail::slotSendQueued() void OpieMail::slotSearchMails() { qDebug("OpieMail::slotSearchMails():not implemented "); } void OpieMail::slotEditSettings() { -#if 0 - SettingsDialog settingsDialog( this, 0, true, WStyle_ContextHelp ); - settingsDialog.showMaximized(); - settingsDialog.exec(); -#endif + KOPrefsDialog settingsDialog( this, "koprefs", true ); +#ifndef DESKTOP_VERSION settingsDialog.showMaximized(); +#endif settingsDialog.exec(); + + // KApplication::execDialog(settingsDialog); } void OpieMail::slotEditAccounts() { EditAccounts eaDialog( settings, this, 0, true ); eaDialog.slotAdjustColumns(); +#ifndef DESKTOP_VERSION eaDialog.showMaximized(); +#endif eaDialog.exec(); if ( settings ) delete settings; settings = new Settings(); folderView->populate( settings->getAccounts() ); } void OpieMail::displayMail() { QListViewItem*item = mailView->currentItem(); if (!item) return; RecMailP mail = ((MailListViewItem*)item)->data(); RecBodyP body = folderView->fetchBody(mail); ViewMail readMail( this,"", Qt::WType_Modal ); readMail.setBody( body ); readMail.setMail( mail ); +#ifndef DESKTOP_VERSION readMail.showMaximized(); +#else + readMail.resize( 640, 480); +#endif readMail.exec(); if ( readMail.deleted ) { folderView->refreshCurrent(); } else { @@ -467,11 +469,15 @@ void OpieMail::slotMoveCopyAllMail() void OpieMail::reEditMail() { if (!mailView->currentItem()) return; ComposeMail compose( settings, this, 0, true ); compose.reEditMail(((MailListViewItem*)mailView->currentItem() )->data()); compose.slotAdjustColumns(); +#ifndef DESKTOP_VERSION compose.showMaximized(); +#else + compose.resize(640,480); +#endif compose.exec(); } |