refactor mv: res/gui => src/gui/res

2024-11-09 18:35:48 -05:00
parent aba9c08352
commit a0666f0167
17 changed files with 4 additions and 10 deletions
--- 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()

--- 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}
--- a/src/gui/res/app.qrc
+++ b/src/gui/res/app.qrc
--- a/src/gui/res/icons/128x128/tray-dark.png
+++ b/src/gui/res/icons/128x128/tray-dark.png
--- a/src/gui/res/icons/128x128/tray-light.png
+++ b/src/gui/res/icons/128x128/tray-light.png
--- a/src/gui/res/icons/128x128/tray.png
+++ b/src/gui/res/icons/128x128/tray.png
--- a/src/gui/res/icons/64x64/copy-dark.png
+++ b/src/gui/res/icons/64x64/copy-dark.png
--- a/src/gui/res/icons/64x64/copy-light.png
+++ b/src/gui/res/icons/64x64/copy-light.png
--- a/src/gui/res/icons/64x64/folder.png
+++ b/src/gui/res/icons/64x64/folder.png
--- a/src/gui/res/icons/64x64/padlock.png
+++ b/src/gui/res/icons/64x64/padlock.png
--- a/src/gui/res/icons/64x64/user-trash.png
+++ b/src/gui/res/icons/64x64/user-trash.png
--- a/src/gui/res/icons/64x64/video-display.png
+++ b/src/gui/res/icons/64x64/video-display.png
--- a/src/gui/res/image/logo-dark.png
+++ b/src/gui/res/image/logo-dark.png
--- a/src/gui/res/image/logo-light.png
+++ b/src/gui/res/image/logo-light.png
--- a/src/gui/res/image/placeholder.png
+++ b/src/gui/res/image/placeholder.png
--- a/src/gui/res/image/welcome.png
+++ b/src/gui/res/image/welcome.png
--- 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}