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

IDE: use better text for menu item and variables, "Clean up and Build".

Browse Source 
git-svn-id: trunk@45771 -
This commit is contained in:
juha 2014-07-04 14:30:51 +00:00
parent e74514ad7b
commit 72bb33e99c
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/ideintf/idecommands.pas
View File

@ -242,7 +242,7 @@ const
ecCompile = ecFirstLazarus + 400; ecCompile = ecFirstLazarus + 400;
ecBuild = ecFirstLazarus + 401; ecBuild = ecFirstLazarus + 401;
ecQuickCompile = ecFirstLazarus + 402; ecQuickCompile = ecFirstLazarus + 402;
ecCleanUpCompiled = ecFirstLazarus + 403; ecCleanUpAndBuild = ecFirstLazarus + 403;
ecAbortBuild = ecFirstLazarus + 404; ecAbortBuild = ecFirstLazarus + 404;
ecRun = ecFirstLazarus + 410; ecRun = ecFirstLazarus + 410;
ecPause = ecFirstLazarus + 411; ecPause = ecFirstLazarus + 411;
@ -1413,7 +1413,7 @@ const
(Value: ecCompile; Name: 'ecCompile'), (Value: ecCompile; Name: 'ecCompile'),
(Value: ecBuild; Name: 'ecBuild'), (Value: ecBuild; Name: 'ecBuild'),
(Value: ecQuickCompile; Name: 'ecQuickCompile'), (Value: ecQuickCompile; Name: 'ecQuickCompile'),
(Value: ecCleanUpCompiled; Name: 'ecCleanUpCompiled'), (Value: ecCleanUpAndBuild; Name: 'ecCleanUpAndBuild'),
(Value: ecAbortBuild; Name: 'ecAbortBuild'), (Value: ecAbortBuild; Name: 'ecAbortBuild'),
(Value: ecRun; Name: 'ecRun'), (Value: ecRun; Name: 'ecRun'),
(Value: ecPause; Name: 'ecPause'), (Value: ecPause; Name: 'ecPause'),

12
ide/keymapping.pp
View File

@ -602,7 +602,7 @@ begin
ecCompile : Result:= srkmecCompile; ecCompile : Result:= srkmecCompile;
ecBuild : Result:= srkmecBuild; ecBuild : Result:= srkmecBuild;
ecQuickCompile : Result:= srkmecQuickCompile; ecQuickCompile : Result:= srkmecQuickCompile;
ecCleanUpCompiled : Result:= srkmecCleanUpCompiled; ecCleanUpAndBuild : Result:= srkmecCleanUpAndBuild;
ecAbortBuild : Result:= srkmecAbortBuild; ecAbortBuild : Result:= srkmecAbortBuild;
ecRun : Result:= srkmecRun; ecRun : Result:= srkmecRun;
ecPause : Result:= srkmecPause; ecPause : Result:= srkmecPause;
@ -1187,7 +1187,7 @@ begin
ecCompile: SetSingle(VK_F9,[ssCtrl]); ecCompile: SetSingle(VK_F9,[ssCtrl]);
ecBuild: SetSingle(VK_F9,[ssShift]); ecBuild: SetSingle(VK_F9,[ssShift]);
ecQuickCompile: SetSingle(VK_UNKNOWN,[]); ecQuickCompile: SetSingle(VK_UNKNOWN,[]);
ecCleanUpCompiled: SetSingle(VK_UNKNOWN,[]); ecCleanUpAndBuild: SetSingle(VK_UNKNOWN,[]);
ecAbortBuild: SetSingle(VK_UNKNOWN,[]); ecAbortBuild: SetSingle(VK_UNKNOWN,[]);
ecRun: SetSingle(VK_F9,[]); ecRun: SetSingle(VK_F9,[]);
ecPause: SetSingle(VK_UNKNOWN,[]); ecPause: SetSingle(VK_UNKNOWN,[]);
@ -1608,7 +1608,7 @@ begin
ecCompile: SetSingle(VK_F9,[ssCtrl]); ecCompile: SetSingle(VK_F9,[ssCtrl]);
ecBuild: SetSingle(VK_F9,[ssShift]); ecBuild: SetSingle(VK_F9,[ssShift]);
ecQuickCompile: SetSingle(VK_UNKNOWN,[]); ecQuickCompile: SetSingle(VK_UNKNOWN,[]);
ecCleanUpCompiled: SetSingle(VK_UNKNOWN,[]); ecCleanUpAndBuild: SetSingle(VK_UNKNOWN,[]);
ecAbortBuild: SetSingle(VK_UNKNOWN,[]); ecAbortBuild: SetSingle(VK_UNKNOWN,[]);
ecRun: SetSingle(VK_F9,[]); ecRun: SetSingle(VK_F9,[]);
ecPause: SetSingle(VK_UNKNOWN,[]); ecPause: SetSingle(VK_UNKNOWN,[]);
@ -2219,7 +2219,7 @@ begin
ecCompile: SetSingle(VK_B,[ssMeta]); ecCompile: SetSingle(VK_B,[ssMeta]);
ecBuild: SetSingle(VK_UNKNOWN,[]); ecBuild: SetSingle(VK_UNKNOWN,[]);
ecQuickCompile: SetSingle(VK_UNKNOWN,[]); ecQuickCompile: SetSingle(VK_UNKNOWN,[]);
ecCleanUpCompiled: SetSingle(VK_UNKNOWN,[]); ecCleanUpAndBuild: SetSingle(VK_UNKNOWN,[]);
ecAbortBuild: SetSingle(VK_UNKNOWN,[]); ecAbortBuild: SetSingle(VK_UNKNOWN,[]);
ecRun: SetSingle(VK_R,[ssMeta]); ecRun: SetSingle(VK_R,[ssMeta]);
ecPause: SetSingle(VK_UNKNOWN,[]); ecPause: SetSingle(VK_UNKNOWN,[]);
@ -2377,7 +2377,7 @@ begin
ecCompile: SetSingle(VK_F9,[ssCtrl], VK_F9,[ssCtrl,ssMeta]); ecCompile: SetSingle(VK_F9,[ssCtrl], VK_F9,[ssCtrl,ssMeta]);
ecBuild: SetSingle(VK_F9,[ssShift]); ecBuild: SetSingle(VK_F9,[ssShift]);
ecQuickCompile: SetSingle(VK_UNKNOWN,[]); ecQuickCompile: SetSingle(VK_UNKNOWN,[]);
ecCleanUpCompiled: SetSingle(VK_UNKNOWN,[]); ecCleanUpAndBuild: SetSingle(VK_UNKNOWN,[]);
ecAbortBuild: SetSingle(VK_UNKNOWN,[]); ecAbortBuild: SetSingle(VK_UNKNOWN,[]);
ecRun: SetSingle(VK_F9,[], VK_F9,[ssMeta]); ecRun: SetSingle(VK_F9,[], VK_F9,[ssMeta]);
ecPause: SetSingle(VK_UNKNOWN,[]); ecPause: SetSingle(VK_UNKNOWN,[]);
@ -2875,7 +2875,7 @@ begin
AddDefault(C, 'Compile project/program', lisKMCompileProjectProgram, ecCompile); AddDefault(C, 'Compile project/program', lisKMCompileProjectProgram, ecCompile);
AddDefault(C, 'Build project/program', lisKMBuildProjectProgram, ecBuild); AddDefault(C, 'Build project/program', lisKMBuildProjectProgram, ecBuild);
AddDefault(C, 'Quick compile, no linking', lisKMQuickCompileNoLinking, ecQuickCompile); AddDefault(C, 'Quick compile, no linking', lisKMQuickCompileNoLinking, ecQuickCompile);
AddDefault(C, 'Clean up and compile project/program', lisKMCleanUpCompiled, ecCleanUpCompiled); AddDefault(C, 'Clean up and build project/program', lisKMCleanUpAndBuild, ecCleanUpAndBuild);
AddDefault(C, 'Abort building', lisKMAbortBuilding, ecAbortBuild); AddDefault(C, 'Abort building', lisKMAbortBuilding, ecAbortBuild);
AddDefault(C, 'Run program', lisKMRunProgram, ecRun); AddDefault(C, 'Run program', lisKMRunProgram, ecRun);
AddDefault(C, 'Pause program', lisKMPauseProgram, ecPause); AddDefault(C, 'Pause program', lisKMPauseProgram, ecPause);

6
ide/lazarusidestrconsts.pas
View File

@ -436,7 +436,7 @@ resourcestring
lisBFWorkingDirectoryLeaveEmptyForFilePath = 'Working directory (leave empty for file path)'; lisBFWorkingDirectoryLeaveEmptyForFilePath = 'Working directory (leave empty for file path)';
lisBFBuildCommand = 'Build Command'; lisBFBuildCommand = 'Build Command';
lisMenuQuickCompile = 'Quick Compile'; lisMenuQuickCompile = 'Quick Compile';
lisMenuCleanUpCompiled = 'Clean up Build Files ...'; lisMenuCleanUpAndBuild = 'Clean up and Build ...';
lisMenuAbortBuild = 'Abort Build'; lisMenuAbortBuild = 'Abort Build';
lisMenuProjectRun = '&Run'; lisMenuProjectRun = '&Run';
lisBFAlwaysBuildBeforeRun = 'Always build before run'; lisBFAlwaysBuildBeforeRun = 'Always build before run';
@ -2946,7 +2946,7 @@ resourcestring
srkmecCompile = 'compile program/project'; srkmecCompile = 'compile program/project';
srkmecBuild = 'build program/project'; srkmecBuild = 'build program/project';
srkmecQuickCompile = 'quick compile, no linking'; srkmecQuickCompile = 'quick compile, no linking';
srkmecCleanUpCompiled = 'clean up build files'; srkmecCleanUpAndBuild = 'clean up and build';
srkmecAbortBuild = 'abort build'; srkmecAbortBuild = 'abort build';
srkmecRun = 'run program'; srkmecRun = 'run program';
srkmecPause = 'pause program'; srkmecPause = 'pause program';
@ -3039,7 +3039,7 @@ resourcestring
lisKMCompileProjectProgram = 'Compile project/program'; lisKMCompileProjectProgram = 'Compile project/program';
lisKMBuildProjectProgram = 'Build project/program'; lisKMBuildProjectProgram = 'Build project/program';
lisKMQuickCompileNoLinking = 'Quick compile, no linking'; lisKMQuickCompileNoLinking = 'Quick compile, no linking';
lisKMCleanUpCompiled = 'Clean up build files'; lisKMCleanUpAndBuild = 'Clean up and build';
lisKMAbortBuilding = 'Abort building'; lisKMAbortBuilding = 'Abort building';
lisKMRunProgram = 'Run program'; lisKMRunProgram = 'Run program';
lisKMPauseProgram = 'Pause program'; lisKMPauseProgram = 'Pause program';

10
ide/main.pp
View File

@ -337,7 +337,7 @@ type
procedure mnuCompileProjectClicked(Sender: TObject); procedure mnuCompileProjectClicked(Sender: TObject);
procedure mnuBuildProjectClicked(Sender: TObject); procedure mnuBuildProjectClicked(Sender: TObject);
procedure mnuQuickCompileProjectClicked(Sender: TObject); procedure mnuQuickCompileProjectClicked(Sender: TObject);
procedure mnuCleanUpCompiledProjectClicked(Sender: TObject); procedure mnuCleanUpAndBuildProjectClicked(Sender: TObject);
procedure mnuAbortBuildProjectClicked(Sender: TObject); procedure mnuAbortBuildProjectClicked(Sender: TObject);
procedure mnuRunProjectClicked(Sender: TObject); procedure mnuRunProjectClicked(Sender: TObject);
procedure mnuPauseProjectClicked(Sender: TObject); procedure mnuPauseProjectClicked(Sender: TObject);
@ -2842,7 +2842,7 @@ begin
itmRunMenuCompile.OnClick := @mnuCompileProjectClicked; itmRunMenuCompile.OnClick := @mnuCompileProjectClicked;
itmRunMenuBuild.OnClick := @mnuBuildProjectClicked; itmRunMenuBuild.OnClick := @mnuBuildProjectClicked;
itmRunMenuQuickCompile.OnClick := @mnuQuickCompileProjectClicked; itmRunMenuQuickCompile.OnClick := @mnuQuickCompileProjectClicked;
itmRunMenuCleanUpCompiled.OnClick := @mnuCleanUpCompiledProjectClicked; itmRunMenuCleanUpAndBuild.OnClick := @mnuCleanUpAndBuildProjectClicked;
itmRunMenuAbortBuild.OnClick := @mnuAbortBuildProjectClicked; itmRunMenuAbortBuild.OnClick := @mnuAbortBuildProjectClicked;
itmRunMenuRun.OnClick := @mnuRunProjectClicked; itmRunMenuRun.OnClick := @mnuRunProjectClicked;
itmRunMenuPause.OnClick := @mnuPauseProjectClicked; itmRunMenuPause.OnClick := @mnuPauseProjectClicked;
@ -3382,7 +3382,7 @@ begin
end; end;
ecDetach: DebugBoss.Detach; ecDetach: DebugBoss.Detach;
ecBuild: DoBuildProject(crBuild, [pbfCleanCompile]); ecBuild: DoBuildProject(crBuild, [pbfCleanCompile]);
ecCleanUpCompiled: mnuCleanUpCompiledProjectClicked(nil); ecCleanUpAndBuild: mnuCleanUpAndBuildProjectClicked(nil);
ecQuickCompile: DoQuickCompile; ecQuickCompile: DoQuickCompile;
ecAbortBuild: DoAbortBuild; ecAbortBuild: DoAbortBuild;
ecBuildFile: DoBuildFile(false); ecBuildFile: DoBuildFile(false);
@ -3845,7 +3845,7 @@ begin
itmRunMenuCompile.Enabled:=aAllow; itmRunMenuCompile.Enabled:=aAllow;
itmRunMenuBuild.Enabled:=aAllow; itmRunMenuBuild.Enabled:=aAllow;
itmRunMenuQuickCompile.Enabled:=aAllow; itmRunMenuQuickCompile.Enabled:=aAllow;
itmRunMenuCleanUpCompiled.Enabled:=aAllow; itmRunMenuCleanUpAndBuild.Enabled:=aAllow;
itmPkgEditInstallPkgs.Enabled:=aAllow; itmPkgEditInstallPkgs.Enabled:=aAllow;
itmToolRescanFPCSrcDir.Enabled:=aAllow; itmToolRescanFPCSrcDir.Enabled:=aAllow;
itmToolBuildLazarus.Enabled:=aAllow; itmToolBuildLazarus.Enabled:=aAllow;
@ -4365,7 +4365,7 @@ begin
DoQuickCompile; DoQuickCompile;
end; end;
procedure TMainIDE.mnuCleanUpCompiledProjectClicked(Sender: TObject); procedure TMainIDE.mnuCleanUpAndBuildProjectClicked(Sender: TObject);
begin begin
if Project1=nil then exit; if Project1=nil then exit;
if Project1.MainUnitInfo=nil then begin if Project1.MainUnitInfo=nil then begin

2
ide/mainbar.pas
View File

@ -285,7 +285,7 @@ type
itmRunMenuCompile: TIDEMenuCommand; itmRunMenuCompile: TIDEMenuCommand;
itmRunMenuBuild: TIDEMenuCommand; itmRunMenuBuild: TIDEMenuCommand;
itmRunMenuQuickCompile: TIDEMenuCommand; itmRunMenuQuickCompile: TIDEMenuCommand;
itmRunMenuCleanUpCompiled: TIDEMenuCommand; itmRunMenuCleanUpAndBuild: TIDEMenuCommand;
itmRunMenuAbortBuild: TIDEMenuCommand; itmRunMenuAbortBuild: TIDEMenuCommand;
//itmRunnning: TIDEMenuSection; //itmRunnning: TIDEMenuSection;
itmRunMenuRun: TIDEMenuCommand; itmRunMenuRun: TIDEMenuCommand;

2
ide/mainbase.pas
View File

@ -925,7 +925,7 @@ begin
CreateMenuItem(ParentMI,itmRunMenuCompile,'itmRunMenuCompile',lisCompile,'menu_build'); CreateMenuItem(ParentMI,itmRunMenuCompile,'itmRunMenuCompile',lisCompile,'menu_build');
CreateMenuItem(ParentMI,itmRunMenuBuild,'itmRunMenuBuild',lisBuild,'menu_build_all'); CreateMenuItem(ParentMI,itmRunMenuBuild,'itmRunMenuBuild',lisBuild,'menu_build_all');
CreateMenuItem(ParentMI,itmRunMenuQuickCompile,'itmRunMenuQuickCompile',lisMenuQuickCompile,'menu_quick_compile'); CreateMenuItem(ParentMI,itmRunMenuQuickCompile,'itmRunMenuQuickCompile',lisMenuQuickCompile,'menu_quick_compile');
CreateMenuItem(ParentMI,itmRunMenuCleanUpCompiled,'itmRunMenuCleanUpCompiled',lisMenuCleanUpCompiled,'menu_build'); CreateMenuItem(ParentMI,itmRunMenuCleanUpAndBuild,'itmRunMenuCleanUpAndBuild',lisMenuCleanUpAndBuild,'menu_build');
CreateMenuItem(ParentMI,itmRunMenuAbortBuild,'itmRunMenuAbortBuild',lisMenuAbortBuild,'menu_abort_build'); CreateMenuItem(ParentMI,itmRunMenuAbortBuild,'itmRunMenuAbortBuild',lisMenuAbortBuild,'menu_abort_build');
CreateMenuSeparatorSection(mnuRun,itmRunnning,'itmRunnning'); CreateMenuSeparatorSection(mnuRun,itmRunnning,'itmRunnning');