X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/d059b705a9b50572537cb938b3f593de0d305f9a..73f095cc5ebe64aeec6ec1ffaa9878f5ebc1fff4:/src/statusbarspaceinfo.cpp

diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp
index 9bc091b7a..a311902f7 100644
--- 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>
@@ -29,10 +29,11 @@
 #include <QKeyEvent>
 
 StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) :
-    QProgressBar(parent),
-    m_text()
+    KCapacityBar(KCapacityBar::DrawTextInline, parent),
+    m_kBSize(0)
 {
     setMaximumWidth(200);
+    setMinimumWidth(200); // something to fix on kcapacitybar (ereslibre)
 
     // Update the space information each 10 seconds. Polling is useful
     // here, as files can be deleted/added outside the scope of Dolphin.
@@ -49,56 +50,45 @@ void StatusBarSpaceInfo::setUrl(const KUrl& url)
 {
     m_url = url;
     refresh();
-    QTimer::singleShot(300, this, SLOT(update()));
-}
-
-QString StatusBarSpaceInfo::text() const
-{
-    return m_text;
-}
-
-void StatusBarSpaceInfo::slotFoundMountPoint(const QString& mountPoint,
-                                             quint64 kBSize,
-                                             quint64 kBUsed,
-                                             quint64 kBAvailable)
-{
-    Q_UNUSED(kBUsed);
-    Q_UNUSED(mountPoint);
-
-    m_text = i18nc("@info:status", "%1 free", KIO::convertSizeFromKiB(kBAvailable));
-
-    setMinimum(0);
-    setMaximum(kBAvailable);
-    setValue(kBUsed);
 }
 
 void StatusBarSpaceInfo::refresh()
 {
     // KDiskFreeSpace is for local paths only
     if (!m_url.isLocalFile()) {
+        setText(i18nc("@info:status", "Unknown size"));
+        setValue(0);
+        update();
         return;
     }
 
-    m_text = i18nc("@info:status", "Getting size...");
-    setMinimum(0);
-    setMaximum(0);
-
     KMountPoint::Ptr mp = KMountPoint::currentMountPoints().findByPath(m_url.path());
     if (!mp) {
         return;
     }
 
-    KDiskFreeSpace* job = new KDiskFreeSpace(this);
-    connect(job, SIGNAL(foundMountPoint(const QString&,
-                                        quint64,
-                                        quint64,
-                                        quint64)),
-            this, SLOT(slotFoundMountPoint(const QString&,
-                                           quint64,
-                                           quint64,
-                                           quint64)));
+    KDiskFreeSpaceInfo job = KDiskFreeSpaceInfo::freeSpaceInfo(mp->mountPoint());
+    if (!job.isValid()) {
+        setText(i18nc("@info:status", "Unknown size"));
+        setValue(0);
+        update();
+        return;
+    }
 
-    job->readDF(mp->mountPoint());
+    KIO::filesize_t kBSize = job.size() / 1024;
+    KIO::filesize_t kBUsed = job.used() / 1024;
+
+    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();
+    }
 }
 
 #include "statusbarspaceinfo.moc"