reorganize resources

AllanChain · Jul 12, 2024 · 7a4eb52 · 7a4eb52
1 parent 8886f5e
commit 7a4eb52
Show file tree

Hide file tree

Showing 13 changed files with 6 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,7 +12,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 find_package(QT NAMES Qt6 REQUIRED COMPONENTS Widgets)
 find_package(Qt6 REQUIRED COMPONENTS Widgets)
 
-file(GLOB PROJECT_SOURCES "src/*.cpp" "src/*.h" "resources.qrc")
+file(GLOB PROJECT_SOURCES "src/*.cpp" "src/*.h" "resources/index.qrc")
 
 if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
     file(GLOB_RECURSE PROJECT_SOURCES_LINUX "src/linux/*")
@@ -21,7 +21,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     file(GLOB_RECURSE PROJECT_SOURCES_MACOS "src/macos/*")
     list(APPEND PROJECT_SOURCES ${PROJECT_SOURCES_MACOS})
     set(MACOSX_BUNDLE_ICON_FILE icon.icns)
-    set(SANE_BREAK_ICON ${CMAKE_CURRENT_SOURCE_DIR}/images/icon.icns)
+    set(SANE_BREAK_ICON ${CMAKE_CURRENT_SOURCE_DIR}/packaging/macos/icon.icns)
     set_source_files_properties(${SANE_BREAK_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
     list(APPEND PROJECT_SOURCES ${SANE_BREAK_ICON})
 elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows")
@@ -50,7 +50,8 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     target_link_libraries(sane-break PRIVATE "-framework IOKit")
     target_link_libraries(sane-break PRIVATE "-framework CoreFoundation")
     set_target_properties(sane-break PROPERTIES
-        MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/MacOSXBundleInfo.plist.in")
+        MACOSX_BUNDLE_INFO_PLIST
+        "${CMAKE_CURRENT_SOURCE_DIR}/packaging/macos/MacOSXBundleInfo.plist.in")
 endif()
 
 set_target_properties(sane-break PROPERTIES

diff --git a/MacOSXBundleInfo.plist.in → packaging/macos/MacOSXBundleInfo.plist.in b/MacOSXBundleInfo.plist.in → packaging/macos/MacOSXBundleInfo.plist.in
diff --git a/images/icon.icns → packaging/macos/icon.icns b/images/icon.icns → packaging/macos/icon.icns
diff --git a/images/icon-lime.png → resources/images/icon-lime.png b/images/icon-lime.png → resources/images/icon-lime.png
diff --git a/images/icon-lime.svg → resources/images/icon-lime.svg b/images/icon-lime.svg → resources/images/icon-lime.svg
diff --git a/images/icon-yellow.png → resources/images/icon-yellow.png b/images/icon-yellow.png → resources/images/icon-yellow.png
diff --git a/images/icon-yellow.svg → resources/images/icon-yellow.svg b/images/icon-yellow.svg → resources/images/icon-yellow.svg
diff --git a/images/icon.png → resources/images/icon.png b/images/icon.png → resources/images/icon.png
diff --git a/images/icon.svg → resources/images/icon.svg b/images/icon.svg → resources/images/icon.svg
diff --git a/images/[email protected] → resources/images/[email protected] b/images/[email protected] → resources/images/[email protected]
diff --git a/resources.qrc → resources/index.qrc b/resources.qrc → resources/index.qrc
@@ -4,6 +4,6 @@
     <file>images/[email protected]</file>
     <file>images/icon-lime.png</file>
     <file>images/icon-yellow.png</file>
-    <file>src/style.css</file>
+    <file>style.css</file>
   </qresource>
 </RCC>
diff --git a/src/style.css → resources/style.css b/src/style.css → resources/style.css
diff --git a/src/main.cpp b/src/main.cpp
@@ -16,7 +16,7 @@ int main(int argc, char *argv[]) {
   a.setApplicationDisplayName("Sane Break");
   SaneBreakApp *app = new SaneBreakApp();
 
-  QFile styleSheet(":/src/style.css");
+  QFile styleSheet(":/style.css");
   if (styleSheet.open(QIODevice::ReadOnly | QIODevice::Text))
     a.setStyleSheet(styleSheet.readAll());