From 48ba90887d20526f0af3c824c6453d102ba6e438 Mon Sep 17 00:00:00 2001
From: Carsten Burghardt <burghardt@kde.org>
Date: Sat, 13 Nov 2004 14:20:59 +0000
Subject: [PATCH] Better progress feedback when an imap folder is selected

svn path=/trunk/kdepim/; revision=362683
---
 imapaccountbase.h |  5 +++++
 kmfolderimap.cpp  | 12 ++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/imapaccountbase.h b/imapaccountbase.h
index 0f73beebb..dbef7d601 100644
--- a/imapaccountbase.h
+++ b/imapaccountbase.h
@@ -206,6 +206,11 @@ namespace KMail {
      */
     void processNewMailSingleFolder(KMFolder* folder);
 
+    /**
+     * Return true if we are processing a mailcheck for a single folder
+     */
+    bool checkingSingleFolder() { return mCheckingSingleFolder; }
+
     /**
      * Called when we're completely done checking mail for this account
      * When @p setStatusMsg is true a status msg is shown
diff --git a/kmfolderimap.cpp b/kmfolderimap.cpp
index 5e224e8a1..9b9ba5fec 100644
--- a/kmfolderimap.cpp
+++ b/kmfolderimap.cpp
@@ -781,8 +781,10 @@ void KMFolderImap::checkValidity()
   }
   // otherwise we already are inside a mailcheck
   if ( !mMailCheckProgressItem ) {
+    ProgressItem* parent = ( account()->checkingSingleFolder() ? 0 :
+        account()->mailCheckProgressItem() );
     mMailCheckProgressItem = ProgressManager::createProgressItem(
-              account()->mailCheckProgressItem(),
+              parent,
               "MailCheck" + folder()->prettyURL(),
               folder()->prettyURL(),
               i18n("checking"),
@@ -1033,10 +1035,9 @@ void KMFolderImap::slotListFolderResult(KIO::Job * job)
   if ( mMailCheckProgressItem )
   {
     // next step for the progressitem
-//    mMailCheckProgressItem->setTotalItems( jd.total );
-//    mMailCheckProgressItem->setCompletedItems( 0 );
-//    mMailCheckProgressItem->setProgress( 50 );
-//    mMailCheckProgressItem->updateProgress();
+    mMailCheckProgressItem->setCompletedItems( 0 );
+    mMailCheckProgressItem->setTotalItems( jd.total );
+    mMailCheckProgressItem->setProgress( 0 );
     mMailCheckProgressItem->setStatus( i18n("Retrieving messages") );
   }
 
@@ -1187,7 +1188,6 @@ void KMFolderImap::slotGetMessagesData(KIO::Job * job, const QByteArray & data)
         int delta = exists - count();
         if ( mMailCheckProgressItem ) {
           mMailCheckProgressItem->setTotalItems( delta );
-          mMailCheckProgressItem->setStatus( i18n("Retrieving message list") );
         }
       }
     }