diff --git a/ide/editorfilemanager.pas b/ide/editorfilemanager.pas index ecc660825a..a2bebf8d4f 100644 --- a/ide/editorfilemanager.pas +++ b/ide/editorfilemanager.pas @@ -89,7 +89,7 @@ begin end; FilterEdit.InvalidateFilter; // Captions - Caption:=lisEditorFileManager; + Caption:=lisEditorWindowManager; ActivateMenuItem.Caption:=lisActivate; CloseMenuItem.Caption:=lisMenuClose; SelectAllCheckBox.Caption:=lisCheckAll; diff --git a/ide/keymapping.pp b/ide/keymapping.pp index dd3a0fd2c2..fb16b089b5 100644 --- a/ide/keymapping.pp +++ b/ide/keymapping.pp @@ -606,6 +606,11 @@ begin ecConfigCustomComps : Result:= lisMenuConfigCustomComps; // tools menu + ecEnvironmentOptions : Result:= srkmecEnvironmentOptions; + ecRescanFPCSrcDir : Result:= lisMenuRescanFPCSourceDirectory; + ecEditCodeTemplates : Result:= lisMenuEditCodeTemplates; + ecCodeToolsDefinesEd : Result:= srkmecCodeToolsDefinesEd; + ecExtToolSettings : Result:= srkmecExtToolSettings; ecManageExamples : Result:= lisMenuExampleProjects; ecConfigBuildLazarus : Result:= lismenuconfigurebuildlazarus; @@ -615,11 +620,8 @@ begin ecMakeResourceString : Result:= srkmecMakeResourceString; ecDiff : Result:= srkmecDiff; - // environment menu - ecEnvironmentOptions : Result:= srkmecEnvironmentOptions; - ecRescanFPCSrcDir : Result:= lisMenuRescanFPCSourceDirectory; - ecEditCodeTemplates : Result:= lisMenuEditCodeTemplates; - ecCodeToolsDefinesEd : Result:= srkmecCodeToolsDefinesEd; + // window menu + ecWindowManager : Result:= lisEditorWindowManager; // help menu ecAboutLazarus : Result:= lisAboutLazarus; @@ -890,7 +892,7 @@ begin ecSelectionEnclose: SetSingle(VK_N,[ssShift,ssCtrl]); ecSelectionComment: SetSingle(VK_V,[ssShift,ssCtrl]); ecSelectionUncomment: SetSingle(VK_U,[ssShift,ssCtrl]); - ecToggleComment: SetSingle(VK_W,[ssShift,ssCtrl], VK_OEM_2,[ssCtrl]); + ecToggleComment: SetSingle(VK_T,[ssShift,ssCtrl], VK_OEM_2,[ssCtrl]); ecSelectionEncloseIFDEF:SetSingle(VK_D,[ssShift,ssCtrl]); ecSelectionSort: SetSingle(VK_UNKNOWN,[]); ecSelectionBreakLines: SetSingle(VK_UNKNOWN,[]); @@ -1188,6 +1190,11 @@ begin ecConfigCustomComps: SetSingle(VK_UNKNOWN,[]); // tools menu + ecEnvironmentOptions: SetSingle(VK_O,[ssShift,ssCtrl]); + ecRescanFPCSrcDir: SetSingle(VK_UNKNOWN,[]); + ecEditCodeTemplates: SetSingle(VK_UNKNOWN,[]); + ecCodeToolsDefinesEd: SetSingle(VK_UNKNOWN,[]); + ecExtToolSettings: SetSingle(VK_UNKNOWN,[]); ecManageExamples: SetSingle(VK_UNKNOWN,[]); ecBuildLazarus: SetSingle(VK_UNKNOWN,[]); @@ -1195,11 +1202,8 @@ begin ecMakeResourceString: SetSingle(VK_UNKNOWN,[]); ecDiff: SetSingle(VK_UNKNOWN,[]); - // environment (in Tools menu) - ecEnvironmentOptions: SetSingle(VK_O,[ssShift,ssCtrl]); - ecRescanFPCSrcDir: SetSingle(VK_UNKNOWN,[]); - ecEditCodeTemplates: SetSingle(VK_UNKNOWN,[]); - ecCodeToolsDefinesEd: SetSingle(VK_UNKNOWN,[]); + // window menu + ecWindowManager: SetSingle(VK_W,[ssShift,ssCtrl]); // help menu ecAboutLazarus: SetSingle(VK_UNKNOWN,[]); @@ -1612,6 +1616,11 @@ begin ecConfigCustomComps: SetSingle(VK_UNKNOWN,[]); // tools menu + ecEnvironmentOptions: SetSingle(VK_UNKNOWN,[]); + ecRescanFPCSrcDir: SetSingle(VK_UNKNOWN,[]); + ecEditCodeTemplates: SetSingle(VK_UNKNOWN,[]); + ecCodeToolsDefinesEd: SetSingle(VK_UNKNOWN,[]); + ecExtToolSettings: SetSingle(VK_UNKNOWN,[]); ecManageExamples: SetSingle(VK_UNKNOWN,[]); ecBuildLazarus: SetSingle(VK_UNKNOWN,[]); @@ -1619,11 +1628,8 @@ begin ecMakeResourceString: SetSingle(VK_UNKNOWN,[]); ecDiff: SetSingle(VK_UNKNOWN,[]); - // environment menu - ecEnvironmentOptions: SetSingle(VK_UNKNOWN,[]); - ecRescanFPCSrcDir: SetSingle(VK_UNKNOWN,[]); - ecEditCodeTemplates: SetSingle(VK_UNKNOWN,[]); - ecCodeToolsDefinesEd: SetSingle(VK_UNKNOWN,[]); + // window menu + ecWindowManager: SetSingle(VK_UNKNOWN,[]); // help menu ecAboutLazarus: SetSingle(VK_UNKNOWN,[]); @@ -2221,6 +2227,11 @@ begin ecConfigCustomComps: SetSingle(VK_UNKNOWN,[]); // tools menu + ecEnvironmentOptions: SetSingle(VK_UNKNOWN,[]); + ecRescanFPCSrcDir: SetSingle(VK_UNKNOWN,[]); + ecEditCodeTemplates: SetSingle(VK_UNKNOWN,[]); + ecCodeToolsDefinesEd: SetSingle(VK_UNKNOWN,[]); + ecExtToolSettings: SetSingle(VK_UNKNOWN,[]); ecManageExamples: SetSingle(VK_UNKNOWN,[]); ecBuildLazarus: SetSingle(VK_UNKNOWN,[]); @@ -2228,11 +2239,8 @@ begin ecMakeResourceString: SetSingle(VK_UNKNOWN,[]); ecDiff: SetSingle(VK_UNKNOWN,[]); - // environment menu - ecEnvironmentOptions: SetSingle(VK_UNKNOWN,[]); - ecRescanFPCSrcDir: SetSingle(VK_UNKNOWN,[]); - ecEditCodeTemplates: SetSingle(VK_UNKNOWN,[]); - ecCodeToolsDefinesEd: SetSingle(VK_UNKNOWN,[]); + // window menu + ecWindowManager: SetSingle(VK_W,[ssShift,ssCtrl]); // help menu ecAboutLazarus: SetSingle(VK_UNKNOWN,[]); @@ -2383,7 +2391,7 @@ begin end; procedure TKeyCommandRelationList.CreateDefaultMapping; -// create default keymapping +// Define a category for each command var C: TIDECommandCategory; begin @@ -2824,6 +2832,12 @@ begin // tools menu C:=Categories[AddCategory(CommandCategoryToolMenuName,srkmCatToolMenu,nil)]; +// C:=Categories[AddCategory('EnvironmentMenu',srkmCatEnvMenu,nil)]; + AddDefault(C, 'General environment options', srkmecEnvironmentOptions, ecEnvironmentOptions); + AddDefault(C, 'Rescan FPC source directory', lisMenuRescanFPCSourceDirectory, ecRescanFPCSrcDir); + AddDefault(C, 'Edit Code Templates', lisKMEditCodeTemplates, ecEditCodeTemplates); + AddDefault(C, 'CodeTools defines editor', lisKMCodeToolsDefinesEditor, ecCodeToolsDefinesEd); + AddDefault(C, 'External Tools settings', lisKMExternalToolsSettings, ecExtToolSettings); AddDefault(C, 'Example Projects', lisKMExampleProjects, ecManageExamples); AddDefault(C, 'Build Lazarus', lisMenuBuildLazarus, ecBuildLazarus); @@ -2838,13 +2852,9 @@ begin AddDefault(C, 'Convert Delphi package to Lazarus package', lisKMConvertDelphiPackageToLazarusPackage, ecConvertDelphiPackage); AddDefault(C, 'Convert encoding', lisConvertEncodingOfProjectsPackages, ecConvertEncoding); - - // environment (in Tools menu) - C:=Categories[AddCategory('EnvironmentMenu',srkmCatEnvMenu,nil)]; - AddDefault(C, 'General environment options', srkmecEnvironmentOptions, ecEnvironmentOptions); - AddDefault(C, 'Rescan FPC source directory', lisMenuRescanFPCSourceDirectory, ecRescanFPCSrcDir); - AddDefault(C, 'Edit Code Templates', lisKMEditCodeTemplates, ecEditCodeTemplates); - AddDefault(C, 'CodeTools defines editor', lisKMCodeToolsDefinesEditor, ecCodeToolsDefinesEd); + // window menu +// C:=Categories[AddCategory('WindowMenu',srkmCarWindowMenu,nil)]; + AddDefault(C, 'Editor Window Manager', lisEditorWindowManager, ecWindowManager); // help menu C:=Categories[AddCategory('HelpMenu',srkmCarHelpMenu,nil)]; diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas index 7376568d37..095bfed137 100644 --- a/ide/lazarusidestrconsts.pas +++ b/ide/lazarusidestrconsts.pas @@ -451,8 +451,8 @@ resourcestring lisMenuBuildLazarus = 'Build Lazarus with Current Profile'; lisMenuBuildLazarusProf = 'Build Lazarus with Profile: %s'; lisMenuConfigureBuildLazarus = 'Configure "Build Lazarus" ...'; - lisDlgEditorFileManager = 'Editor File Manager ...'; - lisEditorFileManager = 'Editor File Manager'; + lisDlgEditorWindowManager = 'Editor Window Manager ...'; + lisEditorWindowManager = 'Editor Window Manager'; lisSearchProjectsFrom = 'Search projects from'; lisMEOther = 'Other'; @@ -2867,7 +2867,6 @@ resourcestring srkmCatPackageMenu = 'Package menu commands'; srkmCatToolMenu = 'Tools menu commands'; lisKMExternalToolsSettings = 'External Tools settings'; - srkmCatEnvMenu = 'Environment menu commands'; lisKMConvertDelphiPackageToLazarusPackage = 'Convert Delphi package to Lazarus package'; srkmCarHelpMenu = 'Help menu commands'; lisKeyCatDesigner = 'Designer commands'; diff --git a/ide/main.pp b/ide/main.pp index 3272158398..b139703587 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -3372,6 +3372,9 @@ begin ecConfigBuildLazarus: mnuToolConfigBuildLazClicked(Self); + ecWindowManager: + mnuWindowManagerClicked(Self); + ecToggleFormUnit: mnuToggleFormUnitClicked(Self); diff --git a/ide/mainbase.pas b/ide/mainbase.pas index 37beb93162..9364838920 100644 --- a/ide/mainbase.pas +++ b/ide/mainbase.pas @@ -782,7 +782,7 @@ begin with MainIDEBar do begin CreateMenuSeparatorSection(mnuWindow,itmWindowManagers,'itmWindowManagers'); ParentMI:=itmWindowManagers; - CreateMenuItem(ParentMI,itmWindowManager,'itmWindowManager', lisDlgEditorFileManager, 'pkg_files'); + CreateMenuItem(ParentMI,itmWindowManager,'itmWindowManager', lisDlgEditorWindowManager, 'pkg_files'); // Populated later with a list of editor names CreateMenuSeparatorSection(mnuWindow,itmWindowLists,'itmWindowLists'); end; @@ -1027,6 +1027,9 @@ begin itmToolBuildLazarus.Command:=GetCommand(ecBuildLazarus); itmToolConfigureBuildLazarus.Command:=GetCommand(ecConfigBuildLazarus); + // window menu + itmWindowManager.Command:=GetCommand(ecWindowManager); + // help menu itmHelpAboutLazarus.Command:=GetCommand(ecAboutLazarus); itmHelpOnlineHelp.Command:=GetCommand(ecOnlineHelp); diff --git a/ideintf/idecommands.pas b/ideintf/idecommands.pas index 8fc6d8f5aa..c289920c44 100644 --- a/ideintf/idecommands.pas +++ b/ideintf/idecommands.pas @@ -47,8 +47,7 @@ const 1. Add a constant with a unique value in the list below. 2. Add it to GetDefaultKeyForCommand to define the default keys+shiftstates 3. Add it to EditorCommandToDescriptionString to define the description - 4. Add it to TKeyCommandRelationList.CreateDefaultMapping to define the - category. + 4. Add it to TKeyCommandRelationList.CreateDefaultMapping to define the category. } ecNone = 0; @@ -299,16 +298,20 @@ const ecExtToolLast = ecFirstLazarus + 799; // tools menu - ecExtToolSettings = ecFirstLazarus + 820; - ecEnvironmentOptions = ecFirstLazarus + 821; + ecEnvironmentOptions = ecFirstLazarus + 820; + ecRescanFPCSrcDir = ecFirstLazarus + 821; ecEditCodeTemplates = ecFirstLazarus + 822; ecCodeToolsDefinesEd = ecFirstLazarus + 823; - ecRescanFPCSrcDir = ecFirstLazarus + 824; + + ecExtToolSettings = ecFirstLazarus + 824; ecManageExamples = ecFirstLazarus + 825; ecConfigBuildLazarus = ecFirstLazarus + 830; ecBuildLazarus = ecFirstLazarus + 831; ecBuildAdvancedLazarus = ecFirstLazarus + 832; + // window menu + ecWindowManager = ecFirstLazarus + 840; + // help menu ecAboutLazarus = ecFirstLazarus + 900; ecOnlineHelp = ecFirstLazarus + 901;