[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE_3_2_BRANCH: kdepim/kaddressbook
From:       Lukáš Tinkl <lukas () kde ! org>
Date:       2004-02-01 10:45:03
Message-ID: 20040201104503.AF305991D () office ! kde ! org
[Download RAW message or body]

CVS commit by lukas: 

backport:
- the changes in the settings are applyed to the program again
- the KGlobal::activeInstance() isn't overwritten, that solves #72844


  M +7 -11     kabcore.cpp   1.62.2.3
  M +0 -2      kabcore.h   1.28.2.1


--- kdepim/kaddressbook/kabcore.cpp  #1.62.2.2:1.62.2.3
@@ -78,6 +78,5 @@ KABCore::KABCore( KXMLGUIClient *client,
   : KAB::Core( client, parent, name ), mStatusBar( 0 ), mViewManager( 0 ),
     mExtensionManager( 0 ), mCategorySelectDialog( 0 ), mCategoryEditDialog( 0 ),
-    mConfigureDialog( 0 ), mLdapSearchDialog( 0 ), mReadWrite( readWrite ),
-    mModified( false )
+    mLdapSearchDialog( 0 ), mReadWrite( readWrite ), mModified( false )
 {
   mWidget = new QWidget( parent, name );
@@ -820,15 +819,12 @@ void KABCore::configure()
   saveSettings();
 
-  if ( !mConfigureDialog ) {
-    mConfigureDialog = new KCMultiDialog( mWidget );
-
-    connect( mConfigureDialog, SIGNAL( configCommitted() ),
+  KCMultiDialog dlg( mWidget, "", true );
+  connect( &dlg, SIGNAL( configCommitted() ),
              this, SLOT( configurationChanged() ) );
 
-    mConfigureDialog->addModule( "kabconfig.desktop" );
-    mConfigureDialog->addModule( "kabldapconfig.desktop" );
-  }
+  dlg.addModule( "kabconfig.desktop" );
+  dlg.addModule( "kabldapconfig.desktop" );
 
-  mConfigureDialog->show();
+  dlg.exec();
 }
 

--- kdepim/kaddressbook/kabcore.h  #1.28:1.28.2.1
@@ -47,5 +47,4 @@ class KAction;
 class KActionCollection;
 class KConfig;
-class KCMultiDialog;
 class KToggleAction;
 class KXMLGUIClient;
@@ -369,5 +368,4 @@ class KABCore : public KAB::Core
     QSplitter *mExtensionBarSplitter;
 
-    KCMultiDialog *mConfigureDialog;
     LDAPSearchDialog *mLdapSearchDialog;
     QDict<AddresseeEditorDialog> mEditorDict;


[prev in list] [next in list] [prev in thread] [next in thread]