From 7c2bd5428833597dae241ae568b5f803d2e43273 Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Sat, 16 Jul 2022 15:22:14 +0000 Subject: [PATCH] Group lookandfeels together This unclutters the root directory and allows us to add autotests for the look and feels. --- CMakeLists.txt | 18 +----------------- lookandfeel/CMakeLists.txt | 15 +++++++++++++++ lookandfeel/{ => org.kde.breeze}/Messages.sh | 0 .../contents/components/ActionButton.qml | 0 .../contents/components/Battery.qml | 0 .../contents/components/Clock.qml | 0 .../components/SessionManagementScreen.qml | 0 .../contents/components/UserDelegate.qml | 0 .../contents/components/UserList.qml | 0 .../contents/components/VirtualKeyboard.qml | 0 .../components/VirtualKeyboard_wayland.qml | 0 .../contents/components/WallpaperFader.qml | 0 .../animation/RejectPasswordAnimation.qml | 0 .../animation/RejectPasswordPathAnimation.qml | 0 .../contents/components/artwork/README.txt | 0 .../components/artwork/logout_primary.svgz | Bin .../components/artwork/restart_primary.svgz | Bin .../components/artwork/shutdown_primary.svgz | Bin .../{ => org.kde.breeze}/contents/defaults | 0 .../desktopswitcher/DesktopSwitcher.qml | 0 .../layouts/org.kde.plasma.desktop-layout.js | 0 .../contents/lockscreen/LockOsd.qml | 0 .../contents/lockscreen/LockScreen.qml | 0 .../contents/lockscreen/LockScreenUi.qml | 0 .../contents/lockscreen/MainBlock.qml | 0 .../contents/lockscreen/MediaControls.qml | 0 .../contents/lockscreen/NoPasswordUnlock.qml | 0 .../contents/lockscreen/config.qml | 0 .../contents/lockscreen/config.xml | 0 .../contents/logout/Logout.qml | 0 .../contents/logout/LogoutButton.qml | 0 .../logout/dummydata/screenGeometry.qml | 0 .../contents/logout/timer.js | 0 .../{ => org.kde.breeze}/contents/osd/Osd.qml | 0 .../contents/osd/OsdItem.qml | 0 .../contents/previews/desktopswitcher.png | 0 .../contents/previews/fullscreenpreview.jpg | Bin .../contents/previews/lockscreen.png | Bin .../contents/previews/loginmanager.png | 0 .../contents/previews/preview.png | Bin .../contents/previews/runcommand.png | 0 .../contents/previews/splash.png | Bin .../contents/previews/userswitcher.png | 0 .../contents/previews/windowdecoration.png | 0 .../contents/previews/windowswitcher.png | 0 .../contents/runcommand/RunCommand.qml | 0 .../contents/splash/Splash.qml | 0 .../contents/splash/images/busywidget.svgz | Bin .../contents/splash/images/kde.svgz | Bin .../contents/splash/images/plasma.svgz | Bin .../contents/systemdialog/SystemDialog.qml | 0 .../windowswitcher/WindowSwitcher.qml | 0 .../{ => org.kde.breeze}/metadata.json | 0 .../org.kde.breezedark}/contents/defaults | 0 .../layouts/org.kde.plasma.desktop-layout.js | 0 .../contents/previews/fullscreenpreview.jpg | Bin .../contents/previews/preview.png | Bin .../org.kde.breezedark}/metadata.json | 0 .../org.kde.breezetwilight}/contents/defaults | 0 .../layouts/org.kde.plasma.desktop-layout.js | 0 .../contents/previews/fullscreenpreview.jpg | Bin .../contents/previews/preview.png | Bin .../org.kde.breezetwilight}/metadata.json | 0 .../sddm-theme}/Background.qml | 0 .../sddm-theme}/KeyboardButton.qml | 0 .../sddm-theme}/Login.qml | 0 .../sddm-theme}/Main.qml | 0 .../sddm-theme}/SessionButton.qml | 0 .../sddm-theme}/components | 0 .../sddm-theme}/default-logo.svg | 0 .../sddm-theme}/dummydata/config.qml | 0 .../sddm-theme}/dummydata/keyboard.qml | 0 .../sddm-theme}/dummydata/screenModel.qml | 0 .../sddm-theme}/dummydata/sddm.qml | 0 .../sddm-theme}/dummydata/sessionModel.qml | 0 .../sddm-theme}/dummydata/userModel.qml | 0 .../sddm-theme}/faces/.face.icon | 0 .../sddm-theme}/metadata.desktop | 0 .../sddm-theme}/preview.png | Bin .../sddm-theme}/theme.conf.cmake | 0 80 files changed, 16 insertions(+), 17 deletions(-) create mode 100644 lookandfeel/CMakeLists.txt rename lookandfeel/{ => org.kde.breeze}/Messages.sh (100%) rename lookandfeel/{ => org.kde.breeze}/contents/components/ActionButton.qml (100%) rename lookandfeel/{ => org.kde.breeze}/contents/components/Battery.qml (100%) rename lookandfeel/{ => org.kde.breeze}/contents/components/Clock.qml (100%) rename lookandfeel/{ => org.kde.breeze}/contents/components/SessionManagementScreen.qml (100%) rename lookandfeel/{ => org.kde.breeze}/contents/components/UserDelegate.qml (100%) rename lookandfeel/{ => org.kde.breeze}/contents/components/UserList.qml (100%) rename lookandfeel/{ => org.kde.breeze}/contents/components/VirtualKeyboard.qml (100%) rename lookandfeel/{ => org.kde.breeze}/contents/components/VirtualKeyboard_wayland.qml (100%) rename lookandfeel/{ => org.kde.breeze}/contents/components/WallpaperFader.qml (100%) rename lookandfeel/{ => org.kde.breeze}/contents/components/animation/RejectPasswordAnimation.qml (100%) rename lookandfeel/{ => org.kde.breeze}/contents/components/animation/RejectPasswordPathAnimation.qml (100%) rename lookandfeel/{ => org.kde.breeze}/contents/components/artwork/README.txt (100%) rename lookandfeel/{ => org.kde.breeze}/contents/components/artwork/logout_primary.svgz (100%) rename lookandfeel/{ => org.kde.breeze}/contents/components/artwork/restart_primary.svgz (100%) rename lookandfeel/{ => org.kde.breeze}/contents/components/artwork/shutdown_primary.svgz (100%) rename lookandfeel/{ => org.kde.breeze}/contents/defaults (100%) rename lookandfeel/{ => org.kde.breeze}/contents/desktopswitcher/DesktopSwitcher.qml (100%) rename {lookandfeel.dark => lookandfeel/org.kde.breeze}/contents/layouts/org.kde.plasma.desktop-layout.js (100%) rename lookandfeel/{ => org.kde.breeze}/contents/lockscreen/LockOsd.qml (100%) rename lookandfeel/{ => org.kde.breeze}/contents/lockscreen/LockScreen.qml (100%) rename lookandfeel/{ => org.kde.breeze}/contents/lockscreen/LockScreenUi.qml (100%) rename lookandfeel/{ => org.kde.breeze}/contents/lockscreen/MainBlock.qml (100%) rename lookandfeel/{ => org.kde.breeze}/contents/lockscreen/MediaControls.qml (100%) rename lookandfeel/{ => org.kde.breeze}/contents/lockscreen/NoPasswordUnlock.qml (100%) rename lookandfeel/{ => org.kde.breeze}/contents/lockscreen/config.qml (100%) rename lookandfeel/{ => org.kde.breeze}/contents/lockscreen/config.xml (100%) rename lookandfeel/{ => org.kde.breeze}/contents/logout/Logout.qml (100%) rename lookandfeel/{ => org.kde.breeze}/contents/logout/LogoutButton.qml (100%) rename lookandfeel/{ => org.kde.breeze}/contents/logout/dummydata/screenGeometry.qml (100%) rename lookandfeel/{ => org.kde.breeze}/contents/logout/timer.js (100%) rename lookandfeel/{ => org.kde.breeze}/contents/osd/Osd.qml (100%) rename lookandfeel/{ => org.kde.breeze}/contents/osd/OsdItem.qml (100%) rename lookandfeel/{ => org.kde.breeze}/contents/previews/desktopswitcher.png (100%) rename lookandfeel/{ => org.kde.breeze}/contents/previews/fullscreenpreview.jpg (100%) rename lookandfeel/{ => org.kde.breeze}/contents/previews/lockscreen.png (100%) rename lookandfeel/{ => org.kde.breeze}/contents/previews/loginmanager.png (100%) rename lookandfeel/{ => org.kde.breeze}/contents/previews/preview.png (100%) rename lookandfeel/{ => org.kde.breeze}/contents/previews/runcommand.png (100%) rename lookandfeel/{ => org.kde.breeze}/contents/previews/splash.png (100%) rename lookandfeel/{ => org.kde.breeze}/contents/previews/userswitcher.png (100%) rename lookandfeel/{ => org.kde.breeze}/contents/previews/windowdecoration.png (100%) rename lookandfeel/{ => org.kde.breeze}/contents/previews/windowswitcher.png (100%) rename lookandfeel/{ => org.kde.breeze}/contents/runcommand/RunCommand.qml (100%) rename lookandfeel/{ => org.kde.breeze}/contents/splash/Splash.qml (100%) rename lookandfeel/{ => org.kde.breeze}/contents/splash/images/busywidget.svgz (100%) rename lookandfeel/{ => org.kde.breeze}/contents/splash/images/kde.svgz (100%) rename lookandfeel/{ => org.kde.breeze}/contents/splash/images/plasma.svgz (100%) rename lookandfeel/{ => org.kde.breeze}/contents/systemdialog/SystemDialog.qml (100%) rename lookandfeel/{ => org.kde.breeze}/contents/windowswitcher/WindowSwitcher.qml (100%) rename lookandfeel/{ => org.kde.breeze}/metadata.json (100%) rename {lookandfeel.dark => lookandfeel/org.kde.breezedark}/contents/defaults (100%) rename {lookandfeel.twilight => lookandfeel/org.kde.breezedark}/contents/layouts/org.kde.plasma.desktop-layout.js (100%) rename {lookandfeel.dark => lookandfeel/org.kde.breezedark}/contents/previews/fullscreenpreview.jpg (100%) rename {lookandfeel.dark => lookandfeel/org.kde.breezedark}/contents/previews/preview.png (100%) rename {lookandfeel.dark => lookandfeel/org.kde.breezedark}/metadata.json (100%) rename {lookandfeel.twilight => lookandfeel/org.kde.breezetwilight}/contents/defaults (100%) rename lookandfeel/{ => org.kde.breezetwilight}/contents/layouts/org.kde.plasma.desktop-layout.js (100%) rename {lookandfeel.twilight => lookandfeel/org.kde.breezetwilight}/contents/previews/fullscreenpreview.jpg (100%) rename {lookandfeel.twilight => lookandfeel/org.kde.breezetwilight}/contents/previews/preview.png (100%) rename {lookandfeel.twilight => lookandfeel/org.kde.breezetwilight}/metadata.json (100%) rename {sddm-theme => lookandfeel/sddm-theme}/Background.qml (100%) rename {sddm-theme => lookandfeel/sddm-theme}/KeyboardButton.qml (100%) rename {sddm-theme => lookandfeel/sddm-theme}/Login.qml (100%) rename {sddm-theme => lookandfeel/sddm-theme}/Main.qml (100%) rename {sddm-theme => lookandfeel/sddm-theme}/SessionButton.qml (100%) rename {sddm-theme => lookandfeel/sddm-theme}/components (100%) rename {sddm-theme => lookandfeel/sddm-theme}/default-logo.svg (100%) rename {sddm-theme => lookandfeel/sddm-theme}/dummydata/config.qml (100%) rename {sddm-theme => lookandfeel/sddm-theme}/dummydata/keyboard.qml (100%) rename {sddm-theme => lookandfeel/sddm-theme}/dummydata/screenModel.qml (100%) rename {sddm-theme => lookandfeel/sddm-theme}/dummydata/sddm.qml (100%) rename {sddm-theme => lookandfeel/sddm-theme}/dummydata/sessionModel.qml (100%) rename {sddm-theme => lookandfeel/sddm-theme}/dummydata/userModel.qml (100%) rename {sddm-theme => lookandfeel/sddm-theme}/faces/.face.icon (100%) rename {sddm-theme => lookandfeel/sddm-theme}/metadata.desktop (100%) rename {sddm-theme => lookandfeel/sddm-theme}/preview.png (100%) rename {sddm-theme => lookandfeel/sddm-theme}/theme.conf.cmake (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8386e2a5e..a8d652c98 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -301,23 +301,7 @@ configure_file(config-unix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-unix.h ) configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) configure_file(config-appstream.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-appstream.h ) add_subdirectory(login-sessions) - -plasma_install_package(lookandfeel org.kde.breeze.desktop look-and-feel lookandfeel) -plasma_install_package(lookandfeel.dark org.kde.breezedark.desktop look-and-feel lookandfeel) -plasma_install_package(lookandfeel.twilight org.kde.breezetwilight.desktop look-and-feel lookandfeel) - - -if (INSTALL_SDDM_THEME) - configure_file(sddm-theme/theme.conf.cmake ${CMAKE_CURRENT_BINARY_DIR}/sddm-theme/theme.conf) - -# Install the login theme into the SDDM directory -# Longer term we need to look at making SDDM load from look and feel somehow.. and allow copying at runtime - #NOTE this trailing slash is important to rename the directory - install(DIRECTORY sddm-theme/ DESTINATION ${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze PATTERN "README.txt" EXCLUDE PATTERN "components" EXCLUDE PATTERN "dummydata" EXCLUDE - PATTERN "theme.conf.cmake" EXCLUDE) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sddm-theme/theme.conf DESTINATION ${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze) - install(DIRECTORY lookandfeel/contents/components DESTINATION ${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze PATTERN "README.txt" EXCLUDE) -endif() +add_subdirectory(lookandfeel) if (INSTALL_SDDM_WAYLAND_SESSION) install(FILES sddm-wayland-session/plasma-wayland.conf DESTINATION /etc/sddm.conf.d) diff --git a/lookandfeel/CMakeLists.txt b/lookandfeel/CMakeLists.txt new file mode 100644 index 000000000..4c021babc --- /dev/null +++ b/lookandfeel/CMakeLists.txt @@ -0,0 +1,15 @@ +plasma_install_package(org.kde.breeze org.kde.breeze.desktop look-and-feel lookandfeel) +plasma_install_package(org.kde.breezedark org.kde.breezedark.desktop look-and-feel lookandfeel) +plasma_install_package(org.kde.breezetwilight org.kde.breezetwilight.desktop look-and-feel lookandfeel) + +if (INSTALL_SDDM_THEME) + configure_file(sddm-theme/theme.conf.cmake ${CMAKE_CURRENT_BINARY_DIR}/sddm-theme/theme.conf) + +# Install the login theme into the SDDM directory +# Longer term we need to look at making SDDM load from look and feel somehow.. and allow copying at runtime + #NOTE this trailing slash is important to rename the directory + install(DIRECTORY sddm-theme/ DESTINATION ${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze PATTERN "README.txt" EXCLUDE PATTERN "components" EXCLUDE PATTERN "dummydata" EXCLUDE + PATTERN "theme.conf.cmake" EXCLUDE) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sddm-theme/theme.conf DESTINATION ${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze) + install(DIRECTORY org.kde.breeze/contents/components DESTINATION ${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze PATTERN "README.txt" EXCLUDE) +endif() diff --git a/lookandfeel/Messages.sh b/lookandfeel/org.kde.breeze/Messages.sh similarity index 100% rename from lookandfeel/Messages.sh rename to lookandfeel/org.kde.breeze/Messages.sh diff --git a/lookandfeel/contents/components/ActionButton.qml b/lookandfeel/org.kde.breeze/contents/components/ActionButton.qml similarity index 100% rename from lookandfeel/contents/components/ActionButton.qml rename to lookandfeel/org.kde.breeze/contents/components/ActionButton.qml diff --git a/lookandfeel/contents/components/Battery.qml b/lookandfeel/org.kde.breeze/contents/components/Battery.qml similarity index 100% rename from lookandfeel/contents/components/Battery.qml rename to lookandfeel/org.kde.breeze/contents/components/Battery.qml diff --git a/lookandfeel/contents/components/Clock.qml b/lookandfeel/org.kde.breeze/contents/components/Clock.qml similarity index 100% rename from lookandfeel/contents/components/Clock.qml rename to lookandfeel/org.kde.breeze/contents/components/Clock.qml diff --git a/lookandfeel/contents/components/SessionManagementScreen.qml b/lookandfeel/org.kde.breeze/contents/components/SessionManagementScreen.qml similarity index 100% rename from lookandfeel/contents/components/SessionManagementScreen.qml rename to lookandfeel/org.kde.breeze/contents/components/SessionManagementScreen.qml diff --git a/lookandfeel/contents/components/UserDelegate.qml b/lookandfeel/org.kde.breeze/contents/components/UserDelegate.qml similarity index 100% rename from lookandfeel/contents/components/UserDelegate.qml rename to lookandfeel/org.kde.breeze/contents/components/UserDelegate.qml diff --git a/lookandfeel/contents/components/UserList.qml b/lookandfeel/org.kde.breeze/contents/components/UserList.qml similarity index 100% rename from lookandfeel/contents/components/UserList.qml rename to lookandfeel/org.kde.breeze/contents/components/UserList.qml diff --git a/lookandfeel/contents/components/VirtualKeyboard.qml b/lookandfeel/org.kde.breeze/contents/components/VirtualKeyboard.qml similarity index 100% rename from lookandfeel/contents/components/VirtualKeyboard.qml rename to lookandfeel/org.kde.breeze/contents/components/VirtualKeyboard.qml diff --git a/lookandfeel/contents/components/VirtualKeyboard_wayland.qml b/lookandfeel/org.kde.breeze/contents/components/VirtualKeyboard_wayland.qml similarity index 100% rename from lookandfeel/contents/components/VirtualKeyboard_wayland.qml rename to lookandfeel/org.kde.breeze/contents/components/VirtualKeyboard_wayland.qml diff --git a/lookandfeel/contents/components/WallpaperFader.qml b/lookandfeel/org.kde.breeze/contents/components/WallpaperFader.qml similarity index 100% rename from lookandfeel/contents/components/WallpaperFader.qml rename to lookandfeel/org.kde.breeze/contents/components/WallpaperFader.qml diff --git a/lookandfeel/contents/components/animation/RejectPasswordAnimation.qml b/lookandfeel/org.kde.breeze/contents/components/animation/RejectPasswordAnimation.qml similarity index 100% rename from lookandfeel/contents/components/animation/RejectPasswordAnimation.qml rename to lookandfeel/org.kde.breeze/contents/components/animation/RejectPasswordAnimation.qml diff --git a/lookandfeel/contents/components/animation/RejectPasswordPathAnimation.qml b/lookandfeel/org.kde.breeze/contents/components/animation/RejectPasswordPathAnimation.qml similarity index 100% rename from lookandfeel/contents/components/animation/RejectPasswordPathAnimation.qml rename to lookandfeel/org.kde.breeze/contents/components/animation/RejectPasswordPathAnimation.qml diff --git a/lookandfeel/contents/components/artwork/README.txt b/lookandfeel/org.kde.breeze/contents/components/artwork/README.txt similarity index 100% rename from lookandfeel/contents/components/artwork/README.txt rename to lookandfeel/org.kde.breeze/contents/components/artwork/README.txt diff --git a/lookandfeel/contents/components/artwork/logout_primary.svgz b/lookandfeel/org.kde.breeze/contents/components/artwork/logout_primary.svgz similarity index 100% rename from lookandfeel/contents/components/artwork/logout_primary.svgz rename to lookandfeel/org.kde.breeze/contents/components/artwork/logout_primary.svgz diff --git a/lookandfeel/contents/components/artwork/restart_primary.svgz b/lookandfeel/org.kde.breeze/contents/components/artwork/restart_primary.svgz similarity index 100% rename from lookandfeel/contents/components/artwork/restart_primary.svgz rename to lookandfeel/org.kde.breeze/contents/components/artwork/restart_primary.svgz diff --git a/lookandfeel/contents/components/artwork/shutdown_primary.svgz b/lookandfeel/org.kde.breeze/contents/components/artwork/shutdown_primary.svgz similarity index 100% rename from lookandfeel/contents/components/artwork/shutdown_primary.svgz rename to lookandfeel/org.kde.breeze/contents/components/artwork/shutdown_primary.svgz diff --git a/lookandfeel/contents/defaults b/lookandfeel/org.kde.breeze/contents/defaults similarity index 100% rename from lookandfeel/contents/defaults rename to lookandfeel/org.kde.breeze/contents/defaults diff --git a/lookandfeel/contents/desktopswitcher/DesktopSwitcher.qml b/lookandfeel/org.kde.breeze/contents/desktopswitcher/DesktopSwitcher.qml similarity index 100% rename from lookandfeel/contents/desktopswitcher/DesktopSwitcher.qml rename to lookandfeel/org.kde.breeze/contents/desktopswitcher/DesktopSwitcher.qml diff --git a/lookandfeel.dark/contents/layouts/org.kde.plasma.desktop-layout.js b/lookandfeel/org.kde.breeze/contents/layouts/org.kde.plasma.desktop-layout.js similarity index 100% rename from lookandfeel.dark/contents/layouts/org.kde.plasma.desktop-layout.js rename to lookandfeel/org.kde.breeze/contents/layouts/org.kde.plasma.desktop-layout.js diff --git a/lookandfeel/contents/lockscreen/LockOsd.qml b/lookandfeel/org.kde.breeze/contents/lockscreen/LockOsd.qml similarity index 100% rename from lookandfeel/contents/lockscreen/LockOsd.qml rename to lookandfeel/org.kde.breeze/contents/lockscreen/LockOsd.qml diff --git a/lookandfeel/contents/lockscreen/LockScreen.qml b/lookandfeel/org.kde.breeze/contents/lockscreen/LockScreen.qml similarity index 100% rename from lookandfeel/contents/lockscreen/LockScreen.qml rename to lookandfeel/org.kde.breeze/contents/lockscreen/LockScreen.qml diff --git a/lookandfeel/contents/lockscreen/LockScreenUi.qml b/lookandfeel/org.kde.breeze/contents/lockscreen/LockScreenUi.qml similarity index 100% rename from lookandfeel/contents/lockscreen/LockScreenUi.qml rename to lookandfeel/org.kde.breeze/contents/lockscreen/LockScreenUi.qml diff --git a/lookandfeel/contents/lockscreen/MainBlock.qml b/lookandfeel/org.kde.breeze/contents/lockscreen/MainBlock.qml similarity index 100% rename from lookandfeel/contents/lockscreen/MainBlock.qml rename to lookandfeel/org.kde.breeze/contents/lockscreen/MainBlock.qml diff --git a/lookandfeel/contents/lockscreen/MediaControls.qml b/lookandfeel/org.kde.breeze/contents/lockscreen/MediaControls.qml similarity index 100% rename from lookandfeel/contents/lockscreen/MediaControls.qml rename to lookandfeel/org.kde.breeze/contents/lockscreen/MediaControls.qml diff --git a/lookandfeel/contents/lockscreen/NoPasswordUnlock.qml b/lookandfeel/org.kde.breeze/contents/lockscreen/NoPasswordUnlock.qml similarity index 100% rename from lookandfeel/contents/lockscreen/NoPasswordUnlock.qml rename to lookandfeel/org.kde.breeze/contents/lockscreen/NoPasswordUnlock.qml diff --git a/lookandfeel/contents/lockscreen/config.qml b/lookandfeel/org.kde.breeze/contents/lockscreen/config.qml similarity index 100% rename from lookandfeel/contents/lockscreen/config.qml rename to lookandfeel/org.kde.breeze/contents/lockscreen/config.qml diff --git a/lookandfeel/contents/lockscreen/config.xml b/lookandfeel/org.kde.breeze/contents/lockscreen/config.xml similarity index 100% rename from lookandfeel/contents/lockscreen/config.xml rename to lookandfeel/org.kde.breeze/contents/lockscreen/config.xml diff --git a/lookandfeel/contents/logout/Logout.qml b/lookandfeel/org.kde.breeze/contents/logout/Logout.qml similarity index 100% rename from lookandfeel/contents/logout/Logout.qml rename to lookandfeel/org.kde.breeze/contents/logout/Logout.qml diff --git a/lookandfeel/contents/logout/LogoutButton.qml b/lookandfeel/org.kde.breeze/contents/logout/LogoutButton.qml similarity index 100% rename from lookandfeel/contents/logout/LogoutButton.qml rename to lookandfeel/org.kde.breeze/contents/logout/LogoutButton.qml diff --git a/lookandfeel/contents/logout/dummydata/screenGeometry.qml b/lookandfeel/org.kde.breeze/contents/logout/dummydata/screenGeometry.qml similarity index 100% rename from lookandfeel/contents/logout/dummydata/screenGeometry.qml rename to lookandfeel/org.kde.breeze/contents/logout/dummydata/screenGeometry.qml diff --git a/lookandfeel/contents/logout/timer.js b/lookandfeel/org.kde.breeze/contents/logout/timer.js similarity index 100% rename from lookandfeel/contents/logout/timer.js rename to lookandfeel/org.kde.breeze/contents/logout/timer.js diff --git a/lookandfeel/contents/osd/Osd.qml b/lookandfeel/org.kde.breeze/contents/osd/Osd.qml similarity index 100% rename from lookandfeel/contents/osd/Osd.qml rename to lookandfeel/org.kde.breeze/contents/osd/Osd.qml diff --git a/lookandfeel/contents/osd/OsdItem.qml b/lookandfeel/org.kde.breeze/contents/osd/OsdItem.qml similarity index 100% rename from lookandfeel/contents/osd/OsdItem.qml rename to lookandfeel/org.kde.breeze/contents/osd/OsdItem.qml diff --git a/lookandfeel/contents/previews/desktopswitcher.png b/lookandfeel/org.kde.breeze/contents/previews/desktopswitcher.png similarity index 100% rename from lookandfeel/contents/previews/desktopswitcher.png rename to lookandfeel/org.kde.breeze/contents/previews/desktopswitcher.png diff --git a/lookandfeel/contents/previews/fullscreenpreview.jpg b/lookandfeel/org.kde.breeze/contents/previews/fullscreenpreview.jpg similarity index 100% rename from lookandfeel/contents/previews/fullscreenpreview.jpg rename to lookandfeel/org.kde.breeze/contents/previews/fullscreenpreview.jpg diff --git a/lookandfeel/contents/previews/lockscreen.png b/lookandfeel/org.kde.breeze/contents/previews/lockscreen.png similarity index 100% rename from lookandfeel/contents/previews/lockscreen.png rename to lookandfeel/org.kde.breeze/contents/previews/lockscreen.png diff --git a/lookandfeel/contents/previews/loginmanager.png b/lookandfeel/org.kde.breeze/contents/previews/loginmanager.png similarity index 100% rename from lookandfeel/contents/previews/loginmanager.png rename to lookandfeel/org.kde.breeze/contents/previews/loginmanager.png diff --git a/lookandfeel/contents/previews/preview.png b/lookandfeel/org.kde.breeze/contents/previews/preview.png similarity index 100% rename from lookandfeel/contents/previews/preview.png rename to lookandfeel/org.kde.breeze/contents/previews/preview.png diff --git a/lookandfeel/contents/previews/runcommand.png b/lookandfeel/org.kde.breeze/contents/previews/runcommand.png similarity index 100% rename from lookandfeel/contents/previews/runcommand.png rename to lookandfeel/org.kde.breeze/contents/previews/runcommand.png diff --git a/lookandfeel/contents/previews/splash.png b/lookandfeel/org.kde.breeze/contents/previews/splash.png similarity index 100% rename from lookandfeel/contents/previews/splash.png rename to lookandfeel/org.kde.breeze/contents/previews/splash.png diff --git a/lookandfeel/contents/previews/userswitcher.png b/lookandfeel/org.kde.breeze/contents/previews/userswitcher.png similarity index 100% rename from lookandfeel/contents/previews/userswitcher.png rename to lookandfeel/org.kde.breeze/contents/previews/userswitcher.png diff --git a/lookandfeel/contents/previews/windowdecoration.png b/lookandfeel/org.kde.breeze/contents/previews/windowdecoration.png similarity index 100% rename from lookandfeel/contents/previews/windowdecoration.png rename to lookandfeel/org.kde.breeze/contents/previews/windowdecoration.png diff --git a/lookandfeel/contents/previews/windowswitcher.png b/lookandfeel/org.kde.breeze/contents/previews/windowswitcher.png similarity index 100% rename from lookandfeel/contents/previews/windowswitcher.png rename to lookandfeel/org.kde.breeze/contents/previews/windowswitcher.png diff --git a/lookandfeel/contents/runcommand/RunCommand.qml b/lookandfeel/org.kde.breeze/contents/runcommand/RunCommand.qml similarity index 100% rename from lookandfeel/contents/runcommand/RunCommand.qml rename to lookandfeel/org.kde.breeze/contents/runcommand/RunCommand.qml diff --git a/lookandfeel/contents/splash/Splash.qml b/lookandfeel/org.kde.breeze/contents/splash/Splash.qml similarity index 100% rename from lookandfeel/contents/splash/Splash.qml rename to lookandfeel/org.kde.breeze/contents/splash/Splash.qml diff --git a/lookandfeel/contents/splash/images/busywidget.svgz b/lookandfeel/org.kde.breeze/contents/splash/images/busywidget.svgz similarity index 100% rename from lookandfeel/contents/splash/images/busywidget.svgz rename to lookandfeel/org.kde.breeze/contents/splash/images/busywidget.svgz diff --git a/lookandfeel/contents/splash/images/kde.svgz b/lookandfeel/org.kde.breeze/contents/splash/images/kde.svgz similarity index 100% rename from lookandfeel/contents/splash/images/kde.svgz rename to lookandfeel/org.kde.breeze/contents/splash/images/kde.svgz diff --git a/lookandfeel/contents/splash/images/plasma.svgz b/lookandfeel/org.kde.breeze/contents/splash/images/plasma.svgz similarity index 100% rename from lookandfeel/contents/splash/images/plasma.svgz rename to lookandfeel/org.kde.breeze/contents/splash/images/plasma.svgz diff --git a/lookandfeel/contents/systemdialog/SystemDialog.qml b/lookandfeel/org.kde.breeze/contents/systemdialog/SystemDialog.qml similarity index 100% rename from lookandfeel/contents/systemdialog/SystemDialog.qml rename to lookandfeel/org.kde.breeze/contents/systemdialog/SystemDialog.qml diff --git a/lookandfeel/contents/windowswitcher/WindowSwitcher.qml b/lookandfeel/org.kde.breeze/contents/windowswitcher/WindowSwitcher.qml similarity index 100% rename from lookandfeel/contents/windowswitcher/WindowSwitcher.qml rename to lookandfeel/org.kde.breeze/contents/windowswitcher/WindowSwitcher.qml diff --git a/lookandfeel/metadata.json b/lookandfeel/org.kde.breeze/metadata.json similarity index 100% rename from lookandfeel/metadata.json rename to lookandfeel/org.kde.breeze/metadata.json diff --git a/lookandfeel.dark/contents/defaults b/lookandfeel/org.kde.breezedark/contents/defaults similarity index 100% rename from lookandfeel.dark/contents/defaults rename to lookandfeel/org.kde.breezedark/contents/defaults diff --git a/lookandfeel.twilight/contents/layouts/org.kde.plasma.desktop-layout.js b/lookandfeel/org.kde.breezedark/contents/layouts/org.kde.plasma.desktop-layout.js similarity index 100% rename from lookandfeel.twilight/contents/layouts/org.kde.plasma.desktop-layout.js rename to lookandfeel/org.kde.breezedark/contents/layouts/org.kde.plasma.desktop-layout.js diff --git a/lookandfeel.dark/contents/previews/fullscreenpreview.jpg b/lookandfeel/org.kde.breezedark/contents/previews/fullscreenpreview.jpg similarity index 100% rename from lookandfeel.dark/contents/previews/fullscreenpreview.jpg rename to lookandfeel/org.kde.breezedark/contents/previews/fullscreenpreview.jpg diff --git a/lookandfeel.dark/contents/previews/preview.png b/lookandfeel/org.kde.breezedark/contents/previews/preview.png similarity index 100% rename from lookandfeel.dark/contents/previews/preview.png rename to lookandfeel/org.kde.breezedark/contents/previews/preview.png diff --git a/lookandfeel.dark/metadata.json b/lookandfeel/org.kde.breezedark/metadata.json similarity index 100% rename from lookandfeel.dark/metadata.json rename to lookandfeel/org.kde.breezedark/metadata.json diff --git a/lookandfeel.twilight/contents/defaults b/lookandfeel/org.kde.breezetwilight/contents/defaults similarity index 100% rename from lookandfeel.twilight/contents/defaults rename to lookandfeel/org.kde.breezetwilight/contents/defaults diff --git a/lookandfeel/contents/layouts/org.kde.plasma.desktop-layout.js b/lookandfeel/org.kde.breezetwilight/contents/layouts/org.kde.plasma.desktop-layout.js similarity index 100% rename from lookandfeel/contents/layouts/org.kde.plasma.desktop-layout.js rename to lookandfeel/org.kde.breezetwilight/contents/layouts/org.kde.plasma.desktop-layout.js diff --git a/lookandfeel.twilight/contents/previews/fullscreenpreview.jpg b/lookandfeel/org.kde.breezetwilight/contents/previews/fullscreenpreview.jpg similarity index 100% rename from lookandfeel.twilight/contents/previews/fullscreenpreview.jpg rename to lookandfeel/org.kde.breezetwilight/contents/previews/fullscreenpreview.jpg diff --git a/lookandfeel.twilight/contents/previews/preview.png b/lookandfeel/org.kde.breezetwilight/contents/previews/preview.png similarity index 100% rename from lookandfeel.twilight/contents/previews/preview.png rename to lookandfeel/org.kde.breezetwilight/contents/previews/preview.png diff --git a/lookandfeel.twilight/metadata.json b/lookandfeel/org.kde.breezetwilight/metadata.json similarity index 100% rename from lookandfeel.twilight/metadata.json rename to lookandfeel/org.kde.breezetwilight/metadata.json diff --git a/sddm-theme/Background.qml b/lookandfeel/sddm-theme/Background.qml similarity index 100% rename from sddm-theme/Background.qml rename to lookandfeel/sddm-theme/Background.qml diff --git a/sddm-theme/KeyboardButton.qml b/lookandfeel/sddm-theme/KeyboardButton.qml similarity index 100% rename from sddm-theme/KeyboardButton.qml rename to lookandfeel/sddm-theme/KeyboardButton.qml diff --git a/sddm-theme/Login.qml b/lookandfeel/sddm-theme/Login.qml similarity index 100% rename from sddm-theme/Login.qml rename to lookandfeel/sddm-theme/Login.qml diff --git a/sddm-theme/Main.qml b/lookandfeel/sddm-theme/Main.qml similarity index 100% rename from sddm-theme/Main.qml rename to lookandfeel/sddm-theme/Main.qml diff --git a/sddm-theme/SessionButton.qml b/lookandfeel/sddm-theme/SessionButton.qml similarity index 100% rename from sddm-theme/SessionButton.qml rename to lookandfeel/sddm-theme/SessionButton.qml diff --git a/sddm-theme/components b/lookandfeel/sddm-theme/components similarity index 100% rename from sddm-theme/components rename to lookandfeel/sddm-theme/components diff --git a/sddm-theme/default-logo.svg b/lookandfeel/sddm-theme/default-logo.svg similarity index 100% rename from sddm-theme/default-logo.svg rename to lookandfeel/sddm-theme/default-logo.svg diff --git a/sddm-theme/dummydata/config.qml b/lookandfeel/sddm-theme/dummydata/config.qml similarity index 100% rename from sddm-theme/dummydata/config.qml rename to lookandfeel/sddm-theme/dummydata/config.qml diff --git a/sddm-theme/dummydata/keyboard.qml b/lookandfeel/sddm-theme/dummydata/keyboard.qml similarity index 100% rename from sddm-theme/dummydata/keyboard.qml rename to lookandfeel/sddm-theme/dummydata/keyboard.qml diff --git a/sddm-theme/dummydata/screenModel.qml b/lookandfeel/sddm-theme/dummydata/screenModel.qml similarity index 100% rename from sddm-theme/dummydata/screenModel.qml rename to lookandfeel/sddm-theme/dummydata/screenModel.qml diff --git a/sddm-theme/dummydata/sddm.qml b/lookandfeel/sddm-theme/dummydata/sddm.qml similarity index 100% rename from sddm-theme/dummydata/sddm.qml rename to lookandfeel/sddm-theme/dummydata/sddm.qml diff --git a/sddm-theme/dummydata/sessionModel.qml b/lookandfeel/sddm-theme/dummydata/sessionModel.qml similarity index 100% rename from sddm-theme/dummydata/sessionModel.qml rename to lookandfeel/sddm-theme/dummydata/sessionModel.qml diff --git a/sddm-theme/dummydata/userModel.qml b/lookandfeel/sddm-theme/dummydata/userModel.qml similarity index 100% rename from sddm-theme/dummydata/userModel.qml rename to lookandfeel/sddm-theme/dummydata/userModel.qml diff --git a/sddm-theme/faces/.face.icon b/lookandfeel/sddm-theme/faces/.face.icon similarity index 100% rename from sddm-theme/faces/.face.icon rename to lookandfeel/sddm-theme/faces/.face.icon diff --git a/sddm-theme/metadata.desktop b/lookandfeel/sddm-theme/metadata.desktop similarity index 100% rename from sddm-theme/metadata.desktop rename to lookandfeel/sddm-theme/metadata.desktop diff --git a/sddm-theme/preview.png b/lookandfeel/sddm-theme/preview.png similarity index 100% rename from sddm-theme/preview.png rename to lookandfeel/sddm-theme/preview.png diff --git a/sddm-theme/theme.conf.cmake b/lookandfeel/sddm-theme/theme.conf.cmake similarity index 100% rename from sddm-theme/theme.conf.cmake rename to lookandfeel/sddm-theme/theme.conf.cmake