summaryrefslogtreecommitdiffabout
path: root/kmicromail
Side-by-side diff
Diffstat (limited to 'kmicromail') (more/less context) (show whitespace changes)
-rw-r--r--kmicromail/composemailui.ui11
-rw-r--r--kmicromail/libmailwrapper/libmailwrapper.pro2
-rw-r--r--kmicromail/mainwindow.cpp3
-rw-r--r--kmicromail/opiemail.cpp26
-rw-r--r--kmicromail/qpe/qdialog.h8
-rw-r--r--kmicromail/qpe/qdialog_hacked.cpp5
6 files changed, 35 insertions, 20 deletions
diff --git a/kmicromail/composemailui.ui b/kmicromail/composemailui.ui
index c66b0c8..029922c 100644
--- a/kmicromail/composemailui.ui
+++ b/kmicromail/composemailui.ui
@@ -11,13 +11,20 @@
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
- <width>276</width>
- <height>263</height>
+ <width>579</width>
+ <height>476</height>
</rect>
</property>
<property stdset="1">
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>7</vsizetype>
+ </sizepolicy>
+ </property>
+ <property stdset="1">
<name>caption</name>
<string>Compose Message</string>
</property>
<property>
diff --git a/kmicromail/libmailwrapper/libmailwrapper.pro b/kmicromail/libmailwrapper/libmailwrapper.pro
index 10d45b1..0919cd2 100644
--- a/kmicromail/libmailwrapper/libmailwrapper.pro
+++ b/kmicromail/libmailwrapper/libmailwrapper.pro
@@ -34,9 +34,9 @@ SOURCES = imapwrapper.cpp \
mhwrapper.cpp \
nntpwrapper.cpp \
generatemail.cpp \
storemail.cpp \
- ./qpe/qdialog_hacked.cpp \
+ ../qpe/qdialog_hacked.cpp \
../qpe/global.cpp
INTERFACES = logindialogui.ui \
sendmailprogressui.ui
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index 7655385..4115276 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -178,8 +178,11 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
li->addTo(helpMenu);
li = new QAction(i18n("LibEtPan Licence"), QPixmap(), 0, 0, this);
connect( li, SIGNAL( activated() ), SLOT( showEtpanLicence()) );
li->addTo(helpMenu);
+#ifdef DESKTOP_VERSION
+ resize ( 640, 480 );
+#endif
}
MainWindow::~MainWindow()
{
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 @@
// 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
@@ -30,13 +31,8 @@
#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 )
@@ -220,23 +216,25 @@ 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);
}
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();
@@ -251,9 +249,13 @@ void OpieMail::displayMail()
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 )
{
@@ -471,7 +473,11 @@ void OpieMail::reEditMail()
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();
}
diff --git a/kmicromail/qpe/qdialog.h b/kmicromail/qpe/qdialog.h
index d671e34..aafdf80 100644
--- a/kmicromail/qpe/qdialog.h
+++ b/kmicromail/qpe/qdialog.h
@@ -4,9 +4,10 @@
#ifndef DEFINE_QDIALOG_HACK
#define DEFINE_QDIALOG_HACK
#warning call of include <qdialog.h>
#warning including /usr/local/qt/include/qdialog.h
-#warning if you get an compiling error please adjust your path her
+#warning if you get a compiling error
+#warning please adjust your path here!
#include "/usr/local/qt/include/qdialog.h"
class QDialog_hacked : public QDialog
{
@@ -25,11 +26,8 @@ class QDialog_hacked : public QDialog
#warning ******************************************
#warning ******************************************
#warning ******************************************
#warning ******************************************
-#warning ******************************************
-#warning ******************************************
-#warning ******************************************
-#warning ******************************************
+#warning "/usr/local/qt/include/qdialog.h" for KDialog
#include "/usr/local/qt/include/qdialog.h"
#endif
diff --git a/kmicromail/qpe/qdialog_hacked.cpp b/kmicromail/qpe/qdialog_hacked.cpp
index e2ce21a..3669312 100644
--- a/kmicromail/qpe/qdialog_hacked.cpp
+++ b/kmicromail/qpe/qdialog_hacked.cpp
@@ -6,15 +6,15 @@
#ifdef QDialog
#undef QDialog
#endif
QDialog_hacked::QDialog_hacked ( QWidget * parent, const char * name, bool modal, WFlags f )
- : QDialog( parent,name,modal)
+ : QDialog( parent,name,modal, f)
{
qDebug("******************** ");
qDebug("******************** ");
qDebug("******************** ");
qDebug("******************** ");
- qDebug("New hacked QDialog == KDialogBase ");
+ qDebug("New hacked QDialog for ompi ");
//QTimer::singleShot( 1, this,SLOT(addaddbuttons()) );
setOrientation ( Vertical );
QHBox * hb = new QHBox ( this );
@@ -23,8 +23,9 @@
setExtension ( hb );
showExtension ( true );
connect ( ok, SIGNAL ( clicked()),this, SLOT (accept() ) );
connect ( cancel, SIGNAL ( clicked()),this, SLOT (reject() ) );
+ //setWFlags(WStyle_MinMax );
}