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/taskbar.cpp | |
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/taskbar.cpp | 17 |
1 files changed, 16 insertions, 1 deletions
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 | |||
@@ -19,12 +19,13 @@ | |||
19 | *********************************************************************/ | 19 | *********************************************************************/ |
20 | 20 | ||
21 | #include "startmenu.h" | 21 | #include "startmenu.h" |
22 | #include "inputmethods.h" | 22 | #include "inputmethods.h" |
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" |
27 | 28 | ||
28 | #include "taskbar.h" | 29 | #include "taskbar.h" |
29 | #include "desktop.h" | 30 | #include "desktop.h" |
30 | 31 | ||
@@ -78,18 +79,21 @@ static Global::Command builtins[] = { | |||
78 | #ifdef SINGLE_APP | 79 | #ifdef SINGLE_APP |
79 | #define APP(a,b,c,d) { a, new##b, c }, | 80 | #define APP(a,b,c,d) { a, new##b, c }, |
80 | #include "../launcher/apps.h" | 81 | #include "../launcher/apps.h" |
81 | #undef APP | 82 | #undef APP |
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 }, |
86 | // { "run", run, 1, 0 }, | 90 | // { "run", run, 1, 0 }, |
87 | #endif | 91 | #endif |
88 | 92 | ||
89 | { 0, 0, 0, 0 }, | 93 | { 0, TaskBar::calibrate, 0, 0 }, |
90 | }; | 94 | }; |
91 | 95 | ||
92 | static bool initNumLock() | 96 | static bool initNumLock() |
93 | { | 97 | { |
94 | #ifdef QPE_INITIAL_NUMLOCK_STATE | 98 | #ifdef QPE_INITIAL_NUMLOCK_STATE |
95 | QPE_INITIAL_NUMLOCK_STATE | 99 | QPE_INITIAL_NUMLOCK_STATE |
@@ -299,12 +303,23 @@ void TaskBar::receive( const QCString &msg, const QByteArray &data ) | |||
299 | } | 303 | } |
300 | else if ( msg == "toggleStartMenu()" ) { | 304 | else if ( msg == "toggleStartMenu()" ) { |
301 | sm-> launch ( ); | 305 | sm-> launch ( ); |
302 | } | 306 | } |
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 | { |
307 | if ( lockState ) lockState->toggleNumLockState(); | 322 | if ( lockState ) lockState->toggleNumLockState(); |
308 | } | 323 | } |
309 | 324 | ||
310 | void TaskBar::toggleCapsLockState() | 325 | void TaskBar::toggleCapsLockState() |