diff options
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/config-dolphin.h.cmake | 1 | ||||
| -rw-r--r-- | src/dolphinmainwindow.cpp | 6 | ||||
| -rw-r--r-- | src/dolphinmainwindow.h | 3 | ||||
| -rw-r--r-- | src/dolphinviewcontainer.cpp | 7 |
6 files changed, 9 insertions, 25 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d7f1cb57a..6a17bf6ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,12 +91,6 @@ endif() find_package(KF6 ${KF6_MIN_VERSION} OPTIONAL_COMPONENTS DocTools ) -find_package(PlasmaActivities) -set_package_properties(PlasmaActivities PROPERTIES DESCRIPTION "PlasmaActivities libraries" - URL "https://www.kde.org" - TYPE OPTIONAL - PURPOSE "For tracking which folders are frequently accessed on a Plasma desktop" - ) find_package(Phonon4Qt6 CONFIG REQUIRED) @@ -130,10 +124,6 @@ set_package_properties(KF6FileMetaData PROPERTIES PURPOSE "For accessing file metadata labels" ) -if (PlasmaActivities_FOUND) - set(HAVE_PLASMA_ACTIVITIES TRUE) -endif() - if (KF6Baloo_FOUND AND KF6BalooWidgets_FOUND AND KF6FileMetaData_FOUND) message(STATUS "Baloo packages are found") set(HAVE_BALOO TRUE) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fe9ac1f45..6b1d9c7b0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -455,13 +455,6 @@ target_link_libraries(dolphinstatic Phonon::phonon4qt6 ) -if (HAVE_PLASMA_ACTIVITIES) - target_link_libraries( - dolphinstatic - Plasma::Activities - ) -endif() - if(HAVE_PACKAGEKIT) target_link_libraries( dolphinstatic diff --git a/src/config-dolphin.h.cmake b/src/config-dolphin.h.cmake index 903b7e7db..05ae7d2f9 100644 --- a/src/config-dolphin.h.cmake +++ b/src/config-dolphin.h.cmake @@ -1,6 +1,5 @@ /** Set whether to build Dolphin with support for these technologies or not. */ #cmakedefine01 HAVE_BALOO -#cmakedefine01 HAVE_PLASMA_ACTIVITIES #cmakedefine01 HAVE_KUSERFEEDBACK #cmakedefine01 HAVE_PACKAGEKIT #cmakedefine01 HAVE_TERMINAL diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index bc88d643e..8bc066455 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -53,6 +53,7 @@ #include <KMessageBox> #include <KProtocolInfo> #include <KProtocolManager> +#include <KRecentFilesAction> #include <KShell> #include <KShortcutsDialog> #include <KStandardAction> @@ -365,6 +366,9 @@ void DolphinMainWindow::changeUrl(const QUrl &url) updateViewActions(); updateGoActions(); + // will signal used urls to activities manager, too + m_recentFiles->addUrl(url); + Q_EMIT urlChanged(url); } @@ -2157,6 +2161,8 @@ void DolphinMainWindow::setupActions() connect(openInSplitViewAction, &QAction::triggered, this, [this]() { openInSplitView(QUrl()); }); + + m_recentFiles = new KRecentFilesAction(this); } void DolphinMainWindow::setupDockWidgets() diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index 5f96ca3b6..5f2ed20ca 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -42,6 +42,7 @@ class KFileItem; class KFileItemList; class KJob; class KNewFileMenu; +class KRecentFilesAction; class KToolBarPopupAction; class QToolButton; class PlacesPanel; @@ -759,6 +760,8 @@ private: KIO::CommandLauncherJob *m_job; + KRecentFilesAction *m_recentFiles = nullptr; + friend class DolphinMainWindowTest; }; diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index fbad258ac..ce91dbfe8 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -21,9 +21,6 @@ #include "statusbar/dolphinstatusbar.h" #include <KActionCollection> -#if HAVE_PLASMA_ACTIVITIES -#include <PlasmaActivities/ResourceInstance> -#endif #include <KApplicationTrader> #include <KFileItemActions> #include <KFilePlacesModel> @@ -570,10 +567,6 @@ void DolphinViewContainer::setUrl(const QUrl &newUrl) if (newUrl != m_urlNavigator->locationUrl()) { m_urlNavigator->setLocationUrl(newUrl); } - -#if HAVE_PLASMA_ACTIVITIES - KActivities::ResourceInstance::notifyAccessed(newUrl); -#endif } void DolphinViewContainer::setFilterBarVisible(bool visible) |