From e487b8357adcfff3c6ef3d37034a82a4f4bec7b3 Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Thu, 12 Jun 2025 20:21:53 +0200 Subject: [PATCH] restructure folder Signed-off-by: Peter Siegmund --- CMakeLists.txt | 4 ++-- components/CMakeLists.txt | 4 ++-- components/{justus => insa}/CMakeLists.txt | 4 ++-- components/{justus => insa}/include/MenuOptions.h | 0 components/{justus => insa}/include/common/Common.h | 0 components/{justus => insa}/include/common/PSMenu.h | 0 components/{justus => insa}/include/common/ScrollBar.h | 0 components/{justus => insa}/include/common/Widget.h | 0 components/{justus => insa}/include/data/MenuItem.h | 0 components/{justus => insa}/include/ui/LightMenu.h | 0 components/{justus => insa}/include/ui/MainMenu.h | 0 components/{justus => insa}/include/ui/SettingsMenu.h | 0 components/{justus => insa}/include/ui/SplashScreen.h | 0 components/{justus => insa}/src/common/PSMenu.cpp | 0 components/{justus => insa}/src/common/ScrollBar.cpp | 0 components/{justus => insa}/src/common/Widget.cpp | 0 components/{justus => insa}/src/data/MenuItem.cpp | 0 components/{justus => insa}/src/ui/LightMenu.cpp | 0 components/{justus => insa}/src/ui/MainMenu.cpp | 0 components/{justus => insa}/src/ui/SettingsMenu.cpp | 0 components/{justus => insa}/src/ui/SplashScreen.cpp | 0 components/{peter => ruth}/CMakeLists.txt | 2 +- components/{peter => ruth}/PushButton.cpp | 0 components/{peter => ruth}/include/PushButton.h | 0 src/main.cpp | 1 - 25 files changed, 7 insertions(+), 8 deletions(-) rename components/{justus => insa}/CMakeLists.txt (96%) rename components/{justus => insa}/include/MenuOptions.h (100%) rename components/{justus => insa}/include/common/Common.h (100%) rename components/{justus => insa}/include/common/PSMenu.h (100%) rename components/{justus => insa}/include/common/ScrollBar.h (100%) rename components/{justus => insa}/include/common/Widget.h (100%) rename components/{justus => insa}/include/data/MenuItem.h (100%) rename components/{justus => insa}/include/ui/LightMenu.h (100%) rename components/{justus => insa}/include/ui/MainMenu.h (100%) rename components/{justus => insa}/include/ui/SettingsMenu.h (100%) rename components/{justus => insa}/include/ui/SplashScreen.h (100%) rename components/{justus => insa}/src/common/PSMenu.cpp (100%) rename components/{justus => insa}/src/common/ScrollBar.cpp (100%) rename components/{justus => insa}/src/common/Widget.cpp (100%) rename components/{justus => insa}/src/data/MenuItem.cpp (100%) rename components/{justus => insa}/src/ui/LightMenu.cpp (100%) rename components/{justus => insa}/src/ui/MainMenu.cpp (100%) rename components/{justus => insa}/src/ui/SettingsMenu.cpp (100%) rename components/{justus => insa}/src/ui/SplashScreen.cpp (100%) rename components/{peter => ruth}/CMakeLists.txt (95%) rename components/{peter => ruth}/PushButton.cpp (100%) rename components/{peter => ruth}/include/PushButton.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ea0597..8e7f71a 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,8 +96,8 @@ else () target_link_libraries(${PROJECT_NAME} PRIVATE ImGui - justus - peter + insa + ruth SDL3::SDL3 SDL3_image::SDL3_image SDL3_ttf::SDL3_ttf diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index 4d0a668..209a3f9 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt @@ -5,7 +5,7 @@ endif () add_library(components INTERFACE) add_subdirectory(imgui) -add_subdirectory(justus) -add_subdirectory(peter) +add_subdirectory(insa) +add_subdirectory(ruth) target_link_libraries(components INTERFACE ImGui) diff --git a/components/justus/CMakeLists.txt b/components/insa/CMakeLists.txt similarity index 96% rename from components/justus/CMakeLists.txt rename to components/insa/CMakeLists.txt index 3583ce1..26ebf61 100644 --- a/components/justus/CMakeLists.txt +++ b/components/insa/CMakeLists.txt @@ -14,7 +14,7 @@ if (DEFINED ENV{IDF_PATH}) endif () cmake_minimum_required(VERSION 3.30) -project(justus) +project(insa) add_library(${PROJECT_NAME} STATIC src/common/PSMenu.cpp @@ -33,5 +33,5 @@ target_include_directories(${PROJECT_NAME} PUBLIC include) target_link_libraries(${PROJECT_NAME} PRIVATE u8g2 - peter + ruth ) diff --git a/components/justus/include/MenuOptions.h b/components/insa/include/MenuOptions.h similarity index 100% rename from components/justus/include/MenuOptions.h rename to components/insa/include/MenuOptions.h diff --git a/components/justus/include/common/Common.h b/components/insa/include/common/Common.h similarity index 100% rename from components/justus/include/common/Common.h rename to components/insa/include/common/Common.h diff --git a/components/justus/include/common/PSMenu.h b/components/insa/include/common/PSMenu.h similarity index 100% rename from components/justus/include/common/PSMenu.h rename to components/insa/include/common/PSMenu.h diff --git a/components/justus/include/common/ScrollBar.h b/components/insa/include/common/ScrollBar.h similarity index 100% rename from components/justus/include/common/ScrollBar.h rename to components/insa/include/common/ScrollBar.h diff --git a/components/justus/include/common/Widget.h b/components/insa/include/common/Widget.h similarity index 100% rename from components/justus/include/common/Widget.h rename to components/insa/include/common/Widget.h diff --git a/components/justus/include/data/MenuItem.h b/components/insa/include/data/MenuItem.h similarity index 100% rename from components/justus/include/data/MenuItem.h rename to components/insa/include/data/MenuItem.h diff --git a/components/justus/include/ui/LightMenu.h b/components/insa/include/ui/LightMenu.h similarity index 100% rename from components/justus/include/ui/LightMenu.h rename to components/insa/include/ui/LightMenu.h diff --git a/components/justus/include/ui/MainMenu.h b/components/insa/include/ui/MainMenu.h similarity index 100% rename from components/justus/include/ui/MainMenu.h rename to components/insa/include/ui/MainMenu.h diff --git a/components/justus/include/ui/SettingsMenu.h b/components/insa/include/ui/SettingsMenu.h similarity index 100% rename from components/justus/include/ui/SettingsMenu.h rename to components/insa/include/ui/SettingsMenu.h diff --git a/components/justus/include/ui/SplashScreen.h b/components/insa/include/ui/SplashScreen.h similarity index 100% rename from components/justus/include/ui/SplashScreen.h rename to components/insa/include/ui/SplashScreen.h diff --git a/components/justus/src/common/PSMenu.cpp b/components/insa/src/common/PSMenu.cpp similarity index 100% rename from components/justus/src/common/PSMenu.cpp rename to components/insa/src/common/PSMenu.cpp diff --git a/components/justus/src/common/ScrollBar.cpp b/components/insa/src/common/ScrollBar.cpp similarity index 100% rename from components/justus/src/common/ScrollBar.cpp rename to components/insa/src/common/ScrollBar.cpp diff --git a/components/justus/src/common/Widget.cpp b/components/insa/src/common/Widget.cpp similarity index 100% rename from components/justus/src/common/Widget.cpp rename to components/insa/src/common/Widget.cpp diff --git a/components/justus/src/data/MenuItem.cpp b/components/insa/src/data/MenuItem.cpp similarity index 100% rename from components/justus/src/data/MenuItem.cpp rename to components/insa/src/data/MenuItem.cpp diff --git a/components/justus/src/ui/LightMenu.cpp b/components/insa/src/ui/LightMenu.cpp similarity index 100% rename from components/justus/src/ui/LightMenu.cpp rename to components/insa/src/ui/LightMenu.cpp diff --git a/components/justus/src/ui/MainMenu.cpp b/components/insa/src/ui/MainMenu.cpp similarity index 100% rename from components/justus/src/ui/MainMenu.cpp rename to components/insa/src/ui/MainMenu.cpp diff --git a/components/justus/src/ui/SettingsMenu.cpp b/components/insa/src/ui/SettingsMenu.cpp similarity index 100% rename from components/justus/src/ui/SettingsMenu.cpp rename to components/insa/src/ui/SettingsMenu.cpp diff --git a/components/justus/src/ui/SplashScreen.cpp b/components/insa/src/ui/SplashScreen.cpp similarity index 100% rename from components/justus/src/ui/SplashScreen.cpp rename to components/insa/src/ui/SplashScreen.cpp diff --git a/components/peter/CMakeLists.txt b/components/ruth/CMakeLists.txt similarity index 95% rename from components/peter/CMakeLists.txt rename to components/ruth/CMakeLists.txt index c7366b8..09da2a1 100644 --- a/components/peter/CMakeLists.txt +++ b/components/ruth/CMakeLists.txt @@ -7,7 +7,7 @@ if (DEFINED ENV{IDF_PATH}) endif () cmake_minimum_required(VERSION 3.30) -project(peter) +project(ruth) add_library(${PROJECT_NAME} STATIC PushButton.cpp diff --git a/components/peter/PushButton.cpp b/components/ruth/PushButton.cpp similarity index 100% rename from components/peter/PushButton.cpp rename to components/ruth/PushButton.cpp diff --git a/components/peter/include/PushButton.h b/components/ruth/include/PushButton.h similarity index 100% rename from components/peter/include/PushButton.h rename to components/ruth/include/PushButton.h diff --git a/src/main.cpp b/src/main.cpp index 10f0c57..d5a14c4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,6 +1,5 @@ #include #include -#include #include #include