author | kergoth <kergoth> | 2003-04-19 22:07:06 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-04-19 22:07:06 (UTC) |
commit | 29c556ffc9b1497cd996ceb46d646b1eaf1288be (patch) (unidiff) | |
tree | b89c424de93f541bc80908c93172eb4e601e8c02 /core/apps | |
parent | c502394063598e63591e06072802f1c5a9e0c266 (diff) | |
download | opie-29c556ffc9b1497cd996ceb46d646b1eaf1288be.zip opie-29c556ffc9b1497cd996ceb46d646b1eaf1288be.tar.gz opie-29c556ffc9b1497cd996ceb46d646b1eaf1288be.tar.bz2 |
Split calibrate out as a standalone application, and ensure taskbar depends
on it. This makes ts debugging easier, having a seperate calibration tool
around, and as a side affect fixes calibration on the C700, which previously
required a reboot to take effect.
-rw-r--r-- | core/apps/calibrate/main.cpp | 20 | ||||
-rw-r--r-- | core/apps/calibrate/opie-calibrate.control | 8 |
2 files changed, 20 insertions, 8 deletions
diff --git a/core/apps/calibrate/main.cpp b/core/apps/calibrate/main.cpp index d1ad083..1c295eb 100644 --- a/core/apps/calibrate/main.cpp +++ b/core/apps/calibrate/main.cpp | |||
@@ -22,21 +22,25 @@ | |||
22 | 22 | ||
23 | #include <qfile.h> | 23 | #include <qfile.h> |
24 | #include <qpe/qpeapplication.h> | 24 | #include <qpe/qpeapplication.h> |
25 | 25 | ||
26 | #ifdef QWS | ||
27 | #include <qwindowsystem_qws.h> | ||
28 | #endif | ||
29 | |||
26 | int main( int argc, char ** argv ) | 30 | int main( int argc, char ** argv ) |
27 | { | 31 | { |
28 | QPEApplication a( argc, argv ); | 32 | QPEApplication a( argc, argv ); |
29 | int retval = 0; | 33 | int retval = 0; |
30 | 34 | ||
31 | #if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) | 35 | #ifdef QWS |
32 | if ( !QFile::exists( "/etc/pointercal" ) ) { | 36 | if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { |
37 | #endif | ||
33 | // Make sure calibration widget starts on top. | 38 | // Make sure calibration widget starts on top. |
34 | Calibrate *cal = new Calibrate; | 39 | Calibrate cal; |
35 | a.setMainWidget(cal); | 40 | a.setMainWidget(&cal); |
36 | a.showMainWidget(cal); | 41 | a.showMainWidget(&cal); |
37 | retval = a.exec(); | 42 | return a.exec(); |
38 | delete cal; | 43 | #ifdef QWS |
39 | } | 44 | } |
40 | #endif | 45 | #endif |
41 | return retval; | ||
42 | } | 46 | } |
diff --git a/core/apps/calibrate/opie-calibrate.control b/core/apps/calibrate/opie-calibrate.control new file mode 100644 index 0000000..6eafb94 --- a/dev/null +++ b/core/apps/calibrate/opie-calibrate.control | |||
@@ -0,0 +1,8 @@ | |||
1 | Files: bin/calibrate apps/Settings/Calibrate.desktop | ||
2 | Priority: required | ||
3 | Section: opie/system | ||
4 | Maintainer: Project Opie <opie@handhelds.org> | ||
5 | Architecture: arm | ||
6 | Version: $QPE_VERSION-$SUB_VERSION.3 | ||
7 | Depends: libqpe1, libqt2-emb | ||
8 | Description: Opie calibration tool | ||