Apply 2 suggestion(s) to 1 file(s)

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

diff --git a/src/statusbar/statusbarspaceinfo.cpp b/src/statusbar/statusbarspaceinfo.cpp
index bb7f8584257c53aa85003d0c9d2c06b1936ce149..4fb1f311e64976abfdadeb69df6e2b8a385488a0 100644 (file)
--- a/src/statusbar/statusbarspaceinfo.cpp
+++ b/src/statusbar/statusbarspaceinfo.cpp
@@ -6,18 +6,39 @@
 
 #include "statusbarspaceinfo.h"
 
 
 #include "statusbarspaceinfo.h"
 

+#include "config-dolphin.h"
+#include "diskspaceusagemenu.h"

 #include "spaceinfoobserver.h"
 
 #include "spaceinfoobserver.h"
 

+#include <KCapacityBar>
+#include <KIO/Global>

 #include <KLocalizedString>
 #include <KLocalizedString>

-#include <KNS3/KMoreToolsMenuFactory>

 
 

-#include <QMouseEvent>
+#include <QHBoxLayout>
+#include <QToolButton>

 
 

-StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) :
-    KCapacityBar(KCapacityBar::DrawTextInline, parent),
-    m_observer(nullptr)
+StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget *parent)
+    : QWidget(parent)
+    , m_observer(nullptr)
+    , m_hasSpaceInfo{false}
+    , m_shown{false}

 {
 {

-    setCursor(Qt::PointingHandCursor);
+    hide(); // Only become visible when we have space info to show. @see StatusBarSpaceInfo::setShown().
+
+    m_capacityBar = new KCapacityBar(KCapacityBar::DrawTextInline, this);
+    m_textInfoButton = new QToolButton(this);
+    m_textInfoButton->setAutoRaise(true);
+    m_textInfoButton->setPopupMode(QToolButton::InstantPopup);
+    auto menu = new DiskSpaceUsageMenu{this};
+    connect(menu, &DiskSpaceUsageMenu::showMessage, this, &StatusBarSpaceInfo::showMessage);
+    connect(menu, &DiskSpaceUsageMenu::showInstallationProgress, this, &StatusBarSpaceInfo::showInstallationProgress);
+    m_textInfoButton->setMenu(menu);
+
+    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()
 }
 
 StatusBarSpaceInfo::~StatusBarSpaceInfo()


@@ -29,15 +50,26 @@ void StatusBarSpaceInfo::setShown(bool shown)
     m_shown = shown;
     if (!m_shown) {
         hide();
     m_shown = shown;
     if (!m_shown) {
         hide();

-        m_ready = false;
+        return;
+    }
+
+    // We only show() this widget in slotValueChanged() when it m_hasSpaceInfo.
+    if (m_observer.isNull()) {
+        m_observer.reset(new SpaceInfoObserver(m_url, this));
+        connect(m_observer.data(), &SpaceInfoObserver::valuesChanged, this, &StatusBarSpaceInfo::slotValuesChanged);
+    }
+
+    if (m_hasSpaceInfo) {
+        slotValuesChanged();

     }
 }
 
     }
 }
 

-void StatusBarSpaceInfo::setUrl(const QUrl& url)
+void StatusBarSpaceInfo::setUrl(const QUrl &url)

 {
     if (m_url != url) {
         m_url = url;
 {
     if (m_url != url) {
         m_url = url;

-        m_ready = false;
+        static_cast<DiskSpaceUsageMenu *>(m_textInfoButton->menu())->setUrl(url);
+        m_hasSpaceInfo = false;

         if (m_observer) {
             m_observer.reset(new SpaceInfoObserver(m_url, this));
             connect(m_observer.data(), &SpaceInfoObserver::valuesChanged, this, &StatusBarSpaceInfo::slotValuesChanged);
         if (m_observer) {
             m_observer.reset(new SpaceInfoObserver(m_url, this));
             connect(m_observer.data(), &SpaceInfoObserver::valuesChanged, this, &StatusBarSpaceInfo::slotValuesChanged);


@@ -57,44 +89,27 @@ void StatusBarSpaceInfo::update()
     }
 }
 
     }
 }
 

-void StatusBarSpaceInfo::showEvent(QShowEvent* event)
+void StatusBarSpaceInfo::showEvent(QShowEvent *event)

 {
 {

-    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);
-        }
+    if (m_shown && m_observer.isNull()) {
+        m_observer.reset(new SpaceInfoObserver(m_url, this));
+        connect(m_observer.data(), &SpaceInfoObserver::valuesChanged, this, &StatusBarSpaceInfo::slotValuesChanged);

     }
     }

+    QWidget::showEvent(event);

 }
 
 }
 

-void StatusBarSpaceInfo::hideEvent(QHideEvent* event)
+void StatusBarSpaceInfo::hideEvent(QHideEvent *event)

 {
 {

-    if (m_ready) {
+    if (m_hasSpaceInfo) {

         m_observer.reset();
         m_observer.reset();

-        m_ready = false;
+        m_hasSpaceInfo = 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::slotValuesChanged()
 }
 
 void StatusBarSpaceInfo::slotValuesChanged()


@@ -107,15 +122,21 @@ void StatusBarSpaceInfo::slotValuesChanged()
         return;
     }
 
         return;
     }
 

-    m_ready = true;
+    m_hasSpaceInfo = true;

 
     const quint64 available = m_observer->available();
     const quint64 used = size - available;
     const int percentUsed = qRound(100.0 * qreal(used) / qreal(size));
 
 
     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)));
+    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);
     setUpdatesEnabled(false);

-    setValue(percentUsed);
+    m_capacityBar->setValue(percentUsed);

     setUpdatesEnabled(true);
 
     if (!isVisible()) {
     setUpdatesEnabled(true);
 
     if (!isVisible()) {


@@ -125,3 +146,4 @@ void StatusBarSpaceInfo::slotValuesChanged()
     }
 }
 
     }
 }
 

+#include "moc_statusbarspaceinfo.cpp"