X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/69c3eba0ad5fe3bc4dec40c2eea4f336c0d7eea9..a286506405550fe299e1f4a5fd73543e642655a0:/src/statusbar/statusbarspaceinfo.cpp

diff --git a/src/statusbar/statusbarspaceinfo.cpp b/src/statusbar/statusbarspaceinfo.cpp
index f364fcf5b..bb7f85842 100644
--- a/src/statusbar/statusbarspaceinfo.cpp
+++ b/src/statusbar/statusbarspaceinfo.cpp
@@ -1,37 +1,21 @@
-/***************************************************************************
- *   Copyright (C) 2006 by Peter Penz (peter.penz@gmx.at) and              *
- *   and Patrice Tremblay                                                  *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
- ***************************************************************************/
+/*
+ * SPDX-FileCopyrightText: 2006 Peter Penz (peter.penz@gmx.at) and Patrice Tremblay
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
 #include "statusbarspaceinfo.h"
 
 #include "spaceinfoobserver.h"
 
-#include <QMouseEvent>
-
 #include <KLocalizedString>
 #include <KNS3/KMoreToolsMenuFactory>
-#include <KIO/Job>
-#include <knewstuff_version.h>
+
+#include <QMouseEvent>
 
 StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) :
     KCapacityBar(KCapacityBar::DrawTextInline, parent),
-    m_observer(0)
+    m_observer(nullptr)
 {
     setCursor(Qt::PointingHandCursor);
 }
@@ -40,12 +24,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;
+        m_ready = false;
         if (m_observer) {
-            m_observer->setUrl(url);
+            m_observer.reset(new SpaceInfoObserver(m_url, this));
+            connect(m_observer.data(), &SpaceInfoObserver::valuesChanged, this, &StatusBarSpaceInfo::slotValuesChanged);
         }
     }
 }
@@ -55,17 +50,33 @@ QUrl StatusBarSpaceInfo::url() const
     return m_url;
 }
 
+void StatusBarSpaceInfo::update()
+{
+    if (m_observer) {
+        m_observer->update();
+    }
+}
+
 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)
 {
-    m_observer.reset();
+    if (m_ready) {
+        m_observer.reset();
+        m_ready = false;
+    }
     KCapacityBar::hideEvent(event);
 }
 
@@ -78,9 +89,7 @@ void StatusBarSpaceInfo::mousePressEvent(QMouseEvent* event)
         // Note that this object must live long enough in case the user opens
         // the "Configure..." dialog
         KMoreToolsMenuFactory menuFactory(QStringLiteral("dolphin/statusbar-diskspace-menu"));
-#if KNEWSTUFF_VERSION >= QT_VERSION_CHECK(5, 37, 0)
         menuFactory.setParentWidget(this);
-#endif
         auto menu = menuFactory.createMenuFromGroupingNames(
             { "disk-usage", "more:", "disk-partitions" }, m_url);
 
@@ -92,19 +101,26 @@ void StatusBarSpaceInfo::slotValuesChanged()
 {
     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 {
-        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();
     }
 }