author | harlekin <harlekin> | 2003-02-24 18:25:27 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-02-24 18:25:27 (UTC) |
commit | 93151a1467b45759d320ce6673160190d6ab8872 (patch) (unidiff) | |
tree | 2df5877692521a50da87f5e4b64d32dffa6e1de0 /library | |
parent | f294a5d101fc9935e1a73f3d44b43ea00d0a03c7 (diff) | |
download | opie-93151a1467b45759d320ce6673160190d6ab8872.zip opie-93151a1467b45759d320ce6673160190d6ab8872.tar.gz opie-93151a1467b45759d320ce6673160190d6ab8872.tar.bz2 |
Hmm, Oliver was that intentional?
changed the opiemail config.in files to the correct dependencies. How did this slip in again ?
- qApp->desktop()->qwsDisplay()->setTransformation( e );
+ //qApp->desktop()->qwsDisplay()->setTransformation( e );
-rw-r--r-- | library/qpeapplication.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/qpeapplication.h b/library/qpeapplication.h index 5c18836..7f74510 100644 --- a/library/qpeapplication.h +++ b/library/qpeapplication.h | |||
@@ -1,188 +1,188 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of the 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 |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef __QPE_APPLICATION_H__ | 20 | #ifndef __QPE_APPLICATION_H__ |
21 | #define __QPE_APPLICATION_H__ | 21 | #define __QPE_APPLICATION_H__ |
22 | 22 | ||
23 | 23 | ||
24 | #include <qglobal.h> | 24 | #include <qglobal.h> |
25 | #include <qapplication.h> | 25 | #include <qapplication.h> |
26 | #include <qdialog.h> | 26 | #include <qdialog.h> |
27 | #include <qwsdisplay_qws.h> | 27 | #include <qwsdisplay_qws.h> |
28 | #if defined(_WS_QWS_) && !defined(Q_WS_QWS) | 28 | #if defined(_WS_QWS_) && !defined(Q_WS_QWS) |
29 | #define Q_WS_QWS | 29 | #define Q_WS_QWS |
30 | #endif | 30 | #endif |
31 | #include "qpedecoration_qws.h" | 31 | #include "qpedecoration_qws.h" |
32 | #include "timestring.h" | 32 | #include "timestring.h" |
33 | 33 | ||
34 | class QCopChannel; | 34 | class QCopChannel; |
35 | class QPEApplicationData; | 35 | class QPEApplicationData; |
36 | class QWSEvent; | 36 | class QWSEvent; |
37 | class QWSKeyEvent; | 37 | class QWSKeyEvent; |
38 | 38 | ||
39 | 39 | ||
40 | class QPEApplication : public QApplication | 40 | class QPEApplication : public QApplication |
41 | { | 41 | { |
42 | Q_OBJECT | 42 | Q_OBJECT |
43 | public: | 43 | public: |
44 | QPEApplication( int& argc, char **argv, Type=GuiClient ); | 44 | QPEApplication( int& argc, char **argv, Type=GuiClient ); |
45 | ~QPEApplication(); | 45 | ~QPEApplication(); |
46 | 46 | ||
47 | static QString qpeDir(); | 47 | static QString qpeDir(); |
48 | static QString documentDir(); | 48 | static QString documentDir(); |
49 | void applyStyle(); | 49 | void applyStyle(); |
50 | static int defaultRotation(); | 50 | static int defaultRotation(); |
51 | static void setDefaultRotation(int r); | 51 | static void setDefaultRotation(int r); |
52 | static void setCurrentRotation(int r); | 52 | static void setCurrentRotation(int r); |
53 | static void grabKeyboard(); | 53 | static void grabKeyboard(); |
54 | static void ungrabKeyboard(); | 54 | static void ungrabKeyboard(); |
55 | 55 | ||
56 | enum StylusMode { | 56 | enum StylusMode { |
57 | LeftOnly, | 57 | LeftOnly, |
58 | RightOnHold | 58 | RightOnHold |
59 | // RightOnHoldLeftDelayed, etc. | 59 | // RightOnHoldLeftDelayed, etc. |
60 | }; | 60 | }; |
61 | static void setStylusOperation( QWidget*, StylusMode ); | 61 | static void setStylusOperation( QWidget*, StylusMode ); |
62 | static StylusMode stylusOperation( QWidget* ); | 62 | static StylusMode stylusOperation( QWidget* ); |
63 | 63 | ||
64 | enum InputMethodHint { | 64 | enum InputMethodHint { |
65 | Normal, | 65 | Normal, |
66 | AlwaysOff, | 66 | AlwaysOff, |
67 | AlwaysOn | 67 | AlwaysOn |
68 | }; | 68 | }; |
69 | 69 | ||
70 | enum screenSaverHint { | 70 | enum screenSaverHint { |
71 | Disable = 0, | 71 | Disable = 0, |
72 | DisableLightOff = 1, | 72 | DisableLightOff = 1, |
73 | DisableSuspend = 2, | 73 | DisableSuspend = 2, |
74 | Enable = 100 | 74 | Enable = 100 |
75 | }; | 75 | }; |
76 | 76 | ||
77 | static void setInputMethodHint( QWidget *, InputMethodHint ); | 77 | static void setInputMethodHint( QWidget *, InputMethodHint ); |
78 | static InputMethodHint inputMethodHint( QWidget * ); | 78 | static InputMethodHint inputMethodHint( QWidget * ); |
79 | 79 | ||
80 | void showMainWidget( QWidget*, bool nomax=FALSE ); | 80 | void showMainWidget( QWidget*, bool nomax=FALSE ); |
81 | void showMainDocumentWidget( QWidget*, bool nomax=FALSE ); | 81 | void showMainDocumentWidget( QWidget*, bool nomax=FALSE ); |
82 | static void showDialog( QDialog*, bool nomax=FALSE ); | 82 | static void showDialog( QDialog*, bool nomax=FALSE ); |
83 | static int execDialog( QDialog*, bool nomax=FALSE ); | 83 | static int execDialog( QDialog*, bool nomax=FALSE ); |
84 | 84 | ||
85 | static void setKeepRunning(); | 85 | static void setKeepRunning(); |
86 | bool keepRunning() const; | 86 | bool keepRunning() const; |
87 | 87 | ||
88 | bool keyboardGrabbed() const; | 88 | bool keyboardGrabbed() const; |
89 | 89 | ||
90 | int exec(); | 90 | int exec(); |
91 | 91 | ||
92 | signals: | 92 | signals: |
93 | void clientMoused(); | 93 | void clientMoused(); |
94 | void timeChanged(); | 94 | void timeChanged(); |
95 | void clockChanged( bool pm ); | 95 | void clockChanged( bool pm ); |
96 | void micChanged( bool muted ); | 96 | void micChanged( bool muted ); |
97 | void volumeChanged( bool muted ); | 97 | void volumeChanged( bool muted ); |
98 | void appMessage( const QCString& msg, const QByteArray& data); | 98 | void appMessage( const QCString& msg, const QByteArray& data); |
99 | void weekChanged( bool startOnMonday ); | 99 | void weekChanged( bool startOnMonday ); |
100 | void dateFormatChanged( DateFormat ); | 100 | void dateFormatChanged( DateFormat ); |
101 | void flush(); | 101 | void flush(); |
102 | void reload(); | 102 | void reload(); |
103 | 103 | ||
104 | private slots: | 104 | private slots: |
105 | void systemMessage( const QCString &msg, const QByteArray &data ); | 105 | void systemMessage( const QCString &msg, const QByteArray &data ); |
106 | void pidMessage( const QCString &msg, const QByteArray &data ); | 106 | void pidMessage( const QCString &msg, const QByteArray &data ); |
107 | void removeSenderFromStylusDict(); | 107 | void removeSenderFromStylusDict(); |
108 | void hideOrQuit(); | 108 | void hideOrQuit(); |
109 | 109 | ||
110 | protected: | 110 | protected: |
111 | bool qwsEventFilter( QWSEvent * ); | 111 | bool qwsEventFilter( QWSEvent * ); |
112 | void internalSetStyle( const QString &style ); | 112 | void internalSetStyle( const QString &style ); |
113 | void prepareForTermination(bool willrestart); | 113 | void prepareForTermination(bool willrestart); |
114 | virtual void restart(); | 114 | virtual void restart(); |
115 | virtual void shutdown(); | 115 | virtual void shutdown(); |
116 | bool eventFilter( QObject *, QEvent * ); | 116 | bool eventFilter( QObject *, QEvent * ); |
117 | void timerEvent( QTimerEvent * ); | 117 | void timerEvent( QTimerEvent * ); |
118 | bool raiseAppropriateWindow(); | 118 | bool raiseAppropriateWindow(); |
119 | virtual void tryQuit(); | 119 | virtual void tryQuit(); |
120 | 120 | ||
121 | virtual void polish ( QWidget * ); // this is actually implemented in qt_override.cpp (!) | 121 | virtual void polish ( QWidget * ); // this is actually implemented in qt_override.cpp (!) |
122 | 122 | ||
123 | private: | 123 | private: |
124 | void mapToDefaultAction( QWSKeyEvent *ke, int defKey ); | 124 | void mapToDefaultAction( QWSKeyEvent *ke, int defKey ); |
125 | 125 | ||
126 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 126 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
127 | QCopChannel *sysChannel; | 127 | QCopChannel *sysChannel; |
128 | QCopChannel *pidChannel; | 128 | QCopChannel *pidChannel; |
129 | #endif | 129 | #endif |
130 | QPEApplicationData *d; | 130 | QPEApplicationData *d; |
131 | 131 | ||
132 | bool reserved_sh; | 132 | bool reserved_sh; |
133 | 133 | ||
134 | 134 | ||
135 | 135 | ||
136 | }; | 136 | }; |
137 | 137 | ||
138 | inline void QPEApplication::showDialog( QDialog* d, bool nomax ) | 138 | inline void QPEApplication::showDialog( QDialog* d, bool nomax ) |
139 | { | 139 | { |
140 | QSize sh = d->sizeHint(); | 140 | QSize sh = d->sizeHint(); |
141 | int w = QMAX(sh.width(),d->width()); | 141 | int w = QMAX(sh.width(),d->width()); |
142 | int h = QMAX(sh.height(),d->height()); | 142 | int h = QMAX(sh.height(),d->height()); |
143 | if ( !nomax | 143 | if ( !nomax |
144 | && ( w > qApp->desktop()->width()*3/4 | 144 | && ( w > qApp->desktop()->width()*3/4 |
145 | || h > qApp->desktop()->height()*3/4 ) ) | 145 | || h > qApp->desktop()->height()*3/4 ) ) |
146 | { | 146 | { |
147 | d->showMaximized(); | 147 | d->showMaximized(); |
148 | } else { | 148 | } else { |
149 | d->resize(w,h); | 149 | d->resize(w,h); |
150 | d->show(); | 150 | d->show(); |
151 | } | 151 | } |
152 | } | 152 | } |
153 | 153 | ||
154 | inline int QPEApplication::execDialog( QDialog* d, bool nomax ) | 154 | inline int QPEApplication::execDialog( QDialog* d, bool nomax ) |
155 | { | 155 | { |
156 | showDialog(d,nomax); | 156 | showDialog(d,nomax); |
157 | return d->exec(); | 157 | return d->exec(); |
158 | } | 158 | } |
159 | 159 | ||
160 | enum Transformation { Rot0, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */ | 160 | enum Transformation { Rot0, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */ |
161 | 161 | ||
162 | inline void QPEApplication::setCurrentRotation( int r ) | 162 | inline void QPEApplication::setCurrentRotation( int r ) |
163 | { | 163 | { |
164 | Transformation e; | 164 | Transformation e; |
165 | 165 | ||
166 | switch (r) { | 166 | switch (r) { |
167 | case 0: | 167 | case 0: |
168 | e = Rot0; | 168 | e = Rot0; |
169 | break; | 169 | break; |
170 | case 90: | 170 | case 90: |
171 | e = Rot90; | 171 | e = Rot90; |
172 | break; | 172 | break; |
173 | case 180: | 173 | case 180: |
174 | e = Rot180; | 174 | e = Rot180; |
175 | break; | 175 | break; |
176 | case 270: | 176 | case 270: |
177 | e = Rot270; | 177 | e = Rot270; |
178 | break; | 178 | break; |
179 | default: | 179 | default: |
180 | return; | 180 | return; |
181 | } | 181 | } |
182 | 182 | ||
183 | qDebug("calling qApp->desktop()->qwsDisplay()->setTransformation( %d )\n", e); | 183 | qDebug("calling qApp->desktop()->qwsDisplay()->setTransformation( %d )\n", e); |
184 | //qApp->desktop()->qwsDisplay()->setTransformation( e ); | 184 | qApp->desktop()->qwsDisplay()->setTransformation( e ); |
185 | } | 185 | } |
186 | 186 | ||
187 | 187 | ||
188 | #endif | 188 | #endif |