From 28df10a0eb5ff343191755a06391bc6ce2fd84b0 Mon Sep 17 00:00:00 2001 From: zautrix Date: Sat, 30 Oct 2004 17:07:04 +0000 Subject: ompi fixes --- (limited to 'kmicromail') diff --git a/kmicromail/composemailui.ui b/kmicromail/composemailui.ui index c66b0c8..029922c 100644 --- a/kmicromail/composemailui.ui +++ b/kmicromail/composemailui.ui @@ -12,11 +12,18 @@ 0 0 - 276 - 263 + 579 + 476 + sizePolicy + + 7 + 7 + + + caption Compose Message 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 @@ -35,7 +35,7 @@ SOURCES = imapwrapper.cpp \ nntpwrapper.cpp \ generatemail.cpp \ storemail.cpp \ - ./qpe/qdialog_hacked.cpp \ + ../qpe/qdialog_hacked.cpp \ ../qpe/global.cpp INTERFACES = logindialogui.ui \ diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp index 7655385..4115276 100644 --- a/kmicromail/mainwindow.cpp +++ b/kmicromail/mainwindow.cpp @@ -179,6 +179,9 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) 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 @@ -2,6 +2,7 @@ // CHANGED 2004-08-06 Lutz Rogowski #include "koprefsdialog.h" +#include #include #include #ifdef MINIKDE_KDIALOG_H @@ -31,11 +32,6 @@ #include #include #include -/* OPIE */ -//#include -//#include - -/* QT */ //using namespace Opie::Core; @@ -221,21 +217,23 @@ 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(); @@ -252,7 +250,11 @@ void OpieMail::displayMail() 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 ) @@ -472,6 +474,10 @@ 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 @@ -5,7 +5,8 @@ #define DEFINE_QDIALOG_HACK #warning call of include #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 @@ -26,10 +27,7 @@ class QDialog_hacked : public QDialog #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 @@ -7,13 +7,13 @@ #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 ); @@ -24,6 +24,7 @@ showExtension ( true ); connect ( ok, SIGNAL ( clicked()),this, SLOT (accept() ) ); connect ( cancel, SIGNAL ( clicked()),this, SLOT (reject() ) ); + //setWFlags(WStyle_MinMax ); } -- cgit v0.9.0.2