diff --git a/CMakeLists.txt b/CMakeLists.txt index 84a79114b..8deeea411 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -195,7 +195,8 @@ install(FILES ################# list the subdirectories ################# add_subdirectory(src) -add_subdirectory( desktoptheme ) +add_subdirectory(desktoptheme) +add_subdirectory(examples) install(EXPORT PlasmaTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE PlasmaTargets.cmake NAMESPACE KF5:: COMPONENT Devel) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt new file mode 100644 index 000000000..388e4eca8 --- /dev/null +++ b/examples/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(applets) diff --git a/examples/applets/CMakeLists.txt b/examples/applets/CMakeLists.txt new file mode 100644 index 000000000..64340b298 --- /dev/null +++ b/examples/applets/CMakeLists.txt @@ -0,0 +1,4 @@ + +plasma_install_package(conditionalloader org.kde.example.conditionalloader) +plasma_install_package(testcomponents org.kde.example.testcomponents) +plasma_install_package(testshaders org.kde.example.testshaders) \ No newline at end of file diff --git a/src/shell/applets/testapplet/contents/config/config.qml b/examples/applets/conditionalloader/contents/config/config.qml similarity index 100% rename from src/shell/applets/testapplet/contents/config/config.qml rename to examples/applets/conditionalloader/contents/config/config.qml diff --git a/src/shell/applets/testapplet/contents/config/main.xml b/examples/applets/conditionalloader/contents/config/main.xml similarity index 100% rename from src/shell/applets/testapplet/contents/config/main.xml rename to examples/applets/conditionalloader/contents/config/main.xml diff --git a/src/shell/applets/testapplet/contents/ui/configGeneral.qml b/examples/applets/conditionalloader/contents/ui/configGeneral.qml similarity index 100% rename from src/shell/applets/testapplet/contents/ui/configGeneral.qml rename to examples/applets/conditionalloader/contents/ui/configGeneral.qml diff --git a/src/shell/applets/testapplet/contents/ui/main.qml b/examples/applets/conditionalloader/contents/ui/main.qml similarity index 100% rename from src/shell/applets/testapplet/contents/ui/main.qml rename to examples/applets/conditionalloader/contents/ui/main.qml diff --git a/src/shell/applets/testapplet/metadata.desktop b/examples/applets/conditionalloader/metadata.desktop similarity index 92% rename from src/shell/applets/testapplet/metadata.desktop rename to examples/applets/conditionalloader/metadata.desktop index fedec08a4..ccf08874d 100644 --- a/src/shell/applets/testapplet/metadata.desktop +++ b/examples/applets/conditionalloader/metadata.desktop @@ -24,7 +24,7 @@ X-KDE-PluginInfo-Author=Marco Martin X-KDE-PluginInfo-Category= X-KDE-PluginInfo-Email=mart@kde.org X-KDE-PluginInfo-License=GPLv2+ -X-KDE-PluginInfo-Name=org.kde.testapplet +X-KDE-PluginInfo-Name=org.kde.example.conditionalloader X-KDE-PluginInfo-Version= X-KDE-PluginInfo-Website= X-Plasma-MainScript=ui/main.qml diff --git a/src/shell/applets/testcomponentsapplet/contents/images/bridge.jpg b/examples/applets/testcomponents/contents/images/bridge.jpg similarity index 100% rename from src/shell/applets/testcomponentsapplet/contents/images/bridge.jpg rename to examples/applets/testcomponents/contents/images/bridge.jpg diff --git a/src/shell/applets/testcomponentsapplet/contents/images/surfboard.jpg b/examples/applets/testcomponents/contents/images/surfboard.jpg similarity index 100% rename from src/shell/applets/testcomponentsapplet/contents/images/surfboard.jpg rename to examples/applets/testcomponents/contents/images/surfboard.jpg diff --git a/src/shell/applets/testcomponentsapplet/contents/ui/ButtonsPage.qml b/examples/applets/testcomponents/contents/ui/ButtonsPage.qml similarity index 100% rename from src/shell/applets/testcomponentsapplet/contents/ui/ButtonsPage.qml rename to examples/applets/testcomponents/contents/ui/ButtonsPage.qml diff --git a/src/shell/applets/testcomponentsapplet/contents/ui/DialogContent.qml b/examples/applets/testcomponents/contents/ui/DialogContent.qml similarity index 100% rename from src/shell/applets/testcomponentsapplet/contents/ui/DialogContent.qml rename to examples/applets/testcomponents/contents/ui/DialogContent.qml diff --git a/src/shell/applets/testcomponentsapplet/contents/ui/DialogsPage.qml b/examples/applets/testcomponents/contents/ui/DialogsPage.qml similarity index 100% rename from src/shell/applets/testcomponentsapplet/contents/ui/DialogsPage.qml rename to examples/applets/testcomponents/contents/ui/DialogsPage.qml diff --git a/src/shell/applets/testcomponentsapplet/contents/ui/DragItem.qml b/examples/applets/testcomponents/contents/ui/DragItem.qml similarity index 100% rename from src/shell/applets/testcomponentsapplet/contents/ui/DragItem.qml rename to examples/applets/testcomponents/contents/ui/DragItem.qml diff --git a/src/shell/applets/testcomponentsapplet/contents/ui/DragPage.qml b/examples/applets/testcomponents/contents/ui/DragPage.qml similarity index 100% rename from src/shell/applets/testcomponentsapplet/contents/ui/DragPage.qml rename to examples/applets/testcomponents/contents/ui/DragPage.qml diff --git a/src/shell/applets/testcomponentsapplet/contents/ui/IconsPage.qml b/examples/applets/testcomponents/contents/ui/IconsPage.qml similarity index 100% rename from src/shell/applets/testcomponentsapplet/contents/ui/IconsPage.qml rename to examples/applets/testcomponents/contents/ui/IconsPage.qml diff --git a/src/shell/applets/testcomponentsapplet/contents/ui/LocaleItem.qml b/examples/applets/testcomponents/contents/ui/LocaleItem.qml similarity index 100% rename from src/shell/applets/testcomponentsapplet/contents/ui/LocaleItem.qml rename to examples/applets/testcomponents/contents/ui/LocaleItem.qml diff --git a/src/shell/applets/testcomponentsapplet/contents/ui/MousePage.qml b/examples/applets/testcomponents/contents/ui/MousePage.qml similarity index 100% rename from src/shell/applets/testcomponentsapplet/contents/ui/MousePage.qml rename to examples/applets/testcomponents/contents/ui/MousePage.qml diff --git a/src/shell/applets/testcomponentsapplet/contents/ui/PlasmoidPage.qml b/examples/applets/testcomponents/contents/ui/PlasmoidPage.qml similarity index 100% rename from src/shell/applets/testcomponentsapplet/contents/ui/PlasmoidPage.qml rename to examples/applets/testcomponents/contents/ui/PlasmoidPage.qml diff --git a/src/shell/applets/testcomponentsapplet/contents/ui/TestMenu.qml b/examples/applets/testcomponents/contents/ui/TestMenu.qml similarity index 100% rename from src/shell/applets/testcomponentsapplet/contents/ui/TestMenu.qml rename to examples/applets/testcomponents/contents/ui/TestMenu.qml diff --git a/src/shell/applets/testcomponentsapplet/contents/ui/testcomponents.qml b/examples/applets/testcomponents/contents/ui/testcomponents.qml similarity index 100% rename from src/shell/applets/testcomponentsapplet/contents/ui/testcomponents.qml rename to examples/applets/testcomponents/contents/ui/testcomponents.qml diff --git a/src/shell/applets/testcomponentsapplet/metadata.desktop b/examples/applets/testcomponents/metadata.desktop similarity index 93% rename from src/shell/applets/testcomponentsapplet/metadata.desktop rename to examples/applets/testcomponents/metadata.desktop index 965086598..3808c23f0 100644 --- a/src/shell/applets/testcomponentsapplet/metadata.desktop +++ b/examples/applets/testcomponents/metadata.desktop @@ -25,7 +25,7 @@ X-KDE-PluginInfo-Author=Sebastian Kügler X-KDE-PluginInfo-Category=Development Tools X-KDE-PluginInfo-Email=sebas@kde.org X-KDE-PluginInfo-License=GPLv2+ -X-KDE-PluginInfo-Name=org.kde.testcomponentsapplet +X-KDE-PluginInfo-Name=org.kde.example.testcomponents X-KDE-PluginInfo-Version= X-KDE-PluginInfo-Website= X-Plasma-MainScript=ui/testcomponents.qml diff --git a/src/shell/applets/testshaderapplet/contents/config/main.xml b/examples/applets/testshaders/contents/config/main.xml similarity index 100% rename from src/shell/applets/testshaderapplet/contents/config/main.xml rename to examples/applets/testshaders/contents/config/main.xml diff --git a/src/shell/applets/testshaderapplet/contents/images/elarun-small.png b/examples/applets/testshaders/contents/images/elarun-small.png similarity index 100% rename from src/shell/applets/testshaderapplet/contents/images/elarun-small.png rename to examples/applets/testshaders/contents/images/elarun-small.png diff --git a/src/shell/applets/testshaderapplet/contents/ui/ColorExample.qml b/examples/applets/testshaders/contents/ui/ColorExample.qml similarity index 100% rename from src/shell/applets/testshaderapplet/contents/ui/ColorExample.qml rename to examples/applets/testshaders/contents/ui/ColorExample.qml diff --git a/src/shell/applets/testshaderapplet/contents/ui/ColorShower.qml b/examples/applets/testshaders/contents/ui/ColorShower.qml similarity index 100% rename from src/shell/applets/testshaderapplet/contents/ui/ColorShower.qml rename to examples/applets/testshaders/contents/ui/ColorShower.qml diff --git a/src/shell/applets/testshaderapplet/contents/ui/EditorPage.qml b/examples/applets/testshaders/contents/ui/EditorPage.qml similarity index 100% rename from src/shell/applets/testshaderapplet/contents/ui/EditorPage.qml rename to examples/applets/testshaders/contents/ui/EditorPage.qml diff --git a/src/shell/applets/testshaderapplet/contents/ui/ShaderExample.qml b/examples/applets/testshaders/contents/ui/ShaderExample.qml similarity index 100% rename from src/shell/applets/testshaderapplet/contents/ui/ShaderExample.qml rename to examples/applets/testshaders/contents/ui/ShaderExample.qml diff --git a/src/shell/applets/testshaderapplet/contents/ui/Shadows.qml b/examples/applets/testshaders/contents/ui/Shadows.qml similarity index 100% rename from src/shell/applets/testshaderapplet/contents/ui/Shadows.qml rename to examples/applets/testshaders/contents/ui/Shadows.qml diff --git a/src/shell/applets/testshaderapplet/contents/ui/SimpleExample.qml b/examples/applets/testshaders/contents/ui/SimpleExample.qml similarity index 100% rename from src/shell/applets/testshaderapplet/contents/ui/SimpleExample.qml rename to examples/applets/testshaders/contents/ui/SimpleExample.qml diff --git a/src/shell/applets/testshaderapplet/contents/ui/WaterEffect.qml b/examples/applets/testshaders/contents/ui/WaterEffect.qml similarity index 100% rename from src/shell/applets/testshaderapplet/contents/ui/WaterEffect.qml rename to examples/applets/testshaders/contents/ui/WaterEffect.qml diff --git a/src/shell/applets/testshaderapplet/contents/ui/WobbleExample.qml b/examples/applets/testshaders/contents/ui/WobbleExample.qml similarity index 100% rename from src/shell/applets/testshaderapplet/contents/ui/WobbleExample.qml rename to examples/applets/testshaders/contents/ui/WobbleExample.qml diff --git a/src/shell/applets/testshaderapplet/contents/ui/config.qml b/examples/applets/testshaders/contents/ui/config.qml similarity index 100% rename from src/shell/applets/testshaderapplet/contents/ui/config.qml rename to examples/applets/testshaders/contents/ui/config.qml diff --git a/src/shell/applets/testshaderapplet/contents/ui/testshaderapplet.qml b/examples/applets/testshaders/contents/ui/testshaderapplet.qml similarity index 100% rename from src/shell/applets/testshaderapplet/contents/ui/testshaderapplet.qml rename to examples/applets/testshaders/contents/ui/testshaderapplet.qml diff --git a/src/shell/applets/testshaderapplet/metadata.desktop b/examples/applets/testshaders/metadata.desktop similarity index 96% rename from src/shell/applets/testshaderapplet/metadata.desktop rename to examples/applets/testshaders/metadata.desktop index 06b90e30a..583a4ed9b 100644 --- a/src/shell/applets/testshaderapplet/metadata.desktop +++ b/examples/applets/testshaders/metadata.desktop @@ -33,7 +33,7 @@ X-KDE-PluginInfo-Author=Sebastian Kügler X-KDE-PluginInfo-Category=Graphics X-KDE-PluginInfo-Email=sebas@kde.org X-KDE-PluginInfo-License=GPLv2+ -X-KDE-PluginInfo-Name=org.kde.testshaderapplet +X-KDE-PluginInfo-Name=org.kde.example.testshaders X-KDE-PluginInfo-Version= X-KDE-PluginInfo-Website= X-Plasma-MainScript=ui/testshaderapplet.qml diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt index d29c35e4a..5e2fec4b2 100644 --- a/src/shell/CMakeLists.txt +++ b/src/shell/CMakeLists.txt @@ -104,5 +104,4 @@ endif(X11_FOUND) install(TARGETS plasma-shell ${INSTALL_TARGETS_DEFAULT_ARGS}) -add_subdirectory(applets) add_subdirectory(qmlpackages) diff --git a/src/shell/applets/CMakeLists.txt b/src/shell/applets/CMakeLists.txt deleted file mode 100644 index acfa3ab2c..000000000 --- a/src/shell/applets/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ - -plasma_install_package(testapplet org.kde.testapplet) -plasma_install_package(testcomponentsapplet org.kde.testcomponentsapplet) -plasma_install_package(testshaderapplet org.kde.testshaderapplet)