user must not explicitely agree to "license"
authorSven Strickroth <email@cs-ware.de>
Sat, 19 Mar 2011 13:27:18 +0000 (19 14:27 +0100)
committerSven Strickroth <email@cs-ware.de>
Sat, 19 Mar 2011 13:27:18 +0000 (19 14:27 +0100)
Signed-off-by: Sven Strickroth <email@cs-ware.de>
src/TortoiseGitSetup/UIFragment.wxi

index 0543aad..4f5ce1b 100644 (file)
         <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />\r
       </Dialog>\r
 \r
-      <Dialog Id="LicenseAgreementDlg" Width="370" Height="270" Title="[ProductName] License Agreement" NoMinimize="yes">\r
+      <Dialog Id="LicenseAgreementDlg" 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="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="NewDialog" Value="SSHClient">"Yes"</Publish>\r
-           <Condition Action="disable"><![CDATA[IAgree <> "Yes"]]></Condition>\r
-           <Condition Action="enable">IAgree = "Yes"</Condition>\r
+           <Publish Event="NewDialog" Value="SSHClient">1</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="AgreementText" Type="ScrollableText" X="5" Y="60" Width="360" Height="120" Sunken="yes" TabSkip="no">\r
+        <Control Id="AgreementText" Type="ScrollableText" X="5" Y="60" Width="360" Height="160" Sunken="yes" TabSkip="no">\r
           <Text SourceFile="include\TSVN_eula.rtf" />\r
         </Control>\r
-        <Control Id="Buttons" Type="RadioButtonGroup" X="10" Y="187" Width="330" Height="40" Property="IAgree" />\r
-\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]End-User License Agreement</Text>\r
+          <Text>[DlgTitleFont]Information</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>Please read the following license agreement carefully</Text>\r
+          <Text>Please read the following important information before continuing.</Text>\r
         </Control>\r
         <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />\r
       </Dialog>\r
 \r
-      <RadioButtonGroup Property="IAgree">\r
-        <RadioButton Text="{\DlgFont8}I &amp;accept the terms in the License Agreement" Value="Yes" X="5" Y="0" Width="250" Height="15" />\r
-        <RadioButton Text="{\DlgFont8}I &amp;do not accept the terms in the License Agreement" Value="No" X="5" Y="20" Width="250" Height="15" />\r
-      </RadioButtonGroup>\r
-\r
-\r
       <Dialog Id="MaintenanceTypeDlg" 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="MaintenanceWelcomeDlg">1</Publish>\r