From 605e4c763ac037f84b949ab8acbac40523aa7232 Mon Sep 17 00:00:00 2001 From: Vyn Date: Wed, 20 Nov 2024 12:40:24 +0100 Subject: [PATCH] Move Slint files to src directory --- CMakeLists.txt | 2 +- src/Anilist.h | 2 +- src/AppWindow.h | 2 +- ui/app-window.slint => src/AppWindow.slint | 2 -- src/main.cpp | 2 +- {ui => src}/state.slint | 0 src/ui.slint | 4 ++++ {ui => src}/utils.slint | 0 8 files changed, 8 insertions(+), 6 deletions(-) rename ui/app-window.slint => src/AppWindow.slint (99%) rename {ui => src}/state.slint (100%) create mode 100644 src/ui.slint rename {ui => src}/utils.slint (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index a2e8aba..e76225d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ add_executable(lali src/main.cpp) target_include_directories(lali PRIVATE "external") target_link_libraries(lali PRIVATE Slint::Slint) slint_target_sources( - lali ui/app-window.slint + lali src/ui.slint NAMESPACE ui LIBRARY_PATHS selenite=${CMAKE_CURRENT_SOURCE_DIR}/external/selenite/components/index.slint ) diff --git a/src/Anilist.h b/src/Anilist.h index 9740225..c338a6b 100644 --- a/src/Anilist.h +++ b/src/Anilist.h @@ -4,7 +4,7 @@ #include #include #include "httplib.h" -#include "app-window.h" +#include "ui.h" #include "rei-json/json.h" #include "slint_string.h" #include "slint.h" diff --git a/src/AppWindow.h b/src/AppWindow.h index 0258457..5447ada 100644 --- a/src/AppWindow.h +++ b/src/AppWindow.h @@ -3,7 +3,7 @@ #include #include #include -#include "app-window.h" +#include "ui.h" #include "rei-json/Array.h" #include "rei-json/json.h" #include "slint_string.h" diff --git a/ui/app-window.slint b/src/AppWindow.slint similarity index 99% rename from ui/app-window.slint rename to src/AppWindow.slint index 626584a..3d8bb88 100644 --- a/ui/app-window.slint +++ b/src/AppWindow.slint @@ -169,5 +169,3 @@ export component AppWindow inherits Window { } } } - -export { State } diff --git a/src/main.cpp b/src/main.cpp index 1123b78..727a7f0 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4,7 +4,7 @@ #include #include #include "httplib.h" -#include "app-window.h" +#include "ui.h" #include "rei-json/json.h" #include "slint_string.h" #include "slint.h" diff --git a/ui/state.slint b/src/state.slint similarity index 100% rename from ui/state.slint rename to src/state.slint diff --git a/src/ui.slint b/src/ui.slint new file mode 100644 index 0000000..f46c1dd --- /dev/null +++ b/src/ui.slint @@ -0,0 +1,4 @@ +import { AppWindow } from "./AppWindow.slint"; +import { State } from "./state.slint"; + +export { State, AppWindow } diff --git a/ui/utils.slint b/src/utils.slint similarity index 100% rename from ui/utils.slint rename to src/utils.slint