GIT_SILENT Sync po/docbooks with svn

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 5b2a318d679f2e299b9a5c20166941aad7f61c68..27f845fa798fa3245248241167ca22775b8bca24 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -6,6 +6,7 @@
 
 #include "dolphinviewcontainer.h"
 
 
 #include "dolphinviewcontainer.h"
 

+#include "admin/bar.h"

 #include "dolphin_compactmodesettings.h"
 #include "dolphin_contentdisplaysettings.h"
 #include "dolphin_detailsmodesettings.h"
 #include "dolphin_compactmodesettings.h"
 #include "dolphin_contentdisplaysettings.h"
 #include "dolphin_detailsmodesettings.h"


@@ -20,9 +21,6 @@
 #include "statusbar/dolphinstatusbar.h"
 
 #include <KActionCollection>
 #include "statusbar/dolphinstatusbar.h"
 
 #include <KActionCollection>

-#if HAVE_KACTIVITIES
-#include <KActivities/ResourceInstance>
-#endif

 #include <KApplicationTrader>
 #include <KFileItemActions>
 #include <KFilePlacesModel>
 #include <KApplicationTrader>
 #include <KFileItemActions>
 #include <KFilePlacesModel>


@@ -46,12 +44,13 @@
 // An overview of the widgets contained by this ViewContainer
 struct LayoutStructure {
     int searchBox = 0;
 // An overview of the widgets contained by this ViewContainer
 struct LayoutStructure {
     int searchBox = 0;

-    int messageWidget = 1;
-    int selectionModeTopBar = 2;
-    int view = 3;
-    int selectionModeBottomBar = 4;
-    int filterBar = 5;
-    int statusBar = 6;
+    int adminBar = 1;
+    int messageWidget = 2;
+    int selectionModeTopBar = 3;
+    int view = 4;
+    int selectionModeBottomBar = 5;
+    int filterBar = 6;
+    int statusBar = 7;

 };
 constexpr LayoutStructure positionFor;
 
 };
 constexpr LayoutStructure positionFor;
 


@@ -62,6 +61,7 @@ DolphinViewContainer::DolphinViewContainer(const QUrl &url, QWidget *parent)
     , m_urlNavigatorConnected{nullptr}
     , m_searchBox(nullptr)
     , m_searchModeEnabled(false)
     , m_urlNavigatorConnected{nullptr}
     , m_searchBox(nullptr)
     , m_searchModeEnabled(false)

+    , m_adminBar{nullptr}

     , m_messageWidget(nullptr)
     , m_selectionModeTopBar{nullptr}
     , m_view(nullptr)
     , m_messageWidget(nullptr)
     , m_selectionModeTopBar{nullptr}
     , m_view(nullptr)


@@ -71,9 +71,6 @@ DolphinViewContainer::DolphinViewContainer(const QUrl &url, QWidget *parent)
     , m_statusBarTimer(nullptr)
     , m_statusBarTimestamp()
     , m_autoGrabFocus(true)
     , m_statusBarTimer(nullptr)
     , m_statusBarTimestamp()
     , m_autoGrabFocus(true)

-#if HAVE_KACTIVITIES
-    , m_activityResourceInstance(nullptr)
-#endif

 {
     hide();
 
 {
     hide();
 


@@ -82,7 +79,7 @@ DolphinViewContainer::DolphinViewContainer(const QUrl &url, QWidget *parent)
     m_topLayout->setContentsMargins(0, 0, 0, 0);
 
     m_searchBox = new DolphinSearchBox(this);
     m_topLayout->setContentsMargins(0, 0, 0, 0);
 
     m_searchBox = new DolphinSearchBox(this);

-    m_searchBox->hide();
+    m_searchBox->setVisible(false, WithoutAnimation);

     connect(m_searchBox, &DolphinSearchBox::activated, this, &DolphinViewContainer::activate);
     connect(m_searchBox, &DolphinSearchBox::openRequest, this, &DolphinViewContainer::openSearchBox);
     connect(m_searchBox, &DolphinSearchBox::closeRequest, this, &DolphinViewContainer::closeSearchBox);
     connect(m_searchBox, &DolphinSearchBox::activated, this, &DolphinViewContainer::activate);
     connect(m_searchBox, &DolphinSearchBox::openRequest, this, &DolphinViewContainer::openSearchBox);
     connect(m_searchBox, &DolphinSearchBox::closeRequest, this, &DolphinViewContainer::closeSearchBox);


@@ -103,18 +100,19 @@ DolphinViewContainer::DolphinViewContainer(const QUrl &url, QWidget *parent)
 
     m_messageWidget = new KMessageWidget(this);
     m_messageWidget->setCloseButtonVisible(true);
 
     m_messageWidget = new KMessageWidget(this);
     m_messageWidget->setCloseButtonVisible(true);

+    m_messageWidget->setPosition(KMessageWidget::Header);

     m_messageWidget->hide();
 
     m_messageWidget->hide();
 

-#ifndef Q_OS_WIN
+#if !defined(Q_OS_WIN) && !defined(Q_OS_HAIKU)

     if (getuid() == 0) {
         // We must be logged in as the root user; show a big scary warning
     if (getuid() == 0) {
         // We must be logged in as the root user; show a big scary warning

-        showMessage(i18n("Running Dolphin as root can be dangerous. Please be careful."), Warning);
+        showMessage(i18n("Running Dolphin as root can be dangerous. Please be careful."), KMessageWidget::Warning);

     }
 #endif
 
     // Initialize filter bar
     m_filterBar = new FilterBar(this);
     }
 #endif
 
     // Initialize filter bar
     m_filterBar = new FilterBar(this);

-    m_filterBar->setVisible(GeneralSettings::filterBar());
+    m_filterBar->setVisible(GeneralSettings::filterBar(), WithoutAnimation);

 
     connect(m_filterBar, &FilterBar::filterChanged, this, &DolphinViewContainer::setNameFilter);
     connect(m_filterBar, &FilterBar::closeRequest, this, &DolphinViewContainer::closeFilterBar);
 
     connect(m_filterBar, &FilterBar::filterChanged, this, &DolphinViewContainer::setNameFilter);
     connect(m_filterBar, &FilterBar::closeRequest, this, &DolphinViewContainer::closeFilterBar);


@@ -140,8 +138,6 @@ DolphinViewContainer::DolphinViewContainer(const QUrl &url, QWidget *parent)
     connect(m_view, &DolphinView::directoryLoadingCompleted, this, &DolphinViewContainer::slotDirectoryLoadingCompleted);
     connect(m_view, &DolphinView::directoryLoadingCanceled, this, &DolphinViewContainer::slotDirectoryLoadingCanceled);
     connect(m_view, &DolphinView::itemCountChanged, this, &DolphinViewContainer::delayedStatusBarUpdate);
     connect(m_view, &DolphinView::directoryLoadingCompleted, this, &DolphinViewContainer::slotDirectoryLoadingCompleted);
     connect(m_view, &DolphinView::directoryLoadingCanceled, this, &DolphinViewContainer::slotDirectoryLoadingCanceled);
     connect(m_view, &DolphinView::itemCountChanged, this, &DolphinViewContainer::delayedStatusBarUpdate);

-    connect(m_view, &DolphinView::directoryLoadingProgress, this, &DolphinViewContainer::updateDirectoryLoadingProgress);
-    connect(m_view, &DolphinView::directorySortingProgress, this, &DolphinViewContainer::updateDirectorySortingProgress);

     connect(m_view, &DolphinView::selectionChanged, this, &DolphinViewContainer::delayedStatusBarUpdate);
     connect(m_view, &DolphinView::errorMessage, this, &DolphinViewContainer::showErrorMessage);
     connect(m_view, &DolphinView::urlIsFileError, this, &DolphinViewContainer::slotUrlIsFileError);
     connect(m_view, &DolphinView::selectionChanged, this, &DolphinViewContainer::delayedStatusBarUpdate);
     connect(m_view, &DolphinView::errorMessage, this, &DolphinViewContainer::showErrorMessage);
     connect(m_view, &DolphinView::urlIsFileError, this, &DolphinViewContainer::slotUrlIsFileError);


@@ -160,8 +156,17 @@ DolphinViewContainer::DolphinViewContainer(const QUrl &url, QWidget *parent)
     connect(m_view, &DolphinView::operationCompletedMessage, m_statusBar, &DolphinStatusBar::setText);
     connect(m_view, &DolphinView::statusBarTextChanged, m_statusBar, &DolphinStatusBar::setDefaultText);
     connect(m_view, &DolphinView::statusBarTextChanged, m_statusBar, &DolphinStatusBar::resetToDefaultText);
     connect(m_view, &DolphinView::operationCompletedMessage, m_statusBar, &DolphinStatusBar::setText);
     connect(m_view, &DolphinView::statusBarTextChanged, m_statusBar, &DolphinStatusBar::setDefaultText);
     connect(m_view, &DolphinView::statusBarTextChanged, m_statusBar, &DolphinStatusBar::resetToDefaultText);

+    connect(m_view, &DolphinView::directoryLoadingProgress, m_statusBar, [this](int percent) {
+        m_statusBar->showProgress(i18nc("@info:progress", "Loading folder…"), percent);
+    });
+    connect(m_view, &DolphinView::directorySortingProgress, m_statusBar, [this](int percent) {
+        m_statusBar->showProgress(i18nc("@info:progress", "Sorting…"), percent);
+    });

     connect(m_statusBar, &DolphinStatusBar::stopPressed, this, &DolphinViewContainer::stopDirectoryLoading);
     connect(m_statusBar, &DolphinStatusBar::zoomLevelChanged, this, &DolphinViewContainer::slotStatusBarZoomLevelChanged);
     connect(m_statusBar, &DolphinStatusBar::stopPressed, this, &DolphinViewContainer::stopDirectoryLoading);
     connect(m_statusBar, &DolphinStatusBar::zoomLevelChanged, this, &DolphinViewContainer::slotStatusBarZoomLevelChanged);

+    connect(m_statusBar, &DolphinStatusBar::showMessage, this, [this](const QString &message, KMessageWidget::MessageType messageType) {
+        showMessage(message, messageType);
+    });

 
     m_statusBarTimer = new QTimer(this);
     m_statusBarTimer->setSingleShot(true);
 
     m_statusBarTimer = new QTimer(this);
     m_statusBarTimer->setSingleShot(true);


@@ -189,13 +194,6 @@ DolphinViewContainer::DolphinViewContainer(const QUrl &url, QWidget *parent)
     connect(placesModel, &KFilePlacesModel::rowsRemoved, this, &DolphinViewContainer::slotPlacesModelChanged);
 
     connect(this, &DolphinViewContainer::searchModeEnabledChanged, this, &DolphinViewContainer::captionChanged);
     connect(placesModel, &KFilePlacesModel::rowsRemoved, this, &DolphinViewContainer::slotPlacesModelChanged);
 
     connect(this, &DolphinViewContainer::searchModeEnabledChanged, this, &DolphinViewContainer::captionChanged);

-
-    // Initialize kactivities resource instance
-
-#if HAVE_KACTIVITIES
-    m_activityResourceInstance = new KActivities::ResourceInstance(window()->winId(), url);
-    m_activityResourceInstance->setParent(this);
-#endif

 }
 
 DolphinViewContainer::~DolphinViewContainer()
 }
 
 DolphinViewContainer::~DolphinViewContainer()


@@ -219,14 +217,6 @@ void DolphinViewContainer::setActive(bool active)
         m_urlNavigatorConnected->setActive(active);
     }
     m_view->setActive(active);
         m_urlNavigatorConnected->setActive(active);
     }
     m_view->setActive(active);

-
-#if HAVE_KACTIVITIES
-    if (active) {
-        m_activityResourceInstance->notifyFocusedIn();
-    } else {
-        m_activityResourceInstance->notifyFocusedOut();
-    }
-#endif

 }
 
 bool DolphinViewContainer::isActive() const
 }
 
 bool DolphinViewContainer::isActive() const


@@ -314,6 +304,8 @@ void DolphinViewContainer::connectUrlNavigator(DolphinUrlNavigator *urlNavigator
     connect(m_view, &DolphinView::urlChanged, urlNavigator, &DolphinUrlNavigator::setLocationUrl);
     connect(urlNavigator, &DolphinUrlNavigator::activated, this, &DolphinViewContainer::activate);
 
     connect(m_view, &DolphinView::urlChanged, urlNavigator, &DolphinUrlNavigator::setLocationUrl);
     connect(urlNavigator, &DolphinUrlNavigator::activated, this, &DolphinViewContainer::activate);
 

+    urlNavigator->setReadOnlyBadgeVisible(rootItem().isLocalFile() && !rootItem().isWritable());
+

     m_urlNavigatorConnected = urlNavigator;
 }
 
     m_urlNavigatorConnected = urlNavigator;
 }
 


@@ -343,12 +335,14 @@ void DolphinViewContainer::setSelectionModeEnabled(bool enabled, KActionCollecti
         }
         Q_CHECK_PTR(m_selectionModeTopBar); // there is no point in disabling selectionMode when it wasn't even enabled once.
         Q_CHECK_PTR(m_selectionModeBottomBar);
         }
         Q_CHECK_PTR(m_selectionModeTopBar); // there is no point in disabling selectionMode when it wasn't even enabled once.
         Q_CHECK_PTR(m_selectionModeBottomBar);

-        if (m_selectionModeTopBar->isAncestorOf(QApplication::focusWidget()) || m_selectionModeBottomBar->isAncestorOf(QApplication::focusWidget())) {
-            m_view->setFocus();
-        }

         m_selectionModeTopBar->setVisible(false, WithAnimation);
         m_selectionModeBottomBar->setVisible(false, WithAnimation);
         Q_EMIT selectionModeChanged(false);
         m_selectionModeTopBar->setVisible(false, WithAnimation);
         m_selectionModeBottomBar->setVisible(false, WithAnimation);
         Q_EMIT selectionModeChanged(false);

+
+        if (!QApplication::focusWidget() || m_selectionModeTopBar->isAncestorOf(QApplication::focusWidget())
+            || m_selectionModeBottomBar->isAncestorOf(QApplication::focusWidget())) {
+            m_view->setFocus();
+        }

         return;
     }
 
         return;
     }
 


@@ -370,9 +364,7 @@ void DolphinViewContainer::setSelectionModeEnabled(bool enabled, KActionCollecti
         connect(m_view, &DolphinView::selectionChanged, this, [this](const KFileItemList &selection) {
             m_selectionModeBottomBar->slotSelectionChanged(selection, m_view->url());
         });
         connect(m_view, &DolphinView::selectionChanged, this, [this](const KFileItemList &selection) {
             m_selectionModeBottomBar->slotSelectionChanged(selection, m_view->url());
         });

-        connect(m_selectionModeBottomBar, &SelectionMode::BottomBar::error, this, [this](const QString &errorMessage) {
-            showErrorMessage(errorMessage);
-        });
+        connect(m_selectionModeBottomBar, &SelectionMode::BottomBar::error, this, &DolphinViewContainer::showErrorMessage);

         connect(m_selectionModeBottomBar, &SelectionMode::BottomBar::selectionModeLeavingRequested, this, [this]() {
             setSelectionModeEnabled(false);
         });
         connect(m_selectionModeBottomBar, &SelectionMode::BottomBar::selectionModeLeavingRequested, this, [this]() {
             setSelectionModeEnabled(false);
         });


@@ -412,31 +404,25 @@ void DolphinViewContainer::slotSplitTabDisabled()
     }
 }
 
     }
 }
 

-void DolphinViewContainer::showMessage(const QString &msg, MessageType type)
+void DolphinViewContainer::showMessage(const QString &message, KMessageWidget::MessageType messageType, std::initializer_list<QAction *> buttonActions)

 {
 {

-    if (msg.isEmpty()) {
+    if (message.isEmpty()) {

         return;
     }
 
         return;
     }
 

-    m_messageWidget->setText(msg);
+    m_messageWidget->setText(message);

 
     // TODO: wrap at arbitrary character positions once QLabel can do this
     // https://bugreports.qt.io/browse/QTBUG-1276
     m_messageWidget->setWordWrap(true);
 
     // TODO: wrap at arbitrary character positions once QLabel can do this
     // https://bugreports.qt.io/browse/QTBUG-1276
     m_messageWidget->setWordWrap(true);

+    m_messageWidget->setMessageType(messageType);

 
 

-    switch (type) {
-    case Information:
-        m_messageWidget->setMessageType(KMessageWidget::Information);
-        break;
-    case Warning:
-        m_messageWidget->setMessageType(KMessageWidget::Warning);
-        break;
-    case Error:
-        m_messageWidget->setMessageType(KMessageWidget::Error);
-        break;
-    default:
-        Q_ASSERT(false);
-        break;
+    const QList<QAction *> previousMessageWidgetActions = m_messageWidget->actions();
+    for (auto action : previousMessageWidgetActions) {
+        m_messageWidget->removeAction(action);
+    }
+    for (QAction *action : buttonActions) {
+        m_messageWidget->addAction(action);

     }
 
     m_messageWidget->setWordWrap(false);
     }
 
     m_messageWidget->setWordWrap(false);


@@ -464,12 +450,12 @@ void DolphinViewContainer::readSettings()
 
 bool DolphinViewContainer::isFilterBarVisible() const
 {
 
 bool DolphinViewContainer::isFilterBarVisible() const
 {

-    return m_filterBar->isVisible();
+    return m_filterBar->isEnabled(); // Gets disabled in AnimatedHeightWidget while animating towards a hidden state.

 }
 
 void DolphinViewContainer::setSearchModeEnabled(bool enabled)
 {
 }
 
 void DolphinViewContainer::setSearchModeEnabled(bool enabled)
 {

-    m_searchBox->setVisible(enabled);
+    m_searchBox->setVisible(enabled, WithAnimation);

 
     if (enabled) {
         const QUrl &locationUrl = m_urlNavigator->locationUrl();
 
     if (enabled) {
         const QUrl &locationUrl = m_urlNavigator->locationUrl();


@@ -590,10 +576,6 @@ void DolphinViewContainer::setUrl(const QUrl &newUrl)
     if (newUrl != m_urlNavigator->locationUrl()) {
         m_urlNavigator->setLocationUrl(newUrl);
     }
     if (newUrl != m_urlNavigator->locationUrl()) {
         m_urlNavigator->setLocationUrl(newUrl);
     }

-
-#if HAVE_KACTIVITIES
-    m_activityResourceInstance->setUri(newUrl);
-#endif

 }
 
 void DolphinViewContainer::setFilterBarVisible(bool visible)
 }
 
 void DolphinViewContainer::setFilterBarVisible(bool visible)


@@ -601,7 +583,7 @@ void DolphinViewContainer::setFilterBarVisible(bool visible)
     Q_ASSERT(m_filterBar);
     if (visible) {
         m_view->hideToolTip(ToolTipManager::HideBehavior::Instantly);
     Q_ASSERT(m_filterBar);
     if (visible) {
         m_view->hideToolTip(ToolTipManager::HideBehavior::Instantly);

-        m_filterBar->show();
+        m_filterBar->setVisible(true, WithAnimation);

         m_filterBar->setFocus();
         m_filterBar->selectAll();
     } else {
         m_filterBar->setFocus();
         m_filterBar->selectAll();
     } else {


@@ -630,45 +612,28 @@ void DolphinViewContainer::updateStatusBar()
     m_view->requestStatusBarText();
 }
 
     m_view->requestStatusBarText();
 }
 

-void DolphinViewContainer::updateDirectoryLoadingProgress(int percent)
-{
-    if (m_statusBar->progressText().isEmpty()) {
-        m_statusBar->setProgressText(i18nc("@info:progress", "Loading folder…"));
-    }
-    m_statusBar->setProgress(percent);
-}
-
-void DolphinViewContainer::updateDirectorySortingProgress(int percent)
-{
-    if (m_statusBar->progressText().isEmpty()) {
-        m_statusBar->setProgressText(i18nc("@info:progress", "Sorting…"));
-    }
-    m_statusBar->setProgress(percent);
-}
-

 void DolphinViewContainer::slotDirectoryLoadingStarted()
 {
     if (isSearchUrl(url())) {
         // Search KIO-slaves usually don't provide any progress information. Give
         // a hint to the user that a searching is done:
         updateStatusBar();
 void DolphinViewContainer::slotDirectoryLoadingStarted()
 {
     if (isSearchUrl(url())) {
         // Search KIO-slaves usually don't provide any progress information. Give
         // a hint to the user that a searching is done:
         updateStatusBar();

-        m_statusBar->setProgressText(i18nc("@info", "Searching…"));
-        m_statusBar->setProgress(-1);
+        m_statusBar->showProgress(i18nc("@info", "Searching…"), -1);

     } else {
         // Trigger an undetermined progress indication. The progress
         // information in percent will be triggered by the percent() signal
         // of the directory lister later.
     } else {
         // Trigger an undetermined progress indication. The progress
         // information in percent will be triggered by the percent() signal
         // of the directory lister later.

-        m_statusBar->setProgressText(QString());
-        updateDirectoryLoadingProgress(-1);
+        m_statusBar->showProgress(QString(), -1);
+    }
+
+    if (m_urlNavigatorConnected) {
+        m_urlNavigatorConnected->setReadOnlyBadgeVisible(false);

     }
 }
 
 void DolphinViewContainer::slotDirectoryLoadingCompleted()
 {
     }
 }
 
 void DolphinViewContainer::slotDirectoryLoadingCompleted()
 {

-    if (!m_statusBar->progressText().isEmpty()) {
-        m_statusBar->setProgressText(QString());
-        m_statusBar->setProgress(100);
-    }
+    m_statusBar->showProgress(QString(), 100);

 
     if (isSearchUrl(url()) && m_view->itemsCount() == 0) {
         // The dir lister has been completed on a Baloo-URI and no items have been found. Instead
 
     if (isSearchUrl(url()) && m_view->itemsCount() == 0) {
         // The dir lister has been completed on a Baloo-URI and no items have been found. Instead


@@ -677,15 +642,26 @@ void DolphinViewContainer::slotDirectoryLoadingCompleted()
     } else {
         updateStatusBar();
     }
     } else {
         updateStatusBar();
     }

+
+    if (m_urlNavigatorConnected) {
+        m_urlNavigatorConnected->setReadOnlyBadgeVisible(rootItem().isLocalFile() && !rootItem().isWritable());
+    }
+
+    // Update admin bar visibility
+    if (m_view->url().scheme() == QStringLiteral("admin")) {
+        if (!m_adminBar) {
+            m_adminBar = new Admin::Bar(this);
+            m_topLayout->addWidget(m_adminBar, positionFor.adminBar, 0);
+        }
+        m_adminBar->setVisible(true, WithAnimation);
+    } else if (m_adminBar) {
+        m_adminBar->setVisible(false, WithAnimation);
+    }

 }
 
 void DolphinViewContainer::slotDirectoryLoadingCanceled()
 {
 }
 
 void DolphinViewContainer::slotDirectoryLoadingCanceled()
 {

-    if (!m_statusBar->progressText().isEmpty()) {
-        m_statusBar->setProgressText(QString());
-        m_statusBar->setProgress(100);
-    }
-
+    m_statusBar->showProgress(QString(), 100);

     m_statusBar->setText(QString());
 }
 
     m_statusBar->setText(QString());
 }
 


@@ -728,7 +704,8 @@ void DolphinViewContainer::slotItemActivated(const KFileItem &item)
     }
 
     KIO::OpenUrlJob *job = new KIO::OpenUrlJob(item.targetUrl(), item.mimetype());
     }
 
     KIO::OpenUrlJob *job = new KIO::OpenUrlJob(item.targetUrl(), item.mimetype());

-    job->setUiDelegate(KIO::createDefaultJobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, this));
+    // Auto*Warning*Handling, errors are put in a KMessageWidget by us in slotOpenUrlFinished.
+    job->setUiDelegate(KIO::createDefaultJobUiDelegate(KJobUiDelegate::AutoWarningHandlingEnabled, this));

     job->setShowOpenOrExecuteDialog(true);
     connect(job, &KIO::OpenUrlJob::finished, this, &DolphinViewContainer::slotOpenUrlFinished);
     job->start();
     job->setShowOpenOrExecuteDialog(true);
     connect(job, &KIO::OpenUrlJob::finished, this, &DolphinViewContainer::slotOpenUrlFinished);
     job->start();


@@ -744,7 +721,7 @@ void DolphinViewContainer::slotfileMiddleClickActivated(const KFileItem &item)
     auto mimeType = item.currentMimeType();
     if (item.isLocalFile() && mimeType.inherits(QStringLiteral("application/x-executable")) && mimeType.inherits(QStringLiteral("text/plain"))
         && QFileInfo(item.localPath()).isExecutable()) {
     auto mimeType = item.currentMimeType();
     if (item.isLocalFile() && mimeType.inherits(QStringLiteral("application/x-executable")) && mimeType.inherits(QStringLiteral("text/plain"))
         && QFileInfo(item.localPath()).isExecutable()) {

-        KConfigGroup cfgGroup(KSharedConfig::openConfig(QStringLiteral("kiorc")), "Executable scripts");
+        KConfigGroup cfgGroup(KSharedConfig::openConfig(QStringLiteral("kiorc")), QStringLiteral("Executable scripts"));

         const QString value = cfgGroup.readEntry("behaviourOnLaunch", "alwaysAsk");
 
         // in case KIO::WidgetsOpenOrExecuteFileHandler::promptUserOpenOrExecute would not open the file
         const QString value = cfgGroup.readEntry("behaviourOnLaunch", "alwaysAsk");
 
         // in case KIO::WidgetsOpenOrExecuteFileHandler::promptUserOpenOrExecute would not open the file


@@ -834,22 +811,27 @@ void DolphinViewContainer::slotUrlNavigatorLocationChanged(const QUrl &url)
         if (url.scheme().startsWith(QLatin1String("http"))) {
             showMessage(i18nc("@info:status", // krazy:exclude=qmethods
                               "Dolphin does not support web pages, the web browser has been launched"),
         if (url.scheme().startsWith(QLatin1String("http"))) {
             showMessage(i18nc("@info:status", // krazy:exclude=qmethods
                               "Dolphin does not support web pages, the web browser has been launched"),

-                        Information);
+                        KMessageWidget::Information);

         } else {
         } else {

-            showMessage(i18nc("@info:status", "Protocol not supported by Dolphin, default application has been launched"), Information);
+            showMessage(i18nc("@info:status", "Protocol not supported by Dolphin, default application has been launched"), KMessageWidget::Information);

         }
 
         QDesktopServices::openUrl(url);
         redirect(QUrl(), m_urlNavigator->locationUrl(1));
     } else {
         }
 
         QDesktopServices::openUrl(url);
         redirect(QUrl(), m_urlNavigator->locationUrl(1));
     } else {

-        showMessage(i18nc("@info:status", "Invalid protocol"), Error);
+        if (!url.scheme().isEmpty()) {
+            showMessage(i18nc("@info:status", "Invalid protocol '%1'", url.scheme()), KMessageWidget::Error);
+        } else {
+            showMessage(i18nc("@info:status", "Invalid protocol"), KMessageWidget::Error);
+        }

         m_urlNavigator->goBack();
     }
 }
 
 void DolphinViewContainer::slotUrlSelectionRequested(const QUrl &url)
 {
         m_urlNavigator->goBack();
     }
 }
 
 void DolphinViewContainer::slotUrlSelectionRequested(const QUrl &url)
 {

-    m_view->markUrlsAsSelected({url});
+    // We do not want to select any item here because there is no reason to assume that the user wants to edit the folder we are emerging from. BUG: 424723
+

     m_view->markUrlAsCurrent(url); // makes the item scroll into view
 }
 
     m_view->markUrlAsCurrent(url); // makes the item scroll into view
 }
 


@@ -907,7 +889,7 @@ void DolphinViewContainer::closeSearchBox()
 void DolphinViewContainer::stopDirectoryLoading()
 {
     m_view->stopLoading();
 void DolphinViewContainer::stopDirectoryLoading()
 {
     m_view->stopLoading();

-    m_statusBar->setProgress(100);
+    m_statusBar->showProgress(QString(), 100);

 }
 
 void DolphinViewContainer::slotStatusBarZoomLevelChanged(int zoomLevel)
 }
 
 void DolphinViewContainer::slotStatusBarZoomLevelChanged(int zoomLevel)


@@ -915,9 +897,9 @@ void DolphinViewContainer::slotStatusBarZoomLevelChanged(int zoomLevel)
     m_view->setZoomLevel(zoomLevel);
 }
 
     m_view->setZoomLevel(zoomLevel);
 }
 

-void DolphinViewContainer::showErrorMessage(const QString &msg)
+void DolphinViewContainer::showErrorMessage(const QString &message)

 {
 {

-    showMessage(msg, Error);
+    showMessage(message, KMessageWidget::Error);

 }
 
 void DolphinViewContainer::slotPlacesModelChanged()
 }
 
 void DolphinViewContainer::slotPlacesModelChanged()


@@ -951,7 +933,7 @@ void DolphinViewContainer::slotCurrentDirectoryRemoved()
         setUrl(newUrl);
     }
 
         setUrl(newUrl);
     }
 

-    showMessage(xi18n("Current location changed, <filename>%1</filename> is no longer accessible.", location), Warning);
+    showMessage(xi18n("Current location changed, <filename>%1</filename> is no longer accessible.", location), KMessageWidget::Warning);

 }
 
 void DolphinViewContainer::slotOpenUrlFinished(KJob *job)
 }
 
 void DolphinViewContainer::slotOpenUrlFinished(KJob *job)