-rw-r--r-- | core/pim/today/changelog | 5 | ||||
-rw-r--r-- | core/pim/today/opie-today.control | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookplugin.cpp | 3 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookplugin.h | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/mail/mailplugin.cpp | 4 | ||||
-rw-r--r-- | core/pim/today/plugins/mail/mailplugin.h | 3 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todoplugin.cpp | 3 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todoplugin.h | 2 | ||||
-rw-r--r-- | core/pim/today/today.cpp | 39 | ||||
-rw-r--r-- | core/pim/today/todayconfig.cpp | 6 |
10 files changed, 59 insertions, 10 deletions
diff --git a/core/pim/today/changelog b/core/pim/today/changelog index 93abdcb..ba3cdbc 100644 --- a/core/pim/today/changelog +++ b/core/pim/today/changelog @@ -1 +1,6 @@ +0.6 + +* longer refresh intervals possible +* plugins can decide now if they want to take part in refresh cycles + 0.5.2 diff --git a/core/pim/today/opie-today.control b/core/pim/today/opie-today.control index 267a195..acdcf8e 100644 --- a/core/pim/today/opie-today.control +++ b/core/pim/today/opie-today.control @@ -5,3 +5,3 @@ Maintainer: Maximilian Reiß <harlekin@handhelds.org> Architecture: arm -Version: 0.5.2-$SUB_VERSION +Version: 0.6-$SUB_VERSION Depends: opie-base ($QPE_VERSION), libopie ($QPE_VERSION) diff --git a/core/pim/today/plugins/datebook/datebookplugin.cpp b/core/pim/today/plugins/datebook/datebookplugin.cpp index cacdb65..eda84be 100644 --- a/core/pim/today/plugins/datebook/datebookplugin.cpp +++ b/core/pim/today/plugins/datebook/datebookplugin.cpp @@ -59 +59,4 @@ QString DatebookPlugin::appName() const { +bool DatebookPlugin::excludeFromRefresh() const { + return false; +} diff --git a/core/pim/today/plugins/datebook/datebookplugin.h b/core/pim/today/plugins/datebook/datebookplugin.h index 4d0f8e6..13c62a9 100644 --- a/core/pim/today/plugins/datebook/datebookplugin.h +++ b/core/pim/today/plugins/datebook/datebookplugin.h @@ -38,3 +38,3 @@ public: QString appName() const; - + bool excludeFromRefresh() const; }; diff --git a/core/pim/today/plugins/mail/mailplugin.cpp b/core/pim/today/plugins/mail/mailplugin.cpp index 1c90df4..d497970 100644 --- a/core/pim/today/plugins/mail/mailplugin.cpp +++ b/core/pim/today/plugins/mail/mailplugin.cpp @@ -56 +56,5 @@ QString MailPlugin::appName() const { +bool MailPlugin::excludeFromRefresh() const { + return false; +} + diff --git a/core/pim/today/plugins/mail/mailplugin.h b/core/pim/today/plugins/mail/mailplugin.h index d2a3dcb..c937b9e 100644 --- a/core/pim/today/plugins/mail/mailplugin.h +++ b/core/pim/today/plugins/mail/mailplugin.h @@ -42,4 +42,3 @@ public: QString appName() const; - - + bool excludeFromRefresh() const; }; diff --git a/core/pim/today/plugins/todolist/todoplugin.cpp b/core/pim/today/plugins/todolist/todoplugin.cpp index 09b54af..e10b414 100644 --- a/core/pim/today/plugins/todolist/todoplugin.cpp +++ b/core/pim/today/plugins/todolist/todoplugin.cpp @@ -58 +58,4 @@ QString TodolistPlugin::appName() const { +bool TodolistPlugin::excludeFromRefresh() const { + return false; +} diff --git a/core/pim/today/plugins/todolist/todoplugin.h b/core/pim/today/plugins/todolist/todoplugin.h index 0a6669f..f98afdb 100644 --- a/core/pim/today/plugins/todolist/todoplugin.h +++ b/core/pim/today/plugins/todolist/todoplugin.h @@ -39,3 +39,3 @@ public: QString appName() const; - + bool excludeFromRefresh() const; }; diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index 8184730..3eda5c0 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp @@ -47,2 +47,3 @@ struct TodayPlugin { bool active; + bool excludeRefresh; int pos; @@ -88,3 +89,8 @@ void Today::setRefreshTimer( int interval ) { - if ( m_refreshTimerEnabled ) { + + disconnect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) ); + + // 0 is "never" case + if ( !interval == 0 ) { + connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) ); m_refreshTimer->changeInterval( interval ); @@ -131,4 +137,3 @@ void Today::init() { m_iconSize = cfg.readNumEntry( "IconSize", 18 ); - m_refreshTimer->changeInterval( cfg.readNumEntry( "checkinterval", 15000 ) ); - + setRefreshTimer( cfg.readNumEntry( "checkinterval", 15000 ) ); } @@ -141,4 +146,12 @@ void Today::loadPlugins() { + // extra list for plugins that exclude themself from periodic refresh + QMap<QString, TodayPlugin> pluginListRefreshExclude; + QValueList<TodayPlugin>::Iterator tit; + if ( !pluginList.isEmpty() ) { for ( tit = pluginList.begin(); tit != pluginList.end(); ++tit ) { + if ( (*tit).excludeRefresh ) { + pluginListRefreshExclude.insert( (*tit).name , (*tit) ); + qDebug( "Found an plug that does not want refresh feature" ); + } else { (*tit).library->unload(); @@ -146,3 +159,6 @@ void Today::loadPlugins() { } + } pluginList.clear(); + } + @@ -164,2 +180,10 @@ void Today::loadPlugins() { qDebug( QString(*it) ); + + // If plugin is exludes from refresh, get it in the list again here. + + if ( pluginListRefreshExclude.contains( (*it) ) ) { + tempList.insert( pluginListRefreshExclude[(*it)].name, pluginListRefreshExclude[(*it)] ); + qDebug( "TEST2 " + pluginListRefreshExclude[(*it)].name ); + } else { + TodayPlugin plugin; @@ -176,2 +200,3 @@ void Today::loadPlugins() { plugin.guiPart = plugin.iface->guiPart(); + plugin.excludeRefresh = plugin.guiPart->excludeFromRefresh(); @@ -209,2 +234,3 @@ void Today::loadPlugins() { } + } } else { @@ -218,2 +244,3 @@ void Today::loadPlugins() { QStringList::Iterator stringit; + for( stringit = m_allApplets.begin(); stringit != m_allApplets.end(); ++stringit ) { @@ -270,2 +297,5 @@ void Today::startConfig() { + // disconnect timer to prevent problems while being on config dialog + disconnect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) ); + TodayConfig conf( this, "dialog", true ); @@ -298,2 +328,5 @@ void Today::startConfig() { refresh(); + } else { + // since refresh is not called in that case , reconnect the signal + connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) ); } diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp index db1141a..8d0b069 100644 --- a/core/pim/today/todayconfig.cpp +++ b/core/pim/today/todayconfig.cpp @@ -106,4 +106,6 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal ) SpinRefresh = new QSpinBox( hbox_refresh ); - SpinRefresh->setMinValue( 2 ); - SpinRefresh->setSuffix( tr( " seconds" ) ); + SpinRefresh->setMinValue( 0 ); + SpinRefresh->setSuffix( tr( " sec" ) ); + SpinRefresh->setMaxValue ( 7200 ); + SpinRefresh->setSpecialValueText ( tr("never") ); QWhatsThis::add( SpinRefresh, tr( "How often should Today refresh itself" ) ); |