fixed hardware start keys to be more flexible

1 files changed, 38 insertions, 38 deletions

diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index 1ec477c..5aba8dd 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -423,194 +423,194 @@ void Desktop::checkMemory()
       break;
   case Normal:
       memstate = Unknown;
       if ( ignoreNormal )
     ignoreNormal = FALSE;
       else
     QMessageBox::information ( 0 , "Memory Status",
         "There is enough memory again." );
       break;
   case VeryLow:
       memstate = Unknown;
       QMessageBox::critical( 0 , "Memory Status",
     "The memory is very low. \n"
     "Please end this application \n"
     "immediately." );
       recoverMemory();
     }
     existingMessage = FALSE;
 #endif
 }
 
 static bool isVisibleWindow(int wid)
 {
     const QList<QWSWindow> &list = qwsServer->clientWindows();
     QWSWindow* w;
     for (QListIterator<QWSWindow> it(list); (w=it.current()); ++it) {
   if ( w->winId() == wid )
       return !w->isFullyObscured();
     }
     return FALSE;
 }
 
 static bool hasVisibleWindow(const QString& clientname)
 {
     const QList<QWSWindow> &list = qwsServer->clientWindows();
     QWSWindow* w;
     for (QListIterator<QWSWindow> it(list); (w=it.current()); ++it) {
   if ( w->client()->identity() == clientname && !w->isFullyObscured() )
       return TRUE;
     }
     return FALSE;
 }
 
 void Desktop::raiseLauncher()
 {
     Config cfg("qpe"); //F12 'Home'
     cfg.setGroup("AppsKey");
     QString tempItem;
     tempItem = cfg.readEntry("Middle","Home");
     if(tempItem == "Home" || tempItem.isEmpty()) {
         if ( isVisibleWindow(launcher->winId()) )
             launcher->nextView();
         else
             launcher->raise();
     } else {
         QCopEnvelope e("QPE/System","execute(QString)");
         e << tempItem;
     }
 }
 
 void Desktop::executeOrModify(const QString& appLnkFile)
 {
     AppLnk lnk(MimeType::appsFolderName() + "/" + appLnkFile);
     if ( lnk.isValid() ) {
-  QCString app = lnk.exec().utf8();
-  Global::terminateBuiltin("calibrate");
-  if ( QCopChannel::isRegistered("QPE/Application/" + app) ) {
-      MRUList::addTask(&lnk);
-      if ( hasVisibleWindow(app) )
-    QCopChannel::send("QPE/Application/" + app, "nextView()");
-      else
-    QCopChannel::send("QPE/Application/" + app, "raise()");
-  } else {
-      lnk.execute();
-  }
+        QCString app = lnk.exec().utf8();
+        Global::terminateBuiltin("calibrate");
+        if ( QCopChannel::isRegistered("QPE/Application/" + app) ) {
+            MRUList::addTask(&lnk);
+            if ( hasVisibleWindow(app) )
+                QCopChannel::send("QPE/Application/" + app, "nextView()");
+            else
+                QCopChannel::send("QPE/Application/" + app, "raise()");
+        } else {
+            lnk.execute();
+        }
     }
 }
 
 void Desktop::raiseDatebook()
 {
-    Config cfg("qpe"); //F9 'Activity'
-    cfg.setGroup("AppsKey");
+    Config cfg( "qpe" ); //F9 'Activity'
+    cfg.setGroup( "AppsKey" );
     QString tempItem;
-    tempItem = cfg.readEntry("LeftEnd","Calender");
-    if(tempItem == "Calender" || tempItem.isEmpty())  executeOrModify("Applications/datebook.desktop");
-    else {
-        QCopEnvelope e("QPE/System","execute(QString)");
-        e << tempItem;
+    tempItem = cfg.readEntry( "LeftEnd" , "Calender" );
+    if ( tempItem == "Calender" || tempItem.isEmpty() ) {
+        tempItem = "datebook";
     }
+    QCopEnvelope e( "QPE/System", "execute(QString)" );
+    e << tempItem;
 }
 
 void Desktop::raiseContacts()
 {
-    Config cfg("qpe"); //F10, 'Contacts'
-    cfg.setGroup("AppsKey");
+    Config cfg( "qpe" ); //F10, 'Contacts'
+    cfg.setGroup( "AppsKey" );
     QString tempItem;
-    tempItem = cfg.readEntry("Left2nd","Address Book");
-    if(tempItem == "Address Book" || tempItem.isEmpty())  executeOrModify("Applications/addressbook.desktop");
-    else {
-        QCopEnvelope e("QPE/System","execute(QString)");
-        e << tempItem;
+    tempItem = cfg.readEntry( "Left2nd", "Address Book" );
+    if ( tempItem == "Address Book" || tempItem.isEmpty() )  {
+        tempItem = "addressbook";
     }
+    QCopEnvelope e("QPE/System","execute(QString)");
+    e << tempItem;
 }
 
 void Desktop::raiseMenu()
 {
-    Config cfg("qpe"); //F11, 'Menu'
-    cfg.setGroup("AppsKey");
+    Config cfg( "qpe" ); //F11, 'Menu
+    cfg.setGroup( "AppsKey" );
     QString tempItem;
-    tempItem = cfg.readEntry("Right2nd","Popup Menu");
-    if(tempItem == "Popup Menu" || tempItem.isEmpty()) {
-    Global::terminateBuiltin("calibrate");
-    tb->startMenu()->launch();
+    tempItem = cfg.readEntry( "Right2nd" , "Popup Menu" );
+    if ( tempItem == "Popup Menu" || tempItem.isEmpty() ) {
+        Global::terminateBuiltin("calibrate");
+        tb->startMenu()->launch();
     } else {
         QCopEnvelope e("QPE/System","execute(QString)");
         e << tempItem;
     }
 }
 
 void Desktop::raiseEmail()
 {
-    Config cfg("qpe"); //F13, 'Mail'
-    cfg.setGroup("AppsKey");
+    Config cfg( "qpe" ); //F13, 'Mail'
+    cfg.setGroup( "AppsKey" );
     QString tempItem;
-    tempItem = cfg.readEntry("RightEnd","Mail");
-    if(tempItem == "Mail" || tempItem == "qtmail" || tempItem.isEmpty())  executeOrModify("Applications/qtmail.desktop");
-    else {
-        QCopEnvelope e("QPE/System","execute(QString)");
-        e << tempItem;
+    tempItem = cfg.readEntry( "RightEnd", "Mail" );
+    if ( tempItem == "Mail" || tempItem == "qtmail" || tempItem.isEmpty() ) {
+        tempItem = "mail";
     }
+    QCopEnvelope e("QPE/System","execute(QString)");
+    e << tempItem;
 }
 
 // autoStarts apps on resume and start
 void Desktop::execAutoStart() {
     QString appName;
     int delay;
     QDateTime now = QDateTime::currentDateTime();
     Config cfg( "autostart" );
     cfg.setGroup( "AutoStart" );
     appName = cfg.readEntry( "Apps", "" );
     delay = ( cfg.readEntry( "Delay", "0" ) ).toInt();
     // If the time between suspend and resume was longer then the
     // value saved as delay, start the app
     if ( suspendTime.secsTo( now ) >= ( delay * 60 )  && !appName.isEmpty() ) {
         QCopEnvelope e( "QPE/System", "execute(QString)" );
         e << QString( appName );
     }
 }
 
 #if defined(QPE_HAVE_TOGGLELIGHT)
 #include <qpe/config.h>
 
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
 #include <linux/ioctl.h>
 #include <time.h>
 #endif
 
 static bool blanked=FALSE;
 
 static void blankScreen()
 {
     if ( !qt_screen ) return;
     /* Should use a big black window instead.
     QGfx* g = qt_screen->screenGfx();
     g->fillRect(0,0,qt_screen->width(),qt_screen->height());
     delete g;
     */
     blanked = TRUE;
 }
 
 static void darkScreen()
 {
     extern void qpe_setBacklight(int);
     qpe_setBacklight(0); // force off
 }
 
 
 void Desktop::togglePower()
 {
         extern void qpe_setBacklight ( int ); // We need to toggle the LCD fast - no time to send a QCop
 
         static bool excllock = false;
 
         if ( excllock )
                 return;
 
         excllock = true;
 
         bool wasloggedin = loggedin;
         loggedin=0;