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 )
           cardSendTimer->start( 2000, TRUE );
           connect( cardSendTimer, SIGNAL( timeout() ), this, SLOT( sendCard() ) );
         }
         return TRUE;
       }
 //       menu key now opens application menu/toolbar
-       if ( ke->simpleData.keycode == Key_F11 ) {
-       if ( press ) emit menu();
-       return TRUE;
-       }
+//         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();
@@ -1044,6 +1044,21 @@ void Desktop::screenClick()
 void Desktop::soundAlarm()
 {
   if ( qpedesktop-> alarmsound )
     ODevice::inst ( ) -> alarmSound ( );
 }
 
+bool Desktop::eventFilter( QObject *, QEvent *ev )
+{
+    if ( ev->type() == QEvent::KeyPress ) {
+        QKeyEvent *ke = (QKeyEvent *)ev;
+        if ( ke->key() == Qt::Key_F11 ) { // menu key
+            QWidget *active = qApp->activeWindow();
+            if ( active && active->isPopup() ) {
+                active->close();
+            }
+            raiseMenu();
+            return TRUE;
+        }
+    }
+    return FALSE;
+}