summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-10-20 23:00:49 (UTC)
committer llornkcor <llornkcor>2002-10-20 23:00:49 (UTC)
commit8bbd3bca858939b15b8775b4811149b8d83bb6cc (patch) (unidiff)
tree3ec2f82cf31c49debdf46f21746c71c0d69ec1db
parent706b3e155ad713f388606b4ae15c70a2be4c2294 (diff)
downloadopie-8bbd3bca858939b15b8775b4811149b8d83bb6cc.zip
opie-8bbd3bca858939b15b8775b4811149b8d83bb6cc.tar.gz
opie-8bbd3bca858939b15b8775b4811149b8d83bb6cc.tar.bz2
better implementation of F11 menu handling
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/desktop.cpp23
-rw-r--r--core/launcher/desktop.h1
2 files changed, 20 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
@@ -476,10 +476,10 @@ bool DesktopApplication::qwsEventFilter( QWSEvent *e )
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() )
@@ -1047,3 +1047,18 @@ void Desktop::soundAlarm()
1047 ODevice::inst ( ) -> alarmSound ( ); 1047 ODevice::inst ( ) -> alarmSound ( );
1048} 1048}
1049 1049
1050bool 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}
diff --git a/core/launcher/desktop.h b/core/launcher/desktop.h
index 5de85f4..04c2f61 100644
--- a/core/launcher/desktop.h
+++ b/core/launcher/desktop.h
@@ -125,6 +125,7 @@ protected:
125 void executeOrModify( const QString& appLnkFile ); 125 void executeOrModify( const QString& appLnkFile );
126 void styleChange( QStyle & ); 126 void styleChange( QStyle & );
127 void timerEvent( QTimerEvent *e ); 127 void timerEvent( QTimerEvent *e );
128 bool eventFilter( QObject *, QEvent * );
128 129
129 QWidget *bg; 130 QWidget *bg;
130 Launcher *launcher; 131 Launcher *launcher;