From 4c2bf7e89d1c65a8cf6340f22cbe30172d0e5a17 Mon Sep 17 00:00:00 2001 From: juha Date: Thu, 17 Mar 2011 11:54:25 +0000 Subject: [PATCH] IDE: Get rid of Environment menu and move items to Tools menu. git-svn-id: trunk@29884 - --- components/education/edumenu.pas | 2 +- .../design/registeranchordocking.pas | 2 +- ide/keymapping.pp | 7 ++- ide/lazarusidestrconsts.pas | 3 +- ide/main.pp | 18 ++------ ide/mainbar.pas | 17 +++---- ide/mainbase.pas | 45 +++++++------------ ideintf/menuintf.pas | 6 +-- 8 files changed, 32 insertions(+), 68 deletions(-) diff --git a/components/education/edumenu.pas b/components/education/edumenu.pas index 64fa5ecdeb..6e03e60d4a 100644 --- a/components/education/edumenu.pas +++ b/components/education/edumenu.pas @@ -407,7 +407,7 @@ end; function TEduMenuOptions.KeepItemVisible(Item: TIDEMenuItem): boolean; begin - if (Item=mnuEnvironment) or (Item.HasAsParent(mnuEnvironment)) then exit(true); + if (Item=itmSecondaryTools) or (Item.HasAsParent(itmSecondaryTools)) then exit(true); Result:=false; end; diff --git a/examples/anchordocking/design/registeranchordocking.pas b/examples/anchordocking/design/registeranchordocking.pas index 3caae947d9..cf1ac914d5 100644 --- a/examples/anchordocking/design/registeranchordocking.pas +++ b/examples/anchordocking/design/registeranchordocking.pas @@ -132,7 +132,7 @@ begin LazarusIDE.AddHandlerOnProjectClose(@IDEAnchorDockMaster.OnProjectClose); // add menu section - mnuAnchorDockSection:=RegisterIDEMenuSection(mnuEnvironment,'AnchorDocking'); + mnuAnchorDockSection:=RegisterIDEMenuSection(itmSecondaryTools,'AnchorDocking'); mnuADSaveLayoutAsDefault:=RegisterIDEMenuCommand(mnuAnchorDockSection, 'ADSaveLayoutAsDefault', adrsSaveWindowLayoutAsDefault, @IDEAnchorDockMaster.SaveLayoutAsDefaultClicked); diff --git a/ide/keymapping.pp b/ide/keymapping.pp index dbf2b42e24..3deecb5919 100644 --- a/ide/keymapping.pp +++ b/ide/keymapping.pp @@ -374,7 +374,6 @@ begin ecOpenFileAtCursor: SetResult2(VK_RETURN,[ssCtrl],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]); ecProcedureList: SetResult(VK_G, [ssAlt],VK_UNKNOWN,[]); - // marker ecSetFreeBookmark: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]); ecPrevBookmark: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]); @@ -585,8 +584,8 @@ begin ecMakeResourceString: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]); ecDiff: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]); - // environment menu - ecEnvironmentOptions: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]); + // environment (in Tools menu) + ecEnvironmentOptions: SetResult(VK_O,[ssShift,ssCtrl],VK_UNKNOWN,[]); ecEditCodeTemplates: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]); ecCodeToolsDefinesEd: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]); ecRescanFPCSrcDir: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]); @@ -2829,7 +2828,7 @@ begin lisKMConvertDelphiPackageToLazarusPackage, ecConvertDelphiPackage); AddDefault(C, 'Convert encoding', lisConvertEncodingOfProjectsPackages, ecConvertEncoding); - // environment menu + // environment (in Tools menu) C:=Categories[AddCategory('EnvironmentMenu',srkmCatEnvMenu,nil)]; AddDefault(C, 'General environment options', srkmecEnvironmentOptions, ecEnvironmentOptions); AddDefault(C, 'Edit Code Templates', lisKMEditCodeTemplates, ecEditCodeTemplates); diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas index 4ecd1df049..c167c45df6 100644 --- a/ide/lazarusidestrconsts.pas +++ b/ide/lazarusidestrconsts.pas @@ -154,7 +154,6 @@ resourcestring lisMenuRun = '&Run'; lisMenuPackage = 'Pa&ckage'; lisMenuTools = '&Tools'; - lisMenuEnvironent = 'E&nvironment'; lisMenuWindow = '&Window'; lisMenuHelp = '&Help'; @@ -407,7 +406,7 @@ resourcestring lisMenuMakeResourceString = 'Make Resource String ...'; lisCaptionDiff = 'Diff'; lisMenuDiff = 'Diff ...'; - lisMenuConvertDFMtoLFM = 'Convert binary DFM file to text LFM and check syntax ...'; + lisMenuConvertDFMtoLFM = 'Convert binary DFM to text LFM + check syntax ...'; lisMenuCheckLFM = 'Check LFM file in editor'; lisMenuConvertDelphiUnit = 'Convert Delphi unit to Lazarus unit ...'; lisMenuConvertDelphiProject = 'Convert Delphi project to Lazarus project ...'; diff --git a/ide/main.pp b/ide/main.pp index edef3d735c..1d9ae60aa7 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -654,7 +654,6 @@ type procedure SetupRunMenu; override; procedure SetupComponentsMenu; override; procedure SetupToolsMenu; override; - procedure SetupEnvironmentMenu; override; procedure SetupWindowsMenu; override; procedure SetupHelpMenu; override; procedure LoadMenuShortCuts; override; @@ -2302,7 +2301,6 @@ begin SetupRunMenu; SetupComponentsMenu; SetupToolsMenu; - SetupEnvironmentMenu; SetupWindowsMenu; SetupHelpMenu; end; @@ -2560,6 +2558,10 @@ begin with MainIDEBar do begin itmToolConfigure.OnClick := @mnuToolConfigureClicked; itmToolDiff.OnClick := @mnuToolDiffClicked; + itmEnvGeneralOptions.OnClick := @mnuEnvGeneralOptionsClicked; + itmToolRescanFPCSrcDir.OnClick := @mnuEnvRescanFPCSrcDirClicked; + itmEnvCodeTemplates.OnClick := @mnuEnvCodeTemplatesClicked; + itmEnvCodeToolsDefinesEditor.OnClick := @mnuEnvCodeToolsDefinesEditorClicked; itmToolCheckLFM.OnClick := @mnuToolCheckLFMClicked; itmToolConvertDFMtoLFM.OnClick := @mnuToolConvertDFMtoLFMClicked; itmToolConvertDelphiUnit.OnClick := @mnuToolConvertDelphiUnitClicked; @@ -2576,18 +2578,6 @@ begin UpdateCustomToolsInMenu; end; -procedure TMainIDE.SetupEnvironmentMenu; -begin - inherited SetupEnvironmentMenu; - with MainIDEBar do - begin - itmEnvGeneralOptions.OnClick := @mnuEnvGeneralOptionsClicked; - itmEnvCodeTemplates.OnClick := @mnuEnvCodeTemplatesClicked; - itmEnvCodeToolsDefinesEditor.OnClick := @mnuEnvCodeToolsDefinesEditorClicked; - itmEnvRescanFPCSrcDir.OnClick := @mnuEnvRescanFPCSrcDirClicked; - end; -end; - procedure TMainIDE.SetupWindowsMenu; begin inherited SetupWindowsMenu; diff --git a/ide/mainbar.pas b/ide/mainbar.pas index f45f251dcc..19ad496d3b 100644 --- a/ide/mainbar.pas +++ b/ide/mainbar.pas @@ -319,6 +319,11 @@ type itmToolConfigure: TIDEMenuCommand; //itmSecondaryTools: TIDEMenuSection; itmToolDiff: TIDEMenuCommand; + //itmOptionsDialogs: TIDEMenuSection; + itmEnvGeneralOptions: TIDEMenuCommand; + itmToolRescanFPCSrcDir: TIDEMenuCommand; + itmEnvCodeTemplates: TIDEMenuCommand; + itmEnvCodeToolsDefinesEditor: TIDEMenuCommand; //itmDelphiConversion: TIDEMenuSection; itmToolCheckLFM: TIDEMenuCommand; itmToolConvertDelphiUnit: TIDEMenuCommand; @@ -330,18 +335,6 @@ type itmToolBuildLazarus: TIDEMenuCommand; itmToolConfigureBuildLazarus: TIDEMenuCommand; - // environment menu - //mnuEnvironment: TIDEMenuSection; - //itmOptionsDialogs: TIDEMenuSection; - itmEnvGeneralOptions: TIDEMenuCommand; - //itmEnvEditorOptions: TIDEMenuCommand; - itmEnvCodeTemplates: TIDEMenuCommand; - //itmEnvDebuggerOptions: TIDEMenuCommand; - //itmEnvCodeToolsOptions: TIDEMenuCommand; - itmEnvCodeToolsDefinesEditor: TIDEMenuCommand; - //itmIDECacheSection: TIDEMenuSection; - itmEnvRescanFPCSrcDir: TIDEMenuCommand; - // windows menu //mnuWindow: TIDEMenuSection; diff --git a/ide/mainbase.pas b/ide/mainbase.pas index 786533fd51..3833732aa2 100644 --- a/ide/mainbase.pas +++ b/ide/mainbase.pas @@ -114,7 +114,6 @@ type procedure SetupRunMenu; virtual; procedure SetupComponentsMenu; virtual; procedure SetupToolsMenu; virtual; - procedure SetupEnvironmentMenu; virtual; procedure SetupWindowsMenu; virtual; procedure SetupHelpMenu; virtual; @@ -364,7 +363,6 @@ begin CreateMainMenuItem(mnuPackage,'Package',lisMenuPackage); mnuComponent:=mnuPackage; CreateMainMenuItem(mnuTools,'Tools',lisMenuTools); - CreateMainMenuItem(mnuEnvironment,'Environment',lisMenuEnvironent); CreateMainMenuItem(mnuWindow,'Window',lisMenuWindow); CreateMainMenuItem(mnuHelp,'Help',lisMenuHelp); end; @@ -743,6 +741,16 @@ begin ParentMI:=itmSecondaryTools; CreateMenuItem(ParentMI,itmToolDiff,'itmToolDiff',lisMenuDiff, 'menu_tool_diff'); + CreateMenuSeparatorSection(mnuTools,itmOptionsDialogs,'itmOptionsDialogs'); + ParentMI:=itmOptionsDialogs; + CreateMenuItem(ParentMI,itmEnvGeneralOptions,'itmEnvGeneralOptions', + lisMenuGeneralOptions,'menu_environment_options'); + CreateMenuItem(ParentMI,itmToolRescanFPCSrcDir,'itmToolRescanFPCSrcDir', + lisMenuRescanFPCSourceDirectory); + CreateMenuItem(ParentMI,itmEnvCodeTemplates,'itmEnvCodeTemplates',lisMenuEditCodeTemplates,''); + CreateMenuItem(ParentMI,itmEnvCodeToolsDefinesEditor,'itmEnvCodeToolsDefinesEditor', + lisMenuCodeToolsDefinesEditor,'menu_codetoolsdefineseditor'); + CreateMenuSeparatorSection(mnuTools,itmDelphiConversion,'itmDelphiConversion'); ParentMI:=itmDelphiConversion; CreateMenuItem(ParentMI,itmToolCheckLFM,'itmToolCheckLFM',lisMenuCheckLFM, 'menu_tool_check_lfm'); @@ -755,27 +763,8 @@ begin CreateMenuSeparatorSection(mnuTools,itmBuildingLazarus,'itmBuildingLazarus'); ParentMI:=itmBuildingLazarus; CreateMenuItem(ParentMI,itmToolBuildLazarus,'itmToolBuildLazarus',lisMenuBuildLazarus,'menu_build_lazarus'); - CreateMenuItem(ParentMI,itmToolConfigureBuildLazarus,'itmToolConfigureBuildLazarus',lisMenuConfigureBuildLazarus, 'menu_configure_build_lazarus'); - end; -end; - -procedure TMainIDEBase.SetupEnvironmentMenu; -var - ParentMI: TIDEMenuSection; -begin - with MainIDEBar do begin - CreateMenuSeparatorSection(mnuEnvironment,itmOptionsDialogs,'itmOptionsDialogs'); - ParentMI:=itmOptionsDialogs; - CreateMenuItem(ParentMI,itmEnvGeneralOptions,'itmEnvGeneralOptions', - lisMenuGeneralOptions,'menu_environment_options'); - CreateMenuItem(ParentMI,itmEnvCodeTemplates,'itmEnvCodeTemplates',lisMenuEditCodeTemplates,''); - CreateMenuItem(ParentMI,itmEnvCodeToolsDefinesEditor,'itmEnvCodeToolsDefinesEditor', - lisMenuCodeToolsDefinesEditor,'menu_codetoolsdefineseditor'); - - CreateMenuSeparatorSection(mnuEnvironment,itmIDECacheSection,'itmIDECacheSection'); - ParentMI:=itmIDECacheSection; - CreateMenuItem(ParentMI,itmEnvRescanFPCSrcDir,'itmEnvRescanFPCSrcDir', - lisMenuRescanFPCSourceDirectory); + CreateMenuItem(ParentMI,itmToolConfigureBuildLazarus,'itmToolConfigureBuildLazarus', + lisMenuConfigureBuildLazarus, 'menu_configure_build_lazarus'); end; end; @@ -1000,6 +989,10 @@ begin // tools menu itmToolConfigure.Command:=GetCommand(ecExtToolSettings); itmToolDiff.Command:=GetCommand(ecDiff); + itmEnvGeneralOptions.Command:=GetCommand(ecEnvironmentOptions); + itmToolRescanFPCSrcDir.Command:=GetCommand(ecRescanFPCSrcDir); + itmEnvCodeTemplates.Command:=GetCommand(ecEditCodeTemplates); + itmEnvCodeToolsDefinesEditor.Command:=GetCommand(ecCodeToolsDefinesEd); itmToolConvertDFMtoLFM.Command:=GetCommand(ecConvertDFM2LFM); itmToolCheckLFM.Command:=GetCommand(ecCheckLFM); itmToolConvertDelphiUnit.Command:=GetCommand(ecConvertDelphiUnit); @@ -1009,12 +1002,6 @@ begin itmToolBuildLazarus.Command:=GetCommand(ecBuildLazarus); itmToolConfigureBuildLazarus.Command:=GetCommand(ecConfigBuildLazarus); - // environment menu - itmEnvGeneralOptions.Command:=GetCommand(ecEnvironmentOptions); - itmEnvCodeTemplates.Command:=GetCommand(ecEditCodeTemplates); - itmEnvCodeToolsDefinesEditor.Command:=GetCommand(ecCodeToolsDefinesEd); - itmEnvRescanFPCSrcDir.Command:=GetCommand(ecRescanFPCSrcDir); - // help menu itmHelpAboutLazarus.Command:=GetCommand(ecAboutLazarus); itmHelpOnlineHelp.Command:=GetCommand(ecOnlineHelp); diff --git a/ideintf/menuintf.pas b/ideintf/menuintf.pas index fbd8f4edd6..2a5cec9842 100644 --- a/ideintf/menuintf.pas +++ b/ideintf/menuintf.pas @@ -362,14 +362,10 @@ var mnuTools: TIDEMenuSection; itmCustomTools: TIDEMenuSection; itmSecondaryTools: TIDEMenuSection; + itmOptionsDialogs: TIDEMenuSection; itmDelphiConversion: TIDEMenuSection; itmBuildingLazarus: TIDEMenuSection; - // environment menu - mnuEnvironment: TIDEMenuSection; - itmOptionsDialogs: TIDEMenuSection; - itmIDECacheSection: TIDEMenuSection; - // windows menu mnuWindow: TIDEMenuSection; itmDesignerWindow: TIDEMenuSection;