Choose TortoisePLink and SSH at install.

Signed-off-by: Frank Li <lznuaa@gmail.com>

diff --git a/src/TortoiseGitSetup/FeaturesFragment.wxi b/src/TortoiseGitSetup/FeaturesFragment.wxi
index a47f0ab..f5bf71f 100644 (file)
--- a/src/TortoiseGitSetup/FeaturesFragment.wxi
+++ b/src/TortoiseGitSetup/FeaturesFragment.wxi
@@ -87,5 +87,15 @@ DO NOT INSTALL THIS FEATURE if you don't use VS.NET with Web Projects!!!"
                        </Feature>\r
                        <?endif ?>\r
 \r
+               \r
+               <Feature  Id="SSHPlink" Level="1" Title="SSH Plink" Description="SSH PLink" TypicalDefault="install" Display="hidden" InstallDefault="followParent">\r
+                               <ComponentRef  Id="C_SSHCLIENT_PLINK"/>\r
                </Feature>\r
+               \r
+                       \r
+               <Feature  Id="SSHOpenSSH" Level="1" Title="SSH OpenSSH" Description="SSH OpenSSH" TypicalDefault="install" Display="hidden" InstallDefault="followParent">\r
+                               <ComponentRef  Id="C_SSHCLIENT_OPENSSH"/>\r
+               </Feature>\r
+               \r
+               </Feature>      \r
 </Include>
\ No newline at end of file

diff --git a/src/TortoiseGitSetup/Includes.wxi b/src/TortoiseGitSetup/Includes.wxi
index 254466e..58a5b98 100644 (file)
--- a/src/TortoiseGitSetup/Includes.wxi
+++ b/src/TortoiseGitSetup/Includes.wxi
@@ -146,7 +146,8 @@
        <?define GuidIconsXPStyle="EA15DA03-D008-4d2e-8BC4-F20E0A01418C"?>\r
        <?define GuidIconsMarkPhippard="40D1B81D-F8FE-4a97-BCF0-F58BE2C9D7A9"?>\r
        <?define GuidIconsStraight="6176FFF7-3626-4464-8B71-4A5E2551A2B8"?>\r
-\r
+       <?define RegSSHPLINK="112230AA-AB13-4667-AD78-DC8EBEA2ED26"?>\r
+       <?define RegSSHOpen="0E21B3B2-FA54-411b-9AF3-BB275F169A27"?>\r
        <?endif?>\r
 \r
 </Include>\r

diff --git a/src/TortoiseGitSetup/StructureFragment.wxi b/src/TortoiseGitSetup/StructureFragment.wxi
index cbca00e..8d51a2d 100644 (file)
--- a/src/TortoiseGitSetup/StructureFragment.wxi
+++ b/src/TortoiseGitSetup/StructureFragment.wxi
@@ -131,7 +131,15 @@
             <Registry Root="HKMU" Key="Software\Classes\*\shellex\PropertySheetHandlers\TortoiseGit" Value="{$(var.GuidUncontrolled)}" Type="string" />\r
             <Registry Root="HKMU" Key="Software\Classes\Directory\shellex\CopyHookHandlers\TortoiseGit" Value="{$(var.GuidUncontrolled)}" Type="string" />\r
           </Component>\r
-\r
+                 \r
+                 <Component Id="C_SSHCLIENT_PLINK" Guid="$(var.RegSSHPLINK)" Win64="$(var.Win64YesNo)">\r
+                       <Registry Root="HKCU" Key="Software\[Manufacturer]" Name="SSH" Value="[INSTALLDIR]bin\TortoisePLink.exe" Type="string" />\r
+                 </Component>\r
+                 \r
+                 <Component Id="C_SSHCLIENT_OPENSSH" Guid="$(var.RegSSHOpen)" Win64="$(var.Win64YesNo)">\r
+                       <Registry Root="HKCU" Key="Software\[Manufacturer]" Name="SSH" Value="ssh.exe" Type="string" />\r
+                 </Component>\r
+                 \r
           <Component Id="C__machineregistry" Guid="$(var.GuidMachineRegistry)" Win64="$(var.Win64YesNo)">\r
             <Registry Root="HKLM" Key="Software\[Manufacturer]" Action="createKeyAndRemoveKeyOnUninstall" />\r
             <Registry Root="HKLM" Key="Software\[Manufacturer]" Name="ProcPath" Value="[INSTALLDIR]bin\TortoiseProc.exe" Type="string" />\r

diff --git a/src/TortoiseGitSetup/TortoiseSVN.wxs b/src/TortoiseGitSetup/TortoiseSVN.wxs
index 11104aa..c7201f0 100644 (file)
--- a/src/TortoiseGitSetup/TortoiseSVN.wxs
+++ b/src/TortoiseGitSetup/TortoiseSVN.wxs
@@ -33,6 +33,8 @@
 \r
                <Icon Id="TSVNIcon" SourceFile="..\Resources\Tortoise.ico" />\r
 \r
+               <Property Id="SSHRadio">Plink</Property>\r
+                         \r
                <!-- Launch Condition related properties ................................................................................. -->\r
                <Property Id="VERSIONIE">\r
                        <RegistrySearch Id="RegSearchIeVersion" Root="HKLM" Key="SOFTWARE\Microsoft\Internet Explorer" Name="Version" Type="raw" Win64="$(var.Win64YesNo)"/>\r
@@ -86,6 +88,7 @@
                </Property>\r
                <?endif ?>\r
     \r
+       \r
     <?include FeaturesFragment.wxi?>\r
     <?include StructureFragment.wxi?>\r
     <?include UIFragment.wxi?>\r

diff --git a/src/TortoiseGitSetup/UIFragment.wxi b/src/TortoiseGitSetup/UIFragment.wxi
index 0390710..390df29 100644 (file)
--- a/src/TortoiseGitSetup/UIFragment.wxi
+++ b/src/TortoiseGitSetup/UIFragment.wxi
@@ -30,7 +30,6 @@
       <Property Id="ButtonText_Yes"><![CDATA[&Yes]]></Property>\r
 \r
       <!-- UI Variables ................................................................ -->\r
-      <Property Id="SSHRadio">Plink</Property>\r
       <Property Id="IAgree">No</Property>\r
       <Property Id="InstallMode">Complete</Property>\r
       <Property Id="Setup">Setup</Property>\r
@@ -208,9 +207,18 @@
         </Control>\r
         <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="[ButtonText_Next]">\r
           <Publish Event="SpawnWaitDialog" Value="WaitForCostingPopup">CostingComplete = 1</Publish>\r
-          <Publish Property="InstallMode" Value="Custom">1</Publish>           \r
-          <Publish Event="ValidateProductID" Value="0">0</Publish>\r
+          <Publish Property="InstallMode" Value="Custom">1</Publish>     \r
+                 <Publish Event="ValidateProductID" Value="0">0</Publish>\r
+\r
+                 \r
+                 <Publish Event="AddLocal" Value="SSHPlink">1</Publish>\r
+                 <Publish Event="AddLocal" Value="SSHOpenSSH">1</Publish>\r
+                 \r
+                 <Publish Event="Remove" Value="SSHPlink">SSHRadio = "OpenSSH"</Publish>\r
+                 <Publish Event="Remove" Value="SSHOpenSSH">SSHRadio = "Plink"</Publish>\r
+                 \r
           <Publish Event="NewDialog" Value="CustomizeDlg">"Yes"</Publish>\r
+                 \r
         </Control>\r
         <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="[ButtonText_Cancel]">\r
           <Publish Event="SpawnDialog" Value="CancelPopup">1</Publish>\r
@@ -232,8 +240,8 @@
       </Dialog>\r
       \r
       <RadioButtonGroup Property="SSHRadio">\r
-        <RadioButton Text="{\DlgFont8}TortoisePLink, coming from Putty, which is better integrate with windows" Value="Plink" X="5" Y="0" Width="250" Height="30" />\r
-        <RadioButton Text="{\DlgFont8}OpenSSH, Git default SSH Client" Value="OpenSSH" X="5" Y="60" Width="250" Height="30" />\r
+        <RadioButton Text="{\DlgFont8}TortoisePLink, coming from Putty, which is better integrate with windows" Value="Plink" X="5" Y="0" Width="300" Height="30" />\r
+        <RadioButton Text="{\DlgFont8}OpenSSH, Git default SSH Client" Value="OpenSSH" X="5" Y="60" Width="300" Height="30" />\r
       </RadioButtonGroup>\r
       \r
 \r