From 81cb75ebd7f6596d9accaf9de5c6561be4b4cb83 Mon Sep 17 00:00:00 2001
From: Jelle Spijker <j.spijker@ultimaker.com>
Date: Tue, 10 Jan 2023 16:59:17 +0100
Subject: [PATCH] Allow for custom location installation

Contribute to CURA-9157
---
 packaging/msi/CustomizeCuraDlg.wxs     | 10 +++++-----
 packaging/msi/UltiMaker-Cura.wxs.jinja |  6 ++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/packaging/msi/CustomizeCuraDlg.wxs b/packaging/msi/CustomizeCuraDlg.wxs
index a9f1d7c462..9214ae7693 100644
--- a/packaging/msi/CustomizeCuraDlg.wxs
+++ b/packaging/msi/CustomizeCuraDlg.wxs
@@ -6,7 +6,7 @@
     <Fragment>
         <UI>
             <Dialog Id="CustomizeCuraDlg" Width="370" Height="270" Title="!(loc.CustomizeDlg_Title)" TrackDiskSpace="yes">
-                <Control Id="Tree" Type="SelectionTree" X="25" Y="85" Width="175" Height="115" Property="_BrowseProperty" Sunken="yes" TabSkip="no" Text="!(loc.CustomizeDlgTree)" />
+                <Control Id="Tree" Type="SelectionTree" X="25" Y="85" Width="175" Height="95" Property="_BrowseProperty" Sunken="yes" TabSkip="no" Text="!(loc.CustomizeDlgTree)" />
                 <Control Id="Browse" Type="PushButton" X="294" Y="210" Width="66" Height="17" Text="!(loc.CustomizeDlgBrowse)">
                     <Publish Event="SelectionBrowse" Value="BrowseDlg">1</Publish>
                     <Condition Action="hide">Installed</Condition>
@@ -16,7 +16,7 @@
                     <Publish Event="Reset" Value="0">1</Publish>
                     <Subscribe Event="SelectionNoItems" Attribute="Enabled" />
                 </Control>
-                <Control Id="DiskCost" Type="PushButton" X="91" Y="243" Width="100" Height="17" Text="!(loc.CustomizeDlgDiskCost)">
+                <Control Id="DiskCost" Type="PushButton" X="91" Y="243" Width="80" Height="17" Text="!(loc.CustomizeDlgDiskCost)">
                     <Publish Event="SpawnDialog" Value="DiskCostDlg">1</Publish>
                     <Subscribe Event="SelectionNoItems" Attribute="Enabled" />
                 </Control>
@@ -33,14 +33,14 @@
                 <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
                 <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.CustomizeDlgDescription)" />
                 <Control Id="Title" Type="Text" X="15" Y="6" Width="210" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.CustomizeDlgTitle)" />
-                <Control Id="Box" Type="GroupBox" X="210" Y="81" Width="150" Height="118" />
-                <Control Id="ItemDescription" Type="Text" X="215" Y="90" Width="131" Height="50" Text="!(loc.CustomizeDlgItemDescription)">
+                <Control Id="Box" Type="GroupBox" X="210" Y="81" Width="150" Height="88" />
+                <Control Id="ItemDescription" Type="Text" X="215" Y="90" Width="131" Height="30" Text="!(loc.CustomizeDlgItemDescription)">
                     <Subscribe Event="SelectionDescription" Attribute="Text" />
                 </Control>
                 <Control Id="ItemSize" Type="Text" X="215" Y="140" Width="131" Height="50" Text="!(loc.CustomizeDlgItemSize)">
                     <Subscribe Event="SelectionSize" Attribute="Text" />
                 </Control>
-                <Control Id="UninstallPreviousCheckBox" Type="CheckBox" X="10" Y="210" Width="290" Height="17" Property="PREVIOUS_VERSIONS_INSTALLED" CheckBoxValue="0" Text="Uninstall previous Cura versions." />
+                <Control Id="UninstallPreviousCheckBox" Type="CheckBox" X="25" Y="190" Width="290" Height="17" Property="PREVIOUS_VERSIONS_INSTALLED" CheckBoxValue="0" Text="Uninstall previous Cura versions." />
                 <Control Id="Location" Type="Text" X="90" Y="210" Width="200" Height="20" Text="!(loc.CustomizeDlgLocation)">
                     <Subscribe Event="SelectionPath" Attribute="Text" />
                     <Subscribe Event="SelectionPathOn" Attribute="Visible" />
diff --git a/packaging/msi/UltiMaker-Cura.wxs.jinja b/packaging/msi/UltiMaker-Cura.wxs.jinja
index 5a4fc3e660..39ea521d8e 100644
--- a/packaging/msi/UltiMaker-Cura.wxs.jinja
+++ b/packaging/msi/UltiMaker-Cura.wxs.jinja
@@ -28,8 +28,6 @@
                 IncludeMinimum="no" IncludeMaximum="no"
             />
         </Upgrade>
-        <!--TODO: handle copy of configuration of previous version-->
-        <!--TODO: handle removal of old configuration once previous version is uninstalled-->
 
         {% if "Enterprise" in app_name %}
         <Property Id="PREVIOUS_413_INSTALLED" Secure="yes" />
@@ -169,7 +167,7 @@
                 <RemoveFolder Id="RemoveMyShortcutsDir"
                               On="uninstall" />
                 <RegistryValue Root="HKCU"
-                               Key="Software\{{ company }}\{{ app_name }}"
+                               Key="Software\{{ company }}\{{ app_name }}\{{ version }}"
                                Name="installed"
                                Type="integer"
                                Value="1"
@@ -177,7 +175,7 @@
             </Component>
         </DirectoryRef>
 
-        <Feature Id="ProductFeature" Title="{{ app_name }}" Level="1">
+        <Feature Id="ProductFeature" Title="{{ app_name }}" Level="1" ConfigurableDirectory="APPLICATIONFOLDER">
             <ComponentRef Id="CMP_UltiMaker_Cura_exe" />
             <ComponentRef Id="CMP_CuraEngine_exe" />
             <ComponentGroupRef Id="NewFilesGroup" />