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

[dolphin.git] / src / statusbar / spaceinfoobserver.cpp

diff --git a/src/statusbar/spaceinfoobserver.cpp b/src/statusbar/spaceinfoobserver.cpp
index 0fb018727c5e7ea68d583c4f633621c886ab3b26..0d8f5f2fe73f2e41d152891534c4439a8fe7ee1e 100644 (file)
--- a/src/statusbar/spaceinfoobserver.cpp
+++ b/src/statusbar/spaceinfoobserver.cpp
@@ -21,11 +21,10 @@
 
 #include "mountpointobserver.h"
 
 
 #include "mountpointobserver.h"
 

-#include <QUrl>
-

 SpaceInfoObserver::SpaceInfoObserver(const QUrl& url, QObject* parent) :
     QObject(parent),
 SpaceInfoObserver::SpaceInfoObserver(const QUrl& url, QObject* parent) :
     QObject(parent),

-    m_mountPointObserver(0),
+    m_mountPointObserver(nullptr),
+    m_hasData(false),

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


@@ -39,7 +38,7 @@ SpaceInfoObserver::~SpaceInfoObserver()
 {
     if (m_mountPointObserver) {
         m_mountPointObserver->deref();
 {
     if (m_mountPointObserver) {
         m_mountPointObserver->deref();

-        m_mountPointObserver = 0;
+        m_mountPointObserver = nullptr;

     }
 }
 
     }
 }
 


@@ -60,7 +59,7 @@ void SpaceInfoObserver::setUrl(const QUrl& url)
         if (m_mountPointObserver) {
             disconnect(m_mountPointObserver, &MountPointObserver::spaceInfoChanged, this, &SpaceInfoObserver::spaceInfoChanged);
             m_mountPointObserver->deref();
         if (m_mountPointObserver) {
             disconnect(m_mountPointObserver, &MountPointObserver::spaceInfoChanged, this, &SpaceInfoObserver::spaceInfoChanged);
             m_mountPointObserver->deref();

-            m_mountPointObserver = 0;
+            m_mountPointObserver = nullptr;

         }
 
         m_mountPointObserver = newObserver;
         }
 
         m_mountPointObserver = newObserver;


@@ -73,10 +72,18 @@ void SpaceInfoObserver::setUrl(const QUrl& url)
     }
 }
 
     }
 }
 

+void SpaceInfoObserver::update()
+{
+    if (m_mountPointObserver) {
+        m_mountPointObserver->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;