summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/today.cpp372
-rw-r--r--core/pim/today/today.h27
-rw-r--r--core/pim/today/todayconfig.cpp137
-rw-r--r--core/pim/today/todayconfig.h18
4 files changed, 236 insertions, 318 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
@@ -15,11 +15,10 @@
***************************************************************************/
-#define QTOPIA_INTERNAL_LANGLIST
-
#include "today.h"
#include <opie2/odebug.h>
+#include <opie2/opluginloader.h>
+#include <opie2/oconfig.h>
-#include <qpe/config.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/resource.h>
@@ -32,41 +31,40 @@
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;
Today::Today( QWidget* parent, const char* name, WFlags fl )
- : TodayBase( parent, name, fl ) {
+: TodayBase( parent, name, fl ) {
QObject::connect( (QObject*)ConfigButton, SIGNAL( clicked() ), this, SLOT( startConfig() ) );
QObject::connect( (QObject*)OwnerField, SIGNAL( clicked() ), this, SLOT( editCard() ) );
-#if defined(Q_WS_QWS)
-#if !defined(QT_NO_COP)
+ #if defined(Q_WS_QWS)
+ #if !defined(QT_NO_COP)
+
QCopChannel *todayChannel = new QCopChannel( "QPE/Today" , this );
connect ( todayChannel, SIGNAL( received(const QCString&,const QByteArray&) ),
this, SLOT ( channelReceived(const QCString&,const QByteArray&) ) );
-#endif
-#endif
+ #endif
+ #endif
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 );
layout->addWidget( Frame );
@@ -81,6 +79,10 @@ Today::Today( QWidget* parent, const char* name, WFlags fl )
layout->setStretchFactor( m_sv,4 );
- qApp->processEvents();
+ m_refreshTimer = new QTimer( this );
+ connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) );
+
+ init();
loadPlugins();
+ initialize();
QPEApplication::showWidget( this );
}
@@ -101,5 +103,4 @@ void Today::setRefreshTimer( int interval ) {
disconnect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) );
-
// 0 is "never" case
if ( !interval == 0 ) {
@@ -133,4 +134,5 @@ void Today::setOwnerField( QString &message ) {
}
+
/**
* Init stuff needed for today. Reads the config file.
@@ -138,9 +140,8 @@ void Today::setOwnerField( QString &message ) {
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", ',' );
cfg.setGroup( "General" );
@@ -170,4 +171,5 @@ void Today::init() {
}
+
/**
* Load the plugins
@@ -175,162 +177,46 @@ void Today::init() {
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();
+ m_pluginLoader = new OPluginLoader( "today", true );
+ m_pluginLoader->setAutoDelete( true );
+
+ OPluginItem::List lst = m_pluginLoader->allAvailable( true );
+
+ m_manager = new OPluginManager( m_pluginLoader );
+ m_manager->load();
+
+ for ( OPluginItem::List::Iterator it = lst.begin(); it != lst.end(); ++it ) {
+ TodayPluginInterface* iface = m_pluginLoader->load<TodayPluginInterface>( *it, IID_TodayPluginInterface );
+
+ TodayPlugin plugin;
+ plugin.iface = iface;
+ plugin.name = (*it).name();
+ plugin.oplugin = (*it);
+
+ plugin.guiPart = plugin.iface->guiPart();
+ plugin.excludeRefresh = plugin.guiPart->excludeFromRefresh();
+
+ // package the whole thing into a qwidget so it can be shown and hidden
+ plugin.guiBox = new QWidget( m_big_box );
+ QHBoxLayout *boxLayout = new QHBoxLayout( plugin.guiBox );
+ QPixmap plugPix;
+ plugPix.convertFromImage( Resource::loadImage( plugin.guiPart->pixmapNameWidget() ).smoothScale( m_iconSize, m_iconSize ), 0 );
+ OClickableLabel* plugIcon = new OClickableLabel( plugin.guiBox );
+ plugIcon->setPixmap( plugPix );
+ QWhatsThis::add
+ ( plugIcon, tr("Click here to launch the associated app") );
+ plugIcon->setName( plugin.guiPart->appName() );
+ connect( plugIcon, SIGNAL( clicked() ), this, SLOT( startApplication() ) );
+
+ QWidget *plugWidget = plugin.guiPart->widget( plugin.guiBox );
+ boxLayout->addWidget( plugIcon, 0, AlignTop );
+ boxLayout->addWidget( plugWidget, 0, AlignTop );
+ boxLayout->setStretchFactor( plugIcon, 1 );
+ boxLayout->setStretchFactor( plugWidget, 9 );
+
+ pluginList.insert( plugin.name, plugin );
+ m_bblayout->addWidget(plugin.guiBox);
}
- 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
-
- QStringList list = dir.entryList();
- QStringList::Iterator it;
-
- // QMap<QString, TodayPlugin> tempList;
-
- 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;
-
- 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.guiPart = plugin.iface->guiPart();
- plugin.excludeRefresh = plugin.guiPart->excludeFromRefresh();
-
- // package the whole thing into a qwidget so it can be shown and hidden
- plugin.guiBox = new QWidget( m_big_box );
- QHBoxLayout *boxLayout = new QHBoxLayout( plugin.guiBox );
- QPixmap plugPix;
- plugPix.convertFromImage( Resource::loadImage( plugin.guiPart->pixmapNameWidget() ).smoothScale( m_iconSize, m_iconSize ), 0 );
- OClickableLabel* plugIcon = new OClickableLabel( plugin.guiBox );
- plugIcon->setPixmap( plugPix );
- QWhatsThis::add( plugIcon, tr("Click here to launch the associated app") );
- plugIcon->setName( plugin.guiPart->appName() );
- connect( plugIcon, SIGNAL( clicked() ), this, SLOT( startApplication() ) );
-
- QWidget *plugWidget = plugin.guiPart->widget( plugin.guiBox );
- boxLayout->addWidget( plugIcon, 0, AlignTop );
- boxLayout->addWidget( plugWidget, 0, AlignTop );
- boxLayout->setStretchFactor( plugIcon, 1 );
- boxLayout->setStretchFactor( plugWidget, 9 );
-
- // "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 );
- m_bblayout->addWidget( plugin.guiBox );
- }
-
- // 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 );
}
@@ -346,37 +232,11 @@ 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 );
if ( conf.exec() == QDialog::Accepted ) {
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
connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) );
@@ -385,28 +245,9 @@ void Today::startConfig() {
-
-void Today::reinitialize() {
+void Today::initialize() {
Config cfg( "today" );
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;
- }
-
- }
cfg.setGroup( "General" );
@@ -427,17 +268,43 @@ void Today::reinitialize() {
}
- delete m_bblayout;
- m_bblayout = new QVBoxLayout( m_big_box );
- TodayPlugin tempPlugin;
- QStringList::Iterator stringit;
+ 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 ) {
- for( stringit = m_allApplets.begin(); stringit != m_allApplets.end(); ++stringit ) {
- tempPlugin = ( tempList.find( *stringit ) ).data();
- if ( !( (tempPlugin.name).isEmpty() ) ) {
- m_bblayout->addWidget( tempPlugin.guiBox );
+ 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( 2 );
-
+ m_bblayout->addStretch( 1 );
+ repaint();
}
@@ -448,10 +315,10 @@ void Today::reinitialize() {
void Today::refresh() {
- QValueList<TodayPlugin>::Iterator it;
- for ( it = pluginList.begin(); it != pluginList.end(); ++it ) {
- if ( !(*it).excludeRefresh ) {
- (*it).guiPart->refresh();
- odebug << "refresh" << oendl;
- }
+ 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;
}
@@ -462,4 +329,5 @@ void Today::refresh() {
}
+
void Today::startApplication() {
QCopEnvelope e( "QPE/System", "execute(QString)" );
@@ -467,12 +335,20 @@ void Today::startApplication() {
}
+
/**
- * launch addressbook (personal card)
- */
+* launch addressbook (personal card)
+*/
void Today::editCard() {
QCopEnvelope env( "QPE/Application/addressbook", "editPersonalAndClose()" );
}
+
Today::~Today() {
+ if (m_pluginLoader) {
+ delete m_pluginLoader;
+ }
+ if (m_manager) {
+ delete m_manager;
+ }
}
diff --git a/core/pim/today/today.h b/core/pim/today/today.h
index 89170e1..c947ae1 100644
--- a/core/pim/today/today.h
+++ b/core/pim/today/today.h
@@ -23,4 +23,5 @@
#include <opie2/todayplugininterface.h>
#include <opie2/oclickablelabel.h>
+#include <opie2/opluginloader.h>
#include <qpe/qlibrary.h>
@@ -29,15 +30,24 @@
#include <qvbox.h>
-
+
class QVBoxLayout;
+namespace Opie {
+ namespace Core {
+ class OPluginManager;
+ class OPluginLoader;
+ }
+}
+
class Today : public TodayBase {
Q_OBJECT
- public:
+public:
Today( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~Today();
- static QString appName() { return QString::fromLatin1("today"); }
+ static QString appName() {
+ return QString::fromLatin1("today");
+ }
private slots:
@@ -51,7 +61,5 @@ private:
void setOwnerField();
void setOwnerField(QString &string);
- void loadPlugins();
- void draw();
- void reinitialize();
+ void initialize();
void setRefreshTimer( int );
@@ -59,6 +67,7 @@ private:
private slots:
void channelReceived(const QCString &msg, const QByteArray & data);
+ void loadPlugins();
- private:
+private:
TodayConfig *conf;
QStringList m_excludeApplets;
@@ -69,5 +78,6 @@ private slots:
QVBoxLayout *m_bblayout;
-
+ Opie::Core::OPluginLoader *m_pluginLoader;
+ Opie::Core::OPluginManager *m_manager;
QTimer *m_refreshTimer;
@@ -79,4 +89,3 @@ private slots:
int m_hideBanner;
};
-
#endif
diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp
index 4f0877c..c9823d4 100644
--- a/core/pim/today/todayconfig.cpp
+++ b/core/pim/today/todayconfig.cpp
@@ -17,5 +17,8 @@
#include "todayconfig.h"
-#include <qpe/config.h>
+#include <opie2/oconfig.h>
+#include <opie2/opluginloader.h>
+#include <opie2/todayplugininterface.h>
+
#include <qpe/resource.h>
#include <qpe/qcopenvelope_qws.h>
@@ -32,9 +35,14 @@
using namespace Opie::Ui;
+using Opie::Core::OConfig;
+using Opie::Core::OPluginManager;
+using Opie::Core::OPluginLoader;
+using Opie::Core::OPluginItem;
+
class ToolButton : public QToolButton {
public:
ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE )
- : QToolButton( parent, name ) {
+: QToolButton( parent, name ) {
setPixmap( Resource::loadPixmap( icon ) );
setAutoRaise( TRUE );
@@ -52,5 +60,5 @@ public:
*/
TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal )
- : QDialog( parent, name, modal, WStyle_ContextHelp ) {
+: QDialog( parent, name, modal, WStyle_ContextHelp ) {
setCaption( tr( "Today Config" ) );
@@ -69,5 +77,6 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal )
m_appletListView->header()->hide();
m_appletListView->setSorting( -1 );
- QWhatsThis::add( m_appletListView, tr( "Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order" ) );
+ QWhatsThis::add
+ ( m_appletListView, tr( "Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order" ) );
QVBox *vbox1 = new QVBox( hbox1 );
new ToolButton( vbox1, tr( "Move Up" ), "up", this , SLOT( moveSelectedUp() ) );
@@ -85,8 +94,6 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal )
TabWidget3->addTab( tab_3, "SettingsIcon", tr( "Misc" ) );
- m_applets_changed = false;
-
connect ( m_appletListView , SIGNAL( clicked(QListViewItem*) ), this, SLOT( appletChanged() ) );
-
+ previousItem = 0l;
readConfig();
QPEApplication::showDialog( this );
@@ -94,4 +101,32 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal )
+void TodayConfig::setUpPlugins( OPluginManager * plugManager, OPluginLoader *plugLoader ) {
+
+
+ m_pluginManager = plugManager;
+ m_pluginLoader = plugLoader;
+
+ OPluginItem::List inLst = m_pluginLoader->allAvailable( true );
+
+ OPluginItem::List lst;
+ for ( OPluginItem::List::Iterator it = inLst.begin(); it != inLst.end(); ++it ) {
+ lst.prepend((*it));
+
+ TodayPluginInterface* iface = m_pluginLoader->load<TodayPluginInterface>( *it, IID_TodayPluginInterface );
+
+ if ( iface->guiPart()->configWidget(this) != 0l ) {
+ TodayConfigWidget* widget = iface->guiPart()->configWidget( TabWidget3 );
+ TabWidget3->addTab( widget, iface->guiPart()->pixmapNameConfig()
+ , iface->guiPart()->appName() );
+ }
+ }
+
+ for ( OPluginItem::List::Iterator it = lst.begin(); it != lst.end(); ++it ) {
+ pluginManagement( (*it) );
+ }
+
+ TabWidget3->setCurrentTab( tab_2 );
+}
+
/**
* Autostart, uses the new (opie only) autostart method in the launcher code.
@@ -99,5 +134,5 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal )
*/
void TodayConfig::setAutoStart() {
- Config cfg( "today" );
+ OConfig cfg( "today" );
cfg.setGroup( "Autostart" );
if ( m_autoStart ) {
@@ -117,5 +152,5 @@ void TodayConfig::setAutoStart() {
*/
void TodayConfig::readConfig() {
- Config cfg( "today" );
+ OConfig cfg( "today" );
cfg.setGroup( "Autostart" );
m_autoStart = cfg.readNumEntry( "autostart", 1 );
@@ -129,8 +164,4 @@ void TodayConfig::readConfig() {
m_guiMisc->SpinRefresh->setValue( cfg.readNumEntry( "checkinterval", 15000 ) / 1000 );
m_guiMisc->CheckBoxHide->setChecked( cfg.readNumEntry( "HideBanner", 0 ) );
-
-
- cfg.setGroup( "Plugins" );
- m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' );
}
@@ -139,35 +170,26 @@ void TodayConfig::readConfig() {
*/
void TodayConfig::writeConfig() {
- Config cfg( "today" );
- cfg.setGroup( "Plugins" );
- if ( m_applets_changed ) {
- QStringList exclude;
- QStringList include;
- QStringList all_applets;
-
- QListViewItemIterator list_it( m_appletListView );
-
- // this makes sure the names get saved in the order selected
- for ( ; list_it.current(); ++list_it ) {
- QMap <QString, QCheckListItem *>::Iterator it;
- for ( it = m_applets.begin(); it != m_applets. end (); ++it ) {
- if ( list_it.current() == (*it) && !(*it)-> isOn () ) {
- exclude << it.key();
- } else if ( list_it.current() == (*it) && (*it)-> isOn () ){
- include << it.key();
- }
- if ( list_it.current() == (*it) ) {
- all_applets << it.key();
- }
+ OConfig cfg( "today" );
+
+ int position = m_appletListView->childCount();
+
+ QListViewItemIterator list_it( m_appletListView );
+ //
+ // 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 ) {
+ if ( QString::compare( (*it).name() , list_it.current()->text(0) ) == 0 ) {
+ (*it).setPosition(position--);
+ m_pluginManager->setEnabled( (*it),((QCheckListItem*)list_it.current())->isOn() );
}
}
- cfg.writeEntry( "ExcludeApplets", exclude, ',' );
- cfg.writeEntry( "IncludeApplets", include, ',' );
- cfg.writeEntry( "AllApplets", all_applets, ',' );
}
+ m_pluginManager->save();
+
cfg.setGroup( "Autostart" );
m_autoStart = m_guiMisc->CheckBoxAuto->isChecked();
- cfg.writeEntry( "autostart", m_autoStart );
+ cfg.writeEntry( "autostart", m_autoStart );
m_autoStartTimer = m_guiMisc->SpinBoxTime->value();
cfg.writeEntry( "autostartdelay", m_autoStartTimer );
@@ -181,4 +203,12 @@ void TodayConfig::writeConfig() {
// set autostart settings
setAutoStart();
+
+ OPluginItem::List lst = m_pluginManager->managedPlugins();
+ for ( OPluginItem::List::Iterator it = lst.begin(); it != lst.end(); ++it ) {
+ TodayPluginInterface* iface = m_pluginLoader->load<TodayPluginInterface>( *it, IID_TodayPluginInterface );
+ if ( iface->guiPart()->configWidget(this) != 0l ) {
+ iface->guiPart()->configWidget(this)->writeConfig();
+ }
+ }
}
@@ -203,29 +233,18 @@ void TodayConfig::moveSelectedDown() {
* Set up the icons in the order/active tab
*/
-void TodayConfig::pluginManagement( QString libName, QString name, QPixmap icon ) {
-
- QCheckListItem *item;
- item = new QCheckListItem( m_appletListView, name, QCheckListItem::CheckBox );
+void TodayConfig::pluginManagement( OPluginItem plugItem ) {
- if ( !icon.isNull() ) {
- item->setPixmap( 0, icon );
- }
-
- if ( m_excludeApplets.find( libName ) == m_excludeApplets.end() ) {
- item->setOn( TRUE );
- }
-
- m_applets[libName] = item;
+ QCheckListItem *item = new QCheckListItem( m_appletListView, plugItem.name(), QCheckListItem::CheckBox );
- // kind of hack to get the first tab as default.
- TabWidget3->setCurrentTab( tab_2 );
-}
-
-void TodayConfig::appletChanged() {
- m_applets_changed = true;
+ TodayPluginInterface* iface = m_pluginLoader->load<TodayPluginInterface>( plugItem, IID_TodayPluginInterface );
+ QPixmap icon = Resource::loadPixmap( iface->guiPart()->pixmapNameWidget() );
+ if ( !icon.isNull() ) {
+ item->setPixmap( 0, icon );
+ }
+ item->setOn( plugItem.isEnabled() );
+ previousItem = item;
}
-TodayConfig::~TodayConfig() {
-}
+TodayConfig::~TodayConfig() {}
diff --git a/core/pim/today/todayconfig.h b/core/pim/today/todayconfig.h
index 2b6c507..ab79f31 100644
--- a/core/pim/today/todayconfig.h
+++ b/core/pim/today/todayconfig.h
@@ -21,4 +21,5 @@
#include <opie2/otabwidget.h>
+#include <opie2/opluginloader.h>
#include <qvariant.h>
@@ -31,4 +32,12 @@ class QSpinBox;
class QTabWidget;
+namespace Opie {
+ namespace Core {
+ class OPluginManager;
+ class OPluginLoader;
+ class OPluginItem;
+ }
+}
+
class TodayConfig : public QDialog {
@@ -42,9 +51,8 @@ public:
void writeConfig();
- void pluginManagement( QString libName, QString name, QPixmap icon );
+ void setUpPlugins( Opie::Core::OPluginManager * plugManager, Opie::Core::OPluginLoader * plugLoader );
protected slots:
- void appletChanged();
void moveSelectedUp();
void moveSelectedDown();
@@ -53,4 +61,5 @@ private:
void setAutoStart();
void readConfig();
+ void pluginManagement( Opie::Core::OPluginItem plugItem);
QListView* m_appletListView;
@@ -68,4 +77,9 @@ private:
QSpinBox* SpinBox7;
+ Opie::Core::OPluginManager *m_pluginManager;
+ Opie::Core::OPluginLoader *m_pluginLoader;
+
+ QCheckListItem *previousItem;
+
TodayConfigMiscBase *m_guiMisc;
};