author | llornkcor <llornkcor> | 2002-10-20 04:30:34 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-10-20 04:30:34 (UTC) |
commit | e2694c5aedb3697a373e363cebe72cddb3114a8f (patch) (unidiff) | |
tree | 5ba5910a40cfc151e01a956c609f1bdd0243668e /core | |
parent | f6a0af65b96edf63135d2b88c17b8510eebbbd51 (diff) | |
download | opie-e2694c5aedb3697a373e363cebe72cddb3114a8f.zip opie-e2694c5aedb3697a373e363cebe72cddb3114a8f.tar.gz opie-e2694c5aedb3697a373e363cebe72cddb3114a8f.tar.bz2 |
fix menu button on zaurus F11 raising opie menu
-rw-r--r-- | core/launcher/desktop.cpp | 4 | ||||
-rw-r--r-- | core/launcher/desktop.h | 1 | ||||
-rw-r--r-- | core/launcher/main.cpp | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp index 3546e28..9863187 100644 --- a/core/launcher/desktop.cpp +++ b/core/launcher/desktop.cpp | |||
@@ -454,54 +454,54 @@ bool DesktopApplication::qwsEventFilter( QWSEvent *e ) | |||
454 | qDebug( "release" ); | 454 | qDebug( "release" ); |
455 | QCopEnvelope( ( *it ).getChannel().utf8(), ( *it ).getMessage().utf8() ); | 455 | QCopEnvelope( ( *it ).getChannel().utf8(), ( *it ).getMessage().utf8() ); |
456 | } | 456 | } |
457 | } | 457 | } |
458 | } | 458 | } |
459 | 459 | ||
460 | if ( !keyboardGrabbed() ) { | 460 | if ( !keyboardGrabbed() ) { |
461 | if ( ke->simpleData.keycode == Key_F9 ) { | 461 | if ( ke->simpleData.keycode == Key_F9 ) { |
462 | if ( press ) | 462 | if ( press ) |
463 | emit datebook(); | 463 | emit datebook(); |
464 | return TRUE; | 464 | return TRUE; |
465 | } | 465 | } |
466 | if ( ke->simpleData.keycode == Key_F10 ) { | 466 | if ( ke->simpleData.keycode == Key_F10 ) { |
467 | if ( !press && cardSendTimer ) { | 467 | if ( !press && cardSendTimer ) { |
468 | emit contacts(); | 468 | emit contacts(); |
469 | delete cardSendTimer; | 469 | delete cardSendTimer; |
470 | } | 470 | } |
471 | else if ( press ) { | 471 | else if ( press ) { |
472 | cardSendTimer = new QTimer(); | 472 | cardSendTimer = new QTimer(); |
473 | cardSendTimer->start( 2000, TRUE ); | 473 | cardSendTimer->start( 2000, TRUE ); |
474 | connect( cardSendTimer, SIGNAL( timeout() ), this, SLOT( sendCard() ) ); | 474 | connect( cardSendTimer, SIGNAL( timeout() ), this, SLOT( sendCard() ) ); |
475 | } | 475 | } |
476 | return TRUE; | 476 | return TRUE; |
477 | } | 477 | } |
478 | /* menu key now opens application menu/toolbar | 478 | // menu key now opens application menu/toolbar |
479 | if ( ke->simpleData.keycode == Key_F11 ) { | 479 | if ( ke->simpleData.keycode == Key_F11 ) { |
480 | if ( press ) emit menu(); | 480 | if ( press ) emit menu(); |
481 | return TRUE; | 481 | return TRUE; |
482 | } | 482 | } |
483 | */ | 483 | |
484 | if ( ke->simpleData.keycode == Key_F12 ) { | 484 | if ( ke->simpleData.keycode == Key_F12 ) { |
485 | while ( activePopupWidget() ) | 485 | while ( activePopupWidget() ) |
486 | activePopupWidget() ->close(); | 486 | activePopupWidget() ->close(); |
487 | if ( press ) | 487 | if ( press ) |
488 | emit launch(); | 488 | emit launch(); |
489 | return TRUE; | 489 | return TRUE; |
490 | } | 490 | } |
491 | if ( ke->simpleData.keycode == Key_F13 ) { | 491 | if ( ke->simpleData.keycode == Key_F13 ) { |
492 | if ( press ) | 492 | if ( press ) |
493 | emit email(); | 493 | emit email(); |
494 | return TRUE; | 494 | return TRUE; |
495 | } | 495 | } |
496 | } | 496 | } |
497 | 497 | ||
498 | if ( ke->simpleData.keycode == Key_F34 ) { | 498 | if ( ke->simpleData.keycode == Key_F34 ) { |
499 | if ( press ) | 499 | if ( press ) |
500 | emit power(); | 500 | emit power(); |
501 | return TRUE; | 501 | return TRUE; |
502 | } | 502 | } |
503 | // This was used for the iPAQ PowerButton | 503 | // This was used for the iPAQ PowerButton |
504 | // See main.cpp for new KeyboardFilter | 504 | // See main.cpp for new KeyboardFilter |
505 | // | 505 | // |
506 | // if ( ke->simpleData.keycode == Key_SysReq ) { | 506 | // if ( ke->simpleData.keycode == Key_SysReq ) { |
507 | // if ( press ) emit power(); | 507 | // if ( press ) emit power(); |
diff --git a/core/launcher/desktop.h b/core/launcher/desktop.h index 09ffe1c..5de85f4 100644 --- a/core/launcher/desktop.h +++ b/core/launcher/desktop.h | |||
@@ -28,48 +28,49 @@ | |||
28 | 28 | ||
29 | #include <qwidget.h> | 29 | #include <qwidget.h> |
30 | #include <qdatetime.h> | 30 | #include <qdatetime.h> |
31 | 31 | ||
32 | class Background; | 32 | class Background; |
33 | class Launcher; | 33 | class Launcher; |
34 | class TaskBar; | 34 | class TaskBar; |
35 | class PowerStatus; | 35 | class PowerStatus; |
36 | class QCopBridge; | 36 | class QCopBridge; |
37 | class TransferServer; | 37 | class TransferServer; |
38 | class DesktopPowerAlerter; | 38 | class DesktopPowerAlerter; |
39 | class PackageSlave; | 39 | class PackageSlave; |
40 | class QPEScreenSaver; | 40 | class QPEScreenSaver; |
41 | 41 | ||
42 | class DesktopApplication : public QPEApplication | 42 | class DesktopApplication : public QPEApplication |
43 | { | 43 | { |
44 | Q_OBJECT | 44 | Q_OBJECT |
45 | public: | 45 | public: |
46 | DesktopApplication( int& argc, char **argv, Type t ); | 46 | DesktopApplication( int& argc, char **argv, Type t ); |
47 | ~DesktopApplication(); | 47 | ~DesktopApplication(); |
48 | 48 | ||
49 | static void switchLCD ( bool on ); // only for togglePower in Desktop | 49 | static void switchLCD ( bool on ); // only for togglePower in Desktop |
50 | 50 | ||
51 | signals: | 51 | signals: |
52 | void menu(); | ||
52 | void home(); | 53 | void home(); |
53 | void datebook(); | 54 | void datebook(); |
54 | void contacts(); | 55 | void contacts(); |
55 | void launch(); | 56 | void launch(); |
56 | void email(); | 57 | void email(); |
57 | void backlight(); | 58 | void backlight(); |
58 | void power(); | 59 | void power(); |
59 | void symbol(); | 60 | void symbol(); |
60 | void numLockStateToggle(); | 61 | void numLockStateToggle(); |
61 | void capsLockStateToggle(); | 62 | void capsLockStateToggle(); |
62 | void prepareForRestart(); | 63 | void prepareForRestart(); |
63 | 64 | ||
64 | protected: | 65 | protected: |
65 | #ifdef Q_WS_QWS | 66 | #ifdef Q_WS_QWS |
66 | 67 | ||
67 | bool qwsEventFilter( QWSEvent * ); | 68 | bool qwsEventFilter( QWSEvent * ); |
68 | #endif | 69 | #endif |
69 | 70 | ||
70 | void shutdown(); | 71 | void shutdown(); |
71 | void restart(); | 72 | void restart(); |
72 | 73 | ||
73 | public slots: | 74 | public slots: |
74 | virtual void desktopMessage ( const QCString &msg, const QByteArray &data ); | 75 | virtual void desktopMessage ( const QCString &msg, const QByteArray &data ); |
75 | virtual void systemMessage ( const QCString &msg, const QByteArray &data ); | 76 | virtual void systemMessage ( const QCString &msg, const QByteArray &data ); |
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp index 762a596..8974ced 100644 --- a/core/launcher/main.cpp +++ b/core/launcher/main.cpp | |||
@@ -70,48 +70,49 @@ void initEnvironment() | |||
70 | 70 | ||
71 | int initApplication( int argc, char ** argv ) | 71 | int initApplication( int argc, char ** argv ) |
72 | { | 72 | { |
73 | initEnvironment(); | 73 | initEnvironment(); |
74 | 74 | ||
75 | #if !defined(QT_QWS_CASSIOPEIA) && !defined(QT_QWS_IPAQ) && !defined(QT_QWS_EBX) | 75 | #if !defined(QT_QWS_CASSIOPEIA) && !defined(QT_QWS_IPAQ) && !defined(QT_QWS_EBX) |
76 | setenv( "QWS_SIZE", "240x320", 0 ); | 76 | setenv( "QWS_SIZE", "240x320", 0 ); |
77 | #endif | 77 | #endif |
78 | 78 | ||
79 | //Don't flicker at startup: | 79 | //Don't flicker at startup: |
80 | QWSServer::setDesktopBackground( QImage() ); | 80 | QWSServer::setDesktopBackground( QImage() ); |
81 | DesktopApplication a( argc, argv, QApplication::GuiServer ); | 81 | DesktopApplication a( argc, argv, QApplication::GuiServer ); |
82 | 82 | ||
83 | ODevice::inst ( )-> setSoftSuspend ( true ); | 83 | ODevice::inst ( )-> setSoftSuspend ( true ); |
84 | 84 | ||
85 | { // init backlight | 85 | { // init backlight |
86 | QCopEnvelope e("QPE/System", "setBacklight(int)" ); | 86 | QCopEnvelope e("QPE/System", "setBacklight(int)" ); |
87 | e << -3; // Forced on | 87 | e << -3; // Forced on |
88 | } | 88 | } |
89 | 89 | ||
90 | AlarmServer::initialize(); | 90 | AlarmServer::initialize(); |
91 | 91 | ||
92 | Desktop *d = new Desktop(); | 92 | Desktop *d = new Desktop(); |
93 | 93 | ||
94 | QObject::connect( &a, SIGNAL(menu()), d, SLOT(raiseMenu()) ); | ||
94 | QObject::connect( &a, SIGNAL(datebook()), d, SLOT(raiseDatebook()) ); | 95 | QObject::connect( &a, SIGNAL(datebook()), d, SLOT(raiseDatebook()) ); |
95 | QObject::connect( &a, SIGNAL(contacts()), d, SLOT(raiseContacts()) ); | 96 | QObject::connect( &a, SIGNAL(contacts()), d, SLOT(raiseContacts()) ); |
96 | QObject::connect( &a, SIGNAL(launch()), d, SLOT(raiseLauncher()) ); | 97 | QObject::connect( &a, SIGNAL(launch()), d, SLOT(raiseLauncher()) ); |
97 | QObject::connect( &a, SIGNAL(email()), d, SLOT(raiseEmail()) ); | 98 | QObject::connect( &a, SIGNAL(email()), d, SLOT(raiseEmail()) ); |
98 | QObject::connect( &a, SIGNAL(power()), d, SLOT(togglePower()) ); | 99 | QObject::connect( &a, SIGNAL(power()), d, SLOT(togglePower()) ); |
99 | QObject::connect( &a, SIGNAL(backlight()), d, SLOT(toggleLight()) ); | 100 | QObject::connect( &a, SIGNAL(backlight()), d, SLOT(toggleLight()) ); |
100 | QObject::connect( &a, SIGNAL(symbol()), d, SLOT(toggleSymbolInput()) ); | 101 | QObject::connect( &a, SIGNAL(symbol()), d, SLOT(toggleSymbolInput()) ); |
101 | QObject::connect( &a, SIGNAL(numLockStateToggle()), d, SLOT(toggleNumLockState()) ); | 102 | QObject::connect( &a, SIGNAL(numLockStateToggle()), d, SLOT(toggleNumLockState()) ); |
102 | QObject::connect( &a, SIGNAL(capsLockStateToggle()), d, SLOT(toggleCapsLockState()) ); | 103 | QObject::connect( &a, SIGNAL(capsLockStateToggle()), d, SLOT(toggleCapsLockState()) ); |
103 | QObject::connect( &a, SIGNAL(prepareForRestart()), d, SLOT(terminateServers()) ); | 104 | QObject::connect( &a, SIGNAL(prepareForRestart()), d, SLOT(terminateServers()) ); |
104 | 105 | ||
105 | (void)new SysFileMonitor(d); | 106 | (void)new SysFileMonitor(d); |
106 | Network::createServer(d); | 107 | Network::createServer(d); |
107 | 108 | ||
108 | #if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) | 109 | #if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) |
109 | if ( !QFile::exists( "/etc/pointercal" ) ) { | 110 | if ( !QFile::exists( "/etc/pointercal" ) ) { |
110 | // Make sure calibration widget starts on top. | 111 | // Make sure calibration widget starts on top. |
111 | Calibrate *cal = new Calibrate; | 112 | Calibrate *cal = new Calibrate; |
112 | cal->exec(); | 113 | cal->exec(); |
113 | delete cal; | 114 | delete cal; |
114 | } | 115 | } |
115 | #endif | 116 | #endif |
116 | 117 | ||
117 | d->show(); | 118 | d->show(); |