IDE: setup dialog: fixed make label

git-svn-id: trunk@38096 -
This commit is contained in:
mattias 2012-07-31 11:10:19 +00:00
parent 99c24f0d3c
commit d4baafc62d
2 changed files with 29 additions and 21 deletions

View File

@ -88,32 +88,32 @@ type
CompilerComboBox: TComboBox;
CompilerLabel: TLabel;
CompilerMemo: TMemo;
FPCSrcDirBrowseButton: TButton;
MakeExeBrowseButton: TButton;
CompilerTabSheet: TTabSheet;
DebuggerBrowseButton: TButton;
FPCSrcDirComboBox: TComboBox;
MakeExeComboBox: TComboBox;
DebuggerComboBox: TComboBox;
FPCSrcDirLabel: TLabel;
MakeExeLabel: TLabel;
DebuggerLabel: TLabel;
FPCSrcDirMemo: TMemo;
MakeExeMemo: TMemo;
DebuggerMemo: TMemo;
DebuggerTabSheet: TTabSheet;
FPCSourcesTabSheet: TTabSheet;
FPCSrcDirBrowseButton: TButton;
FPCSrcDirComboBox: TComboBox;
FPCSrcDirLabel: TLabel;
FPCSrcDirMemo: TMemo;
ImageList1: TImageList;
LazarusTabSheet: TTabSheet;
LazDirBrowseButton: TButton;
LazDirLabel: TLabel;
LazDirComboBox: TComboBox;
LazDirLabel: TLabel;
LazDirMemo: TMemo;
MakeExeBrowseButton: TButton;
MakeExeComboBox: TComboBox;
MakeExeLabel: TLabel;
MakeExeMemo: TMemo;
MakeExeTabSheet: TTabSheet;
PropertiesPageControl: TPageControl;
PropertiesTreeView: TTreeView;
Splitter1: TSplitter;
StartIDEBitBtn: TBitBtn;
LazarusTabSheet: TTabSheet;
CompilerTabSheet: TTabSheet;
FPCSourcesTabSheet: TTabSheet;
MakeExeTabSheet: TTabSheet;
DebuggerTabSheet: TTabSheet;
WelcomePaintBox: TPaintBox;
procedure CompilerBrowseButtonClick(Sender: TObject);
procedure CompilerComboBoxChange(Sender: TObject);
@ -1288,6 +1288,8 @@ end;
{ TInitialSetupDialog }
procedure TInitialSetupDialog.FormCreate(Sender: TObject);
var
s: String;
begin
Caption:=Format(lisWelcomeToLazarusIDE, [GetLazarusVersionString]);
@ -1330,8 +1332,12 @@ begin
lisTheMakeExecutableTypicallyHasTheName, ['make'+GetExecutableExt('')]);
DebuggerBrowseButton.Caption:=lisPathEditBrowse;
DebuggerLabel.Caption:=Format(
lisTheDebuggerExecutableTypicallyHasTheName, ['gdb'+GetExecutableExt('')]);
s:=Format(lisTheDebuggerExecutableTypicallyHasTheNamePleaseGive, [
'gdb'+GetExecutableExt]);
{$IFDEF Windows}
s+=' '+lisAUsefulSettingOnWindowsSystemsIsLazarusDirMingwBin;
{$ENDIF}
DebuggerLabel.Caption:=s;
end;
procedure TInitialSetupDialog.CompilerComboBoxChange(Sender: TObject);

View File

@ -5451,11 +5451,13 @@ resourcestring
lisTheFreePascalCompilerExecutableTypicallyHasTheName = 'The Free Pascal '
+'compiler executable typically has the name "%s". You can also use the '
+'target specific compiler like "%s". Please give the full file path.';
lisTheMakeExecutableTypicallyHasTheName = 'The make executable typically '
+'has the name "%s". Please give the full file path.';
lisTheDebuggerExecutableTypicallyHasTheName = 'The debugger executable '
+'typically has the name "%s". Pleae give the full file path. '
+'A useful setting on Windows systems is: $(LazarusDir)\mingw\bin\$(TargetCPU)-$(TargetOS)\gdb.exe';
lisTheMakeExecutableTypicallyHasTheName = 'The "make" executable typically '
+'has the name "%s". It is needed for building the IDE. Please give the full file path.';
lisTheDebuggerExecutableTypicallyHasTheNamePleaseGive = 'The debugger '
+'executable typically has the name "%s". Please give the full file path.';
lisAUsefulSettingOnWindowsSystemsIsLazarusDirMingwBin = 'A useful setting on'
+' Windows systems is: $(LazarusDir)\mingw\bin\$(TargetCPU)-$(TargetOS)\'
+'gdb.exe';
lisFoundVersionExpected = 'Found version %s, expected %s';
lisInvalidVersionIn = 'invalid version in %s';
lisWrongVersionIn = 'wrong version in %s: %s';