Fix for show_filter_bar action of tools-menu, which is not correctly set (when the...

[dolphin.git] / src / statusbarspaceinfo.cpp

diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp
index c674a387a5c1a96d0bae3e850e9e871286c83016..79a1169e58dc610c6fb08ce77120e384165751a9 100644 (file)
--- a/src/statusbarspaceinfo.cpp
+++ b/src/statusbarspaceinfo.cpp
@@ -29,15 +29,13 @@
 #include <QKeyEvent>
 
 StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) :
 #include <QKeyEvent>
 
 StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) :

-    QProgressBar(parent),
+    KCapacityBar(KCapacityBar::DrawTextInline, parent),

     m_gettingSize(false),
     m_foundMountPoint(false),
     m_gettingSize(false),
     m_foundMountPoint(false),

-    m_text()
+    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,11 +54,6 @@ 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,
 void StatusBarSpaceInfo::slotFoundMountPoint(const QString& mountPoint,
                                              quint64 kBSize,
                                              quint64 kBUsed,


@@ -70,13 +63,12 @@ void StatusBarSpaceInfo::slotFoundMountPoint(const QString& mountPoint,
 
     m_gettingSize = false;
     m_foundMountPoint = true;
 
     m_gettingSize = false;
     m_foundMountPoint = true;

-    const bool valuesChanged = (kBUsed != static_cast<quint64>(value())) ||
-                               (kBSize != static_cast<quint64>(maximum()));
+    const bool valuesChanged = (kBUsed != static_cast<quint64>(value())) || (kBSize != m_kBSize);

     if (valuesChanged) {
     if (valuesChanged) {

-        m_text = i18nc("@info:status Free disk space", "%1 free", KIO::convertSize(kBAvailable * 1024));
+        setText(i18nc("@info:status Free disk space", "%1 free", KIO::convertSize(kBAvailable * 1024)));

         setUpdatesEnabled(false);
         setUpdatesEnabled(false);

-        setMaximum(kBSize);
-        setValue(kBUsed);
+        m_kBSize = kBSize;
+        setValue(kBSize > 0 ? (kBUsed * 100) / kBSize : 0);

         setUpdatesEnabled(true);
         update();
     }
         setUpdatesEnabled(true);
         update();
     }


@@ -89,7 +81,7 @@ void StatusBarSpaceInfo::slotDiskFreeSpaceDone()
     }
 
     m_gettingSize = false;
     }
 
     m_gettingSize = false;

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

     setValue(0);
     update();
 }
     setValue(0);
     update();
 }


@@ -98,7 +90,7 @@ void StatusBarSpaceInfo::refresh()
 {
     // KDiskFreeSpace is for local paths only
     if (!m_url.isLocalFile()) {
 {
     // 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;


@@ -134,8 +126,8 @@ void StatusBarSpaceInfo::refresh()
 void StatusBarSpaceInfo::showGettingSizeInfo()
 {
     if (m_gettingSize) {
 void StatusBarSpaceInfo::showGettingSizeInfo()
 {
     if (m_gettingSize) {

-        m_text = i18nc("@info:status", "Getting size...");
-        setMaximum(0);
+        m_kBSize = 0;
+        setText(i18nc("@info:status", "Getting size..."));

         update();
     }
 }
         update();
     }
 }