author | kergoth <kergoth> | 2003-04-20 21:49:11 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-04-20 21:49:11 (UTC) |
commit | 258feac229c2e8b5016670c1edc442e923c58628 (patch) (side-by-side diff) | |
tree | 7ef7f582eea8dee7ca1335b2e8748965e04cb8e6 /core/launcher | |
parent | 50fc4807caa741b4bddf7c727273082a038d9760 (diff) | |
download | opie-258feac229c2e8b5016670c1edc442e923c58628.zip opie-258feac229c2e8b5016670c1edc442e923c58628.tar.gz opie-258feac229c2e8b5016670c1edc442e923c58628.tar.bz2 |
Revert the attempt to split calibrate, as it failed miserably.
-rw-r--r-- | core/launcher/desktop.cpp | 2 | ||||
-rw-r--r-- | core/launcher/launcher.pro | 4 | ||||
-rw-r--r-- | core/launcher/main.cpp | 15 | ||||
-rw-r--r-- | core/launcher/opie-taskbar.control | 4 | ||||
-rw-r--r-- | core/launcher/taskbar.cpp | 17 | ||||
-rw-r--r-- | core/launcher/taskbar.h | 2 |
6 files changed, 32 insertions, 12 deletions
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 @@ -100,2 +100,3 @@ static void login( bool at_poweron ) if ( !loggedin ) { + Global::terminateBuiltin( "calibrate" ); Password::authenticate( at_poweron ); @@ -623,2 +624,3 @@ void Desktop::executeOrModify( const QString& appLnkFile ) QCString app = lnk.exec().utf8(); + Global::terminateBuiltin( "calibrate" ); if ( QCopChannel::isRegistered( "QPE/Application/" + 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 @@ -19,2 +19,3 @@ HEADERS = background.h \ launcherview.h \ + ../../core/apps/calibrate/calibrate.h \ startmenu.h \ @@ -59,2 +60,3 @@ SOURCES = background.cpp \ launcherview.cpp \ + ../../core/apps/calibrate/calibrate.cpp \ transferserver.cpp \ @@ -94,2 +96,4 @@ INCLUDEPATH += ../../include DEPENDPATH += ../../include . +INCLUDEPATH += ../../core/apps/calibrate +DEPENDPATH += ../../core/apps/calibrate INCLUDEPATH += ../../rsync 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 @@ -32,3 +32,2 @@ #include <opie/odevice.h> -#include <opie/oprocess.h> @@ -47,2 +46,4 @@ +#include "../calibrate/calibrate.h" + using namespace Opie; @@ -119,10 +120,6 @@ int initApplication( int argc, char ** argv ) 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,2 +1,2 @@ -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 @@ -6,3 +6,3 @@ Architecture: arm Version: $QPE_VERSION-$SUB_VERSION.3 -Depends: opie-base, opie-calibrate +Depends: opie-base Replaces: opie-rotation 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 @@ -24,2 +24,3 @@ #include "systray.h" +#include "calibrate.h" #include "wait.h" @@ -83,2 +84,5 @@ static Global::Command builtins[] = { +#if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_SL5XXX) + { "calibrate", TaskBar::calibrate, 1, 0 }, +#endif #if !defined(QT_QWS_CASSIOPEIA) @@ -88,3 +92,3 @@ static Global::Command builtins[] = { - { 0, 0, 0, 0 }, + { 0, TaskBar::calibrate, 0, 0 }, }; @@ -304,2 +308,13 @@ 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 575a8c9..a0bf395 100644 --- a/core/launcher/taskbar.h +++ b/core/launcher/taskbar.h @@ -44,2 +44,4 @@ public: + static QWidget *calibrate( bool ); + bool recoverMemory(); |