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

IDE/Options: When calling help in a filter, show help for the open options frame. Issue #41662

Browse Source
This commit is contained in:
n7800 2025-06-02 00:08:25 +05:00
parent b91a269d8d
commit e07b3a7234
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ide/ideoptionsdlg.lfm
View File

@ -112,7 +112,6 @@ inherited IDEOptionsDialog: TIDEOptionsDialog
OnCollapsed = CategoryTreeCollapsed OnCollapsed = CategoryTreeCollapsed
OnCustomDrawItem = CategoryTreeCustomDrawItem OnCustomDrawItem = CategoryTreeCustomDrawItem
OnExpanded = CategoryTreeExpanded OnExpanded = CategoryTreeExpanded
OnKeyDown = CategoryTreeKeyDown
end end
end end
end end

42
ide/ideoptionsdlg.pas
View File

@ -84,7 +84,6 @@ type
procedure CategoryTreeCustomDrawItem(Sender: TCustomTreeView; procedure CategoryTreeCustomDrawItem(Sender: TCustomTreeView;
Node: TTreeNode; {%H-}State: TCustomDrawState; var {%H-}DefaultDraw: Boolean); Node: TTreeNode; {%H-}State: TCustomDrawState; var {%H-}DefaultDraw: Boolean);
procedure CategoryTreeExpanded(Sender: TObject; Node: TTreeNode); procedure CategoryTreeExpanded(Sender: TObject; Node: TTreeNode);
procedure CategoryTreeKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
function FilterEditFilterItem(ItemData: Pointer; out Done: Boolean): Boolean; function FilterEditFilterItem(ItemData: Pointer; out Done: Boolean): Boolean;
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction); procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
@ -228,14 +227,6 @@ begin
UpdateBuildModeGUI; UpdateBuildModeGUI;
end; end;
procedure TIDEOptionsDialog.HelpButtonClick(Sender: TObject);
begin
if FPrevEditor<>nil then
LazarusHelp.ShowHelpForIDEControl(FPrevEditor)
else
LazarusHelp.ShowHelpForIDEControl(Self);
end;
procedure TIDEOptionsDialog.CategoryTreeChange(Sender: TObject; Node: TTreeNode); procedure TIDEOptionsDialog.CategoryTreeChange(Sender: TObject; Node: TTreeNode);
var var
GroupClass: TAbstractIDEOptionsClass; GroupClass: TAbstractIDEOptionsClass;
@ -335,18 +326,6 @@ begin
TAbstractIDEOptionsEditor(Node.GetFirstChild.Data).GroupRec^.Collapsed := False; TAbstractIDEOptionsEditor(Node.GetFirstChild.Data).GroupRec^.Collapsed := False;
end; end;
procedure TIDEOptionsDialog.CategoryTreeKeyDown(Sender: TObject; var Key: Word;
Shift: TShiftState);
var
Command: Word;
begin
Command := EditorOpts.KeyMap.TranslateKey(Key,Shift,nil);
if (Command=ecContextHelp) and (FPrevEditor <> nil) then begin
Key:=VK_UNKNOWN;
LazarusHelp.ShowHelpForIDEControl(FPrevEditor);
end;
end;
function TIDEOptionsDialog.FilterEditFilterItem(ItemData: Pointer; out Done: Boolean): Boolean; function TIDEOptionsDialog.FilterEditFilterItem(ItemData: Pointer; out Done: Boolean): Boolean;
var var
OptEditor: TAbstractIDEOptionsEditor; OptEditor: TAbstractIDEOptionsEditor;
@ -365,10 +344,29 @@ begin
IDEDialogLayoutList.SaveLayout(self); IDEDialogLayoutList.SaveLayout(self);
end; end;
procedure TIDEOptionsDialog.HelpButtonClick(Sender: TObject);
begin
if assigned(FPrevEditor) then
LazarusHelp.ShowHelpForIDEControl(FPrevEditor)
else
LazarusHelp.ShowHelpForIDEControl(self);
end;
procedure TIDEOptionsDialog.FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); procedure TIDEOptionsDialog.FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
begin begin
// help
if EditorOpts.KeyMap.TranslateKey(Key, Shift, nil) = ecContextHelp then
begin
// in these controls, show help for open options frame
if FilterEdit.Focused or CategoryTree.Focused then
begin
HelpButtonClick(Sender);
Key := 0;
end;
end
// dialog // dialog
if (Key = VK_ESCAPE) and (Shift = []) then else if (Key = VK_ESCAPE) and (Shift = []) then
begin begin
CancelButtonClick(Sender); CancelButtonClick(Sender);
Key := 0; Key := 0;