diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt --- a/effects/CMakeLists.txt +++ b/effects/CMakeLists.txt @@ -75,7 +75,7 @@ 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 @@ 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 @@ 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 --- a/effects/cube/CMakeLists.txt +++ b/effects/cube/CMakeLists.txt @@ -9,7 +9,6 @@ ####################################### # 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 @@ 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/cube/CMakeLists.txt b/effects/cubeslide/CMakeLists.txt copy from effects/cube/CMakeLists.txt copy to effects/cubeslide/CMakeLists.txt --- a/effects/cube/CMakeLists.txt +++ b/effects/cubeslide/CMakeLists.txt @@ -1,34 +1,6 @@ -####################################### -# Effect - -# Data files -install( FILES - data/cubecap.png - DESTINATION ${DATA_INSTALL_DIR}/kwin ) - ####################################### # 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) -kconfig_add_kcfg_files(kwin_cube_config_SRCS cubeconfig.kcfgc) - -add_library(kwin_cube_config MODULE ${kwin_cube_config_SRCS}) - -target_link_libraries(kwin_cube_config - KF5::ConfigWidgets - KF5::GlobalAccel - KF5::I18n - KF5::XmlGui - KF5::KIOWidgets - KF5::Service -) - -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) @@ -47,7 +19,6 @@ install( TARGETS - kwin_cube_config kwin_cubeslide_config DESTINATION ${PLUGIN_INSTALL_DIR}/kwin/effects/configs diff --git a/effects/cube/cubeslide.h b/effects/cubeslide/cubeslide.h rename from effects/cube/cubeslide.h rename to effects/cubeslide/cubeslide.h diff --git a/effects/cube/cubeslide.cpp b/effects/cubeslide/cubeslide.cpp rename from effects/cube/cubeslide.cpp rename to effects/cubeslide/cubeslide.cpp diff --git a/effects/cube/cubeslide.kcfg b/effects/cubeslide/cubeslide.kcfg rename from effects/cube/cubeslide.kcfg rename to effects/cubeslide/cubeslide.kcfg diff --git a/effects/cube/cubeslide_config.h b/effects/cubeslide/cubeslide_config.h rename from effects/cube/cubeslide_config.h rename to effects/cubeslide/cubeslide_config.h diff --git a/effects/cube/cubeslide_config.cpp b/effects/cubeslide/cubeslide_config.cpp 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 rename from effects/cube/cubeslide_config.desktop rename to effects/cubeslide/cubeslide_config.desktop diff --git a/effects/cube/cubeslide_config.ui b/effects/cubeslide/cubeslide_config.ui 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 rename from effects/cube/cubeslideconfig.kcfgc rename to effects/cubeslide/cubeslideconfig.kcfgc diff --git a/effects/effect_builtins.cpp b/effects/effect_builtins.cpp --- a/effects/effect_builtins.cpp +++ b/effects/effect_builtins.cpp @@ -49,7 +49,7 @@ // 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"