From ea497783d01667a7a5f2092c56643e30d19ad528 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@didalog.de>
Date: Tue, 5 Jun 2018 16:49:41 +0200
Subject: [PATCH] jj: attempt to fix shortcut problem

---
 app/Setup/Product.wxs | 52 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 42 insertions(+), 10 deletions(-)

diff --git a/app/Setup/Product.wxs b/app/Setup/Product.wxs
index 6cb78c0..84def41 100644
--- a/app/Setup/Product.wxs
+++ b/app/Setup/Product.wxs
@@ -47,18 +47,48 @@
           <Directory Id="INSTALLDIR" Name="$(var.ProductName)"/>
         </Directory>
       </Directory>
+
+      <Directory Id="ProgramMenuFolder">
+        <Directory Id="ApplicationProgramsFolder" Name="$(var.ProductName)"/>
+      </Directory>
+
+      <Directory Id="DesktopFolder" />
     </Directory>
 
-    <DirectoryRef Id="INSTALLDIR">
-      
-      <Component Id="MainApplicationExe" Guid="71B06048-F595-40CE-B429-79C2F2D6001B">
-        <File Id="MainApplicationExe" Source="..\$(var.ProgramName)\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" KeyPath="yes" Checksum="yes">
-          <Shortcut Id="DesktopShortcut" Directory="DesktopFolder" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="yes" />
-          <Shortcut Id="StartMenuShortcut" Directory="ProgramMenuDir" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="yes" />
-        </File>       
+    <DirectoryRef Id="ApplicationProgramsFolder">
+      <Component Id="ApplicationShortcut_StartMenu" Guid="62aad607-27fc-438f-b2e5-0e3f26e51aaa">
+        <Shortcut Id="ApplicationStartMenuShortcut_StartMenu"
+             Name="$(var.ProductName)"
+             Target="[#MainApplicationExe]"
+             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">
+      <Component Id="ApplicationShortcut_Desktop" Guid="796a4f03-8156-4c62-8d92-29ce92805089">
+        <Shortcut Id="ApplicationStartMenuShortcut_Desktop"
+             Name="$(var.ProductName)"
+             Target="[#MainApplicationExe]"
+             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 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>
+        <!--
+        <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]" />
+        -->
+      </Component>
+      
       <Component Id="ReleaseNotes" Guid="D1496E4D-98C2-4849-9914-DB47D47CC6BE">
         <File Id="ReleaseNote" Name="Release Notes.txt" Source="P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DD_MODULE\DD Process Manager\Release_Notes.txt" KeyPath="yes">
         </File>
@@ -123,7 +153,7 @@
         <util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
       </Component>
 
-      <Directory Id="ProgramMenuFolder" Name="Programs">
+      <!--<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" />
@@ -132,7 +162,7 @@
         </Directory>
       </Directory>
 
-      <Directory Id="DesktopFolder" Name="Desktop"></Directory>
+      <Directory Id="DesktopFolder" Name="Desktop"></Directory>-->
     </DirectoryRef>
 
     <Feature Id="MainApplication" Title="Main Application" Level="1">
@@ -145,7 +175,9 @@
       <ComponentRef Id="PDFsharp" />
       <ComponentRef Id="IndependentsoftLibs" />
       <ComponentRef Id="DevExpressLibs" />
-      <ComponentRef Id="ProgramMenuDir" />
+      <ComponentRef Id="ApplicationShortcut_Desktop" />
+      <ComponentRef Id="ApplicationShortcut_StartMenu" />
+      <!--<ComponentRef Id="ProgramMenuDir" />-->
     </Feature>
 
     <!-- Legt das Standard-Installationsverzeichnis fest-->