author | kergoth <kergoth> | 2003-01-26 19:58:41 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-01-26 19:58:41 (UTC) |
commit | 808181587c1cea5a089c75df7d2833f100bddbf1 (patch) (unidiff) | |
tree | 94b59d3b5d649cf9c7a15f76f5b049030684913e | |
parent | f389dd4e3d5ceacb15b5c0b751a618d7586d6c31 (diff) | |
download | opie-808181587c1cea5a089c75df7d2833f100bddbf1.zip opie-808181587c1cea5a089c75df7d2833f100bddbf1.tar.gz opie-808181587c1cea5a089c75df7d2833f100bddbf1.tar.bz2 |
Add setCurrentRotation QCop call for later use of on the fly rotation. Also adapt depends to the actual required qt version.
-rw-r--r-- | library/libqpe1.control | 2 | ||||
-rw-r--r-- | library/qpeapplication.cpp | 5 | ||||
-rw-r--r-- | library/qpeapplication.h | 63 |
3 files changed, 52 insertions, 18 deletions
diff --git a/library/libqpe1.control b/library/libqpe1.control index 6743e28..94992b1 100644 --- a/library/libqpe1.control +++ b/library/libqpe1.control | |||
@@ -4,5 +4,5 @@ Section: opie/system | |||
4 | Maintainer: Project Opie <opie@handhelds.org> | 4 | Maintainer: Project Opie <opie@handhelds.org> |
5 | Architecture: arm | 5 | Architecture: arm |
6 | Version: $QPE_VERSION-$SUB_VERSION.1 | 6 | Version: $QPE_VERSION-$SUB_VERSION.1 |
7 | Depends: libqt2-emb (>=$QTE_VERSION), libqt2-emb-fonts (>=$QTE_VERSION) | 7 | Depends: libqt2-emb (>=2.3.4-beta4), libqt2-emb-fonts (>=$QTE_VERSION) |
8 | Description: libqpe, base qtopia/opie library. | 8 | Description: libqpe, base qtopia/opie library. |
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index b21428a..95c4a1b 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -1066,6 +1066,11 @@ void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data | |||
1066 | setDefaultRotation( r ); | 1066 | setDefaultRotation( r ); |
1067 | } | 1067 | } |
1068 | } | 1068 | } |
1069 | else if ( msg == "setCurrentRotation(int)" ) { | ||
1070 | int r; | ||
1071 | stream >> r; | ||
1072 | setCurrentRotation( r ); | ||
1073 | } | ||
1069 | else if ( msg == "shutdown()" ) { | 1074 | else if ( msg == "shutdown()" ) { |
1070 | if ( type() == GuiServer ) | 1075 | if ( type() == GuiServer ) |
1071 | shutdown(); | 1076 | shutdown(); |
diff --git a/library/qpeapplication.h b/library/qpeapplication.h index 7d956a3..7505115 100644 --- a/library/qpeapplication.h +++ b/library/qpeapplication.h | |||
@@ -21,8 +21,10 @@ | |||
21 | #define __QPE_APPLICATION_H__ | 21 | #define __QPE_APPLICATION_H__ |
22 | 22 | ||
23 | 23 | ||
24 | #include <qglobal.h> | ||
24 | #include <qapplication.h> | 25 | #include <qapplication.h> |
25 | #include <qdialog.h> | 26 | #include <qdialog.h> |
27 | #include <qwsdisplay_qws.h> | ||
26 | #if defined(_WS_QWS_) && !defined(Q_WS_QWS) | 28 | #if defined(_WS_QWS_) && !defined(Q_WS_QWS) |
27 | #define Q_WS_QWS | 29 | #define Q_WS_QWS |
28 | #endif | 30 | #endif |
@@ -47,28 +49,29 @@ public: | |||
47 | void applyStyle(); | 49 | void applyStyle(); |
48 | static int defaultRotation(); | 50 | static int defaultRotation(); |
49 | static void setDefaultRotation(int r); | 51 | static void setDefaultRotation(int r); |
52 | static void setCurrentRotation(int r); | ||
50 | static void grabKeyboard(); | 53 | static void grabKeyboard(); |
51 | static void ungrabKeyboard(); | 54 | static void ungrabKeyboard(); |
52 | 55 | ||
53 | enum StylusMode { | 56 | enum StylusMode { |
54 | LeftOnly, | 57 | LeftOnly, |
55 | RightOnHold | 58 | RightOnHold |
56 | // RightOnHoldLeftDelayed, etc. | 59 | // RightOnHoldLeftDelayed, etc. |
57 | }; | 60 | }; |
58 | static void setStylusOperation( QWidget*, StylusMode ); | 61 | static void setStylusOperation( QWidget*, StylusMode ); |
59 | static StylusMode stylusOperation( QWidget* ); | 62 | static StylusMode stylusOperation( QWidget* ); |
60 | 63 | ||
61 | enum InputMethodHint { | 64 | enum InputMethodHint { |
62 | Normal, | 65 | Normal, |
63 | AlwaysOff, | 66 | AlwaysOff, |
64 | AlwaysOn | 67 | AlwaysOn |
65 | }; | 68 | }; |
66 | 69 | ||
67 | enum screenSaverHint { | 70 | enum screenSaverHint { |
68 | Disable = 0, | 71 | Disable = 0, |
69 | DisableLightOff = 1, | 72 | DisableLightOff = 1, |
70 | DisableSuspend = 2, | 73 | DisableSuspend = 2, |
71 | Enable = 100 | 74 | Enable = 100 |
72 | }; | 75 | }; |
73 | 76 | ||
74 | static void setInputMethodHint( QWidget *, InputMethodHint ); | 77 | static void setInputMethodHint( QWidget *, InputMethodHint ); |
@@ -115,7 +118,7 @@ protected: | |||
115 | bool raiseAppropriateWindow(); | 118 | bool raiseAppropriateWindow(); |
116 | virtual void tryQuit(); | 119 | virtual void tryQuit(); |
117 | 120 | ||
118 | 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 (!) |
119 | 122 | ||
120 | private: | 123 | private: |
121 | void mapToDefaultAction( QWSKeyEvent *ke, int defKey ); | 124 | void mapToDefaultAction( QWSKeyEvent *ke, int defKey ); |
@@ -138,13 +141,13 @@ inline void QPEApplication::showDialog( QDialog* d, bool nomax ) | |||
138 | int w = QMAX(sh.width(),d->width()); | 141 | int w = QMAX(sh.width(),d->width()); |
139 | int h = QMAX(sh.height(),d->height()); | 142 | int h = QMAX(sh.height(),d->height()); |
140 | if ( !nomax | 143 | if ( !nomax |
141 | && ( w > qApp->desktop()->width()*3/4 | 144 | && ( w > qApp->desktop()->width()*3/4 |
142 | || h > qApp->desktop()->height()*3/4 ) ) | 145 | || h > qApp->desktop()->height()*3/4 ) ) |
143 | { | 146 | { |
144 | d->showMaximized(); | 147 | d->showMaximized(); |
145 | } else { | 148 | } else { |
146 | d->resize(w,h); | 149 | d->resize(w,h); |
147 | d->show(); | 150 | d->show(); |
148 | } | 151 | } |
149 | } | 152 | } |
150 | 153 | ||
@@ -154,6 +157,32 @@ inline int QPEApplication::execDialog( QDialog* d, bool nomax ) | |||
154 | return d->exec(); | 157 | return d->exec(); |
155 | } | 158 | } |
156 | 159 | ||
160 | enum Transformation { None, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */ | ||
157 | 161 | ||
158 | #endif | 162 | inline void QPEApplication::setCurrentRotation( int r ) |
163 | { | ||
164 | Transformation e; | ||
165 | |||
166 | switch (r) { | ||
167 | case 0: | ||
168 | e = None; | ||
169 | break; | ||
170 | case 90: | ||
171 | e = Rot90; | ||
172 | break; | ||
173 | case 180: | ||
174 | e = Rot180; | ||
175 | break; | ||
176 | case 270: | ||
177 | e = Rot270; | ||
178 | break; | ||
179 | default: | ||
180 | return; | ||
181 | } | ||
159 | 182 | ||
183 | qDebug("calling qApp->desktop()->qwsDisplay()->setTransformation( %d )\n", e); | ||
184 | qApp->desktop()->qwsDisplay()->setTransformation( e ); | ||
185 | } | ||
186 | |||
187 | |||
188 | #endif | ||