summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/firstuse.cpp24
-rw-r--r--core/launcher/firstuse.h1
-rw-r--r--core/launcher/main.cpp3
3 files changed, 16 insertions, 12 deletions
diff --git a/core/launcher/firstuse.cpp b/core/launcher/firstuse.cpp
index 2dc6a72..3f769ae 100644
--- a/core/launcher/firstuse.cpp
+++ b/core/launcher/firstuse.cpp
@@ -32,5 +32,4 @@
32#include <qtopia/custom.h> 32#include <qtopia/custom.h>
33#if defined(QPE_NEED_CALIBRATION) 33
34#include "calibrate.h" 34#include "calibrate.h"
35#endif
36#include "documentlist.h" 35#include "documentlist.h"
@@ -170,8 +169,12 @@ FirstUse::FirstUse(QWidget* parent, const char * name, WFlags wf) :
170 calcMaxWindowRect(); 169 calcMaxWindowRect();
171#if defined(QPE_NEED_CALIBRATION) 170
172 if ( !QFile::exists("/etc/pointercal") ) { 171 m_calHandler = ( QWSServer::mouseHandler() && QWSServer::mouseHandler()->inherits("QCalibratedMouseHandler") ) ? true : false;
173 needCalibrate = TRUE; 172
174 grabMouse(); 173 if ( m_calHandler) {
174 if ( !QFile::exists("/etc/pointercal") ) {
175 needCalibrate = TRUE;
176 grabMouse();
177 }
175 } 178 }
176#endif 179
177 Config config("locale"); 180 Config config("locale");
@@ -232,3 +235,3 @@ void FirstUse::nextDialog()
232 // The last application is still running. 235 // The last application is still running.
233 // Tell it to stop, and when its done we'll come back 236 // Tell it to stop, and when its done we'll come back
234 // to nextDialog and exit. 237 // to nextDialog and exit.
@@ -493,2 +496,3 @@ void FirstUse::updateButtons()
493 next->setText(tr("Next >>")); 496 next->setText(tr("Next >>"));
497
494 next->setEnabled( !waitingForLaunch ); 498 next->setEnabled( !waitingForLaunch );
@@ -506,4 +510,3 @@ void FirstUse::mouseReleaseEvent( QMouseEvent * )
506 if ( currApp < 0 ) { 510 if ( currApp < 0 ) {
507#if defined(QPE_NEED_CALIBRATION) 511 if ( m_calHandler && needCalibrate ) {
508 if ( needCalibrate ) {
509 releaseMouse(); 512 releaseMouse();
@@ -513,3 +516,2 @@ void FirstUse::mouseReleaseEvent( QMouseEvent * )
513 } 516 }
514#endif
515 nextDialog(); 517 nextDialog();
diff --git a/core/launcher/firstuse.h b/core/launcher/firstuse.h
index 44a95a8..98858f8 100644
--- a/core/launcher/firstuse.h
+++ b/core/launcher/firstuse.h
@@ -81,2 +81,3 @@ private:
81 bool needRestart; 81 bool needRestart;
82 bool m_calHandler : 1;
82 83
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index 075985d..ad40536 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -200,3 +200,4 @@ static bool firstUse()
200 bool needFirstUse = FALSE; 200 bool needFirstUse = FALSE;
201 if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { 201 if ( QWSServer::mouseHandler() &&
202 QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) {
202 if ( !QFile::exists( "/etc/pointercal" ) ) 203 if ( !QFile::exists( "/etc/pointercal" ) )