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.

8 files changed, 32 insertions, 40 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 @@
 
 #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
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index 6def126..ef0bf4c 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -97,9 +97,8 @@ static Desktop* qpedesktop = 0;
 static int loggedin = 0;
 static void login( bool at_poweron )
 {
 	if ( !loggedin ) {
-		Global::terminateBuiltin( "calibrate" );
 		Password::authenticate( at_poweron );
 		loggedin = 1;
 		QCopEnvelope e( "QPE/Desktop", "unlocked()" );
 	}
@@ -621,9 +620,8 @@ void Desktop::executeOrModify( const QString& appLnkFile )
 {
 	AppLnk lnk( MimeType::appsFolderName() + "/" + appLnkFile );
 	if ( lnk.isValid() ) {
 		QCString app = lnk.exec().utf8();
-		Global::terminateBuiltin( "calibrate" );
 		if ( QCopChannel::isRegistered( "QPE/Application/" + app ) ) {
 			//  MRUList::addTask( &lnk );
 			if ( hasVisibleWindow( app ) )
 				QCopChannel::send( "QPE/Application/" + app, "nextView()" );
diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro
index d0a573b..007e48c 100644
--- a/core/launcher/launcher.pro
+++ b/core/launcher/launcher.pro
@@ -16,9 +16,8 @@ HEADERS		= background.h \
 		  wait.h \
 		  shutdownimpl.h \
 		  launcher.h \
 		  launcherview.h \
-		  ../../core/apps/calibrate/calibrate.h \
 		  startmenu.h \
 		  transferserver.h \
 		  qcopbridge.h \
 		  packageslave.h \
@@ -57,9 +56,8 @@ SOURCES		= background.cpp \
 		  wait.cpp \
 		  shutdownimpl.cpp \
 		  launcher.cpp \
 		  launcherview.cpp \
-		  ../../core/apps/calibrate/calibrate.cpp \
 		  transferserver.cpp \
 		  packageslave.cpp \
 		irserver.cpp \
 		  qcopbridge.cpp \
@@ -93,10 +91,8 @@ SOURCES		= background.cpp \
 	../../rsync/qrsync.cpp
 INTERFACES	= syncdialog.ui
 INCLUDEPATH += ../../include
 DEPENDPATH	+= ../../include .
-INCLUDEPATH += ../../core/apps/calibrate
-DEPENDPATH	+= ../../core/apps/calibrate
 INCLUDEPATH += ../../rsync
 DEPENDPATH	+= ../../rsync
 TARGET		= qpe
 LIBS		+= -lqpe -lcrypt -lopie 
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index 20a1ecd..e96eeae 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -29,8 +29,9 @@
 #include <qpe/custom.h>
 #endif
 
 #include <opie/odevice.h>
+#include <opie/oprocess.h>
 
 #include <qmessagebox.h>
 #include <qfile.h>
 #include <qimage.h>
@@ -43,10 +44,8 @@
 #include <stdio.h>
 #include <signal.h>
 #include <unistd.h>
 
-#include "../calibrate/calibrate.h"
-
 using namespace Opie;
 
 void initEnvironment()
 {
@@ -117,12 +116,16 @@ int initApplication( int argc, char ** argv )
     Network::createServer(d);
 
     if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) {
 	if ( !QFile::exists( "/etc/pointercal" ) ) {
-	    // Make sure calibration widget starts on top.
-	    Calibrate *cal = new Calibrate;
-	    cal->exec();
-	    delete cal;
+            OProcess cal;
+            cal << "calibrate";
+          
+            if ( ! cal.start(OProcess::Block, OProcess::NoCommunication) ) {
+		QMessageBox::warning( 0, "Unable to calibrate",
+                    "Failed to start the calibration tool.\n"
+		);
+            }
 	}
     }
 
     d->show();
diff --git a/core/launcher/opie-taskbar.control b/core/launcher/opie-taskbar.control
index c0430b7..db66a05 100644
--- a/core/launcher/opie-taskbar.control
+++ b/core/launcher/opie-taskbar.control
@@ -1,9 +1,9 @@
-Files: bin/qpe apps/Settings/Calibrate.desktop pics/launcher pics/devicebuttons/*.png plugins/applets/libsuspendapplet.so* plugins/applets/libhomeapplet.so* plugins/applets/liblogoutapplet.so* plugins/applets/librotateapplet.so* root/etc/init.d/opie
+Files: bin/qpe pics/launcher pics/devicebuttons/*.png plugins/applets/libsuspendapplet.so* plugins/applets/libhomeapplet.so* plugins/applets/liblogoutapplet.so* plugins/applets/librotateapplet.so* root/etc/init.d/opie
 Priority: required
 Section: opie/system
 Maintainer: Project Opie <opie@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.3
-Depends: opie-base
+Depends: opie-base, opie-calibrate
 Replaces: opie-rotation
 Description: Launcher for Opie
diff --git a/core/launcher/taskbar.cpp b/core/launcher/taskbar.cpp
index 8af568d..8158128 100644
--- a/core/launcher/taskbar.cpp
+++ b/core/launcher/taskbar.cpp
@@ -21,9 +21,8 @@
 #include "startmenu.h"
 #include "inputmethods.h"
 #include "runningappbar.h"
 #include "systray.h"
-#include "calibrate.h"
 #include "wait.h"
 #include "appicons.h"
 
 #include "taskbar.h"
@@ -81,17 +80,14 @@ static Global::Command builtins[] = {
 #include "../launcher/apps.h"
 #undef APP
 #endif
 
-#if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_SL5XXX)
-        { "calibrate",          TaskBar::calibrate, 1, 0 },
-#endif
 #if !defined(QT_QWS_CASSIOPEIA)
   { "shutdown",           Global::shutdown,   1, 0 },
 //  { "run",                run,      1, 0 },
 #endif
 
-  { 0,            TaskBar::calibrate, 0, 0 },
+  { 0, 0, 0, 0 },
 };
 
 static bool initNumLock()
 {
@@ -305,19 +301,8 @@ void TaskBar::receive( const QCString &msg, const QByteArray &data )
 		sm-> launch ( );
 	}
 }
 
-QWidget *TaskBar::calibrate(bool)
-{
-#ifdef Q_WS_QWS
-    Calibrate *c = new Calibrate;
-    c->show();
-    return c;
-#else
-    return 0;
-#endif
-}
-
 void TaskBar::toggleNumLockState()
 {
     if ( lockState ) lockState->toggleNumLockState();
 }
diff --git a/core/launcher/taskbar.h b/core/launcher/taskbar.h
index a0bf395..575a8c9 100644
--- a/core/launcher/taskbar.h
+++ b/core/launcher/taskbar.h
@@ -41,10 +41,8 @@ class TaskBar : public QHBox {
 public:
     TaskBar();
     ~TaskBar();
 
-    static QWidget *calibrate( bool );
-
     bool recoverMemory();
 
     StartMenu *startMenu() const { return sm; }
 public slots: