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

IDE: Add hints and some tweaks to the options dialog. From n7800.

Browse Source
This commit is contained in:
Juha 2024-02-29 19:15:35 +02:00
parent e253e8cfb4
commit b8b0b042be
2 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ide/ideoptionsdlg.lfm
View File

@ -24,13 +24,16 @@ inherited IDEOptionsDialog: TIDEOptionsDialog
BorderSpacing.Bottom = 6
BorderSpacing.Around = 0
OKButton.Name = 'OKButton'
OKButton.Hint = '[Ctrl+Enter]'
OKButton.DefaultCaption = True
HelpButton.Name = 'HelpButton'
HelpButton.Hint = '[F1]'
HelpButton.DefaultCaption = True
CloseButton.Name = 'CloseButton'
CloseButton.DefaultCaption = True
CloseButton.Enabled = False
CancelButton.Name = 'CancelButton'
CancelButton.Hint = '[Esc]'
CancelButton.DefaultCaption = True
TabOrder = 4
ShowButtons = [pbOK, pbCancel, pbHelp]
@ -84,6 +87,7 @@ inherited IDEOptionsDialog: TIDEOptionsDialog
AnchorSideRight.Side = asrBottom
Left = 6
Height = 32
Hint = '[Ctrl+F]'
Top = 6
Width = 249
OnFilterItem = FilterEditFilterItem
@ -93,6 +97,8 @@ inherited IDEOptionsDialog: TIDEOptionsDialog
BorderSpacing.Top = 6
NumGlyphs = 1
MaxLength = 0
ParentShowHint = False
ShowHint = True
TabOrder = 0
FilteredTreeview = CategoryTree
ExpandAllInitially = True

48
ide/ideoptionsdlg.pas
View File

@ -167,9 +167,8 @@ begin
SetBuildModeVisibility(False);
btnApply := AddButton;
btnApply.LoadGlyphFromResource(idButtonRetry); // not the best glyph for this button
btnApply.LoadGlyphFromResource(idButtonRetry);
btnApply.OnClick := @ApplyButtonClick;
btnApply.Constraints.MinWidth := 75;
ButtonPanel.OKButton.OnClick := @OKButtonClick;
ButtonPanel.OKButton.ModalResult := mrNone;
ButtonPanel.CancelButton.OnClick := @CancelButtonClick;
@ -184,11 +183,8 @@ begin
btnApply.Caption := lisApply;
// hint
ButtonPanel.HelpButton.Hint := '[F1]';
ButtonPanel.CancelButton.Hint := '[Esc]';
ButtonPanel.OKButton.Hint := '[Ctrl+Enter]';
btnApply.Hint := '[Shift+Enter]';
ButtonPanel.ShowHint := true;
btnApply.Hint := '[Shift+Enter]';
BuildModeComboBox.DropDownCount := EnvironmentOptions.DropDownCount;
IDEDialogLayoutList.ApplyLayout(Self);
@ -257,7 +253,7 @@ begin
if Assigned(AEditor) then begin
AEditor.Align := alClient;
AEditor.BorderSpacing.Around := 6;
SetDropDownCount(AEditor); ///TEST
SetDropDownCount(AEditor);
AEditor.Visible := True;
end;
FPrevEditor := AEditor;
@ -276,24 +272,23 @@ end;
procedure TIDEOptionsDialog.BuildModeManageButtonClick(Sender: TObject);
begin
if ShowBuildModesDlg(Project1.SessionStorage in pssHasSeparateSession) <> mrOK then
exit;
UpdateBuildModeCombo(BuildModeComboBox);
if ShowBuildModesDlg(Project1.SessionStorage in pssHasSeparateSession) = mrOK then
UpdateBuildModeCombo(BuildModeComboBox);
end;
procedure TIDEOptionsDialog.CategoryTreeCollapsed(Sender: TObject; Node: TTreeNode);
begin
if node.Deleting then exit;
if (Node.Data <> nil) then
if Node.Deleting then exit;
if Assigned(Node.Data) then
TAbstractIDEOptionsEditor(Node.Data).Rec^.Collapsed := True
else
if (Node.GetFirstChild <> nil) and (Node.GetFirstChild.Data <> nil) then
else if Assigned(Node.GetFirstChild) and Assigned(Node.GetFirstChild.Data) then
TAbstractIDEOptionsEditor(Node.GetFirstChild.Data).GroupRec^.Collapsed := True;
end;
procedure TIDEOptionsDialog.CategoryTreeCustomDrawItem(Sender: TCustomTreeView;
Node: TTreeNode; State: TCustomDrawState; var DefaultDraw: Boolean);
begin
// make group categories bold
if Node.Data = nil then // is group category
Node.TreeView.Font.Style := [fsBold]
else
@ -303,10 +298,9 @@ end;
procedure TIDEOptionsDialog.CategoryTreeExpanded(Sender: TObject; Node: TTreeNode);
begin
if node.Deleting then exit;
if (Node.Data <> nil) then
if Assigned(Node.Data) then
TAbstractIDEOptionsEditor(Node.Data).Rec^.Collapsed := False
else
if (Node.GetFirstChild <> nil) and (Node.GetFirstChild.Data <> nil) then
else if Assigned(Node.GetFirstChild) and Assigned(Node.GetFirstChild.Data) then
TAbstractIDEOptionsEditor(Node.GetFirstChild.Data).GroupRec^.Collapsed := False;
end;
@ -417,9 +411,10 @@ begin
Break;
end;
// GroupRec is stored in the first child editor
Result := nil;
if Assigned(Node) then
Result := TAbstractIDEOptionsEditor(Node.GetFirstChild.Data).GroupRec^.GroupClass;
Result := TAbstractIDEOptionsEditor(Node.GetFirstChild.Data).GroupRec^.GroupClass
else
Result := nil;
end;
procedure TIDEOptionsDialog.TraverseSettings(AOptions: TAbstractIDEOptions;
@ -791,7 +786,7 @@ begin
Result := TBitBtn.Create(Self);
Result.Align := alCustom;
Result.Default := false;
Result.Constraints.MinWidth := 25;
Result.Constraints.MinWidth := 75;
Result.AutoSize := true;
Result.Parent := ButtonPanel;
end;
@ -872,15 +867,10 @@ var
begin
Result:=nil;
Grp:=IDEEditorGroups.GetByIndex(GroupIndex);
if (Grp=nil) or (Grp^.Items=nil) then exit;
for i:=0 to Grp^.Items.Count-1 do
begin
if Grp^.Items[i]^.Index=AIndex then
begin
Result:=Grp^.Items[i]^.EditorClass;
exit;
end;
end;
if Assigned(Grp) and Assigned(Grp^.Items) then
for i:=0 to Grp^.Items.Count-1 do
if Grp^.Items[i]^.Index=AIndex then
exit(Grp^.Items[i]^.EditorClass);
end;
function TIDEOptionsDialog.ResetFilter: Boolean;