haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged WixUI files into a single extension folder

Browse Source
This commit is contained in:
Kenneth Skovhede
2024-05-25 20:01:14 +02:00
parent 529133d967
commit e0ef501e6a
9 changed files with 38 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ReleaseBuilder/Resources/Windows/WixUIExtension/ExtraDialogs/CommonExtra.wxs
-30
View File
@@ -1,30 +0,0 @@
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.txt file in this directory for full license information. -->
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<Fragment>
<UI Id="WixUI_Common_Extra">
<!-- ui text, missing from Wixl -->
<UIText Id="SelParentCostNegNeg" Value="This feature frees up [1] on your hard drive. It has [2] of [3] subfeatures selected. The subfeatures free up [4] on your hard drive." />
<UIText Id="SelParentCostNegPos" Value="This feature frees up [1] on your hard drive. It has [2] of [3] subfeatures selected. The subfeatures require [4] on your hard drive." />
<UIText Id="SelParentCostPosNeg" Value="This feature requires [1] on your hard drive. It has [2] of [3] subfeatures selected. The subfeatures free up [4] on your hard drive." />
<UIText Id="SelParentCostPosPos" Value="This feature requires [1] on your hard drive. It has [2] of [3] subfeatures selected. The subfeatures require [4] on your hard drive." />
<UIText Id="MenuLocal" Value="Will be installed on local hard drive" />
<UIText Id="MenuAllLocal" Value="Entire feature will be installed on local hard drive" />
<UIText Id="MenuAdvertise" Value="Feature will be installed when required" />
<UIText Id="MenuAbsent" Value="Entire feature will be unavailable" />
<UIText Id="SelChildCostNeg" Value="This feature frees up [1] on your hard drive." />
<UIText Id="SelChildCostPos" Value="This feature requires [1] on your hard drive." />
<UIText Id="SelCostPending" Value="Compiling cost for this feature..." />
<UIText Id="SelLocalAbsent" Value="This feature will be completely removed" />
<UIText Id="TimeRemaining" Value="Time remaining:{ [1] minutes}{ [2] seconds}" />
<UIText Id="VolumeCostAvailable" Value="Available" />
<UIText Id="VolumeCostDifference" Value="Difference" />
<UIText Id="VolumeCostRequired" Value="Required" />
<UIText Id="VolumeCostSize" Value="Disk Size" />
<UIText Id="VolumeCostVolume" Value="Volume" />
</UI>
</Fragment>
</Wix>
ReleaseBuilder/Resources/Windows/WixUIExtension/ExtraDialogs/README.md
-9
View File
@@ -1,9 +0,0 @@
# Files from UI.wixext
The files in this folder are adapted from [UI.wixext](https://github.com/wixtoolset/UI.wixext/tree/master/src/wixlib).
The adaptation is mostly to remove the use of localization (`!(loc.name)`) which is not supported by Wixl.
The actual strings are copied from `en-US` and inserted into `CommonExtra.wxs`.
Some modification was required to avoid `"Error 2834: The next pointers on the dialog BrowseDlg do not form a single loop"`.
The files are licensed under the [MS-RL](https://opensource.org/licenses/ms-rl) license.
ReleaseBuilder/Resources/Windows/WixUIExtension/ExtraDialogs/BrowseDlg.wxs → ReleaseBuilder/Resources/Windows/WixUIExtension/ui/BrowseDlg.wxs
View File
ReleaseBuilder/Resources/Windows/WixUIExtension/ui/Common.wxs
+22
View File
@@ -17,6 +17,28 @@
<UIText Id="GB" Value="GB" />
<UIText Id="KB" Value="KB" />
<UIText Id="MB" Value="MB" />
<!-- ui text, missing from Wixl, copied from https://github.com/wixtoolset/UI.wixext/tree/master/src/wixlib/WixUI_en-US.wxl -->
<UIText Id="SelParentCostNegNeg" Value="This feature frees up [1] on your hard drive. It has [2] of [3] subfeatures selected. The subfeatures free up [4] on your hard drive." />
<UIText Id="SelParentCostNegPos" Value="This feature frees up [1] on your hard drive. It has [2] of [3] subfeatures selected. The subfeatures require [4] on your hard drive." />
<UIText Id="SelParentCostPosNeg" Value="This feature requires [1] on your hard drive. It has [2] of [3] subfeatures selected. The subfeatures free up [4] on your hard drive." />
<UIText Id="SelParentCostPosPos" Value="This feature requires [1] on your hard drive. It has [2] of [3] subfeatures selected. The subfeatures require [4] on your hard drive." />
<UIText Id="MenuLocal" Value="Will be installed on local hard drive" />
<UIText Id="MenuAllLocal" Value="Entire feature will be installed on local hard drive" />
<UIText Id="MenuAdvertise" Value="Feature will be installed when required" />
<UIText Id="MenuAbsent" Value="Entire feature will be unavailable" />
<UIText Id="SelChildCostNeg" Value="This feature frees up [1] on your hard drive." />
<UIText Id="SelChildCostPos" Value="This feature requires [1] on your hard drive." />
<UIText Id="SelCostPending" Value="Compiling cost for this feature..." />
<UIText Id="SelLocalAbsent" Value="This feature will be completely removed" />
<UIText Id="TimeRemaining" Value="Time remaining:{ [1] minutes}{ [2] seconds}" />
<UIText Id="VolumeCostAvailable" Value="Available" />
<UIText Id="VolumeCostDifference" Value="Difference" />
<UIText Id="VolumeCostRequired" Value="Required" />
<UIText Id="VolumeCostSize" Value="Disk Size" />
<UIText Id="VolumeCostVolume" Value="Volume" />
</UI>
</Fragment>
</Wix>
ReleaseBuilder/Resources/Windows/WixUIExtension/ExtraDialogs/CustomizeDlg.wxs → ReleaseBuilder/Resources/Windows/WixUIExtension/ui/CustomizeDlg.wxs
View File
ReleaseBuilder/Resources/Windows/WixUIExtension/ExtraDialogs/DiskCostDlg.wxs → ReleaseBuilder/Resources/Windows/WixUIExtension/ui/DiskCostDlg.wxs
View File
ReleaseBuilder/Resources/Windows/WixUIExtension/ExtraDialogs/LicenseAgreementDlg.wxs → ReleaseBuilder/Resources/Windows/WixUIExtension/ui/LicenseAgreementDlg.wxs
View File
ReleaseBuilder/Resources/Windows/WixUIExtension/ui/README.md
+16 -3
View File
@@ -1,7 +1,20 @@
# WIX UI custom files
The contents of this folder is copied from the [Wixl UI extensions](https://gitlab.gnome.org/GNOME/msitools/-/tree/master/data/ext/ui).
The base contents of this folder are copied from the [Wixl UI extensions](https://gitlab.gnome.org/GNOME/msitools/-/tree/master/data/ext/ui).
The [`Common.wxs`](./ui/Common.wxs) file has been modified to use the custom banners.
This was needed as it is not possible to pass outside strings/resources into the project as it is.
Unfortunately, there is not a simple way to override just one property, so all files are copied.
The files are licensed under the [MS-RL](https://opensource.org/licenses/ms-rl) license.
Some extra files are included from [UI.wixext](https://github.com/wixtoolset/UI.wixext/tree/master/src/wixlib).
The adaptation is mostly to remove the use of localization (`!(loc.name)`) which is not supported by Wixl. The actual strings are copied from `en-US` and inserted into `Common.wxs`.
Also, the dialogs were modified to place the buttons as the first items in the dialog, because it otherwise causes the error: `"Error 2834: The next pointers on the dialog BrowseDlg do not form a single loop"`.
The extra files are:
- [`BrowseDlg.wxs`](./ui/BrowseDlg.wxs)
- [`CustomizeDlg.wxs`](./ui/CustomizeDlg.wxs)
- [`DiskCostDlg.wxs`](./ui/DiskCostDlg.wxs)
- [`LicenseAgreementDlg.wxs`](./ui/LicenseAgreementDlg.wxs)
- [`WixUI_FeatureTree.wxs`](./ui/WixUI_FeatureTree.wxs)
The files are all licensed under the [MS-RL](https://opensource.org/licenses/ms-rl) license.
ReleaseBuilder/Resources/Windows/WixUIExtension/ExtraDialogs/WixUI_FeatureTree.wxs → ReleaseBuilder/Resources/Windows/WixUIExtension/ui/WixUI_FeatureTree.wxs
View File