2017-09-03 09:18:04 +00:00
|
|
|
cmake_minimum_required(VERSION 3.0)
|
2014-06-28 22:49:11 +00:00
|
|
|
|
2015-07-29 20:54:54 +00:00
|
|
|
# KDE Application Version, managed by release script
|
2018-11-10 07:37:42 +00:00
|
|
|
set (KDE_APPLICATIONS_VERSION_MAJOR "19")
|
2019-03-16 21:11:47 +00:00
|
|
|
set (KDE_APPLICATIONS_VERSION_MINOR "07")
|
2016-07-19 21:28:02 +00:00
|
|
|
set (KDE_APPLICATIONS_VERSION_MICRO "70")
|
2015-07-29 20:54:54 +00:00
|
|
|
set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
|
2017-09-03 09:18:04 +00:00
|
|
|
project(Dolphin VERSION ${KDE_APPLICATIONS_VERSION})
|
2015-02-25 20:45:19 +00:00
|
|
|
|
2018-03-08 09:21:13 +00:00
|
|
|
set(QT_MIN_VERSION "5.8.0")
|
2019-05-21 18:27:29 +00:00
|
|
|
set(KF5_MIN_VERSION "5.58.0")
|
2015-02-25 20:45:19 +00:00
|
|
|
|
2014-06-28 22:49:11 +00:00
|
|
|
# ECM setup
|
2018-03-11 16:09:11 +00:00
|
|
|
find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
|
2015-04-22 13:29:39 +00:00
|
|
|
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
|
2014-06-28 22:49:11 +00:00
|
|
|
|
|
|
|
include(ECMSetupVersion)
|
2015-02-25 11:12:55 +00:00
|
|
|
include(ECMGenerateHeaders)
|
2017-12-01 18:01:59 +00:00
|
|
|
include(CMakePackageConfigHelpers)
|
2014-06-28 22:49:11 +00:00
|
|
|
include(GenerateExportHeader)
|
|
|
|
include(FeatureSummary)
|
|
|
|
include(KDEInstallDirs)
|
|
|
|
include(KDECMakeSettings)
|
2016-01-19 12:14:00 +00:00
|
|
|
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
|
2018-11-02 12:23:10 +00:00
|
|
|
include(ECMQtDeclareLoggingCategory)
|
2014-06-28 22:49:11 +00:00
|
|
|
|
2015-08-22 16:22:37 +00:00
|
|
|
ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX DOLPHIN
|
|
|
|
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/src/dolphin_version.h"
|
|
|
|
)
|
|
|
|
|
2015-08-12 20:23:37 +00:00
|
|
|
ecm_setup_version("5.0.0" VARIABLE_PREFIX DOLPHINVCS
|
2015-02-25 11:12:55 +00:00
|
|
|
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/dolphinvcs_version.h"
|
|
|
|
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/DolphinVcsConfigVersion.cmake"
|
|
|
|
SOVERSION 5
|
|
|
|
)
|
|
|
|
|
2015-08-12 20:23:37 +00:00
|
|
|
ecm_setup_version("5.0.0" VARIABLE_PREFIX DOLPHINPRIVATE
|
2014-06-28 22:49:11 +00:00
|
|
|
SOVERSION 5
|
|
|
|
)
|
|
|
|
|
2015-02-25 20:45:19 +00:00
|
|
|
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
|
|
|
|
Core
|
2015-02-27 19:17:59 +00:00
|
|
|
Concurrent
|
2015-02-25 20:45:19 +00:00
|
|
|
Widgets
|
|
|
|
Gui
|
|
|
|
DBus
|
|
|
|
)
|
|
|
|
|
|
|
|
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
|
|
|
|
DocTools
|
|
|
|
Init
|
|
|
|
KCMUtils
|
|
|
|
NewStuff
|
|
|
|
CoreAddons
|
|
|
|
I18n
|
|
|
|
DBusAddons
|
|
|
|
Bookmarks
|
|
|
|
Config
|
|
|
|
KIO
|
|
|
|
Parts
|
|
|
|
Solid
|
2015-02-26 16:40:06 +00:00
|
|
|
IconThemes
|
|
|
|
Completion
|
2015-08-26 12:53:44 +00:00
|
|
|
TextWidgets
|
2015-02-26 16:40:06 +00:00
|
|
|
Notifications
|
2015-11-14 21:37:40 +00:00
|
|
|
Crash
|
Open externally called files/directories in new tabs
Summary:
FEATURE: 183429
FIXED-IN: 19.08.0
GUI: new cli argument --new-window
Externally called files/directories are opened in a a new tab of an instance of Dolphin that already exists. If any of the given URIs are already open in a tab, then those tabs are activated instead of a new tab being opened. If there is no instance then the files/directories are opened in a new window. The newly opened file/directory has its tab activated, and consequently, the window is also activated.
When the user clicks "Open In New Window" or "Detach Tab", the files/directories are opened in a new window.
Test Plan:
[Manual]
Before testing, set the default file manager in system settings as the newly built Dolphin executable.
One must also include the new dolphin executable in the $PATH, otherwise some functions will attempt to open the system dolphin instead of the new one.
Furthermore, running two different versions of Dolphin (in particular, where one does not have this patch included) can result in bugs appearing, in particular, new tabs not opening as old instances will not recognise the DBus commands sent to it. However, I see no reason why a user will have two different versions of Dolphin (apart from people like us :D).
Open directories with the help of auxillary programs (i.e. a browser). The files/directories should appear in a new window if an instance does not exist. If an existence already exists, then a new tab should be opened and activated in that instance and the window activated.
Use QDBusViewer to open folders/items by calling the ShowFolders/ShowItems methods in org.freedesktop.FileManager1 of the Dolphin instance.
When a user chooses to "Open In New Window"/"Detach Tab" then the files/directories should be opened in a new window.
Reviewers: #dolphin, elvisangelaccio
Subscribers: zzag, dfaure, fvogt, fikrim, magar, fbg13, davidedmundson, kwin, ngraham, elvisangelaccio, anthonyfieroni, kfm-devel
Tags: #dolphin
Differential Revision: https://phabricator.kde.org/D16648
2019-05-30 20:22:43 +00:00
|
|
|
WindowSystem
|
2015-02-25 20:45:19 +00:00
|
|
|
)
|
2015-09-25 19:34:26 +00:00
|
|
|
find_package(KF5 ${KF5_MIN_VERSION} OPTIONAL_COMPONENTS
|
2015-02-25 20:45:19 +00:00
|
|
|
Activities
|
|
|
|
)
|
2019-01-15 17:47:27 +00:00
|
|
|
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"
|
|
|
|
)
|
2014-06-28 22:49:11 +00:00
|
|
|
|
|
|
|
find_package(Phonon4Qt5 CONFIG REQUIRED)
|
|
|
|
|
2019-01-15 17:53:45 +00:00
|
|
|
find_package(KF5Baloo ${KF5_MIN_VERSION})
|
2014-06-28 22:49:11 +00:00
|
|
|
set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "Baloo Core libraries"
|
|
|
|
URL "http://www.kde.org"
|
|
|
|
TYPE OPTIONAL
|
|
|
|
PURPOSE "For adding desktop-wide search and tagging support to dolphin"
|
|
|
|
)
|
|
|
|
|
[InformationPanel] Use the new inline configuration mode
Summary:
The current external configuration dialog has some issues:
- its layout is suboptimal, as its initial size is typically to small
- it is quite disassociated with the actual widget it configures, properties
have a different order, and the property names can be quite abstract
without the corresponding value.
Doing the visibility selection inline typically avoids the sizing problem,
as the containing application (dolphin) is often vertically maximized.
The selection becomes more obvious, as the item order is kept,
and the values are shown.
Depends on D20524
CCBUG: 389571
Reviewers: #dolphin, #baloo, #frameworks, ngraham, astippich, #vdg, elvisangelaccio
Reviewed By: #dolphin, elvisangelaccio
Subscribers: elvisangelaccio, meven, kfm-devel
Tags: #dolphin
Differential Revision: https://phabricator.kde.org/D20525
2019-04-14 00:44:01 +00:00
|
|
|
find_package(KF5BalooWidgets 19.07.70)
|
2014-06-28 22:49:11 +00:00
|
|
|
set_package_properties(KF5BalooWidgets PROPERTIES DESCRIPTION "Baloos Widgets"
|
|
|
|
URL "http://www.kde.org"
|
|
|
|
TYPE OPTIONAL
|
|
|
|
)
|
|
|
|
|
2019-01-15 17:53:45 +00:00
|
|
|
find_package(KF5FileMetaData ${KF5_MIN_VERSION})
|
2014-06-28 22:49:11 +00:00
|
|
|
set_package_properties(KF5FileMetaData PROPERTIES
|
|
|
|
URL "https://projects.kde.org/kfilemetadata"
|
|
|
|
TYPE OPTIONAL
|
|
|
|
PURPOSE "For accessing file metadata labels"
|
|
|
|
)
|
|
|
|
|
2019-01-15 17:47:27 +00:00
|
|
|
if (KF5Activities_FOUND)
|
|
|
|
set(HAVE_KACTIVITIES TRUE)
|
|
|
|
endif()
|
|
|
|
|
2014-06-28 22:49:11 +00:00
|
|
|
if (KF5Baloo_FOUND AND KF5BalooWidgets_FOUND AND KF5FileMetaData_FOUND)
|
2015-02-04 11:27:20 +00:00
|
|
|
message(STATUS "Baloo packages are found")
|
2014-06-28 22:49:11 +00:00
|
|
|
set(HAVE_BALOO TRUE)
|
2015-02-26 16:40:06 +00:00
|
|
|
else()
|
2018-08-13 21:36:35 +00:00
|
|
|
message(WARNING "Baloo packages not found. They are needed for the metadata features of Dolphin (including the information panel).")
|
2014-06-28 22:49:11 +00:00
|
|
|
endif()
|
|
|
|
|
2019-01-28 21:38:21 +00:00
|
|
|
# TODO: drop HAVE_TERMINAL once we are sure the terminal panel works on Windows too.
|
|
|
|
if(WIN32)
|
|
|
|
set(HAVE_TERMINAL FALSE)
|
|
|
|
else()
|
|
|
|
set(HAVE_TERMINAL TRUE)
|
|
|
|
endif()
|
|
|
|
|
2006-11-21 06:02:05 +00:00
|
|
|
add_subdirectory(src)
|
2015-03-06 21:44:23 +00:00
|
|
|
add_subdirectory(doc)
|
2014-06-28 22:49:11 +00:00
|
|
|
|
2015-02-25 11:12:55 +00:00
|
|
|
# CMake files
|
2015-02-25 20:40:24 +00:00
|
|
|
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/DolphinVcs")
|
2015-02-25 11:12:55 +00:00
|
|
|
|
2017-12-01 18:01:59 +00:00
|
|
|
configure_package_config_file(
|
2015-02-25 11:12:55 +00:00
|
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/DolphinVcsConfig.cmake.in"
|
|
|
|
"${CMAKE_CURRENT_BINARY_DIR}/DolphinVcsConfig.cmake"
|
|
|
|
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
|
|
|
|
)
|
|
|
|
|
|
|
|
install(FILES
|
|
|
|
"${CMAKE_CURRENT_BINARY_DIR}/DolphinVcsConfig.cmake"
|
|
|
|
"${CMAKE_CURRENT_BINARY_DIR}/DolphinVcsConfigVersion.cmake"
|
|
|
|
DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
|
|
|
|
COMPONENT Devel
|
|
|
|
)
|
|
|
|
|
|
|
|
install(EXPORT DolphinVcsTargets
|
|
|
|
DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
|
|
|
|
FILE DolphinVcsTargets.cmake
|
|
|
|
)
|
|
|
|
|
|
|
|
install(FILES
|
|
|
|
"${CMAKE_CURRENT_BINARY_DIR}/dolphinvcs_version.h"
|
|
|
|
DESTINATION "${KDE_INSTALL_INCLUDEDIR}/Dolphin"
|
|
|
|
COMPONENT Devel
|
|
|
|
)
|
|
|
|
|
2015-04-22 13:29:39 +00:00
|
|
|
configure_file(org.kde.dolphin.FileManager1.service.in
|
|
|
|
${CMAKE_CURRENT_BINARY_DIR}/org.kde.dolphin.FileManager1.service)
|
|
|
|
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.dolphin.FileManager1.service
|
|
|
|
DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
|
|
|
|
|
2019-06-16 10:02:42 +00:00
|
|
|
if (ECM_VERSION VERSION_GREATER_EQUAL "5.59.0")
|
2019-06-13 05:07:25 +00:00
|
|
|
install(FILES dolphin.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
|
|
|
|
else()
|
|
|
|
install(FILES dolphin.categories DESTINATION ${KDE_INSTALL_CONFDIR})
|
|
|
|
endif()
|
2018-11-02 12:23:10 +00:00
|
|
|
|
2015-02-27 07:16:15 +00:00
|
|
|
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
|
|
|
|
|