paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-12 10:55:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: add IDE command for the Editor Window Manager. Improve some strings.

Browse Source 
git-svn-id: trunk@35479 -
This commit is contained in:
juha 2012-02-19 12:59:49 +00:00
parent a4ee9b8f81
commit 4310d040e2
6 changed files with 57 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ide/editorfilemanager.pas
View File

@ -89,7 +89,7 @@ begin
end; end;
FilterEdit.InvalidateFilter; FilterEdit.InvalidateFilter;
// Captions // Captions
Caption:=lisEditorFileManager; Caption:=lisEditorWindowManager;
ActivateMenuItem.Caption:=lisActivate; ActivateMenuItem.Caption:=lisActivate;
CloseMenuItem.Caption:=lisMenuClose; CloseMenuItem.Caption:=lisMenuClose;
SelectAllCheckBox.Caption:=lisCheckAll; SelectAllCheckBox.Caption:=lisCheckAll;

68
ide/keymapping.pp
View File

@ -606,6 +606,11 @@ begin
ecConfigCustomComps : Result:= lisMenuConfigCustomComps; ecConfigCustomComps : Result:= lisMenuConfigCustomComps;
// tools menu // tools menu
ecEnvironmentOptions : Result:= srkmecEnvironmentOptions;
ecRescanFPCSrcDir : Result:= lisMenuRescanFPCSourceDirectory;
ecEditCodeTemplates : Result:= lisMenuEditCodeTemplates;
ecCodeToolsDefinesEd : Result:= srkmecCodeToolsDefinesEd;
ecExtToolSettings : Result:= srkmecExtToolSettings; ecExtToolSettings : Result:= srkmecExtToolSettings;
ecManageExamples : Result:= lisMenuExampleProjects; ecManageExamples : Result:= lisMenuExampleProjects;
ecConfigBuildLazarus : Result:= lismenuconfigurebuildlazarus; ecConfigBuildLazarus : Result:= lismenuconfigurebuildlazarus;
@ -615,11 +620,8 @@ begin
ecMakeResourceString : Result:= srkmecMakeResourceString; ecMakeResourceString : Result:= srkmecMakeResourceString;
ecDiff : Result:= srkmecDiff; ecDiff : Result:= srkmecDiff;
// environment menu // window menu
ecEnvironmentOptions : Result:= srkmecEnvironmentOptions; ecWindowManager : Result:= lisEditorWindowManager;
ecRescanFPCSrcDir : Result:= lisMenuRescanFPCSourceDirectory;
ecEditCodeTemplates : Result:= lisMenuEditCodeTemplates;
ecCodeToolsDefinesEd : Result:= srkmecCodeToolsDefinesEd;
// help menu // help menu
ecAboutLazarus : Result:= lisAboutLazarus; ecAboutLazarus : Result:= lisAboutLazarus;
@ -890,7 +892,7 @@ begin
ecSelectionEnclose: SetSingle(VK_N,[ssShift,ssCtrl]); ecSelectionEnclose: SetSingle(VK_N,[ssShift,ssCtrl]);
ecSelectionComment: SetSingle(VK_V,[ssShift,ssCtrl]); ecSelectionComment: SetSingle(VK_V,[ssShift,ssCtrl]);
ecSelectionUncomment: SetSingle(VK_U,[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]); ecSelectionEncloseIFDEF:SetSingle(VK_D,[ssShift,ssCtrl]);
ecSelectionSort: SetSingle(VK_UNKNOWN,[]); ecSelectionSort: SetSingle(VK_UNKNOWN,[]);
ecSelectionBreakLines: SetSingle(VK_UNKNOWN,[]); ecSelectionBreakLines: SetSingle(VK_UNKNOWN,[]);
@ -1188,6 +1190,11 @@ begin
ecConfigCustomComps: SetSingle(VK_UNKNOWN,[]); ecConfigCustomComps: SetSingle(VK_UNKNOWN,[]);
// tools menu // tools menu
ecEnvironmentOptions: SetSingle(VK_O,[ssShift,ssCtrl]);
ecRescanFPCSrcDir: SetSingle(VK_UNKNOWN,[]);
ecEditCodeTemplates: SetSingle(VK_UNKNOWN,[]);
ecCodeToolsDefinesEd: SetSingle(VK_UNKNOWN,[]);
ecExtToolSettings: SetSingle(VK_UNKNOWN,[]); ecExtToolSettings: SetSingle(VK_UNKNOWN,[]);
ecManageExamples: SetSingle(VK_UNKNOWN,[]); ecManageExamples: SetSingle(VK_UNKNOWN,[]);
ecBuildLazarus: SetSingle(VK_UNKNOWN,[]); ecBuildLazarus: SetSingle(VK_UNKNOWN,[]);
@ -1195,11 +1202,8 @@ begin
ecMakeResourceString: SetSingle(VK_UNKNOWN,[]); ecMakeResourceString: SetSingle(VK_UNKNOWN,[]);
ecDiff: SetSingle(VK_UNKNOWN,[]); ecDiff: SetSingle(VK_UNKNOWN,[]);
// environment (in Tools menu) // window menu
ecEnvironmentOptions: SetSingle(VK_O,[ssShift,ssCtrl]); ecWindowManager: SetSingle(VK_W,[ssShift,ssCtrl]);
ecRescanFPCSrcDir: SetSingle(VK_UNKNOWN,[]);
ecEditCodeTemplates: SetSingle(VK_UNKNOWN,[]);
ecCodeToolsDefinesEd: SetSingle(VK_UNKNOWN,[]);
// help menu // help menu
ecAboutLazarus: SetSingle(VK_UNKNOWN,[]); ecAboutLazarus: SetSingle(VK_UNKNOWN,[]);
@ -1612,6 +1616,11 @@ begin
ecConfigCustomComps: SetSingle(VK_UNKNOWN,[]); ecConfigCustomComps: SetSingle(VK_UNKNOWN,[]);
// tools menu // tools menu
ecEnvironmentOptions: SetSingle(VK_UNKNOWN,[]);
ecRescanFPCSrcDir: SetSingle(VK_UNKNOWN,[]);
ecEditCodeTemplates: SetSingle(VK_UNKNOWN,[]);
ecCodeToolsDefinesEd: SetSingle(VK_UNKNOWN,[]);
ecExtToolSettings: SetSingle(VK_UNKNOWN,[]); ecExtToolSettings: SetSingle(VK_UNKNOWN,[]);
ecManageExamples: SetSingle(VK_UNKNOWN,[]); ecManageExamples: SetSingle(VK_UNKNOWN,[]);
ecBuildLazarus: SetSingle(VK_UNKNOWN,[]); ecBuildLazarus: SetSingle(VK_UNKNOWN,[]);
@ -1619,11 +1628,8 @@ begin
ecMakeResourceString: SetSingle(VK_UNKNOWN,[]); ecMakeResourceString: SetSingle(VK_UNKNOWN,[]);
ecDiff: SetSingle(VK_UNKNOWN,[]); ecDiff: SetSingle(VK_UNKNOWN,[]);
// environment menu // window menu
ecEnvironmentOptions: SetSingle(VK_UNKNOWN,[]); ecWindowManager: SetSingle(VK_UNKNOWN,[]);
ecRescanFPCSrcDir: SetSingle(VK_UNKNOWN,[]);
ecEditCodeTemplates: SetSingle(VK_UNKNOWN,[]);
ecCodeToolsDefinesEd: SetSingle(VK_UNKNOWN,[]);
// help menu // help menu
ecAboutLazarus: SetSingle(VK_UNKNOWN,[]); ecAboutLazarus: SetSingle(VK_UNKNOWN,[]);
@ -2221,6 +2227,11 @@ begin
ecConfigCustomComps: SetSingle(VK_UNKNOWN,[]); ecConfigCustomComps: SetSingle(VK_UNKNOWN,[]);
// tools menu // tools menu
ecEnvironmentOptions: SetSingle(VK_UNKNOWN,[]);
ecRescanFPCSrcDir: SetSingle(VK_UNKNOWN,[]);
ecEditCodeTemplates: SetSingle(VK_UNKNOWN,[]);
ecCodeToolsDefinesEd: SetSingle(VK_UNKNOWN,[]);
ecExtToolSettings: SetSingle(VK_UNKNOWN,[]); ecExtToolSettings: SetSingle(VK_UNKNOWN,[]);
ecManageExamples: SetSingle(VK_UNKNOWN,[]); ecManageExamples: SetSingle(VK_UNKNOWN,[]);
ecBuildLazarus: SetSingle(VK_UNKNOWN,[]); ecBuildLazarus: SetSingle(VK_UNKNOWN,[]);
@ -2228,11 +2239,8 @@ begin
ecMakeResourceString: SetSingle(VK_UNKNOWN,[]); ecMakeResourceString: SetSingle(VK_UNKNOWN,[]);
ecDiff: SetSingle(VK_UNKNOWN,[]); ecDiff: SetSingle(VK_UNKNOWN,[]);
// environment menu // window menu
ecEnvironmentOptions: SetSingle(VK_UNKNOWN,[]); ecWindowManager: SetSingle(VK_W,[ssShift,ssCtrl]);
ecRescanFPCSrcDir: SetSingle(VK_UNKNOWN,[]);
ecEditCodeTemplates: SetSingle(VK_UNKNOWN,[]);
ecCodeToolsDefinesEd: SetSingle(VK_UNKNOWN,[]);
// help menu // help menu
ecAboutLazarus: SetSingle(VK_UNKNOWN,[]); ecAboutLazarus: SetSingle(VK_UNKNOWN,[]);
@ -2383,7 +2391,7 @@ begin
end; end;
procedure TKeyCommandRelationList.CreateDefaultMapping; procedure TKeyCommandRelationList.CreateDefaultMapping;
// create default keymapping // Define a category for each command
var var
C: TIDECommandCategory; C: TIDECommandCategory;
begin begin
@ -2824,6 +2832,12 @@ begin
// tools menu // tools menu
C:=Categories[AddCategory(CommandCategoryToolMenuName,srkmCatToolMenu,nil)]; 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, 'External Tools settings', lisKMExternalToolsSettings, ecExtToolSettings);
AddDefault(C, 'Example Projects', lisKMExampleProjects, ecManageExamples); AddDefault(C, 'Example Projects', lisKMExampleProjects, ecManageExamples);
AddDefault(C, 'Build Lazarus', lisMenuBuildLazarus, ecBuildLazarus); AddDefault(C, 'Build Lazarus', lisMenuBuildLazarus, ecBuildLazarus);
@ -2838,13 +2852,9 @@ begin
AddDefault(C, 'Convert Delphi package to Lazarus package', AddDefault(C, 'Convert Delphi package to Lazarus package',
lisKMConvertDelphiPackageToLazarusPackage, ecConvertDelphiPackage); lisKMConvertDelphiPackageToLazarusPackage, ecConvertDelphiPackage);
AddDefault(C, 'Convert encoding', lisConvertEncodingOfProjectsPackages, ecConvertEncoding); AddDefault(C, 'Convert encoding', lisConvertEncodingOfProjectsPackages, ecConvertEncoding);
// window menu
// environment (in Tools menu) // C:=Categories[AddCategory('WindowMenu',srkmCarWindowMenu,nil)];
C:=Categories[AddCategory('EnvironmentMenu',srkmCatEnvMenu,nil)]; AddDefault(C, 'Editor Window Manager', lisEditorWindowManager, ecWindowManager);
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);
// help menu // help menu
C:=Categories[AddCategory('HelpMenu',srkmCarHelpMenu,nil)]; C:=Categories[AddCategory('HelpMenu',srkmCarHelpMenu,nil)];

5
ide/lazarusidestrconsts.pas
View File

@ -451,8 +451,8 @@ resourcestring
lisMenuBuildLazarus = 'Build Lazarus with Current Profile'; lisMenuBuildLazarus = 'Build Lazarus with Current Profile';
lisMenuBuildLazarusProf = 'Build Lazarus with Profile: %s'; lisMenuBuildLazarusProf = 'Build Lazarus with Profile: %s';
lisMenuConfigureBuildLazarus = 'Configure "Build Lazarus" ...'; lisMenuConfigureBuildLazarus = 'Configure "Build Lazarus" ...';
lisDlgEditorFileManager = 'Editor File Manager ...'; lisDlgEditorWindowManager = 'Editor Window Manager ...';
lisEditorFileManager = 'Editor File Manager'; lisEditorWindowManager = 'Editor Window Manager';
lisSearchProjectsFrom = 'Search projects from'; lisSearchProjectsFrom = 'Search projects from';
lisMEOther = 'Other'; lisMEOther = 'Other';
@ -2867,7 +2867,6 @@ resourcestring
srkmCatPackageMenu = 'Package menu commands'; srkmCatPackageMenu = 'Package menu commands';
srkmCatToolMenu = 'Tools menu commands'; srkmCatToolMenu = 'Tools menu commands';
lisKMExternalToolsSettings = 'External Tools settings'; lisKMExternalToolsSettings = 'External Tools settings';
srkmCatEnvMenu = 'Environment menu commands';
lisKMConvertDelphiPackageToLazarusPackage = 'Convert Delphi package to Lazarus package'; lisKMConvertDelphiPackageToLazarusPackage = 'Convert Delphi package to Lazarus package';
srkmCarHelpMenu = 'Help menu commands'; srkmCarHelpMenu = 'Help menu commands';
lisKeyCatDesigner = 'Designer commands'; lisKeyCatDesigner = 'Designer commands';

3
ide/main.pp
View File

@ -3372,6 +3372,9 @@ begin
ecConfigBuildLazarus: ecConfigBuildLazarus:
mnuToolConfigBuildLazClicked(Self); mnuToolConfigBuildLazClicked(Self);
ecWindowManager:
mnuWindowManagerClicked(Self);
ecToggleFormUnit: ecToggleFormUnit:
mnuToggleFormUnitClicked(Self); mnuToggleFormUnitClicked(Self);

5
ide/mainbase.pas
View File

@ -782,7 +782,7 @@ begin
with MainIDEBar do begin with MainIDEBar do begin
CreateMenuSeparatorSection(mnuWindow,itmWindowManagers,'itmWindowManagers'); CreateMenuSeparatorSection(mnuWindow,itmWindowManagers,'itmWindowManagers');
ParentMI:=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 // Populated later with a list of editor names
CreateMenuSeparatorSection(mnuWindow,itmWindowLists,'itmWindowLists'); CreateMenuSeparatorSection(mnuWindow,itmWindowLists,'itmWindowLists');
end; end;
@ -1027,6 +1027,9 @@ begin
itmToolBuildLazarus.Command:=GetCommand(ecBuildLazarus); itmToolBuildLazarus.Command:=GetCommand(ecBuildLazarus);
itmToolConfigureBuildLazarus.Command:=GetCommand(ecConfigBuildLazarus); itmToolConfigureBuildLazarus.Command:=GetCommand(ecConfigBuildLazarus);
// window menu
itmWindowManager.Command:=GetCommand(ecWindowManager);
// help menu // help menu
itmHelpAboutLazarus.Command:=GetCommand(ecAboutLazarus); itmHelpAboutLazarus.Command:=GetCommand(ecAboutLazarus);
itmHelpOnlineHelp.Command:=GetCommand(ecOnlineHelp); itmHelpOnlineHelp.Command:=GetCommand(ecOnlineHelp);

13
ideintf/idecommands.pas
View File

@ -47,8 +47,7 @@ const
1. Add a constant with a unique value in the list below. 1. Add a constant with a unique value in the list below.
2. Add it to GetDefaultKeyForCommand to define the default keys+shiftstates 2. Add it to GetDefaultKeyForCommand to define the default keys+shiftstates
3. Add it to EditorCommandToDescriptionString to define the description 3. Add it to EditorCommandToDescriptionString to define the description
4. Add it to TKeyCommandRelationList.CreateDefaultMapping to define the 4. Add it to TKeyCommandRelationList.CreateDefaultMapping to define the category.
category.
} }
ecNone = 0; ecNone = 0;
@ -299,16 +298,20 @@ const
ecExtToolLast = ecFirstLazarus + 799; ecExtToolLast = ecFirstLazarus + 799;
// tools menu // tools menu
ecExtToolSettings = ecFirstLazarus + 820; ecEnvironmentOptions = ecFirstLazarus + 820;
ecEnvironmentOptions = ecFirstLazarus + 821; ecRescanFPCSrcDir = ecFirstLazarus + 821;
ecEditCodeTemplates = ecFirstLazarus + 822; ecEditCodeTemplates = ecFirstLazarus + 822;
ecCodeToolsDefinesEd = ecFirstLazarus + 823; ecCodeToolsDefinesEd = ecFirstLazarus + 823;
ecRescanFPCSrcDir = ecFirstLazarus + 824;
ecExtToolSettings = ecFirstLazarus + 824;
ecManageExamples = ecFirstLazarus + 825; ecManageExamples = ecFirstLazarus + 825;
ecConfigBuildLazarus = ecFirstLazarus + 830; ecConfigBuildLazarus = ecFirstLazarus + 830;
ecBuildLazarus = ecFirstLazarus + 831; ecBuildLazarus = ecFirstLazarus + 831;
ecBuildAdvancedLazarus = ecFirstLazarus + 832; ecBuildAdvancedLazarus = ecFirstLazarus + 832;
// window menu
ecWindowManager = ecFirstLazarus + 840;
// help menu // help menu
ecAboutLazarus = ecFirstLazarus + 900; ecAboutLazarus = ecFirstLazarus + 900;
ecOnlineHelp = ecFirstLazarus + 901; ecOnlineHelp = ecFirstLazarus + 901;