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,4 +1,9 @@
+0.6
+
+* longer refresh intervals possible
+* plugins can decide now if they want to take part in refresh cycles
+
 0.5.2
 
 * refresh settings
 * only launch datebook config when clicked on a date ( opie only )
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
@@ -2,9 +2,9 @@ Files: bin/today apps/1Pim/today.desktop pics/today/*
 Priority: optional
 Section: opie/applications
 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)
 License: GPL
 Description: today screen
  This today screen app gives an overview of appointments 
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
@@ -56,4 +56,7 @@ TodayConfigWidget* DatebookPlugin::configWidget( QWidget* wid ) {
 QString DatebookPlugin::appName()  const {
     return "datebook";
 }
 
+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
@@ -35,9 +35,9 @@ public:
     QWidget* widget( QWidget *);
     QString pixmapNameConfig() const;
     TodayConfigWidget* configWidget( QWidget *);
     QString appName() const;
-
+    bool excludeFromRefresh() const;
 };
 
 
 #endif
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
@@ -53,4 +53,8 @@ QString MailPlugin::appName() const {
     return "mail";
 }
 
 
+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
@@ -39,9 +39,8 @@ public:
     QWidget* widget(QWidget *);
     QString pixmapNameConfig() const;
     TodayConfigWidget* configWidget(QWidget *);
     QString appName() const;
-
-
+    bool excludeFromRefresh() const;
 };
 
 #endif
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
@@ -55,4 +55,7 @@ QString TodolistPlugin::appName() const {
     return  "todolist";
 }
 
 
+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
@@ -36,8 +36,8 @@ public:
     QWidget* widget(QWidget *);
     QString pixmapNameConfig() const;
     TodayConfigWidget* configWidget(QWidget *);
     QString appName() const;
-
+    bool excludeFromRefresh() const;
 };
 
 #endif
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
@@ -44,8 +44,9 @@ struct TodayPlugin {
     TodayPluginObject *guiPart;
     QWidget *guiBox;
     QString name;
     bool active;
+    bool excludeRefresh;
     int pos;
 };
 
 static QValueList<TodayPlugin> pluginList;
@@ -85,9 +86,14 @@ void Today::channelReceived( const QCString &msg, const QByteArray & data ) {
 }
 
 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 );
     }
 }
 
@@ -128,24 +134,34 @@ void Today::init() {
     m_allApplets = cfg.readListEntry( "AllApplets", ',' );
 
     cfg.setGroup( "General" );
     m_iconSize = cfg.readNumEntry( "IconSize", 18 );
-    m_refreshTimer->changeInterval( cfg.readNumEntry( "checkinterval", 15000 ) );
-
+    setRefreshTimer(  cfg.readNumEntry( "checkinterval", 15000 ) );
 }
 
 
 /**
  * Load the plugins
  */
 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();
         delete (*tit).library;
     }
+        }
     pluginList.clear();
+    }
+
 
     QString path = QPEApplication::qpeDir() + "/plugins/today";
     QDir dir( path, "lib*.so" );
 
@@ -161,8 +177,16 @@ void Today::loadPlugins() {
         qDebug( "querying: %s", QString( path + "/" + *it ).latin1() );
         if ( lib->queryInterface( IID_TodayPluginInterface, (QUnknownInterface**)&iface ) == QS_OK ) {
             qDebug( "loading: %s", QString( path + "/" + *it ).latin1() );
             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;
             plugin.library = lib;
             plugin.iface = iface;
             plugin.name = QString(*it);
@@ -173,8 +197,9 @@ void Today::loadPlugins() {
             } else {
                 plugin.active = false;
             }
             plugin.guiPart = plugin.iface->guiPart();
+                plugin.excludeRefresh = plugin.guiPart->excludeFromRefresh();
 
             // package the whole thing into a qwidget so it can be shown and hidden
             plugin.guiBox = new QWidget( this );
             QHBoxLayout *boxLayout = new QHBoxLayout( plugin.guiBox );
@@ -206,8 +231,9 @@ void Today::loadPlugins() {
             if ( m_allApplets.isEmpty() ) {
                 layout->addWidget( plugin.guiBox );
                 pluginList.append( plugin );
             }
+            }
         } else {
             qDebug( "could not recognize %s", QString( path + "/" + *it ).latin1() );
             delete lib;
         }
@@ -215,8 +241,9 @@ void Today::loadPlugins() {
 
     if ( !m_allApplets.isEmpty() ) {
         TodayPlugin tempPlugin;
         QStringList::Iterator stringit;
+
         for( stringit = m_allApplets.begin(); stringit !=  m_allApplets.end(); ++stringit ) {
             tempPlugin = ( tempList.find( *stringit ) ).data();
             if ( !( (tempPlugin.name).isEmpty() ) ) {
                 layout->addWidget( tempPlugin.guiBox );
@@ -267,8 +294,11 @@ void Today::draw() {
  * The method for the configuration dialog.
  */
 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 );
 
      TodayPlugin plugin;
     QList<TodayConfigWidget> configWidgetList;
@@ -295,8 +325,11 @@ void Today::startConfig() {
               confWidget = configWidgetList.next() ) {
             confWidget->writeConfig();
         }
         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
@@ -103,10 +103,12 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal )
     QLabel *refreshLabel = new QLabel( hbox_refresh );
     refreshLabel->setText( tr( "Refresh" ) );
     QWhatsThis::add( refreshLabel, tr( "How often should Today refresh itself" ) );
     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" ) );
 
     tab3Layout->addWidget( hbox_auto );
     tab3Layout->addWidget( hbox_inactive );