Fix small problems with enums. Sort by type works like a charm :)

[dolphin.git] / src / statusbarspaceinfo.cpp

diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp
index 09976372ab7c569bb2422f462eb79529668d66ea..62b46700ab15d90554a11a53044ce467b2d74a0b 100644 (file)
--- a/src/statusbarspaceinfo.cpp
+++ b/src/statusbarspaceinfo.cpp
@@ -22,10 +22,11 @@
 
 #include <QtCore/QTimer>
 #include <QtGui/QPainter>
-#include <QtGui/QPaintEvent>
+#include <QtGui/QKeyEvent>
 
 #include <kglobalsettings.h>
-#include <kdiskfreesp.h>
+#include <kdiskfreespace.h>
+#include <kmountpoint.h>
 #include <klocale.h>
 #include <kio/job.h>
 
@@ -37,6 +38,10 @@ StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) :
 {
     setMinimumWidth(200);
 
+    QPalette palette;
+    palette.setColor(QPalette::Background, Qt::transparent);
+    setPalette(palette);
+
     // Update the space information each 10 seconds. Polling is useful
     // here, as files can be deleted/added outside the scope of Dolphin.
     QTimer* timer = new QTimer(this);
@@ -66,11 +71,8 @@ void StatusBarSpaceInfo::paintEvent(QPaintEvent* /* event */)
 
     const int widthDec = 3;  // visual decrement for the available width
 
-    const QColor c1 = palette().brush(QPalette::Background).color();
-    const QColor c2 = KGlobalSettings::buttonTextColor();
-    const QColor frameColor((c1.red()   + c2.red())   / 2,
-                            (c1.green() + c2.green()) / 2,
-                            (c1.blue()  + c2.blue())  / 2);
+    QColor frameColor = palette().brush(QPalette::Background).color();
+    frameColor.setAlpha(128);
     painter.setPen(frameColor);
 
     const QColor backgrColor = KGlobalSettings::baseColor();
@@ -109,9 +111,9 @@ void StatusBarSpaceInfo::paintEvent(QPaintEvent* /* event */)
 }
 
 
-void StatusBarSpaceInfo::slotFoundMountPoint(const unsigned long& kBSize,
-                                             const unsigned long& kBUsed,
-                                             const unsigned long& kBAvailable,
+void StatusBarSpaceInfo::slotFoundMountPoint(const quint64& kBSize,
+                                             const quint64& kBUsed,
+                                             const quint64& kBAvailable,
                                              const QString& mountPoint)
 {
     Q_UNUSED(kBUsed);
@@ -121,15 +123,6 @@ void StatusBarSpaceInfo::slotFoundMountPoint(const unsigned long& kBSize,
     m_kBSize = kBSize;
     m_kBAvailable = kBAvailable;
 
-    // Bypass a the issue (?) of KDiskFreeSp that for protocols like
-    // FTP, SMB the size of root partition is returned.
-    // TODO: check whether KDiskFreeSp is buggy or Dolphin uses it in a wrong way
-    const QString protocol(m_url.protocol());
-    if (!protocol.isEmpty() && (protocol != "file")) {
-        m_kBSize = 0;
-        m_kBAvailable = 0;
-    }
-
     update();
 }
 
@@ -141,25 +134,31 @@ void StatusBarSpaceInfo::showResult()
 
 void StatusBarSpaceInfo::refresh()
 {
-    m_gettingSize = true;
     m_kBSize = 0;
     m_kBAvailable = 0;
 
-    const QString mountPoint(KIO::findPathMountPoint(m_url.path()));
+    // KDiskFreeSpace is for local paths only
+    if (!m_url.isLocalFile())
+        return;
 
-    KDiskFreeSp* job = new KDiskFreeSp(this);
-    connect(job, SIGNAL(foundMountPoint(const unsigned long&,
-                                        const unsigned long&,
-                                        const unsigned long&,
+    m_gettingSize = true;
+    KMountPoint::Ptr mp = KMountPoint::currentMountPoints().findByPath(m_url.path());
+    if (!mp)
+        return;
+
+    KDiskFreeSpace* job = new KDiskFreeSpace(this);
+    connect(job, SIGNAL(foundMountPoint(const quint64&,
+                                        const quint64&,
+                                        const quint64&,
                                         const QString&)),
-            this, SLOT(slotFoundMountPoint(const unsigned long&,
-                                           const unsigned long&,
-                                           const unsigned long&,
+            this, SLOT(slotFoundMountPoint(const quint64&,
+                                           const quint64&,
+                                           const quint64&,
                                            const QString&)));
     connect(job, SIGNAL(done()),
             this, SLOT(showResult()));
 
-    job->readDF(mountPoint);
+    job->readDF(mp->mountPoint());
 }
 
 QColor StatusBarSpaceInfo::progressColor(const QColor& bgColor) const