author | harlekin <harlekin> | 2002-10-31 17:09:01 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-10-31 17:09:01 (UTC) |
commit | 16fcb285f9ba7c514fc3f2695768a82feeb7182b (patch) (unidiff) | |
tree | 4b1b09287dd339e7138608464c309f938f89e257 /core | |
parent | ba60ce32edbad5e743494c0de33534258ee5d80c (diff) | |
download | opie-16fcb285f9ba7c514fc3f2695768a82feeb7182b.zip opie-16fcb285f9ba7c514fc3f2695768a82feeb7182b.tar.gz opie-16fcb285f9ba7c514fc3f2695768a82feeb7182b.tar.bz2 |
started support for plugins without refresh, not finished yet
-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,2 +1,7 @@ | |||
1 | 0.6 | ||
2 | |||
3 | * longer refresh intervals possible | ||
4 | * plugins can decide now if they want to take part in refresh cycles | ||
5 | |||
1 | 0.5.2 | 6 | 0.5.2 |
2 | 7 | ||
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 | |||
@@ -4,5 +4,5 @@ Section: opie/applications | |||
4 | Maintainer: Maximilian Reiß <harlekin@handhelds.org> | 4 | Maintainer: Maximilian Reiß <harlekin@handhelds.org> |
5 | Architecture: arm | 5 | Architecture: arm |
6 | Version: 0.5.2-$SUB_VERSION | 6 | Version: 0.6-$SUB_VERSION |
7 | Depends: opie-base ($QPE_VERSION), libopie ($QPE_VERSION) | 7 | Depends: opie-base ($QPE_VERSION), libopie ($QPE_VERSION) |
8 | License: GPL | 8 | License: GPL |
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 | |||
@@ -58,2 +58,5 @@ QString DatebookPlugin::appName() const { | |||
58 | } | 58 | } |
59 | 59 | ||
60 | bool DatebookPlugin::excludeFromRefresh() const { | ||
61 | return false; | ||
62 | } | ||
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 | |||
@@ -37,5 +37,5 @@ public: | |||
37 | TodayConfigWidget* configWidget( QWidget *); | 37 | TodayConfigWidget* configWidget( QWidget *); |
38 | QString appName() const; | 38 | QString appName() const; |
39 | 39 | bool excludeFromRefresh() const; | |
40 | }; | 40 | }; |
41 | 41 | ||
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 | |||
@@ -55,2 +55,6 @@ QString MailPlugin::appName() const { | |||
55 | 55 | ||
56 | 56 | ||
57 | bool MailPlugin::excludeFromRefresh() const { | ||
58 | return false; | ||
59 | } | ||
60 | |||
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 | |||
@@ -41,6 +41,5 @@ public: | |||
41 | TodayConfigWidget* configWidget(QWidget *); | 41 | TodayConfigWidget* configWidget(QWidget *); |
42 | QString appName() const; | 42 | QString appName() const; |
43 | 43 | bool excludeFromRefresh() const; | |
44 | |||
45 | }; | 44 | }; |
46 | 45 | ||
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 | |||
@@ -57,2 +57,5 @@ QString TodolistPlugin::appName() const { | |||
57 | 57 | ||
58 | 58 | ||
59 | bool TodolistPlugin::excludeFromRefresh() const { | ||
60 | return false; | ||
61 | } | ||
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 | |||
@@ -38,5 +38,5 @@ public: | |||
38 | TodayConfigWidget* configWidget(QWidget *); | 38 | TodayConfigWidget* configWidget(QWidget *); |
39 | QString appName() const; | 39 | QString appName() const; |
40 | 40 | bool excludeFromRefresh() const; | |
41 | }; | 41 | }; |
42 | 42 | ||
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 | |||
@@ -46,4 +46,5 @@ struct TodayPlugin { | |||
46 | QString name; | 46 | QString name; |
47 | bool active; | 47 | bool active; |
48 | bool excludeRefresh; | ||
48 | int pos; | 49 | int pos; |
49 | }; | 50 | }; |
@@ -87,5 +88,10 @@ void Today::channelReceived( const QCString &msg, const QByteArray & data ) { | |||
87 | void Today::setRefreshTimer( int interval ) { | 88 | void Today::setRefreshTimer( int interval ) { |
88 | 89 | ||
89 | if ( m_refreshTimerEnabled ) { | 90 | |
91 | disconnect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) ); | ||
92 | |||
93 | // 0 is "never" case | ||
94 | if ( !interval == 0 ) { | ||
95 | connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) ); | ||
90 | m_refreshTimer->changeInterval( interval ); | 96 | m_refreshTimer->changeInterval( interval ); |
91 | } | 97 | } |
@@ -130,6 +136,5 @@ void Today::init() { | |||
130 | cfg.setGroup( "General" ); | 136 | cfg.setGroup( "General" ); |
131 | m_iconSize = cfg.readNumEntry( "IconSize", 18 ); | 137 | m_iconSize = cfg.readNumEntry( "IconSize", 18 ); |
132 | m_refreshTimer->changeInterval( cfg.readNumEntry( "checkinterval", 15000 ) ); | 138 | setRefreshTimer( cfg.readNumEntry( "checkinterval", 15000 ) ); |
133 | |||
134 | } | 139 | } |
135 | 140 | ||
@@ -140,10 +145,21 @@ void Today::init() { | |||
140 | void Today::loadPlugins() { | 145 | void Today::loadPlugins() { |
141 | 146 | ||
147 | // extra list for plugins that exclude themself from periodic refresh | ||
148 | QMap<QString, TodayPlugin> pluginListRefreshExclude; | ||
149 | |||
142 | QValueList<TodayPlugin>::Iterator tit; | 150 | QValueList<TodayPlugin>::Iterator tit; |
151 | if ( !pluginList.isEmpty() ) { | ||
143 | for ( tit = pluginList.begin(); tit != pluginList.end(); ++tit ) { | 152 | for ( tit = pluginList.begin(); tit != pluginList.end(); ++tit ) { |
153 | if ( (*tit).excludeRefresh ) { | ||
154 | pluginListRefreshExclude.insert( (*tit).name , (*tit) ); | ||
155 | qDebug( "Found an plug that does not want refresh feature" ); | ||
156 | } else { | ||
144 | (*tit).library->unload(); | 157 | (*tit).library->unload(); |
145 | delete (*tit).library; | 158 | delete (*tit).library; |
146 | } | 159 | } |
160 | } | ||
147 | pluginList.clear(); | 161 | pluginList.clear(); |
162 | } | ||
163 | |||
148 | 164 | ||
149 | QString path = QPEApplication::qpeDir() + "/plugins/today"; | 165 | QString path = QPEApplication::qpeDir() + "/plugins/today"; |
@@ -163,4 +179,12 @@ void Today::loadPlugins() { | |||
163 | qDebug( "loading: %s", QString( path + "/" + *it ).latin1() ); | 179 | qDebug( "loading: %s", QString( path + "/" + *it ).latin1() ); |
164 | qDebug( QString(*it) ); | 180 | qDebug( QString(*it) ); |
181 | |||
182 | // If plugin is exludes from refresh, get it in the list again here. | ||
183 | |||
184 | if ( pluginListRefreshExclude.contains( (*it) ) ) { | ||
185 | tempList.insert( pluginListRefreshExclude[(*it)].name, pluginListRefreshExclude[(*it)] ); | ||
186 | qDebug( "TEST2 " + pluginListRefreshExclude[(*it)].name ); | ||
187 | } else { | ||
188 | |||
165 | TodayPlugin plugin; | 189 | TodayPlugin plugin; |
166 | plugin.library = lib; | 190 | plugin.library = lib; |
@@ -175,4 +199,5 @@ void Today::loadPlugins() { | |||
175 | } | 199 | } |
176 | plugin.guiPart = plugin.iface->guiPart(); | 200 | plugin.guiPart = plugin.iface->guiPart(); |
201 | plugin.excludeRefresh = plugin.guiPart->excludeFromRefresh(); | ||
177 | 202 | ||
178 | // package the whole thing into a qwidget so it can be shown and hidden | 203 | // package the whole thing into a qwidget so it can be shown and hidden |
@@ -208,4 +233,5 @@ void Today::loadPlugins() { | |||
208 | pluginList.append( plugin ); | 233 | pluginList.append( plugin ); |
209 | } | 234 | } |
235 | } | ||
210 | } else { | 236 | } else { |
211 | qDebug( "could not recognize %s", QString( path + "/" + *it ).latin1() ); | 237 | qDebug( "could not recognize %s", QString( path + "/" + *it ).latin1() ); |
@@ -217,4 +243,5 @@ void Today::loadPlugins() { | |||
217 | TodayPlugin tempPlugin; | 243 | TodayPlugin tempPlugin; |
218 | QStringList::Iterator stringit; | 244 | QStringList::Iterator stringit; |
245 | |||
219 | for( stringit = m_allApplets.begin(); stringit != m_allApplets.end(); ++stringit ) { | 246 | for( stringit = m_allApplets.begin(); stringit != m_allApplets.end(); ++stringit ) { |
220 | tempPlugin = ( tempList.find( *stringit ) ).data(); | 247 | tempPlugin = ( tempList.find( *stringit ) ).data(); |
@@ -269,4 +296,7 @@ void Today::draw() { | |||
269 | void Today::startConfig() { | 296 | void Today::startConfig() { |
270 | 297 | ||
298 | // disconnect timer to prevent problems while being on config dialog | ||
299 | disconnect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) ); | ||
300 | |||
271 | TodayConfig conf( this, "dialog", true ); | 301 | TodayConfig conf( this, "dialog", true ); |
272 | 302 | ||
@@ -297,4 +327,7 @@ void Today::startConfig() { | |||
297 | } | 327 | } |
298 | refresh(); | 328 | refresh(); |
329 | } else { | ||
330 | // since refresh is not called in that case , reconnect the signal | ||
331 | connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) ); | ||
299 | } | 332 | } |
300 | } | 333 | } |
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 | |||
@@ -105,6 +105,8 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal ) | |||
105 | QWhatsThis::add( refreshLabel, tr( "How often should Today refresh itself" ) ); | 105 | QWhatsThis::add( refreshLabel, tr( "How often should Today refresh itself" ) ); |
106 | SpinRefresh = new QSpinBox( hbox_refresh ); | 106 | SpinRefresh = new QSpinBox( hbox_refresh ); |
107 | SpinRefresh->setMinValue( 2 ); | 107 | SpinRefresh->setMinValue( 0 ); |
108 | SpinRefresh->setSuffix( tr( " seconds" ) ); | 108 | SpinRefresh->setSuffix( tr( " sec" ) ); |
109 | SpinRefresh->setMaxValue ( 7200 ); | ||
110 | SpinRefresh->setSpecialValueText ( tr("never") ); | ||
109 | QWhatsThis::add( SpinRefresh, tr( "How often should Today refresh itself" ) ); | 111 | QWhatsThis::add( SpinRefresh, tr( "How often should Today refresh itself" ) ); |
110 | 112 | ||