X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/64e40c1d934247fc9e1c2fa00761b2cb8d70a146..92b178b7404b002778d8288353f65e27ee5de5dd:/src/CMakeLists.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1a229f6a7..fe9ac1f45 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,6 @@ include(ECMAddAppIcon) +set(ADMIN_WORKER_PACKAGE_NAME "kio-admin") configure_file(config-dolphin.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-dolphin.h) add_definitions( @@ -23,7 +24,7 @@ generate_export_header(dolphinvcs BASE_NAME dolphinvcs) target_link_libraries( dolphinvcs PUBLIC - Qt${QT_MAJOR_VERSION}::Widgets + Qt6::Widgets ) set_target_properties(dolphinvcs PROPERTIES @@ -83,6 +84,7 @@ target_sources(dolphinprivate PRIVATE kitemviews/private/kitemlistsmoothscroller.cpp kitemviews/private/kitemlistviewanimation.cpp kitemviews/private/kitemlistviewlayouter.cpp + kitemviews/private/kitemviewsutils.cpp kitemviews/private/kpixmapmodifier.cpp settings/applyviewpropsjob.cpp settings/viewmodes/viewmodesettings.cpp @@ -188,6 +190,7 @@ kconfig_add_kcfg_files(dolphinprivate settings/dolphin_generalsettings.kcfgc settings/dolphin_contextmenusettings.kcfgc settings/dolphin_versioncontrolsettings.kcfgc + GENERATE_MOC ) generate_export_header(dolphinprivate BASE_NAME dolphin) @@ -195,8 +198,9 @@ generate_export_header(dolphinprivate BASE_NAME dolphin) target_link_libraries( dolphinprivate PUBLIC dolphinvcs - Qt${QT_MAJOR_VERSION}::Concurrent - Qt${QT_MAJOR_VERSION}::Gui + Qt6::Concurrent + Qt6::DBus + Qt6::Gui KF6::I18n KF6::IconThemes KF6::KIOCore @@ -212,8 +216,6 @@ target_link_libraries( KF6::Codecs KF6::KCMUtils - KF6::MoreTools - ${FTS_LIB} ) @@ -254,7 +256,7 @@ target_link_libraries(dolphinpart dolphinprivate ) -install(TARGETS dolphinpart DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/parts) +install(TARGETS dolphinpart DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf6/parts) install(FILES dolphinpartactions.desktop DESTINATION "${KDE_INSTALL_DATADIR}/dolphin/") ########################################## @@ -262,6 +264,10 @@ install(FILES dolphinpartactions.desktop DESTINATION "${KDE_INSTALL_DATADIR}/dol add_library(dolphinstatic STATIC) target_sources(dolphinstatic PRIVATE + admin/bar.cpp + admin/workerintegration.cpp + animatedheightwidget.cpp + disabledactionnotifier.cpp dolphinbookmarkhandler.cpp dolphindockwidget.cpp dolphinmainwindow.cpp @@ -269,6 +275,7 @@ target_sources(dolphinstatic PRIVATE dolphincontextmenu.cpp dolphinnavigatorswidgetaction.cpp dolphintabbar.cpp + dolphinpackageinstaller.cpp dolphinplacesmodelsingleton.cpp dolphinrecenttabsmenu.cpp dolphintabpage.cpp @@ -319,6 +326,9 @@ target_sources(dolphinstatic PRIVATE global.cpp dolphin.qrc + admin/bar.h + admin/workerintegration.h + animatedheightwidget.h dolphinbookmarkhandler.h dolphindockwidget.h dolphinmainwindow.h @@ -326,6 +336,7 @@ target_sources(dolphinstatic PRIVATE dolphincontextmenu.h dolphinnavigatorswidgetaction.h dolphintabbar.h + dolphinpackageinstaller.h dolphinplacesmodelsingleton.h dolphinrecenttabsmenu.h dolphintabpage.h @@ -382,11 +393,18 @@ if(HAVE_BALOO) panels/information/informationpanelcontent.cpp panels/information/pixmapviewer.cpp panels/information/phononwidget.cpp + settings/interface/panelsettingspage.cpp panels/information/informationpanel.h panels/information/informationpanelcontent.h panels/information/pixmapviewer.h panels/information/phononwidget.h + settings/interface/panelsettingspage.h + ) + + kconfig_add_kcfg_files(dolphinstatic + panels/information/dolphin_informationpanelsettings.kcfgc ) + endif() if(HAVE_KUSERFEEDBACK) @@ -404,7 +422,6 @@ endif() kconfig_add_kcfg_files(dolphinstatic panels/folders/dolphin_folderspanelsettings.kcfgc - panels/information/dolphin_informationpanelsettings.kcfgc panels/places/dolphin_placespanelsettings.kcfgc settings/dolphin_compactmodesettings.kcfgc settings/dolphin_detailsmodesettings.kcfgc @@ -434,21 +451,29 @@ target_link_libraries(dolphinstatic KF6::KCMUtils KF6::DBusAddons KF6::Notifications - Phonon::phonon4qt${QT_MAJOR_VERSION} + KF6::BookmarksWidgets + Phonon::phonon4qt6 ) -if (HAVE_KACTIVITIES) +if (HAVE_PLASMA_ACTIVITIES) + target_link_libraries( + dolphinstatic + Plasma::Activities + ) +endif() + +if(HAVE_PACKAGEKIT) target_link_libraries( dolphinstatic - KF6::Activities + PK::packagekitqt6 ) endif() if (HAVE_KUSERFEEDBACK) target_link_libraries( dolphinstatic - KUserFeedbackCoreQt6 - KUserFeedbackWidgetsQt6 + KF6::UserFeedbackCore + KF6::UserFeedbackWidgets ) endif() @@ -464,9 +489,18 @@ if(FLATPAK) target_compile_definitions(dolphin PRIVATE FLATPAK) endif() -# Sets the icon on Windows and OSX -file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/*system-file-manager.png") -ecm_add_app_icon(dolphin ICONS ${ICONS_SRCS}) +# Install the icons on macOS and Windows +ecm_add_app_icon(dolphin + ICONS + icons/128-apps-org.kde.dolphin.png + icons/16-apps-org.kde.dolphin.png + icons/22-apps-org.kde.dolphin.png + icons/32-apps-org.kde.dolphin.png + icons/48-apps-org.kde.dolphin.png + icons/64-apps-org.kde.dolphin.png +) + +install(FILES icons/org.kde.dolphin.svg DESTINATION ${KDE_INSTALL_ICONDIR}/hicolor/scalable/apps) target_link_libraries(dolphin PRIVATE @@ -476,11 +510,7 @@ target_link_libraries(dolphin ) if (HAVE_X11) - if (QT_MAJOR_VERSION STREQUAL "5") - target_link_libraries(dolphin PRIVATE Qt{QT_MAJOR_VERSION}::X11Extras) - else() - target_link_libraries(dolphin PRIVATE Qt::GuiPrivate) - endif() + target_link_libraries(dolphin PRIVATE Qt::GuiPrivate) endif() include(DbusInterfaceMacros) @@ -551,10 +581,13 @@ if(NOT WIN32) settings/dolphin_contentdisplaysettings.kcfgc settings/dolphin_generalsettings.kcfgc settings/dolphin_versioncontrolsettings.kcfgc + GENERATE_MOC ) kconfig_add_kcfg_files(kcm_dolphingeneral - settings/dolphin_generalsettings.kcfgc) + settings/dolphin_generalsettings.kcfgc + GENERATE_MOC + ) target_link_libraries(kcm_dolphinviewmodes dolphinprivate) target_link_libraries(kcm_dolphingeneral dolphinprivate) @@ -591,8 +624,22 @@ install( FILES settings/dolphin_directoryviewpropertysettings.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} ) install( FILES settings/dolphin_detailsmodesettings.upd + settings/dolphin_directorysizemode.upd + settings/dolphin_directorysizemode.py DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR} ) if(BUILD_TESTING) add_subdirectory(tests) endif() + +# movetonewfolderitemaction plugin + +kcoreaddons_add_plugin(movetonewfolderitemaction + SOURCES itemactions/movetonewfolderitemaction.cpp itemactions/movetonewfolderitemaction.h + INSTALL_NAMESPACE "kf6/kfileitemaction") + +target_link_libraries(movetonewfolderitemaction + KF6::I18n + KF6::KIOCore + KF6::KIOWidgets + KF6::KIOFileWidgets)