From 51c62a3eeb6a31b6dcf699166eb92a25c0ba0f3a Mon Sep 17 00:00:00 2001
From: Hasso Pape <hasso_pape@sil.org>
Date: Mon, 9 Jul 2018 17:36:51 -0500
Subject: [PATCH] Start Menu Shortcuts (part of LT-19007)

* Include start menu shortcuts from the old installer
* Install license text

Change-Id: I4965164fa009d22fb91e289a717c27a8cefde942
---
 Build/Installer.targets            |  3 ++-
 FLExInstaller/CustomComponents.wxi | 37 ++++++++++++++++++++++++++++++
 FLExInstaller/CustomFeatures.wxi   |  5 +++-
 License.htm                        |  2 +-
 4 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/Build/Installer.targets b/Build/Installer.targets
index e9e6301cc5..25da9e7830 100644
--- a/Build/Installer.targets
+++ b/Build/Installer.targets
@@ -172,7 +172,7 @@
 			<DeveloperFiles Include="$(fwrt)\DistFiles\TxtConv.exe"/>
 			<DeveloperFiles Include="$(fwrt)\DistFiles\Windows\**\*"/>
 			<IcuFiles Include="$(fwrt)\DistFiles\Icu$(IcuVersion)\**\*"/>
-			<InstallerResources Include="$(fwrt)\License.htm"/>
+			<InstallerResources Include="$(fwrt)\License.htm"/> <!-- allow users to view the license before installing -->
 			<InstallerResources Include="$(fwrt)\resources\App.ico"/>
 			<InstallerResources Include="$(fwrt)\resources\Installer.ico"/>
 			<!-- If you change this list, you must also update those listed at $(fwrt)\Localizations\ReadMe.md -->
@@ -244,6 +244,7 @@
 			<BinFiles Remove="$(OutputDirForConfig)\*Tests.*"/>
 			<BinFiles Remove="$(OutputDirForConfig)\test*"/>
 			<BinFiles Include="$(fwrt)\DistFiles\**\*" Exclude="@(DeveloperFiles);@(IcuFiles)"/>
+			<BinFiles Include="$(fwrt)\License.htm"/> <!-- install the license -->
 			<!-- Files used to customize the generic patchable installer -->
 			<OverrideFiles Include="$(fwrt)\FLExInstaller\*.wxi"/>
 		</ItemGroup>
diff --git a/FLExInstaller/CustomComponents.wxi b/FLExInstaller/CustomComponents.wxi
index dda928f8f0..c346d6474f 100644
--- a/FLExInstaller/CustomComponents.wxi
+++ b/FLExInstaller/CustomComponents.wxi
@@ -31,6 +31,43 @@
 		<ComponentRef Id="FwInstallDir"/>
 	</ComponentGroup>
 
+	<DirectoryRef Id="ProgramMenuFolder">
+		<Directory Id="FLExProgramMenuFolder" Name="$(var.ApplicationName) $(var.MajorVersion)">
+			<Component Id="StartMenuShortcuts" Guid="EE2CF3EF-30C2-48AC-8151-7B55191A1E59">
+				<Shortcut Id="HelpsShortcut"
+					Name="$(var.ApplicationName) Help"
+					Description="$(var.ApplicationName) Help"
+					Target="[APPFOLDER]Helps\FieldWorks_Language_Explorer_Help.chm"/>
+				<Shortcut Id="ApplicationStartSubmenuShortcut"
+					Name="$(var.ApplicationName)"
+					Description="$(var.ApplicationName) $(var.MajorVersion)"
+					Target="[APPFOLDER]Flex.exe"
+					WorkingDirectory="APPFOLDER"
+					Icon="Application_Icon.ico"/>
+				<Shortcut Id="MorphologyIntroShortcut"
+					Name="Morphology Introduction"
+					Description="A Conceptual Introduction to Morphological Parsing for Stage 1 of the FieldWorks Language Explorer"
+					Target="[APPFOLDER]Helps\WW-ConceptualIntro\ConceptualIntroduction.htm"/>
+				<Shortcut Id="UnicodeCharEditorShortcut"
+					Name="Unicode Character Editor"
+					Description="Unicode Character Editor"
+					Target="[APPFOLDER]UnicodeCharEditor.exe"
+					WorkingDirectory="APPFOLDER"/>
+				<Shortcut Id="EULAShortcut"
+					Name="View the End User License Agreement"
+					Description="$(var.ApplicationName) License"
+					Target="[APPFOLDER]License.htm"/>
+				<Shortcut Id="UninstallProductSubmenu"
+					Name="Uninstall $(var.ApplicationName)"
+					Target="[SystemFolder]msiexec.exe"
+					Arguments="/x [ProductCode]"
+					Description="Uninstalls $(var.ApplicationName)"/>
+				<RemoveFolder Id="RemoveFLExProgramMenuFolder" Directory="FLExProgramMenuFolder" On="uninstall"/>
+				<RegistryValue Root="HKCU" Key="Software\Microsoft\$(var.SafeApplicationName)$(var.MajorVersion)" Name="installed" Type="integer" Value="1" KeyPath="yes"/><!--REVIEW (Hasso) 2018.07: what is this and why is it *here*? (copied from genericinstaller's Framework.wxs -->
+			</Component>
+		</Directory>
+	</DirectoryRef>
+
 	<DirectoryRef  Id='APPFOLDER'>
 		<?if $(sys.BUILDARCH) = x64 ?>
 		<Merge Id="CC_DLL" Language="1033" SourceFile="$(var.EncodingConvertersPath)\CcDLLs64bitMM.msm" DiskId="1"/>
diff --git a/FLExInstaller/CustomFeatures.wxi b/FLExInstaller/CustomFeatures.wxi
index bcafe53447..d9da5afab5 100644
--- a/FLExInstaller/CustomFeatures.wxi
+++ b/FLExInstaller/CustomFeatures.wxi
@@ -13,7 +13,10 @@
 	<Feature Id='DesktopShortcut' Title='Desktop Shortcut' Description='Creates a shortcut on the desktop.' Level='3' ConfigurableDirectory='APPFOLDER' AllowAdvertise="no" InstallDefault="source" Absent='allow' TypicalDefault="install" >
 		<ComponentRef Id='ApplicationShortcutDesktop'/>
 	</Feature>
-	<Feature Id='MenuShortcut' Title='Start Menu Shortcut' Description='Creates a shortcut in the Start menu.' Level='3' ConfigurableDirectory='APPFOLDER' AllowAdvertise="no" InstallDefault="source" Absent='allow' TypicalDefault="install" >
+	<Feature Id='MenuShortcuts' Title='Start Menu Shortcuts' Description='Creates shortcuts in the Start Menu to FieldWorks, utilities, and key documentation.' Level='3' ConfigurableDirectory='APPFOLDER' AllowAdvertise="no" InstallDefault="source" Absent='allow' TypicalDefault="install" >
+		<ComponentRef Id='StartMenuShortcuts' />
+	</Feature>
+	<Feature Id='GenericShortcut_NotInstalled' Title='Generic Start Menu Shortcut' Description='Creates a shortcut in the Start menu.' Level='0' ConfigurableDirectory='APPFOLDER' AllowAdvertise="no" InstallDefault="source" Absent='allow' TypicalDefault="install" >
 		<ComponentRef Id='ApplicationShortcutMenu' />
 	</Feature>
 	<Feature Id="LOC" Title="Language Packs" Description="Additional languages for the user interface." Display="expand" Level="3" AllowAdvertise="no">
diff --git a/License.htm b/License.htm
index acc4965ca8..ca277de826 100644
--- a/License.htm
+++ b/License.htm
@@ -44,7 +44,7 @@
 <span style="font-size:22">Version 2.1, February 1999</span></p>
 <br>
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA<br>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 <br><br>