author | kergoth <kergoth> | 2003-04-19 22:07:06 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-04-19 22:07:06 (UTC) |
commit | 29c556ffc9b1497cd996ceb46d646b1eaf1288be (patch) (side-by-side diff) | |
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 @@ -20,23 +20,27 @@ #include "calibrate.h" #include <qfile.h> #include <qpe/qpeapplication.h> +#ifdef QWS +#include <qwindowsystem_qws.h> +#endif + int main( int argc, char ** argv ) { QPEApplication a( argc, argv ); int retval = 0; -#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) - if ( !QFile::exists( "/etc/pointercal" ) ) { +#ifdef QWS + if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { +#endif // Make sure calibration widget starts on top. - Calibrate *cal = new Calibrate; - a.setMainWidget(cal); - a.showMainWidget(cal); - retval = a.exec(); - delete cal; + Calibrate cal; + a.setMainWidget(&cal); + a.showMainWidget(&cal); + return a.exec(); +#ifdef QWS } #endif - return retval; } 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 @@ +Files: bin/calibrate apps/Settings/Calibrate.desktop +Priority: required +Section: opie/system +Maintainer: Project Opie <opie@handhelds.org> +Architecture: arm +Version: $QPE_VERSION-$SUB_VERSION.3 +Depends: libqpe1, libqt2-emb +Description: Opie calibration tool |