Side by Side Diff: WixInstaller/custom_WixUI_InstallDir.wxs
Issue 11047004:
Eliminate install directory dialog in installer (Closed)
Patch Set:
Created June 18, 2013, 4:20 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 <?xml version="1.0" encoding="UTF-8"?> | 1 <?xml version="1.0" encoding="UTF-8"?> |
| 2 <!-- | 2 <!-- |
| 3 <copyright file="WixUI_InstallDir.wxs" company="Outercurve Foundation"> | 3 <copyright file="WixUI_InstallDir.wxs" company="Outercurve Foundation"> |
| 4 Copyright (c) 2004, Outercurve Foundation. | 4 Copyright (c) 2004, Outercurve Foundation. |
| 5 This software is released under Microsoft Reciprocal License (MS-RL). | 5 This software is released under Microsoft Reciprocal License (MS-RL). |
| 6 The license and further copyright text can be found in the file | 6 The license and further copyright text can be found in the file |
| 7 LICENSE.TXT at the root directory of the distribution. | 7 LICENSE.TXT at the root directory of the distribution. |
| 8 </copyright> | 8 </copyright> |
| 9 Modified to remove license dialog. | 9 Modified to remove license dialog. |
| 10 --> | 10 --> |
| 11 | 11 |
| 12 <!-- | 12 <!-- |
| 13 First-time install dialog sequence: | 13 First-time install dialog sequence: |
| 14 - WixUI_WelcomeDlg | 14 - WixUI_WelcomeDlg |
| 15 - WixUI_InstallDirDlg | |
| 16 - WixUI_VerifyReadyDlg | 15 - WixUI_VerifyReadyDlg |
| 17 - WixUI_DiskCostDlg | 16 - WixUI_DiskCostDlg |
| 18 | 17 |
| 19 Maintenance dialog sequence: | 18 Maintenance dialog sequence: |
| 20 - WixUI_MaintenanceWelcomeDlg | 19 - WixUI_MaintenanceWelcomeDlg |
| 21 - WixUI_MaintenanceTypeDlg | 20 - WixUI_MaintenanceTypeDlg |
| 22 - WixUI_InstallDirDlg | |
| 23 - WixUI_VerifyReadyDlg | 21 - WixUI_VerifyReadyDlg |
| 24 | 22 |
| 25 Patch dialog sequence: | 23 Patch dialog sequence: |
| 26 - WixUI_WelcomeDlg | 24 - WixUI_WelcomeDlg |
| 27 - WixUI_VerifyReadyDlg | 25 - WixUI_VerifyReadyDlg |
| 28 | 26 |
| 29 --> | 27 --> |
| 30 | 28 |
| 31 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> | 29 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> |
| 32 <Fragment> | 30 <Fragment> |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 47 <DialogRef Id="PrepareDlg" /> | 45 <DialogRef Id="PrepareDlg" /> |
| 48 <DialogRef Id="ProgressDlg" /> | 46 <DialogRef Id="ProgressDlg" /> |
| 49 <DialogRef Id="ResumeDlg" /> | 47 <DialogRef Id="ResumeDlg" /> |
| 50 <DialogRef Id="UserExit" /> | 48 <DialogRef Id="UserExit" /> |
| 51 | 49 |
| 52 <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="Wix UIValidatePath" Order="3">1</Publish> | 50 <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="Wix UIValidatePath" Order="3">1</Publish> |
| 53 <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value=" InvalidDirDlg" Order="4"><![CDATA[WIXUI_INSTALLDIR_VALID<>"1"]]></Publish> | 51 <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value=" InvalidDirDlg" Order="4"><![CDATA[WIXUI_INSTALLDIR_VALID<>"1"]]></Publish> |
| 54 | 52 |
| 55 <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Valu e="Return" Order="999">1</Publish> | 53 <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Valu e="Return" Order="999">1</Publish> |
| 56 | 54 |
| 57 <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value= "InstallDirDlg">1</Publish> | 55 <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value= "VerifyReadyDlg">1</Publish> |
| 58 | 56 |
| 59 <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Val ue="WelcomeDlg">1</Publish> | 57 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Va lue="WelcomeDlg" Order="1">NOT Installed</Publish> |
| 60 <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish> | |
| 61 <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Valu e="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish> | |
| 62 <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" V alue="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INS TALLDIR_VALID<>"1"]]></Publish> | |
| 63 <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Val ue="VerifyReadyDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID=" 1"</Publish> | |
| 64 <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_Br owseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish> | |
| 65 <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnD ialog" Value="BrowseDlg" Order="2">1</Publish> | |
| 66 | |
| 67 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Va lue="InstallDirDlg" Order="1">NOT Installed</Publish> | |
| 68 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Va lue="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish> | 58 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Va lue="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish> |
| 69 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Va lue="WelcomeDlg" Order="2">Installed AND PATCH</Publish> | 59 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Va lue="WelcomeDlg" Order="2">Installed AND PATCH</Publish> |
| 70 | 60 |
| 71 <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDia log" Value="MaintenanceTypeDlg">1</Publish> | 61 <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDia log" Value="MaintenanceTypeDlg">1</Publish> |
| 72 | 62 |
| 73 <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="N ewDialog" Value="VerifyReadyDlg">1</Publish> | 63 <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="N ewDialog" Value="VerifyReadyDlg">1</Publish> |
| 74 <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="N ewDialog" Value="VerifyReadyDlg">1</Publish> | 64 <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="N ewDialog" Value="VerifyReadyDlg">1</Publish> |
| 75 <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog " Value="MaintenanceWelcomeDlg">1</Publish> | 65 <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog " Value="MaintenanceWelcomeDlg">1</Publish> |
| 76 | 66 |
| 77 <Property Id="ARPNOMODIFY" Value="1" /> | 67 <Property Id="ARPNOMODIFY" Value="1" /> |
| 78 </UI> | 68 </UI> |
| 79 | 69 |
| 80 <UIRef Id="WixUI_Common" /> | 70 <UIRef Id="WixUI_Common" /> |
| 81 </Fragment> | 71 </Fragment> |
| 82 </Wix> | 72 </Wix> |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
