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

IDE: do not show build modes on package options, that is too confusing

Browse Source 
git-svn-id: trunk@41679 -
This commit is contained in:
mattias 2013-06-11 16:38:33 +00:00
parent 2334f84a57
commit 31bb5200d0
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ide/buildmodesmanager.pas
View File

@ -95,7 +95,7 @@ var
OnSaveIDEOptionsHook: TOnSaveIDEOptions; OnSaveIDEOptionsHook: TOnSaveIDEOptions;
function ShowBuildModesDlg(aShowSession: Boolean): TModalResult; function ShowBuildModesDlg(aShowSession: Boolean): TModalResult;
procedure SwitchBuildMode(aBuildModeID: string); procedure SwitchBuildMode(aBuildModeID: string; LoadSaveProjectOptions: boolean);
procedure UpdateBuildModeCombo(aCombo: TComboBox); procedure UpdateBuildModeCombo(aCombo: TComboBox);
@ -135,12 +135,15 @@ begin
end; end;
end; end;
procedure SwitchBuildMode(aBuildModeID: string); procedure SwitchBuildMode(aBuildModeID: string;
LoadSaveProjectOptions: boolean);
begin begin
OnSaveIDEOptionsHook(Nil, Project1.CompilerOptions); // Save changes if LoadSaveProjectOptions then
OnSaveIDEOptionsHook(Nil, Project1.CompilerOptions); // Save changes
Project1.ActiveBuildModeID := aBuildModeID; // Switch Project1.ActiveBuildModeID := aBuildModeID; // Switch
IncreaseBuildMacroChangeStamp; IncreaseBuildMacroChangeStamp;
OnLoadIDEOptionsHook(Nil, Project1.CompilerOptions); // Load options if LoadSaveProjectOptions then
OnLoadIDEOptionsHook(Nil, Project1.CompilerOptions); // Load options
end; end;
procedure UpdateBuildModeCombo(aCombo: TComboBox); procedure UpdateBuildModeCombo(aCombo: TComboBox);

13
ide/ideoptionsdlg.pas
View File

@ -85,6 +85,7 @@ type
FPrevEditor: TAbstractIDEOptionsEditor; FPrevEditor: TAbstractIDEOptionsEditor;
FSelectNode: TTreeNode; FSelectNode: TTreeNode;
FSettings: TIDEOptionsEditorSettings; FSettings: TIDEOptionsEditorSettings;
FShowBuildModes: boolean;
function FindGroupClass(Node: TTreeNode): TAbstractIDEOptionsClass; function FindGroupClass(Node: TTreeNode): TAbstractIDEOptionsClass;
procedure TraverseSettings(AOptions: TAbstractIDEOptions; anAction: TIDEOptsDlgAction); procedure TraverseSettings(AOptions: TAbstractIDEOptions; anAction: TIDEOptsDlgAction);
function CheckValues: boolean; function CheckValues: boolean;
@ -132,7 +133,7 @@ begin
FEditorsCreated := False; FEditorsCreated := False;
FEditorToOpen := nil; FEditorToOpen := nil;
SettingsPanel.Constraints.MinHeight:=0; SettingsPanel.Constraints.MinHeight:=0;
BuildModeSelectPanel.Height:=0; BuildModeSelectPanel.Visible:=false;
BuildModeLabel.Caption:=lisBuildMode; BuildModeLabel.Caption:=lisBuildMode;
BuildModeInSessionCheckBox.Caption:=lisInSession; BuildModeInSessionCheckBox.Caption:=lisInSession;
BuildModeInSessionCheckBox.Hint:= BuildModeInSessionCheckBox.Hint:=
@ -198,11 +199,11 @@ begin
AEditor := TAbstractIDEOptionsEditor(Node.Data); AEditor := TAbstractIDEOptionsEditor(Node.Data);
GroupClass := FindGroupClass(Node); GroupClass := FindGroupClass(Node);
end; end;
// Show the Build Mode panel for Compiler Options // Show the Build Mode panel for project compiler options
if (GroupClass <> nil) and (GroupClass.InheritsFrom(TLazCompilerOptions)) then if (GroupClass <> nil) and (GroupClass.InheritsFrom(TProjectCompilerOptions)) then
BuildModeSelectPanel.Height:=40 BuildModeSelectPanel.Visible:=true
else else
BuildModeSelectPanel.Height:=0; BuildModeSelectPanel.Visible:=false;
// Hide the old and show the new editor frame // Hide the old and show the new editor frame
if Assigned(AEditor) then if Assigned(AEditor) then
FNewLastSelected := AEditor.Rec; FNewLastSelected := AEditor.Rec;
@ -225,7 +226,7 @@ begin
BuildModeInSessionCheckBox.Enabled:=false; BuildModeInSessionCheckBox.Enabled:=false;
end end
else begin else begin
SwitchBuildMode(BuildModeComboBox.Text); SwitchBuildMode(BuildModeComboBox.Text,BuildModeSelectPanel.Visible);
end; end;
end; end;