-rw-r--r-- | core/pim/today/today.cpp | 30 | ||||
-rw-r--r-- | core/pim/today/today.h | 1 | ||||
-rw-r--r-- | core/pim/today/todayconfig.cpp | 28 | ||||
-rw-r--r-- | core/pim/today/todayconfig.h | 4 |
4 files changed, 37 insertions, 26 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 @@ -27,8 +27,9 @@ #include <qdir.h> #include <qtimer.h> #include <qwhatsthis.h> +#include <qmessagebox.h> using namespace Opie::Ui; using Opie::Core::OPluginItem; using Opie::Core::OPluginLoader; @@ -53,16 +54,14 @@ 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) QCopChannel *todayChannel = new QCopChannel( "QPE/Today" , this ); connect ( todayChannel, SIGNAL( received(const QCString&,const QByteArray&) ), this, SLOT ( channelReceived(const QCString&,const QByteArray&) ) ); #endif - #endif setOwnerField(); m_big_box = 0L; @@ -83,9 +82,8 @@ Today::Today( QWidget* parent, const char* name, WFlags fl ) init(); loadPlugins(); initialize(); - QPEApplication::showWidget( this ); } /** * Qcop receive method. @@ -178,13 +176,26 @@ 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; @@ -232,9 +243,9 @@ 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 { // since reinitialize is not called in that case , reconnect the signal @@ -343,12 +354,11 @@ void Today::editCard() { } Today::~Today() { - if (m_pluginLoader) { + for(QMap<QString, TodayPlugin>::Iterator it = pluginList.begin(); it != pluginList.end(); ++it ) + delete it.data().guiBox; + delete m_pluginLoader; - } - if (m_manager) { 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 @@ -39,9 +39,8 @@ namespace Opie { } } class Today : public TodayBase { - Q_OBJECT public: Today( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); 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 @@ -95,14 +95,13 @@ 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; @@ -112,19 +111,21 @@ void TodayConfig::setUpPlugins( OPluginManager * plugManager, OPluginLoader *plu 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 ); + + 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 ); } @@ -173,12 +174,12 @@ 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--); m_pluginManager->setEnabled( (*it),((QCheckListItem*)list_it.current())->isOn() ); @@ -202,14 +203,13 @@ 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 @@ -29,8 +29,10 @@ class QCheckBox; class QLabel; class QSpinBox; class QTabWidget; +class TodayConfigWidget; +class TodayPluginInterface; namespace Opie { namespace Core { class OPluginManager; @@ -39,9 +41,8 @@ namespace Opie { } } class TodayConfig : public QDialog { - Q_OBJECT public: TodayConfig( QWidget* parent = 0, const char* name = 0, bool modal = FALSE ); @@ -63,8 +64,9 @@ private: 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; |