From ea7c1eae9e701cd3fdb76e0d8632d68540a97e9b Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@didalog.de>
Date: Wed, 6 Jun 2018 11:15:26 +0200
Subject: [PATCH] jj: fix strange shortcuts :D add features for shortcuts

---
 app/Setup/Product.wxs | 54 +++++++++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/app/Setup/Product.wxs b/app/Setup/Product.wxs
index 84def41..6437a88 100644
--- a/app/Setup/Product.wxs
+++ b/app/Setup/Product.wxs
@@ -31,7 +31,7 @@
     <Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
     <Upgrade Id="$(var.UpgradeCode)">
       <UpgradeVersion
-        Minimum="1.0.0.0" Maximum="99.0.0.0"
+        Minimum="1.0.0.0" Maximum="1.9.4.0"
         Property="PREVIOUSVERSIONSINSTALLED"
         IncludeMinimum="yes" IncludeMaximum="no" />
     </Upgrade>
@@ -59,30 +59,28 @@
       <Component Id="ApplicationShortcut_StartMenu" Guid="62aad607-27fc-438f-b2e5-0e3f26e51aaa">
         <Shortcut Id="ApplicationStartMenuShortcut_StartMenu"
              Name="$(var.ProductName)"
-             Target="[#MainApplicationExe]"
+             Target="[INSTALLDIR]$(var.ProgramName).exe"
              WorkingDirectory="INSTALLDIR"/>
         <RemoveFolder Id="ApplicationProgramsFolder_StartMenu" On="uninstall"/>
         <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
       </Component>
     </DirectoryRef>
 
-    <DirectoryRef Id="ApplicationProgramsFolder">
+    <DirectoryRef Id="DesktopFolder">
       <Component Id="ApplicationShortcut_Desktop" Guid="796a4f03-8156-4c62-8d92-29ce92805089">
         <Shortcut Id="ApplicationStartMenuShortcut_Desktop"
              Name="$(var.ProductName)"
-             Target="[#MainApplicationExe]"
+             Target="[INSTALLDIR]$(var.ProgramName).exe"
              WorkingDirectory="INSTALLDIR"/>
         <RemoveFolder Id="ApplicationProgramsFolder_Desktop" On="uninstall"/>
         <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
       </Component>
-    </DirectoryRef>
-    
+    </DirectoryRef>   
 
     <DirectoryRef Id="INSTALLDIR">
       
       <Component Id="MainApplicationExe" Guid="71B06048-F595-40CE-B429-79C2F2D6001B" KeyPath="yes">
-        <File Id="MainApplicationExe" Source="..\$(var.ProgramName)\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" KeyPath="no" Checksum="yes">
-       </File>
+        <File Id="MainApplicationExe" Source="..\$(var.ProgramName)\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" KeyPath="no" Checksum="yes" />
         <!--
         <Shortcut Id="DesktopShortcut" Directory="DesktopFolder" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="no" Target="[#MainApplicationExe]" />
         <Shortcut Id="StartMenuShortcut" Directory="ProgramMenuDir" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="no" Target="[#MainApplicationExe]" />
@@ -152,17 +150,6 @@
 
         <util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
       </Component>
-
-      <!--<Directory Id="ProgramMenuFolder" Name="Programs">
-        <Directory Id="ProgramMenuDir" Name="Process Manager">
-          <Component Id="ProgramMenuDir" Guid="84FC82EA-EF4F-4246-A463-B076E878DF0A">
-            <RemoveFolder Id="ProgramMenuDir" On="uninstall" />
-            <RegistryValue Root="HKMU" Key="Software\[Manufacturer]\[ProductName]" Type="string" Value="" KeyPath="yes" />
-          </Component>
-        </Directory>
-      </Directory>
-
-      <Directory Id="DesktopFolder" Name="Desktop"></Directory>-->
     </DirectoryRef>
 
     <Feature Id="MainApplication" Title="Main Application" Level="1">
@@ -174,17 +161,23 @@
       <ComponentRef Id="Oracle" />
       <ComponentRef Id="PDFsharp" />
       <ComponentRef Id="IndependentsoftLibs" />
-      <ComponentRef Id="DevExpressLibs" />
-      <ComponentRef Id="ApplicationShortcut_Desktop" />
+      <ComponentRef Id="DevExpressLibs" />  
+    </Feature>
+    
+    <Feature Id="DesktopShortcut" Title="Desktop Shortcut" >
+      <ComponentRef Id="ApplicationShortcut_Desktop"   />
+    </Feature>
+    
+    <Feature Id="StartmenuShortcut" Title="Startmenu Shortcut">
       <ComponentRef Id="ApplicationShortcut_StartMenu" />
-      <!--<ComponentRef Id="ProgramMenuDir" />-->
     </Feature>
 
     <!-- Legt das Standard-Installationsverzeichnis fest-->
     <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
 
     <UI>
-      <UIRef Id="WixUI_InstallDir" />
+      <!--<UIRef Id="WixUI_InstallDir" />-->
+      <UIRef Id="WixUI_FeatureTree"/>
       <UIRef Id="WixUI_ErrorProgressText" />
       <Publish Dialog="WelcomeDlg"
             Control="Next"
@@ -196,6 +189,21 @@
             Event="NewDialog"
             Value="WelcomeDlg"
             Order="2">1</Publish>
+      <Publish Dialog="InstallDirDlg"
+            Control="Next"
+            Event="NewDialog"
+            Value="FeaturesDlg"
+            Order="2">1</Publish>
+      <Publish Dialog="InstallDirDlg"
+            Control="ChangeFolder"
+            Event="NewDialog"
+            Value="BrowseDlg"
+            Order="2">1</Publish>
+    <Publish Dialog="FeaturesDlg"
+            Control="Back"
+            Event="NewDialog"
+            Value="InstallDirDlg"
+            Order="2">1</Publish>
     </UI>
   </Product>
 </Wix>
\ No newline at end of file