| -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 @@ -201,5 +201,4 @@ bool DesktopApplication::qwsEventFilter( QWSEvent *e ) will not send multiple repeats if user holds key i.e. one shot - */ if (!keyRegisterList.isEmpty()) { @@ -532,5 +531,5 @@ void Desktop::raiseMenu() tempItem = cfg.readEntry( "Right2nd" , "Popup Menu" ); if ( tempItem == "Popup Menu" || tempItem.isEmpty() ) { - Global::terminateBuiltin("calibrate"); + Global::terminateBuiltin( "calibrate" ); tb->startMenu()->launch(); } else { @@ -542,5 +541,5 @@ void Desktop::raiseMenu() 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" ); QString tempItem; @@ -554,5 +553,6 @@ void Desktop::raiseEmail() // autoStarts apps on resume and start -void Desktop::execAutoStart() { +void Desktop::execAutoStart() +{ QString appName; int delay; @@ -765,42 +765,48 @@ void Desktop::rereadVolumes() keyclick = cfg.readBoolEntry("KeySound"); alarmsound = cfg.readBoolEntry("AlarmSound"); -// Config cfg("Sound"); -// cfg.setGroup("System"); -// touchclick = cfg.readBoolEntry("Touch"); -// keyclick = cfg.readBoolEntry("Key"); } void Desktop::keyClick() { - if ( keyclick ) - ODevice::inst ( )-> keySound ( ); + if ( keyclick ) + ODevice::inst ( )-> keySound ( ); } void Desktop::screenClick() { - if ( touchclick ) - ODevice::inst ( )-> touchSound ( ); + if ( touchclick ) + ODevice::inst ( )-> touchSound ( ); } void Desktop::soundAlarm() { - if ( qpedesktop-> alarmsound ) - ODevice::inst ( )-> alarmSound ( ); + 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; + 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; } |