| -rw-r--r-- | core/launcher/desktop.cpp | 20 |
1 files changed, 13 insertions, 7 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 @@ -200,7 +200,6 @@ bool DesktopApplication::qwsEventFilter( QWSEvent *e ) when user presses key, unless keyboard has been requested from app. will not send multiple repeats if user holds key i.e. one shot - */ if (!keyRegisterList.isEmpty()) { KeyRegisterList::Iterator it; @@ -541,7 +540,7 @@ 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; tempItem = cfg.readEntry( "RightEnd", "Mail" ); @@ -553,7 +552,8 @@ void Desktop::raiseEmail() } // autoStarts apps on resume and start -void Desktop::execAutoStart() { +void Desktop::execAutoStart() +{ QString appName; int delay; QDateTime now = QDateTime::currentDateTime(); @@ -764,10 +764,6 @@ void Desktop::rereadVolumes() touchclick = cfg.readBoolEntry("TouchSound"); 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() @@ -798,9 +794,19 @@ bool Desktop::eventFilter( QObject *, QEvent *ev ) 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; } |