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 9bc091b7a03ba80cf33028ed8a8e821634c76e36..c674a387a5c1a96d0bae3e850e9e871286c83016 100644 (file)
--- a/src/statusbarspaceinfo.cpp
+++ b/src/statusbarspaceinfo.cpp
@@ -30,8 +30,13 @@
 
 StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) :
     QProgressBar(parent),
+    m_gettingSize(false),
+    m_foundMountPoint(false),
     m_text()
 {
+    setMinimum(0);
+    setMaximum(0);
+
     setMaximumWidth(200);
 
     // Update the space information each 10 seconds. Polling is useful
@@ -49,7 +54,6 @@ void StatusBarSpaceInfo::setUrl(const KUrl& url)
 {
     m_url = url;
     refresh();
-    QTimer::singleShot(300, this, SLOT(update()));
 }
 
 QString StatusBarSpaceInfo::text() const
@@ -62,32 +66,51 @@ void StatusBarSpaceInfo::slotFoundMountPoint(const QString& mountPoint,
                                              quint64 kBUsed,
                                              quint64 kBAvailable)
 {
-    Q_UNUSED(kBUsed);
     Q_UNUSED(mountPoint);
 
-    m_text = i18nc("@info:status", "%1 free", KIO::convertSizeFromKiB(kBAvailable));
+    m_gettingSize = false;
+    m_foundMountPoint = true;
+    const bool valuesChanged = (kBUsed != static_cast<quint64>(value())) ||
+                               (kBSize != static_cast<quint64>(maximum()));
+    if (valuesChanged) {
+        m_text = i18nc("@info:status Free disk space", "%1 free", KIO::convertSize(kBAvailable * 1024));
+        setUpdatesEnabled(false);
+        setMaximum(kBSize);
+        setValue(kBUsed);
+        setUpdatesEnabled(true);
+        update();
+    }
+}
 
-    setMinimum(0);
-    setMaximum(kBAvailable);
-    setValue(kBUsed);
+void StatusBarSpaceInfo::slotDiskFreeSpaceDone()
+{
+    if (m_foundMountPoint) {
+        return;
+    }
+
+    m_gettingSize = false;
+    m_text = i18nc("@info:status", "Unknown size");
+    setValue(0);
+    update();
 }
 
 void StatusBarSpaceInfo::refresh()
 {
     // KDiskFreeSpace is for local paths only
     if (!m_url.isLocalFile()) {
+        m_text = 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;
     }
 
+    m_gettingSize = true;
+    m_foundMountPoint = false;
     KDiskFreeSpace* job = new KDiskFreeSpace(this);
     connect(job, SIGNAL(foundMountPoint(const QString&,
                                         quint64,
@@ -97,8 +120,24 @@ void StatusBarSpaceInfo::refresh()
                                            quint64,
                                            quint64,
                                            quint64)));
+    connect(job, SIGNAL(done()), this, SLOT(slotDiskFreeSpaceDone()));
 
     job->readDF(mp->mountPoint());
+
+    // 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()));
+}
+
+void StatusBarSpaceInfo::showGettingSizeInfo()
+{
+    if (m_gettingSize) {
+        m_text = i18nc("@info:status", "Getting size...");
+        setMaximum(0);
+        update();
+    }
 }
 
 #include "statusbarspaceinfo.moc"