| -rw-r--r-- | kmicromail/composemailui.ui | 11 | ||||
| -rw-r--r-- | kmicromail/libmailwrapper/libmailwrapper.pro | 2 | ||||
| -rw-r--r-- | kmicromail/mainwindow.cpp | 3 | ||||
| -rw-r--r-- | kmicromail/opiemail.cpp | 26 | ||||
| -rw-r--r-- | kmicromail/qpe/qdialog.h | 8 | ||||
| -rw-r--r-- | kmicromail/qpe/qdialog_hacked.cpp | 5 | ||||
| -rw-r--r-- | microkde/kapplication.cpp | 4 |
7 files changed, 38 insertions, 21 deletions
diff --git a/kmicromail/composemailui.ui b/kmicromail/composemailui.ui index c66b0c8..029922c 100644 --- a/kmicromail/composemailui.ui +++ b/kmicromail/composemailui.ui @@ -14,4 +14,4 @@ <y>0</y> - <width>276</width> - <height>263</height> + <width>579</width> + <height>476</height> </rect> @@ -19,2 +19,9 @@ <property stdset="1"> + <name>sizePolicy</name> + <sizepolicy> + <hsizetype>7</hsizetype> + <vsizetype>7</vsizetype> + </sizepolicy> + </property> + <property stdset="1"> <name>caption</name> 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 @@ -37,3 +37,3 @@ SOURCES = imapwrapper.cpp \ storemail.cpp \ - ./qpe/qdialog_hacked.cpp \ + ../qpe/qdialog_hacked.cpp \ ../qpe/global.cpp diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp index 7655385..4115276 100644 --- a/kmicromail/mainwindow.cpp +++ b/kmicromail/mainwindow.cpp @@ -181,2 +181,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) li->addTo(helpMenu); +#ifdef DESKTOP_VERSION + resize ( 640, 480 ); +#endif } diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index e088b9e..ca3faaf 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp @@ -4,2 +4,3 @@ #include "koprefsdialog.h" +#include <kapplication.h> #include <libkdepim/externalapphandler.h> @@ -33,7 +34,2 @@ #include <libmailwrapper/abstractmail.h> -/* OPIE */ -//#include <qpe/resource.h> -//#include <qpe/qpeapplication.h> - -/* QT */ @@ -223,10 +219,10 @@ 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); } @@ -237,3 +233,5 @@ void OpieMail::slotEditAccounts() eaDialog.slotAdjustColumns(); +#ifndef DESKTOP_VERSION eaDialog.showMaximized(); +#endif eaDialog.exec(); @@ -254,3 +252,7 @@ void OpieMail::displayMail() readMail.setMail( mail ); +#ifndef DESKTOP_VERSION readMail.showMaximized(); +#else + readMail.resize( 640, 480); +#endif readMail.exec(); @@ -474,3 +476,7 @@ void OpieMail::reEditMail() 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 @@ -7,3 +7,4 @@ #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! @@ -28,6 +29,3 @@ class QDialog_hacked : public QDialog #warning ****************************************** -#warning ****************************************** -#warning ****************************************** -#warning ****************************************** -#warning ****************************************** +#warning "/usr/local/qt/include/qdialog.h" for KDialog #include "/usr/local/qt/include/qdialog.h" 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 @@ -9,3 +9,3 @@ QDialog_hacked::QDialog_hacked ( QWidget * parent, const char * name, bool modal, WFlags f ) - : QDialog( parent,name,modal) + : QDialog( parent,name,modal, f) { @@ -15,3 +15,3 @@ qDebug("******************** "); - qDebug("New hacked QDialog == KDialogBase "); + qDebug("New hacked QDialog for ompi "); //QTimer::singleShot( 1, this,SLOT(addaddbuttons()) ); @@ -26,2 +26,3 @@ connect ( cancel, SIGNAL ( clicked()),this, SLOT (reject() ) ); + //setWFlags(WStyle_MinMax ); diff --git a/microkde/kapplication.cpp b/microkde/kapplication.cpp index 56c01af..d6f556d 100644 --- a/microkde/kapplication.cpp +++ b/microkde/kapplication.cpp @@ -38,2 +38,4 @@ int KApplication::execDialog( QDialog* d ) d->showMaximized(); + else + ;//d->resize( 800, 600 ); return d->exec(); @@ -42,3 +44,3 @@ void KApplication::showLicence() { - KApplication::showFile( "KDE-Pim/Pi licence", "kdepim/LICENCE.TXT" ); + KApplication::showFile( "KDE-Pim/Pi licence", "kdepim/licence.txt" ); } |