|
1 | | -<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 1 | +<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui"> |
2 | 2 | <Package Name="CCExtractor" Language="1033" Version="$(AppVersion)" Manufacturer="CCExtractor development" UpgradeCode="e70dbe37-bb04-4c39-bedc-966a6b073bcf" InstallerVersion="200"> |
3 | 3 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed."/> |
4 | 4 | <MediaTemplate EmbedCab="yes"/> |
|
12 | 12 | <ComponentRef Id="ApplicationShortcutDesktop"/> |
13 | 13 | </Feature> |
14 | 14 | <Icon Id="ccxgui.exe" SourceFile="./installer/ccxgui.exe"/> |
15 | | - <!-- Derives from the regular install dir, but skips the license dialog. --> |
16 | | - <UI Id="WixUI_InstallDir"> |
17 | | - <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" /> |
18 | | - <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" /> |
19 | | - <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" /> |
20 | | - |
21 | | - <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" /> |
22 | | - <Property Id="WixUI_Mode" Value="InstallDir" /> |
23 | | - |
24 | | - <DialogRef Id="BrowseDlg" /> |
25 | | - <DialogRef Id="DiskCostDlg" /> |
26 | | - <DialogRef Id="ErrorDlg" /> |
27 | | - <DialogRef Id="FatalError" /> |
28 | | - <DialogRef Id="FilesInUse" /> |
29 | | - <DialogRef Id="MsiRMFilesInUse" /> |
30 | | - <DialogRef Id="PrepareDlg" /> |
31 | | - <DialogRef Id="ProgressDlg" /> |
32 | | - <DialogRef Id="ResumeDlg" /> |
33 | | - <DialogRef Id="UserExit" /> |
34 | | - <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3" /> |
35 | | - <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4" Condition="NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"" /> |
36 | | - |
37 | | - <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999" /> |
38 | | - |
39 | | - <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Condition="NOT Installed" /> |
40 | | - <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Condition="Installed AND PATCH" /> |
41 | | - |
42 | | - <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" /> |
43 | | - <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1" /> |
44 | | - <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2" Condition="NOT WIXUI_DONTVALIDATEPATH" /> |
45 | | - <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3" Condition="NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"" /> |
46 | | - <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="4" Condition="WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"" /> |
47 | | - <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1" /> |
48 | | - <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2" /> |
49 | | - <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Order="1" Condition="NOT Installed" /> |
50 | | - <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2" Condition="Installed AND NOT PATCH" /> |
51 | | - <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2" Condition="Installed AND PATCH" /> |
52 | | - |
53 | | - <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg" /> |
54 | | - |
55 | | - <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg" /> |
56 | | - <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg" /> |
57 | | - <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg" /> |
58 | | - |
59 | | - <Property Id="ARPNOMODIFY" Value="1" /> |
60 | | - </UI> |
61 | | - |
62 | | - <UIRef Id="WixUI_Common" /> |
63 | | - <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER"/> |
| 15 | + <!-- Use standard WixUI_InstallDir dialog set --> |
| 16 | + <ui:WixUI Id="WixUI_InstallDir" InstallDirectory="INSTALLFOLDER" /> |
| 17 | + <Property Id="ARPNOMODIFY" Value="1" /> |
64 | 18 | </Package> |
65 | 19 | <Fragment> |
66 | | - <Directory Id="DesktopFolder" Name="Desktop"> |
| 20 | + <StandardDirectory Id="DesktopFolder"> |
67 | 21 | <Component Id="ApplicationShortcutDesktop" Guid="*"> |
68 | 22 | <Shortcut Id="ApplicationDesktopShortcut" |
69 | 23 | Name="CCExtractor" |
|
79 | 33 | Value="1" |
80 | 34 | KeyPath="yes"/> |
81 | 35 | </Component> |
82 | | - </Directory> |
| 36 | + </StandardDirectory> |
83 | 37 | <StandardDirectory Id="ProgramFiles6432Folder"> |
84 | 38 | <Directory Id="INSTALLFOLDER" Name="CCExtractor"> |
85 | 39 | <Directory Id="CCX_data" Name="data"> |
|
0 commit comments