paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-06 10:00:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE, Build Lazarus dialog. Cleanup

Browse Source 
git-svn-id: trunk@39293 -
This commit is contained in:
juha 2012-11-17 10:02:48 +00:00
parent 7b14876476
commit 773c2fe670
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ide/buildlazdialog.pas
View File

@ -144,8 +144,6 @@ type
procedure CopyProfileToUI(AProfile: TBuildLazarusProfile); procedure CopyProfileToUI(AProfile: TBuildLazarusProfile);
procedure CopyUIToProfile(AProfile: TBuildLazarusProfile); procedure CopyUIToProfile(AProfile: TBuildLazarusProfile);
procedure UpdateProfileNamesUI; procedure UpdateProfileNamesUI;
public
property Profiles: TBuildLazarusProfiles read fProfiles;
end; end;
function ShowConfigureBuildLazarusDlg(AProfiles: TBuildLazarusProfiles): TModalResult; function ShowConfigureBuildLazarusDlg(AProfiles: TBuildLazarusProfiles): TModalResult;
@ -185,10 +183,10 @@ begin
Result := mrCancel; Result := mrCancel;
ConfigBuildLazDlg := TConfigureBuildLazarusDlg.Create(nil); ConfigBuildLazDlg := TConfigureBuildLazarusDlg.Create(nil);
try try
ConfigBuildLazDlg.Profiles.Assign(AProfiles); // Copy profiles to dialog. ConfigBuildLazDlg.fProfiles.Assign(AProfiles); // Copy profiles to dialog.
Result := ConfigBuildLazDlg.ShowModal; Result := ConfigBuildLazDlg.ShowModal;
if Result in [mrOk,mrYes,mrAll] then if Result in [mrOk,mrYes,mrAll] then
AProfiles.Assign(ConfigBuildLazDlg.Profiles); // Copy profiles back from dialog. AProfiles.Assign(ConfigBuildLazDlg.fProfiles); // Copy profiles back from dialog.
finally finally
ConfigBuildLazDlg.Free; ConfigBuildLazDlg.Free;
end; end;
@ -966,7 +964,7 @@ end;
procedure TConfigureBuildLazarusDlg.ShowOptsMenuItemClick(Sender: TObject); procedure TConfigureBuildLazarusDlg.ShowOptsMenuItemClick(Sender: TObject);
begin begin
CopyUIToProfile(Profiles.Current); CopyUIToProfile(fProfiles.Current);
ShowMessage(fProfiles.Current.ExtraOptions); ShowMessage(fProfiles.Current.ExtraOptions);
end; end;
@ -979,7 +977,7 @@ begin
try try
DirDialog.Options:=DirDialog.Options+[ofPathMustExist]; DirDialog.Options:=DirDialog.Options+[ofPathMustExist];
DirDialog.Title:=lisLazBuildABOChooseOutputDir+'(lazarus'+ DirDialog.Title:=lisLazBuildABOChooseOutputDir+'(lazarus'+
GetExecutableExt(Profiles.Current.FPCTargetOS)+')'; GetExecutableExt(fProfiles.Current.FPCTargetOS)+')';
if DirDialog.Execute then begin if DirDialog.Execute then begin
AFilename:=CleanAndExpandDirectory(DirDialog.Filename); AFilename:=CleanAndExpandDirectory(DirDialog.Filename);
TargetDirectoryComboBox.AddHistoryItem(AFilename,10,true,true); TargetDirectoryComboBox.AddHistoryItem(AFilename,10,true,true);
@ -1131,11 +1129,11 @@ end;
procedure TConfigureBuildLazarusDlg.PrepareClose; procedure TConfigureBuildLazarusDlg.PrepareClose;
begin begin
CopyUIToProfile(Profiles.Current); CopyUIToProfile(fProfiles.Current);
fProfiles.RestartAfterBuild :=RestartAfterBuildCheckBox.Checked; fProfiles.RestartAfterBuild :=RestartAfterBuildCheckBox.Checked;
fProfiles.ConfirmBuild :=ConfirmBuildCheckBox.Checked; fProfiles.ConfirmBuild :=ConfirmBuildCheckBox.Checked;
MainIDEBar.itmToolBuildLazarus.Caption:= MainIDEBar.itmToolBuildLazarus.Caption:=
Format(lisMenuBuildLazarusProf, [Profiles.Current.Name]); Format(lisMenuBuildLazarusProf, [fProfiles.Current.Name]);
end; end;
procedure TConfigureBuildLazarusDlg.CompileAdvancedButtonClick(Sender: TObject); procedure TConfigureBuildLazarusDlg.CompileAdvancedButtonClick(Sender: TObject);
@ -1196,7 +1194,7 @@ begin
EditForm.Caption:=lisLazBuildEditDefinesDialogCaption; EditForm.Caption:=lisLazBuildEditDefinesDialogCaption;
EditForm.Memo1.Lines.Assign(fProfiles.AllDefines); EditForm.Memo1.Lines.Assign(fProfiles.AllDefines);
if EditForm.ShowModal=mrOK then begin if EditForm.ShowModal=mrOK then begin
CopyUIToProfile(Profiles.Current); // Make sure changed fields don't get lost. CopyUIToProfile(fProfiles.Current); // Make sure changed fields don't get lost.
fProfiles.AllDefines.Assign(EditForm.Memo1.Lines); fProfiles.AllDefines.Assign(EditForm.Memo1.Lines);
DefinesListBox.Items.Clear; DefinesListBox.Items.Clear;
for i:=0 to fProfiles.AllDefines.Count-1 do for i:=0 to fProfiles.AllDefines.Count-1 do
@ -1221,7 +1219,7 @@ var
begin begin
Frm:=TBuildProfileManagerForm.Create(nil); Frm:=TBuildProfileManagerForm.Create(nil);
try try
CopyUIToProfile(Profiles.Current); // Make sure changed fields get included. CopyUIToProfile(fProfiles.Current); // Make sure changed fields get included.
Frm.Prepare(fProfiles); // Copy profiles to dialog. Frm.Prepare(fProfiles); // Copy profiles to dialog.
if Frm.ShowModal = mrOk then begin if Frm.ShowModal = mrOk then begin
fProfiles.Assign(Frm.ProfsToManage); // Copy profiles back from dialog. fProfiles.Assign(Frm.ProfsToManage); // Copy profiles back from dialog.