78ce54f88a
Summary:
Currently, if one wants to install a scripted effect from the KDE Store,
the effect won't show up in the Desktop Effects KCM. The reason for that
is kpackagetool5 doesn't know where to install effects (they have to be
installed under ${DATA_DIR}/kwin/effects).
Another problem is that even if the scripted effect is installed in the
right directory (e.g. ~/.local/share/kwin/effects), it won't be listed in
the Desktop Effects KCM because it doesn't have a desktop file in
kservices5 dir. Please notice that the effect will be "visible" for KWin, i.e.
you can enable it by editing kwinrc.
This diff addresses those 2 problems by:
* Adding a PackageStructure plugin for effects (so they are installed
under kwin/effects/);
* Using KPackage::PackageLoader to get list of scripted effect in the
Desktop Effects KCM.
Test Plan:
* Installed an effect from the KDE Store, it appeared in the Desktop Effects
KCM;
* Removed it.
Reviewers: #kwin, mart, davidedmundson
Reviewed By: #kwin, davidedmundson
Subscribers: ngraham, davidedmundson, kwin
Tags: #kwin
Differential Revision: https://phabricator.kde.org/D15372
87 lines
2.6 KiB
CMake
87 lines
2.6 KiB
CMake
#########################################################################
|
|
# KI18N Translation Domain for this library
|
|
add_definitions(-DTRANSLATION_DOMAIN=\"kcmkwincompositing\")
|
|
|
|
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
|
|
|
|
remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_CAST_FROM_BYTEARRAY)
|
|
|
|
include_directories(${KWIN_SOURCE_DIR}/effects)
|
|
|
|
################# configure checks and create the configured files #################
|
|
|
|
# now create config headers
|
|
configure_file(config-prefix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-prefix.h )
|
|
configure_file(config-compiler.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-compiler.h )
|
|
|
|
set(kwincomposing_SRC
|
|
model.cpp
|
|
main.cpp
|
|
compositing.cpp
|
|
effectconfig.cpp)
|
|
|
|
qt5_add_dbus_interface( kwincomposing_SRC
|
|
${KWIN_SOURCE_DIR}/org.kde.kwin.Compositing.xml kwin_compositing_interface)
|
|
qt5_add_dbus_interface( kwincomposing_SRC
|
|
${KWIN_SOURCE_DIR}/org.kde.kwin.Effects.xml kwin_effects_interface)
|
|
|
|
ki18n_wrap_ui(kwincomposing_SRC compositing.ui)
|
|
|
|
add_library(kwincompositing MODULE ${kwincomposing_SRC})
|
|
|
|
target_link_libraries(kwincompositing
|
|
Qt5::Quick
|
|
Qt5::QuickWidgets
|
|
Qt5::DBus
|
|
Qt5::Widgets
|
|
KF5::CoreAddons
|
|
KF5::ConfigCore
|
|
KF5::Declarative
|
|
KF5::I18n
|
|
KF5::Package
|
|
KF5::KCMUtils
|
|
KF5::NewStuff
|
|
kwin4_effect_builtins
|
|
)
|
|
|
|
if (BUILD_TESTING)
|
|
include(ECMMarkAsTest)
|
|
|
|
set(modelTest_SRC
|
|
model.cpp
|
|
effectconfig.cpp
|
|
compositing.cpp
|
|
test/effectmodeltest.cpp
|
|
test/modeltest.cpp)
|
|
|
|
qt5_add_dbus_interface(modelTest_SRC
|
|
${KWIN_SOURCE_DIR}/org.kde.kwin.Compositing.xml kwin_compositing_interface)
|
|
qt5_add_dbus_interface(modelTest_SRC
|
|
${KWIN_SOURCE_DIR}/org.kde.kwin.Effects.xml kwin_effects_interface)
|
|
|
|
add_executable(effectModelTest ${modelTest_SRC})
|
|
ecm_mark_as_test(effectModelTest)
|
|
|
|
target_link_libraries(effectModelTest
|
|
Qt5::Quick
|
|
Qt5::QuickWidgets
|
|
Qt5::DBus
|
|
Qt5::Test
|
|
Qt5::Widgets
|
|
KF5::CoreAddons
|
|
KF5::ConfigCore
|
|
KF5::Declarative
|
|
KF5::I18n
|
|
KF5::Package
|
|
KF5::KCMUtils
|
|
KF5::NewStuff
|
|
kwineffects
|
|
kwin4_effect_builtins
|
|
)
|
|
endif()
|
|
|
|
INSTALL(DIRECTORY qml DESTINATION ${DATA_INSTALL_DIR}/kwincompositing)
|
|
INSTALL(TARGETS kwincompositing DESTINATION ${PLUGIN_INSTALL_DIR})
|
|
install(FILES kwincompositing.desktop kcmkwineffects.desktop DESTINATION ${SERVICES_INSTALL_DIR})
|
|
install(FILES kwineffect.knsrc DESTINATION ${CONFIG_INSTALL_DIR})
|
|
################# list the subdirectories #################
|