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

List:       kde-commits
Subject:    KDE/kdebase/libkonq
From:       David Faure <faure () kde ! org>
Date:       2007-04-10 8:43:14
Message-ID: 1176194594.048486.27232.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 652155 by dfaure:

Was working on a better fix too ;)
Also improve progress info during multirestore job.


 M  +7 -9      konq_operations.cc  
 M  +1 -1      konq_operations.h  


--- trunk/KDE/kdebase/libkonq/konq_operations.cc #652154:652155
@@ -224,8 +224,9 @@
 void KonqOperations::_restoreTrashedItems( const KUrl::List& urls )
 {
     m_method = RESTORE;
-    KonqMultiRestoreJob* job = new KonqMultiRestoreJob( urls, true );
+    KonqMultiRestoreJob* job = new KonqMultiRestoreJob( urls );
     job->ui()->setWindow(parentWidget());
+    KIO::getJobTracker()->registerJob(job);
     connect( job, SIGNAL( result( KJob * ) ),
              SLOT( slotResult( KJob * ) ) );
 }
@@ -759,22 +760,18 @@
 
 ////
 
-KonqMultiRestoreJob::KonqMultiRestoreJob( const KUrl::List& urls, bool showProgressInfo )
-    : KIO::Job(  ),
+KonqMultiRestoreJob::KonqMultiRestoreJob( const KUrl::List& urls )
+    : KIO::Job(),
       m_urls( urls ), m_urlsIterator( m_urls.begin() ),
       m_progress( 0 )
 {
-    if(showProgressInfo)
-       KIO::getJobTracker()->registerJob(this);
-
     QTimer::singleShot(0, this, SLOT(slotStart()));
 }
 
 void KonqMultiRestoreJob::slotStart()
 {
-    // Well, it's not a total in bytes, so this would look weird
-    //if ( m_urlsIterator == m_urls.begin() ) // first time: emit total
-    //    emit totalSize( m_urls.count() );
+    if ( m_urlsIterator == m_urls.begin() ) // first time: emit total
+        setTotalAmount( KJob::Files, m_urls.count() );
 
     if ( m_urlsIterator != m_urls.end() )
     {
@@ -796,6 +793,7 @@
         stream << (int)3 << new_url;
         KIO::Job* job = KIO::special( new_url, packedArgs );
         addSubjob( job );
+        setProcessedAmount(KJob::Files, processedAmount(KJob::Files) + 1);
     }
     else // done!
     {
--- trunk/KDE/kdebase/libkonq/konq_operations.h #652154:652155
@@ -203,7 +203,7 @@
     Q_OBJECT
 
 public:
-    KonqMultiRestoreJob( const KUrl::List& urls, bool showProgressInfo );
+    KonqMultiRestoreJob( const KUrl::List& urls );
 
 protected Q_SLOTS:
     virtual void slotStart();
[prev in list] [next in list] [prev in thread] [next in thread]