mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-19 14:29:29 +02:00
ide: rename BuildAll -> Build, Build -> Compile to map to the same meaning as it is internally used in IDE (and also in Delphi)
git-svn-id: trunk@29844 -
This commit is contained in:
paul
parent
621494e9f4
commit
b35d26939d
@ -545,8 +545,8 @@ begin
|
||||
ecProjectOptions: SetResult(VK_F11,[ssShift,ssCtrl],VK_UNKNOWN,[]);
|
||||
|
||||
// run menu
|
||||
ecBuild: SetResult(VK_F9,[ssCtrl],VK_UNKNOWN,[]);
|
||||
ecBuildAll: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
|
||||
ecCompile: SetResult(VK_F9,[ssCtrl],VK_UNKNOWN,[]);
|
||||
ecBuild: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
|
||||
ecQuickCompile: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
|
||||
ecAbortBuild: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
|
||||
ecRun: SetResult(VK_F9,[],VK_UNKNOWN,[]);
|
||||
@ -984,8 +984,8 @@ begin
|
||||
ecProjectOptions: SetResult(VK_F11,[ssShift,ssCtrl],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]);
|
||||
|
||||
// run menu
|
||||
ecBuild: SetResult(VK_F9,[ssCtrl],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]);
|
||||
ecBuildAll: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]);
|
||||
ecCompile: SetResult(VK_F9,[ssCtrl],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]);
|
||||
ecBuild: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]);
|
||||
ecQuickCompile: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]);
|
||||
ecAbortBuild: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]);
|
||||
ecRun: SetResult(VK_F9,[],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]);
|
||||
@ -1604,8 +1604,8 @@ begin
|
||||
ecProjectOptions: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
|
||||
|
||||
// run menu
|
||||
ecBuild: SetResult(VK_B,[ssMeta],VK_UNKNOWN,[]);
|
||||
ecBuildAll: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
|
||||
ecCompile: SetResult(VK_B,[ssMeta],VK_UNKNOWN,[]);
|
||||
ecBuild: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
|
||||
ecQuickCompile: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
|
||||
ecAbortBuild: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
|
||||
ecRun: SetResult(VK_R,[ssMeta],VK_UNKNOWN,[]);
|
||||
@ -1768,8 +1768,8 @@ begin
|
||||
ecRenameIdentifier: SetResult(VK_E, [ssShift,ssCtrl],VK_UNKNOWN,[]);
|
||||
|
||||
// run menu
|
||||
ecBuild: SetResult(VK_F9,[ssCtrl],VK_F9,[ssCtrl,ssMeta]);
|
||||
ecBuildAll: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
|
||||
ecCompile: SetResult(VK_F9,[ssCtrl],VK_F9,[ssCtrl,ssMeta]);
|
||||
ecBuild: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
|
||||
ecQuickCompile: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
|
||||
ecAbortBuild: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
|
||||
ecRun: SetResult(VK_F9,[],VK_F9,[ssMeta]);
|
||||
@ -2135,8 +2135,8 @@ begin
|
||||
ecProjectOptions : Result:= lisMenuProjectOptions;
|
||||
|
||||
// run menu (menu string resource)
|
||||
ecCompile : Result:= srkmecCompile;
|
||||
ecBuild : Result:= srkmecBuild;
|
||||
ecBuildAll : Result:= srkmecBuildAll;
|
||||
ecQuickCompile : Result:= srkmecQuickCompile;
|
||||
ecAbortBuild : Result:= srkmecAbortBuild;
|
||||
ecRun : Result:= srkmecRun;
|
||||
@ -2776,8 +2776,8 @@ begin
|
||||
|
||||
// run menu
|
||||
C:=Categories[AddCategory('RunMenu',srkmCatRunMenu,nil)];
|
||||
AddDefault(C, 'Compile project/program', lisKMCompileProjectProgram, ecCompile);
|
||||
AddDefault(C, 'Build project/program', lisKMBuildProjectProgram, ecBuild);
|
||||
AddDefault(C, 'Build all files of project/program', lisKMBuildAllFilesOfProjectProgram, ecBuildAll);
|
||||
AddDefault(C, 'Quick compile, no linking', lisKMQuickCompileNoLinking, ecQuickCompile);
|
||||
AddDefault(C, 'Abort building', lisKMAbortBuilding, ecAbortBuild);
|
||||
AddDefault(C, 'Run program', lisKMRunProgram, ecRun);
|
||||
|
||||
@ -326,13 +326,13 @@ resourcestring
|
||||
lisMenuViewSource = '&View Source';
|
||||
lisMenuProjectOptions = 'Project Options ...';
|
||||
|
||||
lisMenuBuild = 'Build';
|
||||
lisMenuCompile = 'Compile';
|
||||
lisBFBuild = 'Build';
|
||||
lisBFRun = 'Run';
|
||||
lisBFWorkingDirectoryLeaveEmptyForFilePath = 'Working directory (Leave '
|
||||
+'empty for file path)';
|
||||
lisBFBuildCommand = 'Build Command';
|
||||
lisMenuBuildAll = 'Build all';
|
||||
lisMenuBuild = 'Build';
|
||||
lisMenuQuickCompile = 'Quick compile';
|
||||
lisMenuAbortBuild = 'Abort Build';
|
||||
lisMenuProjectRun = 'Run';
|
||||
@ -2666,8 +2666,8 @@ resourcestring
|
||||
srkmecSynPSyncroEdStart = 'Start Syncro edit';
|
||||
|
||||
// run menu
|
||||
srkmecCompile = 'compile program/project';
|
||||
srkmecBuild = 'build program/project';
|
||||
srkmecBuildAll = 'build all files of program/project';
|
||||
srkmecQuickCompile = 'quick compile, no linking';
|
||||
srkmecAbortBuild = 'abort build';
|
||||
srkmecRun = 'run program';
|
||||
@ -2754,8 +2754,8 @@ resourcestring
|
||||
lisKMNewProjectFromFile = 'New project from file';
|
||||
lisKMToggleViewIDESpeedButtons = 'Toggle view IDE speed buttons';
|
||||
srkmCatRunMenu = 'Run menu commands';
|
||||
lisKMCompileProjectProgram = 'Compile project/program';
|
||||
lisKMBuildProjectProgram = 'Build project/program';
|
||||
lisKMBuildAllFilesOfProjectProgram = 'Build all files of project/program';
|
||||
lisKMQuickCompileNoLinking = 'Quick compile, no linking';
|
||||
lisKMAbortBuilding = 'Abort building';
|
||||
lisKMRunProgram = 'Run program';
|
||||
|
||||
25
ide/main.pp
25
ide/main.pp
@ -313,8 +313,8 @@ type
|
||||
procedure mnuProjectOptionsClicked(Sender: TObject);
|
||||
|
||||
// run menu
|
||||
procedure mnuCompileProjectClicked(Sender: TObject);
|
||||
procedure mnuBuildProjectClicked(Sender: TObject);
|
||||
procedure mnuBuildAllProjectClicked(Sender: TObject);
|
||||
procedure mnuQuickCompileProjectClicked(Sender: TObject);
|
||||
procedure mnuAbortBuildProjectClicked(Sender: TObject);
|
||||
procedure mnuRunProjectClicked(Sender: TObject);
|
||||
@ -1438,7 +1438,8 @@ begin
|
||||
DebugLn('[TMainIDE.Destroy] A ');
|
||||
|
||||
{$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TMainIDE.Destroy A ');{$ENDIF}
|
||||
MainIDEBar.DisableAutoSizing{$IFDEF DebugDisableAutoSizing}('TMainIDE.Destroy'){$ENDIF};
|
||||
if Assigned(MainIDEBar) then
|
||||
MainIDEBar.DisableAutoSizing{$IFDEF DebugDisableAutoSizing}('TMainIDE.Destroy'){$ENDIF};
|
||||
|
||||
if DebugBoss<>nil then DebugBoss.EndDebugging;
|
||||
|
||||
@ -2522,8 +2523,8 @@ procedure TMainIDE.SetupRunMenu;
|
||||
begin
|
||||
inherited SetupRunMenu;
|
||||
with MainIDEBar do begin
|
||||
itmRunMenuCompile.OnClick := @mnuCompileProjectClicked;
|
||||
itmRunMenuBuild.OnClick := @mnuBuildProjectClicked;
|
||||
itmRunMenuBuildAll.OnClick := @mnuBuildAllProjectClicked;
|
||||
itmRunMenuQuickCompile.OnClick := @mnuQuickCompileProjectClicked;
|
||||
itmRunMenuAbortBuild.OnClick := @mnuAbortBuildProjectClicked;
|
||||
itmRunMenuRun.OnClick := @mnuRunProjectClicked;
|
||||
@ -3149,20 +3150,18 @@ begin
|
||||
ecQuit:
|
||||
mnuQuitClicked(Self);
|
||||
|
||||
ecBuild:
|
||||
ecCompile:
|
||||
begin
|
||||
GetCurrentUnit(ASrcEdit,AnUnitInfo);
|
||||
if (AnUnitInfo<>nil)
|
||||
and AnUnitInfo.BuildFileIfActive then
|
||||
if Assigned(AnUnitInfo) and AnUnitInfo.BuildFileIfActive then
|
||||
DoBuildFile(false)
|
||||
else
|
||||
DoBuildProject(crCompile,[]);
|
||||
DoBuildProject(crCompile, []);
|
||||
end;
|
||||
|
||||
ecBuildAll: DoBuildProject(crBuild,[pbfCleanCompile,
|
||||
pbfCompileDependenciesClean]);
|
||||
ecQuickCompile:DoQuickCompile;
|
||||
ecAbortBuild: DoAbortBuild;
|
||||
ecBuild: DoBuildProject(crBuild, [pbfCleanCompile, pbfCompileDependenciesClean]);
|
||||
ecQuickCompile: DoQuickCompile;
|
||||
ecAbortBuild: DoAbortBuild;
|
||||
|
||||
ecRun:
|
||||
begin
|
||||
@ -4214,7 +4213,7 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
Procedure TMainIDE.mnuBuildProjectClicked(Sender: TObject);
|
||||
Procedure TMainIDE.mnuCompileProjectClicked(Sender: TObject);
|
||||
var
|
||||
ASrcEdit: TSourceEditor;
|
||||
AnUnitInfo: TUnitInfo;
|
||||
@ -4227,7 +4226,7 @@ Begin
|
||||
DoBuildProject(crCompile,[]);
|
||||
end;
|
||||
|
||||
Procedure TMainIDE.mnuBuildAllProjectClicked(Sender: TObject);
|
||||
Procedure TMainIDE.mnuBuildProjectClicked(Sender: TObject);
|
||||
Begin
|
||||
DoBuildProject(crBuild,[pbfCleanCompile,pbfCompileDependenciesClean]);
|
||||
end;
|
||||
|
||||
@ -269,8 +269,8 @@ type
|
||||
// run menu
|
||||
//mnuRun: TIDEMenuSection;
|
||||
//itmRunBuilding: TIDEMenuSection;
|
||||
itmRunMenuCompile: TIDEMenuCommand;
|
||||
itmRunMenuBuild: TIDEMenuCommand;
|
||||
itmRunMenuBuildAll: TIDEMenuCommand;
|
||||
itmRunMenuQuickCompile: TIDEMenuCommand;
|
||||
itmRunMenuAbortBuild: TIDEMenuCommand;
|
||||
//itmRunnning: TIDEMenuSection;
|
||||
|
||||
@ -669,8 +669,8 @@ begin
|
||||
with MainIDEBar do begin
|
||||
CreateMenuSeparatorSection(mnuRun,itmRunBuilding,'itmRunBuilding');
|
||||
ParentMI:=itmRunBuilding;
|
||||
CreateMenuItem(ParentMI,itmRunMenuBuild,'itmRunMenuBuild',lisMenuBuild,'menu_build');
|
||||
CreateMenuItem(ParentMI,itmRunMenuBuildAll,'itmRunMenuBuildAll',lisMenuBuildAll,'menu_build_all');
|
||||
CreateMenuItem(ParentMI,itmRunMenuCompile,'itmRunMenuCompile',lisMenuCompile,'menu_build');
|
||||
CreateMenuItem(ParentMI,itmRunMenuBuild,'itmRunMenuBuild',lisMenuBuild,'menu_build_all');
|
||||
CreateMenuItem(ParentMI,itmRunMenuQuickCompile,'itmRunMenuQuickCompile',lisMenuQuickCompile,'menu_quick_compile');
|
||||
CreateMenuItem(ParentMI,itmRunMenuAbortBuild,'itmRunMenuAbortBuild',lisMenuAbortBuild,'menu_abort_build');
|
||||
|
||||
@ -970,8 +970,8 @@ begin
|
||||
itmProjectViewSource.Command:=GetCommand(ecViewProjectSource);
|
||||
|
||||
// run menu
|
||||
itmRunMenuCompile.Command:=GetCommand(ecCompile);
|
||||
itmRunMenuBuild.Command:=GetCommand(ecBuild);
|
||||
itmRunMenuBuildAll.Command:=GetCommand(ecBuildAll);
|
||||
itmRunMenuQuickCompile.Command:=GetCommand(ecQuickCompile);
|
||||
itmRunMenuAbortBuild.Command:=GetCommand(ecAbortBuild);
|
||||
itmRunMenuRun.Command:=GetCommand(ecRun);
|
||||
|
||||
@ -229,8 +229,8 @@ const
|
||||
ecNextBookmark = ecFirstLazarus + 383;
|
||||
|
||||
// compile menu
|
||||
ecBuild = ecFirstLazarus + 400;
|
||||
ecBuildAll = ecFirstLazarus + 401;
|
||||
ecCompile = ecFirstLazarus + 400;
|
||||
ecBuild = ecFirstLazarus + 401;
|
||||
ecQuickCompile = ecFirstLazarus + 402;
|
||||
ecAbortBuild = ecFirstLazarus + 403;
|
||||
ecRun = ecFirstLazarus + 404;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user