From 18e66271ae92c2e7c25d08fc30062ea66fc17024 Mon Sep 17 00:00:00 2001
From: sithlord48 <sithlord48@gmail.com>
Date: Sat, 9 Nov 2024 02:00:49 -0500
Subject: [PATCH] refactor: mv res/app.ico src/gui/src/app.ico

---
 res/dist/wix/Include.wxi.in  |   1 +
 res/dist/wix/Product.wxs     |   4 ++--
 {res => src/gui/src}/app.ico | Bin
 src/gui/src/app.rc           |   2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)
 rename {res => src/gui/src}/app.ico (100%)

diff --git a/res/dist/wix/Include.wxi.in b/res/dist/wix/Include.wxi.in
index 67d0db1b1..f649f0b7d 100644
--- a/res/dist/wix/Include.wxi.in
+++ b/res/dist/wix/Include.wxi.in
@@ -6,6 +6,7 @@
     <?define Author="@DESKFLOW_AUTHOR_NAME@"?>
     <?define BinDir="@CMAKE_RUNTIME_OUTPUT_DIRECTORY@"?>
     <?define ProjectResDir="@DESKFLOW_PROJECT_RES_DIR@"?>
+    <?define ProjectIcon="@CMAKE_SOURCE_DIR@/src/gui/src/app.ico"?>
     <?define ResDir="@DESKFLOW_RES_DIR@"?>
     <?define QtDir="@QT_PATH@"?>
     <?define QtBinDir="$(var.QtDir)\bin"?>
diff --git a/res/dist/wix/Product.wxs b/res/dist/wix/Product.wxs
index 5d679d5ba..308bee0e5 100644
--- a/res/dist/wix/Product.wxs
+++ b/res/dist/wix/Product.wxs
@@ -45,7 +45,7 @@
 		</DirectoryRef>
 		<Property Id="CommonBackground">CommonBackground</Property>
 		<Binary Id="CommonBackground" SourceFile="$(var.ResDir)\dist\wix\images\common_background.png"/>
-		<Icon Id="AppIcon" SourceFile="$(var.ResDir)/app.ico"/>
+		<Icon Id="AppIcon" SourceFile="$(var.ProjectIcon)"/>
 		<WixVariable Id="WixUIBannerBmp" Value="$(var.ResDir)\dist\wix\images\banner.png"/>
 		<WixVariable Id="WixUIDialogBmp" Value="$(var.ResDir)\dist\wix\images\dialog.png"/>
 		<Property Id="ARPPRODUCTICON" Value="AppIcon"/>
@@ -99,7 +99,7 @@
 			<Component Guid="BAC8149B-6287-45BF-9C27-43D71ED40214" Id="Gui">
 				<File Id="GuiProgram" KeyPath="yes" Source="$(var.BinDir)/$(var.GuiBin)">
 					<Shortcut Advertise="yes" Directory="ProgramMenuFolder" Icon="$(var.GuiBin)" Id="GuiShortcut" Name="$(var.Name)">
-						<Icon Id="$(var.GuiBin)" SourceFile="$(var.ResDir)/app.ico"/>
+						<Icon Id="$(var.GuiBin)" SourceFile="$(var.ProjectIcon)"/>
 					</Shortcut>
 					<fire:FirewallException Id="GuiFirewallException" IgnoreFailure="yes" Name="$(var.Name)" Scope="any"/>
 				</File>
diff --git a/res/app.ico b/src/gui/src/app.ico
similarity index 100%
rename from res/app.ico
rename to src/gui/src/app.ico
diff --git a/src/gui/src/app.rc b/src/gui/src/app.rc
index cec71c560..80624c3e4 100644
--- a/src/gui/src/app.rc
+++ b/src/gui/src/app.rc
@@ -1 +1 @@
-IDI_ICON1 ICON DISCARDABLE "../../app.ico"
+IDI_ICON1 ICON DISCARDABLE "app.ico"