From 15244683bb97d303d0d3b6104b46a9b429aaed85 Mon Sep 17 00:00:00 2001 From: harlekin Date: Mon, 15 Apr 2002 20:30:41 +0000 Subject: added a configurable delay, so for example if 5 min are set, and the suspend time is shorter, no app is autostarted --- (limited to 'core') 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 @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #ifdef QT_QWS_CUSTOM @@ -56,7 +57,7 @@ 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; } @@ -168,14 +169,14 @@ void DesktopApplication::receive( const QCString &msg, const QByteArray &data ) 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; @@ -277,7 +278,7 @@ bool DesktopApplication::qwsEventFilter( QWSEvent *e ) } } } - + return QPEApplication::qwsEventFilter( e ); } #endif @@ -547,14 +548,21 @@ void Desktop::raiseEmail() } // 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) @@ -593,13 +601,14 @@ void Desktop::togglePower() { bool wasloggedin = loggedin; loggedin=0; + suspendTime = QDateTime::currentDateTime(); darkScreen(); if ( wasloggedin ) blankScreen(); - + system("apm --suspend"); - - + + QWSServer::screenSaverActivate( FALSE ); { 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 @@ -27,6 +27,7 @@ #include #include +#include class Background; class Launcher; @@ -126,6 +127,7 @@ private: TransferServer *transferServer; PackageSlave *packageSlave; + QDateTime suspendTime; bool keyclick,touchclick; }; 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 @@ -97,7 +97,7 @@ namespace { tmpMime = cfg->readBoolEntry("text", true ); if(tmpMime ) mimes.append("text//*"); - + tmpMime = cfg->readBoolEntry("video", true ); if(tmpMime ) mimes.append("video//*" ); @@ -549,10 +549,10 @@ void Launcher::loadDocs() // ok here comes a hack belonging to Global:: 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 &fileSystems = storage.fileSystems(); @@ -591,7 +591,7 @@ void Launcher::loadDocs() // ok here comes a hack belonging to Global:: delete tmp; } } - } + } } } m_timeStamp = newStamp; @@ -687,7 +687,7 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data) 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; @@ -741,34 +741,48 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data) // 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 &fs = storage->fileSystems(); QListIterator it ( fs ); @@ -823,7 +837,7 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data) syncDialog->showMaximized(); syncDialog->whatLabel->setText( "" + what + "" ); connect( syncDialog->buttonCancel, SIGNAL( clicked() ), - SLOT( cancelSync() ) ); + SLOT( cancelSync() ) ); } else if ( msg == "stopSync()") { delete syncDialog; syncDialog = 0; @@ -862,7 +876,7 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data) //qDebug( "sending length %d", contents.length() ); QCopEnvelope e( "QPE/Desktop", "docLinks(QString)" ); e << contents; - + qDebug( "================ \n\n%s\n\n===============", contents.latin1() ); 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 @@ -22,7 +22,7 @@ #include #include #include -#include +//#include #include #include #include @@ -38,7 +38,7 @@ #include #include #include -#include +//#include #include #include @@ -55,6 +55,7 @@ int SHOW_NOTES; int ONLY_LATER; int AUTOSTART; int NEW_START=1; +QString AUTOSTART_TIMER; /* * Constructs a Example which is a child of 'parent', with the @@ -126,15 +127,17 @@ void Today::setOwnerField(QString &message) { * 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"); } @@ -212,6 +215,10 @@ void Today::init() { // 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; } @@ -240,6 +247,8 @@ void Today::startConfig() { 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(); @@ -249,7 +258,8 @@ void Today::startConfig() { 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); @@ -259,6 +269,7 @@ void Today::startConfig() { cfg.writeEntry("onlylater", onlylater); cfg.setGroup("Autostart"); cfg.writeEntry("autostart", autostart); + cfg.writeEntry("autostartdelay", autostartdelay); // sync it to "disk" cfg.write(); 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,11 +1,22 @@ -/**************************************************************************** -** 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 @@ -16,20 +27,12 @@ #include #include #include -#include +//#include -/* - * 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" ) ); @@ -120,7 +123,6 @@ todayconfig::todayconfig( QWidget* parent, const char* name, bool modal, WFlags 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 ) ); @@ -132,15 +134,18 @@ todayconfig::todayconfig( QWidget* parent, const char* name, bool modal, WFlags 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,19 +1,29 @@ -/**************************************************************************** -** 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 #include -//class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; +//class QVBoxLayout; +class QHBoxLayout; +class QGridLayout; class QCheckBox; class QFrame; class QLabel; @@ -21,8 +31,7 @@ class QSpinBox; class QTabWidget; class QWidget; -class todayconfig : public QDialog -{ +class todayconfig : public QDialog { Q_OBJECT public: @@ -49,7 +58,9 @@ public: QFrame* Frame14; QLabel* TextLabel1; QSpinBox* SpinBox7; + QLabel* TimeLabel; + QSpinBox* SpinBoxTime; }; -#endif // TODAYCONFIG_H +#endif -- cgit v0.9.0.2