Add option to completely disable directory size counting

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index f5cb459fbcbbda0064679efe77684b815b2267d0..ecabbc379b27eaf35c658afe068f68d5a061f48c 100644 (file)
--- 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>
@@ -326,12 +326,13 @@ 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 (m_selectionModeTopBar->isAncestorOf(QApplication::focusWidget()) || m_selectionModeBottomBar->isAncestorOf(QApplication::focusWidget())) {
+            m_view->setFocus();
+        }
         return;
     }
 
@@ -574,7 +575,7 @@ void DolphinViewContainer::setUrl(const QUrl &newUrl)
         m_urlNavigator->setLocationUrl(newUrl);
     }
 
-#if HAVE_KACTIVITIES
+#if HAVE_PLASMA_ACTIVITIES
     KActivities::ResourceInstance::notifyAccessed(newUrl);
 #endif
 }