QPEApplication::showDialog() and QPEAPplication::execDialog() for better big screen handling

12 files changed, 28 insertions, 65 deletions

diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp
index a5adc03..ce8fb6b 100644
--- a/core/apps/embeddedkonsole/konsole.cpp
+++ b/core/apps/embeddedkonsole/konsole.cpp
@@ -46,5 +46,6 @@
 #include <qtabbar.h>
-#include <qpe/config.h>
 #include <qstringlist.h>
 #include <qpalette.h>
+#include <qpe/config.h>
+#include <qpe/qpeapplication.h>
 
@@ -1078,3 +1079,3 @@ void Konsole::editCommandListMenuSelected(int iD)
     connect(m,SIGNAL(commandsEdited()),this,SLOT(initCommandList()));
-    m->showMaximized();
+    QPEApplication::showDialog( m );
     }
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index be18140..1299fe3 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -944,4 +944,3 @@ bool TextEdit::saveAs() {
                                                0,(const QString &)fileNm);
-                filePerm->showMaximized();
-                filePerm->exec();
+                QPEApplication::execDialog( filePerm );
 
@@ -1018,4 +1017,3 @@ void TextEdit::changeFont() {
 
-  d-> showMaximized ( );
-    if ( d-> exec ( ) == QDialog::Accepted )
+    if ( QPEApplication::execDialog( d ) == QDialog::Accepted )
       editor-> setFont ( ofs-> selectedFont ( ));
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 5fb605b..82fd1e1 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -951,4 +951,3 @@ void PlayListWidget::listDelete() {
             LnkProperties prop( Pdit.current() );
-            prop.showMaximized();
-            prop.exec();
+            QPEApplication::execDialog( &prop );
          }
diff --git a/core/pim/addressbook/abeditor.cpp b/core/pim/addressbook/abeditor.cpp
index 91e8722..75e7ede 100644
--- a/core/pim/addressbook/abeditor.cpp
+++ b/core/pim/addressbook/abeditor.cpp
@@ -532,4 +532,3 @@ void AbEditor::slotNote()
 {
-    dlgNote->showMaximized();
-    if ( !dlgNote->exec() ) {
+    if ( ! QPEApplication::execDialog( &dlgNote ) ) {
 	// reset the note...
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 00cd2a6..1c7ddd4 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -284,4 +284,3 @@ void AddressbookWindow::slotConfig()
 	dlg -> setConfig( m_config );
-	dlg -> showMaximized();
-	if ( dlg -> exec() ) {
+	if ( QPEApplication::execDialog( dlg ) ) {
 		qWarning ("Config Dialog accepted!");
@@ -752,8 +751,5 @@ void AddressbookWindow::editEntry( EntryMode entryMode )
 
-#if defined(Q_WS_QWS) || defined(_WS_QWS_)
-	abEditor->showMaximized();
-#endif
 	// fix the foxus...
 	abEditor->setNameFocus();
-	if ( abEditor->exec() ) {
+	if ( QPEApplication::execDialog( abEditor ) ) {
 		setFocus();
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index 8fbd065..7932781 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -1085,4 +1085,3 @@ void ContactEditor::slotNote() {
 
-	dlgNote->showMaximized();
-	if ( !dlgNote->exec() ) {
+    if ( ! QPEApplication::execDialog( dlgNote ) ) {
 		txtNote->setText( ent.notes() );
@@ -1100,4 +1099,3 @@ void ContactEditor::slotName() {
 
-	dlgName->showMaximized();
-	if ( dlgName->exec() ) {
+	if ( QPEApplication::execDialog( dlgName ) ) {
 		 if ( txtLastName->text().contains( ' ', TRUE ) )
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index 44f1515..706cc08 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -267,8 +267,3 @@ void DateBook::slotSettings()
 
-#if defined (Q_WS_QWS) || defined(_WS_QWS_)
-    frmSettings.showMaximized();
-#endif
-
-	if ( frmSettings.exec() ) {
-
+	if ( QPEApplication::execDialog( &frmSettings ) ) {
 		aPreset = frmSettings.alarmPreset();
@@ -439,6 +434,3 @@ void DateBook::duplicateEvent( const Event &e )
 
-#if defined(Q_WS_QWS) || defined(_WS_QWS_)
-    editDlg.showMaximized();
-#endif
-	while (editDlg.exec() ) {
+	while ( QPEApplication::execDialog( &editDlg ) ) {
 		Event newEv = entry->event();
@@ -488,6 +480,3 @@ void DateBook::editEvent( const Event &e )
 
-#if defined(Q_WS_QWS) || defined(_WS_QWS_)
-	editDlg.showMaximized();
-#endif
-	while (editDlg.exec() ) {
+	while ( QPEApplication::execDialog( &editDlg ) ) {
 		Event newEv = entry->event();
@@ -709,6 +698,3 @@ void DateBook::appMessage(const QCString& msg, const QByteArray& data)
 
-#if defined(Q_WS_QWS) || defined(_WS_QWS_)
-				dlg.showMaximized();
-#endif
-				needShow = dlg.exec();
+				needShow = QPEApplication::execDialog( &dlg );
 
@@ -904,6 +890,3 @@ void DateBook::slotNewEntry(const QDateTime &start, const QDateTime &end, const
 	sv->addChild( e );
-#if defined(Q_WS_QWS) || defined(_WS_QWS_)
-	newDlg.showMaximized();
-#endif
-	while (newDlg.exec()) {
+	while ( QPEApplication::execDialog( &newDlg ) ) {
 		ev = e->event();
diff --git a/core/pim/datebook/dateentryimpl.cpp b/core/pim/datebook/dateentryimpl.cpp
index d9e5225..856837c 100644
--- a/core/pim/datebook/dateentryimpl.cpp
+++ b/core/pim/datebook/dateentryimpl.cpp
@@ -251,6 +251,3 @@ void DateEntry::slotEditNote() {
 
-#if defined(Q_WS_QWS) || defined(_WS_QWS_)
-  noteDlg.showMaximized();
-#endif
-  if (noteDlg.exec() ) {
+  if ( QPEApplication::execDialog( &noteDlg ) ) {
     noteStr=noteDlg.note->text();
@@ -397,6 +394,3 @@ void DateEntry::slotRepeat()
 
-#if defined(Q_WS_QWS) || defined(_WS_QWS_)
-    e->showMaximized();
-#endif
-    if ( e->exec() ) {
+    if ( QPEApplication::execDialog( e ) ) {
 	rp = e->repeatPattern();
diff --git a/core/pim/datebook2/mainwindow.cpp b/core/pim/datebook2/mainwindow.cpp
index be30415..7ff2204 100644
--- a/core/pim/datebook2/mainwindow.cpp
+++ b/core/pim/datebook2/mainwindow.cpp
@@ -231,4 +231,3 @@ void MainWindow::slotConfigureLocs() {
     dlg.setCaption( tr("Configure Locations") );
-    dlg.showMaximized();
-    if (dlg.exec() == QDialog::Accepted ) {
+    if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ) {
         setLocationManager( dlg.manager() );
@@ -239,4 +238,3 @@ void MainWindow::slotConfigureDesc() {
     dlg.setCaption( tr("Configure Descriptions") );
-    dlg.showMaximized();
-    if (dlg.exec() == QDialog::Accepted ) {
+    if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ) {
         setDescriptionManager( dlg.manager() );
@@ -247,4 +245,3 @@ void MainWindow::slotConfigureTemp() {
     dlg.setCaption( tr("Configure Templates") );
-    dlg.showMaximized();
-    if ( dlg.exec() == QDialog::Accepted ) {
+    if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ) {
         m_tempMan = dlg.manager();
diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp
index d06a405..fc189bd 100644
--- a/core/pim/todo/mainwindow.cpp
+++ b/core/pim/todo/mainwindow.cpp
@@ -1030,4 +1030,3 @@ void MainWindow::doAlarm( const QDateTime& dt, int uid ) {
 
-    dlg.showMaximized();
-    bool needToStay = dlg.exec();
+    bool needToStay = QPEApplication::execDialog( &dlg );
 
diff --git a/core/pim/todo/todoeditor.cpp b/core/pim/todo/todoeditor.cpp
index c204325..78aedd6 100644
--- a/core/pim/todo/todoeditor.cpp
+++ b/core/pim/todo/todoeditor.cpp
@@ -1,2 +1,4 @@
 
+#include <qpe/qpeapplication.h>
+
 #include "otaskeditor.h"
@@ -21,6 +23,4 @@ OTodo Editor::newTodo( int cur,
 
+    int ret = QPEApplication::execDialog( e );
 
-    e->showMaximized();
-
-    int ret = e->exec();
     if ( QDialog::Accepted == ret ) {
@@ -43,4 +43,3 @@ OTodo Editor::edit( QWidget *,
 
-    e->showMaximized();
-    int ret = e->exec();
+    int ret = QPEApplication::execDialog( e );
 
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp
index d6d09a1..b21215b 100644
--- a/core/settings/light-and-power/light.cpp
+++ b/core/settings/light-and-power/light.cpp
@@ -35,2 +35,3 @@
 #endif
+#include <qpe/qpeapplication.h>
 
@@ -203,4 +204,3 @@ void LightSettings::calibrateSensor ( )
 	connect ( s, SIGNAL( viewBacklight ( int )), this, SLOT( setBacklight ( int )));
-	s-> showMaximized ( );
-	s-> exec ( );
+	QPEApplication::execDialog( s );
 	delete s;