author | zecke <zecke> | 2004-09-12 23:56:54 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-09-12 23:56:54 (UTC) |
commit | 848be27ce441430b6946221cd288ff9d6297096c (patch) (side-by-side diff) | |
tree | 1ff3d0bad98bee9d5dd0ff70f3eedd5484e25ab6 | |
parent | df292cd5dbd8f3c11efa06db1a2ed565a6efa9b8 (diff) | |
download | opie-848be27ce441430b6946221cd288ff9d6297096c.zip opie-848be27ce441430b6946221cd288ff9d6297096c.tar.gz opie-848be27ce441430b6946221cd288ff9d6297096c.tar.bz2 |
-Refactor loading of the Plugin Widgets' to be only contained
in one place.
-Reload the Plugins after configuration to reflect the changes
immediately
-rw-r--r-- | core/pim/today/plugins/datebook/datebookplugin.cpp | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todoplugin.cpp | 2 | ||||
-rw-r--r-- | core/pim/today/today.cpp | 172 | ||||
-rw-r--r-- | core/pim/today/today.h | 8 | ||||
-rw-r--r-- | core/pim/today/todayconfig.cpp | 7 |
5 files changed, 76 insertions, 115 deletions
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 @@ -45,9 +45,9 @@ QString DatebookPlugin::pixmapNameConfig() const { return "datebook/DateBook"; } TodayConfigWidget* DatebookPlugin::configWidget( QWidget* wid ) { - return new DatebookPluginConfig( wid , "Datebook" ); + return new DatebookPluginConfig( wid , "Datebook Config" ); } QString DatebookPlugin::appName() const { return "datebook"; 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 @@ -46,9 +46,9 @@ QString TodolistPlugin::pixmapNameConfig() const { return "todo/TodoList"; } TodayConfigWidget* TodolistPlugin::configWidget( QWidget* wid ) { - return new TodolistPluginConfig( wid , "Todolist" ); + return new TodolistPluginConfig( wid , "Todolist Config" ); } QString TodolistPlugin::appName() const { return "todolist"; 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 @@ -49,12 +49,13 @@ TodayPlugin() : iface( 0 ), guiPart( 0 ), guiBox( 0 ) {} static QMap<QString, TodayPlugin> 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) QCopChannel *todayChannel = new QCopChannel( "QPE/Today" , this ); @@ -62,14 +63,19 @@ Today::Today( QWidget* parent, const char* name, WFlags fl ) this, SLOT ( channelReceived(const QCString&,const QByteArray&) ) ); #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 ); m_sv->setFrameShape( QFrame::NoFrame ); @@ -79,11 +85,11 @@ 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(); } /** * Qcop receive method. @@ -132,16 +138,22 @@ 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 ); m_hideBanner = cfg.readNumEntry( "HideBanner", 0 ); @@ -157,30 +169,11 @@ void Today::init() { } else { 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 */ if( m_pluginLoader->isInSafeMode() ) { @@ -193,8 +186,23 @@ 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<TodayPluginInterface>( *it, IID_TodayPluginInterface ); @@ -228,16 +236,16 @@ void Today::loadPlugins() { m_bblayout->addWidget(plugin.guiBox); } m_bblayout->addStretch( 1 ); + m_big_box->show(); } /** * 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( ); @@ -245,94 +253,26 @@ void Today::startConfig() { conf.setUpPlugins( m_manager, m_pluginLoader ); 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 connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) ); } } - -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( "<font color=#FFFFFF>" + TimeString::longDateString( date ) + "</font>" ) ); - - 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<TodayPluginInterface>( *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<TodayPluginInterface>( *it, IID_TodayPluginInterface ); - iface->guiPart()->refresh(); - odebug << "refresh" << oendl; - } + for ( QMap<QString, TodayPlugin>::Iterator it = pluginList.begin(); + it != pluginList.end(); ++it ) + it.data().guiPart->refresh(); DateLabel->setText( QString( "<font color=#FFFFFF>" + TimeString::longDateString( QDate::currentDate() ) + "</font>" ) ); updateGeometry(); @@ -354,11 +294,23 @@ void Today::editCard() { } Today::~Today() { - for(QMap<QString, TodayPlugin>::Iterator it = pluginList.begin(); it != pluginList.end(); ++it ) - delete it.data().guiBox; - + clearPluginWidgets(); delete m_pluginLoader; delete m_manager; } + +void Today::clearPluginWidgets() { + for(QMap<QString, TodayPlugin>::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 @@ -55,15 +55,18 @@ private slots: void editCard(); 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(); @@ -74,8 +77,9 @@ 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 @@ -92,9 +92,8 @@ 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(); } @@ -180,14 +179,19 @@ void TodayConfig::writeConfig() { // this makes sure the names get saved in the order selected 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" ); m_autoStart = m_guiMisc->CheckBoxAuto->isChecked(); @@ -208,8 +212,9 @@ void TodayConfig::writeConfig() { for ( OPluginItem::List::Iterator it = managedLst.begin(); it != managedLst.end(); ++it ) { TodayPluginInterface* iface = m_pluginLoader->load<TodayPluginInterface>( *it, IID_TodayPluginInterface ); if ( m_configMap.contains( iface ) ) m_configMap[iface]->writeConfig(); + } } |