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

[Gilles Caulier]

CVS commit by cgilles: 

Fixed missing Pending task provide by Jesper (problem during K3b project creation)
CDArchiving work fine now.
CCMAIL: kde-imaging at kde.org


  M +10 -6     cdarchiving.cpp   1.11
  M +1 -1      cdarchivingdialog.cpp   1.18
  M +2 -1      cdarchivingdialog.h   1.8


--- kdeextragear-libs-1/kipi-plugins/cdarchiving/cdarchiving.cpp  #1.10:1.11
@@ -1441,8 +1441,9 @@ bool CDArchiving::BuildK3bXMLprojectfile
     // Add Selected Albums paths List.
 
-    for( QValueList<KIPI::ImageCollection>::Iterator it = ListAlbums.begin(); it != ListAlbums.end(); ++it ) {
+    for( QValueList<KIPI::ImageCollection>::Iterator it = ListAlbums.begin(); it != ListAlbums.end(); ++it ) 
+        {
         m_progressDlg->setLabelText( i18n("Added Album\n'%1'\ninto project...").arg( (*it).name()) );
         kapp->processEvents();
-        AddFolderTreeToK3bXMLProjectFile( "", &stream); // PENDING(blackie)  I seriously doubt this is correct!
+        AddFolderTreeToK3bXMLProjectFile( (*it).path().path(), &stream); 
         m_progressDlg->setProgress( ++progressValue );
         kapp->processEvents();
@@ -1482,5 +1483,6 @@ bool CDArchiving::AddFolderTreeToK3bXMLP
 
    *stream << Temp;
-   //qDebug("Directory: %s", dir->dirName().latin1 ());
+   
+   kdDebug( 51000 ) << "Directory: " << dir->dirName().latin1 () << endl;
 
    const QFileInfoList* fileinfolist = dir->entryInfoList();
@@ -1500,5 +1502,6 @@ bool CDArchiving::AddFolderTreeToK3bXMLP
      if( fi_files->isFile() )
           {
-          //qDebug("   Filename: %s", fi_files->fileName().latin1 ());
+          kdDebug( 51000 ) << "   Filename: " << fi_files->fileName().latin1() << endl;
+          
           Temp = "<file name=\""
                  + EscapeSgmlText(QTextCodec::codecForLocale(), fi_files->fileName(), true, true)
@@ -1526,5 +1529,6 @@ bool CDArchiving::AddFolderTreeToK3bXMLP
      if ( fi_folders->isDir() )
           {
-          //qDebug("   folder: %s", fi_folders->fileName().latin1 ());
+          kdDebug( 51000 ) << "   folder: " << fi_folders->fileName().latin1() << endl;
+          
           AddFolderTreeToK3bXMLProjectFile ( fi_folders->absFilePath(), stream );
           }

--- kdeextragear-libs-1/kipi-plugins/cdarchiving/cdarchivingdialog.cpp  #1.17:1.18
@@ -717,5 +717,5 @@ void CDArchivingDialog::albumSelected( Q
 /////////////////////////////////////////////////////////////////////////////////////////////
 
-void CDArchivingDialog::slotGotPreview(const KFilePreview* /*url*/, const QPixmap &pixmap)
+void CDArchivingDialog::slotGotPreview(const KFileItem*, const QPixmap &pixmap)
 {
     m_albumPreview->setPixmap(pixmap);

--- kdeextragear-libs-1/kipi-plugins/cdarchiving/cdarchivingdialog.h  #1.7:1.8
@@ -44,4 +44,5 @@ class QSpinBox;
 class QListView;
 
+class KFileItem;
 class KSqueezedTextLabel;
 class KURLRequester;
@@ -141,5 +142,5 @@ class CDArchivingDialog : public KDialog
   void slotbuttonSelectNone(void);
   void UrlChanged(const QString &url );
-  void slotGotPreview(const KFilePreview*, const QPixmap &pixmap);
+  void slotGotPreview(const KFileItem*, const QPixmap &pixmap);
 
  private: