From b441e29ef4926d13df19aa656c4f07d05134c45b Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Thu, 18 Jan 2024 09:07:02 +0100 Subject: [PATCH] skins renamed to designsystems --- CMakeLists.txt | 2 +- {skins => designsystems}/CMakeLists.txt | 0 {skins => designsystems}/fluent2/CMakeLists.txt | 0 {skins => designsystems}/fluent2/QskFluent2Global.h | 0 {skins => designsystems}/fluent2/QskFluent2Skin.cpp | 0 {skins => designsystems}/fluent2/QskFluent2Skin.h | 0 .../fluent2/QskFluent2SkinFactory.cpp | 0 .../fluent2/QskFluent2SkinFactory.h | 0 .../fluent2/QskFluent2Theme.cpp | 0 {skins => designsystems}/fluent2/QskFluent2Theme.h | 0 {skins => designsystems}/fluent2/icons.qrc | 0 .../fluent2/icons/checkmark.svg | 0 .../fluent2/icons/combo-box-arrow-closed.svg | 0 .../fluent2/icons/combo-box-arrow-open.svg | 0 .../fluent2/icons/qvg/checkmark.qvg | Bin .../fluent2/icons/qvg/combo-box-arrow-closed.qvg | Bin .../fluent2/icons/qvg/combo-box-arrow-open.qvg | Bin .../fluent2/icons/qvg/segmented-button-check.qvg | Bin .../fluent2/icons/qvg/spin-box-arrow-down.qvg | Bin .../fluent2/icons/qvg/spin-box-arrow-up.qvg | Bin .../fluent2/icons/segmented-button-check.svg | 0 .../fluent2/icons/spin-box-arrow-down.svg | 0 .../fluent2/icons/spin-box-arrow-up.svg | 0 {skins => designsystems}/fluent2/metadata.json | 0 {skins => designsystems}/material3/CMakeLists.txt | 0 .../material3/QskMaterial3Global.h | 0 .../material3/QskMaterial3Skin.cpp | 0 .../material3/QskMaterial3Skin.h | 0 .../material3/QskMaterial3SkinFactory.cpp | 0 .../material3/QskMaterial3SkinFactory.h | 0 {skins => designsystems}/material3/icons.qrc | 0 .../material3/icons/check_small.svg | 0 .../material3/icons/combo-box-arrow-closed.svg | 0 .../material3/icons/combo-box-arrow-open.svg | 0 .../material3/icons/qvg/check_small.qvg | Bin .../material3/icons/qvg/combo-box-arrow-closed.qvg | Bin .../material3/icons/qvg/combo-box-arrow-open.qvg | Bin .../material3/icons/qvg/segmented-button-check.qvg | Bin .../material3/icons/segmented-button-check.svg | 0 {skins => designsystems}/material3/metadata.json | 0 {skins => designsystems}/squiek/CMakeLists.txt | 0 {skins => designsystems}/squiek/QskSquiekGlobal.h | 0 {skins => designsystems}/squiek/QskSquiekSkin.cpp | 0 {skins => designsystems}/squiek/QskSquiekSkin.h | 0 .../squiek/QskSquiekSkinFactory.cpp | 0 .../squiek/QskSquiekSkinFactory.h | 0 {skins => designsystems}/squiek/metadata.json | 0 support/CMakeLists.txt | 2 +- 48 files changed, 2 insertions(+), 2 deletions(-) rename {skins => designsystems}/CMakeLists.txt (100%) rename {skins => designsystems}/fluent2/CMakeLists.txt (100%) rename {skins => designsystems}/fluent2/QskFluent2Global.h (100%) rename {skins => designsystems}/fluent2/QskFluent2Skin.cpp (100%) rename {skins => designsystems}/fluent2/QskFluent2Skin.h (100%) rename {skins => designsystems}/fluent2/QskFluent2SkinFactory.cpp (100%) rename {skins => designsystems}/fluent2/QskFluent2SkinFactory.h (100%) rename {skins => designsystems}/fluent2/QskFluent2Theme.cpp (100%) rename {skins => designsystems}/fluent2/QskFluent2Theme.h (100%) rename {skins => designsystems}/fluent2/icons.qrc (100%) rename {skins => designsystems}/fluent2/icons/checkmark.svg (100%) rename {skins => designsystems}/fluent2/icons/combo-box-arrow-closed.svg (100%) rename {skins => designsystems}/fluent2/icons/combo-box-arrow-open.svg (100%) rename {skins => designsystems}/fluent2/icons/qvg/checkmark.qvg (100%) rename {skins => designsystems}/fluent2/icons/qvg/combo-box-arrow-closed.qvg (100%) rename {skins => designsystems}/fluent2/icons/qvg/combo-box-arrow-open.qvg (100%) rename {skins => designsystems}/fluent2/icons/qvg/segmented-button-check.qvg (100%) rename {skins => designsystems}/fluent2/icons/qvg/spin-box-arrow-down.qvg (100%) rename {skins => designsystems}/fluent2/icons/qvg/spin-box-arrow-up.qvg (100%) rename {skins => designsystems}/fluent2/icons/segmented-button-check.svg (100%) rename {skins => designsystems}/fluent2/icons/spin-box-arrow-down.svg (100%) rename {skins => designsystems}/fluent2/icons/spin-box-arrow-up.svg (100%) rename {skins => designsystems}/fluent2/metadata.json (100%) rename {skins => designsystems}/material3/CMakeLists.txt (100%) rename {skins => designsystems}/material3/QskMaterial3Global.h (100%) rename {skins => designsystems}/material3/QskMaterial3Skin.cpp (100%) rename {skins => designsystems}/material3/QskMaterial3Skin.h (100%) rename {skins => designsystems}/material3/QskMaterial3SkinFactory.cpp (100%) rename {skins => designsystems}/material3/QskMaterial3SkinFactory.h (100%) rename {skins => designsystems}/material3/icons.qrc (100%) rename {skins => designsystems}/material3/icons/check_small.svg (100%) rename {skins => designsystems}/material3/icons/combo-box-arrow-closed.svg (100%) rename {skins => designsystems}/material3/icons/combo-box-arrow-open.svg (100%) rename {skins => designsystems}/material3/icons/qvg/check_small.qvg (100%) rename {skins => designsystems}/material3/icons/qvg/combo-box-arrow-closed.qvg (100%) rename {skins => designsystems}/material3/icons/qvg/combo-box-arrow-open.qvg (100%) rename {skins => designsystems}/material3/icons/qvg/segmented-button-check.qvg (100%) rename {skins => designsystems}/material3/icons/segmented-button-check.svg (100%) rename {skins => designsystems}/material3/metadata.json (100%) rename {skins => designsystems}/squiek/CMakeLists.txt (100%) rename {skins => designsystems}/squiek/QskSquiekGlobal.h (100%) rename {skins => designsystems}/squiek/QskSquiekSkin.cpp (100%) rename {skins => designsystems}/squiek/QskSquiekSkin.h (100%) rename {skins => designsystems}/squiek/QskSquiekSkinFactory.cpp (100%) rename {skins => designsystems}/squiek/QskSquiekSkinFactory.h (100%) rename {skins => designsystems}/squiek/metadata.json (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 539979e7..e3978c24 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,7 +104,7 @@ qsk_setup_build() qsk_setup_install() add_subdirectory(src) -add_subdirectory(skins) +add_subdirectory(designsystems) include(CMakePackageConfigHelpers) diff --git a/skins/CMakeLists.txt b/designsystems/CMakeLists.txt similarity index 100% rename from skins/CMakeLists.txt rename to designsystems/CMakeLists.txt diff --git a/skins/fluent2/CMakeLists.txt b/designsystems/fluent2/CMakeLists.txt similarity index 100% rename from skins/fluent2/CMakeLists.txt rename to designsystems/fluent2/CMakeLists.txt diff --git a/skins/fluent2/QskFluent2Global.h b/designsystems/fluent2/QskFluent2Global.h similarity index 100% rename from skins/fluent2/QskFluent2Global.h rename to designsystems/fluent2/QskFluent2Global.h diff --git a/skins/fluent2/QskFluent2Skin.cpp b/designsystems/fluent2/QskFluent2Skin.cpp similarity index 100% rename from skins/fluent2/QskFluent2Skin.cpp rename to designsystems/fluent2/QskFluent2Skin.cpp diff --git a/skins/fluent2/QskFluent2Skin.h b/designsystems/fluent2/QskFluent2Skin.h similarity index 100% rename from skins/fluent2/QskFluent2Skin.h rename to designsystems/fluent2/QskFluent2Skin.h diff --git a/skins/fluent2/QskFluent2SkinFactory.cpp b/designsystems/fluent2/QskFluent2SkinFactory.cpp similarity index 100% rename from skins/fluent2/QskFluent2SkinFactory.cpp rename to designsystems/fluent2/QskFluent2SkinFactory.cpp diff --git a/skins/fluent2/QskFluent2SkinFactory.h b/designsystems/fluent2/QskFluent2SkinFactory.h similarity index 100% rename from skins/fluent2/QskFluent2SkinFactory.h rename to designsystems/fluent2/QskFluent2SkinFactory.h diff --git a/skins/fluent2/QskFluent2Theme.cpp b/designsystems/fluent2/QskFluent2Theme.cpp similarity index 100% rename from skins/fluent2/QskFluent2Theme.cpp rename to designsystems/fluent2/QskFluent2Theme.cpp diff --git a/skins/fluent2/QskFluent2Theme.h b/designsystems/fluent2/QskFluent2Theme.h similarity index 100% rename from skins/fluent2/QskFluent2Theme.h rename to designsystems/fluent2/QskFluent2Theme.h diff --git a/skins/fluent2/icons.qrc b/designsystems/fluent2/icons.qrc similarity index 100% rename from skins/fluent2/icons.qrc rename to designsystems/fluent2/icons.qrc diff --git a/skins/fluent2/icons/checkmark.svg b/designsystems/fluent2/icons/checkmark.svg similarity index 100% rename from skins/fluent2/icons/checkmark.svg rename to designsystems/fluent2/icons/checkmark.svg diff --git a/skins/fluent2/icons/combo-box-arrow-closed.svg b/designsystems/fluent2/icons/combo-box-arrow-closed.svg similarity index 100% rename from skins/fluent2/icons/combo-box-arrow-closed.svg rename to designsystems/fluent2/icons/combo-box-arrow-closed.svg diff --git a/skins/fluent2/icons/combo-box-arrow-open.svg b/designsystems/fluent2/icons/combo-box-arrow-open.svg similarity index 100% rename from skins/fluent2/icons/combo-box-arrow-open.svg rename to designsystems/fluent2/icons/combo-box-arrow-open.svg diff --git a/skins/fluent2/icons/qvg/checkmark.qvg b/designsystems/fluent2/icons/qvg/checkmark.qvg similarity index 100% rename from skins/fluent2/icons/qvg/checkmark.qvg rename to designsystems/fluent2/icons/qvg/checkmark.qvg diff --git a/skins/fluent2/icons/qvg/combo-box-arrow-closed.qvg b/designsystems/fluent2/icons/qvg/combo-box-arrow-closed.qvg similarity index 100% rename from skins/fluent2/icons/qvg/combo-box-arrow-closed.qvg rename to designsystems/fluent2/icons/qvg/combo-box-arrow-closed.qvg diff --git a/skins/fluent2/icons/qvg/combo-box-arrow-open.qvg b/designsystems/fluent2/icons/qvg/combo-box-arrow-open.qvg similarity index 100% rename from skins/fluent2/icons/qvg/combo-box-arrow-open.qvg rename to designsystems/fluent2/icons/qvg/combo-box-arrow-open.qvg diff --git a/skins/fluent2/icons/qvg/segmented-button-check.qvg b/designsystems/fluent2/icons/qvg/segmented-button-check.qvg similarity index 100% rename from skins/fluent2/icons/qvg/segmented-button-check.qvg rename to designsystems/fluent2/icons/qvg/segmented-button-check.qvg diff --git a/skins/fluent2/icons/qvg/spin-box-arrow-down.qvg b/designsystems/fluent2/icons/qvg/spin-box-arrow-down.qvg similarity index 100% rename from skins/fluent2/icons/qvg/spin-box-arrow-down.qvg rename to designsystems/fluent2/icons/qvg/spin-box-arrow-down.qvg diff --git a/skins/fluent2/icons/qvg/spin-box-arrow-up.qvg b/designsystems/fluent2/icons/qvg/spin-box-arrow-up.qvg similarity index 100% rename from skins/fluent2/icons/qvg/spin-box-arrow-up.qvg rename to designsystems/fluent2/icons/qvg/spin-box-arrow-up.qvg diff --git a/skins/fluent2/icons/segmented-button-check.svg b/designsystems/fluent2/icons/segmented-button-check.svg similarity index 100% rename from skins/fluent2/icons/segmented-button-check.svg rename to designsystems/fluent2/icons/segmented-button-check.svg diff --git a/skins/fluent2/icons/spin-box-arrow-down.svg b/designsystems/fluent2/icons/spin-box-arrow-down.svg similarity index 100% rename from skins/fluent2/icons/spin-box-arrow-down.svg rename to designsystems/fluent2/icons/spin-box-arrow-down.svg diff --git a/skins/fluent2/icons/spin-box-arrow-up.svg b/designsystems/fluent2/icons/spin-box-arrow-up.svg similarity index 100% rename from skins/fluent2/icons/spin-box-arrow-up.svg rename to designsystems/fluent2/icons/spin-box-arrow-up.svg diff --git a/skins/fluent2/metadata.json b/designsystems/fluent2/metadata.json similarity index 100% rename from skins/fluent2/metadata.json rename to designsystems/fluent2/metadata.json diff --git a/skins/material3/CMakeLists.txt b/designsystems/material3/CMakeLists.txt similarity index 100% rename from skins/material3/CMakeLists.txt rename to designsystems/material3/CMakeLists.txt diff --git a/skins/material3/QskMaterial3Global.h b/designsystems/material3/QskMaterial3Global.h similarity index 100% rename from skins/material3/QskMaterial3Global.h rename to designsystems/material3/QskMaterial3Global.h diff --git a/skins/material3/QskMaterial3Skin.cpp b/designsystems/material3/QskMaterial3Skin.cpp similarity index 100% rename from skins/material3/QskMaterial3Skin.cpp rename to designsystems/material3/QskMaterial3Skin.cpp diff --git a/skins/material3/QskMaterial3Skin.h b/designsystems/material3/QskMaterial3Skin.h similarity index 100% rename from skins/material3/QskMaterial3Skin.h rename to designsystems/material3/QskMaterial3Skin.h diff --git a/skins/material3/QskMaterial3SkinFactory.cpp b/designsystems/material3/QskMaterial3SkinFactory.cpp similarity index 100% rename from skins/material3/QskMaterial3SkinFactory.cpp rename to designsystems/material3/QskMaterial3SkinFactory.cpp diff --git a/skins/material3/QskMaterial3SkinFactory.h b/designsystems/material3/QskMaterial3SkinFactory.h similarity index 100% rename from skins/material3/QskMaterial3SkinFactory.h rename to designsystems/material3/QskMaterial3SkinFactory.h diff --git a/skins/material3/icons.qrc b/designsystems/material3/icons.qrc similarity index 100% rename from skins/material3/icons.qrc rename to designsystems/material3/icons.qrc diff --git a/skins/material3/icons/check_small.svg b/designsystems/material3/icons/check_small.svg similarity index 100% rename from skins/material3/icons/check_small.svg rename to designsystems/material3/icons/check_small.svg diff --git a/skins/material3/icons/combo-box-arrow-closed.svg b/designsystems/material3/icons/combo-box-arrow-closed.svg similarity index 100% rename from skins/material3/icons/combo-box-arrow-closed.svg rename to designsystems/material3/icons/combo-box-arrow-closed.svg diff --git a/skins/material3/icons/combo-box-arrow-open.svg b/designsystems/material3/icons/combo-box-arrow-open.svg similarity index 100% rename from skins/material3/icons/combo-box-arrow-open.svg rename to designsystems/material3/icons/combo-box-arrow-open.svg diff --git a/skins/material3/icons/qvg/check_small.qvg b/designsystems/material3/icons/qvg/check_small.qvg similarity index 100% rename from skins/material3/icons/qvg/check_small.qvg rename to designsystems/material3/icons/qvg/check_small.qvg diff --git a/skins/material3/icons/qvg/combo-box-arrow-closed.qvg b/designsystems/material3/icons/qvg/combo-box-arrow-closed.qvg similarity index 100% rename from skins/material3/icons/qvg/combo-box-arrow-closed.qvg rename to designsystems/material3/icons/qvg/combo-box-arrow-closed.qvg diff --git a/skins/material3/icons/qvg/combo-box-arrow-open.qvg b/designsystems/material3/icons/qvg/combo-box-arrow-open.qvg similarity index 100% rename from skins/material3/icons/qvg/combo-box-arrow-open.qvg rename to designsystems/material3/icons/qvg/combo-box-arrow-open.qvg diff --git a/skins/material3/icons/qvg/segmented-button-check.qvg b/designsystems/material3/icons/qvg/segmented-button-check.qvg similarity index 100% rename from skins/material3/icons/qvg/segmented-button-check.qvg rename to designsystems/material3/icons/qvg/segmented-button-check.qvg diff --git a/skins/material3/icons/segmented-button-check.svg b/designsystems/material3/icons/segmented-button-check.svg similarity index 100% rename from skins/material3/icons/segmented-button-check.svg rename to designsystems/material3/icons/segmented-button-check.svg diff --git a/skins/material3/metadata.json b/designsystems/material3/metadata.json similarity index 100% rename from skins/material3/metadata.json rename to designsystems/material3/metadata.json diff --git a/skins/squiek/CMakeLists.txt b/designsystems/squiek/CMakeLists.txt similarity index 100% rename from skins/squiek/CMakeLists.txt rename to designsystems/squiek/CMakeLists.txt diff --git a/skins/squiek/QskSquiekGlobal.h b/designsystems/squiek/QskSquiekGlobal.h similarity index 100% rename from skins/squiek/QskSquiekGlobal.h rename to designsystems/squiek/QskSquiekGlobal.h diff --git a/skins/squiek/QskSquiekSkin.cpp b/designsystems/squiek/QskSquiekSkin.cpp similarity index 100% rename from skins/squiek/QskSquiekSkin.cpp rename to designsystems/squiek/QskSquiekSkin.cpp diff --git a/skins/squiek/QskSquiekSkin.h b/designsystems/squiek/QskSquiekSkin.h similarity index 100% rename from skins/squiek/QskSquiekSkin.h rename to designsystems/squiek/QskSquiekSkin.h diff --git a/skins/squiek/QskSquiekSkinFactory.cpp b/designsystems/squiek/QskSquiekSkinFactory.cpp similarity index 100% rename from skins/squiek/QskSquiekSkinFactory.cpp rename to designsystems/squiek/QskSquiekSkinFactory.cpp diff --git a/skins/squiek/QskSquiekSkinFactory.h b/designsystems/squiek/QskSquiekSkinFactory.h similarity index 100% rename from skins/squiek/QskSquiekSkinFactory.h rename to designsystems/squiek/QskSquiekSkinFactory.h diff --git a/skins/squiek/metadata.json b/designsystems/squiek/metadata.json similarity index 100% rename from skins/squiek/metadata.json rename to designsystems/squiek/metadata.json diff --git a/support/CMakeLists.txt b/support/CMakeLists.txt index ecd53385..c1f439c2 100644 --- a/support/CMakeLists.txt +++ b/support/CMakeLists.txt @@ -31,7 +31,7 @@ target_compile_definitions(${target} target_include_directories(${target} PUBLIC ${CMAKE_CURRENT_LIST_DIR}) if(ENABLE_ENSURE_SKINS) - target_include_directories(${target} PRIVATE ${QSK_SOURCE_DIR}/skins) + target_include_directories(${target} PRIVATE ${QSK_SOURCE_DIR}/designsystems) target_compile_definitions(${target} PRIVATE ENSURE_SKINS) target_link_libraries(${target} PRIVATE squiekskin material3skin fluent2skin) endif()