The else path is never reached -> removed it (thanks to Simon St James for the hint)

[dolphin.git] / src / statusbarspaceinfo.cpp

diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp
index c674a387a5c1a96d0bae3e850e9e871286c83016..a311902f77c76c907541581412eda95bde7c3874 100644 (file)
--- a/src/statusbarspaceinfo.cpp
+++ b/src/statusbarspaceinfo.cpp
@@ -20,7 +20,7 @@
 
 #include "statusbarspaceinfo.h"
 
 
 #include "statusbarspaceinfo.h"
 

-#include <kdiskfreespace.h>
+#include <KDiskFreeSpaceInfo>

 #include <kmountpoint.h>
 #include <klocale.h>
 #include <kio/job.h>
 #include <kmountpoint.h>
 #include <klocale.h>
 #include <kio/job.h>


@@ -29,15 +29,11 @@
 #include <QKeyEvent>
 
 StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) :
 #include <QKeyEvent>
 
 StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) :

-    QProgressBar(parent),
-    m_gettingSize(false),
-    m_foundMountPoint(false),
-    m_text()
+    KCapacityBar(KCapacityBar::DrawTextInline, parent),
+    m_kBSize(0)

 {
 {

-    setMinimum(0);
-    setMaximum(0);
-

     setMaximumWidth(200);
     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.
 
     // Update the space information each 10 seconds. Polling is useful
     // here, as files can be deleted/added outside the scope of Dolphin.


@@ -56,49 +52,11 @@ void StatusBarSpaceInfo::setUrl(const KUrl& url)
     refresh();
 }
 
     refresh();
 }
 

-QString StatusBarSpaceInfo::text() const
-{
-    return m_text;
-}
-
-void StatusBarSpaceInfo::slotFoundMountPoint(const QString& mountPoint,
-                                             quint64 kBSize,
-                                             quint64 kBUsed,
-                                             quint64 kBAvailable)
-{
-    Q_UNUSED(mountPoint);
-
-    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();
-    }
-}
-
-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()) {
 void StatusBarSpaceInfo::refresh()
 {
     // KDiskFreeSpace is for local paths only
     if (!m_url.isLocalFile()) {

-        m_text = i18nc("@info:status", "Unknown size");
+        setText(i18nc("@info:status", "Unknown size"));

         setValue(0);
         update();
         return;
         setValue(0);
         update();
         return;


@@ -109,33 +67,26 @@ void StatusBarSpaceInfo::refresh()
         return;
     }
 
         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) {
-        m_text = i18nc("@info:status", "Getting size...");
-        setMaximum(0);
+    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();
     }
 }
         update();
     }
 }