author | llornkcor <llornkcor> | 2002-10-20 04:30:34 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-10-20 04:30:34 (UTC) |
commit | e2694c5aedb3697a373e363cebe72cddb3114a8f (patch) (side-by-side diff) | |
tree | 5ba5910a40cfc151e01a956c609f1bdd0243668e | |
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 @@ -472,18 +472,18 @@ bool DesktopApplication::qwsEventFilter( QWSEvent *e ) cardSendTimer = new QTimer(); cardSendTimer->start( 2000, TRUE ); connect( cardSendTimer, SIGNAL( timeout() ), this, SLOT( sendCard() ) ); } return TRUE; } - /* menu key now opens application menu/toolbar +// menu key now opens application menu/toolbar if ( ke->simpleData.keycode == Key_F11 ) { if ( press ) emit menu(); return TRUE; } - */ + if ( ke->simpleData.keycode == Key_F12 ) { while ( activePopupWidget() ) activePopupWidget() ->close(); if ( press ) emit launch(); return TRUE; 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 @@ -46,12 +46,13 @@ public: DesktopApplication( int& argc, char **argv, Type t ); ~DesktopApplication(); static void switchLCD ( bool on ); // only for togglePower in Desktop signals: + void menu(); void home(); void datebook(); void contacts(); void launch(); void email(); void backlight(); 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 @@ -88,12 +88,13 @@ int initApplication( int argc, char ** argv ) } AlarmServer::initialize(); Desktop *d = new Desktop(); + QObject::connect( &a, SIGNAL(menu()), d, SLOT(raiseMenu()) ); QObject::connect( &a, SIGNAL(datebook()), d, SLOT(raiseDatebook()) ); QObject::connect( &a, SIGNAL(contacts()), d, SLOT(raiseContacts()) ); QObject::connect( &a, SIGNAL(launch()), d, SLOT(raiseLauncher()) ); QObject::connect( &a, SIGNAL(email()), d, SLOT(raiseEmail()) ); QObject::connect( &a, SIGNAL(power()), d, SLOT(togglePower()) ); QObject::connect( &a, SIGNAL(backlight()), d, SLOT(toggleLight()) ); |