Assure that automatically expanding of a folder also works when the new folder has...

[dolphin.git] / src / statusbarspaceinfo.cpp

diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp
index 20266e1a0e7e086e978758313714b81e02dfb6ec..adcd23d7573923612b43165cd3401bb85fe6b91c 100644 (file)
--- a/src/statusbarspaceinfo.cpp
+++ b/src/statusbarspaceinfo.cpp
@@ -20,7 +20,7 @@
 
 #include "statusbarspaceinfo.h"
 
-#include <kdiskfreespace.h>
+#include <KDiskFreeSpaceInfo>
 #include <kmountpoint.h>
 #include <klocale.h>
 #include <kio/job.h>
@@ -30,17 +30,16 @@
 
 StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) :
     KCapacityBar(KCapacityBar::DrawTextInline, parent),
-    m_gettingSize(false),
-    m_foundMountPoint(false)
+    m_kBSize(0),
+    m_timer(0)
 {
     setMaximumWidth(200);
     setMinimumWidth(200); // something to fix on kcapacitybar (ereslibre)
 
-    // Update the space information each 10 seconds. Polling is useful
+    // Use a timer to update the space information. Polling is useful
     // here, as files can be deleted/added outside the scope of Dolphin.
-    QTimer* timer = new QTimer(this);
-    connect(timer, SIGNAL(timeout()), this, SLOT(refresh()));
-    timer->start(10000);
+    m_timer = new QTimer(this);
+    connect(m_timer, SIGNAL(timeout()), this, SLOT(refresh()));
 }
 
 StatusBarSpaceInfo::~StatusBarSpaceInfo()
@@ -53,39 +52,27 @@ void StatusBarSpaceInfo::setUrl(const KUrl& url)
     refresh();
 }
 
-void StatusBarSpaceInfo::slotFoundMountPoint(const QString& mountPoint,
-                                             quint64 kBSize,
-                                             quint64 kBUsed,
-                                             quint64 kBAvailable)
+void StatusBarSpaceInfo::showEvent(QShowEvent* event)
 {
-    Q_UNUSED(mountPoint);
-
-    m_gettingSize = false;
-    m_foundMountPoint = true;
-    const bool valuesChanged = (kBUsed != static_cast<quint64>(value()));
-    if (valuesChanged) {
-        setText(i18nc("@info:status Free disk space", "%1 free", KIO::convertSize(kBAvailable * 1024)));
-        setUpdatesEnabled(false);
-        setValue((kBUsed * 100) / kBSize);
-        setUpdatesEnabled(true);
-        update();
+    KCapacityBar::showEvent(event);
+    if (!event->spontaneous()) {
+        refresh();
+        m_timer->start(10000);
     }
 }
 
-void StatusBarSpaceInfo::slotDiskFreeSpaceDone()
+void StatusBarSpaceInfo::hideEvent(QHideEvent* event)
 {
-    if (m_foundMountPoint) {
-        return;
-    }
-
-    m_gettingSize = false;
-    setText(i18nc("@info:status", "Unknown size"));
-    setValue(0);
-    update();
+    m_timer->stop();
+    KCapacityBar::hideEvent(event);
 }
 
 void StatusBarSpaceInfo::refresh()
 {
+    if (!isVisible()) {
+        return;
+    }
+    
     // KDiskFreeSpace is for local paths only
     if (!m_url.isLocalFile()) {
         setText(i18nc("@info:status", "Unknown size"));
@@ -99,32 +86,26 @@ void StatusBarSpaceInfo::refresh()
         return;
     }
 
-    m_gettingSize = true;
-    m_foundMountPoint = false;
-    KDiskFreeSpace* job = new KDiskFreeSpace(this);
-    connect(job, SIGNAL(foundMountPoint(const QString&,
-                                        quint64,
-                                        quint64,
-                                        quint64)),
-            this, SLOT(slotFoundMountPoint(const QString&,
-                                           quint64,
-                                           quint64,
-                                           quint64)));
-    connect(job, SIGNAL(done()), this, SLOT(slotDiskFreeSpaceDone()));
-
-    job->readDF(mp->mountPoint());
+    KDiskFreeSpaceInfo job = KDiskFreeSpaceInfo::freeSpaceInfo(mp->mountPoint());
+    if (!job.isValid()) {
+        setText(i18nc("@info:status", "Unknown size"));
+        setValue(0);
+        update();
+        return;
+    }
 
-    // refresh() is invoked for each directory change. Usually getting
-    // the size information can be done very fast, so to prevent any
-    // flickering the "Getting size..." indication is only shown if
-    // at least 300 ms have been passed.
-    QTimer::singleShot(300, this, SLOT(showGettingSizeInfo()));
-}
+    KIO::filesize_t kBSize = job.size() / 1024;
+    KIO::filesize_t kBUsed = job.used() / 1024;
 
-void StatusBarSpaceInfo::showGettingSizeInfo()
-{
-    if (m_gettingSize) {
-        setText(i18nc("@info:status", "Getting size..."));
+    const bool valuesChanged = (kBUsed != static_cast<quint64>(value())) || (kBSize != m_kBSize);
+    if (valuesChanged) {
+        setText(i18nc("@info:status Free disk space", "%1 free",
+                KIO::convertSize(job.available())));
+        
+        setUpdatesEnabled(false);
+        m_kBSize = kBSize;
+        setValue(kBSize > 0 ? (kBUsed * 100) / kBSize : 0);
+        setUpdatesEnabled(true);
         update();
     }
 }