Diffstat (limited to 'core/pim/today/todayconfig.cpp') (more/less context) (show whitespace changes)
| -rw-r--r-- | core/pim/today/todayconfig.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp index c9823d4..dacce8b 100644 --- a/core/pim/today/todayconfig.cpp +++ b/core/pim/today/todayconfig.cpp @@ -98,3 +98,2 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal ) readConfig(); - QPEApplication::showDialog( this ); } @@ -103,3 +102,3 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal ) void TodayConfig::setUpPlugins( OPluginManager * plugManager, OPluginLoader *plugLoader ) { - + m_configMap.clear(); @@ -115,5 +114,8 @@ void TodayConfig::setUpPlugins( OPluginManager * plugManager, OPluginLoader *plu TodayPluginInterface* iface = m_pluginLoader->load<TodayPluginInterface>( *it, IID_TodayPluginInterface ); - - if ( iface->guiPart()->configWidget(this) != 0l ) { TodayConfigWidget* widget = iface->guiPart()->configWidget( TabWidget3 ); + + if (!widget ) + continue; + + m_configMap.insert( iface, widget ); TabWidget3->addTab( widget, iface->guiPart()->pixmapNameConfig() @@ -121,7 +123,6 @@ void TodayConfig::setUpPlugins( OPluginManager * plugManager, OPluginLoader *plu } - } - for ( OPluginItem::List::Iterator it = lst.begin(); it != lst.end(); ++it ) { + for ( OPluginItem::List::Iterator it = lst.begin(); it != lst.end(); ++it ) pluginManagement( (*it) ); - } + @@ -176,6 +177,6 @@ void TodayConfig::writeConfig() { QListViewItemIterator list_it( m_appletListView ); - // + OPluginItem::List lst = m_pluginLoader->allAvailable( true ); + // this makes sure the names get saved in the order selected for ( ; list_it.current(); ++list_it ) { - OPluginItem::List lst = m_pluginLoader->allAvailable( true ); for ( OPluginItem::List::Iterator it = lst.begin(); it != lst.end(); ++it ) { @@ -205,8 +206,7 @@ void TodayConfig::writeConfig() { - OPluginItem::List lst = m_pluginManager->managedPlugins(); - for ( OPluginItem::List::Iterator it = lst.begin(); it != lst.end(); ++it ) { + OPluginItem::List managedLst = m_pluginManager->managedPlugins(); + for ( OPluginItem::List::Iterator it = managedLst.begin(); it != managedLst.end(); ++it ) { TodayPluginInterface* iface = m_pluginLoader->load<TodayPluginInterface>( *it, IID_TodayPluginInterface ); - if ( iface->guiPart()->configWidget(this) != 0l ) { - iface->guiPart()->configWidget(this)->writeConfig(); - } + if ( m_configMap.contains( iface ) ) + m_configMap[iface]->writeConfig(); } |