From fa6fa279354672c3685eb5a01dedbd36e24df744 Mon Sep 17 00:00:00 2001 From: Vlad Zagorodniy Date: Mon, 24 Sep 2018 09:36:11 +0300 Subject: [PATCH] [effects] Move the Desktop Cube Animation effect to its own directory Summary: Just little tidying. Reviewers: #kwin, davidedmundson Reviewed By: #kwin, davidedmundson Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D15725 --- effects/CMakeLists.txt | 5 ++-- effects/cube/CMakeLists.txt | 19 -------------- effects/cubeslide/CMakeLists.txt | 25 +++++++++++++++++++ effects/{cube => cubeslide}/cubeslide.cpp | 0 effects/{cube => cubeslide}/cubeslide.h | 0 effects/{cube => cubeslide}/cubeslide.kcfg | 0 .../{cube => cubeslide}/cubeslide_config.cpp | 0 .../cubeslide_config.desktop | 0 .../{cube => cubeslide}/cubeslide_config.h | 0 .../{cube => cubeslide}/cubeslide_config.ui | 0 .../{cube => cubeslide}/cubeslideconfig.kcfgc | 0 effects/effect_builtins.cpp | 2 +- 12 files changed, 29 insertions(+), 22 deletions(-) create mode 100644 effects/cubeslide/CMakeLists.txt rename effects/{cube => cubeslide}/cubeslide.cpp (100%) rename effects/{cube => cubeslide}/cubeslide.h (100%) rename effects/{cube => cubeslide}/cubeslide.kcfg (100%) rename effects/{cube => cubeslide}/cubeslide_config.cpp (100%) rename effects/{cube => cubeslide}/cubeslide_config.desktop (100%) rename effects/{cube => cubeslide}/cubeslide_config.h (100%) rename effects/{cube => cubeslide}/cubeslide_config.ui (100%) rename effects/{cube => cubeslide}/cubeslideconfig.kcfgc (100%) diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt index 06445ccb53..85595eabf7 100644 --- a/effects/CMakeLists.txt +++ b/effects/CMakeLists.txt @@ -75,7 +75,7 @@ set( kwin4_effect_builtins_sources colorpicker/colorpicker.cpp cube/cube.cpp cube/cube_proxy.cpp - cube/cubeslide.cpp + cubeslide/cubeslide.cpp coverswitch/coverswitch.cpp desktopgrid/desktopgrid.cpp diminactive/diminactive.cpp @@ -105,8 +105,8 @@ qt5_add_resources( kwin4_effect_builtins_sources shaders.qrc ) kconfig_add_kcfg_files(kwin4_effect_builtins_sources blur/blurconfig.kcfgc - cube/cubeslideconfig.kcfgc cube/cubeconfig.kcfgc + cubeslide/cubeslideconfig.kcfgc coverswitch/coverswitchconfig.kcfgc desktopgrid/desktopgridconfig.kcfgc diminactive/diminactiveconfig.kcfgc @@ -173,6 +173,7 @@ add_subdirectory( blur ) include( backgroundcontrast/CMakeLists.txt ) add_subdirectory( coverswitch ) add_subdirectory( cube ) +add_subdirectory( cubeslide ) add_subdirectory( flipswitch ) add_subdirectory( glide ) add_subdirectory( invert ) diff --git a/effects/cube/CMakeLists.txt b/effects/cube/CMakeLists.txt index 91be75fe38..ee9e52c90b 100644 --- a/effects/cube/CMakeLists.txt +++ b/effects/cube/CMakeLists.txt @@ -9,7 +9,6 @@ install( FILES ####################################### # Config -# cube set(kwin_cube_config_SRCS cube_config.cpp) ki18n_wrap_ui(kwin_cube_config_SRCS cube_config.ui) qt5_add_dbus_interface(kwin_cube_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface) @@ -28,27 +27,9 @@ target_link_libraries(kwin_cube_config kcoreaddons_desktop_to_json(kwin_cube_config cube_config.desktop SERVICE_TYPES kcmodule.desktop) -# cube slide -set(kwin_cubeslide_config_SRCS cubeslide_config.cpp) -ki18n_wrap_ui(kwin_cubeslide_config_SRCS cubeslide_config.ui) -qt5_add_dbus_interface(kwin_cubeslide_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface) -kconfig_add_kcfg_files(kwin_cubeslide_config_SRCS cubeslideconfig.kcfgc) - -add_library(kwin_cubeslide_config MODULE ${kwin_cubeslide_config_SRCS}) - -target_link_libraries(kwin_cubeslide_config - kwineffects - KF5::ConfigWidgets - KF5::I18n - KF5::Service -) - -kcoreaddons_desktop_to_json(kwin_cubeslide_config cubeslide_config.desktop SERVICE_TYPES kcmodule.desktop) - install( TARGETS kwin_cube_config - kwin_cubeslide_config DESTINATION ${PLUGIN_INSTALL_DIR}/kwin/effects/configs ) diff --git a/effects/cubeslide/CMakeLists.txt b/effects/cubeslide/CMakeLists.txt new file mode 100644 index 0000000000..3d3a29fa7a --- /dev/null +++ b/effects/cubeslide/CMakeLists.txt @@ -0,0 +1,25 @@ +####################################### +# Config + +set(kwin_cubeslide_config_SRCS cubeslide_config.cpp) +ki18n_wrap_ui(kwin_cubeslide_config_SRCS cubeslide_config.ui) +qt5_add_dbus_interface(kwin_cubeslide_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface) +kconfig_add_kcfg_files(kwin_cubeslide_config_SRCS cubeslideconfig.kcfgc) + +add_library(kwin_cubeslide_config MODULE ${kwin_cubeslide_config_SRCS}) + +target_link_libraries(kwin_cubeslide_config + kwineffects + KF5::ConfigWidgets + KF5::I18n + KF5::Service +) + +kcoreaddons_desktop_to_json(kwin_cubeslide_config cubeslide_config.desktop SERVICE_TYPES kcmodule.desktop) + +install( + TARGETS + kwin_cubeslide_config + DESTINATION + ${PLUGIN_INSTALL_DIR}/kwin/effects/configs +) diff --git a/effects/cube/cubeslide.cpp b/effects/cubeslide/cubeslide.cpp similarity index 100% rename from effects/cube/cubeslide.cpp rename to effects/cubeslide/cubeslide.cpp diff --git a/effects/cube/cubeslide.h b/effects/cubeslide/cubeslide.h similarity index 100% rename from effects/cube/cubeslide.h rename to effects/cubeslide/cubeslide.h diff --git a/effects/cube/cubeslide.kcfg b/effects/cubeslide/cubeslide.kcfg similarity index 100% rename from effects/cube/cubeslide.kcfg rename to effects/cubeslide/cubeslide.kcfg diff --git a/effects/cube/cubeslide_config.cpp b/effects/cubeslide/cubeslide_config.cpp similarity index 100% rename from effects/cube/cubeslide_config.cpp rename to effects/cubeslide/cubeslide_config.cpp diff --git a/effects/cube/cubeslide_config.desktop b/effects/cubeslide/cubeslide_config.desktop similarity index 100% rename from effects/cube/cubeslide_config.desktop rename to effects/cubeslide/cubeslide_config.desktop diff --git a/effects/cube/cubeslide_config.h b/effects/cubeslide/cubeslide_config.h similarity index 100% rename from effects/cube/cubeslide_config.h rename to effects/cubeslide/cubeslide_config.h diff --git a/effects/cube/cubeslide_config.ui b/effects/cubeslide/cubeslide_config.ui similarity index 100% rename from effects/cube/cubeslide_config.ui rename to effects/cubeslide/cubeslide_config.ui diff --git a/effects/cube/cubeslideconfig.kcfgc b/effects/cubeslide/cubeslideconfig.kcfgc similarity index 100% rename from effects/cube/cubeslideconfig.kcfgc rename to effects/cubeslide/cubeslideconfig.kcfgc diff --git a/effects/effect_builtins.cpp b/effects/effect_builtins.cpp index 7b4b7f782b..92f64c87e5 100644 --- a/effects/effect_builtins.cpp +++ b/effects/effect_builtins.cpp @@ -49,7 +49,7 @@ along with this program. If not, see . // OpenGL-specific effects for desktop #include "coverswitch/coverswitch.h" #include "cube/cube.h" -#include "cube/cubeslide.h" +#include "cubeslide/cubeslide.h" #include "flipswitch/flipswitch.h" #include "glide/glide.h" #include "invert/invert.h"