author | harlekin <harlekin> | 2003-02-11 21:26:39 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-02-11 21:26:39 (UTC) |
commit | 39f9441dabcb094be258240f7ec3c53ed038133e (patch) (unidiff) | |
tree | 7d6e7f49ce18c6c3723cbc59358c58a252011133 /core | |
parent | af398bd4c280e7c27754b409851fbe8189d08819 (diff) | |
download | opie-39f9441dabcb094be258240f7ec3c53ed038133e.zip opie-39f9441dabcb094be258240f7ec3c53ed038133e.tar.gz opie-39f9441dabcb094be258240f7ec3c53ed038133e.tar.bz2 |
now when coming back from the config dialog ALL plugins get restarted
-rw-r--r-- | core/pim/today/today.cpp | 35 | ||||
-rw-r--r-- | core/pim/today/today.h | 2 |
2 files changed, 6 insertions, 31 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index 1f758f2..2f6907d 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp | |||
@@ -1,10 +1,10 @@ | |||
1 | /* | 1 | /* |
2 | * today.cpp | 2 | * today.cpp |
3 | * | 3 | * |
4 | * copyright : (c) 2002 by Maximilian Reiß | 4 | * copyright : (c) 2002,2003 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
7 | */ | 7 | */ |
8 | /*************************************************************************** | 8 | /*************************************************************************** |
9 | * * | 9 | * * |
10 | * This program is free software; you can redistribute it and/or modify * | 10 | * This program is free software; you can redistribute it and/or modify * |
@@ -67,13 +67,13 @@ Today::Today( QWidget* parent, const char* name, WFlags fl ) | |||
67 | #endif | 67 | #endif |
68 | 68 | ||
69 | setOwnerField(); | 69 | setOwnerField(); |
70 | m_refreshTimer = new QTimer( this ); | 70 | m_refreshTimer = new QTimer( this ); |
71 | connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) ); | 71 | connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) ); |
72 | m_refreshTimer->start( 15000 ); | 72 | m_refreshTimer->start( 15000 ); |
73 | init(); | 73 | //init(); |
74 | loadPlugins(); | 74 | loadPlugins(); |
75 | showMaximized(); | 75 | showMaximized(); |
76 | } | 76 | } |
77 | 77 | ||
78 | /** | 78 | /** |
79 | * Qcop receive method. | 79 | * Qcop receive method. |
@@ -119,13 +119,12 @@ void Today::setOwnerField() { | |||
119 | void Today::setOwnerField( QString &message ) { | 119 | void Today::setOwnerField( QString &message ) { |
120 | if ( !message.isEmpty() ) { | 120 | if ( !message.isEmpty() ) { |
121 | OwnerField->setText( "<b>" + message + "</b>" ); | 121 | OwnerField->setText( "<b>" + message + "</b>" ); |
122 | } | 122 | } |
123 | } | 123 | } |
124 | 124 | ||
125 | |||
126 | /** | 125 | /** |
127 | * Init stuff needed for today. Reads the config file. | 126 | * Init stuff needed for today. Reads the config file. |
128 | */ | 127 | */ |
129 | void Today::init() { | 128 | void Today::init() { |
130 | // read config | 129 | // read config |
131 | Config cfg( "today" ); | 130 | Config cfg( "today" ); |
@@ -135,84 +134,60 @@ void Today::init() { | |||
135 | m_allApplets = cfg.readListEntry( "AllApplets", ',' ); | 134 | m_allApplets = cfg.readListEntry( "AllApplets", ',' ); |
136 | 135 | ||
137 | cfg.setGroup( "General" ); | 136 | cfg.setGroup( "General" ); |
138 | m_iconSize = cfg.readNumEntry( "IconSize", 18 ); | 137 | m_iconSize = cfg.readNumEntry( "IconSize", 18 ); |
139 | setRefreshTimer( cfg.readNumEntry( "checkinterval", 15000 ) ); | 138 | setRefreshTimer( cfg.readNumEntry( "checkinterval", 15000 ) ); |
140 | 139 | ||
141 | |||
142 | // qDebug(" refresh "); | ||
143 | // set the date in top label | 140 | // set the date in top label |
144 | QDate date = QDate::currentDate(); | 141 | QDate date = QDate::currentDate(); |
145 | QString time = ( tr( date.toString() ) ); | 142 | QString time = ( tr( date.toString() ) ); |
146 | |||
147 | DateLabel->setText( QString( "<font color=#FFFFFF>" + time + "</font>" ) ); | 143 | DateLabel->setText( QString( "<font color=#FFFFFF>" + time + "</font>" ) ); |
148 | 144 | ||
149 | if ( layout ) { | 145 | if ( layout ) { |
150 | delete layout; | 146 | delete layout; |
151 | } | 147 | } |
152 | layout = new QVBoxLayout( this ); | 148 | layout = new QVBoxLayout( this ); |
153 | layout->addWidget( Frame ); | 149 | layout->addWidget( Frame ); |
154 | layout->addWidget( OwnerField ); | 150 | layout->addWidget( OwnerField ); |
155 | } | 151 | } |
156 | 152 | ||
157 | |||
158 | /** | 153 | /** |
159 | * Load the plugins | 154 | * Load the plugins |
160 | */ | 155 | */ |
161 | void Today::loadPlugins() { | 156 | void Today::loadPlugins() { |
162 | 157 | ||
163 | // extra list for plugins that exclude themself from periodic refresh | 158 | init(); |
164 | QMap<QString, TodayPlugin> pluginListRefreshExclude; | ||
165 | |||
166 | QValueList<TodayPlugin>::Iterator tit; | 159 | QValueList<TodayPlugin>::Iterator tit; |
167 | if ( !pluginList.isEmpty() ) { | 160 | if ( !pluginList.isEmpty() ) { |
168 | for ( tit = pluginList.begin(); tit != pluginList.end(); ++tit ) { | 161 | for ( tit = pluginList.begin(); tit != pluginList.end(); ++tit ) { |
169 | if ( (*tit).excludeRefresh ) { | ||
170 | pluginListRefreshExclude.insert( (*tit).name , (*tit) ); | ||
171 | qDebug( "Found a plugin that does not want refresh feature" ); | ||
172 | } else { | ||
173 | (*tit).guiBox->hide(); | 162 | (*tit).guiBox->hide(); |
174 | (*tit).guiBox->reparent( 0, QPoint( 0, 0 ) ); | 163 | (*tit).guiBox->reparent( 0, QPoint( 0, 0 ) ); |
175 | (*tit).library->unload(); | 164 | (*tit).library->unload(); |
176 | delete (*tit).guiBox; | 165 | delete (*tit).guiBox; |
177 | delete (*tit).library; | 166 | delete (*tit).library; |
178 | } | 167 | } |
179 | } | ||
180 | pluginList.clear(); | 168 | pluginList.clear(); |
181 | } | 169 | } |
182 | 170 | ||
183 | QString path = QPEApplication::qpeDir() + "/plugins/today"; | 171 | QString path = QPEApplication::qpeDir() + "/plugins/today"; |
184 | QDir dir( path, "lib*.so" ); | 172 | QDir dir( path, "lib*.so" ); |
185 | 173 | ||
186 | QStringList list = dir.entryList(); | 174 | QStringList list = dir.entryList(); |
187 | QStringList::Iterator it; | 175 | QStringList::Iterator it; |
188 | 176 | ||
189 | QMap<QString, TodayPlugin> tempList; | 177 | QMap<QString, TodayPlugin> tempList; |
190 | 178 | ||
191 | for ( it = list.begin(); it != list.end(); ++it ) { | 179 | for ( it = list.begin(); it != list.end(); ++it ) { |
192 | //TodayPluginInterface *iface = 0; | ||
193 | QInterfacePtr<TodayPluginInterface> iface; | 180 | QInterfacePtr<TodayPluginInterface> iface; |
194 | QLibrary *lib = new QLibrary( path + "/" + *it ); | 181 | QLibrary *lib = new QLibrary( path + "/" + *it ); |
195 | 182 | ||
196 | qDebug( "querying: %s", QString( path + "/" + *it ).latin1() ); | 183 | qDebug( "querying: %s", QString( path + "/" + *it ).latin1() ); |
197 | if ( lib->queryInterface( IID_TodayPluginInterface, (QUnknownInterface**)&iface ) == QS_OK ) { | 184 | if ( lib->queryInterface( IID_TodayPluginInterface, (QUnknownInterface**)&iface ) == QS_OK ) { |
198 | qDebug( "accepted: %s", QString( path + "/" + *it ).latin1() ); | 185 | qDebug( "accepted: %s", QString( path + "/" + *it ).latin1() ); |
199 | qDebug( QString(*it) ); | 186 | qDebug( QString(*it) ); |
200 | 187 | ||
201 | // If plugin is exludes from refresh, get it in the list again here. | ||
202 | |||
203 | if ( pluginListRefreshExclude.contains( (*it) ) ) { | ||
204 | // if its not in allApplets list, add it to a layout | ||
205 | if ( !m_allApplets.contains( pluginListRefreshExclude[(*it)].name ) ) { | ||
206 | layout->addWidget( pluginListRefreshExclude[(*it)].guiBox ); | ||
207 | pluginList.append( pluginListRefreshExclude[(*it)] ); | ||
208 | } else { | ||
209 | tempList.insert( pluginListRefreshExclude[(*it)].name, pluginListRefreshExclude[(*it)] ); | ||
210 | } | ||
211 | } else { | ||
212 | |||
213 | TodayPlugin plugin; | 188 | TodayPlugin plugin; |
214 | plugin.library = lib; | 189 | plugin.library = lib; |
215 | plugin.iface = iface; | 190 | plugin.iface = iface; |
216 | plugin.name = QString(*it); | 191 | plugin.name = QString(*it); |
217 | 192 | ||
218 | // find out if plugins should be shown | 193 | // find out if plugins should be shown |
@@ -236,13 +211,13 @@ void Today::loadPlugins() { | |||
236 | plugIcon->setName( plugin.guiPart->appName() ); | 211 | plugIcon->setName( plugin.guiPart->appName() ); |
237 | connect( plugIcon, SIGNAL( clicked() ), this, SLOT( startApplication() ) ); | 212 | connect( plugIcon, SIGNAL( clicked() ), this, SLOT( startApplication() ) ); |
238 | // a scrollview for each plugin | 213 | // a scrollview for each plugin |
239 | QScrollView* sv = new QScrollView( plugin.guiBox ); | 214 | QScrollView* sv = new QScrollView( plugin.guiBox ); |
240 | QWidget *plugWidget = plugin.guiPart->widget( sv->viewport() ); | 215 | QWidget *plugWidget = plugin.guiPart->widget( sv->viewport() ); |
241 | // not sure if that is good .-) | 216 | // not sure if that is good .-) |
242 | sv->setMinimumHeight( 10 ); | 217 | sv->setMinimumHeight( 12 ); |
243 | sv->setResizePolicy( QScrollView::AutoOneFit ); | 218 | sv->setResizePolicy( QScrollView::AutoOneFit ); |
244 | sv->setHScrollBarMode( QScrollView::AlwaysOff ); | 219 | sv->setHScrollBarMode( QScrollView::AlwaysOff ); |
245 | sv->setFrameShape( QFrame::NoFrame ); | 220 | sv->setFrameShape( QFrame::NoFrame ); |
246 | sv->addChild( plugWidget ); | 221 | sv->addChild( plugWidget ); |
247 | // make sure the icon is on the top alligned | 222 | // make sure the icon is on the top alligned |
248 | boxLayout->addWidget( plugIcon, 0, AlignTop ); | 223 | boxLayout->addWidget( plugIcon, 0, AlignTop ); |
@@ -260,13 +235,12 @@ void Today::loadPlugins() { | |||
260 | 235 | ||
261 | // if plugin is not yet in the list, add it to the layout too | 236 | // if plugin is not yet in the list, add it to the layout too |
262 | else if ( !m_allApplets.contains( plugin.name ) ) { | 237 | else if ( !m_allApplets.contains( plugin.name ) ) { |
263 | layout->addWidget( plugin.guiBox ); | 238 | layout->addWidget( plugin.guiBox ); |
264 | pluginList.append( plugin ); | 239 | pluginList.append( plugin ); |
265 | } | 240 | } |
266 | } | ||
267 | } else { | 241 | } else { |
268 | qDebug( "could not recognize %s", QString( path + "/" + *it ).latin1() ); | 242 | qDebug( "could not recognize %s", QString( path + "/" + *it ).latin1() ); |
269 | delete lib; | 243 | delete lib; |
270 | } | 244 | } |
271 | } | 245 | } |
272 | 246 | ||
@@ -367,12 +341,13 @@ void Today::startConfig() { | |||
367 | 341 | ||
368 | /** | 342 | /** |
369 | * Refresh for the view. Reload all applets | 343 | * Refresh for the view. Reload all applets |
370 | * | 344 | * |
371 | */ | 345 | */ |
372 | void Today::refresh() { | 346 | void Today::refresh() { |
347 | |||
373 | init(); | 348 | init(); |
374 | 349 | ||
375 | QValueList<TodayPlugin>::Iterator it; | 350 | QValueList<TodayPlugin>::Iterator it; |
376 | for ( it = pluginList.begin(); it != pluginList.end(); ++it ) { | 351 | for ( it = pluginList.begin(); it != pluginList.end(); ++it ) { |
377 | if ( !(*it).excludeRefresh ) { | 352 | if ( !(*it).excludeRefresh ) { |
378 | (*it).guiPart->refresh(); | 353 | (*it).guiPart->refresh(); |
diff --git a/core/pim/today/today.h b/core/pim/today/today.h index 35b7ee3..24f5611 100644 --- a/core/pim/today/today.h +++ b/core/pim/today/today.h | |||
@@ -1,10 +1,10 @@ | |||
1 | /* | 1 | /* |
2 | * today.h | 2 | * today.h |
3 | * | 3 | * |
4 | * copyright : (c) 2002 by Maximilian Reiß | 4 | * copyright : (c) 2002,2003 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
7 | */ | 7 | */ |
8 | /*************************************************************************** | 8 | /*************************************************************************** |
9 | * * | 9 | * * |
10 | * This program is free software; you can redistribute it and/or modify * | 10 | * This program is free software; you can redistribute it and/or modify * |