summaryrefslogtreecommitdiffabout
path: root/kmicromail
Unidiff
Diffstat (limited to 'kmicromail') (more/less context) (ignore 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
@@ -14,4 +14,4 @@
14 <y>0</y> 14 <y>0</y>
15 <width>276</width> 15 <width>579</width>
16 <height>263</height> 16 <height>476</height>
17 </rect> 17 </rect>
@@ -19,2 +19,9 @@
19 <property stdset="1"> 19 <property stdset="1">
20 <name>sizePolicy</name>
21 <sizepolicy>
22 <hsizetype>7</hsizetype>
23 <vsizetype>7</vsizetype>
24 </sizepolicy>
25 </property>
26 <property stdset="1">
20 <name>caption</name> 27 <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 \
37 storemail.cpp \ 37 storemail.cpp \
38 ./qpe/qdialog_hacked.cpp \ 38 ../qpe/qdialog_hacked.cpp \
39 ../qpe/global.cpp 39 ../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 )
181 li->addTo(helpMenu); 181 li->addTo(helpMenu);
182#ifdef DESKTOP_VERSION
183 resize ( 640, 480 );
184#endif
182} 185}
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 @@
4#include "koprefsdialog.h" 4#include "koprefsdialog.h"
5#include <kapplication.h>
5#include <libkdepim/externalapphandler.h> 6#include <libkdepim/externalapphandler.h>
@@ -33,7 +34,2 @@
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
@@ -223,10 +219,10 @@ 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}
@@ -237,3 +233,5 @@ void OpieMail::slotEditAccounts()
237 eaDialog.slotAdjustColumns(); 233 eaDialog.slotAdjustColumns();
234#ifndef DESKTOP_VERSION
238 eaDialog.showMaximized(); 235 eaDialog.showMaximized();
236#endif
239 eaDialog.exec(); 237 eaDialog.exec();
@@ -254,3 +252,7 @@ void OpieMail::displayMail()
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();
@@ -474,3 +476,7 @@ void OpieMail::reEditMail()
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();
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 @@
7#warning including /usr/local/qt/include/qdialog.h 7#warning including /usr/local/qt/include/qdialog.h
8#warning if you get an compiling error please adjust your path her 8#warning if you get a compiling error
9#warning please adjust your path here!
9 10
@@ -28,6 +29,3 @@ class QDialog_hacked : public QDialog
28#warning ****************************************** 29#warning ******************************************
29#warning ****************************************** 30#warning "/usr/local/qt/include/qdialog.h" for KDialog
30#warning ******************************************
31#warning ******************************************
32#warning ******************************************
33#include "/usr/local/qt/include/qdialog.h" 31#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 @@
9 QDialog_hacked::QDialog_hacked ( QWidget * parent, const char * name, bool modal, WFlags f ) 9 QDialog_hacked::QDialog_hacked ( QWidget * parent, const char * name, bool modal, WFlags f )
10 : QDialog( parent,name,modal) 10 : QDialog( parent,name,modal, f)
11 { 11 {
@@ -15,3 +15,3 @@
15 qDebug("******************** "); 15 qDebug("******************** ");
16 qDebug("New hacked QDialog == KDialogBase "); 16 qDebug("New hacked QDialog for ompi ");
17 //QTimer::singleShot( 1, this,SLOT(addaddbuttons()) ); 17 //QTimer::singleShot( 1, this,SLOT(addaddbuttons()) );
@@ -26,2 +26,3 @@
26 connect ( cancel, SIGNAL ( clicked()),this, SLOT (reject() ) ); 26 connect ( cancel, SIGNAL ( clicked()),this, SLOT (reject() ) );
27 //setWFlags(WStyle_MinMax );
27 28