paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-16 16:12:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: Fix showing of session in the new build mode window.

Browse Source 
git-svn-id: trunk@41315 -
This commit is contained in:
juha 2013-05-20 10:22:19 +00:00
parent aabc580b13
commit 00bd2e9ee9
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ide/buildmodesmanager.pas
View File

@ -70,7 +70,7 @@ var
OnLoadIDEOptionsHook: TOnLoadIDEOptions; OnLoadIDEOptionsHook: TOnLoadIDEOptions;
OnSaveIDEOptionsHook: TOnSaveIDEOptions; OnSaveIDEOptionsHook: TOnSaveIDEOptions;
function ShowBuildModesDlg: TModalResult; function ShowBuildModesDlg(aShowSession: Boolean): TModalResult;
procedure SwitchBuildMode(aBuildModeID: string); procedure SwitchBuildMode(aBuildModeID: string);
procedure UpdateBuildModeCombo(aCombo: TComboBox); procedure UpdateBuildModeCombo(aCombo: TComboBox);
@ -79,7 +79,7 @@ implementation
{$R *.lfm} {$R *.lfm}
function ShowBuildModesDlg: TModalResult; function ShowBuildModesDlg(aShowSession: Boolean): TModalResult;
var var
frm: TBuildModesForm; frm: TBuildModesForm;
begin begin
@ -91,7 +91,7 @@ begin
// Copy to dialog // Copy to dialog
frm.fBuildModes.Assign(Project1.BuildModes, True); frm.fBuildModes.Assign(Project1.BuildModes, True);
frm.SetActiveBuildModeByID(Project1.ActiveBuildMode); frm.SetActiveBuildModeByID(Project1.ActiveBuildMode);
frm.fShowSession:=Project1.SessionStorage in [pssInProjectDir,pssInIDEConfig]; frm.fShowSession:=aShowSession;
// Show the form. Let user add / edit / delete. // Show the form. Let user add / edit / delete.
Result := frm.ShowModal; Result := frm.ShowModal;
if Result = mrOk then if Result = mrOk then

17
ide/ideoptionsdlg.pas
View File

@ -31,11 +31,11 @@ interface
uses uses
Classes, SysUtils, Controls, Forms, ComCtrls, LCLProc, LCLType, Classes, SysUtils, Controls, Forms, ComCtrls, LCLProc, LCLType,
Buttons, ButtonPanel, ExtCtrls, EditBtn, StdCtrls, Dialogs, Buttons, ButtonPanel, ExtCtrls, EditBtn, StdCtrls, Dialogs, TreeFilterEdit,
TreeFilterEdit, IDEWindowIntf, IDEOptionsIntf, IDECommands, IDEHelpIntf, IDEWindowIntf, IDEOptionsIntf, IDECommands, IDEHelpIntf, ProjectIntf,
EnvironmentOpts, LazarusIDEStrConsts, CompOptsIntf, EditorOptions, EnvironmentOpts, LazarusIDEStrConsts, CompOptsIntf, EditorOptions,
{$IFDEF NewBuildModeWindow} {$IFDEF NewBuildModeWindow}
BuildModesManager; //project_save_options; BuildModesManager, project_save_options;
{$ELSE} {$ELSE}
BuildModesEditor; BuildModesEditor;
{$ENDIF} {$ENDIF}
@ -242,9 +242,18 @@ begin
end; end;
procedure TIDEOptionsDialog.BuildModeManageButtonClick(Sender: TObject); procedure TIDEOptionsDialog.BuildModeManageButtonClick(Sender: TObject);
{$IFDEF NewBuildModeWindow}
var
ProjectSaveOptions: TProjectSaveOptionsFrame;
ShowSes: Boolean;
{$ENDIF}
begin begin
{$IFDEF NewBuildModeWindow} {$IFDEF NewBuildModeWindow}
if ShowBuildModesDlg = mrOK then ProjectSaveOptions:=TProjectSaveOptionsFrame(FindEditor(TProjectSaveOptionsFrame));
Assert(Assigned(ProjectSaveOptions),
'TIDEOptionsDialog.BuildModeManageButtonClick: ProjectSaveOptions is not assigned');
ShowSes:=ProjectSaveOptions.GetSessionLocation in [pssInIDEConfig,pssInProjectDir];
if ShowBuildModesDlg(ShowSes) = mrOK then
UpdateBuildModeCombo(BuildModeComboBox); UpdateBuildModeCombo(BuildModeComboBox);
{$ENDIF} {$ENDIF}
end; end;