author | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
commit | 6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4 (patch) (unidiff) | |
tree | 6ebc93c6432f4ed9d00ef1448b6a047ef522a79a /library/qpeapplication.h | |
parent | d10cddb3c9ce75bc90b14add14bc133737fe35aa (diff) | |
download | opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.zip opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.gz opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.bz2 |
Qtopia1-6 merge
still to test
bic changes to be resolved
more changes to be made?
-rw-r--r-- | library/qpeapplication.h | 40 |
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,6 +1,6 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
@@ -23,4 +23,5 @@ | |||
23 | 23 | ||
24 | #include <qapplication.h> | 24 | #include <qapplication.h> |
25 | #include <qdialog.h> | ||
25 | #if defined(_WS_QWS_) && !defined(Q_WS_QWS) | 26 | #if defined(_WS_QWS_) && !defined(Q_WS_QWS) |
26 | #define Q_WS_QWS | 27 | #define Q_WS_QWS |
@@ -62,5 +63,5 @@ public: | |||
62 | AlwaysOn | 63 | AlwaysOn |
63 | }; | 64 | }; |
64 | 65 | ||
65 | enum screenSaverHint { | 66 | enum screenSaverHint { |
66 | Disable = 0, | 67 | Disable = 0, |
@@ -69,5 +70,5 @@ public: | |||
69 | Enable = 100 | 70 | Enable = 100 |
70 | }; | 71 | }; |
71 | 72 | ||
72 | static void setInputMethodHint( QWidget *, InputMethodHint ); | 73 | static void setInputMethodHint( QWidget *, InputMethodHint ); |
73 | static InputMethodHint inputMethodHint( QWidget * ); | 74 | static InputMethodHint inputMethodHint( QWidget * ); |
@@ -75,8 +76,12 @@ public: | |||
75 | void showMainWidget( QWidget*, bool nomax=FALSE ); | 76 | void showMainWidget( QWidget*, bool nomax=FALSE ); |
76 | void showMainDocumentWidget( QWidget*, bool nomax=FALSE ); | 77 | void showMainDocumentWidget( QWidget*, bool nomax=FALSE ); |
78 | static void showDialog( QDialog*, bool nomax=FALSE ); | ||
79 | static int execDialog( QDialog*, bool nomax=FALSE ); | ||
77 | 80 | ||
78 | static void setKeepRunning(); | 81 | static void setKeepRunning(); |
79 | bool keepRunning() const; | 82 | bool keepRunning() const; |
80 | 83 | ||
84 | bool keyboardGrabbed() const; | ||
85 | |||
81 | int exec(); | 86 | int exec(); |
82 | 87 | ||
@@ -85,6 +90,6 @@ signals: | |||
85 | void timeChanged(); | 90 | void timeChanged(); |
86 | void clockChanged( bool pm ); | 91 | void clockChanged( bool pm ); |
92 | void micChanged( bool muted ); | ||
87 | void volumeChanged( bool muted ); | 93 | void volumeChanged( bool muted ); |
88 | void micChanged( bool muted ); | ||
89 | void appMessage( const QCString& msg, const QByteArray& data); | 94 | void appMessage( const QCString& msg, const QByteArray& data); |
90 | void weekChanged( bool startOnMonday ); | 95 | void weekChanged( bool startOnMonday ); |
@@ -92,5 +97,5 @@ signals: | |||
92 | void flush(); | 97 | void flush(); |
93 | void reload(); | 98 | void reload(); |
94 | 99 | ||
95 | private slots: | 100 | private slots: |
96 | void systemMessage( const QCString &msg, const QByteArray &data ); | 101 | void systemMessage( const QCString &msg, const QByteArray &data ); |
@@ -107,5 +112,4 @@ protected: | |||
107 | bool eventFilter( QObject *, QEvent * ); | 112 | bool eventFilter( QObject *, QEvent * ); |
108 | void timerEvent( QTimerEvent * ); | 113 | void timerEvent( QTimerEvent * ); |
109 | bool keyboardGrabbed() const; | ||
110 | bool raiseAppropriateWindow(); | 114 | bool raiseAppropriateWindow(); |
111 | virtual void tryQuit(); | 115 | virtual void tryQuit(); |
@@ -126,4 +130,26 @@ private: | |||
126 | }; | 130 | }; |
127 | 131 | ||
132 | inline void QPEApplication::showDialog( QDialog* d, bool nomax ) | ||
133 | { | ||
134 | QSize sh = d->sizeHint(); | ||
135 | int w = QMAX(sh.width(),d->width()); | ||
136 | int h = QMAX(sh.height(),d->height()); | ||
137 | if ( !nomax | ||
138 | && ( w > qApp->desktop()->width()*3/4 | ||
139 | || h > qApp->desktop()->height()*3/4 ) ) | ||
140 | { | ||
141 | d->showMaximized(); | ||
142 | } else { | ||
143 | d->resize(w,h); | ||
144 | d->show(); | ||
145 | } | ||
146 | } | ||
147 | |||
148 | inline int QPEApplication::execDialog( QDialog* d, bool nomax ) | ||
149 | { | ||
150 | showDialog(d,nomax); | ||
151 | return d->exec(); | ||
152 | } | ||
153 | |||
128 | 154 | ||
129 | #endif | 155 | #endif |