Merge remote-tracking branch 'origin/Applications/17.12'

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

diff --git a/src/statusbar/statusbarspaceinfo.cpp b/src/statusbar/statusbarspaceinfo.cpp
index c9173b8f9ef2feee26d18ca34c8ed2dbda5cbe7b..6b6a6d61081daf2211f3f606acf67fc01cba6f6e 100644 (file)
--- a/src/statusbar/statusbarspaceinfo.cpp
+++ b/src/statusbar/statusbarspaceinfo.cpp
@@ -20,94 +20,92 @@
 
 #include "statusbarspaceinfo.h"
 
 
 #include "statusbarspaceinfo.h"
 

-#include <KDiskFreeSpaceInfo>
-#include <kmountpoint.h>
-#include <klocale.h>
-#include <kio/job.h>
+#include "spaceinfoobserver.h"

 
 

-#include <QTimer>
-#include <QKeyEvent>
+#include <QMouseEvent>
+
+#include <KLocalizedString>
+#include <KNS3/KMoreToolsMenuFactory>
+#include <KIO/Job>
+#include <knewstuff_version.h>

 
 StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) :
     KCapacityBar(KCapacityBar::DrawTextInline, parent),
 
 StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) :
     KCapacityBar(KCapacityBar::DrawTextInline, parent),

-    m_kBSize(0),
-    m_timer(0)
+    m_observer(nullptr)

 {
 {

-    setMaximumWidth(200);
-    setMinimumWidth(200); // something to fix on kcapacitybar (ereslibre)
-
-    // Use a timer to update the space information. Polling is useful
-    // here, as files can be deleted/added outside the scope of Dolphin.
-    m_timer = new QTimer(this);
-    connect(m_timer, SIGNAL(timeout()), this, SLOT(refresh()));
+    setCursor(Qt::PointingHandCursor);

 }
 
 StatusBarSpaceInfo::~StatusBarSpaceInfo()
 {
 }
 
 }
 
 StatusBarSpaceInfo::~StatusBarSpaceInfo()
 {
 }
 

-void StatusBarSpaceInfo::setUrl(const KUrl& url)
+void StatusBarSpaceInfo::setUrl(const QUrl& url)
+{
+    if (m_url != url) {
+        m_url = url;
+        if (m_observer) {
+            m_observer->setUrl(url);
+        }
+    }
+}
+
+QUrl StatusBarSpaceInfo::url() const

 {
 {

-    m_url = url;
-    refresh();
+    return m_url;

 }
 
 void StatusBarSpaceInfo::showEvent(QShowEvent* event)
 {
     KCapacityBar::showEvent(event);
 }
 
 void StatusBarSpaceInfo::showEvent(QShowEvent* event)
 {
     KCapacityBar::showEvent(event);

-    if (!event->spontaneous()) {
-        refresh();
-        m_timer->start(10000);
-    }
+    m_observer.reset(new SpaceInfoObserver(m_url, this));
+    slotValuesChanged();
+    connect(m_observer.data(), &SpaceInfoObserver::valuesChanged, this, &StatusBarSpaceInfo::slotValuesChanged);

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

-    m_timer->stop();
+    m_observer.reset();

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

-void StatusBarSpaceInfo::refresh()
+void StatusBarSpaceInfo::mousePressEvent(QMouseEvent* event)

 {
 {

-    if (!isVisible()) {
-        return;
-    }
-
-    // KDiskFreeSpace is for local paths only
-    if (!m_url.isLocalFile()) {
-        setText(i18nc("@info:status", "Unknown size"));
-        setValue(0);
-        update();
-        return;
-    }
-
-    KMountPoint::Ptr mp = KMountPoint::currentMountPoints().findByPath(m_url.toLocalFile());
-    if (!mp) {
-        return;
+    if (event->button() == Qt::LeftButton) {
+        // Creates a menu with tools that help to find out more about free
+        // disk space for the given url.
+
+        // 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);
+
+        menu->exec(QCursor::pos());

     }
     }

+}

 
 

-    KDiskFreeSpaceInfo job = KDiskFreeSpaceInfo::freeSpaceInfo(mp->mountPoint());
-    if (!job.isValid()) {
+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();
         setText(i18nc("@info:status", "Unknown size"));
         setValue(0);
         update();

-        return;
-    }
-
-    KIO::filesize_t kBSize = job.size() / 1024;
-    KIO::filesize_t kBUsed = job.used() / 1024;
-
-    const bool valuesChanged = (kBUsed != static_cast<quint64>(value())) || (kBSize != m_kBSize);
-    if (valuesChanged) {
-        setText(i18nc("@info:status Free disk space", "%1 free",
-                KIO::convertSize(job.available())));
+    } 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);
         setUpdatesEnabled(false);

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

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

-#include "statusbarspaceinfo.moc"