Qtopia1-6 merge

still to test
bic changes to be resolved
more changes to be made?

1 files changed, 33 insertions, 7 deletions

diff --git a/library/qpeapplication.h b/library/qpeapplication.h
index 23606db..2515f1b 100644
--- a/library/qpeapplication.h
+++ b/library/qpeapplication.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -24,2 +24,3 @@
 #include <qapplication.h>
+#include <qdialog.h>
 #if defined(_WS_QWS_) && !defined(Q_WS_QWS)
@@ -63,3 +64,3 @@ public:
     };
-    
+
     enum screenSaverHint {
@@ -70,3 +71,3 @@ public:
     };
-    
+
     static void setInputMethodHint( QWidget *, InputMethodHint );
@@ -76,2 +77,4 @@ public:
     void showMainDocumentWidget( QWidget*, bool nomax=FALSE );
+    static void showDialog( QDialog*, bool nomax=FALSE );
+    static int execDialog( QDialog*, bool nomax=FALSE );
 
@@ -80,2 +83,4 @@ public:
 
+    bool keyboardGrabbed() const;
+
     int exec();
@@ -86,4 +91,4 @@ signals:
     void clockChanged( bool pm );
+    void micChanged( bool muted );
     void volumeChanged( bool muted );
-	void micChanged( bool muted );
     void appMessage( const QCString& msg, const QByteArray& data);
@@ -93,3 +98,3 @@ signals:
     void reload();
-    
+
 private slots:
@@ -108,3 +113,2 @@ protected:
     void timerEvent( QTimerEvent * );
-    bool keyboardGrabbed() const;
     bool raiseAppropriateWindow();
@@ -127,2 +131,24 @@ private:
 
+inline void QPEApplication::showDialog( QDialog* d, bool nomax )
+{
+    QSize sh = d->sizeHint();
+    int w = QMAX(sh.width(),d->width());
+    int h = QMAX(sh.height(),d->height());
+    if ( !nomax
+	&& ( w > qApp->desktop()->width()*3/4
+	    || h > qApp->desktop()->height()*3/4 ) )
+    {
+	d->showMaximized();
+    } else {
+	d->resize(w,h);
+	d->show();
+    }
+}
+
+inline int QPEApplication::execDialog( QDialog* d, bool nomax )
+{
+    showDialog(d,nomax);
+    return d->exec();
+}
+