add choose ssh client dialog at setup msi

diff --git a/src/TortoiseGitSetup/StructureFragment.wxi b/src/TortoiseGitSetup/StructureFragment.wxi
index 4d4ed1d..cbca00e 100644 (file)
--- a/src/TortoiseGitSetup/StructureFragment.wxi
+++ b/src/TortoiseGitSetup/StructureFragment.wxi
@@ -246,6 +246,7 @@ out everything for now, leaving these enabled as they are would make the install
                          <File Id="F__PuttyGen"      ShortName="puttygen.EXE" Name="puttygen.exe" DiskId="1" Source="..\..\ext\putty\puttygen.exe" />\r
                          <File Id="F__pageant"       ShortName="pageant.EXE" Name="pageant.exe" DiskId="1" Source="..\..\ext\putty\pageant.exe" />\r
                          <File Id="F__notepad2"      ShortName="notepad2.EXE" Name="notepad2.exe" DiskId="1" Source="..\..\ext\tools\notepad2.exe" />\r
+                         <File Id="F__askpass"       ShortName="askpass.EXE"  Name="sshaskpass.exe" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\sshaskpass.exe" />\r
        \r
                          \r
               <File Id="F__TSVNCache" ShortName="TGITCACH.EXE" Name="TGitCache.exe" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\TGitCache.exe" />\r

diff --git a/src/TortoiseGitSetup/UIFragment.wxi b/src/TortoiseGitSetup/UIFragment.wxi
index dd6eb17..0390710 100644 (file)
--- a/src/TortoiseGitSetup/UIFragment.wxi
+++ b/src/TortoiseGitSetup/UIFragment.wxi
@@ -30,6 +30,7 @@
       <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
@@ -200,6 +201,41 @@
         </Control>\r
         <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />\r
       </Dialog>\r
+      \r
+      <Dialog Id="SSHClient" Width="370" Height="270" Title="[ProductName] [Setup]" NoMinimize="yes">\r
+        <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="[ButtonText_Back]">\r
+          <Publish Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>\r
+        </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 Event="NewDialog" Value="CustomizeDlg">"Yes"</Publish>\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
+        </Control>\r
+\r
+        <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />\r
+        <Control Id="Title" Type="Text" X="155" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" RightAligned="yes">\r
+          <Text>[DlgTitleFont]Choose SSH Client</Text>\r
+        </Control>\r
+        <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />\r
+        <Control Id="DialogDescription" Type="Text" X="75" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" RightAligned="yes">\r
+          <Text>Choose a kind of SSH Client</Text>\r
+        </Control>\r
+        \r
+        <Control Id="Buttons" Type="RadioButtonGroup" X="10" Y="60" Width="330" Height="150" Property="SSHRadio" />\r
+        \r
+        <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />\r
+        \r
+      </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
+      </RadioButtonGroup>\r
+      \r
 \r
       <Dialog Id="BrowseDlg" Width="370" Height="270" Title="[ProductName] [Setup]" NoMinimize="yes">\r
         <Control Id="OK" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Text="[ButtonText_OK]">\r
@@ -253,7 +289,7 @@
       <Dialog Id="CustomizeDlg" Width="370" Height="270" Title="[ProductName] [Setup]" NoMinimize="yes" TrackDiskSpace="yes">\r
         <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="[ButtonText_Back]">\r
           <Publish Event="NewDialog" Value="MaintenanceTypeDlg"><![CDATA[InstallMode = "Change"]]></Publish>\r
-          <Publish Event="NewDialog" Value="LicenseAgreementDlg"><![CDATA[InstallMode = "Custom"]]></Publish>\r
+          <Publish Event="NewDialog" Value="SSHClient"><![CDATA[InstallMode = "Custom"]]></Publish>\r
         </Control>\r
         <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="[ButtonText_Next]">\r
           <Publish Event="NewDialog" Value="VerifyReadyDlg">1</Publish>\r
@@ -457,11 +493,9 @@
           <Publish Event="NewDialog" Value="WelcomeDlg">1</Publish>\r
         </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 Event="NewDialog" Value="CustomizeDlg">"Yes"</Publish>\r
-          <Publish Property="InstallMode" Value="Custom">1</Publish>\r
-          <Condition Action="disable"><![CDATA[IAgree <> "Yes"]]></Condition>\r
-          <Condition Action="enable">IAgree = "Yes"</Condition>\r
+           <Publish Event="NewDialog" Value="SSHClient">"Yes"</Publish>\r
+           <Condition Action="disable"><![CDATA[IAgree <> "Yes"]]></Condition>\r
+           <Condition Action="enable">IAgree = "Yes"</Condition>\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
@@ -855,6 +889,7 @@
         <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />\r
       </Dialog>\r
 \r
+\r
       <!-- UI Texts ................................................................................................ -->\r
       <UIText Id="AbsentPath" />\r
       <UIText Id="bytes">bytes</UIText>\r