author | harlekin <harlekin> | 2002-09-17 09:40:51 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-09-17 09:40:51 (UTC) |
commit | 92b88813ad8d6352fbf74964fc56dfc1a2aada8c (patch) (unidiff) | |
tree | 2a9681d21cc354e66d5fd823018f45d9ac9a32d9 | |
parent | 03abe825f26678c34142e14f93cabd8f097d5bea (diff) | |
download | opie-92b88813ad8d6352fbf74964fc56dfc1a2aada8c.zip opie-92b88813ad8d6352fbf74964fc56dfc1a2aada8c.tar.gz opie-92b88813ad8d6352fbf74964fc56dfc1a2aada8c.tar.bz2 |
only start config dialog once
-rw-r--r-- | core/pim/today/today.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index d78b5b5..066a5a8 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp | |||
@@ -249,44 +249,43 @@ void Today::startConfig() { | |||
249 | 249 | ||
250 | // load the config widgets in the tabs | 250 | // load the config widgets in the tabs |
251 | if ( plugin.guiPart->configWidget( this ) != 0l ) { | 251 | if ( plugin.guiPart->configWidget( this ) != 0l ) { |
252 | ConfigWidget* widget = plugin.guiPart->configWidget( this ); | 252 | ConfigWidget* widget = plugin.guiPart->configWidget( this ); |
253 | configWidgetList.append( widget ); | 253 | configWidgetList.append( widget ); |
254 | conf.TabWidget3->insertTab( widget, plugin.guiPart->appName() ); | 254 | conf.TabWidget3->insertTab( widget, plugin.guiPart->appName() ); |
255 | } | 255 | } |
256 | // set the order/activate tab | 256 | // set the order/activate tab |
257 | conf.pluginManagement( plugin.name, plugin.guiPart->pluginName(), | 257 | conf.pluginManagement( plugin.name, plugin.guiPart->pluginName(), |
258 | Resource::loadPixmap( plugin.guiPart->pixmapNameWidget() ) ); | 258 | Resource::loadPixmap( plugin.guiPart->pixmapNameWidget() ) ); |
259 | } | 259 | } |
260 | 260 | ||
261 | conf.exec(); | ||
262 | if ( conf.exec() == QDialog::Accepted ) { | 261 | if ( conf.exec() == QDialog::Accepted ) { |
263 | conf.writeConfig(); | 262 | conf.writeConfig(); |
264 | ConfigWidget *confWidget; | 263 | ConfigWidget *confWidget; |
265 | for ( confWidget = configWidgetList.first(); confWidget != 0; | 264 | for ( confWidget = configWidgetList.first(); confWidget != 0; |
266 | confWidget = configWidgetList.next() ) { | 265 | confWidget = configWidgetList.next() ) { |
267 | confWidget->writeConfig(); | 266 | confWidget->writeConfig(); |
268 | } | 267 | } |
269 | init(); | ||
270 | 268 | ||
269 | init(); | ||
271 | 270 | ||
272 | TodayPlugin plugin; | 271 | TodayPlugin plugin; |
273 | for ( uint i = 0; i < pluginList.count(); i++ ) { | 272 | for ( uint i = 0; i < pluginList.count(); i++ ) { |
274 | plugin = pluginList[i]; | 273 | plugin = pluginList[i]; |
275 | 274 | ||
276 | if ( m_excludeApplets.grep( plugin.name ).isEmpty() ) { | 275 | if ( m_excludeApplets.grep( plugin.name ).isEmpty() ) { |
277 | qDebug("CONFIG" + plugin.name + "ACTIVE"); | 276 | qDebug("CONFIG " + plugin.name + " ACTIVE"); |
278 | plugin.active = true; | 277 | plugin.active = true; |
279 | } else { | 278 | } else { |
280 | qDebug("CONFIG" + plugin.name + "INACTIVE"); | 279 | qDebug("CONFIG " + plugin.name + " INACTIVE"); |
281 | 280 | ||
282 | plugin.active = false; | 281 | plugin.active = false; |
283 | } | 282 | } |
284 | } | 283 | } |
285 | 284 | ||
286 | draw(); | 285 | draw(); |
287 | } | 286 | } |
288 | } | 287 | } |
289 | 288 | ||
290 | 289 | ||
291 | void Today::startAddressbook() { | 290 | void Today::startAddressbook() { |
292 | QCopEnvelope e( "QPE/System", "execute(QString)" ); | 291 | QCopEnvelope e( "QPE/System", "execute(QString)" ); |