Windows build: remove stale license page from install wizard. Fixes #879. Install desktop icon but no way to turn it off. See #887.

Author: azonenberg

src/ngscopeclient/wix/ngscopeclient.wxs.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?define Manufacturer = "Antikernel Labs" ?>
 <?define Product = "ngscopeclient" ?>
-<?define Version = "0.1" ?>
+<?define Version = "@PROJECT_VERSION@" ?>
 <?define RegKey = "ngscopeclient" ?>
 <?define DefaultInstallDir = "ngscopeclient" ?>
 <?define ShortcutTarget = "ngscopeclient.exe" ?>
@@ -15,13 +15,14 @@
     <Property Id="ARPURLINFOABOUT" Value="https://www.github.com/azonenberg/scopehal-apps" />
     <Property Id="ARPURLUPDATEINFO" Value="https://www.github.com/azonenberg/scopehal-apps" />
     <Property Id="ARPNOMODIFY" Value="1" />
-    <Directory Id="TARGETDIR" Name="SourceDir">      
+    <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramMenuFolder">
         <Directory Id="ProgramMenuDir" Name="ngscopeclient">
           <Component Id="StartMenuShortcuts" Guid="$(var.Uuid.StartMenuShortcuts)">
             <RegistryValue Root="HKCU" Key="Software\$(var.RegKey)" Name="InstallDir" Value="[APPLICATIONFOLDER]" Type="string" KeyPath="yes" />
             <RemoveFolder Id="ProgramMenuDir" Directory="ProgramMenuDir" On="uninstall" />
             <Shortcut Id="RunProgram" Directory="ProgramMenuDir" Name="$(var.Product)" Description="Run $(var.Product)" Target="[APPLICATIONFOLDER]$(var.ShortcutTarget)" />
+            <Shortcut Id="RunProgramDesktop" Directory="DesktopFolder" Name="$(var.Product)"/>
             <Shortcut Id="UninstallProduct" Directory="ProgramMenuDir" Name="Uninstall $(var.Product)" Description="Uninstalls the $(var.Product)" Target="[System64Folder]msiexec.exe" Arguments="/x [ProductCode]" />
           </Component>
         </Directory>
@@ -43,7 +44,7 @@
     <UIRef Id="WixUI_Custom" />
     <Property Id="ALLUSERS" Value="1" />
     <Property Id="WixAppFolder" Value="WixPerMachineFolder" />
-    <Property Id="WIXUI_INSTALLDIR" Value="APPLICATIONFOLDER" /> 
+    <Property Id="WIXUI_INSTALLDIR" Value="APPLICATIONFOLDER" />
     <UI Id="WixUI_Custom">
       <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
       <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
@@ -65,12 +66,18 @@
       <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
       <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
       <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
+
+      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallScopeDlg">NOT Installed</Publish>
+      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>
+      <Publish Dialog="InstallScopeDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
+      <!--
       <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg">NOT Installed</Publish>
       <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>
       <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
       <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="InstallScopeDlg">LicenseAccepted = "1"</Publish>
-
       <Publish Dialog="InstallScopeDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
+      -->
+
       <Publish Dialog="InstallScopeDlg" Control="Next" Property="WixAppFolder" Value="WixPerUserFolder" Order="1">!(wix.WixUISupportPerUser) AND NOT Privileged</Publish>
       <Publish Dialog="InstallScopeDlg" Control="Next" Property="ALLUSERS" Value="{}" Order="2">WixAppFolder = "WixPerUserFolder"</Publish>
       <Publish Dialog="InstallScopeDlg" Control="Next" Property="ALLUSERS" Value="1" Order="3">WixAppFolder = "WixPerMachineFolder"</Publish>