From 5cf5fe13833ca28a4bae79c07f24da3ac16a8456 Mon Sep 17 00:00:00 2001 From: Sebastian Schuberth Date: Tue, 24 Nov 2009 16:38:18 +0100 Subject: [PATCH] Make the recommended line ending conversion the first option For consistency, make the recommended default option the first on the page. Signed-off-by: Sebastian Schuberth --- share/WinGit/install.iss | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/share/WinGit/install.iss b/share/WinGit/install.iss index 6be89bd0..03326470 100644 --- a/share/WinGit/install.iss +++ b/share/WinGit/install.iss @@ -486,25 +486,25 @@ begin PrevPageID:=CRLFPage.ID; // 1st choice - RdbCRLF[GC_LFOnly]:=TRadioButton.Create(CRLFPage); - with RdbCRLF[GC_LFOnly] do begin + RdbCRLF[GC_CRLFAlways]:=TRadioButton.Create(CRLFPage); + with RdbCRLF[GC_CRLFAlways] do begin Parent:=CRLFPage.Surface; - Caption:='Checkout as-is, commit Unix-style line endings'; + Caption:='Checkout Windows-style, commit Unix-style line endings'; Left:=ScaleX(4); Top:=ScaleY(8); Width:=ScaleX(340); Height:=ScaleY(17); Font.Style:=[fsBold]; TabOrder:=0; - Checked:=False; + Checked:=True; end; - LblLFOnly:=TLabel.Create(CRLFPage); - with LblLFOnly do begin + LblCRLFAlways:=TLabel.Create(CRLFPage); + with LblCRLFAlways do begin Parent:=CRLFPage.Surface; Caption:= - 'Git will not perform any conversion when checking out text files. When' + #13 + - 'committing text files, CRLF will be converted to LF. For cross-platform projects,' + #13 + - 'this is the recommended setting on Unix ("core.autocrlf" is set to "input").'; + 'Git will convert LF to CRLF when checking out text files. When committing' + #13 + + 'text files, CRLF will be converted to LF. For cross-platform projects,' + #13 + + 'this is the recommended setting on Windows ("core.autocrlf" is set to "true").'; Left:=ScaleX(28); Top:=ScaleY(32); Width:=ScaleX(372); @@ -512,27 +512,27 @@ begin end; // 2nd choice - RdbCRLF[GC_CRLFAlways]:=TRadioButton.Create(CRLFPage); - with RdbCRLF[GC_CRLFAlways] do begin + RdbCRLF[GC_LFOnly]:=TRadioButton.Create(CRLFPage); + with RdbCRLF[GC_LFOnly] do begin Parent:=CRLFPage.Surface; - Caption:='Checkout Windows-style, commit Unix-style line endings'; + Caption:='Checkout as-is, commit Unix-style line endings'; Left:=ScaleX(4); - Top:=ScaleY(76); + Top:=ScaleY(80); Width:=ScaleX(340); Height:=ScaleY(17); Font.Style:=[fsBold]; TabOrder:=1; - Checked:=True; + Checked:=False; end; - LblCRLFAlways:=TLabel.Create(CRLFPage); - with LblCRLFAlways do begin + LblLFOnly:=TLabel.Create(CRLFPage); + with LblLFOnly do begin Parent:=CRLFPage.Surface; Caption:= - 'Git will convert LF to CRLF when checking out text files. When committing' + #13 + - 'text files, CRLF will be converted to LF. For cross-platform projects,' + #13 + - 'this is the recommended setting on Windows ("core.autocrlf" is set to "true").'; + 'Git will not perform any conversion when checking out text files. When' + #13 + + 'committing text files, CRLF will be converted to LF. For cross-platform projects,' + #13 + + 'this is the recommended setting on Unix ("core.autocrlf" is set to "input").'; Left:=ScaleX(28); - Top:=ScaleY(100); + Top:=ScaleY(104); Width:=ScaleX(372); Height:=ScaleY(47); end; -- 2.11.4.GIT