Status bar: Hide the space free bar when size is unknown

Summary:
BUG: 420027
BUG: 422226
FIXED-IN: 20.08

Test Plan: {F8312398}

Reviewers: #dolphin, ngraham, broulik, #vdg, elvisangelaccio

Reviewed By: #dolphin, ngraham, #vdg, elvisangelaccio

Subscribers: elvisangelaccio, kfm-devel

Tags: #dolphin

Differential Revision: https://phabricator.kde.org/D29213

diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp
index a7585bed023632e3dadaa39c1e96e0369f0f2c7b..6cd76bb60445f89c211d4fe8f1477ced2ec716b9 100644 (file)
--- a/src/statusbar/dolphinstatusbar.cpp
+++ b/src/statusbar/dolphinstatusbar.cpp
@@ -229,7 +229,9 @@ QString DolphinStatusBar::defaultText() const
 
 void DolphinStatusBar::setUrl(const QUrl& url)
 {
 
 void DolphinStatusBar::setUrl(const QUrl& url)
 {

-    m_spaceInfo->setUrl(url);
+    if (GeneralSettings::showSpaceInfo()) {
+        m_spaceInfo->setUrl(url);
+    }

 }
 
 QUrl DolphinStatusBar::url() const
 }
 
 QUrl DolphinStatusBar::url() const


@@ -332,7 +334,7 @@ void DolphinStatusBar::setExtensionsVisible(bool visible)
         showSpaceInfo = GeneralSettings::showSpaceInfo();
         showZoomSlider = GeneralSettings::showZoomSlider();
     }
         showSpaceInfo = GeneralSettings::showSpaceInfo();
         showZoomSlider = GeneralSettings::showZoomSlider();
     }

-    m_spaceInfo->setVisible(showSpaceInfo);
+    m_spaceInfo->setShown(showSpaceInfo);

     m_zoomSlider->setVisible(showZoomSlider);
 }
 
     m_zoomSlider->setVisible(showZoomSlider);
 }
 

diff --git a/src/statusbar/spaceinfoobserver.cpp b/src/statusbar/spaceinfoobserver.cpp
index 692eba7e7a781d52aa5e59acf13426c3cb951cf8..0d8f5f2fe73f2e41d152891534c4439a8fe7ee1e 100644 (file)
--- a/src/statusbar/spaceinfoobserver.cpp
+++ b/src/statusbar/spaceinfoobserver.cpp
@@ -24,6 +24,7 @@
 SpaceInfoObserver::SpaceInfoObserver(const QUrl& url, QObject* parent) :
     QObject(parent),
     m_mountPointObserver(nullptr),
 SpaceInfoObserver::SpaceInfoObserver(const QUrl& url, QObject* parent) :
     QObject(parent),
     m_mountPointObserver(nullptr),

+    m_hasData(false),

     m_dataSize(0),
     m_dataAvailable(0)
 {
     m_dataSize(0),
     m_dataAvailable(0)
 {


@@ -81,7 +82,8 @@ void SpaceInfoObserver::update()
 void SpaceInfoObserver::spaceInfoChanged(quint64 size, quint64 available)
 {
     // Make sure that the size has actually changed
 void SpaceInfoObserver::spaceInfoChanged(quint64 size, quint64 available)
 {
     // Make sure that the size has actually changed

-    if (m_dataSize != size || m_dataAvailable != available) {
+    if (m_dataSize != size || m_dataAvailable != available || !m_hasData) {
+        m_hasData = true;

         m_dataSize = size;
         m_dataAvailable = available;
 
         m_dataSize = size;
         m_dataAvailable = available;
 

diff --git a/src/statusbar/spaceinfoobserver.h b/src/statusbar/spaceinfoobserver.h
index 93f4c8c9146b6122be489264c58d7e04907b8111..67dbf15ec4801f472e0a23e307280565725f1f20 100644 (file)
--- a/src/statusbar/spaceinfoobserver.h
+++ b/src/statusbar/spaceinfoobserver.h
@@ -55,6 +55,7 @@ private slots:
 private:
     MountPointObserver* m_mountPointObserver;
 
 private:
     MountPointObserver* m_mountPointObserver;
 

+    bool    m_hasData;

     quint64 m_dataSize;
     quint64 m_dataAvailable;
 };
     quint64 m_dataSize;
     quint64 m_dataAvailable;
 };

diff --git a/src/statusbar/statusbarspaceinfo.cpp b/src/statusbar/statusbarspaceinfo.cpp
index 3ac87925fcc3f4121018920f8becdfb3c1fa8751..acffcf69dba126a8cbf423ad708f74be111cbe8d 100644 (file)
--- a/src/statusbar/statusbarspaceinfo.cpp
+++ b/src/statusbar/statusbarspaceinfo.cpp
@@ -38,12 +38,23 @@ StatusBarSpaceInfo::~StatusBarSpaceInfo()
 {
 }
 
 {
 }
 

+void StatusBarSpaceInfo::setShown(bool shown)
+{
+    m_shown = shown;
+    if (!m_shown) {
+        hide();
+        m_ready = false;
+    }
+}
+

 void StatusBarSpaceInfo::setUrl(const QUrl& url)
 {
     if (m_url != url) {
         m_url = url;
 void StatusBarSpaceInfo::setUrl(const QUrl& url)
 {
     if (m_url != url) {
         m_url = url;

+        m_ready = false;

         if (m_observer) {
         if (m_observer) {

-            m_observer->setUrl(url);
+            m_observer.reset(new SpaceInfoObserver(m_url, this));
+            connect(m_observer.data(), &SpaceInfoObserver::valuesChanged, this, &StatusBarSpaceInfo::slotValuesChanged);

         }
     }
 }
         }
     }
 }


@@ -62,15 +73,24 @@ void StatusBarSpaceInfo::update()
 
 void StatusBarSpaceInfo::showEvent(QShowEvent* event)
 {
 
 void StatusBarSpaceInfo::showEvent(QShowEvent* event)
 {

-    KCapacityBar::showEvent(event);
-    m_observer.reset(new SpaceInfoObserver(m_url, this));
-    slotValuesChanged();
-    connect(m_observer.data(), &SpaceInfoObserver::valuesChanged, this, &StatusBarSpaceInfo::slotValuesChanged);
+    if (m_shown) {
+        if (m_ready) {
+            KCapacityBar::showEvent(event);
+        }
+
+        if (m_observer.isNull()) {
+            m_observer.reset(new SpaceInfoObserver(m_url, this));
+            connect(m_observer.data(), &SpaceInfoObserver::valuesChanged, this, &StatusBarSpaceInfo::slotValuesChanged);
+        }
+    }

 }
 
 void StatusBarSpaceInfo::hideEvent(QHideEvent* event)
 {
 }
 
 void StatusBarSpaceInfo::hideEvent(QHideEvent* event)
 {

-    m_observer.reset();
+    if (m_ready) {
+        m_observer.reset();
+        m_ready = false;
+    }

     KCapacityBar::hideEvent(event);
 }
 
     KCapacityBar::hideEvent(event);
 }
 


@@ -95,19 +115,26 @@ void StatusBarSpaceInfo::slotValuesChanged()
 {
     Q_ASSERT(m_observer);
     const quint64 size = m_observer->size();
 {
     Q_ASSERT(m_observer);
     const quint64 size = m_observer->size();

-    if (size == 0) {
-        setText(i18nc("@info:status", "Unknown size"));
-        setValue(0);
-        update();
+
+    if (!m_shown || size == 0) {
+        hide();
+        return;
+    }
+
+    m_ready = true;
+
+    const quint64 available = m_observer->available();
+    const quint64 used = size - available;
+    const int percentUsed = qRound(100.0 * qreal(used) / qreal(size));
+
+    setText(i18nc("@info:status Free disk space", "%1 free", KIO::convertSize(available)));
+    setUpdatesEnabled(false);
+    setValue(percentUsed);
+    setUpdatesEnabled(true);
+
+    if (!isVisible()) {
+        show();

     } else {
     } else {

-        const quint64 available = m_observer->available();
-        const quint64 used = size - available;
-        const int percentUsed = qRound(100.0 * qreal(used) / qreal(size));
-
-        setText(i18nc("@info:status Free disk space", "%1 free", KIO::convertSize(available)));
-        setUpdatesEnabled(false);
-        setValue(percentUsed);
-        setUpdatesEnabled(true);

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

diff --git a/src/statusbar/statusbarspaceinfo.h b/src/statusbar/statusbarspaceinfo.h
index 24f8b7f29fb6b910c4fd0c9564eed7d207daead5..0b0d787dd4f76e18daf1930653dd602989986feb 100644 (file)
--- a/src/statusbar/statusbarspaceinfo.h
+++ b/src/statusbar/statusbarspaceinfo.h
@@ -42,6 +42,10 @@ public:
     explicit StatusBarSpaceInfo(QWidget* parent = nullptr);
     ~StatusBarSpaceInfo() override;
 
     explicit StatusBarSpaceInfo(QWidget* parent = nullptr);
     ~StatusBarSpaceInfo() override;
 

+    /**
+     * Use this to set the widget visibility as it can hide itself
+     */
+    void setShown(bool);

     void setUrl(const QUrl& url);
     QUrl url() const;
 
     void setUrl(const QUrl& url);
     QUrl url() const;
 


@@ -58,6 +62,8 @@ private slots:
 private:
     QScopedPointer<SpaceInfoObserver> m_observer;
     QUrl m_url;
 private:
     QScopedPointer<SpaceInfoObserver> m_observer;
     QUrl m_url;

+    bool m_ready;
+    bool m_shown;

 };
 
 #endif
 };
 
 #endif