Diffstat (limited to 'korganizer/kodialogmanager.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | korganizer/kodialogmanager.cpp | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp index aa30c52..3dfa344 100644 --- a/korganizer/kodialogmanager.cpp +++ b/korganizer/kodialogmanager.cpp @@ -89,24 +89,12 @@ void KODialogManager::createOutgoingDialog() } void KODialogManager::showGlobalOptionsDialog( bool showSync ) { - if (!mOptionsDialog) { - mOptionsDialog = new KOPrefsDialog(0); - connect(mOptionsDialog,SIGNAL(configChanged()), - mMainView,SLOT(updateConfig())); - } - mOptionsDialog->readConfig(); -#ifndef DESKTOP_VERSION - mOptionsDialog->showMaximized(); -#else - mOptionsDialog->show(); -#endif - if ( showSync ) - mOptionsDialog->showSyncPage(); - mOptionsDialog->exec(); - delete mOptionsDialog; - mOptionsDialog = 0; + KPimPrefsGlobalDialog gc ( mMainView ); + if ( showSync ) + gc.showTZconfig(); + gc.exec(); } void KODialogManager::showOptionsDialog( bool showSync ) { @@ -120,10 +108,9 @@ void KODialogManager::showOptionsDialog( bool showSync ) mOptionsDialog->showMaximized(); #else mOptionsDialog->show(); #endif - if ( showSync ) - mOptionsDialog->showSyncPage(); + mOptionsDialog->exec(); delete mOptionsDialog; mOptionsDialog = 0; } |