mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-27 17:00:31 +02:00
IDE: Move funcs from MainIDE to MainIDEBase (DoMergeDefaultProjectOptions) and to SourceFileManager (CheckMainSrcLCLInterfaces, DoOpenMainUnit, DoRevertMainUnit)
git-svn-id: trunk@38794 -
This commit is contained in:
juha
parent
257a444796
commit
b393a5bd18
150
ide/main.pp
150
ide/main.pp
@ -475,7 +475,7 @@ type
|
||||
procedure OnSrcNoteBookCloseQuery(Sender: TObject; var CloseAction: TCloseAction);
|
||||
|
||||
// ObjectInspector + PropertyEditorHook events
|
||||
procedure CreateObjectInspector;
|
||||
procedure CreateObjectInspector; override;
|
||||
procedure OIOnSelectPersistents(Sender: TObject);
|
||||
procedure OIOnShowOptions(Sender: TObject);
|
||||
procedure OIOnViewRestricted(Sender: TObject);
|
||||
@ -779,8 +779,6 @@ type
|
||||
procedure EndFixupComponentReferences;
|
||||
procedure DoRestart;
|
||||
procedure DoExecuteRemoteControl;
|
||||
function DoOpenMainUnit(PageIndex, WindowIndex: integer; Flags: TOpenFlags): TModalResult;
|
||||
function DoRevertMainUnit: TModalResult;
|
||||
function DoViewUnitsAndForms(OnlyForms: boolean): TModalResult;
|
||||
function DoSelectFrame: TComponentClass;
|
||||
procedure DoViewUnitDependencies(Show: boolean);
|
||||
@ -802,7 +800,6 @@ type
|
||||
ACaretPoint: TPoint; WantedTopLine: integer = -1): TUnitEditorInfo;
|
||||
|
||||
// project(s)
|
||||
procedure DoMergeDefaultProjectOptions(AProject: TProject);
|
||||
function DoNewProject(ProjectDesc: TProjectDescriptor): TModalResult; override;
|
||||
function DoSaveProject(Flags: TSaveFlags): TModalResult; override;
|
||||
function DoCloseProject: TModalResult; override;
|
||||
@ -829,7 +826,6 @@ type
|
||||
function DoCreateProjectForProgram(ProgramBuf: TCodeBuffer): TModalResult;
|
||||
function DoSaveProjectIfChanged: TModalResult;
|
||||
function DoSaveProjectToTestDirectory(Flags: TSaveFlags): TModalResult;
|
||||
function CheckMainSrcLCLInterfaces(Silent: boolean): TModalResult;
|
||||
function QuitIDE: boolean;
|
||||
|
||||
// edit menu
|
||||
@ -877,7 +873,7 @@ type
|
||||
var ActiveSourceEditor: TSourceEditor; var ActiveUnitInfo: TUnitInfo); override;
|
||||
function GetAncestorUnit(AnUnitInfo: TUnitInfo): TUnitInfo;
|
||||
function GetAncestorLookupRoot(AnUnitInfo: TUnitInfo): TComponent;
|
||||
procedure UpdateSaveMenuItemsAndButtons(UpdateSaveAll: boolean);
|
||||
procedure UpdateSaveMenuItemsAndButtons(UpdateSaveAll: boolean); override;
|
||||
|
||||
// useful file methods
|
||||
function FindUnitFile(const AFilename: string; TheOwner: TObject = nil;
|
||||
@ -990,7 +986,7 @@ type
|
||||
// form editor and designer
|
||||
procedure DoBringToFrontFormOrUnit;
|
||||
procedure DoBringToFrontFormOrInspector(ForceInspector: boolean);
|
||||
procedure DoShowDesignerFormOfCurrentSrc;
|
||||
procedure DoShowDesignerFormOfCurrentSrc; override;
|
||||
procedure DoShowSourceOfActiveDesignerForm;
|
||||
procedure SetDesigning(AComponent: TComponent; Value: Boolean);
|
||||
procedure SetDesignInstance(AComponent: TComponent; Value: Boolean);
|
||||
@ -4087,7 +4083,7 @@ end;
|
||||
|
||||
procedure TMainIDE.mnuViewProjectSourceClicked(Sender: TObject);
|
||||
begin
|
||||
DoOpenMainUnit(-1,-1,[]);
|
||||
SourceFileMgr.DoOpenMainUnit(-1,-1,[]);
|
||||
end;
|
||||
|
||||
procedure TMainIDE.mnuProjectOptionsClicked(Sender: TObject);
|
||||
@ -5618,72 +5614,24 @@ begin
|
||||
UpdateSaveMenuItemsAndButtons(true);
|
||||
end;
|
||||
|
||||
function TMainIDE.DoOpenEditorFile(AFileName:string;
|
||||
PageIndex: integer; Flags: TOpenFlags):TModalResult;
|
||||
function TMainIDE.DoOpenEditorFile(AFileName:string; PageIndex: integer;
|
||||
Flags: TOpenFlags):TModalResult;
|
||||
begin
|
||||
Result := DoOpenEditorFile(AFileName, PageIndex,
|
||||
SourceEditorManager.ActiveSourceWindowIndex, Flags);
|
||||
Result := DoOpenEditorFile(AFileName, PageIndex, SourceEditorManager.ActiveSourceWindowIndex, Flags);
|
||||
end;
|
||||
|
||||
function TMainIDE.DoOpenEditorFile(AFileName: string; PageIndex,
|
||||
WindowIndex: integer; Flags: TOpenFlags): TModalResult;
|
||||
function TMainIDE.DoOpenEditorFile(AFileName: string; PageIndex, WindowIndex: integer;
|
||||
Flags: TOpenFlags): TModalResult;
|
||||
begin
|
||||
Result := DoOpenEditorFile(AFileName, PageIndex, WindowIndex, nil, Flags);
|
||||
end;
|
||||
|
||||
function TMainIDE.DoOpenEditorFile(AFileName: string; PageIndex,
|
||||
WindowIndex: integer; AEditorInfo: TUnitEditorInfo; Flags: TOpenFlags): TModalResult;
|
||||
function TMainIDE.DoOpenEditorFile(AFileName: string; PageIndex, WindowIndex: integer;
|
||||
AEditorInfo: TUnitEditorInfo; Flags: TOpenFlags): TModalResult;
|
||||
begin
|
||||
Result:=SourceFileMgr.OpenEditorFile(AFileName, PageIndex, WindowIndex, AEditorInfo, Flags);
|
||||
end;
|
||||
|
||||
function TMainIDE.DoOpenMainUnit(PageIndex, WindowIndex: integer;
|
||||
Flags: TOpenFlags): TModalResult;
|
||||
var MainUnitInfo: TUnitInfo;
|
||||
begin
|
||||
{$IFDEF IDE_VERBOSE}
|
||||
debugln(['[TMainIDE.DoOpenMainUnit] A ProjectLoading=',ofProjectLoading in Flags,' MainUnitID=',Project1.MainUnitID]);
|
||||
{$ENDIF}
|
||||
Result:=mrCancel;
|
||||
if (Project1=nil) or (Project1.MainUnitID<0) then exit;
|
||||
MainUnitInfo:=Project1.MainUnitInfo;
|
||||
|
||||
// check if main unit is already open in source editor
|
||||
if (MainUnitInfo.OpenEditorInfoCount > 0) and (not (ofProjectLoading in Flags)) then
|
||||
begin
|
||||
// already loaded -> switch to source editor
|
||||
SourceEditorManager.ActiveEditor := TSourceEditor(MainUnitInfo.OpenEditorInfo[0].EditorComponent);
|
||||
SourceEditorManager.ShowActiveWindowOnTop(True);
|
||||
Result:=mrOk;
|
||||
exit;
|
||||
end;
|
||||
|
||||
// open file in source notebook
|
||||
Result:=SourceFileMgr.OpenFileInSourceEditor(MainUnitInfo.GetClosedOrNewEditorInfo,
|
||||
PageIndex,WindowIndex,Flags);
|
||||
if Result<>mrOk then exit;
|
||||
|
||||
Result:=mrOk;
|
||||
{$IFDEF IDE_VERBOSE}
|
||||
writeln('[TMainIDE.DoOpenMainUnit] END');
|
||||
{$ENDIF}
|
||||
end;
|
||||
|
||||
function TMainIDE.DoRevertMainUnit: TModalResult;
|
||||
begin
|
||||
Result:=mrOk;
|
||||
if Project1.MainUnitID<0 then exit;
|
||||
if Project1.MainUnitInfo.OpenEditorInfoCount > 0 then
|
||||
// main unit is loaded, so we can just revert
|
||||
Result:=DoOpenEditorFile('',Project1.MainUnitInfo.EditorInfo[0].PageIndex,
|
||||
Project1.MainUnitInfo.EditorInfo[0].WindowIndex, [ofRevert])
|
||||
else begin
|
||||
// main unit is only loaded in background
|
||||
// -> just reload the source and update the source name
|
||||
Result:=Project1.MainUnitInfo.ReadUnitSource(true,true);
|
||||
end;
|
||||
end;
|
||||
|
||||
function TMainIDE.SelectProjectItems(ItemList: TStringList;
|
||||
ItemType: TIDEProjectItem; MultiSelect: boolean;
|
||||
var MultiSelectCheckedState: Boolean): TModalResult;
|
||||
@ -6035,7 +5983,7 @@ begin
|
||||
end else
|
||||
begin
|
||||
if Project1.MainUnitInfo = AnUnitInfo then
|
||||
Result:=DoOpenMainUnit(-1,-1,[])
|
||||
Result:=SourceFileMgr.DoOpenMainUnit(-1,-1,[])
|
||||
else
|
||||
Result:=DoOpenEditorFile(AnUnitInfo.Filename,-1,-1,[ofOnlyIfExists]);
|
||||
if Result=mrAbort then exit;
|
||||
@ -6616,29 +6564,6 @@ begin
|
||||
[ofRevert]); // Reverting one will revert all
|
||||
end;
|
||||
|
||||
procedure TMainIDE.DoMergeDefaultProjectOptions(AProject: TProject);
|
||||
var
|
||||
AFilename: String;
|
||||
begin
|
||||
// load default project options if exists
|
||||
AFilename:=AppendPathDelim(GetPrimaryConfigPath)+DefaultProjectOptionsFilename;
|
||||
if not FileExistsUTF8(AFilename) then
|
||||
CopySecondaryConfigFile(DefaultProjectOptionsFilename);
|
||||
if FileExistsUTF8(AFilename) then begin
|
||||
if AProject.ReadProject(AFilename,[prfLoadParts,prfLoadPartBuildModes])<>mrOk then
|
||||
DebugLn(['TMainIDE.DoLoadDefaultCompilerOptions failed']);
|
||||
end else begin
|
||||
// old way (<0.9.31)
|
||||
// load default compiler options if exists
|
||||
AFilename:=AppendPathDelim(GetPrimaryConfigPath)+DefaultProjectCompilerOptionsFilename;
|
||||
if not FileExistsUTF8(AFilename) then
|
||||
CopySecondaryConfigFile(DefaultProjectCompilerOptionsFilename);
|
||||
if not FileExistsUTF8(AFilename) then exit;
|
||||
if AProject.CompilerOptions.LoadFromFile(AFilename)<>mrOk then
|
||||
DebugLn(['TMainIDE.DoLoadDefaultCompilerOptions failed']);
|
||||
end;
|
||||
end;
|
||||
|
||||
function TMainIDE.DoNewProject(ProjectDesc: TProjectDescriptor): TModalResult;
|
||||
begin
|
||||
//DebugLn('TMainIDE.DoNewProject A');
|
||||
@ -7200,55 +7125,6 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
function TMainIDE.CheckMainSrcLCLInterfaces(Silent: boolean): TModalResult;
|
||||
var
|
||||
MainUnitInfo: TUnitInfo;
|
||||
MainUsesSection,ImplementationUsesSection: TStrings;
|
||||
MsgResult: TModalResult;
|
||||
begin
|
||||
Result:=mrOk;
|
||||
if (Project1=nil) then exit;
|
||||
if Project1.SkipCheckLCLInterfaces then exit;
|
||||
MainUnitInfo:=Project1.MainUnitInfo;
|
||||
if (MainUnitInfo=nil) or (MainUnitInfo.Source=nil) then exit;
|
||||
if PackageGraph.FindDependencyRecursively(Project1.FirstRequiredDependency,
|
||||
PackageGraph.LCLBasePackage)=nil
|
||||
then
|
||||
exit; // project does not use LCLBase
|
||||
// project uses LCLBase
|
||||
MainUsesSection:=nil;
|
||||
ImplementationUsesSection:=nil;
|
||||
try
|
||||
if not CodeToolBoss.FindUsedUnitNames(MainUnitInfo.Source,
|
||||
MainUsesSection,ImplementationUsesSection) then exit;
|
||||
if (UTF8SearchInStringList(MainUsesSection,'forms')<0)
|
||||
and (UTF8SearchInStringList(ImplementationUsesSection,'forms')<0) then
|
||||
exit;
|
||||
// project uses lcl unit Forms
|
||||
if (UTF8SearchInStringList(MainUsesSection,'interfaces')>=0)
|
||||
or (UTF8SearchInStringList(ImplementationUsesSection,'interfaces')>=0) then
|
||||
exit;
|
||||
// project uses lcl unit Forms, but not unit interfaces
|
||||
// this will result in strange linker error
|
||||
if not Silent then
|
||||
begin
|
||||
MsgResult:=IDEQuestionDialog(lisCCOWarningCaption,
|
||||
Format(lisTheProjectDoesNotUseTheLCLUnitInterfacesButItSeems, [LineEnding]),
|
||||
mtWarning, [mrYes, lisAddUnitInterfaces, mrNo, dlgIgnoreVerb,
|
||||
mrNoToAll, lisAlwaysIgnore, mrCancel]);
|
||||
case MsgResult of
|
||||
mrNo: exit;
|
||||
mrNoToAll: begin Project1.SkipCheckLCLInterfaces:=true; exit; end;
|
||||
mrCancel: exit(mrCancel);
|
||||
end;
|
||||
end;
|
||||
CodeToolBoss.AddUnitToMainUsesSection(MainUnitInfo.Source,'Interfaces','');
|
||||
finally
|
||||
MainUsesSection.Free;
|
||||
ImplementationUsesSection.Free;
|
||||
end;
|
||||
end;
|
||||
|
||||
function TMainIDE.QuitIDE: boolean;
|
||||
begin
|
||||
Result:=true;
|
||||
@ -8891,7 +8767,7 @@ begin
|
||||
CurUnit.OpenEditorInfo[0].WindowIndex, [ofRevert]);
|
||||
//DebugLn(['TMainIDE.DoCheckFilesOnDisk DoOpenEditorFile=',Result]);
|
||||
end else if CurUnit.IsMainUnit then begin
|
||||
Result:=DoRevertMainUnit;
|
||||
Result:=SourceFileMgr.DoRevertMainUnit;
|
||||
//DebugLn(['TMainIDE.DoCheckFilesOnDisk DoRevertMainUnit=',Result]);
|
||||
end else
|
||||
Result:=mrIgnore;
|
||||
|
||||
@ -151,7 +151,11 @@ type
|
||||
Flags: TCodeToolsFlags): boolean;
|
||||
procedure ActivateCodeToolAbortableMode;
|
||||
function OnCodeToolBossCheckAbort: boolean;
|
||||
procedure CreateObjectInspector; virtual; abstract;
|
||||
procedure DoShowDesignerFormOfCurrentSrc; virtual; abstract;
|
||||
procedure UpdateSaveMenuItemsAndButtons(UpdateSaveAll: boolean); virtual; abstract;
|
||||
|
||||
procedure DoMergeDefaultProjectOptions(AProject: TProject);
|
||||
procedure DoSwitchToFormSrc(var ActiveSourceEditor:TSourceEditor;
|
||||
var ActiveUnitInfo:TUnitInfo);
|
||||
procedure DoSwitchToFormSrc(ADesigner: TDesigner;
|
||||
@ -338,12 +342,12 @@ begin
|
||||
|
||||
// check global stati
|
||||
if (ToolStatus in [itCodeTools,itCodeToolAborting]) then begin
|
||||
debugln('TMainIDE.BeginCodeTool impossible ',dbgs(ord(ToolStatus)));
|
||||
debugln('TMainIDEBase.BeginCodeTool impossible ',dbgs(ord(ToolStatus)));
|
||||
exit;
|
||||
end;
|
||||
if (not (ctfSourceEditorNotNeeded in Flags)) and (SourceEditorManager.SourceEditorCount=0)
|
||||
then begin
|
||||
DebugLn('TMainIDE.BeginCodeTool no source editor');
|
||||
DebugLn('TMainIDEBase.BeginCodeTool no source editor');
|
||||
exit;
|
||||
end;
|
||||
|
||||
@ -395,6 +399,29 @@ begin
|
||||
Result:=ToolStatus<>itCodeTools;
|
||||
end;
|
||||
|
||||
procedure TMainIDEBase.DoMergeDefaultProjectOptions(AProject: TProject);
|
||||
var
|
||||
AFilename: String;
|
||||
begin
|
||||
// load default project options if exists
|
||||
AFilename:=AppendPathDelim(GetPrimaryConfigPath)+DefaultProjectOptionsFilename;
|
||||
if not FileExistsUTF8(AFilename) then
|
||||
CopySecondaryConfigFile(DefaultProjectOptionsFilename);
|
||||
if FileExistsUTF8(AFilename) then begin
|
||||
if AProject.ReadProject(AFilename,[prfLoadParts,prfLoadPartBuildModes])<>mrOk then
|
||||
DebugLn(['TMainIDEBase.DoLoadDefaultCompilerOptions failed']);
|
||||
end else begin
|
||||
// old way (<0.9.31)
|
||||
// load default compiler options if exists
|
||||
AFilename:=AppendPathDelim(GetPrimaryConfigPath)+DefaultProjectCompilerOptionsFilename;
|
||||
if not FileExistsUTF8(AFilename) then
|
||||
CopySecondaryConfigFile(DefaultProjectCompilerOptionsFilename);
|
||||
if not FileExistsUTF8(AFilename) then exit;
|
||||
if AProject.CompilerOptions.LoadFromFile(AFilename)<>mrOk then
|
||||
DebugLn(['TMainIDEBase.DoLoadDefaultCompilerOptions failed']);
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TMainIDEBase.DoSwitchToFormSrc(var ActiveSourceEditor: TSourceEditor;
|
||||
var ActiveUnitInfo: TUnitInfo);
|
||||
begin
|
||||
|
||||
@ -34,10 +34,11 @@ uses
|
||||
AVL_Tree, typinfo, math, Classes, SysUtils, Controls, Forms, Dialogs, LCLIntf,
|
||||
LCLType, LCLProc, FileProcs, FileUtil, IDEProcs, DialogProcs, IDEDialogs,
|
||||
LConvEncoding, LResources, PropEdits, DefineTemplates, IDEMsgIntf,
|
||||
IDEProtocol, LazarusIDEStrConsts, LazIDEIntf, MainBase, MainBar, MainIntf,
|
||||
MenuIntf, NewItemIntf, NewDialog, ProjectIntf, Project, ProjectDefs,
|
||||
ProjectInspector, CompilerOptions, BasePkgManager, PackageIntf, PackageDefs,
|
||||
PackageSystem, SrcEditorIntf, IDEWindowIntf, SourceEditor, EditorOptions,
|
||||
IDEProtocol, LazarusIDEStrConsts, NewDialog,
|
||||
LazIDEIntf, MainBase, MainBar, MainIntf, MenuIntf, NewItemIntf,
|
||||
ProjectIntf, Project, ProjectDefs, ProjectInspector, CompilerOptions,
|
||||
BasePkgManager, PackageIntf, PackageDefs, PackageSystem,
|
||||
SrcEditorIntf, IDEWindowIntf, SourceEditor, EditorOptions,
|
||||
CustomFormEditor, FormEditor, EmptyMethodsDlg, BaseDebugManager,
|
||||
ControlSelection, TransferMacros, EnvironmentOpts, BuildManager, Designer,
|
||||
EditorMacroListViewer, KeywordFuncLists, FindRenameIdentifier, MsgView,
|
||||
@ -50,6 +51,8 @@ type
|
||||
{ TLazSourceFileManager }
|
||||
|
||||
TLazSourceFileManager = class
|
||||
private
|
||||
function CheckMainSrcLCLInterfaces(Silent: boolean): TModalResult;
|
||||
public
|
||||
constructor Create;
|
||||
destructor Destroy; override;
|
||||
@ -127,6 +130,8 @@ type
|
||||
var AComponentClass: TComponentClass;
|
||||
var ComponentUnitInfo: TUnitInfo): TModalResult;
|
||||
public
|
||||
function DoOpenMainUnit(PageIndex, WindowIndex: integer; Flags: TOpenFlags): TModalResult;
|
||||
function DoRevertMainUnit: TModalResult;
|
||||
function OpenFileInSourceEditor(AnEditorInfo: TUnitEditorInfo;
|
||||
PageIndex, WindowIndex: integer; Flags: TOpenFlags): TModalResult;
|
||||
function LoadLFM(AnUnitInfo: TUnitInfo; OpenFlags: TOpenFlags;
|
||||
@ -226,6 +231,55 @@ begin
|
||||
end;
|
||||
|
||||
|
||||
function TLazSourceFileManager.CheckMainSrcLCLInterfaces(Silent: boolean): TModalResult;
|
||||
var
|
||||
MainUnitInfo: TUnitInfo;
|
||||
MainUsesSection,ImplementationUsesSection: TStrings;
|
||||
MsgResult: TModalResult;
|
||||
begin
|
||||
Result:=mrOk;
|
||||
if (Project1=nil) then exit;
|
||||
if Project1.SkipCheckLCLInterfaces then exit;
|
||||
MainUnitInfo:=Project1.MainUnitInfo;
|
||||
if (MainUnitInfo=nil) or (MainUnitInfo.Source=nil) then exit;
|
||||
if PackageGraph.FindDependencyRecursively(Project1.FirstRequiredDependency,
|
||||
PackageGraph.LCLBasePackage)=nil
|
||||
then
|
||||
exit; // project does not use LCLBase
|
||||
// project uses LCLBase
|
||||
MainUsesSection:=nil;
|
||||
ImplementationUsesSection:=nil;
|
||||
try
|
||||
if not CodeToolBoss.FindUsedUnitNames(MainUnitInfo.Source,
|
||||
MainUsesSection,ImplementationUsesSection) then exit;
|
||||
if (UTF8SearchInStringList(MainUsesSection,'forms')<0)
|
||||
and (UTF8SearchInStringList(ImplementationUsesSection,'forms')<0) then
|
||||
exit;
|
||||
// project uses lcl unit Forms
|
||||
if (UTF8SearchInStringList(MainUsesSection,'interfaces')>=0)
|
||||
or (UTF8SearchInStringList(ImplementationUsesSection,'interfaces')>=0) then
|
||||
exit;
|
||||
// project uses lcl unit Forms, but not unit interfaces
|
||||
// this will result in strange linker error
|
||||
if not Silent then
|
||||
begin
|
||||
MsgResult:=IDEQuestionDialog(lisCCOWarningCaption,
|
||||
Format(lisTheProjectDoesNotUseTheLCLUnitInterfacesButItSeems, [LineEnding]),
|
||||
mtWarning, [mrYes, lisAddUnitInterfaces, mrNo, dlgIgnoreVerb,
|
||||
mrNoToAll, lisAlwaysIgnore, mrCancel]);
|
||||
case MsgResult of
|
||||
mrNo: exit;
|
||||
mrNoToAll: begin Project1.SkipCheckLCLInterfaces:=true; exit; end;
|
||||
mrCancel: exit(mrCancel);
|
||||
end;
|
||||
end;
|
||||
CodeToolBoss.AddUnitToMainUsesSection(MainUnitInfo.Source,'Interfaces','');
|
||||
finally
|
||||
MainUsesSection.Free;
|
||||
ImplementationUsesSection.Free;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TLazSourceFileManager.AddRecentProjectFileToEnvironment(const AFilename: string);
|
||||
begin
|
||||
EnvironmentOptions.AddToRecentProjectFiles(AFilename);
|
||||
@ -513,8 +567,8 @@ begin
|
||||
// show form and select form
|
||||
if NewUnitInfo.Component<>nil then begin
|
||||
// show form
|
||||
TMainIDE(MainIDE).CreateObjectInspector;
|
||||
TMainIDE(MainIDE).DoShowDesignerFormOfCurrentSrc;
|
||||
MainIDE.CreateObjectInspector;
|
||||
MainIDE.DoShowDesignerFormOfCurrentSrc;
|
||||
end else begin
|
||||
MainIDE.DisplayState:= dsSource;
|
||||
end;
|
||||
@ -839,7 +893,7 @@ begin
|
||||
if not (sfSaveToTestDir in Flags) then begin
|
||||
AnUnitInfo.ClearModifieds;
|
||||
AEditor.Modified:=false;
|
||||
TMainIDE(MainIDE).UpdateSaveMenuItemsAndButtons(not (sfProjectSaving in Flags));
|
||||
MainIDE.UpdateSaveMenuItemsAndButtons(not (sfProjectSaving in Flags));
|
||||
end;
|
||||
TSourceEditor(AEditor).SourceNotebook.UpdateStatusBar;
|
||||
|
||||
@ -1181,7 +1235,7 @@ begin
|
||||
and (CompareFilenames(Project1.MainFilename,AFilename,
|
||||
not (ofVirtualFile in Flags))=0)
|
||||
then begin
|
||||
Result:=TMainIDE(MainIDE).DoOpenMainUnit(PageIndex,WindowIndex,Flags);
|
||||
Result:=DoOpenMainUnit(PageIndex,WindowIndex,Flags);
|
||||
exit;
|
||||
end;
|
||||
|
||||
@ -1566,7 +1620,7 @@ begin
|
||||
try
|
||||
Project1.CompilerOptions.CompilerPath:='$(CompPath)';
|
||||
if pfUseDefaultCompilerOptions in Project1.Flags then begin
|
||||
TMainIDE(MainIDE).DoMergeDefaultProjectOptions(Project1);
|
||||
MainIDE.DoMergeDefaultProjectOptions(Project1);
|
||||
Project1.Flags:=Project1.Flags-[pfUseDefaultCompilerOptions];
|
||||
end;
|
||||
Project1.AutoAddOutputDirToIncPath;
|
||||
@ -1596,7 +1650,7 @@ begin
|
||||
then begin
|
||||
// the project has not created any secondary files
|
||||
// or the project main source is not auto updated by the IDE
|
||||
TMainIDE(MainIDE).DoOpenMainUnit(-1,-1,[]);
|
||||
DoOpenMainUnit(-1,-1,[]);
|
||||
end;
|
||||
|
||||
// init resource files
|
||||
@ -1799,7 +1853,7 @@ begin
|
||||
Result:=MainIDE.DoCheckFilesOnDisk(true);
|
||||
if Result in [mrCancel,mrAbort] then exit;
|
||||
|
||||
if TMainIDE(MainIDE).CheckMainSrcLCLInterfaces(sfQuietUnitCheck in Flags)<>mrOk then
|
||||
if CheckMainSrcLCLInterfaces(sfQuietUnitCheck in Flags)<>mrOk then
|
||||
exit(mrCancel);
|
||||
|
||||
// if this is a virtual project then save first the project info file
|
||||
@ -3371,6 +3425,54 @@ begin
|
||||
Result:=mrOk;
|
||||
end;
|
||||
|
||||
function TLazSourceFileManager.DoOpenMainUnit(PageIndex, WindowIndex: integer;
|
||||
Flags: TOpenFlags): TModalResult;
|
||||
var
|
||||
MainUnitInfo: TUnitInfo;
|
||||
begin
|
||||
{$IFDEF IDE_VERBOSE}
|
||||
debugln(['[TLazSourceFileManager.DoOpenMainUnit] A ProjectLoading=',ofProjectLoading in Flags,' MainUnitID=',Project1.MainUnitID]);
|
||||
{$ENDIF}
|
||||
Result:=mrCancel;
|
||||
if (Project1=nil) or (Project1.MainUnitID<0) then exit;
|
||||
MainUnitInfo:=Project1.MainUnitInfo;
|
||||
|
||||
// check if main unit is already open in source editor
|
||||
if (MainUnitInfo.OpenEditorInfoCount > 0) and (not (ofProjectLoading in Flags)) then
|
||||
begin
|
||||
// already loaded -> switch to source editor
|
||||
SourceEditorManager.ActiveEditor := TSourceEditor(MainUnitInfo.OpenEditorInfo[0].EditorComponent);
|
||||
SourceEditorManager.ShowActiveWindowOnTop(True);
|
||||
Result:=mrOk;
|
||||
exit;
|
||||
end;
|
||||
|
||||
// open file in source notebook
|
||||
Result:=SourceFileMgr.OpenFileInSourceEditor(MainUnitInfo.GetClosedOrNewEditorInfo,
|
||||
PageIndex,WindowIndex,Flags);
|
||||
if Result<>mrOk then exit;
|
||||
|
||||
Result:=mrOk;
|
||||
{$IFDEF IDE_VERBOSE}
|
||||
writeln('[TLazSourceFileManager.DoOpenMainUnit] END');
|
||||
{$ENDIF}
|
||||
end;
|
||||
|
||||
function TLazSourceFileManager.DoRevertMainUnit: TModalResult;
|
||||
begin
|
||||
Result:=mrOk;
|
||||
if Project1.MainUnitID<0 then exit;
|
||||
if Project1.MainUnitInfo.OpenEditorInfoCount > 0 then
|
||||
// main unit is loaded, so we can just revert
|
||||
Result:=OpenEditorFile('',Project1.MainUnitInfo.EditorInfo[0].PageIndex,
|
||||
Project1.MainUnitInfo.EditorInfo[0].WindowIndex, nil, [ofRevert])
|
||||
else begin
|
||||
// main unit is only loaded in background
|
||||
// -> just reload the source and update the source name
|
||||
Result:=Project1.MainUnitInfo.ReadUnitSource(true,true);
|
||||
end;
|
||||
end;
|
||||
|
||||
function TLazSourceFileManager.OpenFileInSourceEditor(AnEditorInfo: TUnitEditorInfo;
|
||||
PageIndex, WindowIndex: integer; Flags: TOpenFlags): TModalResult;
|
||||
var
|
||||
@ -3831,7 +3933,7 @@ begin
|
||||
MainIDE.DisplayState := dsForm;
|
||||
GlobalDesignHook.LookupRoot := NewComponent;
|
||||
TheControlSelection.AssignPersistent(NewComponent);
|
||||
TMainIDE(MainIDE).CreateObjectInspector;
|
||||
MainIDE.CreateObjectInspector;
|
||||
end;
|
||||
|
||||
// show new form
|
||||
|
||||
Loading…
Reference in New Issue
Block a user