| -rw-r--r-- | core/launcher/desktop.cpp | 58 |
1 files changed, 32 insertions, 26 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp index 5aba8dd..8756d37 100644 --- a/core/launcher/desktop.cpp +++ b/core/launcher/desktop.cpp @@ -202,3 +202,2 @@ bool DesktopApplication::qwsEventFilter( QWSEvent *e ) i.e. one shot - */ @@ -533,3 +532,3 @@ void Desktop::raiseMenu() if ( tempItem == "Popup Menu" || tempItem.isEmpty() ) { - Global::terminateBuiltin("calibrate"); + Global::terminateBuiltin( "calibrate" ); tb->startMenu()->launch(); @@ -543,3 +542,3 @@ void Desktop::raiseEmail() { - Config cfg( "qpe" ); //F13, 'Mail' + Config cfg( "qpe" ); //F13, 'Mail' // only in zaurus, on ipaq mail key is F11 cfg.setGroup( "AppsKey" ); @@ -555,3 +554,4 @@ void Desktop::raiseEmail() // autoStarts apps on resume and start -void Desktop::execAutoStart() { +void Desktop::execAutoStart() +{ QString appName; @@ -766,6 +766,2 @@ void Desktop::rereadVolumes() alarmsound = cfg.readBoolEntry("AlarmSound"); -// Config cfg("Sound"); -// cfg.setGroup("System"); -// touchclick = cfg.readBoolEntry("Touch"); -// keyclick = cfg.readBoolEntry("Key"); } @@ -774,4 +770,4 @@ void Desktop::keyClick() { - if ( keyclick ) - ODevice::inst ( )-> keySound ( ); + if ( keyclick ) + ODevice::inst ( )-> keySound ( ); } @@ -780,4 +776,4 @@ void Desktop::screenClick() { - if ( touchclick ) - ODevice::inst ( )-> touchSound ( ); + if ( touchclick ) + ODevice::inst ( )-> touchSound ( ); } @@ -786,4 +782,4 @@ void Desktop::soundAlarm() { - if ( qpedesktop-> alarmsound ) - ODevice::inst ( )-> alarmSound ( ); + if ( qpedesktop-> alarmsound ) + ODevice::inst ( )-> alarmSound ( ); } @@ -792,15 +788,25 @@ 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; + 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(); + + /* + * On iPAQ 38xx that key is not the "menu key" but the mail key + * To not confuse the users, make it launch the mail app on 38xx + */ + if (ODevice::inst()->model() == OMODEL_iPAQ_H38xx ) { + QCopEnvelope e( "QPE/System", "execute(QString)" ); + e << QString( "mail" ); + return true; + } else { + raiseMenu ( ); + return true; + } + } } - } - return false; + return false; } |