From 0e5e43aa9d84b2a38db99c469de91e4de8017fc7 Mon Sep 17 00:00:00 2001 From: Elvis Angelaccio Date: Tue, 4 Oct 2016 17:30:51 +0200 Subject: 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 --- src/dolphinviewcontainer.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/dolphinviewcontainer.cpp') diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 1c43fc977..4e625c7d8 100644 --- 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); - connect(m_view, &DolphinView::directoryLoadingCompleted, - m_messageWidget, &KMessageWidget::hide); connect(m_view, &DolphinView::writeStateChanged, this, &DolphinViewContainer::writeStateChanged); connect(m_view, &DolphinView::requestItemInfo, @@ -368,6 +366,12 @@ QString DolphinViewContainer::placesText() const return text; } +void DolphinViewContainer::reload() +{ + view()->reload(); + m_messageWidget->hide(); +} + void DolphinViewContainer::setUrl(const QUrl& newUrl) { if (newUrl != m_urlNavigator->locationUrl()) { -- cgit v1.3 From 215bed085b99274cb3cc57670f4a76d0d43c4603 Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Mon, 16 Jan 2017 15:45:09 +0100 Subject: In doubt use URL scheme for place If we neither have a filename nor a host, we might be in a foo:/ URL, use the scheme then. Differential Revision: https://phabricator.kde.org/D3935 --- src/dolphinviewcontainer.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/dolphinviewcontainer.cpp') diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 4e625c7d8..2ea5b7e00 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -361,6 +361,9 @@ QString DolphinViewContainer::placesText() const if (text.isEmpty()) { text = url().host(); } + if (text.isEmpty()) { + text = url().scheme(); + } } return text; -- cgit v1.3