added a configurable delay, so for example if 5 min are set, and the suspend time is shorter, no app is autostarted

6 files changed, 150 insertions, 98 deletions

diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index cf33011..43006f1 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -32,12 +32,13 @@
 
 #include <qpe/applnk.h>
 #include <qpe/mimetype.h>
 #include <qpe/password.h>
 #include <qpe/config.h>
 #include <qpe/power.h>
+#include <qpe/timeconversion.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/global.h>
 #ifdef QT_QWS_CUSTOM
 #include "qpe/custom.h"
 #endif
 
@@ -53,13 +54,13 @@
 #include <unistd.h>
 
 class QCopKeyRegister
 {
 public:
   QCopKeyRegister() : keyCode(0) { }
-  QCopKeyRegister(int k, const QString &c, const QString &m) 
+  QCopKeyRegister(int k, const QString &c, const QString &m)
   : keyCode(k), channel(c), message(m) { }
 
   int getKeyCode() const { return keyCode; }
   QString getChannel() const { return channel; }
   QString getMessage() const { return message; }
 
@@ -165,20 +166,20 @@ void DesktopApplication::receive( const QCString &msg, const QByteArray &data )
     int k;
     QString c, m;
 
     stream >> k;
     stream >> c;
     stream >> m;
-    
+
     qWarning("KeyRegisterRecieved: %i, %s, %s", k, (const char*)c, (const char *)m);
     keyRegisterList.append(QCopKeyRegister(k,c,m));
-  } 
+  }
   else if (msg == "suspend()"){
     emit power();
   }
-  
+
 }
 
 enum MemState { Unknown, VeryLow, Low, Normal } memstate=Unknown;
 
 #ifdef Q_WS_QWS
 bool DesktopApplication::qwsEventFilter( QWSEvent *e )
@@ -274,13 +275,13 @@ bool DesktopApplication::qwsEventFilter( QWSEvent *e )
       }
       } else {
       up = TRUE;
       }
     }
     }
-  
+
     return QPEApplication::qwsEventFilter( e );
 }
 #endif
 
 void DesktopApplication::psTimeout()
 {
@@ -544,20 +545,27 @@ void Desktop::raiseEmail()
         QCopEnvelope e("QPE/System","execute(QString)");
         e << tempItem;
     }
 }
 
 // autoStarts apps on resume and start
-void Desktop::execAutoStart()
-{
-  QString appName;
-  Config cfg( "autostart" );
-  cfg.setGroup( "AutoStart" );
-  appName = cfg.readEntry("Apps", "");
-  QCopEnvelope e("QPE/System", "execute(QString)");
-  e << QString(appName);
+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) ) {
+        QCopEnvelope e("QPE/System", "execute(QString)");
+        e << QString(appName);
+    } else {
+    }
 }
 
 #if defined(QPE_HAVE_TOGGLELIGHT)
 #include <qpe/config.h>
 
 #include <sys/ioctl.h>
@@ -590,19 +598,20 @@ static void darkScreen()
 
 
 void Desktop::togglePower()
 {
   bool wasloggedin = loggedin;
   loggedin=0;
+  suspendTime = QDateTime::currentDateTime();
   darkScreen();
   if ( wasloggedin )
     blankScreen();
-  
+
   system("apm --suspend");
-  
-  
+
+
 
   QWSServer::screenSaverActivate( FALSE );
   {
     QCopEnvelope("QPE/Card", "mtabChanged()" ); // might have changed while asleep
     QCopEnvelope e("QPE/System", "setBacklight(int)");
     e << -3; // Force on
diff --git a/core/launcher/desktop.h b/core/launcher/desktop.h
index de0dbf0..e094dc0 100644
--- a/core/launcher/desktop.h
+++ b/core/launcher/desktop.h
@@ -24,12 +24,13 @@
 
 #include "shutdownimpl.h"
 
 #include <qpe/qpeapplication.h>
 
 #include <qwidget.h>
+#include <qdatetime.h>
 
 class Background;
 class Launcher;
 class TaskBar;
 class PowerStatus;
 class QCopBridge;
@@ -123,12 +124,13 @@ private:
     bool recoverMemory();
 
     QCopBridge *qcopBridge;
     TransferServer *transferServer;
     PackageSlave *packageSlave;
 
+    QDateTime suspendTime;
     bool keyclick,touchclick;
 };
 
 
 #endif // __DESKTOP_H__
 
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index 1449269..979eee6 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -94,13 +94,13 @@ namespace {
       if(tmpMime )
         mimes.append("image//*" );
 
       tmpMime = cfg->readBoolEntry("text", true );
       if(tmpMime )
         mimes.append("text//*");
-   
+
       tmpMime = cfg->readBoolEntry("video", true );
       if(tmpMime )
         mimes.append("video//*" );
     }
     return mimes;
   }
@@ -546,16 +546,16 @@ void Launcher::loadDocs() // ok here comes a hack belonging to Global::
     QString home = QString(getenv("HOME"))  + "/Documents";
     tmp = new DocLnkSet( home , QString::null);
     docsFolder->appendFrom( *tmp );
     delete tmp;
     // find out wich filesystems are new in this round
     // We will do this by having a timestamp inside each mountpoint
-    // if the current timestamp doesn't match this is a new file system and 
+    // if the current timestamp doesn't match this is a new file system and
     // come up with our MediumMountGui :) let the hacking begin
     int stamp = uidgen.generate();
-    
+
     QString newStamp = QString::number( stamp ); // generates newtime Stamp
     StorageInfo storage;
     const QList<FileSystem> &fileSystems = storage.fileSystems();
     QListIterator<FileSystem> it ( fileSystems );
     for ( ; it.current(); ++it ) {
       if ( (*it)->isRemovable() ) { // let's find out  if we should search on it
@@ -588,13 +588,13 @@ void Launcher::loadDocs() // ok here comes a hack belonging to Global::
             if( check ){ // find the documents
               tmp = new DocLnkSet( (*it)->path(), configToMime(&cfg ).join(";") );
               docsFolder->appendFrom( *tmp );
               delete tmp;
             }
           }
-        } 
+        }
        }
     }
     m_timeStamp = newStamp;
 }
 
 void Launcher::updateTabs()
@@ -684,13 +684,13 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
       QString app;
       stream >> app;
       qWarning("app closed %s", app.latin1()  );
       MRUList::removeTask( app );
     }else if ( msg == "linkChanged(QString)" ) {
       QString link;
-      stream >> link;  
+      stream >> link;
   if ( in_lnk_props ) {
       got_lnk_change = TRUE;
       lnk_change = link;
   } else {
       updateLink(link);
   }
@@ -738,40 +738,54 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
   e << home;
   int locked = (int) Desktop::screenLocked();
   e << locked;
   // register an app for autostart
   // if clear is send the list is cleared.
     } else if ( msg == "autoStart(QString)" ) {
-      QString appName;
-      stream >> appName;
-      Config cfg( "autostart" );
-      cfg.setGroup( "AutoStart" );
-      if ( appName.compare("clear") == 0){
-  cfg.writeEntry("Apps", "");
-      }
+        QString appName;
+        stream >> appName;
+        Config cfg( "autostart" );
+        cfg.setGroup( "AutoStart" );
+        if ( appName.compare("clear") == 0){
+            cfg.writeEntry("Apps", "");
+        }
     } else if ( msg == "autoStart(QString,QString)" ) {
-      QString modifier, appName;
-      stream >> modifier >> appName;
-      Config cfg( "autostart" );
-      cfg.setGroup( "AutoStart" );
-      if ( modifier.compare("add") == 0 ){
-  // only add it appname is entered
-  if (!appName.isEmpty()) {
-    cfg.writeEntry("Apps", appName);
-  }
-      } else if (modifier.compare("remove") == 0 ) {
-  // need to change for multiple entries
-  // actually remove is right now simular to clear, but in future there 
-  // should be multiple apps in autostart possible.
-  QString checkName;
-  checkName = cfg.readEntry("Apps", "");
-  if (checkName == appName) {
-    cfg.writeEntry("Apps", "");
-  }
-      }
-    } else if ( msg == "sendCardInfo()" ) {
+        QString modifier, appName;
+        stream >> modifier >> appName;
+        Config cfg( "autostart" );
+        cfg.setGroup( "AutoStart" );
+        if ( modifier.compare("add") == 0 ){
+            // only add if appname is entered
+            if (!appName.isEmpty()) {
+                cfg.writeEntry("Apps", appName);
+            }
+        } else if (modifier.compare("remove") == 0 ) {
+            // need to change for multiple entries
+            // actually remove is right now simular to clear, but in future there
+            // should be multiple apps in autostart possible.
+            QString checkName;
+            checkName = cfg.readEntry("Apps", "");
+            if (checkName == appName) {
+                cfg.writeEntry("Apps", "");
+            }
+        }
+        // case the autostart feature should be delayed
+    } else if ( msg == "autoStart(QString, QString, QString)") {
+         QString modifier, appName, delay;
+         stream >> modifier >> appName >> delay;
+        Config cfg( "autostart" );
+        cfg.setGroup( "AutoStart" );
+        if ( modifier.compare("add") == 0 ){
+            // only add it appname is entered
+            if (!appName.isEmpty()) {
+                cfg.writeEntry("Apps", appName);
+                cfg.writeEntry("Delay", delay);
+            }
+        } else {
+        }
+   } else if ( msg == "sendCardInfo()" ) {
         QCopEnvelope e( "QPE/Desktop", "cardInfo(QString)" );
         const QList<FileSystem> &fs = storage->fileSystems();
   QListIterator<FileSystem> it ( fs );
   QString s;
   QString homeDir = getenv("HOME");
   QString hardDiskHome;
@@ -820,13 +834,13 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
   syncDialog = new SyncDialog( this, "syncProgress", FALSE,
              WStyle_Tool | WStyle_Customize |
              Qt::WStyle_StaysOnTop );
   syncDialog->showMaximized();
   syncDialog->whatLabel->setText( "<b>" + what + "</b>" );
   connect( syncDialog->buttonCancel, SIGNAL( clicked() ),
-     SLOT( cancelSync() ) );  
+     SLOT( cancelSync() ) );
     }
     else if ( msg == "stopSync()") {
   delete syncDialog; syncDialog = 0;
     } else if ( msg == "getAllDocLinks()" ) {
   loadDocs();
 
@@ -859,13 +873,13 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
       contents += QString("Size = %1\n").arg( fi.size() );
   }
 
   //qDebug( "sending length %d", contents.length() );
   QCopEnvelope e( "QPE/Desktop", "docLinks(QString)" );
   e << contents;
-  
+
   qDebug( "================ \n\n%s\n\n===============",
   contents.latin1() );
 
   delete docsFolder;
   docsFolder = 0;
     }
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 61bd0c4..f5ed8d2 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -19,13 +19,13 @@
 
 #include "today.h"
 
 #include <qpe/timestring.h>
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
-#include <qpe/qprocess.h>
+//#include <qpe/qprocess.h>
 #include <qpe/resource.h>
 #include <qpe/contact.h>
 #include <qpe/global.h>
 #include <qpe/qpeapplication.h>
 
 #include <qdir.h>
@@ -35,13 +35,13 @@
 #include <qcheckbox.h>
 #include <qspinbox.h>
 #include <qpushbutton.h>
 #include <qlabel.h>
 #include <qtimer.h>
 #include <qpixmap.h>
-#include <qfileinfo.h>
+//#include <qfileinfo.h>
 #include <qlayout.h>
 #include <qtl.h>
 
 //#include <iostream.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -52,12 +52,13 @@ int MAX_LINES_MEET;
 int SHOW_LOCATION;
 int SHOW_NOTES;
 // show only later dates
 int ONLY_LATER;
 int AUTOSTART;
 int NEW_START=1;
+QString AUTOSTART_TIMER;
 
 /*
  *  Constructs a Example which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'
  */
 Today::Today( QWidget* parent,  const char* name, WFlags fl )
@@ -123,21 +124,23 @@ void Today::setOwnerField(QString &message) {
 
 /*
  * Autostart, uses the new (opie only) autostart method in the launcher code.
  * If registered against that today ist started on each resume.
  */
 void Today::autoStart() {
-  Config cfg("today");
-  cfg.setGroup("Autostart");
-  AUTOSTART = cfg.readNumEntry("autostart",1);
+    // Config cfg("today");
+    //cfg.setGroup("Autostart");
+    //AUTOSTART = cfg.readNumEntry("autostart",1);
+
   if (AUTOSTART) {
-    QCopEnvelope e("QPE/System", "autoStart(QString,QString)");
+    QCopEnvelope e("QPE/System", "autoStart(QString, QString, QString)");
     e << QString("add");
     e << QString("today");
+    e << AUTOSTART_TIMER;
   } else {
-    QCopEnvelope e("QPE/System", "autoStart(QString,QString)");
+    QCopEnvelope e("QPE/System", "autoStart(QString, QString)");
     e << QString("remove");
     e << QString("today");
   }
 }
 
 /*
@@ -209,12 +212,16 @@ void Today::init() {
   SHOW_LOCATION = cfg.readNumEntry("showlocation",1);
   // if notes should be shown
   SHOW_NOTES = cfg.readNumEntry("shownotes",0);
   // should only later appointments be shown or all for the current day.
   ONLY_LATER = cfg.readNumEntry("onlylater",1);
 
+  cfg.setGroup("Autostart");
+  AUTOSTART = cfg.readNumEntry("autostart",1);
+  AUTOSTART_TIMER = cfg.readEntry("autostartdelay", "0");
+
   //db = new DateBookDB;
 }
 
 /*
  * The method for the configuration dialog.
  */
@@ -237,31 +244,35 @@ void Today::startConfig() {
   // clip when?
   conf->SpinBox7->setValue(MAX_CHAR_CLIP);
   // only later
   conf->CheckBox3->setChecked(ONLY_LATER);
   // if today should be autostarted
   conf->CheckBoxAuto->setChecked(AUTOSTART);
+  // autostart only if device has been suspended for X minutes
+  conf->SpinBoxTime->setValue( AUTOSTART_TIMER.toInt() );
 
   conf->exec();
 
   int maxlinestask = conf->SpinBox2->value();
   int maxmeet = conf->SpinBox1->value();
   int location = conf->CheckBox1->isChecked();
   int notes = conf->CheckBox2->isChecked();
   int maxcharclip = conf->SpinBox7->value();
   int onlylater = conf->CheckBox3->isChecked();
-  int autostart =conf->CheckBoxAuto->isChecked();
+  int autostart = conf->CheckBoxAuto->isChecked();
+  int autostartdelay = conf->SpinBoxTime->value();
 
   cfg.writeEntry("maxlinestask",maxlinestask);
   cfg.writeEntry("maxcharclip", maxcharclip);
   cfg.writeEntry("maxlinesmeet",maxmeet);
   cfg.writeEntry("showlocation",location);
   cfg.writeEntry("shownotes", notes);
   cfg.writeEntry("onlylater", onlylater);
   cfg.setGroup("Autostart");
   cfg.writeEntry("autostart", autostart);
+  cfg.writeEntry("autostartdelay", autostartdelay);
 
   // sync it to "disk"
   cfg.write();
   NEW_START=1;
   draw();
   autoStart();
diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp
index 500e8fb..905ec4b 100644
--- a/core/pim/today/todayconfig.cpp
+++ b/core/pim/today/todayconfig.cpp
@@ -1,38 +1,41 @@
-/****************************************************************************
-** Form implementation generated from reading ui file 'todayconfig.ui'
-**
-** Created: Thu Feb 14 15:04:33 2002
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
+/*
+ * todayconfig.cpp
+ *
+ * ---------------------
+ *
+ * begin       : Sun 10 17:20:00 CEST 2002
+ * copyright   : (c) 2002 by Maximilian Reiß
+ * email       : max.reiss@gmx.de
+ *
+ */
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
 #include "todayconfig.h"
 
 #include <qcheckbox.h>
 #include <qframe.h>
 #include <qlabel.h>
 #include <qspinbox.h>
 #include <qtabwidget.h>
 #include <qwidget.h>
 #include <qlayout.h>
 #include <qvariant.h>
-#include <qwhatsthis.h>
+//#include <qwhatsthis.h>
 
-/*
- *  Constructs a todayconfig which is a child of 'parent', with the
- *  name 'name' and widget flags set to 'f'
- *
- *  The dialog will by default be modeless, unless you set 'modal' to
- *  TRUE to construct a modal dialog.
- */
 todayconfig::todayconfig( QWidget* parent,  const char* name, bool modal, WFlags fl )
-    : QDialog( parent, name, modal, fl )
-{
+    : QDialog( parent, name, modal, fl ) {
   if ( !name )
-    setName( "todayconfig" );
+      setName( "todayconfig" );
   resize( 175, 232 );
   setCaption( tr( "Today config" ) );
 
   TabWidget3 = new QTabWidget( this, "TabWidget3" );
   TabWidget3->setGeometry( QRect( 0, 0, 220, 320 ) );
   TabWidget3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, TabWidget3->sizePolicy().hasHeightForWidth() ) );
@@ -117,30 +120,32 @@ todayconfig::todayconfig( QWidget* parent,  const char* name, bool modal, WFlags
   TextLabel1->setText( tr( "Clip after how\n"
                            "many letters" ) );
 
   SpinBox7 = new QSpinBox( Frame14, "SpinBox7" );
   SpinBox7->setGeometry( QRect( 115, 20, 58, 25 ) );
   SpinBox7->setMaxValue( 80 );
-  SpinBox7->setValue( 30 );
 
   TextLabel2 = new QLabel( Frame14, "AutoStart" );
   TextLabel2->setGeometry( QRect( 20, 60, 100, 45 ) );
   TextLabel2->setText( tr( "Should today be\n"
                            "autostarted on\n"
                            "resume?"
                            " (Opie only)" ) );
 
   CheckBoxAuto = new QCheckBox (Frame14, "CheckBoxAuto" );
   CheckBoxAuto->setGeometry( QRect( 158, 60, 27, 21 ) );
 
+  TimeLabel = new QLabel( Frame14, "TimeLabel" );
+  TimeLabel->setGeometry( QRect ( 20, 120, 120, 45 ) );
+  TimeLabel->setText( tr( "Activate the  \n"
+                          "autostart after how\n"
+                          "many minutes?" ) );
+  SpinBoxTime = new QSpinBox( Frame14, "TimeSpinner");
+  SpinBoxTime->setGeometry( QRect( 115,  120,  58, 25 ) );
+
   TabWidget3->insertTab( tab_3, tr( "Misc" ) );
 
 }
 
-/*
- *  Destroys the object and frees any allocated resources
- */
-todayconfig::~todayconfig()
-{
-    // no need to delete child widgets, Qt does it all for us
+todayconfig::~todayconfig() {
 }
 
diff --git a/core/pim/today/todayconfig.h b/core/pim/today/todayconfig.h
index 4739b5a..2986c4c 100644
--- a/core/pim/today/todayconfig.h
+++ b/core/pim/today/todayconfig.h
@@ -1,31 +1,40 @@
-/****************************************************************************
-** Form interface generated from reading ui file 'todayconfig.ui'
-**
-** Created: Thu Feb 14 15:04:33 2002
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
+/*
+ * todayconfig.h
+ *
+ * ---------------------
+ *
+ * begin       : Sun 10 17:20:00 CEST 2002
+ * copyright   : (c) 2002 by Maximilian Reiß
+ * email       : max.reiss@gmx.de
+ *
+ */
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
 #ifndef TODAYCONFIG_H
 #define TODAYCONFIG_H
 
 #include <qvariant.h>
 #include <qdialog.h>
-//class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
+//class QVBoxLayout;
+class QHBoxLayout;
+class QGridLayout;
 class QCheckBox;
 class QFrame;
 class QLabel;
 class QSpinBox;
 class QTabWidget;
 class QWidget;
 
-class todayconfig : public QDialog
-{ 
+class todayconfig : public QDialog {
     Q_OBJECT
 
 public:
     todayconfig( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~todayconfig();
 
@@ -46,10 +55,12 @@ public:
     QLabel* TextLabel6;
     QSpinBox* SpinBox2;
     QWidget* tab_3;
     QFrame* Frame14;
     QLabel* TextLabel1;
     QSpinBox* SpinBox7;
+    QLabel* TimeLabel;
+    QSpinBox* SpinBoxTime;
 
 };
 
-#endif // TODAYCONFIG_H
+#endif