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

List:       kde-commits
Subject:    extragear/graphics/kphotoalbum/ImportExport
From:       Laurent Montel <montel () kde ! org>
Date:       2007-10-11 7:45:56
Message-ID: 1192088756.564732.14574.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 724019 by mlaurent:

Compile
But "MD5Sum::Utilities" doesn't exist in this branch. Need to fix it


 M  +13 -11    Import.cpp  
 M  +2 -2      Import.h  


--- trunk/extragear/graphics/kphotoalbum/ImportExport/Import.cpp #724018:724019
@@ -25,6 +25,7 @@
 #include <QPixmap>
 #include <QVBoxLayout>
 #include <QCloseEvent>
+#include <QProgressDialog>
 #include <klocale.h>
 #include <qpushbutton.h>
 #include <qdom.h>
@@ -470,8 +471,8 @@
     DB::ImageInfoList images = selectedImages();
 
     _totalCopied = 0;
-    _progress = new QProgressDialog( i18n("Copying Images"), i18n("&Cancel"), 2 * \
                images.count(), 0, "_progress", true );
-    _progress->setProgress( 0 );
+    _progress = new QProgressDialog( i18n("Copying Images"), i18n("&Cancel"), 0,2 * \
images.count(), this ); +    _progress->setValue( 0 );
     _progress->show();
 
     for( DB::ImageInfoListConstIterator it = images.constBegin(); it != \
images.constEnd(); ++it ) { @@ -496,7 +497,7 @@
         out.close();
 
         qApp->processEvents();
-        _progress->setProgress( ++_totalCopied );
+        _progress->setValue( ++_totalCopied );
         if ( _progress->wasCanceled() ) {
             delete _progress;
             _progress = 0;
@@ -510,8 +511,8 @@
 {
     _pendingCopies = selectedImages();
     _totalCopied = 0;
-    _progress = new Q3ProgressDialog( i18n("Copying Images"), i18n("&Cancel"), 2 * \
                _pendingCopies.count(), 0, "_progress", true );
-    _progress->setProgress( 0 );
+    _progress = new QProgressDialog( i18n("Copying Images"), i18n("&Cancel"), 0,2 * \
_pendingCopies.count(), this ); +    _progress->setValue( 0 );
     _progress->show();
     connect( _progress, SIGNAL( canceled() ), this, SLOT( stopCopyingImages() ) );
     copyNextFromExternal();
@@ -541,7 +542,7 @@
             succeeded = true;
             break;
         } else
-            tried << src.prettyURL();
+            tried << src.prettyUrl();
     }
 
     if (!succeeded)
@@ -553,7 +554,7 @@
     int result = _reportUnreadableFiles ?
         KMessageBox::warningYesNoCancelList( _progress,
             i18n("Can't copy file from any of the following locations:"),
-            files, QString::null, KStdGuiItem::cont(), KGuiItem( i18n("Continue \
without Asking") )) : KMessageBox::Yes; +            files, QString::null, \
KStandardGuiItem::cont(), KGuiItem( i18n("Continue without Asking") )) : \
KMessageBox::Yes;  
     switch (result) {
         case KMessageBox::Cancel:
@@ -590,7 +591,7 @@
         delete _progress;
     }
     else {
-        _progress->setProgress( ++_totalCopied );
+        _progress->setValue( ++_totalCopied );
         copyNextFromExternal();
     }
 }
@@ -632,7 +633,8 @@
         newInfo->setDescription( info->description() );
         newInfo->setDate( info->date() );
         newInfo->rotate( info->angle() );
-        newInfo->setMD5Sum( Utilities::MD5Sum( newInfo->fileName(false) ) );
+        //TODO fixme
+        //newInfo->setMD5Sum( Utilities::MD5Sum( newInfo->fileName(false) ) );
         DB::ImageInfoList list;
         list.append(newInfo);
         DB::ImageDB::instance()->addImages( list );
@@ -658,8 +660,8 @@
             }
         }
 
-        _progress->setProgress( ++_totalCopied );
-        if ( _progress->wasCancelled() )
+        _progress->setValue( ++_totalCopied );
+        if ( _progress->wasCanceled() )
             break;
     }
     Browser::BrowserWidget::instance()->home();
--- trunk/extragear/graphics/kphotoalbum/ImportExport/Import.h #724018:724019
@@ -28,11 +28,11 @@
 #include <KAssistantDialog>
 
 class KTemporaryFile;
-class Q3ProgressDialog;
 class QCheckBox;
 class KArchiveDirectory;
 class KZip;
 class KLineEdit;
+class QProgressDialog;
 
 namespace DB
 {
@@ -123,7 +123,7 @@
     bool _finishedPressed;
     int _totalCopied;
     DB::ImageInfoList _pendingCopies;
-    Q3ProgressDialog* _progress;
+    QProgressDialog* _progress;
     KIO::FileCopyJob* _job;
     bool _hasFilled;
     QString _baseUrl;


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