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

IDE: moved SetRecentProjectFilesMenu to mainbase

Browse Source 
git-svn-id: trunk@38734 -
This commit is contained in:
mattias 2012-09-18 11:59:05 +00:00
parent 1789905e3c
commit 643c170bbe
3 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ide/main.pp
View File

@ -306,7 +306,7 @@ type
// project menu
procedure mnuNewProjectClicked(Sender: TObject);
procedure mnuNewProjectFromFileClicked(Sender: TObject);
procedure mnuOpenProjectClicked(Sender: TObject);
procedure mnuOpenProjectClicked(Sender: TObject); override;
procedure mnuCloseProjectClicked(Sender: TObject);
procedure mnuSaveProjectClicked(Sender: TObject);
procedure mnuSaveProjectAsClicked(Sender: TObject);
@ -727,7 +727,6 @@ type
function DoCallProjectChangedHandler(
HandlerType: TLazarusIDEHandlerType): TModalResult;
procedure SetRecentFilesMenu;
procedure SetRecentProjectFilesMenu;
// files/units
function DoNewFile(NewFileDescriptor: TProjectFileDescriptor;
@ -2433,13 +2432,6 @@ begin
@mnuOpenRecentClicked);
end;
procedure TMainIDE.SetRecentProjectFilesMenu;
begin
SetRecentSubMenu(itmProjectRecentOpen,
EnvironmentOptions.RecentProjectFiles,
@mnuOpenProjectClicked);
end;
procedure TMainIDE.SetupFileMenu;
begin
inherited SetupFileMenu;

9
ide/mainbase.pas
View File

@ -81,6 +81,7 @@ type
{ TMainIDEBase }
TMainIDEBase = class(TMainIDEInterface)
procedure mnuOpenProjectClicked(Sender: TObject); virtual; abstract;
private
FToolStatus: TIDEToolStatus;
FWindowMenuActiveForm: TCustomForm;
@ -138,6 +139,7 @@ type
destructor Destroy; override;
procedure CreateOftenUsedForms; virtual; abstract;
function GetMainBar: TComponent; override;
procedure SetRecentProjectFilesMenu;
procedure GetUnitInfoForDesigner(ADesigner: TIDesigner;
out ActiveSourceEditor: TSourceEditorInterface;
@ -286,6 +288,13 @@ begin
Result:=MainIDEBar;
end;
procedure TMainIDEBase.SetRecentProjectFilesMenu;
begin
SetRecentSubMenu(itmProjectRecentOpen,
EnvironmentOptions.RecentProjectFiles,
@mnuOpenProjectClicked);
end;
procedure TMainIDEBase.DoMnuWindowClicked(Sender: TObject);
begin
UpdateWindowMenu(True);

34
ide/sourcefilemanager.pas
View File

@ -31,19 +31,18 @@ unit SourceFileManager;
interface
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, SourceEditor, EditorOptions, CustomFormEditor, FormEditor,
EmptyMethodsDlg, BaseDebugManager, ControlSelection, TransferMacros,
EnvironmentOpts, BuildManager, Designer, EditorMacroListViewer, KeywordFuncLists,
FindRenameIdentifier, MsgView, InputHistory, CheckLFMDlg, LCLMemManager,
CodeToolManager, CodeToolsStructs, ConvCodeTool, CodeCache;
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,
CustomFormEditor, FormEditor, EmptyMethodsDlg, BaseDebugManager,
ControlSelection, TransferMacros, EnvironmentOpts, BuildManager, Designer,
EditorMacroListViewer, KeywordFuncLists, FindRenameIdentifier, MsgView,
InputHistory, CheckLFMDlg, LCLMemManager, CodeToolManager, CodeToolsStructs,
ConvCodeTool, CodeCache;
type
@ -176,6 +175,7 @@ type
implementation
// ToDo: break this cycle
uses Main;
var
@ -228,7 +228,7 @@ end;
procedure TLazSourceFileManager.AddRecentProjectFileToEnvironment(const AFilename: string);
begin
EnvironmentOptions.AddToRecentProjectFiles(AFilename);
TMainIDE(MainIDE).SetRecentProjectFilesMenu;
MainIDE.SetRecentProjectFilesMenu;
MainIDE.SaveEnvironment;
end;
@ -1786,6 +1786,7 @@ var
i: integer;
AnUnitInfo: TUnitInfo;
SaveFileFlags: TSaveFlags;
SrcEdit: TSourceEditor;
begin
Result:=mrCancel;
if not (MainIDE.ToolStatus in [itNone,itDebugger]) then begin
@ -1835,7 +1836,8 @@ begin
// save all editor files
for i:=0 to SourceEditorManager.SourceEditorCount-1 do begin
AnUnitInfo:=Project1.UnitWithEditorComponent(SourceEditorManager.SourceEditors[i]);
SrcEdit:=SourceEditorManager.SourceEditors[i];
AnUnitInfo:=Project1.UnitWithEditorComponent(SrcEdit);
if (Project1.MainUnitID>=0) and (Project1.MainUnitInfo = AnUnitInfo) then
continue;
SaveFileFlags:=[sfProjectSaving]
@ -1843,7 +1845,7 @@ begin
if AnUnitInfo = nil
then begin
// consistency check
DebugLn('TLazSourceFileManager.SaveProject - unit not found for page %d', [i]);
DebugLn(['TLazSourceFileManager.SaveProject - unit not found for page ',i,' File="',SrcEdit.FileName,'"']);
DumpStack;
end else begin
if AnUnitInfo.IsVirtual