3 files changed, 55 insertions, 7 deletions

diff --git a/core/apps/calibrate/calibrate.pro b/core/apps/calibrate/calibrate.pro
index 861ec15..ffec76b 100644
--- a/core/apps/calibrate/calibrate.pro
+++ b/core/apps/calibrate/calibrate.pro
@@ -1,9 +1,17 @@
-# This is part of the taskbar
+        TEMPLATE= app
+        CONFIG  = qt warn_on release
+        DESTDIR         = $(OPIEDIR)/bin
+        HEADERS         = calibrate.h
+        SOURCES         = calibrate.cpp main.cpp
+        INCLUDEPATH+= $(QTDIR)/include $(OPIEDIR)/include
+        DEPENDPATH+= $(QTDIR)/include $(OPIEDIR)/include
+        TARGET  = calibrate
+        LIBS    += -lqpe 
 
 TRANSLATIONS = ../../../i18n/de/calibrate.pro.in.ts \
          ../../../i18n/da/calibrate.pro.in.ts \
          ../../../i18n/xx/calibrate.pro.in.ts \
          ../../../i18n/en/calibrate.pro.in.ts \
          ../../../i18n/es/calibrate.pro.in.ts \
          ../../../i18n/fr/calibrate.pro.in.ts \
          ../../../i18n/hu/calibrate.pro.in.ts \
@@ -13,11 +21,9 @@ TRANSLATIONS = ../../../i18n/de/calibrate.pro.in.ts \
          ../../../i18n/pl/calibrate.pro.in.ts \
          ../../../i18n/pt/calibrate.pro.in.ts \
          ../../../i18n/pt_BR/calibrate.pro.in.ts \
          ../../../i18n/sl/calibrate.pro.in.ts \
          ../../../i18n/zh_CN/calibrate.pro.in.ts \
          ../../../i18n/it/calibrate.pro.in.ts \
          ../../../i18n/zh_TW/calibrate.pro.in.ts
 
-
-
 include ( $(OPIEDIR)/include.pro )
diff --git a/core/apps/calibrate/config.in b/core/apps/calibrate/config.in
index e408448..9a418e9 100644
--- a/core/apps/calibrate/config.in
+++ b/core/apps/calibrate/config.in
@@ -1,4 +1,4 @@
-#  config #CALIBRATE
-#    boolean "calibrate"
-#    default "y"
-#    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+  config CALIBRATE
+    boolean "calibrate (standalone)"
+    default "n"
+    depends ( LIBQPE || LIBQPE-X11 )
diff --git a/core/apps/calibrate/main.cpp b/core/apps/calibrate/main.cpp
new file mode 100644
index 0000000..cb041c9
--- a/dev/null
+++ b/core/apps/calibrate/main.cpp
@@ -0,0 +1,42 @@
+/**********************************************************************
+** 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>
+
+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_EBX)
+    if ( !QFile::exists( "/etc/pointercal" ) ) {
+        // Make sure calibration widget starts on top.
+        Calibrate *cal = new Calibrate;
+        a.setMainWidget(cal);
+        a.showMainWidget(cal);
+        retval = a.exec();
+        delete cal;
+    }
+#endif
+    return retval;
+}