-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 @@ -1,42 +1,46 @@ /********************************************************************** ** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of Qtopia Environment. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #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 |