[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [dolphin] src: Update disk space info on refresh
From:       Kai Uwe Broulik <null () kde ! org>
Date:       2018-09-19 8:20:35
Message-ID: E1g2Xit-0003nQ-AX () code ! kde ! org
[Download RAW message or body]

Git commit 391006130e31b80ecc55343f44bddaf06951c90f by Kai Uwe Broulik.
Committed on 19/09/2018 at 08:20.
Pushed by broulik into branch 'master'.

Update disk space info on refresh

When explicitly refreshing the view (e.g. F5) also refresh disk space info.
This would also allow us to raise the refresh interval somewhat.

CCBUG: 398612

Differential Revision: https://phabricator.kde.org/D15508

M  +1    -0    src/dolphinmainwindow.cpp
M  +5    -0    src/statusbar/dolphinstatusbar.cpp
M  +5    -0    src/statusbar/dolphinstatusbar.h
M  +7    -0    src/statusbar/spaceinfoobserver.cpp
M  +3    -0    src/statusbar/spaceinfoobserver.h
M  +7    -0    src/statusbar/statusbarspaceinfo.cpp
M  +2    -0    src/statusbar/statusbarspaceinfo.h

https://commits.kde.org/dolphin/391006130e31b80ecc55343f44bddaf06951c90f

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index b603b8cfa5..6576e1b0e7 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -590,6 +590,7 @@ void DolphinMainWindow::reloadView()
 {
     clearStatusBar();
     m_activeViewContainer->reload();
+    m_activeViewContainer->statusBar()->updateSpaceInfo();
 }
 =

 void DolphinMainWindow::stopLoading()
diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstat=
usbar.cpp
index 34916830ea..b3fddba108 100644
--- a/src/statusbar/dolphinstatusbar.cpp
+++ b/src/statusbar/dolphinstatusbar.cpp
@@ -252,6 +252,11 @@ void DolphinStatusBar::readSettings()
     setExtensionsVisible(true);
 }
 =

+void DolphinStatusBar::updateSpaceInfo()
+{
+    m_spaceInfo->update();
+}
+
 void DolphinStatusBar::contextMenuEvent(QContextMenuEvent* event)
 {
     Q_UNUSED(event);
diff --git a/src/statusbar/dolphinstatusbar.h b/src/statusbar/dolphinstatus=
bar.h
index 8b872ace58..7461d1d7d3 100644
--- a/src/statusbar/dolphinstatusbar.h
+++ b/src/statusbar/dolphinstatusbar.h
@@ -88,6 +88,11 @@ public:
      */
     void readSettings();
 =

+    /**
+     * Refreshes the disk space information.
+     */
+    void updateSpaceInfo();
+
 public slots:
     void setText(const QString& text);
     void setUrl(const QUrl& url);
diff --git a/src/statusbar/spaceinfoobserver.cpp b/src/statusbar/spaceinfoo=
bserver.cpp
index 6cf695d550..692eba7e7a 100644
--- a/src/statusbar/spaceinfoobserver.cpp
+++ b/src/statusbar/spaceinfoobserver.cpp
@@ -71,6 +71,13 @@ void SpaceInfoObserver::setUrl(const QUrl& url)
     }
 }
 =

+void SpaceInfoObserver::update()
+{
+    if (m_mountPointObserver) {
+        m_mountPointObserver->update();
+    }
+}
+
 void SpaceInfoObserver::spaceInfoChanged(quint64 size, quint64 available)
 {
     // Make sure that the size has actually changed
diff --git a/src/statusbar/spaceinfoobserver.h b/src/statusbar/spaceinfoobs=
erver.h
index 1e74caef47..93f4c8c914 100644
--- a/src/statusbar/spaceinfoobserver.h
+++ b/src/statusbar/spaceinfoobserver.h
@@ -40,6 +40,9 @@ public:
 =

     void setUrl(const QUrl& url);
 =

+public slots:
+    void update();
+
 signals:
     /**
      * This signal is emitted when the size or available space changes.
diff --git a/src/statusbar/statusbarspaceinfo.cpp b/src/statusbar/statusbar=
spaceinfo.cpp
index 65af174909..8822495766 100644
--- a/src/statusbar/statusbarspaceinfo.cpp
+++ b/src/statusbar/statusbarspaceinfo.cpp
@@ -54,6 +54,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);
diff --git a/src/statusbar/statusbarspaceinfo.h b/src/statusbar/statusbarsp=
aceinfo.h
index 4f36517aea..24f8b7f29f 100644
--- a/src/statusbar/statusbarspaceinfo.h
+++ b/src/statusbar/statusbarspaceinfo.h
@@ -45,6 +45,8 @@ public:
     void setUrl(const QUrl& url);
     QUrl url() const;
 =

+    void update();
+
 protected:
     void showEvent(QShowEvent* event) override;
     void hideEvent(QHideEvent* event) override;
[prev in list] [next in list] [prev in thread] [next in thread]