From a0666f016723924846b44e6f05bd4877976c6787 Mon Sep 17 00:00:00 2001
From: sithlord48 <sithlord48@gmail.com>
Date: Sat, 9 Nov 2024 18:35:48 -0500
Subject: [PATCH] refactor mv: res/gui => src/gui/res

---
 cmake/Libraries.cmake                               |   3 +--
 src/gui/CMakeLists.txt                              |   6 ++----
 {res/gui => src/gui/res}/app.qrc                    |   0
 .../gui => src/gui/res}/icons/128x128/tray-dark.png | Bin
 .../gui/res}/icons/128x128/tray-light.png           | Bin
 {res/gui => src/gui/res}/icons/128x128/tray.png     | Bin
 {res/gui => src/gui/res}/icons/64x64/copy-dark.png  | Bin
 {res/gui => src/gui/res}/icons/64x64/copy-light.png | Bin
 {res/gui => src/gui/res}/icons/64x64/folder.png     | Bin
 {res/gui => src/gui/res}/icons/64x64/padlock.png    | Bin
 {res/gui => src/gui/res}/icons/64x64/user-trash.png | Bin
 .../gui/res}/icons/64x64/video-display.png          | Bin
 {res/gui => src/gui/res}/image/logo-dark.png        | Bin
 {res/gui => src/gui/res}/image/logo-light.png       | Bin
 {res/gui => src/gui/res}/image/placeholder.png      | Bin
 {res/gui => src/gui/res}/image/welcome.png          | Bin
 src/lib/gui/CMakeLists.txt                          |   5 +----
 17 files changed, 4 insertions(+), 10 deletions(-)
 rename {res/gui => src/gui/res}/app.qrc (100%)
 rename {res/gui => src/gui/res}/icons/128x128/tray-dark.png (100%)
 rename {res/gui => src/gui/res}/icons/128x128/tray-light.png (100%)
 rename {res/gui => src/gui/res}/icons/128x128/tray.png (100%)
 rename {res/gui => src/gui/res}/icons/64x64/copy-dark.png (100%)
 rename {res/gui => src/gui/res}/icons/64x64/copy-light.png (100%)
 rename {res/gui => src/gui/res}/icons/64x64/folder.png (100%)
 rename {res/gui => src/gui/res}/icons/64x64/padlock.png (100%)
 rename {res/gui => src/gui/res}/icons/64x64/user-trash.png (100%)
 rename {res/gui => src/gui/res}/icons/64x64/video-display.png (100%)
 rename {res/gui => src/gui/res}/image/logo-dark.png (100%)
 rename {res/gui => src/gui/res}/image/logo-light.png (100%)
 rename {res/gui => src/gui/res}/image/placeholder.png (100%)
 rename {res/gui => src/gui/res}/image/welcome.png (100%)

diff --git a/cmake/Libraries.cmake b/cmake/Libraries.cmake
index 7d9dab348..556255296 100644
--- a/cmake/Libraries.cmake
+++ b/cmake/Libraries.cmake
@@ -354,8 +354,7 @@ macro(configure_qt)
 
   message(STATUS "Qt version: ${Qt6_VERSION}")
 
-  set(GUI_RES_DIR ${DESKFLOW_RES_DIR}/gui)
-  set(GUI_QRC_FILE ${GUI_RES_DIR}/app.qrc)
+  set(GUI_QRC_FILE ${PROJECT_SOURCE_DIR}/src/gui/res/app.qrc)
 
 endmacro()
 
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 9fea5ac20..0567ba3bd 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -20,12 +20,10 @@ set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-set(res_dir ${GUI_RES_DIR})
-set(qrc_file ${GUI_QRC_FILE})
-
 file(
   GLOB
   sources
+  res/app.qrc
   src/*.cpp
   src/*.h
   src/dialogs/*.h
@@ -48,7 +46,7 @@ include_directories(${PROJECT_BINARY_DIR}/src/lib/gui/gui_autogen/include)
 # generated includes
 include_directories(${PROJECT_BINARY_DIR}/config)
 
-add_executable(${target} WIN32 ${sources} ${ui_files} ${rc_files} ${qrc_file})
+add_executable(${target} WIN32 ${sources} ${ui_files} ${rc_files})
 
 target_link_libraries(
   ${target}
diff --git a/res/gui/app.qrc b/src/gui/res/app.qrc
similarity index 100%
rename from res/gui/app.qrc
rename to src/gui/res/app.qrc
diff --git a/res/gui/icons/128x128/tray-dark.png b/src/gui/res/icons/128x128/tray-dark.png
similarity index 100%
rename from res/gui/icons/128x128/tray-dark.png
rename to src/gui/res/icons/128x128/tray-dark.png
diff --git a/res/gui/icons/128x128/tray-light.png b/src/gui/res/icons/128x128/tray-light.png
similarity index 100%
rename from res/gui/icons/128x128/tray-light.png
rename to src/gui/res/icons/128x128/tray-light.png
diff --git a/res/gui/icons/128x128/tray.png b/src/gui/res/icons/128x128/tray.png
similarity index 100%
rename from res/gui/icons/128x128/tray.png
rename to src/gui/res/icons/128x128/tray.png
diff --git a/res/gui/icons/64x64/copy-dark.png b/src/gui/res/icons/64x64/copy-dark.png
similarity index 100%
rename from res/gui/icons/64x64/copy-dark.png
rename to src/gui/res/icons/64x64/copy-dark.png
diff --git a/res/gui/icons/64x64/copy-light.png b/src/gui/res/icons/64x64/copy-light.png
similarity index 100%
rename from res/gui/icons/64x64/copy-light.png
rename to src/gui/res/icons/64x64/copy-light.png
diff --git a/res/gui/icons/64x64/folder.png b/src/gui/res/icons/64x64/folder.png
similarity index 100%
rename from res/gui/icons/64x64/folder.png
rename to src/gui/res/icons/64x64/folder.png
diff --git a/res/gui/icons/64x64/padlock.png b/src/gui/res/icons/64x64/padlock.png
similarity index 100%
rename from res/gui/icons/64x64/padlock.png
rename to src/gui/res/icons/64x64/padlock.png
diff --git a/res/gui/icons/64x64/user-trash.png b/src/gui/res/icons/64x64/user-trash.png
similarity index 100%
rename from res/gui/icons/64x64/user-trash.png
rename to src/gui/res/icons/64x64/user-trash.png
diff --git a/res/gui/icons/64x64/video-display.png b/src/gui/res/icons/64x64/video-display.png
similarity index 100%
rename from res/gui/icons/64x64/video-display.png
rename to src/gui/res/icons/64x64/video-display.png
diff --git a/res/gui/image/logo-dark.png b/src/gui/res/image/logo-dark.png
similarity index 100%
rename from res/gui/image/logo-dark.png
rename to src/gui/res/image/logo-dark.png
diff --git a/res/gui/image/logo-light.png b/src/gui/res/image/logo-light.png
similarity index 100%
rename from res/gui/image/logo-light.png
rename to src/gui/res/image/logo-light.png
diff --git a/res/gui/image/placeholder.png b/src/gui/res/image/placeholder.png
similarity index 100%
rename from res/gui/image/placeholder.png
rename to src/gui/res/image/placeholder.png
diff --git a/res/gui/image/welcome.png b/src/gui/res/image/welcome.png
similarity index 100%
rename from res/gui/image/welcome.png
rename to src/gui/res/image/welcome.png
diff --git a/src/lib/gui/CMakeLists.txt b/src/lib/gui/CMakeLists.txt
index d30ce9f81..ae5d064d2 100644
--- a/src/lib/gui/CMakeLists.txt
+++ b/src/lib/gui/CMakeLists.txt
@@ -15,9 +15,6 @@
 
 set(target gui)
 
-set(res_dir ${GUI_RES_DIR})
-set(qrc_file ${GUI_QRC_FILE})
-
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
@@ -38,7 +35,7 @@ endif()
 # generated includes
 include_directories(${PROJECT_BINARY_DIR}/config)
 
-add_library(${target} STATIC ${sources} ${qrc_file})
+add_library(${target} STATIC ${sources})
 
 target_link_libraries(
   ${target}