author | kergoth <kergoth> | 2003-04-20 21:49:11 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-04-20 21:49:11 (UTC) |
commit | 258feac229c2e8b5016670c1edc442e923c58628 (patch) (unidiff) | |
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 | |||
@@ -99,4 +99,5 @@ static void login( bool at_poweron ) | |||
99 | { | 99 | { |
100 | if ( !loggedin ) { | 100 | if ( !loggedin ) { |
101 | Global::terminateBuiltin( "calibrate" ); | ||
101 | Password::authenticate( at_poweron ); | 102 | Password::authenticate( at_poweron ); |
102 | loggedin = 1; | 103 | loggedin = 1; |
@@ -622,4 +623,5 @@ void Desktop::executeOrModify( const QString& appLnkFile ) | |||
622 | if ( lnk.isValid() ) { | 623 | if ( lnk.isValid() ) { |
623 | QCString app = lnk.exec().utf8(); | 624 | QCString app = lnk.exec().utf8(); |
625 | Global::terminateBuiltin( "calibrate" ); | ||
624 | if ( QCopChannel::isRegistered( "QPE/Application/" + app ) ) { | 626 | if ( QCopChannel::isRegistered( "QPE/Application/" + app ) ) { |
625 | // MRUList::addTask( &lnk ); | 627 | // MRUList::addTask( &lnk ); |
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 | |||
@@ -18,4 +18,5 @@ HEADERS = background.h \ | |||
18 | launcher.h \ | 18 | launcher.h \ |
19 | launcherview.h \ | 19 | launcherview.h \ |
20 | ../../core/apps/calibrate/calibrate.h \ | ||
20 | startmenu.h \ | 21 | startmenu.h \ |
21 | transferserver.h \ | 22 | transferserver.h \ |
@@ -58,4 +59,5 @@ SOURCES = background.cpp \ | |||
58 | launcher.cpp \ | 59 | launcher.cpp \ |
59 | launcherview.cpp \ | 60 | launcherview.cpp \ |
61 | ../../core/apps/calibrate/calibrate.cpp \ | ||
60 | transferserver.cpp \ | 62 | transferserver.cpp \ |
61 | packageslave.cpp \ | 63 | packageslave.cpp \ |
@@ -93,4 +95,6 @@ INTERFACES = syncdialog.ui | |||
93 | INCLUDEPATH += ../../include | 95 | INCLUDEPATH += ../../include |
94 | DEPENDPATH+= ../../include . | 96 | DEPENDPATH+= ../../include . |
97 | INCLUDEPATH += ../../core/apps/calibrate | ||
98 | DEPENDPATH+= ../../core/apps/calibrate | ||
95 | INCLUDEPATH += ../../rsync | 99 | INCLUDEPATH += ../../rsync |
96 | DEPENDPATH+= ../../rsync | 100 | DEPENDPATH+= ../../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 | |||
@@ -31,5 +31,4 @@ | |||
31 | 31 | ||
32 | #include <opie/odevice.h> | 32 | #include <opie/odevice.h> |
33 | #include <opie/oprocess.h> | ||
34 | 33 | ||
35 | #include <qmessagebox.h> | 34 | #include <qmessagebox.h> |
@@ -46,4 +45,6 @@ | |||
46 | #include <unistd.h> | 45 | #include <unistd.h> |
47 | 46 | ||
47 | #include "../calibrate/calibrate.h" | ||
48 | |||
48 | using namespace Opie; | 49 | using namespace Opie; |
49 | 50 | ||
@@ -118,12 +119,8 @@ int initApplication( int argc, char ** argv ) | |||
118 | if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { | 119 | if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { |
119 | if ( !QFile::exists( "/etc/pointercal" ) ) { | 120 | if ( !QFile::exists( "/etc/pointercal" ) ) { |
120 | OProcess cal; | 121 | // Make sure calibration widget starts on top. |
121 | cal << "calibrate"; | 122 | Calibrate *cal = new Calibrate; |
122 | 123 | cal->exec(); | |
123 | if ( ! cal.start(OProcess::Block, OProcess::NoCommunication) ) { | 124 | delete cal; |
124 | QMessageBox::warning( 0, "Unable to calibrate", | ||
125 | "Failed to start the calibration tool.\n" | ||
126 | ); | ||
127 | } | ||
128 | } | 125 | } |
129 | } | 126 | } |
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,3 +1,3 @@ | |||
1 | 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 | 1 | 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 |
2 | Priority: required | 2 | Priority: required |
3 | Section: opie/system | 3 | Section: opie/system |
@@ -5,5 +5,5 @@ Maintainer: Project Opie <opie@handhelds.org> | |||
5 | Architecture: arm | 5 | Architecture: arm |
6 | Version: $QPE_VERSION-$SUB_VERSION.3 | 6 | Version: $QPE_VERSION-$SUB_VERSION.3 |
7 | Depends: opie-base, opie-calibrate | 7 | Depends: opie-base |
8 | Replaces: opie-rotation | 8 | Replaces: opie-rotation |
9 | Description: Launcher for Opie | 9 | 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 | |||
@@ -23,4 +23,5 @@ | |||
23 | #include "runningappbar.h" | 23 | #include "runningappbar.h" |
24 | #include "systray.h" | 24 | #include "systray.h" |
25 | #include "calibrate.h" | ||
25 | #include "wait.h" | 26 | #include "wait.h" |
26 | #include "appicons.h" | 27 | #include "appicons.h" |
@@ -82,4 +83,7 @@ static Global::Command builtins[] = { | |||
82 | #endif | 83 | #endif |
83 | 84 | ||
85 | #if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_SL5XXX) | ||
86 | { "calibrate", TaskBar::calibrate, 1, 0 }, | ||
87 | #endif | ||
84 | #if !defined(QT_QWS_CASSIOPEIA) | 88 | #if !defined(QT_QWS_CASSIOPEIA) |
85 | { "shutdown", Global::shutdown, 1, 0 }, | 89 | { "shutdown", Global::shutdown, 1, 0 }, |
@@ -87,5 +91,5 @@ static Global::Command builtins[] = { | |||
87 | #endif | 91 | #endif |
88 | 92 | ||
89 | { 0, 0, 0, 0 }, | 93 | { 0, TaskBar::calibrate, 0, 0 }, |
90 | }; | 94 | }; |
91 | 95 | ||
@@ -303,4 +307,15 @@ void TaskBar::receive( const QCString &msg, const QByteArray &data ) | |||
303 | } | 307 | } |
304 | 308 | ||
309 | QWidget *TaskBar::calibrate(bool) | ||
310 | { | ||
311 | #ifdef Q_WS_QWS | ||
312 | Calibrate *c = new Calibrate; | ||
313 | c->show(); | ||
314 | return c; | ||
315 | #else | ||
316 | return 0; | ||
317 | #endif | ||
318 | } | ||
319 | |||
305 | void TaskBar::toggleNumLockState() | 320 | void TaskBar::toggleNumLockState() |
306 | { | 321 | { |
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 | |||
@@ -43,4 +43,6 @@ public: | |||
43 | ~TaskBar(); | 43 | ~TaskBar(); |
44 | 44 | ||
45 | static QWidget *calibrate( bool ); | ||
46 | |||
45 | bool recoverMemory(); | 47 | bool recoverMemory(); |
46 | 48 | ||