X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/812994644982747d88fc34d6bfc53384bea36144..44d938cf4b421e6c8d39a069809ffbf807f1e02e:/src/statusbarspaceinfo.cpp

diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp
index 1d1ca0240..555cfb891 100644
--- a/src/statusbarspaceinfo.cpp
+++ b/src/statusbarspaceinfo.cpp
@@ -31,6 +31,7 @@
 StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) :
     QProgressBar(parent),
     m_gettingSize(false),
+    m_foundMountPoint(false),
     m_text()
 {
     setMinimum(0);
@@ -69,19 +70,35 @@ void StatusBarSpaceInfo::slotFoundMountPoint(const QString& mountPoint,
     Q_UNUSED(mountPoint);
 
     m_gettingSize = false;
+    m_foundMountPoint = true;
     const bool valuesChanged = (kBUsed != static_cast<quint64>(value())) ||
                                (kBAvailable != static_cast<quint64>(maximum()));
     if (valuesChanged) {
-        m_text = i18nc("@info:status", "%1 free", KIO::convertSizeFromKiB(kBAvailable));
-        setMaximum(kBAvailable);
+        m_text = i18nc("@info:status Free disk space", "%1 free", KIO::convertSize(kBAvailable * 1024));
+        setMaximum(kBSize);
         setValue(kBUsed);
     }
 }
 
+void StatusBarSpaceInfo::slotDiskFreeSpaceDone()
+{
+    if (m_foundMountPoint) {
+        return;
+    }
+
+    m_gettingSize = false;
+    m_text = i18nc("@info:status", "Unknown size");
+    setMinimum(0);
+    setMaximum(0);
+    setValue(0);
+}
+
 void StatusBarSpaceInfo::refresh()
 {
     // KDiskFreeSpace is for local paths only
     if (!m_url.isLocalFile()) {
+        m_text = i18nc("@info:status", "Unknown size");
+        update();
         return;
     }
 
@@ -91,6 +108,7 @@ void StatusBarSpaceInfo::refresh()
     }
 
     m_gettingSize = true;
+    m_foundMountPoint = false;
     KDiskFreeSpace* job = new KDiskFreeSpace(this);
     connect(job, SIGNAL(foundMountPoint(const QString&,
                                         quint64,
@@ -100,6 +118,7 @@ void StatusBarSpaceInfo::refresh()
                                            quint64,
                                            quint64,
                                            quint64)));
+    connect(job, SIGNAL(done()), this, SLOT(slotDiskFreeSpaceDone()));
 
     job->readDF(mp->mountPoint());
 
@@ -114,6 +133,7 @@ void StatusBarSpaceInfo::showGettingSizeInfo()
 {
     if (m_gettingSize) {
         m_text = i18nc("@info:status", "Getting size...");
+        update();
         setMinimum(0);
         setMaximum(0);
     }