AI_Assistant/cad-editor
Watch
1
0
Fork
You've already forked cad-editor
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(installer): split installer UI into its own ui.wxs

Browse source 
Moves the WixUI_Minimal UI and finish-screen launch checkbox out of
main.wxs into a dedicated ui.wxs fragment, referenced from main.wxs via
<UIRef Id='OpenCADStudioUI'>. Keeps the package/feature definition and
the UI concerns in separate files.

Updates the release workflow to compile both .wxs files (candle now
writes per-source .wixobj into a directory) and link both objects.

https://claude.ai/code/session_01DFVSKgViFaxEjZD2KsTdtt
This commit is contained in:
Claude 2026-06-12 07:28:04 +00:00
commit fd949b74c7
No known key found for this signature in database
3 changed files with 59 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

31
packaging/windows/main.wxs
View file

@ -122,35 +122,8 @@
<ComponentRef Id='ProgramMenuDirComp' />
</Feature>
<!--
Finish-screen "Launch Open CAD Studio" checkbox.
WIXUI_EXITDIALOGOPTIONALCHECKBOX=1 pre-ticks the checkbox; the Publish
below fires the launch action when the user clicks Finish with it checked.
WixUI_Minimal shows a minimal wizard (Welcome → Progress → Finish).
-->
<Property Id='WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT' Value='Launch Open CAD Studio' />
<Property Id='WIXUI_EXITDIALOGOPTIONALCHECKBOX' Value='1' />
<!--
Start the installed exe after the wizard closes.
asyncNoWait lets the installer exit cleanly while the app starts.
-->
<CustomAction
Id='LaunchApplication'
FileKey='OpenCADStudioEXE'
ExeCommand=''
Execute='immediate'
Return='asyncNoWait'
Impersonate='yes' />
<UI>
<UIRef Id='WixUI_Minimal' />
<Publish
Dialog='ExitDialog'
Control='Finish'
Event='DoAction'
Value='LaunchApplication'>WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 AND NOT Installed</Publish>
</UI>
<!-- Installer UI + finish-screen launch checkbox (see ui.wxs). -->
<UIRef Id='OpenCADStudioUI' />
</Product>
</Wix>

45
packaging/windows/ui.wxs Normal file
View file

@ -0,0 +1,45 @@
<?xml version='1.0' encoding='windows-1252'?>
<!--
Installer UI for the Windows MSI, kept separate from the package/feature
definition in main.wxs. Linked in via `<UIRef Id='OpenCADStudioUI' />`
there; both files are compiled together by candle and linked by light
(which needs `-ext WixUIExtension` for the WixUI_Minimal dialog set).
Provides:
* WixUI_Minimal wizard (Welcome → Progress → Finish).
* A pre-ticked "Launch Open CAD Studio" checkbox on the finish screen
that starts the freshly installed exe when the user clicks Finish.
-->
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
<Fragment>
<!--
Finish-screen "Launch Open CAD Studio" checkbox.
WIXUI_EXITDIALOGOPTIONALCHECKBOX=1 pre-ticks the checkbox; the Publish
below fires the launch action when the user clicks Finish with it checked.
-->
<Property Id='WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT' Value='Launch Open CAD Studio' />
<Property Id='WIXUI_EXITDIALOGOPTIONALCHECKBOX' Value='1' />
<!--
Start the installed exe after the wizard closes. FileKey points at the
File defined in main.wxs (light resolves the cross-fragment reference).
asyncNoWait lets the installer exit cleanly while the app starts.
-->
<CustomAction
Id='LaunchApplication'
FileKey='OpenCADStudioEXE'
ExeCommand=''
Execute='immediate'
Return='asyncNoWait'
Impersonate='yes' />
<UI Id='OpenCADStudioUI'>
<UIRef Id='WixUI_Minimal' />
<Publish
Dialog='ExitDialog'
Control='Finish'
Event='DoAction'
Value='LaunchApplication'>WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 AND NOT Installed</Publish>
</UI>
</Fragment>
</Wix>