[Kde-imaging] kdeextragear-libs-1/kipi-plugins/cdarchiving

[Gilles Caulier]

CVS commit by cgilles: 

Fixed missing post envent when K3b is done.
Fixed disconnected signal when k3b is done.
Cdarchiving using multithreading capabilities done !
CCMAIL: kde-imaging at kde.org


  M +1 -1      batchprogressdialog.cpp   1.3
  M +7 -11     cdarchiving.cpp   1.15
  M +5 -2      plugin_cdarchiving.cpp   1.14


--- kdeextragear-libs-1/kipi-plugins/cdarchiving/batchprogressdialog.cpp  #1.2:1.3
@@ -56,5 +56,5 @@ namespace KIPICDArchivingPlugin
 BatchProgressDialog::BatchProgressDialog( QWidget *parent )
                    : KDialogBase( KDialogBase::Plain, i18n("Preparing archive to CD"), Cancel,
-                                  Cancel, parent, "ArchiveToCDActionsDialog", true, true )
+                                  Cancel, parent, "ArchiveToCDActionsDialog", true )
 {
     QWidget* box = plainPage();

--- kdeextragear-libs-1/kipi-plugins/cdarchiving/cdarchiving.cpp  #1.14:1.15
@@ -407,4 +407,11 @@ void CDArchiving::slotK3bDone(KProcess*)
     kdDebug(51000) << "K3b is done !!! Removing temporary folder..." << endl;
 
+    KIPICDArchivingPlugin::EventData *d = new KIPICDArchivingPlugin::EventData;
+    d->action = KIPICDArchivingPlugin::Progress;
+    d->starting = true;
+    d->success = true;
+    d->errString = i18n("K3b is done !!! Removing temporary folder...");
+    QApplication::postEvent(m_parent, new QCustomEvent(QEvent::User, d));
+    
     if (DeleteDir(m_tmpFolder) == false)
         KMessageBox::error(kapp->activeWindow(), i18n("Cannot remove temporary folder '%1' !").arg(m_tmpFolder));
@@ -845,9 +852,4 @@ void CDArchiving::createBody(QTextStream
             stream << "</td>" << endl;
 
-            // TODO progress info dispatch !!!
-            
-            /*m_progressDlg->setTotalSteps( numOfImages );
-            m_progressDlg->setProgress( imgIndex );*/
-            
             ++imgIndex;
             }
@@ -1540,8 +1540,4 @@ bool CDArchiving::BuildK3bXMLprojectfile
        AddFolderTreeToK3bXMLProjectFile(HTMLinterfaceFolder, &stream);
 
-    // TODO : Added progress dispatch !
-    
-    //m_progressDlg->setProgress( ++progressValue );
-
     // Add Selected Albums paths List.
 

--- kdeextragear-libs-1/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp  #1.13:1.14
@@ -124,5 +124,5 @@ void Plugin_CDArchiving::customEvent(QCu
         
         connect(m_progressDlg, SIGNAL(cancelClicked()),
-                SLOT(slotCancel()));
+                this, SLOT(slotCancel()));
 
         m_current = 0;
@@ -270,4 +270,7 @@ void Plugin_CDArchiving::customEvent(QCu
            m_progressDlg->setButtonCancel( KStdGuiItem::close() );
            
+           disconnect(m_progressDlg, SIGNAL(cancelClicked()),
+                      this, SLOT(slotCancel()));
+                
            // Invoke K3b program.