summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-09-17 09:40:51 (UTC)
committer harlekin <harlekin>2002-09-17 09:40:51 (UTC)
commit92b88813ad8d6352fbf74964fc56dfc1a2aada8c (patch) (side-by-side diff)
tree2a9681d21cc354e66d5fd823018f45d9ac9a32d9
parent03abe825f26678c34142e14f93cabd8f097d5bea (diff)
downloadopie-92b88813ad8d6352fbf74964fc56dfc1a2aada8c.zip
opie-92b88813ad8d6352fbf74964fc56dfc1a2aada8c.tar.gz
opie-92b88813ad8d6352fbf74964fc56dfc1a2aada8c.tar.bz2
only start config dialog once
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/today.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index d78b5b5..066a5a8 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -237,68 +237,67 @@ void Today::draw() {
/**
* The method for the configuration dialog.
*/
void Today::startConfig() {
TodayConfig conf( this, "dialog", true );
TodayPlugin plugin;
QList<ConfigWidget> configWidgetList;
for ( uint i = 0; i < pluginList.count(); i++ ) {
plugin = pluginList[i];
// load the config widgets in the tabs
if ( plugin.guiPart->configWidget( this ) != 0l ) {
ConfigWidget* widget = plugin.guiPart->configWidget( this );
configWidgetList.append( widget );
conf.TabWidget3->insertTab( widget, plugin.guiPart->appName() );
}
// set the order/activate tab
conf.pluginManagement( plugin.name, plugin.guiPart->pluginName(),
Resource::loadPixmap( plugin.guiPart->pixmapNameWidget() ) );
}
- conf.exec();
if ( conf.exec() == QDialog::Accepted ) {
conf.writeConfig();
ConfigWidget *confWidget;
for ( confWidget = configWidgetList.first(); confWidget != 0;
confWidget = configWidgetList.next() ) {
confWidget->writeConfig();
}
- init();
+ init();
TodayPlugin plugin;
for ( uint i = 0; i < pluginList.count(); i++ ) {
plugin = pluginList[i];
if ( m_excludeApplets.grep( plugin.name ).isEmpty() ) {
- qDebug("CONFIG" + plugin.name + "ACTIVE");
+ qDebug("CONFIG " + plugin.name + " ACTIVE");
plugin.active = true;
} else {
- qDebug("CONFIG" + plugin.name + "INACTIVE");
+ qDebug("CONFIG " + plugin.name + " INACTIVE");
plugin.active = false;
}
}
draw();
}
}
void Today::startAddressbook() {
QCopEnvelope e( "QPE/System", "execute(QString)" );
e << QString( "addressbook" );
}
/**
* launch addressbook (personal card)
*/
void Today::editCard() {
startAddressbook();
while( !QCopChannel::isRegistered( "QPE/Addressbook" ) ) {
qApp->processEvents();
}