summaryrefslogtreecommitdiff
authorzecke <zecke>2004-09-12 20:31:20 (UTC)
committer zecke <zecke>2004-09-12 20:31:20 (UTC)
commitb52e2e46ec535a5307276b8fdf1e578aa5d29283 (patch) (side-by-side diff)
treef30d0fd2faaf89c2bc982e3f8a645645bf74edd8
parent90aaa298cc69522e88e1f81ade7d5259131b1544 (diff)
downloadopie-b52e2e46ec535a5307276b8fdf1e578aa5d29283.zip
opie-b52e2e46ec535a5307276b8fdf1e578aa5d29283.tar.gz
opie-b52e2e46ec535a5307276b8fdf1e578aa5d29283.tar.bz2
-Only create configWidgets once per config dialog, properly delete them
-Delete the Widgets before we remove the plugin from our address space some random clean ups
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/today.cpp38
-rw-r--r--core/pim/today/today.h1
-rw-r--r--core/pim/today/todayconfig.cpp32
-rw-r--r--core/pim/today/todayconfig.h4
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
@@ -25,12 +25,13 @@
#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;
@@ -51,20 +52,18 @@ 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 );
@@ -81,13 +80,12 @@ Today::Today( QWidget* parent, const char* name, WFlags fl )
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 ) {
@@ -176,17 +174,30 @@ void Today::init() {
*/
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();
@@ -230,13 +241,13 @@ void Today::startConfig() {
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() ) );
@@ -341,14 +352,13 @@ void Today::startApplication() {
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
@@ -37,13 +37,12 @@ namespace Opie {
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() {
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
@@ -93,40 +93,41 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal )
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.
@@ -171,16 +172,16 @@ void TodayConfig::readConfig() {
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() );
}
}
@@ -200,18 +201,17 @@ void TodayConfig::writeConfig() {
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();
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
@@ -27,23 +27,24 @@
#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();
@@ -61,12 +62,13 @@ 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;