Bring back KActivities support

Summary: This code has been unused since the KF5 port.

Reviewers: #dolphin, #plasma

Subscribers: kfm-devel

Tags: #dolphin

Differential Revision: https://phabricator.kde.org/D18273

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72ab75d365b573ef633e7c257520a57b24bc0345..09fafe5c9531957fc07cef62aabfc22a2657be43 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,6 +68,11 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
 find_package(KF5 ${KF5_MIN_VERSION} OPTIONAL_COMPONENTS
     Activities
 )
+set_package_properties(KF5Activities PROPERTIES DESCRIPTION "KActivities libraries"
+                       URL "http://www.kde.org"
+                       TYPE OPTIONAL
+                       PURPOSE "For tracking which folders are frequently accessed on a Plasma desktop"
+                      )
 
 find_package(Phonon4Qt5 CONFIG REQUIRED)
 
@@ -91,6 +96,10 @@ set_package_properties(KF5FileMetaData PROPERTIES
                        PURPOSE "For accessing file metadata labels"
                       )
 
+if (KF5Activities_FOUND)
+    set(HAVE_KACTIVITIES TRUE)
+endif()
+
 if (KF5Baloo_FOUND AND KF5BalooWidgets_FOUND AND KF5FileMetaData_FOUND)
     message(STATUS "Baloo packages are found")
     set(HAVE_BALOO TRUE)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1b4c943d4166c49c27f530189fb1d1ef87629a76..e0dd576793b54b22f1192a14fe1dd68074ad487b 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,7 +2,7 @@ include(ECMAddAppIcon)
 
 configure_file(config-baloo.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-baloo.h)
 
-configure_file(config-dolphin.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-dolphin.h)
+configure_file(config-kactivities.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kactivities.h)
 
 configure_file(config-terminal.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-terminal.h)
 
@@ -279,7 +279,7 @@ target_link_libraries(dolphinstatic
     Phonon::phonon4qt5
 )
 
-if (KF5Activities_FOUND)
+if (HAVE_KACTIVITIES)
     target_link_libraries(
         dolphinstatic
         KF5::Activities

diff --git a/src/config-dolphin.h.cmake b/src/config-dolphin.h.cmake
deleted file mode 100644 (file)
index 45e7208..0000000
--- a/src/config-dolphin.h.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-
-/* Define to 1 if you have the KActivities library. */
-#cmakedefine KF5Activities_FOUND 1
-

diff --git a/src/config-kactivities.h.cmake b/src/config-kactivities.h.cmake
new file mode 100644 (file)
index 0000000..e136858
--- /dev/null
+++ b/src/config-kactivities.h.cmake
@@ -0,0 +1 @@
+#cmakedefine HAVE_KACTIVITIES

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index cdce157eb989e9bd95829e08fdd5b39d10b712a5..e21262977a66039886a5c4e8c6ce103e0bf1f12b 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -30,6 +30,9 @@
 #include "views/viewmodecontroller.h"
 #include "views/viewproperties.h"
 
+#ifdef HAVE_KACTIVITIES
+#include <KActivities/ResourceInstance>
+#endif
 #include <KFileItemActions>
 #include <KFilePlacesModel>
 #include <KIO/PreviewJob>
@@ -63,8 +66,8 @@ DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) :
     m_statusBarTimer(nullptr),
     m_statusBarTimestamp(),
     m_autoGrabFocus(true)
-#ifdef KActivities_FOUND
-    , m_activityResourceInstance(0)
+#ifdef HAVE_KACTIVITIES
+    , m_activityResourceInstance(nullptr)
 #endif
 {
     hide();
@@ -221,11 +224,10 @@ DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) :
 
     // Initialize kactivities resource instance
 
-    #ifdef KActivities_FOUND
-    m_activityResourceInstance = new KActivities::ResourceInstance(
-            window()->winId(), url);
+#ifdef HAVE_KACTIVITIES
+    m_activityResourceInstance = new KActivities::ResourceInstance(window()->winId(), url);
     m_activityResourceInstance->setParent(this);
-    #endif
+#endif
 }
 
 DolphinViewContainer::~DolphinViewContainer()
@@ -243,13 +245,13 @@ void DolphinViewContainer::setActive(bool active)
     m_urlNavigator->setActive(active);
     m_view->setActive(active);
 
-    #ifdef KActivities_FOUND
+#ifdef HAVE_KACTIVITIES
     if (active) {
         m_activityResourceInstance->notifyFocusedIn();
     } else {
         m_activityResourceInstance->notifyFocusedOut();
     }
-    #endif
+#endif
 }
 
 bool DolphinViewContainer::isActive() const
@@ -469,9 +471,9 @@ void DolphinViewContainer::setUrl(const QUrl& newUrl)
         m_urlNavigator->setLocationUrl(newUrl);
     }
 
-    #ifdef KActivities_FOUND
+#ifdef HAVE_KACTIVITIES
     m_activityResourceInstance->setUri(newUrl);
-    #endif
+#endif
 }
 
 void DolphinViewContainer::setFilterBarVisible(bool visible)

diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index f33a5a11868e4cac9dd2807b3df89ddd0a09796b..2c4c7a7e196e0ba4d768c072d016fd6ae2de462f 100644 (file)
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -20,7 +20,7 @@
 #ifndef DOLPHINVIEWCONTAINER_H
 #define DOLPHINVIEWCONTAINER_H
 
-#include "config-dolphin.h"
+#include "config-kactivities.h"
 #include "views/dolphinview.h"
 
 #include <KCompletion>
@@ -32,7 +32,7 @@
 #include <QPushButton>
 #include <QWidget>
 
-#ifdef KF5Activities_FOUND
+#ifdef HAVE_KACTIVITIES
 namespace KActivities {
     class ResourceInstance;
 }
@@ -343,7 +343,7 @@ private:
     QElapsedTimer m_statusBarTimestamp;  // Time in ms since last update
     bool m_autoGrabFocus;
 
-#ifdef KF5Activities_FOUND
+#ifdef HAVE_KACTIVITIES
 private:
     KActivities::ResourceInstance * m_activityResourceInstance;
 #endif