diff options
Diffstat (limited to 'src/ext/UI/wixlib')
| -rw-r--r-- | src/ext/UI/wixlib/AdvancedWelcomeEulaDlg.wxs | 4 | ||||
| -rw-r--r-- | src/ext/UI/wixlib/Common_Platform.wxi | 4 | ||||
| -rw-r--r-- | src/ext/UI/wixlib/LicenseAgreementDlg.wxs | 4 | ||||
| -rw-r--r-- | src/ext/UI/wixlib/WelcomeEulaDlg.wxs | 4 | ||||
| -rw-r--r-- | src/ext/UI/wixlib/WixUI_Advanced.wxs | 1 | ||||
| -rw-r--r-- | src/ext/UI/wixlib/WixUI_FeatureTree.wxs | 5 | ||||
| -rw-r--r-- | src/ext/UI/wixlib/WixUI_InstallDir.wxs | 1 | ||||
| -rw-r--r-- | src/ext/UI/wixlib/WixUI_Minimal.wxs | 5 | ||||
| -rw-r--r-- | src/ext/UI/wixlib/WixUI_Mondo.wxs | 1 |
9 files changed, 11 insertions, 18 deletions
diff --git a/src/ext/UI/wixlib/AdvancedWelcomeEulaDlg.wxs b/src/ext/UI/wixlib/AdvancedWelcomeEulaDlg.wxs index 8b950ec1..c8ab1036 100644 --- a/src/ext/UI/wixlib/AdvancedWelcomeEulaDlg.wxs +++ b/src/ext/UI/wixlib/AdvancedWelcomeEulaDlg.wxs | |||
| @@ -11,7 +11,9 @@ | |||
| 11 | <Control Id="DescriptionPerMachine" Type="Text" X="20" Y="202" Width="330" Height="31" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.AdvancedWelcomeEulaDlgDescriptionPerMachine)" ShowCondition="ALLUSERS" /> | 11 | <Control Id="DescriptionPerMachine" Type="Text" X="20" Y="202" Width="330" Height="31" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.AdvancedWelcomeEulaDlgDescriptionPerMachine)" ShowCondition="ALLUSERS" /> |
| 12 | <Control Id="DescriptionPerUser" Type="Text" X="20" Y="202" Width="330" Height="31" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.AdvancedWelcomeEulaDlgDescriptionPerUser)" ShowCondition="NOT ALLUSERS" /> | 12 | <Control Id="DescriptionPerUser" Type="Text" X="20" Y="202" Width="330" Height="31" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.AdvancedWelcomeEulaDlgDescriptionPerUser)" ShowCondition="NOT ALLUSERS" /> |
| 13 | <Control Id="LicenseAcceptedCheckBox" Type="CheckBox" X="20" Y="180" Width="226" Height="18" CheckBoxValue="1" Property="LicenseAccepted" Text="!(loc.WelcomeEulaDlgLicenseAcceptedCheckBox)" /> | 13 | <Control Id="LicenseAcceptedCheckBox" Type="CheckBox" X="20" Y="180" Width="226" Height="18" CheckBoxValue="1" Property="LicenseAccepted" Text="!(loc.WelcomeEulaDlgLicenseAcceptedCheckBox)" /> |
| 14 | <Control Id="Print" Type="PushButton" X="88" Y="243" Width="56" Height="17" Text="!(loc.WixUIPrint)" /> | 14 | <Control Id="Print" Type="PushButton" X="88" Y="243" Width="56" Height="17" Text="!(loc.WixUIPrint)"> |
| 15 | <Publish Event="MsiPrint" Value="1" /> | ||
| 16 | </Control> | ||
| 15 | <Control Id="Advanced" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.AdvancedWelcomeEulaDlgAdvanced)" DisableCondition="LicenseAccepted <> "1"" EnableCondition="LicenseAccepted = "1"" /> | 17 | <Control Id="Advanced" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.AdvancedWelcomeEulaDlgAdvanced)" DisableCondition="LicenseAccepted <> "1"" EnableCondition="LicenseAccepted = "1"" /> |
| 16 | <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.AdvancedWelcomeEulaDlgInstall)" Hidden="yes" DisableCondition="LicenseAccepted <> "1"" EnableCondition="LicenseAccepted = "1"" ShowCondition="ALLUSERS"> | 18 | <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.AdvancedWelcomeEulaDlgInstall)" Hidden="yes" DisableCondition="LicenseAccepted <> "1"" EnableCondition="LicenseAccepted = "1"" ShowCondition="ALLUSERS"> |
| 17 | <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg" Condition="!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1" /> | 19 | <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg" Condition="!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1" /> |
diff --git a/src/ext/UI/wixlib/Common_Platform.wxi b/src/ext/UI/wixlib/Common_Platform.wxi index 329abb2e..51fff6a1 100644 --- a/src/ext/UI/wixlib/Common_Platform.wxi +++ b/src/ext/UI/wixlib/Common_Platform.wxi | |||
| @@ -5,10 +5,6 @@ | |||
| 5 | <?include ..\..\caDecor.wxi ?> | 5 | <?include ..\..\caDecor.wxi ?> |
| 6 | 6 | ||
| 7 | <Fragment> | 7 | <Fragment> |
| 8 | <CustomAction Id="WixUIPrintEula$(Suffix)" BinaryRef="WixUiCa$(Suffix)" DllEntry="PrintEula" Return="ignore" Execute="immediate" /> | ||
| 9 | </Fragment> | ||
| 10 | |||
| 11 | <Fragment> | ||
| 12 | <CustomAction Id="WixUIValidatePath$(Suffix)" BinaryRef="WixUiCa$(Suffix)" DllEntry="ValidatePath" Return="ignore" Execute="immediate" /> | 8 | <CustomAction Id="WixUIValidatePath$(Suffix)" BinaryRef="WixUiCa$(Suffix)" DllEntry="ValidatePath" Return="ignore" Execute="immediate" /> |
| 13 | </Fragment> | 9 | </Fragment> |
| 14 | 10 | ||
diff --git a/src/ext/UI/wixlib/LicenseAgreementDlg.wxs b/src/ext/UI/wixlib/LicenseAgreementDlg.wxs index a072cf6b..96585b29 100644 --- a/src/ext/UI/wixlib/LicenseAgreementDlg.wxs +++ b/src/ext/UI/wixlib/LicenseAgreementDlg.wxs | |||
| @@ -11,7 +11,9 @@ | |||
| 11 | <Control Id="Description" Type="Text" X="25" Y="23" Width="340" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.LicenseAgreementDlgDescription)" /> | 11 | <Control Id="Description" Type="Text" X="25" Y="23" Width="340" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.LicenseAgreementDlgDescription)" /> |
| 12 | <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.LicenseAgreementDlgTitle)" /> | 12 | <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.LicenseAgreementDlgTitle)" /> |
| 13 | <Control Id="LicenseAcceptedCheckBox" Type="CheckBox" X="20" Y="207" Width="330" Height="18" CheckBoxValue="1" Property="LicenseAccepted" Text="!(loc.LicenseAgreementDlgLicenseAcceptedCheckBox)" /> | 13 | <Control Id="LicenseAcceptedCheckBox" Type="CheckBox" X="20" Y="207" Width="330" Height="18" CheckBoxValue="1" Property="LicenseAccepted" Text="!(loc.LicenseAgreementDlgLicenseAcceptedCheckBox)" /> |
| 14 | <Control Id="Print" Type="PushButton" X="112" Y="243" Width="56" Height="17" Text="!(loc.WixUIPrint)" /> | 14 | <Control Id="Print" Type="PushButton" X="112" Y="243" Width="56" Height="17" Text="!(loc.WixUIPrint)"> |
| 15 | <Publish Event="MsiPrint" Value="1" /> | ||
| 16 | </Control> | ||
| 15 | <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" /> | 17 | <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" /> |
| 16 | <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" DisableCondition="LicenseAccepted <> "1"" EnableCondition="LicenseAccepted = "1""> | 18 | <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" DisableCondition="LicenseAccepted <> "1"" EnableCondition="LicenseAccepted = "1""> |
| 17 | <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg" Condition="!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1" /> | 19 | <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg" Condition="!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1" /> |
diff --git a/src/ext/UI/wixlib/WelcomeEulaDlg.wxs b/src/ext/UI/wixlib/WelcomeEulaDlg.wxs index ee01d29a..a95a9274 100644 --- a/src/ext/UI/wixlib/WelcomeEulaDlg.wxs +++ b/src/ext/UI/wixlib/WelcomeEulaDlg.wxs | |||
| @@ -9,7 +9,9 @@ | |||
| 9 | <Control Id="Title" Type="Text" X="130" Y="6" Width="225" Height="30" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeEulaDlgTitle)" /> | 9 | <Control Id="Title" Type="Text" X="130" Y="6" Width="225" Height="30" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeEulaDlgTitle)" /> |
| 10 | <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" /> | 10 | <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" /> |
| 11 | <Control Id="LicenseAcceptedCheckBox" Type="CheckBox" X="130" Y="207" Width="226" Height="18" CheckBoxValue="1" Property="LicenseAccepted" Text="!(loc.WelcomeEulaDlgLicenseAcceptedCheckBox)" /> | 11 | <Control Id="LicenseAcceptedCheckBox" Type="CheckBox" X="130" Y="207" Width="226" Height="18" CheckBoxValue="1" Property="LicenseAccepted" Text="!(loc.WelcomeEulaDlgLicenseAcceptedCheckBox)" /> |
| 12 | <Control Id="Print" Type="PushButton" X="88" Y="243" Width="56" Height="17" Text="!(loc.WixUIPrint)" /> | 12 | <Control Id="Print" Type="PushButton" X="88" Y="243" Width="56" Height="17" Text="!(loc.WixUIPrint)"> |
| 13 | <Publish Event="MsiPrint" Value="1" /> | ||
| 14 | </Control> | ||
| 13 | <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" /> | 15 | <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" /> |
| 14 | <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.WelcomeEulaDlgInstall)" Hidden="yes" DisableCondition="LicenseAccepted <> "1"" EnableCondition="LicenseAccepted = "1"" ShowCondition="ALLUSERS"> | 16 | <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.WelcomeEulaDlgInstall)" Hidden="yes" DisableCondition="LicenseAccepted <> "1"" EnableCondition="LicenseAccepted = "1"" ShowCondition="ALLUSERS"> |
| 15 | <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg" Condition="!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1" /> | 17 | <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg" Condition="!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1" /> |
diff --git a/src/ext/UI/wixlib/WixUI_Advanced.wxs b/src/ext/UI/wixlib/WixUI_Advanced.wxs index 4f8bfa0c..2050dc24 100644 --- a/src/ext/UI/wixlib/WixUI_Advanced.wxs +++ b/src/ext/UI/wixlib/WixUI_Advanced.wxs | |||
| @@ -23,7 +23,6 @@ Todo: | |||
| 23 | <?foreach WIXUIARCH in X86;X64;A64 ?> | 23 | <?foreach WIXUIARCH in X86;X64;A64 ?> |
| 24 | <Fragment> | 24 | <Fragment> |
| 25 | <UI Id="WixUI_Advanced_$(WIXUIARCH)"> | 25 | <UI Id="WixUI_Advanced_$(WIXUIARCH)"> |
| 26 | <Publish Dialog="AdvancedWelcomeEulaDlg" Control="Print" Event="DoAction" Value="WixUIPrintEula_$(WIXUIARCH)" /> | ||
| 27 | <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath_$(WIXUIARCH)" Order="1" Condition="NOT WIXUI_DONTVALIDATEPATH" /> | 26 | <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath_$(WIXUIARCH)" Order="1" Condition="NOT WIXUI_DONTVALIDATEPATH" /> |
| 28 | <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath_$(WIXUIARCH)" Order="2" Condition="NOT WIXUI_DONTVALIDATEPATH" /> | 27 | <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath_$(WIXUIARCH)" Order="2" Condition="NOT WIXUI_DONTVALIDATEPATH" /> |
| 29 | </UI> | 28 | </UI> |
diff --git a/src/ext/UI/wixlib/WixUI_FeatureTree.wxs b/src/ext/UI/wixlib/WixUI_FeatureTree.wxs index 6b9b1cf3..5ec27445 100644 --- a/src/ext/UI/wixlib/WixUI_FeatureTree.wxs +++ b/src/ext/UI/wixlib/WixUI_FeatureTree.wxs | |||
| @@ -22,10 +22,7 @@ Patch dialog sequence: | |||
| 22 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 22 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 23 | <?foreach WIXUIARCH in X86;X64;A64 ?> | 23 | <?foreach WIXUIARCH in X86;X64;A64 ?> |
| 24 | <Fragment> | 24 | <Fragment> |
| 25 | <UI Id="WixUI_FeatureTree_$(WIXUIARCH)"> | 25 | <UI Id="WixUI_FeatureTree_$(WIXUIARCH)" /> |
| 26 | <Publish Dialog="LicenseAgreementDlg" Control="Print" Event="DoAction" Value="WixUIPrintEula_$(WIXUIARCH)" /> | ||
| 27 | </UI> | ||
| 28 | |||
| 29 | <UIRef Id="WixUI_FeatureTree" /> | 26 | <UIRef Id="WixUI_FeatureTree" /> |
| 30 | </Fragment> | 27 | </Fragment> |
| 31 | <?endforeach?> | 28 | <?endforeach?> |
diff --git a/src/ext/UI/wixlib/WixUI_InstallDir.wxs b/src/ext/UI/wixlib/WixUI_InstallDir.wxs index e3c171df..bbe806bd 100644 --- a/src/ext/UI/wixlib/WixUI_InstallDir.wxs +++ b/src/ext/UI/wixlib/WixUI_InstallDir.wxs | |||
| @@ -24,7 +24,6 @@ Patch dialog sequence: | |||
| 24 | <?foreach WIXUIARCH in X86;X64;A64 ?> | 24 | <?foreach WIXUIARCH in X86;X64;A64 ?> |
| 25 | <Fragment> | 25 | <Fragment> |
| 26 | <UI Id="WixUI_InstallDir_$(WIXUIARCH)"> | 26 | <UI Id="WixUI_InstallDir_$(WIXUIARCH)"> |
| 27 | <Publish Dialog="LicenseAgreementDlg" Control="Print" Event="DoAction" Value="WixUIPrintEula_$(WIXUIARCH)" /> | ||
| 28 | <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath_$(WIXUIARCH)" Order="3" Condition="NOT WIXUI_DONTVALIDATEPATH" /> | 27 | <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath_$(WIXUIARCH)" Order="3" Condition="NOT WIXUI_DONTVALIDATEPATH" /> |
| 29 | <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath_$(WIXUIARCH)" Order="2" Condition="NOT WIXUI_DONTVALIDATEPATH" /> | 28 | <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath_$(WIXUIARCH)" Order="2" Condition="NOT WIXUI_DONTVALIDATEPATH" /> |
| 30 | </UI> | 29 | </UI> |
diff --git a/src/ext/UI/wixlib/WixUI_Minimal.wxs b/src/ext/UI/wixlib/WixUI_Minimal.wxs index 80a011e6..df71e995 100644 --- a/src/ext/UI/wixlib/WixUI_Minimal.wxs +++ b/src/ext/UI/wixlib/WixUI_Minimal.wxs | |||
| @@ -17,10 +17,7 @@ Patch dialog sequence: | |||
| 17 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 17 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 18 | <?foreach WIXUIARCH in X86;X64;A64 ?> | 18 | <?foreach WIXUIARCH in X86;X64;A64 ?> |
| 19 | <Fragment> | 19 | <Fragment> |
| 20 | <UI Id="WixUI_Minimal_$(WIXUIARCH)"> | 20 | <UI Id="WixUI_Minimal_$(WIXUIARCH)" /> |
| 21 | <Publish Dialog="WelcomeEulaDlg" Control="Print" Event="DoAction" Value="WixUIPrintEula_$(WIXUIARCH)" /> | ||
| 22 | </UI> | ||
| 23 | |||
| 24 | <UIRef Id="WixUI_Minimal" /> | 21 | <UIRef Id="WixUI_Minimal" /> |
| 25 | </Fragment> | 22 | </Fragment> |
| 26 | <?endforeach?> | 23 | <?endforeach?> |
diff --git a/src/ext/UI/wixlib/WixUI_Mondo.wxs b/src/ext/UI/wixlib/WixUI_Mondo.wxs index aac13112..4dd1148d 100644 --- a/src/ext/UI/wixlib/WixUI_Mondo.wxs +++ b/src/ext/UI/wixlib/WixUI_Mondo.wxs | |||
| @@ -25,7 +25,6 @@ Patch dialog sequence: | |||
| 25 | <?foreach WIXUIARCH in X86;X64;A64 ?> | 25 | <?foreach WIXUIARCH in X86;X64;A64 ?> |
| 26 | <Fragment> | 26 | <Fragment> |
| 27 | <UI Id="WixUI_Mondo_$(WIXUIARCH)"> | 27 | <UI Id="WixUI_Mondo_$(WIXUIARCH)"> |
| 28 | <Publish Dialog="LicenseAgreementDlg" Control="Print" Event="DoAction" Value="WixUIPrintEula_$(WIXUIARCH)" /> | ||
| 29 | <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath_$(WIXUIARCH)" Order="3" Condition="NOT WIXUI_DONTVALIDATEPATH" /> | 28 | <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath_$(WIXUIARCH)" Order="3" Condition="NOT WIXUI_DONTVALIDATEPATH" /> |
| 30 | </UI> | 29 | </UI> |
| 31 | 30 | ||