From a96250b4bc33889ee7cd096e6bdb67b6aa2d325a Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Mon, 28 Nov 2016 15:00:50 +0100
Subject: [PATCH] Allow to start first start wizard from installer

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 src/TortoiseGitSetup/TortoiseGIT.wxs | 5 +++++
 src/TortoiseGitSetup/UIFragment.wxi  | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/TortoiseGitSetup/TortoiseGIT.wxs b/src/TortoiseGitSetup/TortoiseGIT.wxs
index 6debcc36a..431c64b9a 100644
--- a/src/TortoiseGitSetup/TortoiseGIT.wxs
+++ b/src/TortoiseGitSetup/TortoiseGIT.wxs
@@ -26,6 +26,7 @@
 
 		<!-- Launch Condition related properties ................................................................................. -->
 		<Property Id="SHOWCHANGELOG" Secure="yes">1</Property>
+		<Property Id="FIRSTSTARTWIZARD" Secure="yes">1</Property>
 		<Property Id="ALLUSERS" Secure="yes">1</Property>
 
 		<Condition Message="[ProductName] requires Windows Vista or later."><![CDATA[(VersionNT >= 600)]]></Condition>
@@ -50,6 +51,9 @@
 		<CustomAction Id="Set_ShowChangelog" Property="SHOWCHANGELOG" Value="" Return="check" />
 		<CustomAction Id="ShowChangelogAction" Property="TEXTEDITOR" ExeCommand="[INSTALLDIR]changelog.txt" Return="asyncNoWait" />
 
+		<CustomAction Id="Set_FirstStartWizard" Property="FIRSTSTARTWIZARD" Value="" Return="check" />
+		<CustomAction Id="FirstStartWizardAction" Directory="D__Bin" ExeCommand="&quot;[INSTALLDIR]bin\TortoiseGitProc.exe&quot; /command:firststart" Return="asyncNoWait" />
+
 		<CustomAction Id="ShowDonatePage" BinaryKey="CustomActionsDLL" DllEntry="OpenDonatePage" />
 
 		<CustomAction Id="KillCache" BinaryKey="CustomActionsDLL" DllEntry="TerminateCache" />
@@ -122,6 +126,7 @@
 			<Custom Action="DefaultTargetDir" After="PrepareDlg">INSTALLDIR=""</Custom>
 			<Custom Action="ERRCA_UIANDADVERTISED" Before="AppSearch">ProductState=1</Custom>
 			<Custom Action="Set_ShowChangelog" After="LaunchConditions">NOT (NEWERVERSIONDETECTED OR PREVIOUSVERSIONSINSTALLED)</Custom>
+			<Custom Action="Set_FirstStartWizard" After="LaunchConditions">(NEWERVERSIONDETECTED OR PREVIOUSVERSIONSINSTALLED)</Custom>
 		</InstallUISequence>
 	</Product>
 </Wix>
diff --git a/src/TortoiseGitSetup/UIFragment.wxi b/src/TortoiseGitSetup/UIFragment.wxi
index a8fd9d566..9f383864f 100644
--- a/src/TortoiseGitSetup/UIFragment.wxi
+++ b/src/TortoiseGitSetup/UIFragment.wxi
@@ -354,6 +354,7 @@
 		<Dialog Id="ExitDlg" Width="370" Height="270" Title="[ProductName] [Setup]" NoMinimize="yes">
 			<Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="[ButtonText_Finish]">
 				<Publish Event="DoAction" Value="ShowChangelogAction">(NOT Installed) AND (SHOWCHANGELOG = 1)</Publish>
+				<Publish Event="DoAction" Value="FirstStartWizardAction">(NOT Installed) AND (FIRSTSTARTWIZARD = 1)</Publish>
 				<Publish Event="DoAction" Value="RestartExplorer">1</Publish>
 				<Publish Event="EndDialog" Value="Return">1</Publish>
 			</Control>
@@ -363,10 +364,14 @@
 			<Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
 				<Text>{\VerdanaBold13}Completing the [ProductName] [Wizard]</Text>
 			</Control>
-			<Control Id="ChangeLog" Type="CheckBox" X="135" Y="120" Width="200" Height="12" Property='SHOWCHANGELOG' CheckBoxValue='1'>
+			<Control Id="ChangeLog" Type="CheckBox" X="135" Y="100" Width="200" Height="12" Property='SHOWCHANGELOG' CheckBoxValue='1'>
 				<Text>Show Changelog</Text>
 				<Condition Action="hide">(Installed)</Condition>
 			</Control>
+			<Control Id="FirstSTart" Type="CheckBox" X="135" Y="116" Width="200" Height="12" Property='FIRSTSTARTWIZARD' CheckBoxValue='1'>
+				<Text>Run first start wizard</Text>
+				<Condition Action="hide">(Installed)</Condition>
+			</Control>
 			<Control Id="DialogDescription" Type="Text" X="135" Y="70" Width="220" Height="20" Transparent="yes" NoPrefix="yes">
 				<Text>Click the Finish button to exit the [Wizard].</Text>
 			</Control>
-- 
2.11.4.GIT