summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-04-20 21:49:11 (UTC)
committer kergoth <kergoth>2003-04-20 21:49:11 (UTC)
commit258feac229c2e8b5016670c1edc442e923c58628 (patch) (side-by-side diff)
tree7ef7f582eea8dee7ca1335b2e8748965e04cb8e6
parent50fc4807caa741b4bddf7c727273082a038d9760 (diff)
downloadopie-258feac229c2e8b5016670c1edc442e923c58628.zip
opie-258feac229c2e8b5016670c1edc442e923c58628.tar.gz
opie-258feac229c2e8b5016670c1edc442e923c58628.tar.bz2
Revert the attempt to split calibrate, as it failed miserably.
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/apps/calibrate/opie-calibrate.control8
-rw-r--r--core/launcher/desktop.cpp2
-rw-r--r--core/launcher/launcher.pro4
-rw-r--r--core/launcher/main.cpp15
-rw-r--r--core/launcher/opie-taskbar.control4
-rw-r--r--core/launcher/taskbar.cpp17
-rw-r--r--core/launcher/taskbar.h2
7 files changed, 32 insertions, 20 deletions
diff --git a/core/apps/calibrate/opie-calibrate.control b/core/apps/calibrate/opie-calibrate.control
deleted file mode 100644
index 6eafb94..0000000
--- a/core/apps/calibrate/opie-calibrate.control
+++ b/dev/null
@@ -1,8 +0,0 @@
-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 ef0bf4c..6def126 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -98,6 +98,7 @@ 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,6 +622,7 @@ 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 ) )
diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro
index ba01954..f5597c5 100644
--- a/core/launcher/launcher.pro
+++ b/core/launcher/launcher.pro
@@ -17,6 +17,7 @@ HEADERS = background.h \
shutdownimpl.h \
launcher.h \
launcherview.h \
+ ../../core/apps/calibrate/calibrate.h \
startmenu.h \
transferserver.h \
qcopbridge.h \
@@ -57,6 +58,7 @@ SOURCES = background.cpp \
shutdownimpl.cpp \
launcher.cpp \
launcherview.cpp \
+ ../../core/apps/calibrate/calibrate.cpp \
transferserver.cpp \
packageslave.cpp \
irserver.cpp \
@@ -92,6 +94,8 @@ SOURCES = background.cpp \
INTERFACES = syncdialog.ui
INCLUDEPATH += ../../include
DEPENDPATH += ../../include .
+INCLUDEPATH += ../../core/apps/calibrate
+DEPENDPATH += ../../core/apps/calibrate
INCLUDEPATH += ../../rsync
DEPENDPATH += ../../rsync
TARGET = qpe
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index e96eeae..20a1ecd 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -30,7 +30,6 @@
#endif
#include <opie/odevice.h>
-#include <opie/oprocess.h>
#include <qmessagebox.h>
#include <qfile.h>
@@ -45,6 +44,8 @@
#include <signal.h>
#include <unistd.h>
+#include "../calibrate/calibrate.h"
+
using namespace Opie;
void initEnvironment()
@@ -117,14 +118,10 @@ int initApplication( int argc, char ** argv )
if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) {
if ( !QFile::exists( "/etc/pointercal" ) ) {
- OProcess cal;
- cal << "calibrate";
-
- if ( ! cal.start(OProcess::Block, OProcess::NoCommunication) ) {
- QMessageBox::warning( 0, "Unable to calibrate",
- "Failed to start the calibration tool.\n"
- );
- }
+ // Make sure calibration widget starts on top.
+ Calibrate *cal = new Calibrate;
+ cal->exec();
+ delete cal;
}
}
diff --git a/core/launcher/opie-taskbar.control b/core/launcher/opie-taskbar.control
index db66a05..c0430b7 100644
--- a/core/launcher/opie-taskbar.control
+++ b/core/launcher/opie-taskbar.control
@@ -1,9 +1,9 @@
-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
+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
Priority: required
Section: opie/system
Maintainer: Project Opie <opie@handhelds.org>
Architecture: arm
Version: $QPE_VERSION-$SUB_VERSION.3
-Depends: opie-base, opie-calibrate
+Depends: opie-base
Replaces: opie-rotation
Description: Launcher for Opie
diff --git a/core/launcher/taskbar.cpp b/core/launcher/taskbar.cpp
index 8158128..8af568d 100644
--- a/core/launcher/taskbar.cpp
+++ b/core/launcher/taskbar.cpp
@@ -22,6 +22,7 @@
#include "inputmethods.h"
#include "runningappbar.h"
#include "systray.h"
+#include "calibrate.h"
#include "wait.h"
#include "appicons.h"
@@ -81,12 +82,15 @@ static Global::Command builtins[] = {
#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, 0, 0, 0 },
+ { 0, TaskBar::calibrate, 0, 0 },
};
static bool initNumLock()
@@ -302,6 +306,17 @@ 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()
{
if ( lockState ) lockState->toggleNumLockState();
diff --git a/core/launcher/taskbar.h b/core/launcher/taskbar.h
index 575a8c9..a0bf395 100644
--- a/core/launcher/taskbar.h
+++ b/core/launcher/taskbar.h
@@ -42,6 +42,8 @@ public:
TaskBar();
~TaskBar();
+ static QWidget *calibrate( bool );
+
bool recoverMemory();
StartMenu *startMenu() const { return sm; }