author | llornkcor <llornkcor> | 2002-10-20 23:00:49 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-10-20 23:00:49 (UTC) |
commit | 8bbd3bca858939b15b8775b4811149b8d83bb6cc (patch) (unidiff) | |
tree | 3ec2f82cf31c49debdf46f21746c71c0d69ec1db /core/launcher/desktop.cpp | |
parent | 706b3e155ad713f388606b4ae15c70a2be4c2294 (diff) | |
download | opie-8bbd3bca858939b15b8775b4811149b8d83bb6cc.zip opie-8bbd3bca858939b15b8775b4811149b8d83bb6cc.tar.gz opie-8bbd3bca858939b15b8775b4811149b8d83bb6cc.tar.bz2 |
better implementation of F11 menu handling
-rw-r--r-- | core/launcher/desktop.cpp | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp index 9863187..387650b 100644 --- a/core/launcher/desktop.cpp +++ b/core/launcher/desktop.cpp | |||
@@ -473,16 +473,16 @@ bool DesktopApplication::qwsEventFilter( QWSEvent *e ) | |||
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(); |
@@ -1044,6 +1044,21 @@ void Desktop::screenClick() | |||
1044 | void Desktop::soundAlarm() | 1044 | void Desktop::soundAlarm() |
1045 | { | 1045 | { |
1046 | if ( qpedesktop-> alarmsound ) | 1046 | if ( qpedesktop-> alarmsound ) |
1047 | ODevice::inst ( ) -> alarmSound ( ); | 1047 | ODevice::inst ( ) -> alarmSound ( ); |
1048 | } | 1048 | } |
1049 | 1049 | ||
1050 | bool Desktop::eventFilter( QObject *, QEvent *ev ) | ||
1051 | { | ||
1052 | if ( ev->type() == QEvent::KeyPress ) { | ||
1053 | QKeyEvent *ke = (QKeyEvent *)ev; | ||
1054 | if ( ke->key() == Qt::Key_F11 ) { // menu key | ||
1055 | QWidget *active = qApp->activeWindow(); | ||
1056 | if ( active && active->isPopup() ) { | ||
1057 | active->close(); | ||
1058 | } | ||
1059 | raiseMenu(); | ||
1060 | return TRUE; | ||
1061 | } | ||
1062 | } | ||
1063 | return FALSE; | ||
1064 | } | ||