From 848be27ce441430b6946221cd288ff9d6297096c Mon Sep 17 00:00:00 2001 From: zecke Date: Sun, 12 Sep 2004 23:56:54 +0000 Subject: -Refactor loading of the Plugin Widgets' to be only contained in one place. -Reload the Plugins after configuration to reflect the changes immediately --- (limited to 'core') diff --git a/core/pim/today/plugins/datebook/datebookplugin.cpp b/core/pim/today/plugins/datebook/datebookplugin.cpp index 892a0ad..bef284e 100644 --- a/core/pim/today/plugins/datebook/datebookplugin.cpp +++ b/core/pim/today/plugins/datebook/datebookplugin.cpp @@ -46,7 +46,7 @@ QString DatebookPlugin::pixmapNameConfig() const { } TodayConfigWidget* DatebookPlugin::configWidget( QWidget* wid ) { - return new DatebookPluginConfig( wid , "Datebook" ); + return new DatebookPluginConfig( wid , "Datebook Config" ); } QString DatebookPlugin::appName() const { diff --git a/core/pim/today/plugins/todolist/todoplugin.cpp b/core/pim/today/plugins/todolist/todoplugin.cpp index 6cfcbe0..4be5673 100644 --- a/core/pim/today/plugins/todolist/todoplugin.cpp +++ b/core/pim/today/plugins/todolist/todoplugin.cpp @@ -47,7 +47,7 @@ QString TodolistPlugin::pixmapNameConfig() const { } TodayConfigWidget* TodolistPlugin::configWidget( QWidget* wid ) { - return new TodolistPluginConfig( wid , "Todolist" ); + return new TodolistPluginConfig( wid , "Todolist Config" ); } QString TodolistPlugin::appName() const { diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index be7cbce..3e895a4 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp @@ -50,10 +50,11 @@ TodayPlugin() : iface( 0 ), guiPart( 0 ), guiBox( 0 ) {} static QMap pluginList; Today::Today( QWidget* parent, const char* name, WFlags fl ) -: TodayBase( parent, name, fl ) { +: TodayBase( parent, name, fl | WStyle_ContextHelp) { - QObject::connect( (QObject*)ConfigButton, SIGNAL( clicked() ), this, SLOT( startConfig() ) ); - QObject::connect( (QObject*)OwnerField, SIGNAL( clicked() ), this, SLOT( editCard() ) ); + setCaption( tr("Today") ); + connect( (QObject*)ConfigButton, SIGNAL( clicked() ), this, SLOT( startConfig() ) ); + connect( (QObject*)OwnerField, SIGNAL( clicked() ), this, SLOT( editCard() ) ); #if !defined(QT_NO_COP) @@ -63,12 +64,17 @@ Today::Today( QWidget* parent, const char* name, WFlags fl ) #endif setOwnerField(); - m_big_box = 0L; + m_big_box = 0l; + m_bblayout = 0l; layout = new QVBoxLayout( this ); layout->addWidget( Frame ); layout->addWidget( OwnerField ); + + m_informationLabel = new QLabel( tr("No plugins activated"), this ); + layout->addWidget( m_informationLabel ); + m_sv = new QScrollView( this ); m_sv->setResizePolicy( QScrollView::AutoOneFit ); m_sv->setHScrollBarMode( QScrollView::AlwaysOff ); @@ -80,9 +86,9 @@ Today::Today( QWidget* parent, const char* name, WFlags fl ) m_refreshTimer = new QTimer( this ); connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) ); - init(); loadPlugins(); - initialize(); + loadShellContent(); + loadPluginWidgets(); } /** @@ -133,14 +139,20 @@ void Today::setOwnerField( QString &message ) { /** - * Init stuff needed for today. Reads the config file. + * Load the plugins */ -void Today::init() { - // read config - OConfig cfg( "today" ); +void Today::loadPlugins() { + m_pluginLoader = new OPluginLoader( "today", true ); + m_pluginLoader->setAutoDelete( true ); + + m_manager = new OPluginManager( m_pluginLoader ); + m_manager->load(); +} + +void Today::loadShellContent() { + Config cfg( "today" ); cfg.setGroup( "Plugins" ); - // m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' ); - // m_allApplets = cfg.readListEntry( "AllApplets", ',' ); + cfg.setGroup( "General" ); m_iconSize = cfg.readNumEntry( "IconSize", 18 ); @@ -158,28 +170,9 @@ void Today::init() { Opiezilla->show(); TodayLabel->show(); } - - if ( m_big_box ) { - delete m_big_box; - } - - m_big_box = new QWidget( m_sv->viewport() ); - m_sv->addChild( m_big_box ); - m_bblayout = new QVBoxLayout ( m_big_box ); } - -/** - * Load the plugins - */ -void Today::loadPlugins() { - - m_pluginLoader = new OPluginLoader( "today", true ); - m_pluginLoader->setAutoDelete( true ); - - m_manager = new OPluginManager( m_pluginLoader ); - m_manager->load(); - +void Today::loadPluginWidgets() { /* * check if loading of Plugins crashed */ @@ -194,6 +187,21 @@ void Today::loadPlugins() { OPluginItem::List lst = m_pluginLoader->filtered( true ); + /* + * Show or Hide the information of no plugin installed + */ + if ( lst.isEmpty() ) + m_informationLabel->show(); + else + m_informationLabel->hide(); + + + /* + * Now let us add the plugins + */ + m_big_box = new QWidget( m_sv->viewport() ); + m_sv->addChild( m_big_box ); + m_bblayout = new QVBoxLayout( m_big_box ); for ( OPluginItem::List::Iterator it = lst.begin(); it != lst.end(); ++it ) { TodayPluginInterface* iface = m_pluginLoader->load( *it, IID_TodayPluginInterface ); @@ -229,6 +237,7 @@ void Today::loadPlugins() { } m_bblayout->addStretch( 1 ); + m_big_box->show(); } @@ -236,7 +245,6 @@ void Today::loadPlugins() { * 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() ) ); m_refreshTimer->stop( ); @@ -246,7 +254,9 @@ void Today::startConfig() { if ( QPEApplication::execDialog(&conf) == QDialog::Accepted ) { conf.writeConfig(); - initialize(); + clearPluginWidgets(); + loadShellContent(); + loadPluginWidgets(); } else { // since reinitialize is not called in that case , reconnect the signal m_refreshTimer->start( 15000 ); // get the config value in here later @@ -254,84 +264,14 @@ void Today::startConfig() { } } - -void Today::initialize() { - - Config cfg( "today" ); - cfg.setGroup( "Plugins" ); - - - cfg.setGroup( "General" ); - m_iconSize = cfg.readNumEntry( "IconSize", 18 ); - m_hideBanner = cfg.readNumEntry( "HideBanner", 0 ); - setRefreshTimer( cfg.readNumEntry( "checkinterval", 15000 ) ); - - // set the date in top label - QDate date = QDate::currentDate(); - DateLabel->setText( QString( "" + TimeString::longDateString( date ) + "" ) ); - - if ( m_hideBanner ) { - Opiezilla->hide(); - TodayLabel->hide(); - } else { - Opiezilla->show(); - TodayLabel->show(); - } - - if ( m_bblayout ) { - delete m_bblayout; - } - m_bblayout = new QVBoxLayout ( m_big_box ); - - if ( pluginList.count() == 0 ) { - QLabel *noPlugins = new QLabel( this ); - noPlugins->setText( tr( "No plugins found" ) ); - layout->addWidget( noPlugins ); - } else { - - uint count = 0; - TodayPlugin tempPlugin; - OPluginItem::List lst = m_pluginLoader->allAvailable( true ); - for ( OPluginItem::List::Iterator it = lst.begin(); it != lst.end(); ++it ) { - - TodayPluginInterface* iface = m_pluginLoader->load( *it, IID_TodayPluginInterface ); - - tempPlugin = ( pluginList.find( (*it).name() ).data() ); - if ( !( (tempPlugin.name).isEmpty() ) ) { - if ( (*it).isEnabled() ) { - iface->guiPart()->reinitialize(); - odebug << "reinit" << oendl; - tempPlugin.guiBox->show(); - m_bblayout->addWidget(tempPlugin.guiBox); - count++; - } else { - tempPlugin.guiBox->hide(); - } - } - } - if ( count == 0 ) { - QLabel *noPluginsActive = new QLabel( this ); - noPluginsActive->setText( tr( "No plugins activated" ) ); - layout->addWidget( noPluginsActive ); - } - } - m_bblayout->addStretch( 1 ); - repaint(); -} - /** * Refresh for the view. Reload all applets * */ void Today::refresh() { - - OPluginItem::List lst = m_pluginLoader->filtered( true ); - - for ( OPluginItem::List::Iterator it = lst.begin(); it != lst.end(); ++it ) { - TodayPluginInterface* iface = m_pluginLoader->load( *it, IID_TodayPluginInterface ); - iface->guiPart()->refresh(); - odebug << "refresh" << oendl; - } + for ( QMap::Iterator it = pluginList.begin(); + it != pluginList.end(); ++it ) + it.data().guiPart->refresh(); DateLabel->setText( QString( "" + TimeString::longDateString( QDate::currentDate() ) + "" ) ); @@ -355,10 +295,22 @@ void Today::editCard() { Today::~Today() { - for(QMap::Iterator it = pluginList.begin(); it != pluginList.end(); ++it ) - delete it.data().guiBox; - + clearPluginWidgets(); delete m_pluginLoader; delete m_manager; } + +void Today::clearPluginWidgets() { + for(QMap::Iterator it = pluginList.begin(); it != pluginList.end(); ++it ) { + delete it.data().guiBox; + it.data().guiBox = 0; + } + + pluginList.clear(); + + delete m_bblayout; + delete m_big_box; + m_bblayout = 0; + m_big_box = 0; +} diff --git a/core/pim/today/today.h b/core/pim/today/today.h index dfc819d..8dbe9aa 100644 --- a/core/pim/today/today.h +++ b/core/pim/today/today.h @@ -56,13 +56,16 @@ private slots: void refresh(); private: - void init(); void setOwnerField(); void setOwnerField(QString &string); - void initialize(); void setRefreshTimer( int ); + void clearPluginWidgets(); + void loadPluginWidgets(); + void loadShellContent(); + + private slots: void channelReceived(const QCString &msg, const QByteArray & data); void loadPlugins(); @@ -75,6 +78,7 @@ private: QScrollView *m_sv; QWidget* m_big_box; QVBoxLayout *m_bblayout; + QLabel *m_informationLabel; Opie::Core::OPluginLoader *m_pluginLoader; Opie::Core::OPluginManager *m_manager; diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp index dacce8b..864c708 100644 --- a/core/pim/today/todayconfig.cpp +++ b/core/pim/today/todayconfig.cpp @@ -93,7 +93,6 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal ) tab3Layout->addWidget( m_guiMisc ); TabWidget3->addTab( tab_3, "SettingsIcon", tr( "Misc" ) ); - connect ( m_appletListView , SIGNAL( clicked(QListViewItem*) ), this, SLOT( appletChanged() ) ); previousItem = 0l; readConfig(); } @@ -181,12 +180,17 @@ void TodayConfig::writeConfig() { for ( ; list_it.current(); ++list_it ) { for ( OPluginItem::List::Iterator it = lst.begin(); it != lst.end(); ++it ) { if ( QString::compare( (*it).name() , list_it.current()->text(0) ) == 0 ) { + qWarning( "Enabling %d and make it %d", position-1, + ((QCheckListItem*)list_it.current())->isOn() ); (*it).setPosition(position--); m_pluginManager->setEnabled( (*it),((QCheckListItem*)list_it.current())->isOn() ); } } } + /* + * save and get the changes back + */ m_pluginManager->save(); cfg.setGroup( "Autostart" ); @@ -209,6 +213,7 @@ void TodayConfig::writeConfig() { TodayPluginInterface* iface = m_pluginLoader->load( *it, IID_TodayPluginInterface ); if ( m_configMap.contains( iface ) ) m_configMap[iface]->writeConfig(); + } } -- cgit v0.9.0.2