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
@@ -11,80 +11,82 @@
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
-#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>
 #include <qpe/qpeapplication.h>
 #include <qpe/contact.h>
 
 #include <qdir.h>
 #include <qtimer.h>
 #include <qwhatsthis.h>
 
 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 );
     layout->addWidget( OwnerField );
 
     m_sv = new QScrollView( this );
     m_sv->setResizePolicy( QScrollView::AutoOneFit );
     m_sv->setHScrollBarMode( QScrollView::AlwaysOff );
     m_sv->setFrameShape( QFrame::NoFrame );
 
     layout->addWidget( m_sv );
     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 );
 }
 
 /**
  * Qcop receive method.
  */
@@ -97,13 +99,12 @@ void Today::channelReceived( const QCString &msg, const QByteArray & data ) {
     }
 }
 
 void Today::setRefreshTimer( int interval ) {
 
     disconnect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) );
-
     // 0 is "never" case
     if ( !interval == 0 ) {
         connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) );
         m_refreshTimer->changeInterval( interval );
     }
 }
@@ -129,22 +130,22 @@ void Today::setOwnerField() {
 void Today::setOwnerField( QString &message ) {
     if ( !message.isEmpty() ) {
         OwnerField->setText( "<b>" + message + "</b>" );
     }
 }
 
+
 /**
  * Init stuff needed for today. Reads the config file.
  */
 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" );
     m_iconSize = cfg.readNumEntry( "IconSize", 18 );
     m_hideBanner = cfg.readNumEntry( "HideBanner", 0 );
     setRefreshTimer( cfg.readNumEntry( "checkinterval", 15000 ) );
 
@@ -166,175 +167,60 @@ void Today::init() {
 
     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() {
 
-    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 );
 }
 
 
 /**
  * The method for the configuration dialog.
  */
@@ -342,75 +228,30 @@ void Today::startConfig() {
 
     // disconnect timer to prevent problems while being on config dialog
     disconnect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) );
     m_refreshTimer->stop( );
 
     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() ) );
     }
 }
 
 
-
-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" );
     m_iconSize = cfg.readNumEntry( "IconSize", 18 );
     m_hideBanner = cfg.readNumEntry( "HideBanner", 0 );
     setRefreshTimer( cfg.readNumEntry( "checkinterval", 15000 ) );
 
@@ -423,56 +264,91 @@ void Today::reinitialize()  {
         TodayLabel->hide();
     } else {
         Opiezilla->show();
         TodayLabel->show();
     }
 
-    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();
 }
 
 /**
  * Refresh for the view. Reload all applets
  *
  */
 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;
     }
 
     DateLabel->setText( QString( "<font color=#FFFFFF>" +  TimeString::longDateString( QDate::currentDate() )  + "</font>" ) );
 
     updateGeometry();
     repaint();
 }
 
+
 void Today::startApplication() {
     QCopEnvelope e( "QPE/System", "execute(QString)" );
     e << QString( sender()->name() );
 }
 
+
 /**
- * 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
@@ -19,64 +19,73 @@
 
 #include "todayconfig.h"
 #include "todaybase.h"
 
 #include <opie2/todayplugininterface.h>
 #include <opie2/oclickablelabel.h>
+#include <opie2/opluginloader.h>
 
 #include <qpe/qlibrary.h>
 
 #include <qscrollview.h>
 #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:
     void startConfig();
     void startApplication();
     void editCard();
     void refresh();
 
 private:
     void init();
     void setOwnerField();
     void setOwnerField(QString &string);
-    void loadPlugins();
-    void draw();
-    void reinitialize();
+    void initialize();
 
     void setRefreshTimer( int );
 
 private slots:
     void channelReceived(const QCString &msg, const QByteArray & data);
+    void loadPlugins();
 
- private:
+private:
     TodayConfig *conf;
     QStringList m_excludeApplets;
     QStringList m_allApplets;
 
     QScrollView *m_sv;
     QWidget* m_big_box;
     QVBoxLayout *m_bblayout;
 
-   
+    Opie::Core::OPluginLoader *m_pluginLoader;
+    Opie::Core::OPluginManager *m_manager;
 
     QTimer *m_refreshTimer;
 
     bool m_refreshTimerEnabled;
     int m_newStart;
     int m_iconSize;
     int m_maxCharClip;
     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
@@ -13,13 +13,16 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #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>
 #include <qpe/qpeapplication.h>
 
 #include <qcheckbox.h>
 #include <qlabel.h>
@@ -28,17 +31,22 @@
 #include <qheader.h>
 #include <qvbox.h>
 #include <qtoolbutton.h>
 #include <qwhatsthis.h>
 
 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 );
         setFocusPolicy( QWidget::NoFocus );
         setToggleButton( t );
         connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot );
     }
@@ -48,13 +56,13 @@ public:
 /**
  * The class has currently quite some duplicate code.
  * By that way it would be real easy to have it as seperate app in settings tab
  *
  */
 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" ) );
 
     QVBoxLayout *layout = new QVBoxLayout( this );
     TabWidget3 = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom );
     layout->addWidget( TabWidget3 );
@@ -65,13 +73,14 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal )
     tab2Layout->addWidget( l );
     QHBox *hbox1 = new QHBox( tab_2 );
     m_appletListView = new QListView( hbox1 );
     m_appletListView->addColumn( "PluginList" );
     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() ) );
     new ToolButton( vbox1, tr( "Move Down" ), "down", this , SLOT( moveSelectedDown() ) );
     tab2Layout->addWidget( hbox1 );
     TabWidget3->addTab( tab_2, "pass", tr( "active/order" ) );
 
@@ -81,27 +90,53 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal )
 
     m_guiMisc = new TodayConfigMiscBase( tab_3 );
 
     tab3Layout->addWidget( m_guiMisc );
     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 );
 }
 
 
+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.
  * If registered against that today ist started on each resume.
  */
 void TodayConfig::setAutoStart() {
-    Config cfg( "today" );
+    OConfig cfg( "today" );
     cfg.setGroup( "Autostart" );
     if ( m_autoStart ) {
         QCopEnvelope e( "QPE/System", "autoStart(QString,QString,QString)" );
         e << QString( "add" );
         e << QString( "today" );
         e << QString( "%1" ).arg( m_autoStartTimer );
@@ -113,76 +148,71 @@ void TodayConfig::setAutoStart() {
 }
 
 /**
  * Read the config part
  */
 void TodayConfig::readConfig() {
-    Config cfg( "today" );
+    OConfig cfg( "today" );
     cfg.setGroup( "Autostart" );
     m_autoStart = cfg.readNumEntry( "autostart", 1 );
     m_guiMisc->CheckBoxAuto->setChecked( m_autoStart );
     m_autoStartTimer = cfg.readNumEntry( "autostartdelay", 0 );
     m_guiMisc->SpinBoxTime->setValue( m_autoStartTimer );
 
     cfg.setGroup( "General" );
     m_iconSize = cfg.readNumEntry( "IconSize", 18 );
     m_guiMisc->SpinBoxIconSize->setValue( m_iconSize );
     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", ',' );
 }
 
 /**
  * Write the config part
  */
 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 );
     m_iconSize = m_guiMisc->SpinBoxIconSize->value();
 
     cfg.setGroup( "General" );
     cfg.writeEntry( "IconSize", m_iconSize );
     cfg.writeEntry( "HideBanner",  m_guiMisc->CheckBoxHide->isChecked() );
     cfg.writeEntry( "checkinterval", m_guiMisc->SpinRefresh->value()*1000 );
 
     // 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();
+        }
+    }
 }
 
 
 void TodayConfig::moveSelectedUp() {
     QListViewItem *item = m_appletListView->selectedItem();
     if ( item && item->itemAbove() ) {
@@ -199,33 +229,22 @@ 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
@@ -17,44 +17,53 @@
 #ifndef TODAYCONFIG_H
 #define TODAYCONFIG_H
 
 #include "todayconfigmiscbase.h"
 
 #include <opie2/otabwidget.h>
+#include <opie2/opluginloader.h>
 
 #include <qvariant.h>
 #include <qdialog.h>
 #include <qlistview.h>
 
 class QCheckBox;
 class QLabel;
 class QSpinBox;
 class QTabWidget;
 
+namespace Opie {
+    namespace Core {
+        class OPluginManager;
+        class OPluginLoader;
+        class OPluginItem;
+    }
+}
+
 class TodayConfig : public QDialog {
 
     Q_OBJECT
 
 public:
     TodayConfig( QWidget* parent = 0, const char* name = 0, bool modal = FALSE );
     ~TodayConfig();
 
     Opie::Ui::OTabWidget* TabWidget3;
 
     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();
 
 private:
     void setAutoStart();
     void readConfig();
+    void pluginManagement( Opie::Core::OPluginItem plugItem);
 
     QListView* m_appletListView;
     QMap<QString,QCheckListItem*> m_applets;
 
     int m_autoStart;
     int m_autoStartTimer;
@@ -64,10 +73,15 @@ private:
 
     QWidget* tab_2;
     QWidget* tab_3;
     QLabel* TextLabel1, *TextLabel4;
     QSpinBox* SpinBox7;
 
+    Opie::Core::OPluginManager *m_pluginManager;
+    Opie::Core::OPluginLoader *m_pluginLoader;
+
+    QCheckListItem *previousItem;
+
     TodayConfigMiscBase *m_guiMisc;
 };
 
 #endif