paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-19 14:29:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

ide: remove compiler options menu item and key command

Browse Source 
git-svn-id: trunk@23539 -
This commit is contained in:
paul 2010-01-23 17:03:05 +00:00
parent 2679f82e51
commit 90d11eb2a2
5 changed files with 2 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ide/keymapping.pp
View File

@ -540,7 +540,6 @@ begin
ecRunToCursor: SetResult(VK_F4,[],VK_UNKNOWN,[]);
ecStopProgram: SetResult(VK_F2,[SSCtrl],VK_UNKNOWN,[]);
ecRemoveBreakPoint: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecCompilerOptions: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecRunParameters: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecBuildFile: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecRunFile: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
@ -961,7 +960,6 @@ begin
ecRunToCursor: SetResult(VK_F4,[],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecStopProgram: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecRemoveBreakPoint: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecCompilerOptions: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecRunParameters: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecBuildFile: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecRunFile: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]);
@ -1564,7 +1562,6 @@ begin
ecRunToCursor: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecStopProgram: SetResult(VK_RETURN,[ssShift,ssMeta],VK_UNKNOWN,[]);
ecRemoveBreakPoint: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecCompilerOptions: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecRunParameters: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecBuildFile: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecRunFile: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
@ -1727,7 +1724,6 @@ begin
ecRunToCursor: SetResult(VK_F4,[],VK_F4,[ssMeta]);
ecStopProgram: SetResult(VK_F2,[ssCtrl],VK_F2,[ssCtrl,ssMeta]);
ecRemoveBreakPoint: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecCompilerOptions: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecRunParameters: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecBuildFile: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecRunFile: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
@ -2081,7 +2077,6 @@ begin
ecStopProgram : Result:= srkmecStopProgram;
ecResetDebugger : Result:= srkmecResetDebugger;
ecRunParameters : Result:= srkmecRunParameters;
ecCompilerOptions : Result:= srkmecCompilerOptions;
ecBuildFile : Result:= srkmecBuildFile;
ecRunFile : Result:= srkmecRunFile;
ecConfigBuildFile : Result:= srkmecConfigBuildFile;
@ -2771,7 +2766,6 @@ begin
AddDefault(C, 'Run to cursor', lisMenuRunToCursor, ecRunToCursor);
AddDefault(C, 'Stop program', lisKMStopProgram, ecStopProgram);
AddDefault(C, 'Reset debugger', lisMenuResetDebugger, ecResetDebugger);
AddDefault(C, 'Compiler options', lisKMCompilerOptions, ecCompilerOptions);
AddDefault(C, 'Run parameters', dlgRunParameters, ecRunParameters);
AddDefault(C, 'Build File', lisMenuBuildFile, ecBuildFile);
AddDefault(C, 'Run File', lisMenuRunFile, ecRunFile);

32
ide/main.pp
View File

@ -285,7 +285,6 @@ type
procedure mnuRemoveFromProjectClicked(Sender: TObject);
procedure mnuViewProjectSourceClicked(Sender: TObject);
procedure mnuProjectOptionsClicked(Sender: TObject);
procedure mnuProjectCompilerSettingsClicked(Sender: TObject);
// run menu
procedure mnuBuildProjectClicked(Sender: TObject);
@ -2397,7 +2396,6 @@ begin
itmProjectPublish.OnClick := @mnuPublishProjectClicked;
itmProjectInspector.OnClick := @mnuProjectInspectorClicked;
itmProjectOptions.OnClick := @mnuProjectOptionsClicked;
itmProjectCompilerOptions.OnClick := @mnuProjectCompilerSettingsClicked;
itmProjectAddTo.OnClick := @mnuAddToProjectClicked;
itmProjectRemoveFrom.OnClick := @mnuRemoveFromProjectClicked;
itmProjectViewSource.OnClick := @mnuViewProjectSourceClicked;
@ -3866,36 +3864,6 @@ begin
DebugBoss.DoStopProject;
end;
procedure TMainIDE.mnuProjectCompilerSettingsClicked(Sender: TObject);
var
frmCompilerOptions: TfrmCompilerOptions;
NewCaption: String;
begin
frmCompilerOptions:=TfrmCompilerOptions.Create(nil);
try
Project1.UpdateExecutableType;
NewCaption:=Project1.Title;
if NewCaption='' then
NewCaption:=ExtractFilenameOnly(Project1.ProjectInfoFile);
frmCompilerOptions.Caption:=Format(lisCompilerOptionsForProject, [NewCaption
]);
frmCompilerOptions.CompilerOpts:=Project1.CompilerOptions;
frmCompilerOptions.LoadOptionsToForm;
if frmCompilerOptions.ShowModal=mrOk then begin
MainBuildBoss.RescanCompilerDefines(true,true);
Project1.DefineTemplates.AllChanged;
IncreaseCompilerParseStamp;
UpdateHighlighters; // because of FPC/Delphi mode
if frmCompilerOptions.UseAsDefault then begin
// save to primary config directory
Project1.CompilerOptions.SaveCompilerOptions(false);
end;
end;
finally
frmCompilerOptions.Free;
end;
end;
procedure TMainIDE.mnuBuildFileClicked(Sender: TObject);
begin
DoBuildFile;

2
ide/mainbar.pas
View File

@ -236,7 +236,7 @@ type
//itmProjectWindowSection: TIDEMenuSection;
itmProjectInspector: TIDEMenuCommand;
itmProjectOptions: TIDEMenuCommand;
itmProjectCompilerOptions: TIDEMenuCommand;
//itmProjectCompilerOptions: TIDEMenuCommand;
//itmProjectAddRemoveSection: TIDEMenuSection;
itmProjectAddTo: TIDEMenuCommand;
itmProjectRemoveFrom: TIDEMenuCommand;

2
ide/mainbase.pas
View File

@ -623,7 +623,6 @@ begin
CreateMenuItem(ParentMI,itmProjectInspector,'itmProjectInspector',lisMenuProjectInspector,'menu_project_inspector');
CreateMenuItem(ParentMI,itmProjectOptions,'itmProjectOptions',lisMenuProjectOptions,'menu_project_options');
CreateMenuItem(ParentMI,itmProjectCompilerOptions,'itmProjectCompilerOptions',lisMenuCompilerOptions,'menu_compiler_options');
CreateMenuSeparatorSection(mnuProject,itmProjectAddRemoveSection,'itmProjectAddRemoveSection');
ParentMI:=itmProjectAddRemoveSection;
@ -939,7 +938,6 @@ begin
itmProjectPublish.Command:=GetCommand(ecPublishProject);
itmProjectInspector.Command:=GetCommand(ecProjectInspector);
itmProjectOptions.Command:=GetCommand(ecProjectOptions);
itmProjectCompilerOptions.Command:=GetCommand(ecCompilerOptions);
itmProjectAddTo.Command:=GetCommand(ecAddCurUnitToProj);
itmProjectRemoveFrom.Command:=GetCommand(ecRemoveFromProj);
itmProjectViewSource.Command:=GetCommand(ecViewProjectSource);

2
ideintf/idecommands.pas
View File

@ -262,7 +262,7 @@ const
// option commmands
ecRunParameters = ecFirstLazarus + 800;
ecCompilerOptions = ecFirstLazarus + 801;
ecReserved0 = ecFirstLazarus + 801; // reserved
ecExtToolSettings = ecFirstLazarus + 802;
ecConfigBuildLazarus = ecFirstLazarus + 803;
ecEnvironmentOptions = ecFirstLazarus + 804;