paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-23 01:39:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

moved menu sections from IDE to menuintf.pas

Browse Source 
git-svn-id: trunk@7833 -
This commit is contained in:
mattias 2005-09-26 10:33:00 +00:00
parent 8cb0cd4a93
commit 5f3e47834b
5 changed files with 162 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ide/main.pp
View File

@ -1752,14 +1752,14 @@ end;
procedure TMainIDE.SetRecentFilesMenu;
begin
SetRecentSubMenu(MainIDEBar.itmFileRecentOpen,
SetRecentSubMenu(itmFileRecentOpen,
EnvironmentOptions.RecentOpenFiles,
@mnuOpenRecentClicked);
end;
procedure TMainIDE.SetRecentProjectFilesMenu;
begin
SetRecentSubMenu(MainIDEBar.itmProjectRecentOpen,
SetRecentSubMenu(itmProjectRecentOpen,
EnvironmentOptions.RecentProjectFiles,
@mnuOpenProjectClicked);
end;
@ -3133,7 +3133,7 @@ var
Index: integer;
begin
if not (Sender is TIDEMenuItem) then exit;
Index:=MainIDEBar.itmCustomTools.IndexOf(TIDEMenuItem(Sender))-1;
Index:=itmCustomTools.IndexOf(TIDEMenuItem(Sender))-1;
if (Index<0) or (Index>=EnvironmentOptions.ExternalTools.Count) then exit;
DoRunExternalTool(Index);
end;
@ -7780,7 +7780,7 @@ var
var
Section: TIDEMenuSection;
begin
Section:=MainIDEBar.itmCustomTools;
Section:=itmCustomTools;
// add enough menuitems
while Section.Count-1<ToolCount do
RegisterIDEMenuCommand(Section.GetPath,
@ -7798,8 +7798,8 @@ var
begin
i:=1;
Index:=0;
while (i<MainIDEBar.itmCustomTools.Count) do begin
CurMenuItem:=MainIDEBar.itmCustomTools[i];
while (i<itmCustomTools.Count) do begin
CurMenuItem:=itmCustomTools[i];
ExtTool:=EnvironmentOptions.ExternalTools[Index];
CurMenuItem.Caption:=ExtTool.Title;
if CurMenuItem is TIDEMenuCommand then

120
ide/mainbar.pas
View File

@ -67,39 +67,39 @@ type
// MainMenu
mnuMainMenu: TMainMenu;
mnuMain: TIDEMenuSection;
//mnuMain: TIDEMenuSection;
// file menu
mnuFile: TIDEMenuSection;
itmFileNew: TIDEMenuSection;
//mnuFile: TIDEMenuSection;
//itmFileNew: TIDEMenuSection;
itmFileNewUnit: TIDEMenuCommand;
itmFileNewForm: TIDEMenuCommand;
itmFileNewOther: TIDEMenuCommand;
itmFileOpenSave: TIDEMenuSection;
//itmFileOpenSave: TIDEMenuSection;
itmFileOpen: TIDEMenuCommand;
itmFileRevert: TIDEMenuCommand;
itmFileRecentOpen: TIDEMenuSection;
//itmFileRecentOpen: TIDEMenuSection;
itmFileSave: TIDEMenuCommand;
itmFileSaveAs: TIDEMenuCommand;
itmFileSaveAll: TIDEMenuCommand;
itmFileClose: TIDEMenuCommand;
itmFileCloseAll: TIDEMenuCommand;
itmFileDirectories: TIDEMenuSection;
//itmFileDirectories: TIDEMenuSection;
itmFileCleanDirectory: TIDEMenuCommand;
itmFileIDEStart: TIDEMenuSection;
//itmFileIDEStart: TIDEMenuSection;
itmFileRestart: TIDEMenuCommand;
itmFileQuit: TIDEMenuCommand;
// edit menu
mnuEdit: TIDEMenuSection;
itmEditReUndo: TIDEMenuSection;
//mnuEdit: TIDEMenuSection;
//itmEditReUndo: TIDEMenuSection;
itmEditUndo: TIDEMenuCommand;
itmEditRedo: TIDEMenuCommand;
itmEditClipboard: TIDEMenuSection;
//itmEditClipboard: TIDEMenuSection;
itmEditCut: TIDEMenuCommand;
itmEditCopy: TIDEMenuCommand;
itmEditPaste: TIDEMenuCommand;
itmEditBlockIndentation: TIDEMenuSection;
//itmEditBlockIndentation: TIDEMenuSection;
itmEditIndentBlock: TIDEMenuCommand;
itmEditUnindentBlock: TIDEMenuCommand;
itmEditEncloseBlock: TIDEMenuCommand;
@ -107,21 +107,21 @@ type
itmEditUncommentBlock: TIDEMenuCommand;
itmEditConditionalBlock: TIDEMenuCommand;
itmEditSortBlock: TIDEMenuCommand;
itmEditBlockCharConversion: TIDEMenuSection;
//itmEditBlockCharConversion: TIDEMenuSection;
itmEditUpperCaseBlock: TIDEMenuCommand;
itmEditLowerCaseBlock: TIDEMenuCommand;
itmEditTabsToSpacesBlock: TIDEMenuCommand;
itmEditSelectionBreakLines: TIDEMenuCommand;
itmEditSelect: TIDEMenuSection;
//itmEditSelect: TIDEMenuSection;
itmEditSelectAll: TIDEMenuCommand;
itmEditSelectToBrace: TIDEMenuCommand;
itmEditSelectCodeBlock: TIDEMenuCommand;
itmEditSelectLine: TIDEMenuCommand;
itmEditSelectParagraph: TIDEMenuCommand;
itmEditInsertions: TIDEMenuSection;
//itmEditInsertions: TIDEMenuSection;
itmEditInsertCharacter: TIDEMenuCommand;
itmEditInsertText: TIDEMenuSection;
itmEditInsertCVSKeyWord: TIDEMenuSection;
//itmEditInsertText: TIDEMenuSection;
//itmEditInsertCVSKeyWord: TIDEMenuSection;
itmEditInsertCVSAuthor: TIDEMenuCommand;
itmEditInsertCVSDate: TIDEMenuCommand;
itmEditInsertCVSHeader: TIDEMenuCommand;
@ -130,19 +130,19 @@ type
itmEditInsertCVSName: TIDEMenuCommand;
itmEditInsertCVSRevision: TIDEMenuCommand;
itmEditInsertCVSSource: TIDEMenuCommand;
itmEditInsertGeneral: TIDEMenuSection;
//itmEditInsertGeneral: TIDEMenuSection;
itmEditInsertGPLNotice: TIDEMenuCommand;
itmEditInsertLGPLNotice: TIDEMenuCommand;
itmEditInsertUsername: TIDEMenuCommand;
itmEditInsertDateTime: TIDEMenuCommand;
itmEditInsertChangeLogEntry: TIDEMenuCommand;
itmEditMenuCodeTools: TIDEMenuSection;
//itmEditMenuCodeTools: TIDEMenuSection;
itmEditCompleteCode: TIDEMenuCommand;
itmEditExtractProc: TIDEMenuCommand;
// search menu
mnuSearch: TIDEMenuSection;
itmSearchFindReplace: TIDEMenuSection;
//mnuSearch: TIDEMenuSection;
//itmSearchFindReplace: TIDEMenuSection;
itmSearchFind: TIDEMenuCommand;
itmSearchFindNext: TIDEMenuCommand;
itmSearchFindPrevious: TIDEMenuCommand;
@ -150,18 +150,18 @@ type
itmSearchReplace: TIDEMenuCommand;
itmIncrementalFind: TIDEMenuCommand;
itmGotoLine: TIDEMenuCommand;
itmJumpings: TIDEMenuSection;
//itmJumpings: TIDEMenuSection;
itmJumpBack: TIDEMenuCommand;
itmJumpForward: TIDEMenuCommand;
itmAddJumpPoint: TIDEMenuCommand;
itmJumpHistory: TIDEMenuCommand;
itmJumpToNextError: TIDEMenuCommand;
itmJumpToPrevError: TIDEMenuCommand;
itmBookmarks: TIDEMenuSection;
//itmBookmarks: TIDEMenuSection;
itmSetFreeBookmark: TIDEMenuCommand;
itmJumpToNextBookmark: TIDEMenuCommand;
itmJumpToPrevBookmark: TIDEMenuCommand;
itmCodeToolSearches: TIDEMenuSection;
//itmCodeToolSearches: TIDEMenuSection;
itmFindDeclaration: TIDEMenuCommand;
itmFindBlockOtherEnd: TIDEMenuCommand;
itmFindBlockStart: TIDEMenuCommand;
@ -171,23 +171,23 @@ type
itmSearchRenameIdentifier: TIDEMenuCommand;
// view menu
mnuView: TIDEMenuSection;
itmViewMainWindows: TIDEMenuSection;
//mnuView: TIDEMenuSection;
//itmViewMainWindows: TIDEMenuSection;
itmViewInspector: TIDEMenuCommand;
itmViewSourceEditor: TIDEMenuCommand;
itmViewCodeExplorer: TIDEMenuCommand;
itmViewLazDoc: TIDEMenuCommand;
itmViewUnitWindows: TIDEMenuSection;
//itmViewUnitWindows: TIDEMenuSection;
itmViewUnits: TIDEMenuCommand;
itmViewForms: TIDEMenuCommand;
itmViewUnitDependencies: TIDEMenuCommand;
itmViewUnitInfo: TIDEMenuCommand;
itmViewToggleFormUnit: TIDEMenuCommand;
itmViewSecondaryWindows: TIDEMenuSection;
//itmViewSecondaryWindows: TIDEMenuSection;
itmViewAnchorEditor: TIDEMenuCommand;
itmViewMessage: TIDEMenuCommand;
itmViewSearchResults: TIDEMenuCommand;
itmViewDebugWindows: TIDEMenuSection;
//itmViewDebugWindows: TIDEMenuSection;
itmViewWatches: TIDEMenuCommand;
itmViewBreakpoints: TIDEMenuCommand;
itmViewLocals: TIDEMenuCommand;
@ -195,39 +195,39 @@ type
itmViewDebugOutput: TIDEMenuCommand;
// project menu
mnuProject: TIDEMenuSection;
itmProjectNewSection: TIDEMenuSection;
//mnuProject: TIDEMenuSection;
//itmProjectNewSection: TIDEMenuSection;
itmProjectNew: TIDEMenuCommand;
itmProjectNewFromFile: TIDEMenuCommand;
itmProjectOpenSection: TIDEMenuSection;
//itmProjectOpenSection: TIDEMenuSection;
itmProjectOpen: TIDEMenuCommand;
itmProjectRecentOpen: TIDEMenuSection;
itmProjectSaveSection: TIDEMenuSection;
//itmProjectRecentOpen: TIDEMenuSection;
//itmProjectSaveSection: TIDEMenuSection;
itmProjectSave: TIDEMenuCommand;
itmProjectSaveAs: TIDEMenuCommand;
itmProjectPublish: TIDEMenuCommand;
itmProjectWindowSection: TIDEMenuSection;
//itmProjectWindowSection: TIDEMenuSection;
itmProjectInspector: TIDEMenuCommand;
itmProjectOptions: TIDEMenuCommand;
itmProjectCompilerOptions: TIDEMenuCommand;
itmProjectViewToDos: TIDEMenuCommand;
itmProjectAddRemoveSection: TIDEMenuSection;
//itmProjectAddRemoveSection: TIDEMenuSection;
itmProjectAddTo: TIDEMenuCommand;
itmProjectRemoveFrom: TIDEMenuCommand;
itmProjectViewSource: TIDEMenuCommand;
{$IFDEF TRANSLATESTRING}
itmProjectPoFileSection: TIDEMenuCommand;
//itmProjectPoFileSection: TIDEMenuSection;
itmProjectCreatePoFiles: TIDEMenuCommand;
itmProjectCollectPoFiles: TIDEMenuCommand;
{$ENDIF}
// run menu
mnuRun: TIDEMenuSection;
itmRunBuilding: TIDEMenuSection;
//mnuRun: TIDEMenuSection;
//itmRunBuilding: TIDEMenuSection;
itmRunMenuBuild: TIDEMenuCommand;
itmRunMenuBuildAll: TIDEMenuCommand;
itmRunMenuAbortBuild: TIDEMenuCommand;
itmRunnning: TIDEMenuSection;
//itmRunnning: TIDEMenuSection;
itmRunMenuRun: TIDEMenuCommand;
itmRunMenuPause: TIDEMenuCommand;
itmRunMenuStepInto: TIDEMenuCommand;
@ -236,27 +236,27 @@ type
itmRunMenuStop: TIDEMenuCommand;
itmRunMenuRunParameters: TIDEMenuCommand;
itmRunMenuResetDebugger: TIDEMenuCommand;
itmRunBuildingFile: TIDEMenuSection;
//itmRunBuildingFile: TIDEMenuSection;
itmRunMenuBuildFile: TIDEMenuCommand;
itmRunMenuRunFile: TIDEMenuCommand;
itmRunMenuConfigBuildFile: TIDEMenuCommand;
itmRunDebugging: TIDEMenuSection;
//itmRunDebugging: TIDEMenuSection;
itmRunMenuInspect: TIDEMenuCommand;
itmRunMenuEvaluate: TIDEMenuCommand;
itmRunMenuAddWatch: TIDEMenuCommand;
itmRunMenuAddBreakpoint: TIDEMenuSection;
//itmRunMenuAddBreakpoint: TIDEMenuSection;
itmRunMenuAddBpSource: TIDEMenuCommand;
// components menu
mnuComponents: TIDEMenuSection;
itmPkgOpening: TIDEMenuSection;
//mnuComponents: TIDEMenuSection;
//itmPkgOpening: TIDEMenuSection;
itmPkgOpenPackage: TIDEMenuCommand;
itmPkgOpenPackageFile: TIDEMenuCommand;
itmPkgOpenPackageOfCurUnit: TIDEMenuCommand;
itmPkgOpenRecent: TIDEMenuSection;
itmPkgUnits: TIDEMenuSection;
//itmPkgOpenRecent: TIDEMenuSection;
//itmPkgUnits: TIDEMenuSection;
itmPkgAddCurUnitToPkg: TIDEMenuCommand;
itmPkgGraphSection: TIDEMenuSection;
//itmPkgGraphSection: TIDEMenuSection;
itmPkgPkgGraph: TIDEMenuCommand;
itmPkgEditInstallPkgs: TIDEMenuCommand;
{$IFDEF CustomIDEComps}
@ -264,46 +264,46 @@ type
{$ENDIF}
// tools menu
mnuTools: TIDEMenuSection;
itmCustomTools: TIDEMenuSection;
//mnuTools: TIDEMenuSection;
//itmCustomTools: TIDEMenuSection;
itmToolConfigure: TIDEMenuCommand;
itmCodeToolChecks: TIDEMenuSection;
//itmCodeToolChecks: TIDEMenuSection;
itmToolSyntaxCheck: TIDEMenuCommand;
itmToolGuessUnclosedBlock: TIDEMenuCommand;
itmToolGuessMisplacedIFDEF: TIDEMenuCommand;
itmSecondaryTools: TIDEMenuSection;
//itmSecondaryTools: TIDEMenuSection;
itmToolMakeResourceString: TIDEMenuCommand;
itmToolDiff: TIDEMenuCommand;
itmDelphiConversion: TIDEMenuSection;
//itmDelphiConversion: TIDEMenuSection;
itmToolCheckLFM: TIDEMenuCommand;
itmToolConvertDelphiUnit: TIDEMenuCommand;
itmToolConvertDelphiProject: TIDEMenuCommand;
itmToolConvertDFMtoLFM: TIDEMenuCommand;
itmBuildingLazarus: TIDEMenuSection;
//itmBuildingLazarus: TIDEMenuSection;
itmToolBuildLazarus: TIDEMenuCommand;
itmToolConfigureBuildLazarus: TIDEMenuCommand;
// environment menu
mnuEnvironment: TIDEMenuSection;
itmOptionsDialogs: TIDEMenuSection;
//mnuEnvironment: TIDEMenuSection;
//itmOptionsDialogs: TIDEMenuSection;
itmEnvGeneralOptions: TIDEMenuCommand;
itmEnvEditorOptions: TIDEMenuCommand;
itmEnvCodeTemplates: TIDEMenuCommand;
itmEnvDebuggerOptions: TIDEMenuCommand;
itmEnvCodeToolsOptions: TIDEMenuCommand;
itmEnvCodeToolsDefinesEditor: TIDEMenuCommand;
itmIDECacheSection: TIDEMenuSection;
//itmIDECacheSection: TIDEMenuSection;
itmEnvRescanFPCSrcDir: TIDEMenuCommand;
// windows menu
mnuWindows: TIDEMenuSection;
//mnuWindows: TIDEMenuSection;
// help menu
mnuHelp: TIDEMenuSection;
itmOnlineHelps: TIDEMenuSection;
//mnuHelp: TIDEMenuSection;
//itmOnlineHelps: TIDEMenuSection;
itmHelpOnlineHelp: TIDEMenuCommand;
itmHelpConfigureHelp: TIDEMenuCommand;
itmInfoHelps: TIDEMenuSection;
//itmInfoHelps: TIDEMenuSection;
itmHelpAboutLazarus: TIDEMenuCommand;
// component palette

12
ide/mainbase.pas
View File

@ -307,7 +307,7 @@ end;
procedure TMainIDEBase.CreateMainMenuItem(var Section: TIDEMenuSection;
const MenuItemName, MenuItemCaption: String);
begin
Section:=RegisterIDESubMenu(MainIDEBar.mnuMain.GetPath,MenuItemName,
Section:=RegisterIDESubMenu(mnuMain.GetPath,MenuItemName,
MenuItemCaption);
end;
@ -1303,18 +1303,18 @@ begin
end;
// create menuitems
for i:=0 to WindowsList.Count-1 do begin
if MainIDEBar.mnuWindows.Count>i then
CurMenuItem:=MainIDEBar.mnuWindows.Items[i]
if mnuWindows.Count>i then
CurMenuItem:=mnuWindows.Items[i]
else begin
CurMenuItem:=RegisterIDEMenuCommand(MainIDEBar.mnuWindows.GetPath,
CurMenuItem:=RegisterIDEMenuCommand(mnuWindows.GetPath,
'Window'+IntToStr(i),'');
CurMenuItem.OnClick:=@mnuWindowsItemClick;
end;
CurMenuItem.Caption:=TCustomForm(WindowsList[i]).Caption;
end;
// remove unused menuitems
while MainIDEBar.mnuWindows.Count>WindowsList.Count do
MainIDEBar.mnuWindows.Items[MainIDEBar.mnuWindows.Count-1].Free;
while mnuWindows.Count>WindowsList.Count do
mnuWindows.Items[mnuWindows.Count-1].Free;
// clean up
WindowsList.Free;
end;

89
ideintf/menuintf.pas
View File

@ -262,6 +262,93 @@ type
var
IDEMenuRoots: TIDEMenuRoots = nil;// created by the IDE
// IDE MainMenu
mnuMain: TIDEMenuSection;
// file menu
mnuFile: TIDEMenuSection;
itmFileNew: TIDEMenuSection;
itmFileOpenSave: TIDEMenuSection;
itmFileRecentOpen: TIDEMenuSection;
itmFileDirectories: TIDEMenuSection;
itmFileIDEStart: TIDEMenuSection;
// edit menu
mnuEdit: TIDEMenuSection;
itmEditReUndo: TIDEMenuSection;
itmEditClipboard: TIDEMenuSection;
itmEditBlockIndentation: TIDEMenuSection;
itmEditBlockCharConversion: TIDEMenuSection;
itmEditSelect: TIDEMenuSection;
itmEditInsertions: TIDEMenuSection;
itmEditInsertText: TIDEMenuSection;
itmEditInsertCVSKeyWord: TIDEMenuSection;
itmEditInsertGeneral: TIDEMenuSection;
itmEditMenuCodeTools: TIDEMenuSection;
// search menu
mnuSearch: TIDEMenuSection;
itmSearchFindReplace: TIDEMenuSection;
itmJumpings: TIDEMenuSection;
itmBookmarks: TIDEMenuSection;
itmCodeToolSearches: TIDEMenuSection;
// view menu
mnuView: TIDEMenuSection;
itmViewMainWindows: TIDEMenuSection;
itmViewUnitWindows: TIDEMenuSection;
itmViewSecondaryWindows: TIDEMenuSection;
itmViewDebugWindows: TIDEMenuSection;
// project menu
mnuProject: TIDEMenuSection;
itmProjectNewSection: TIDEMenuSection;
itmProjectOpenSection: TIDEMenuSection;
itmProjectRecentOpen: TIDEMenuSection;
itmProjectSaveSection: TIDEMenuSection;
itmProjectWindowSection: TIDEMenuSection;
itmProjectAddRemoveSection: TIDEMenuSection;
{$IFDEF TRANSLATESTRING}
itmProjectPoFileSection: TIDEMenuSection;
{$ENDIF}
// run menu
mnuRun: TIDEMenuSection;
itmRunBuilding: TIDEMenuSection;
itmRunnning: TIDEMenuSection;
itmRunBuildingFile: TIDEMenuSection;
itmRunDebugging: TIDEMenuSection;
itmRunMenuAddBreakpoint: TIDEMenuSection;
// components menu
mnuComponents: TIDEMenuSection;
itmPkgOpening: TIDEMenuSection;
itmPkgOpenRecent: TIDEMenuSection;
itmPkgUnits: TIDEMenuSection;
itmPkgGraphSection: TIDEMenuSection;
// tools menu
mnuTools: TIDEMenuSection;
itmCustomTools: TIDEMenuSection;
itmCodeToolChecks: TIDEMenuSection;
itmSecondaryTools: TIDEMenuSection;
itmDelphiConversion: TIDEMenuSection;
itmBuildingLazarus: TIDEMenuSection;
// environment menu
mnuEnvironment: TIDEMenuSection;
itmOptionsDialogs: TIDEMenuSection;
itmIDECacheSection: TIDEMenuSection;
// windows menu
mnuWindows: TIDEMenuSection;
// help menu
mnuHelp: TIDEMenuSection;
itmOnlineHelps: TIDEMenuSection;
itmInfoHelps: TIDEMenuSection;
// Source Editor: Popupmenu
SourceEditorMenuRoot: TIDEMenuSection;
// Source Editor: First dynamic section for often used context sensitive stuff
@ -287,8 +374,10 @@ var
// Source Editor: Refactor submenu
SrcEditSubMenuRefactor: TIDEMenuSection;
// Messages window popupmenu
MessagesMenuRoot: TIDEMenuSection;
// CodeExplorer window popupmenu
CodeExplorerMenuRoot: TIDEMenuSection;

2
packager/pkgmanager.pas
View File

@ -2156,7 +2156,7 @@ end;
procedure TPkgManager.SetRecentPackagesMenu;
begin
MainIDE.SetRecentSubMenu(MainIDEBar.itmPkgOpenRecent,
MainIDE.SetRecentSubMenu(itmPkgOpenRecent,
EnvironmentOptions.RecentPackageFiles,@MainIDEitmOpenRecentPackageClicked);
end;