author | kergoth <kergoth> | 2003-04-19 22:07:06 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-04-19 22:07:06 (UTC) |
commit | 29c556ffc9b1497cd996ceb46d646b1eaf1288be (patch) (unidiff) | |
tree | b89c424de93f541bc80908c93172eb4e601e8c02 /core/launcher/taskbar.cpp | |
parent | c502394063598e63591e06072802f1c5a9e0c266 (diff) | |
download | opie-29c556ffc9b1497cd996ceb46d646b1eaf1288be.zip opie-29c556ffc9b1497cd996ceb46d646b1eaf1288be.tar.gz opie-29c556ffc9b1497cd996ceb46d646b1eaf1288be.tar.bz2 |
Split calibrate out as a standalone application, and ensure taskbar depends
on it. This makes ts debugging easier, having a seperate calibration tool
around, and as a side affect fixes calibration on the C700, which previously
required a reboot to take effect.
-rw-r--r-- | core/launcher/taskbar.cpp | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/core/launcher/taskbar.cpp b/core/launcher/taskbar.cpp index 8af568d..8158128 100644 --- a/core/launcher/taskbar.cpp +++ b/core/launcher/taskbar.cpp | |||
@@ -19,13 +19,12 @@ | |||
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" | ||
26 | #include "wait.h" | 25 | #include "wait.h" |
27 | #include "appicons.h" | 26 | #include "appicons.h" |
28 | 27 | ||
29 | #include "taskbar.h" | 28 | #include "taskbar.h" |
30 | #include "desktop.h" | 29 | #include "desktop.h" |
31 | 30 | ||
@@ -79,21 +78,18 @@ static Global::Command builtins[] = { | |||
79 | #ifdef SINGLE_APP | 78 | #ifdef SINGLE_APP |
80 | #define APP(a,b,c,d) { a, new##b, c }, | 79 | #define APP(a,b,c,d) { a, new##b, c }, |
81 | #include "../launcher/apps.h" | 80 | #include "../launcher/apps.h" |
82 | #undef APP | 81 | #undef APP |
83 | #endif | 82 | #endif |
84 | 83 | ||
85 | #if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_SL5XXX) | ||
86 | { "calibrate", TaskBar::calibrate, 1, 0 }, | ||
87 | #endif | ||
88 | #if !defined(QT_QWS_CASSIOPEIA) | 84 | #if !defined(QT_QWS_CASSIOPEIA) |
89 | { "shutdown", Global::shutdown, 1, 0 }, | 85 | { "shutdown", Global::shutdown, 1, 0 }, |
90 | // { "run", run, 1, 0 }, | 86 | // { "run", run, 1, 0 }, |
91 | #endif | 87 | #endif |
92 | 88 | ||
93 | { 0, TaskBar::calibrate, 0, 0 }, | 89 | { 0, 0, 0, 0 }, |
94 | }; | 90 | }; |
95 | 91 | ||
96 | static bool initNumLock() | 92 | static bool initNumLock() |
97 | { | 93 | { |
98 | #ifdef QPE_INITIAL_NUMLOCK_STATE | 94 | #ifdef QPE_INITIAL_NUMLOCK_STATE |
99 | QPE_INITIAL_NUMLOCK_STATE | 95 | QPE_INITIAL_NUMLOCK_STATE |
@@ -303,23 +299,12 @@ void TaskBar::receive( const QCString &msg, const QByteArray &data ) | |||
303 | } | 299 | } |
304 | else if ( msg == "toggleStartMenu()" ) { | 300 | else if ( msg == "toggleStartMenu()" ) { |
305 | sm-> launch ( ); | 301 | sm-> launch ( ); |
306 | } | 302 | } |
307 | } | 303 | } |
308 | 304 | ||
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 | |||
320 | void TaskBar::toggleNumLockState() | 305 | void TaskBar::toggleNumLockState() |
321 | { | 306 | { |
322 | if ( lockState ) lockState->toggleNumLockState(); | 307 | if ( lockState ) lockState->toggleNumLockState(); |
323 | } | 308 | } |
324 | 309 | ||
325 | void TaskBar::toggleCapsLockState() | 310 | void TaskBar::toggleCapsLockState() |