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
@@ -24,4 +24,8 @@
 #include <qpe/qpeapplication.h>
 
+#ifdef QWS
+#include <qwindowsystem_qws.h>
+#endif
+
 int main( int argc, char ** argv )
 {
@@ -29,14 +33,14 @@ int main( int argc, char ** 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
@@ -99,5 +99,4 @@ static void login( bool at_poweron )
 {
         if ( !loggedin ) {
-                Global::terminateBuiltin( "calibrate" );
                 Password::authenticate( at_poweron );
                 loggedin = 1;
@@ -623,5 +622,4 @@ void Desktop::executeOrModify( const QString& appLnkFile )
         if ( lnk.isValid() ) {
                 QCString app = lnk.exec().utf8();
-                Global::terminateBuiltin( "calibrate" );
                 if ( QCopChannel::isRegistered( "QPE/Application/" + app ) ) {
                         //  MRUList::addTask( &lnk );
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
@@ -18,5 +18,4 @@ HEADERS		= background.h \
                   launcher.h \
                   launcherview.h \
-                  ../../core/apps/calibrate/calibrate.h \
                   startmenu.h \
                   transferserver.h \
@@ -59,5 +58,4 @@ SOURCES		= background.cpp \
                   launcher.cpp \
                   launcherview.cpp \
-                  ../../core/apps/calibrate/calibrate.cpp \
                   transferserver.cpp \
                   packageslave.cpp \
@@ -95,6 +93,4 @@ INTERFACES	= syncdialog.ui
 INCLUDEPATH += ../../include
         DEPENDPATH+= ../../include .
-INCLUDEPATH += ../../core/apps/calibrate
-        DEPENDPATH+= ../../core/apps/calibrate
 INCLUDEPATH += ../../rsync
         DEPENDPATH+= ../../rsync
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
@@ -31,4 +31,5 @@
 
 #include <opie/odevice.h>
+#include <opie/oprocess.h>
 
 #include <qmessagebox.h>
@@ -45,6 +46,4 @@
 #include <unistd.h>
 
-#include "../calibrate/calibrate.h"
-
 using namespace Opie;
 
@@ -119,8 +118,12 @@ int initApplication( int argc, char ** argv )
     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"
+                );
+            }
         }
     }
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,3 +1,3 @@
-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
@@ -5,5 +5,5 @@ 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
@@ -23,5 +23,4 @@
 #include "runningappbar.h"
 #include "systray.h"
-#include "calibrate.h"
 #include "wait.h"
 #include "appicons.h"
@@ -83,7 +82,4 @@ static Global::Command builtins[] = {
 #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 },
@@ -91,5 +87,5 @@ static Global::Command builtins[] = {
 #endif
 
-  { 0,            TaskBar::calibrate, 0, 0 },
+  { 0, 0, 0, 0 },
 };
 
@@ -307,15 +303,4 @@ void TaskBar::receive( const QCString &msg, const QByteArray &data )
 }
 
-QWidget *TaskBar::calibrate(bool)
-{
-#ifdef Q_WS_QWS
-    Calibrate *c = new Calibrate;
-    c->show();
-    return c;
-#else
-    return 0;
-#endif
-}
-
 void TaskBar::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
@@ -43,6 +43,4 @@ public:
     ~TaskBar();
 
-    static QWidget *calibrate( bool );
-
     bool recoverMemory();