From kde-commits  Sat Aug 21 21:48:34 2004
From: Reinhold Kainhofer <reinhold () kainhofer ! com>
Date: Sat, 21 Aug 2004 21:48:34 +0000
To: kde-commits
Subject: kdepim/kpilot/kpilot
Message-Id: <20040821214834.A3A988EB3 () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=109312492112198

CVS commit by kainhofe: 

make the wizard available in the dcop interface. Swap the generic db viewer and the installer icons in the sidebar of kpilot. Inspired by the rlevantive usability report


  M +34 -22    kpilot.cc   1.146
  M +1 -2      kpilot.h   1.55
  M +1 -0      kpilotDCOP.h   1.16


--- kdepim/kpilot/kpilot/kpilot.cc  #1.145:1.146
@@ -318,8 +318,4 @@ void KPilotInstaller::initComponents()
                 i18n("Memo Viewer"));
 
-        ADDICONPAGE(i18n("Generic DB Viewer"),CSL1("kpilot/kpilot-db.png"));
-        addComponentPage(new GenericDBWidget(w,defaultDBPath),
-                i18n("Generic DB Viewer"));
-
         ADDICONPAGE(i18n("File Installer"),CSL1("kpilot/kpilot-fileinstaller.png"));
         fFileInstallWidget = new FileInstallWidget(
@@ -327,4 +323,8 @@ void KPilotInstaller::initComponents()
         addComponentPage(fFileInstallWidget, i18n("File Installer"));
 
+        ADDICONPAGE(i18n("Generic DB Viewer"),CSL1("kpilot/kpilot-db.png"));
+        addComponentPage(new GenericDBWidget(w,defaultDBPath),
+                i18n("Generic DB Viewer"));
+
 #undef ADDICONPAGE
 #undef VIEWICON
@@ -472,15 +472,4 @@ void KPilotInstaller::slotListSyncReques
 }
 
-/* virtual DCOP */ ASYNC KPilotInstaller::configure()
-{
-        FUNCTIONSETUP;
-#ifdef DEBUG
-        DEBUGKPILOT << fname << ": Daemon requested configure" << endl;
-#endif
-
-        if (!fConfigureKPilotDialogInUse)
-                slotConfigureKPilot();
-}
-
 bool KPilotInstaller::componentPreSync()
 {
@@ -645,9 +634,9 @@ void KPilotInstaller::initMenu()
         (void) KStdAction::configureToolbars(this, SLOT(optionsConfigureToolbars()),
                 actionCollection());
-        (void) KStdAction::preferences(this, SLOT(slotConfigureKPilot()),
+        (void) KStdAction::preferences(this, SLOT(configure()),
                 actionCollection());
 
         a = new KAction(i18n("Configuration &Wizard..."), CSL1("wizard"), 0,
-                this, SLOT(slotConfigureWizard()),
+                this, SLOT(configureWizard()),
                 actionCollection(), "options_configure_wizard");
         a->setWhatsThis(i18n("Configure KPilot using the configuration wizard."));
@@ -938,16 +927,39 @@ sorry:
 }
 
-void KPilotInstaller::slotConfigureWizard()
+/* virtual DCOP */ ASYNC KPilotInstaller::configureWizard()
 {
         FUNCTIONSETUP;
+        if ( fAppStatus!=Normal || fConfigureKPilotDialogInUse )
+        {
+                if (fLogWidget)
+                {
+                        fLogWidget->addMessage(i18n("Cannot configure KPilot right now."));
+                }
+                return;
+        }
+        fAppStatus=UIBusy;
+        fConfigureKPilotDialogInUse = true;
 
-        runWizard(getDaemon(),this);
+        if (runWizard(getDaemon(),this))
+        {
+                // Update each installed component.
+                for (fP->list().first();
+                        fP->list().current();
+                        fP->list().next())
+                {
+                        // TODO_RK: update the current component to use the new settings
+//                      fP->list().current()->initialize();
+                }
+        }
+
+        fConfigureKPilotDialogInUse = false;
+        fAppStatus=Normal;
 }
 
-void KPilotInstaller::slotConfigureKPilot()
+/* virtual DCOP */ ASYNC KPilotInstaller::configure()
 {
         FUNCTIONSETUP;
 
-        if (fAppStatus!=Normal)
+        if ( fAppStatus!=Normal || fConfigureKPilotDialogInUse )
         {
                 if (fLogWidget)

--- kdepim/kpilot/kpilot/kpilot.h  #1.54:1.55
@@ -127,4 +127,5 @@ public:
         */
         virtual ASYNC configure();
+        virtual ASYNC configureWizard();
 
 protected:
@@ -167,6 +168,4 @@ private:
 protected slots:
         void quit();
-        void slotConfigureKPilot();
-        void slotConfigureWizard();
         void fileInstalled(int which);
         void slotNewToolbarConfig();

--- kdepim/kpilot/kpilot/kpilotDCOP.h  #1.15:1.16
@@ -62,4 +62,5 @@ k_dcop:
         */
         virtual ASYNC configure() = 0;
+        virtual ASYNC configureWizard() = 0;
 
         /**