Hide message widgets only when reloading the view

Otherwise an error message might be hidden before it's even shown.

BUG: 357651
FIXED-IN: 16.08.2
REVIEW: 129061

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 34008b5eb685104d69f3b18b67affea2912dfcfc..e729ce972ec686cd8f57a5204d7e1db95ccff711 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -526,7 +526,7 @@ void DolphinMainWindow::toggleSplitView()
 void DolphinMainWindow::reloadView()
 {
     clearStatusBar();
 void DolphinMainWindow::reloadView()
 {
     clearStatusBar();

-    m_activeViewContainer->view()->reload();
+    m_activeViewContainer->reload();

 }
 
 void DolphinMainWindow::stopLoading()
 }
 
 void DolphinMainWindow::stopLoading()

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 1c43fc9779450f5c392c0479af052a336fb07759..4e625c7d8ee4ddd69e2f9b41c1e1fe0ee7483627 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -98,8 +98,6 @@ DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) :
             m_urlNavigator, &KUrlNavigator::setLocationUrl);
     connect(m_view, &DolphinView::urlChanged,
             m_messageWidget, &KMessageWidget::hide);
             m_urlNavigator, &KUrlNavigator::setLocationUrl);
     connect(m_view, &DolphinView::urlChanged,
             m_messageWidget, &KMessageWidget::hide);

-    connect(m_view, &DolphinView::directoryLoadingCompleted,
-            m_messageWidget, &KMessageWidget::hide);

     connect(m_view, &DolphinView::writeStateChanged,
             this, &DolphinViewContainer::writeStateChanged);
     connect(m_view, &DolphinView::requestItemInfo,
     connect(m_view, &DolphinView::writeStateChanged,
             this, &DolphinViewContainer::writeStateChanged);
     connect(m_view, &DolphinView::requestItemInfo,


@@ -368,6 +366,12 @@ QString DolphinViewContainer::placesText() const
     return text;
 }
 
     return text;
 }
 

+void DolphinViewContainer::reload()
+{
+    view()->reload();
+    m_messageWidget->hide();
+}
+

 void DolphinViewContainer::setUrl(const QUrl& newUrl)
 {
     if (newUrl != m_urlNavigator->locationUrl()) {
 void DolphinViewContainer::setUrl(const QUrl& newUrl)
 {
     if (newUrl != m_urlNavigator->locationUrl()) {

diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index 62f91100e9e5d457edd6f4d927c87610335834d7..0b6a76d5eac867a4da8bf0a71414584a2c77c2d7 100644 (file)
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -129,6 +129,11 @@ public:
      */
     QString placesText() const;
 
      */
     QString placesText() const;
 

+    /**
+     * Reload the view of this container. This will also hide messages in a messagewidget.
+     */
+    void reload();
+

 public slots:
     /**
      * Sets the current active URL, where all actions are applied. The
 public slots:
     /**
      * Sets the current active URL, where all actions are applied. The