X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/6072005ddce81b456fdcf2e77d5156a1d86f3686..231200e6800a20aef5a1ba68dd3d64ecbee01000:/src/statusbar/statusbarspaceinfo.cpp

diff --git a/src/statusbar/statusbarspaceinfo.cpp b/src/statusbar/statusbarspaceinfo.cpp
index bb7f85842..253d912c0 100644
--- a/src/statusbar/statusbarspaceinfo.cpp
+++ b/src/statusbar/statusbarspaceinfo.cpp
@@ -8,16 +8,35 @@
 
 #include "spaceinfoobserver.h"
 
+#include <KCapacityBar>
+#include <KIO/ApplicationLauncherJob>
+#include <KIO/Global>
 #include <KLocalizedString>
-#include <KNS3/KMoreToolsMenuFactory>
+#include <KService>
 
+#include <QHBoxLayout>
+#include <QMenu>
 #include <QMouseEvent>
+#include <QStorageInfo>
+#include <QToolButton>
 
-StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) :
-    KCapacityBar(KCapacityBar::DrawTextInline, parent),
-    m_observer(nullptr)
+StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget *parent)
+    : QWidget(parent)
+    , m_observer(nullptr)
 {
-    setCursor(Qt::PointingHandCursor);
+    m_capacityBar = new KCapacityBar(KCapacityBar::DrawTextInline, this);
+    m_textInfoButton = new QToolButton(this);
+    m_textInfoButton->setAutoRaise(true);
+    m_textInfoButton->setPopupMode(QToolButton::InstantPopup);
+    m_buttonMenu = new QMenu(this);
+    m_textInfoButton->setMenu(m_buttonMenu);
+    connect(m_buttonMenu, &QMenu::aboutToShow, this, &StatusBarSpaceInfo::updateMenu);
+
+    auto layout = new QHBoxLayout(this);
+    // We reduce the outside margin of the flat button so it visually has the same margin as the status bar text label on the other end of the bar.
+    layout->setContentsMargins(2, -1, 0, -1); // "-1" makes it so the fixed height won't be ignored.
+    layout->addWidget(m_capacityBar);
+    layout->addWidget(m_textInfoButton);
 }
 
 StatusBarSpaceInfo::~StatusBarSpaceInfo()
@@ -33,7 +52,7 @@ void StatusBarSpaceInfo::setShown(bool shown)
     }
 }
 
-void StatusBarSpaceInfo::setUrl(const QUrl& url)
+void StatusBarSpaceInfo::setUrl(const QUrl &url)
 {
     if (m_url != url) {
         m_url = url;
@@ -57,11 +76,11 @@ void StatusBarSpaceInfo::update()
     }
 }
 
-void StatusBarSpaceInfo::showEvent(QShowEvent* event)
+void StatusBarSpaceInfo::showEvent(QShowEvent *event)
 {
     if (m_shown) {
         if (m_ready) {
-            KCapacityBar::showEvent(event);
+            QWidget::showEvent(event);
         }
 
         if (m_observer.isNull()) {
@@ -71,29 +90,79 @@ void StatusBarSpaceInfo::showEvent(QShowEvent* event)
     }
 }
 
-void StatusBarSpaceInfo::hideEvent(QHideEvent* event)
+void StatusBarSpaceInfo::hideEvent(QHideEvent *event)
 {
     if (m_ready) {
         m_observer.reset();
         m_ready = false;
     }
-    KCapacityBar::hideEvent(event);
+    QWidget::hideEvent(event);
 }
 
-void StatusBarSpaceInfo::mousePressEvent(QMouseEvent* event)
+QSize StatusBarSpaceInfo::minimumSizeHint() const
 {
-    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"));
-        menuFactory.setParentWidget(this);
-        auto menu = menuFactory.createMenuFromGroupingNames(
-            { "disk-usage", "more:", "disk-partitions" }, m_url);
-
-        menu->exec(QCursor::pos());
+    return QSize();
+}
+
+void StatusBarSpaceInfo::updateMenu()
+{
+    m_buttonMenu->clear();
+
+    // Creates a menu with tools that help to find out more about free
+    // disk space for the given url.
+
+    const KService::Ptr filelight = KService::serviceByDesktopName(QStringLiteral("org.kde.filelight"));
+    const KService::Ptr kdiskfree = KService::serviceByDesktopName(QStringLiteral("org.kde.kdf"));
+
+    if (!filelight && !kdiskfree) {
+        // nothing to show
+        return;
+    }
+
+    if (filelight) {
+        QAction *filelightFolderAction = m_buttonMenu->addAction(QIcon::fromTheme(QStringLiteral("filelight")), i18n("Disk Usage Statistics - current folder"));
+
+        m_buttonMenu->connect(filelightFolderAction, &QAction::triggered, m_buttonMenu, [this, filelight](bool) {
+            auto *job = new KIO::ApplicationLauncherJob(filelight);
+            job->setUrls({m_url});
+            job->start();
+        });
+
+        // For remote URLs like FTP analyzing the device makes no sense
+        if (m_url.isLocalFile()) {
+            QAction *filelightDiskAction =
+                m_buttonMenu->addAction(QIcon::fromTheme(QStringLiteral("filelight")), i18n("Disk Usage Statistics - current device"));
+
+            m_buttonMenu->connect(filelightDiskAction, &QAction::triggered, m_buttonMenu, [this, filelight](bool) {
+                const QStorageInfo info(m_url.toLocalFile());
+
+                if (info.isValid() && info.isReady()) {
+                    auto *job = new KIO::ApplicationLauncherJob(filelight);
+                    job->setUrls({QUrl::fromLocalFile(info.rootPath())});
+                    job->start();
+                }
+            });
+        }
+
+        QAction *filelightAllAction = m_buttonMenu->addAction(QIcon::fromTheme(QStringLiteral("filelight")), i18n("Disk Usage Statistics - all devices"));
+
+        m_buttonMenu->connect(filelightAllAction, &QAction::triggered, m_buttonMenu, [this, filelight](bool) {
+            const QStorageInfo info(m_url.toLocalFile());
+
+            if (info.isValid() && info.isReady()) {
+                auto *job = new KIO::ApplicationLauncherJob(filelight);
+                job->start();
+            }
+        });
+    }
+
+    if (kdiskfree) {
+        QAction *kdiskfreeAction = m_buttonMenu->addAction(QIcon::fromTheme(QStringLiteral("kdf")), i18n("KDiskFree"));
+
+        connect(kdiskfreeAction, &QAction::triggered, this, [kdiskfree] {
+            auto *job = new KIO::ApplicationLauncherJob(kdiskfree);
+            job->start();
+        });
     }
 }
 
@@ -113,9 +182,15 @@ void StatusBarSpaceInfo::slotValuesChanged()
     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)));
+    m_textInfoButton->setText(i18nc("@info:status Free disk space", "%1 free", KIO::convertSize(available)));
+    setToolTip(i18nc("tooltip:status Free disk space", "%1 free out of %2 (%3% used)", KIO::convertSize(available), KIO::convertSize(size), percentUsed));
+    m_textInfoButton->setToolTip(i18nc("@info:tooltip for the free disk space button",
+                                       "%1 free out of %2 (%3% used)\nPress to manage disk space usage.",
+                                       KIO::convertSize(available),
+                                       KIO::convertSize(size),
+                                       percentUsed));
     setUpdatesEnabled(false);
-    setValue(percentUsed);
+    m_capacityBar->setValue(percentUsed);
     setUpdatesEnabled(true);
 
     if (!isVisible()) {
@@ -125,3 +200,4 @@ void StatusBarSpaceInfo::slotValuesChanged()
     }
 }
 
+#include "moc_statusbarspaceinfo.cpp"