-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 | |||
@@ -13,25 +13,24 @@ | |||
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
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 | ||
32 | #include <qpe/qpeapplication.h> | 31 | #include <qpe/qpeapplication.h> |
33 | #include <qpe/qcopenvelope_qws.h> | 32 | #include <qpe/qcopenvelope_qws.h> |
34 | #include <qpe/global.h> | 33 | #include <qpe/global.h> |
35 | 34 | ||
36 | #if defined( QT_QWS_SL5XXX ) || defined( QT_QWS_IPAQ ) | 35 | #if defined( QT_QWS_SL5XXX ) || defined( QT_QWS_IPAQ ) |
37 | #include <qpe/custom.h> | 36 | #include <qpe/custom.h> |
@@ -73,33 +72,30 @@ using namespace Opie; | |||
73 | #include "../launcher/apps.h" | 72 | #include "../launcher/apps.h" |
74 | #undef APP | 73 | #undef APP |
75 | #endif // SINGLE_APP | 74 | #endif // SINGLE_APP |
76 | 75 | ||
77 | static Global::Command builtins[] = { | 76 | static Global::Command builtins[] = { |
78 | 77 | ||
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 |
100 | #endif | 96 | #endif |
101 | return FALSE; | 97 | return FALSE; |
102 | } | 98 | } |
103 | 99 | ||
104 | class LockKeyState : public QWidget | 100 | class LockKeyState : public QWidget |
105 | { | 101 | { |
@@ -297,35 +293,24 @@ void TaskBar::receive( const QCString &msg, const QByteArray &data ) | |||
297 | else if ( msg == "toggleMenu()" ) { | 293 | else if ( msg == "toggleMenu()" ) { |
298 | if ( sm-> launchMenu-> isVisible ( )) | 294 | if ( sm-> launchMenu-> isVisible ( )) |
299 | sm-> launch ( ); | 295 | sm-> launch ( ); |
300 | else { | 296 | else { |
301 | QCopEnvelope e ( "QPE/System", "toggleApplicationMenu()" ); | 297 | QCopEnvelope e ( "QPE/System", "toggleApplicationMenu()" ); |
302 | } | 298 | } |
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() |
326 | { | 311 | { |
327 | if ( lockState ) lockState->toggleCapsLockState(); | 312 | if ( lockState ) lockState->toggleCapsLockState(); |
328 | } | 313 | } |
329 | 314 | ||
330 | void TaskBar::toggleSymbolInput() | 315 | void TaskBar::toggleSymbolInput() |
331 | { | 316 | { |