4 files changed, 43 insertions, 32 deletions

diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index a8c8651..be7cbce 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -28,6 +28,7 @@
 #include <qdir.h>
 #include <qtimer.h>
 #include <qwhatsthis.h>
+#include <qmessagebox.h>
 
 using namespace Opie::Ui;
 using Opie::Core::OPluginItem;
@@ -54,14 +55,12 @@ Today::Today( QWidget* parent,  const char* name, WFlags 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(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
 
     setOwnerField();
     m_big_box = 0L;
@@ -84,7 +83,6 @@ Today::Today( QWidget* parent,  const char* name, WFlags fl )
     init();
     loadPlugins();
     initialize();
-    QPEApplication::showWidget( this );
 }
 
 /**
@@ -179,11 +177,24 @@ void Today::loadPlugins() {
     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();
 
+    /*
+     * check if loading of Plugins crashed
+     */
+    if( m_pluginLoader->isInSafeMode() ) {
+        QMessageBox::information(this, tr("Today Error"),
+                                 tr("<qt>The plugin '%1' caused Today to crash."
+                                    " It could be that the plugin is not properly"
+                                    " installed.<br>Today tries to continue loading"
+                                    " plugins.</qt>")
+                                 .arg( m_manager->crashedPlugin().name()));
+    }
+
+    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 );
 
@@ -233,7 +244,7 @@ void Today::startConfig() {
     TodayConfig conf( this, "dialog", true );
     conf.setUpPlugins( m_manager, m_pluginLoader );
 
-    if ( conf.exec() == QDialog::Accepted ) {
+    if ( QPEApplication::execDialog(&conf) == QDialog::Accepted ) {
         conf.writeConfig();
         initialize();
     } else {
@@ -344,11 +355,10 @@ void Today::editCard() {
 
 
 Today::~Today() {
-    if (m_pluginLoader) {
-        delete m_pluginLoader;
-    }
-    if (m_manager) {
-        delete m_manager;
-    }
+    for(QMap<QString, TodayPlugin>::Iterator it = pluginList.begin(); it != pluginList.end(); ++it )
+        delete it.data().guiBox;
+
+    delete m_pluginLoader;
+    delete m_manager;
 }
 
diff --git a/core/pim/today/today.h b/core/pim/today/today.h
index c947ae1..dfc819d 100644
--- a/core/pim/today/today.h
+++ b/core/pim/today/today.h
@@ -40,7 +40,6 @@ namespace Opie {
 }
 
 class Today : public TodayBase {
-
     Q_OBJECT
 
 public:
diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp
index c9823d4..dacce8b 100644
--- a/core/pim/today/todayconfig.cpp
+++ b/core/pim/today/todayconfig.cpp
@@ -96,12 +96,11 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal )
     connect ( m_appletListView , SIGNAL( clicked(QListViewItem*) ), this, SLOT( appletChanged() ) );
     previousItem = 0l;
     readConfig();
-    QPEApplication::showDialog( this );
 }
 
 
 void TodayConfig::setUpPlugins( OPluginManager * plugManager, OPluginLoader *plugLoader ) {
-
+    m_configMap.clear();
 
     m_pluginManager = plugManager;
     m_pluginLoader = plugLoader;
@@ -113,17 +112,19 @@ void TodayConfig::setUpPlugins( OPluginManager * plugManager, OPluginLoader *plu
             lst.prepend((*it));
 
         TodayPluginInterface* iface = m_pluginLoader->load<TodayPluginInterface>( *it, IID_TodayPluginInterface );
+        TodayConfigWidget *widget = iface->guiPart()->configWidget( TabWidget3 );
 
-        if ( iface->guiPart()->configWidget(this) != 0l ) {
-            TodayConfigWidget* widget = iface->guiPart()->configWidget( TabWidget3  );
-            TabWidget3->addTab( widget, iface->guiPart()->pixmapNameConfig()
-                                , iface->guiPart()->appName() );
-        }
+        if (!widget )
+            continue;
+
+        m_configMap.insert( iface, widget );
+        TabWidget3->addTab( widget, iface->guiPart()->pixmapNameConfig()
+                            , iface->guiPart()->appName() );
     }
 
-    for ( OPluginItem::List::Iterator it = lst.begin(); it != lst.end(); ++it ) {
+    for ( OPluginItem::List::Iterator it = lst.begin(); it != lst.end(); ++it )
         pluginManagement( (*it) );
-    }
+
 
     TabWidget3->setCurrentTab( tab_2 );
 }
@@ -174,10 +175,10 @@ void TodayConfig::writeConfig() {
     int position = m_appletListView->childCount();
 
     QListViewItemIterator list_it( m_appletListView );
-    //
+    OPluginItem::List lst = m_pluginLoader->allAvailable( true );
+
     // 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--);
@@ -203,12 +204,11 @@ void TodayConfig::writeConfig() {
     // set autostart settings
     setAutoStart();
 
-    OPluginItem::List lst = m_pluginManager->managedPlugins();
-    for ( OPluginItem::List::Iterator it = lst.begin(); it != lst.end(); ++it ) {
+    OPluginItem::List managedLst = m_pluginManager->managedPlugins();
+    for ( OPluginItem::List::Iterator it = managedLst.begin(); it != managedLst.end(); ++it ) {
         TodayPluginInterface* iface = m_pluginLoader->load<TodayPluginInterface>( *it, IID_TodayPluginInterface );
-        if ( iface->guiPart()->configWidget(this) != 0l ) {
-            iface->guiPart()->configWidget(this)->writeConfig();
-        }
+        if ( m_configMap.contains( iface ) )
+            m_configMap[iface]->writeConfig();
     }
 }
 
diff --git a/core/pim/today/todayconfig.h b/core/pim/today/todayconfig.h
index ab79f31..81120d3 100644
--- a/core/pim/today/todayconfig.h
+++ b/core/pim/today/todayconfig.h
@@ -30,6 +30,8 @@ class QCheckBox;
 class QLabel;
 class QSpinBox;
 class QTabWidget;
+class TodayConfigWidget;
+class TodayPluginInterface;
 
 namespace Opie {
     namespace Core {
@@ -40,7 +42,6 @@ namespace Opie {
 }
 
 class TodayConfig : public QDialog {
-
     Q_OBJECT
 
 public:
@@ -64,6 +65,7 @@ private:
 
     QListView* m_appletListView;
     QMap<QString,QCheckListItem*> m_applets;
+    QMap<TodayPluginInterface*,TodayConfigWidget*> m_configMap;
 
     int m_autoStart;
     int m_autoStartTimer;