launch for ipaq 38xx mail on button F11 instead of showing the menu

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
@@ -199,9 +199,8 @@ bool DesktopApplication::qwsEventFilter( QWSEvent *e )
       app that registers key/message to be sent back to the app, when it doesn't have focus,
       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;
       for( it = keyRegisterList.begin(); it != keyRegisterList.end(); ++it ) {
@@ -540,9 +539,9 @@ 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" );
     if ( tempItem == "Mail" || tempItem == "qtmail" || tempItem.isEmpty() ) {
@@ -552,9 +551,10 @@ void Desktop::raiseEmail()
     e << tempItem;
 }
 
 // autoStarts apps on resume and start
-void Desktop::execAutoStart() {
+void Desktop::execAutoStart()
+{
     QString appName;
     int delay;
     QDateTime now = QDateTime::currentDateTime();
     Config cfg( "autostart" );
@@ -763,12 +763,8 @@ void Desktop::rereadVolumes()
     cfg.setGroup("Volume");
     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()
 {
@@ -797,10 +793,20 @@ 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;
 }