diff options
author | Bob Arnson <bob@firegiant.com> | 2024-03-03 14:16:43 -0500 |
---|---|---|
committer | Bob Arnson <github@bobs.org> | 2024-03-03 14:58:07 -0500 |
commit | 7ec45e8318dc81392daa4eb3d8f95a1a88b60402 (patch) | |
tree | 4fbf663c4ca113f60133683081078908d6dcd89d /src/ext/UI/wixlib/WixUI_Advanced.wxs | |
parent | 1a1da6f105baf47babf292ea71a8218868071c5a (diff) | |
download | wix-7ec45e8318dc81392daa4eb3d8f95a1a88b60402.tar.gz wix-7ec45e8318dc81392daa4eb3d8f95a1a88b60402.tar.bz2 wix-7ec45e8318dc81392daa4eb3d8f95a1a88b60402.zip |
More virtual/override symbols.
And *Sequence/Show works thusly, even with somewhat funky ids.
Diffstat (limited to 'src/ext/UI/wixlib/WixUI_Advanced.wxs')
-rw-r--r-- | src/ext/UI/wixlib/WixUI_Advanced.wxs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ext/UI/wixlib/WixUI_Advanced.wxs b/src/ext/UI/wixlib/WixUI_Advanced.wxs index bab05ec9..4f8bfa0c 100644 --- a/src/ext/UI/wixlib/WixUI_Advanced.wxs +++ b/src/ext/UI/wixlib/WixUI_Advanced.wxs | |||
@@ -8,7 +8,7 @@ installs, install path, and features. | |||
8 | WiX variables used: | 8 | WiX variables used: |
9 | - WixUISupportPerMachine | 9 | - WixUISupportPerMachine |
10 | - WixUISupportPerUser | 10 | - WixUISupportPerUser |
11 | 11 | ||
12 | Todo: | 12 | Todo: |
13 | - Clicking Install doesn't work! - APPLICATIONFOLDER isn't set; need to accept another "incoming" property. | 13 | - Clicking Install doesn't work! - APPLICATIONFOLDER isn't set; need to accept another "incoming" property. |
14 | - Replace this dialog set UI fragment with the UI extension. | 14 | - Replace this dialog set UI fragment with the UI extension. |
@@ -33,8 +33,8 @@ Todo: | |||
33 | <?endforeach?> | 33 | <?endforeach?> |
34 | 34 | ||
35 | <Fragment> | 35 | <Fragment> |
36 | <WixVariable Id="WixUISupportPerUser" Value="1" Overridable="yes" /> | 36 | <WixVariable Id="virtual WixUISupportPerUser" Value="1" /> |
37 | <WixVariable Id="WixUISupportPerMachine" Value="1" Overridable="yes" /> | 37 | <WixVariable Id="virtual WixUISupportPerMachine" Value="1" /> |
38 | 38 | ||
39 | <PropertyRef Id="ApplicationFolderName" /> | 39 | <PropertyRef Id="ApplicationFolderName" /> |
40 | 40 | ||
@@ -119,7 +119,7 @@ Todo: | |||
119 | </UI> | 119 | </UI> |
120 | 120 | ||
121 | <InstallUISequence> | 121 | <InstallUISequence> |
122 | <Show Dialog="WelcomeDlg" Before="AdvancedWelcomeEulaDlg" Condition="Installed AND PATCH" /> | 122 | <Show Dialog="override WelcomeDlg" Before="AdvancedWelcomeEulaDlg" Condition="Installed AND PATCH" /> |
123 | </InstallUISequence> | 123 | </InstallUISequence> |
124 | 124 | ||
125 | <Property Id="WIXUI_INSTALLDIR" Value="APPLICATIONFOLDER" /> | 125 | <Property Id="WIXUI_INSTALLDIR" Value="APPLICATIONFOLDER" /> |