Review resx declaration

Author: AlexandrePTJ

src/CMakeLists.txt

@@ -27,11 +27,6 @@ set(KEMAI_QML_SOURCES
         cpp/context/profileManager.h
 )
 
-set(KEMAI_RESX_FILES
-        assets/fonts/RaveoVF.ttf
-        assets/images/kimai_logo_transparent.svg
-)
-
 set(KEMAI_CPP_FILES
         cpp/main.cpp
         cpp/client/kimaiSystem.h
@@ -63,7 +58,7 @@ set(KEMAI_CPP_FILES
 qt_standard_project_setup(
         REQUIRES 6.10
         # I18N_TRANSLATED_LANGUAGES fr
-        )
+)
 
 qt_add_executable(${PROJECT_NAME} WIN32 MACOSX_BUNDLE ${KEMAI_CPP_FILES})
 
@@ -79,27 +74,31 @@ set_source_files_properties(qml/Theme.qml
 qt_add_qml_module(${PROJECT_NAME}
         URI Kemai
         QML_FILES ${KEMAI_QML_FILES}
-        RESOURCE_PREFIX /
-        RESOURCES ${KEMAI_RESX_FILES}
         SOURCES ${KEMAI_QML_SOURCES}
 )
 
 # qt_add_translations(${PROJECT_NAME}
 #         TS_FILE_DIR translations
 # )
 
+qt_add_resources(
+        ${PROJECT_NAME} "assets"
+        FILES
+        assets/fonts/RaveoVF.ttf
+        assets/images/kimai_logo.svg
+)
+
 qt_add_resources(
         ${PROJECT_NAME} "controls_conf"
-        PREFIX "/"
         FILES "qtquickcontrols2.conf")
 
 configure_file(cpp/kemaiConfig.h.in ${PROJECT_BINARY_DIR}/cpp/kemaiConfig.h)
 
 target_include_directories(${PROJECT_NAME}
         PRIVATE
-                ${CMAKE_CURRENT_BINARY_DIR}/cpp
-                ${CMAKE_CURRENT_SOURCE_DIR}/cpp
-                ${CMAKE_CURRENT_SOURCE_DIR}/cpp/context)
+        ${CMAKE_CURRENT_BINARY_DIR}/cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/cpp/context)
 
 target_compile_definitions(${PROJECT_NAME}
         PRIVATE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>)

…assets/images/kimai_logo_transparent.svg src/assets/images/kimai_logo.svgsrc/assets/images/kimai_logo_transparent.svg renamed to src/assets/images/kimai_logo.svg src/assets/images/kimai_logo_transparent.svg renamed to src/assets/images/kimai_logo.svg

@@ -4,6 +4,7 @@
 #include <QFontDatabase>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
+#include <QDirIterator>
 
 #include <spdlog/sinks/stdout_color_sinks.h>
 #include <spdlog/spdlog.h>
@@ -75,7 +76,7 @@ int main(int argc, char *argv[])
         }
 
         // Load fonts
-        if (const auto fontId = QFontDatabase::addApplicationFont(":/Kemai/assets/fonts/RaveoVF.ttf"); fontId == -1)
+        if (const auto fontId = QFontDatabase::addApplicationFont(":/assets/fonts/RaveoVF.ttf"); fontId == -1)
         {
             spdlog::warn("Failed to load font RaveoVF.ttf");
         }

src/cpp/main.cpp

@@ -30,7 +30,7 @@ Page {
             spacing: Theme.spacingMedium
 
             Image {
-                source: "qrc:/Kemai/assets/images/kimai_logo_transparent.svg"
+                source: "qrc:/assets/images/kimai_logo.svg"
                 sourceSize: Qt.size(56, 56)
                 fillMode: Image.PreserveAspectFit
             }