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
@@ -19,24 +19,25 @@
 #include <opie2/odebug.h>
 #include <opie2/opluginloader.h>
 #include <opie2/oconfig.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>
+#include <qmessagebox.h>
 
 using namespace Opie::Ui;
 using Opie::Core::OPluginItem;
 using Opie::Core::OPluginLoader;
 using Opie::Core::OPluginManager;
 using Opie::Core::OConfig;
 
 
 struct TodayPlugin {
 TodayPlugin() : iface( 0 ), guiPart( 0 ), guiBox( 0 ) {}
     QInterfacePtr<TodayPluginInterface> iface;
     TodayPluginObject *guiPart;
@@ -45,55 +46,52 @@ TodayPlugin() : iface( 0 ), guiPart( 0 ), guiBox( 0 ) {}
     QString name;
     bool excludeRefresh;
 };
 
 static  QMap<QString, TodayPlugin> pluginList;
 
 Today::Today( QWidget* parent,  const char* name, WFlags 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(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;
 
     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 );
 
     m_refreshTimer = new QTimer( this );
     connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) );
 
     init();
     loadPlugins();
     initialize();
-    QPEApplication::showWidget( this );
 }
 
 /**
  * Qcop receive method.
  */
 void Today::channelReceived( const QCString &msg, const QByteArray & data ) {
     QDataStream stream( data, IO_ReadOnly );
     if ( msg == "message(QString)" ) {
         QString message;
         stream >> message;
         setOwnerField( message );
     }
@@ -170,29 +168,42 @@ void Today::init() {
     m_bblayout = new QVBoxLayout ( m_big_box );
 }
 
 
 /**
  * Load the plugins
  */
 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 );
 
         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
@@ -224,25 +235,25 @@ void Today::loadPlugins() {
 /**
  * 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( );
 
     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 {
         // 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()  {
 
@@ -335,20 +346,19 @@ void Today::startApplication() {
 }
 
 
 /**
 * 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;
-    }
+    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
@@ -31,25 +31,24 @@
 
 
 class QVBoxLayout;
 
 namespace Opie {
     namespace Core {
         class OPluginManager;
         class OPluginLoader;
     }
 }
 
 class Today : public TodayBase {
-
     Q_OBJECT
 
 public:
     Today( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~Today();
     static QString appName() {
         return QString::fromLatin1("today");
     }
 
 private slots:
     void startConfig();
     void startApplication();
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
@@ -87,52 +87,53 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal )
     // Misc tab
     tab_3 = new QWidget( TabWidget3, "tab_3" );
     QVBoxLayout *tab3Layout = new QVBoxLayout( tab_3 );
 
     m_guiMisc = new TodayConfigMiscBase( tab_3 );
 
     tab3Layout->addWidget( m_guiMisc );
     TabWidget3->addTab( tab_3, "SettingsIcon", tr( "Misc" ) );
 
     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;
 
     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 );
+        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 );
 }
 
 /**
  * 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() {
     OConfig cfg( "today" );
     cfg.setGroup( "Autostart" );
     if ( m_autoStart ) {
@@ -165,28 +166,28 @@ void TodayConfig::readConfig() {
     m_guiMisc->CheckBoxHide->setChecked( cfg.readNumEntry( "HideBanner", 0 ) );
 }
 
 /**
  * Write the config part
  */
 void TodayConfig::writeConfig() {
     OConfig cfg( "today" );
 
     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--);
                 m_pluginManager->setEnabled( (*it),((QCheckListItem*)list_it.current())->isOn() );
             }
         }
     }
 
     m_pluginManager->save();
 
     cfg.setGroup( "Autostart" );
     m_autoStart = m_guiMisc->CheckBoxAuto->isChecked();
@@ -194,30 +195,29 @@ void TodayConfig::writeConfig() {
     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 ) {
+    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();
     }
 }
 
 
 void TodayConfig::moveSelectedUp() {
     QListViewItem *item = m_appletListView->selectedItem();
     if ( item && item->itemAbove() ) {
         item->itemAbove()->moveItem( item );
     }
 }
 
 
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
@@ -21,58 +21,60 @@
 
 #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;
+class TodayConfigWidget;
+class TodayPluginInterface;
 
 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 setUpPlugins( Opie::Core::OPluginManager * plugManager, Opie::Core::OPluginLoader * plugLoader );
 
 protected slots:
     void moveSelectedUp();
     void moveSelectedDown();
 
 private:
     void setAutoStart();
     void readConfig();
     void pluginManagement( Opie::Core::OPluginItem plugItem);
 
     QListView* m_appletListView;
     QMap<QString,QCheckListItem*> m_applets;
+    QMap<TodayPluginInterface*,TodayConfigWidget*> m_configMap;
 
     int m_autoStart;
     int m_autoStartTimer;
     int m_iconSize;
     QStringList m_excludeApplets;
     bool m_applets_changed;
 
     QWidget* tab_2;
     QWidget* tab_3;
     QLabel* TextLabel1, *TextLabel4;
     QSpinBox* SpinBox7;