1) Make sure that size qprogressbar is really updated after each change

[dolphin.git] / src / statusbarspaceinfo.cpp

diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp
index d30e995a2d04901944f4ec1033b0cac58d407b60..c674a387a5c1a96d0bae3e850e9e871286c83016 100644 (file)
--- a/src/statusbarspaceinfo.cpp
+++ b/src/statusbarspaceinfo.cpp
@@ -66,29 +66,32 @@ void StatusBarSpaceInfo::slotFoundMountPoint(const QString& mountPoint,
                                              quint64 kBUsed,
                                              quint64 kBAvailable)
 {
-    Q_UNUSED(kBSize);
     Q_UNUSED(mountPoint);
 
     m_gettingSize = false;
     m_foundMountPoint = true;
     const bool valuesChanged = (kBUsed != static_cast<quint64>(value())) ||
-                               (kBAvailable != static_cast<quint64>(maximum()));
+                               (kBSize != static_cast<quint64>(maximum()));
     if (valuesChanged) {
-        m_text = i18nc("@info:status Free disk space", "%1 free", KIO::convertSize(kBAvailable*1000));
+        m_text = i18nc("@info:status Free disk space", "%1 free", KIO::convertSize(kBAvailable * 1024));
+        setUpdatesEnabled(false);
         setMaximum(kBSize);
         setValue(kBUsed);
+        setUpdatesEnabled(true);
+        update();
     }
 }
 
-void StatusBarSpaceInfo::slotKDFSDone()
+void StatusBarSpaceInfo::slotDiskFreeSpaceDone()
 {
-    if( m_foundMountPoint )
+    if (m_foundMountPoint) {
         return;
+    }
+
     m_gettingSize = false;
-    m_text = i18n("Free disk space could not be determined");
-    setMinimum(0);
-    setMaximum(0);
+    m_text = i18nc("@info:status", "Unknown size");
     setValue(0);
+    update();
 }
 
 void StatusBarSpaceInfo::refresh()
@@ -96,6 +99,7 @@ void StatusBarSpaceInfo::refresh()
     // KDiskFreeSpace is for local paths only
     if (!m_url.isLocalFile()) {
         m_text = i18nc("@info:status", "Unknown size");
+        setValue(0);
         update();
         return;
     }
@@ -116,7 +120,7 @@ void StatusBarSpaceInfo::refresh()
                                            quint64,
                                            quint64,
                                            quint64)));
-    connect(job, SIGNAL(done()), this, SLOT(slotKDFSDone()));
+    connect(job, SIGNAL(done()), this, SLOT(slotDiskFreeSpaceDone()));
 
     job->readDF(mp->mountPoint());
 
@@ -131,9 +135,8 @@ void StatusBarSpaceInfo::showGettingSizeInfo()
 {
     if (m_gettingSize) {
         m_text = i18nc("@info:status", "Getting size...");
-        update();
-        setMinimum(0);
         setMaximum(0);
+        update();
     }
 }