Skip to content

Commit 3962d6d

Browse files
authored
Merge pull request #224 from game1024/release/v1.7
use installDir UI for wix
2 parents 1f741de + 7d45b1f commit 3962d6d

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

installer/OpenSpeedy.wxs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@
1414
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
1515
<MediaTemplate EmbedCab="yes" />
1616

17-
<!-- 添加标准 UI -->
18-
<UIRef Id="WixUI_Minimal" />
17+
<!-- 添加标准 UI,允许选择安装路径 -->
18+
<UIRef Id="WixUI_InstallDir" />
19+
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
1920
<UIRef Id="WixUI_ErrorProgressText" />
2021

2122
<Feature Id="ProductFeature" Title="Speedy" Level="1">
@@ -43,13 +44,13 @@
4344
Directory="ApplicationProgramsFolder"
4445
Name="Speedy"
4546
WorkingDirectory="INSTALLFOLDER"
46-
Icon="SpeedyIcon"
47+
Icon="ProductIcon"
4748
IconIndex="0" />
4849
<Shortcut Id="DesktopShortcut"
4950
Directory="DesktopFolder"
5051
Name="Speedy"
5152
WorkingDirectory="INSTALLFOLDER"
52-
Icon="SpeedyIcon"
53+
Icon="ProductIcon"
5354
IconIndex="0" />
5455
</File>
5556
<RemoveFolder Id="RemoveINSTALLFOLDER" Directory="INSTALLFOLDER" On="uninstall" />
@@ -74,8 +75,4 @@
7475
</Component>
7576
</ComponentGroup>
7677
</Fragment>
77-
78-
<Fragment>
79-
<Icon Id="SpeedyIcon" SourceFile="files\Speedy.exe" />
80-
</Fragment>
8178
</Wix>

0 commit comments

Comments
 (0)