summaryrefslogtreecommitdiffabout
path: root/kmicromail/opiemail.cpp
Side-by-side diff
Diffstat (limited to 'kmicromail/opiemail.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--kmicromail/opiemail.cpp26
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
@@ -3,4 +3,5 @@
#include "koprefsdialog.h"
+#include <kapplication.h>
#include <libkdepim/externalapphandler.h>
#include <libkdepim/kpimglobalprefs.h>
@@ -32,9 +33,4 @@
#include <libmailwrapper/mailtypes.h>
#include <libmailwrapper/abstractmail.h>
-/* OPIE */
-//#include <qpe/resource.h>
-//#include <qpe/qpeapplication.h>
-
-/* QT */
//using namespace Opie::Core;
@@ -222,12 +218,12 @@ void OpieMail::slotSearchMails()
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);
}
@@ -236,5 +232,7 @@ void OpieMail::slotEditAccounts()
EditAccounts eaDialog( settings, this, 0, true );
eaDialog.slotAdjustColumns();
+#ifndef DESKTOP_VERSION
eaDialog.showMaximized();
+#endif
eaDialog.exec();
if ( settings ) delete settings;
@@ -253,5 +251,9 @@ void OpieMail::displayMail()
readMail.setBody( body );
readMail.setMail( mail );
+#ifndef DESKTOP_VERSION
readMail.showMaximized();
+#else
+ readMail.resize( 640, 480);
+#endif
readMail.exec();
@@ -473,5 +475,9 @@ void OpieMail::reEditMail()
compose.reEditMail(((MailListViewItem*)mailView->currentItem() )->data());
compose.slotAdjustColumns();
+#ifndef DESKTOP_VERSION
compose.showMaximized();
+#else
+ compose.resize(640,480);
+#endif
compose.exec();
}