Merge branch 'Applications/18.12'

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

diff --git a/src/statusbar/statusbarspaceinfo.cpp b/src/statusbar/statusbarspaceinfo.cpp
index 29135566f1a0ea26e5609f62900e19062940a9c0..3ac87925fcc3f4121018920f8becdfb3c1fa8751 100644 (file)
--- a/src/statusbar/statusbarspaceinfo.cpp
+++ b/src/statusbar/statusbarspaceinfo.cpp
@@ -22,17 +22,16 @@
 
 #include "spaceinfoobserver.h"
 
-#include <QMouseEvent>
-
 #include <KLocalizedString>
 #include <KNS3/KMoreToolsMenuFactory>
-#include <KIO/Job>
 
+#include <QMouseEvent>
 
 StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) :
     KCapacityBar(KCapacityBar::DrawTextInline, parent),
-    m_observer(0)
+    m_observer(nullptr)
 {
+    setCursor(Qt::PointingHandCursor);
 }
 
 StatusBarSpaceInfo::~StatusBarSpaceInfo()
@@ -54,6 +53,13 @@ QUrl StatusBarSpaceInfo::url() const
     return m_url;
 }
 
+void StatusBarSpaceInfo::update()
+{
+    if (m_observer) {
+        m_observer->update();
+    }
+}
+
 void StatusBarSpaceInfo::showEvent(QShowEvent* event)
 {
     KCapacityBar::showEvent(event);
@@ -76,7 +82,8 @@ void StatusBarSpaceInfo::mousePressEvent(QMouseEvent* event)
 
         // Note that this object must live long enough in case the user opens
         // the "Configure..." dialog
-        KMoreToolsMenuFactory menuFactory("dolphin/statusbar-diskspace-menu");
+        KMoreToolsMenuFactory menuFactory(QStringLiteral("dolphin/statusbar-diskspace-menu"));
+        menuFactory.setParentWidget(this);
         auto menu = menuFactory.createMenuFromGroupingNames(
             { "disk-usage", "more:", "disk-partitions" }, m_url);