Rename resource config, install resources

JackBoos · Jan 12, 2022 · 5fc0f9a · 5fc0f9a
1 parent 3076fb0
commit 5fc0f9a
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 5 deletions.
diff --git a/app/GithubChecker/CMakeLists.txt b/app/GithubChecker/CMakeLists.txt
@@ -13,4 +13,9 @@ target_compile_definitions(GithubChecker PRIVATE _CRT_SECURE_NO_WARNINGS)
 
 target_link_libraries(GithubChecker PRIVATE dui::duilib grabber)
 
-install(TARGETS GithubChecker RUNTIME DESTINATION bin)
+install(TARGETS GithubChecker RUNTIME DESTINATION bin)
+
+file(GLOB APP_GRABBER_RESOURCES "${CMAKE_CURRENT_LIST_DIR}/*.png")
+list(APPEND APP_GRABBER_RESOURCES "${CMAKE_CURRENT_LIST_DIR}/checkerMainFrame.xml")
+
+install(FILES ${APP_GRABBER_RESOURCES} DESTINATION bin)
diff --git a/app/GithubChecker/mainFrame.xml → app/GithubChecker/checkerMainFrame.xml b/app/GithubChecker/mainFrame.xml → app/GithubChecker/checkerMainFrame.xml
@@ -9,7 +9,7 @@
 		<VerticalLayout height="253" pos="0,0,0,253" padding="0,0,0,0">
 			<HorizontalLayout height="35" pos="0,0,0,35" padding="5,0,0,0">
 				<Label text="repo" width="70" height="30" pos="0,0,70,30" />
-				<Edit name="REPO_NAME" width="580" height="30" text="jackboos/githubgrabber" pos="0,0,580,30" bordersize="1" bordercolor="0xFFB4B4B4" />
+				<Edit name="REPO_NAME" width="580" height="30" text="microsoft/vcpkg" pos="0,0,580,30" bordersize="1" bordercolor="0xFFB4B4B4" />
 			</HorizontalLayout>
 			<HorizontalLayout height="37" pos="0,0,0,37" padding="5,0,0,0">
 				<Label text="用户名" width="70" height="30" pos="0,0,70,30" />

diff --git a/app/GithubChecker/mainFrame.cpp b/app/GithubChecker/mainFrame.cpp
@@ -44,7 +44,7 @@ CDuiString TestFrame::GetSkinFolder()
 
 CDuiString TestFrame::GetSkinFile()
 {
-    return _T("mainFrame.xml");
+    return _T("checkerMainFrame.xml");
 }
 
 LPCTSTR TestFrame::GetWindowClassName(void) const

diff --git a/app/GithubGrabber/CMakeLists.txt b/app/GithubGrabber/CMakeLists.txt
@@ -13,4 +13,9 @@ target_compile_definitions(GithubGrabber PRIVATE _CRT_SECURE_NO_WARNINGS)
 
 target_link_libraries(GithubGrabber PRIVATE dui::duilib grabber)
 
-install(TARGETS GithubGrabber RUNTIME DESTINATION bin)
+install(TARGETS GithubGrabber RUNTIME DESTINATION bin)
+
+file(GLOB APP_CHECKER_RESOURCES "${CMAKE_CURRENT_LIST_DIR}/*.png")
+list(APPEND APP_CHECKER_RESOURCES "${CMAKE_CURRENT_LIST_DIR}/grabberMainFrame.xml")
+
+install(FILES ${APP_CHECKER_RESOURCES} DESTINATION bin)
diff --git a/app/GithubGrabber/mainFrame.xml → app/GithubGrabber/grabberMainFrame.xml b/app/GithubGrabber/mainFrame.xml → app/GithubGrabber/grabberMainFrame.xml
diff --git a/app/GithubGrabber/mainFrame.cpp b/app/GithubGrabber/mainFrame.cpp
@@ -38,7 +38,7 @@ CDuiString TestFrame::GetSkinFolder()
 
 CDuiString TestFrame::GetSkinFile()
 {
-    return _T("mainFrame.xml");
+    return _T("grabberMainFrame.xml");
 }
 
 LPCTSTR TestFrame::GetWindowClassName(void) const