X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/d9c11ee99906558ae853fc3b42167e884d2a940e..da15d5bf8535f9d9b77dbd71bdfaab3804c422d8:/src/dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 076551e5d..cf7778c82 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -20,8 +20,8 @@
 #include "statusbar/dolphinstatusbar.h"
 
 #include <KActionCollection>
-#if HAVE_KACTIVITIES
-#include <KActivities/ResourceInstance>
+#if HAVE_PLASMA_ACTIVITIES
+#include <PlasmaActivities/ResourceInstance>
 #endif
 #include <KApplicationTrader>
 #include <KFileItemActions>
@@ -71,9 +71,6 @@ DolphinViewContainer::DolphinViewContainer(const QUrl &url, QWidget *parent)
     , m_statusBarTimer(nullptr)
     , m_statusBarTimestamp()
     , m_autoGrabFocus(true)
-#if HAVE_KACTIVITIES
-    , m_activityResourceInstance(nullptr)
-#endif
 {
     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_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);
@@ -103,6 +100,7 @@ DolphinViewContainer::DolphinViewContainer(const QUrl &url, QWidget *parent)
 
     m_messageWidget = new KMessageWidget(this);
     m_messageWidget->setCloseButtonVisible(true);
+    m_messageWidget->setPosition(KMessageWidget::Header);
     m_messageWidget->hide();
 
 #ifndef Q_OS_WIN
@@ -114,7 +112,7 @@ DolphinViewContainer::DolphinViewContainer(const QUrl &url, QWidget *parent)
 
     // 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);
@@ -189,13 +187,6 @@ DolphinViewContainer::DolphinViewContainer(const QUrl &url, QWidget *parent)
     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()
@@ -219,14 +210,6 @@ void DolphinViewContainer::setActive(bool 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
@@ -343,12 +326,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);
-        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);
+
+        if (!QApplication::focusWidget() || m_selectionModeTopBar->isAncestorOf(QApplication::focusWidget())
+            || m_selectionModeBottomBar->isAncestorOf(QApplication::focusWidget())) {
+            m_view->setFocus();
+        }
         return;
     }
 
@@ -464,12 +449,12 @@ void DolphinViewContainer::readSettings()
 
 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)
 {
-    m_searchBox->setVisible(enabled);
+    m_searchBox->setVisible(enabled, WithAnimation);
 
     if (enabled) {
         const QUrl &locationUrl = m_urlNavigator->locationUrl();
@@ -591,8 +576,8 @@ void DolphinViewContainer::setUrl(const QUrl &newUrl)
         m_urlNavigator->setLocationUrl(newUrl);
     }
 
-#if HAVE_KACTIVITIES
-    m_activityResourceInstance->setUri(newUrl);
+#if HAVE_PLASMA_ACTIVITIES
+    KActivities::ResourceInstance::notifyAccessed(newUrl);
 #endif
 }
 
@@ -601,7 +586,7 @@ void DolphinViewContainer::setFilterBarVisible(bool visible)
     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 {
@@ -745,7 +730,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()) {
-        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