smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: mv res/app.ico src/gui/src/app.ico

Browse source
This commit is contained in:
sithlord48 2024-11-09 02:00:49 -05:00 committed by Nick Bolton
parent 031c393e0d
commit 18e66271ae
4 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
res/dist/wix/Include.wxi.in vendored
View file

@ -6,6 +6,7 @@
<?define Author="@DESKFLOW_AUTHOR_NAME@"?> <?define Author="@DESKFLOW_AUTHOR_NAME@"?>
<?define BinDir="@CMAKE_RUNTIME_OUTPUT_DIRECTORY@"?> <?define BinDir="@CMAKE_RUNTIME_OUTPUT_DIRECTORY@"?>
<?define ProjectResDir="@DESKFLOW_PROJECT_RES_DIR@"?> <?define ProjectResDir="@DESKFLOW_PROJECT_RES_DIR@"?>
<?define ProjectIcon="@CMAKE_SOURCE_DIR@/src/gui/src/app.ico"?>
<?define ResDir="@DESKFLOW_RES_DIR@"?> <?define ResDir="@DESKFLOW_RES_DIR@"?>
<?define QtDir="@QT_PATH@"?> <?define QtDir="@QT_PATH@"?>
<?define QtBinDir="$(var.QtDir)\bin"?> <?define QtBinDir="$(var.QtDir)\bin"?>

4
res/dist/wix/Product.wxs vendored
View file

@ -45,7 +45,7 @@
</DirectoryRef> </DirectoryRef>
<Property Id="CommonBackground">CommonBackground</Property> <Property Id="CommonBackground">CommonBackground</Property>
<Binary Id="CommonBackground" SourceFile="$(var.ResDir)\dist\wix\images\common_background.png"/> <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="WixUIBannerBmp" Value="$(var.ResDir)\dist\wix\images\banner.png"/>
<WixVariable Id="WixUIDialogBmp" Value="$(var.ResDir)\dist\wix\images\dialog.png"/> <WixVariable Id="WixUIDialogBmp" Value="$(var.ResDir)\dist\wix\images\dialog.png"/>
<Property Id="ARPPRODUCTICON" Value="AppIcon"/> <Property Id="ARPPRODUCTICON" Value="AppIcon"/>
@ -99,7 +99,7 @@
<Component Guid="BAC8149B-6287-45BF-9C27-43D71ED40214" Id="Gui"> <Component Guid="BAC8149B-6287-45BF-9C27-43D71ED40214" Id="Gui">
<File Id="GuiProgram" KeyPath="yes" Source="$(var.BinDir)/$(var.GuiBin)"> <File Id="GuiProgram" KeyPath="yes" Source="$(var.BinDir)/$(var.GuiBin)">
<Shortcut Advertise="yes" Directory="ProgramMenuFolder" Icon="$(var.GuiBin)" Id="GuiShortcut" Name="$(var.Name)"> <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> </Shortcut>
<fire:FirewallException Id="GuiFirewallException" IgnoreFailure="yes" Name="$(var.Name)" Scope="any"/> <fire:FirewallException Id="GuiFirewallException" IgnoreFailure="yes" Name="$(var.Name)" Scope="any"/>
</File> </File>

0
res/app.ico → src/gui/src/app.ico
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 56 KiB

2
src/gui/src/app.rc
View file

@ -1 +1 @@
IDI_ICON1 ICON DISCARDABLE "../../app.ico" IDI_ICON1 ICON DISCARDABLE "app.ico"