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

projectgroups: do not bring editor to front on start

Browse Source
This commit is contained in:
mattias 2022-06-10 15:45:12 +02:00
parent 96271ad5c6
commit bb5c50df1e
4 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/ideintf/projectgroupintf.pp
View File

@ -199,8 +199,9 @@ Type
pgloRemoveInvalid, // Remove non-existing targets from group automatically while loading
pgloSkipInvalid, // Mark non-existing as Missing.
pgloErrorInvalid, // Stop with error on non-existing.
pgloLoadRecursively, // load all sub nodes
pgloSkipDialog, // do not show Project Group editor.
pgloLoadRecursively // load all sub nodes
pgloBringToFront // when showing editor, bring it to front
);
TProjectGroupLoadOptions = set of TProjectGroupLoadOption;
@ -225,7 +226,7 @@ Type
public
constructor Create;
destructor Destroy; override;
function NewProjectGroup(AddActiveProject: boolean): boolean; virtual; abstract;
function NewProjectGroup(AddActiveProject: boolean; BringToFront: boolean = true): boolean; virtual; abstract;
function LoadProjectGroup(AFileName: string; AOptions: TProjectGroupLoadOptions): boolean; virtual; abstract;
function SaveProjectGroup: boolean; virtual; abstract;
function GetSrcPaths: string; virtual; abstract;

24
components/projectgroups/projectgroup.pp
View File

@ -231,7 +231,7 @@ type
FProjectGroup: TIDEProjectGroup;
protected
function GetCurrentProjectGroup: TProjectGroup; override;
function ShowProjectGroupEditor: Boolean;
function ShowProjectGroupEditor(BringToFront: boolean): Boolean;
procedure TargetDeleting(Group: TIDEProjectGroup; Index: integer);
function GroupExists(Group: TIDEProjectGroup): boolean;
public
@ -250,7 +250,7 @@ type
function CanRedo: boolean; override;
procedure Undo; override;
procedure Redo; override;
function NewProjectGroup(AddActiveProject: boolean): boolean; override;
function NewProjectGroup(AddActiveProject: boolean; BringToFront: boolean = true): boolean; override;
function LoadProjectGroup(AFileName: string; AOptions: TProjectGroupLoadOptions): boolean; override;
function SaveProjectGroup: boolean; override;
function GetSrcPaths: string; override;
@ -260,9 +260,9 @@ type
property OnEditorOptionsChanged: TNotifyEvent read FOnEditorOptionsChanged write FOnEditorOptionsChanged;
end;
TEditProjectGroupHandler = procedure(Sender: TObject; AProjectGroup: TProjectGroup);
TEditProjectGroupHandler = procedure(Sender: TObject; AProjectGroup: TProjectGroup; BringToFront: boolean);
// Method variant.
TEditProjectGroupEvent = procedure(Sender: TObject; AProjectGroup: TProjectGroup) of object;
TEditProjectGroupEvent = procedure(Sender: TObject; AProjectGroup: TProjectGroup; BringToFront: boolean) of object;
var
OnShowProjectGroupEditor: TEditProjectGroupHandler; // Takes precedence
@ -549,15 +549,16 @@ begin
Result:=FProjectGroup;
end;
function TIDEProjectGroupManager.ShowProjectGroupEditor: Boolean;
function TIDEProjectGroupManager.ShowProjectGroupEditor(BringToFront: boolean
): Boolean;
begin
Result:=Assigned(FProjectGroup);
if Result then
begin
if Assigned(OnShowProjectGroupEditor) then
OnShowProjectGroupEditor(FProjectGroup,FProjectGroup)
OnShowProjectGroupEditor(FProjectGroup,FProjectGroup,BringToFront)
else if Assigned(OnShowProjectGroupEditorEvent) then
OnShowProjectGroupEditorEvent(FProjectGroup,FProjectGroup)
OnShowProjectGroupEditorEvent(FProjectGroup,FProjectGroup,BringToFront)
else
Result:=False;
end;
@ -727,6 +728,7 @@ begin
if Screen.GetCurrentModalForm<>nil then
exit;
FIDEStarted:=true;
debugln(['TIDEProjectGroupManager.OnIdle OpenLastGroupOnStart=',Options.OpenLastGroupOnStart,' LastGroupFile="',Options.LastGroupFile,'"']);
if (CurrentProjectGroup=nil)
and Options.OpenLastGroupOnStart
and (Options.LastGroupFile<>'')
@ -967,8 +969,8 @@ begin
end;
function TIDEProjectGroupManager.NewProjectGroup(AddActiveProject: boolean
): boolean;
function TIDEProjectGroupManager.NewProjectGroup(AddActiveProject: boolean;
BringToFront: boolean): boolean;
var
AProject: TLazProject;
aTarget: TIDECompileTarget;
@ -992,7 +994,7 @@ begin
end;
end;
ShowProjectGroupEditor;
ShowProjectGroupEditor(BringToFront);
end;
function TIDEProjectGroupManager.LoadProjectGroup(AFileName: string;
@ -1010,7 +1012,7 @@ begin
if not Result then
exit;
if not (pgloSkipDialog in AOptions) then
ShowProjectGroupEditor;
ShowProjectGroupEditor(pgloBringToFront in AOptions);
MnuCmdSaveProjectGroupAs.Enabled:=true;
Result:=true;

6
components/projectgroups/projectgroupeditor.pas
View File

@ -270,7 +270,7 @@ var
const
ProjectGroupEditorName = 'ProjectGroupEditor';
procedure ShowProjectGroupEditor(Sender: TObject; AProjectGroup: TProjectGroup);
procedure ShowProjectGroupEditor(Sender: TObject; AProjectGroup: TProjectGroup; BringToFront: boolean);
procedure CreateProjectGroupEditor(Sender: TObject; aFormName: string;
var AForm: TCustomForm; DoDisableAutoSizing: boolean);
procedure SetProjectGroupEditorCallBack;
@ -286,9 +286,9 @@ const
piTargetCount = 0;
piActiveTarget = 1;
procedure ShowProjectGroupEditor(Sender: TObject; AProjectGroup: TProjectGroup);
procedure ShowProjectGroupEditor(Sender: TObject; AProjectGroup: TProjectGroup; BringToFront: boolean);
begin
IDEWindowCreators.ShowForm(ProjectGroupEditorCreator.FormName,true);
IDEWindowCreators.ShowForm(ProjectGroupEditorCreator.FormName,BringToFront);
if AProjectGroup<>nil then
ProjectGroupEditorForm.ProjectGroup:=AProjectGroup;
end;

2
components/projectgroups/regprojectgroup.pp
View File

@ -83,7 +83,7 @@ end;
procedure ViewProjectGroupsClicked(Sender: TObject);
begin
ShowProjectGroupEditor(Sender,IDEProjectGroupManager.CurrentProjectGroup);
ShowProjectGroupEditor(Sender,IDEProjectGroupManager.CurrentProjectGroup,true);
end;
procedure Register;