-rw-r--r-- | core/pim/today/today.cpp | 292 |
1 files changed, 84 insertions, 208 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index 0a6269e..a8c8651 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp @@ -16,4 +16,2 @@ -#define QTOPIA_INTERNAL_LANGLIST - #include "today.h" @@ -21,4 +19,5 @@ #include <opie2/odebug.h> +#include <opie2/opluginloader.h> +#include <opie2/oconfig.h> -#include <qpe/config.h> #include <qpe/qcopenvelope_qws.h> @@ -33,17 +32,19 @@ using namespace Opie::Ui; +using Opie::Core::OPluginItem; +using Opie::Core::OPluginLoader; +using Opie::Core::OPluginManager; +using Opie::Core::OConfig; + + struct TodayPlugin { - TodayPlugin() : library( 0 ), iface( 0 ), guiPart( 0 ), guiBox( 0 ) {} - QLibrary *library; +TodayPlugin() : iface( 0 ), guiPart( 0 ), guiBox( 0 ) {} QInterfacePtr<TodayPluginInterface> iface; TodayPluginObject *guiPart; + OPluginItem oplugin; QWidget *guiBox; QString name; - bool active; bool excludeRefresh; - int pos; }; -static QValueList<TodayPlugin> pluginList; - -static QMap<QString, TodayPlugin> tempList; +static QMap<QString, TodayPlugin> pluginList; @@ -57,2 +58,3 @@ Today::Today( QWidget* parent, const char* name, WFlags fl ) #if !defined(QT_NO_COP) + QCopChannel *todayChannel = new QCopChannel( "QPE/Today" , this ); @@ -64,8 +66,4 @@ Today::Today( QWidget* parent, const char* name, WFlags fl ) setOwnerField(); - m_refreshTimer = new QTimer( this ); - connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) ); - m_refreshTimer->start( 15000 ); m_big_box = 0L; - layout = new QVBoxLayout( this ); @@ -82,4 +80,8 @@ Today::Today( QWidget* parent, const char* name, WFlags fl ) - qApp->processEvents(); + m_refreshTimer = new QTimer( this ); + connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) ); + + init(); loadPlugins(); + initialize(); QPEApplication::showWidget( this ); @@ -102,3 +104,2 @@ void Today::setRefreshTimer( int interval ) { disconnect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) ); - // 0 is "never" case @@ -134,2 +135,3 @@ void Today::setOwnerField( QString &message ) { + /** @@ -139,7 +141,6 @@ void Today::init() { // read config - Config cfg( "today" ); - + OConfig cfg( "today" ); cfg.setGroup( "Plugins" ); - m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' ); - m_allApplets = cfg.readListEntry( "AllApplets", ',' ); + // m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' ); + // m_allApplets = cfg.readListEntry( "AllApplets", ',' ); @@ -171,2 +172,3 @@ void Today::init() { + /** @@ -176,66 +178,17 @@ void Today::loadPlugins() { - init(); - - QValueList<TodayPlugin>::Iterator tit; - if ( !pluginList.isEmpty() ) { - for ( tit = pluginList.begin(); tit != pluginList.end(); ++tit ) { - (*tit).guiBox->hide(); - (*tit).guiBox->reparent( 0, QPoint( 0, 0 ) ); - delete (*tit).guiBox; - (*tit).library->unload(); - delete (*tit).library; - } - pluginList.clear(); - } - - QString path = QPEApplication::qpeDir() + "/plugins/today"; -#ifdef Q_OS_MACX - owarn << "Searching for Plugins in: " << path << oendl; - QDir dir( path, "lib*.dylib" ); -#else - QDir dir( path, "lib*.so" ); -#endif + m_pluginLoader = new OPluginLoader( "today", true ); + m_pluginLoader->setAutoDelete( true ); - QStringList list = dir.entryList(); - QStringList::Iterator it; + OPluginItem::List lst = m_pluginLoader->allAvailable( true ); - // QMap<QString, TodayPlugin> tempList; + m_manager = new OPluginManager( m_pluginLoader ); + m_manager->load(); - for ( it = list.begin(); it != list.end(); ++it ) { - QInterfacePtr<TodayPluginInterface> iface; - QLibrary *lib = new QLibrary( path + "/" + *it ); - - odebug << "querying: " << path + "/" + *it << oendl; - if ( lib->queryInterface( IID_TodayPluginInterface, (QUnknownInterface**)&iface ) == QS_OK ) { - odebug << "accepted: " << path + "/" + *it << oendl; - odebug << *it << oendl; + for ( OPluginItem::List::Iterator it = lst.begin(); it != lst.end(); ++it ) { + TodayPluginInterface* iface = m_pluginLoader->load<TodayPluginInterface>( *it, IID_TodayPluginInterface ); TodayPlugin plugin; - plugin.library = lib; plugin.iface = iface; - plugin.name = QString(*it); - - QString type = (*it).left( (*it).find(".") ); - - QString lang; - Config config("locale"); - config.setGroup("Language"); - lang = config.readEntry( "Language", "en" ); - - odebug << "Languages: " << lang << oendl; - QTranslator * trans = new QTranslator( qApp ); - QString tfn = QPEApplication::qpeDir()+"/i18n/" + lang + "/" + type + ".qm"; - if ( trans->load( tfn ) ) { - qApp->installTranslator( trans ); - } else { - delete trans; - } - - - // find out if plugins should be shown - if ( m_excludeApplets.grep( *it ).isEmpty() ) { - plugin.active = true; - } else { - plugin.active = false; - } + plugin.name = (*it).name(); + plugin.oplugin = (*it); @@ -251,3 +204,4 @@ void Today::loadPlugins() { plugIcon->setPixmap( plugPix ); - QWhatsThis::add( plugIcon, tr("Click here to launch the associated app") ); + QWhatsThis::add + ( plugIcon, tr("Click here to launch the associated app") ); plugIcon->setName( plugin.guiPart->appName() ); @@ -261,8 +215,3 @@ void Today::loadPlugins() { - // "prebuffer" it in one more list, to get the sorting done - tempList.insert( plugin.name, plugin ); - - // on first start the list is off course empty - if ( m_allApplets.isEmpty() ) { - pluginList.append( plugin ); + pluginList.insert( plugin.name, plugin ); m_bblayout->addWidget( plugin.guiBox ); @@ -270,66 +219,3 @@ void Today::loadPlugins() { - // if plugin is not yet in the list, add it to the layout too - else if ( !m_allApplets.contains( plugin.name ) ) { - pluginList.append( plugin ); - } - } else { - odebug << "could not recognize " << path + "/" + *it << oendl; - delete lib; - } - - } - - - if ( !m_allApplets.isEmpty() ) { - TodayPlugin tempPlugin; - QStringList::Iterator stringit; - - for( stringit = m_allApplets.begin(); stringit != m_allApplets.end(); ++stringit ) { - tempPlugin = ( tempList.find( *stringit ) ).data(); - if ( !( (tempPlugin.name).isEmpty() ) ) { - pluginList.append( tempPlugin ); - m_bblayout->addWidget( tempPlugin.guiBox ); - } - } - } - m_bblayout->addStretch( 2 ); - draw(); -} - - - - -/** - * Repaint method. Reread all fields. - */ -void Today::draw() { - - if ( pluginList.count() == 0 ) { - QLabel *noPlugins = new QLabel( this ); - noPlugins->setText( tr( "No plugins found" ) ); - layout->addWidget( noPlugins ); - return; - } - - uint count = 0; - TodayPlugin plugin; - for ( uint i = 0; i < pluginList.count(); i++ ) { - plugin = pluginList[i]; - - if ( plugin.active ) { - //odebug << plugin.name << " is ACTIVE " << oendl; - plugin.guiBox->show(); - } else { - //odebug << plugin.name << " is INACTIVE " << oendl; - plugin.guiBox->hide(); - } - count++; - } - - if ( count == 0 ) { - QLabel *noPluginsActive = new QLabel( this ); - noPluginsActive->setText( tr( "No plugins activated" ) ); - layout->addWidget( noPluginsActive ); - } - repaint(); + m_bblayout->addStretch( 1 ); } @@ -347,20 +233,3 @@ void Today::startConfig() { TodayConfig conf( this, "dialog", true ); - - TodayPlugin plugin; - QList<TodayConfigWidget> configWidgetList; - - for ( int i = pluginList.count() - 1; i >= 0; i-- ) { - plugin = pluginList[i]; - - // load the config widgets in the tabs - if ( plugin.guiPart->configWidget( this ) != 0l ) { - TodayConfigWidget* widget = plugin.guiPart->configWidget( conf.TabWidget3 ); - configWidgetList.append( widget ); - conf.TabWidget3->addTab( widget, plugin.guiPart->pixmapNameConfig() - , plugin.guiPart->appName() ); - } - // set the order/activate tab - conf.pluginManagement( plugin.name, plugin.guiPart->pluginName(), - Resource::loadPixmap( plugin.guiPart->pixmapNameWidget() ) ); - } + conf.setUpPlugins( m_manager, m_pluginLoader ); @@ -368,14 +237,5 @@ void Today::startConfig() { conf.writeConfig(); - TodayConfigWidget *confWidget; - for ( confWidget = configWidgetList.first(); confWidget != 0; - confWidget = configWidgetList.next() ) { - confWidget->writeConfig(); - } - - // make the plugins to reinitialize ( reread its configs ) - reinitialize(); - draw(); - + initialize(); } else { - // since refresh is not called in that case , reconnect the signal + // since reinitialize is not called in that case , reconnect the signal m_refreshTimer->start( 15000 ); // get the config value in here later @@ -386,4 +246,3 @@ void Today::startConfig() { - -void Today::reinitialize() { +void Today::initialize() { @@ -391,21 +250,3 @@ void Today::reinitialize() { cfg.setGroup( "Plugins" ); - m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' ); - m_allApplets = cfg.readListEntry( "AllApplets", ',' ); - - /* reinitialize all plugins */ - QValueList<TodayPlugin>::Iterator it; - for ( it = pluginList.begin(); it != pluginList.end(); ++it ) { - if ( !(*it).excludeRefresh ) { - (*it).guiPart->reinitialize(); - odebug << "reinit" << oendl; - } - /* check if plugins is still to be shown */ - if ( m_excludeApplets.grep( (*it).name ).isEmpty() ) { - (*it).active = true; - } else { - (*it).active = false; - } - - } @@ -428,15 +269,41 @@ void Today::reinitialize() { + 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; - QStringList::Iterator stringit; + OPluginItem::List lst = m_pluginLoader->allAvailable( true ); + for ( OPluginItem::List::Iterator it = lst.begin(); it != lst.end(); ++it ) { - for( stringit = m_allApplets.begin(); stringit != m_allApplets.end(); ++stringit ) { - tempPlugin = ( tempList.find( *stringit ) ).data(); + 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(); } } - m_bblayout->addStretch( 2 ); - + } + if ( count == 0 ) { + QLabel *noPluginsActive = new QLabel( this ); + noPluginsActive->setText( tr( "No plugins activated" ) ); + layout->addWidget( noPluginsActive ); + } + } + m_bblayout->addStretch( 1 ); + repaint(); } @@ -449,9 +316,9 @@ void Today::refresh() { - QValueList<TodayPlugin>::Iterator it; - for ( it = pluginList.begin(); it != pluginList.end(); ++it ) { - if ( !(*it).excludeRefresh ) { - (*it).guiPart->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; } - } @@ -463,2 +330,3 @@ void Today::refresh() { + void Today::startApplication() { @@ -468,2 +336,3 @@ void Today::startApplication() { + /** @@ -475,3 +344,10 @@ void Today::editCard() { + Today::~Today() { + if (m_pluginLoader) { + delete m_pluginLoader; + } + if (m_manager) { + delete m_manager; + } } |