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

Merge branch 'IDE/Options/Help' into 'main'

Browse Source 
IDE/Options: Help link fixes. Issues #41661, #41662

See merge request freepascal.org/lazarus/lazarus!481
This commit is contained in:
Maxim Ganetsky 2025-05-23 15:10:28 +03:00
commit 27c1e9c720
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/IDEWindowHelpTree.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG Name="IDE windows and dialogs" Path="IDE_Window:_" ChildCount="72"> <CONFIG Name="IDE windows and dialogs" Path="IDE_Window:_" ChildCount="74">
<Node1 Name="TObjectInspector" Path="Object_Inspector" HasHelp="True"/> <Node1 Name="TObjectInspector" Path="Object_Inspector" HasHelp="True"/>
<Node2 Name="TfrmCompilerOptions" Path="Compiler_Options" HasHelp="True" IsRoot="True" ChildCount="1"> <Node2 Name="TfrmCompilerOptions" Path="Compiler_Options" HasHelp="True" IsRoot="True" ChildCount="1">
<Node1 Name="MainNotebook" ChildCount="7"> <Node1 Name="MainNotebook" ChildCount="7">
@ -103,7 +103,7 @@
<Node2 Name="EditorsPanel" ChildCount="68"> <Node2 Name="EditorsPanel" ChildCount="68">
<Node1 Name="EditorMarkupUserDefinedFrame" Path="Editor_User_Defined_Words" HasHelp="True" IsRoot="True"/> <Node1 Name="EditorMarkupUserDefinedFrame" Path="Editor_User_Defined_Words" HasHelp="True" IsRoot="True"/>
<Node2 Name="CompOptModeMatrixFrame" Path="_Compiler_Options#Additions_and_Overrides" HasHelp="True" IsRoot="True"/> <Node2 Name="CompOptModeMatrixFrame" Path="_Compiler_Options#Additions_and_Overrides" HasHelp="True" IsRoot="True"/>
<Node3 Name="CompilerOtherOptionsFrame" Path="_Compiler_Options#Other" HasHelp="True" IsRoot="True"/> <Node3 Name="CompilerOtherOptionsFrame" Path="_Compiler_Options#Custom_Options" HasHelp="True" IsRoot="True"/>
<Node4 Name="CompilerMessagesOptionsFrame" Path="_Compiler_Options#Messages" HasHelp="True" IsRoot="True"/> <Node4 Name="CompilerMessagesOptionsFrame" Path="_Compiler_Options#Messages" HasHelp="True" IsRoot="True"/>
<Node5 Name="CompilerCompilationOptionsFrame" Path="_Compiler_Options#Compilation" HasHelp="True" IsRoot="True"/> <Node5 Name="CompilerCompilationOptionsFrame" Path="_Compiler_Options#Compilation" HasHelp="True" IsRoot="True"/>
<Node6 Name="CompilerVerbosityOptionsFrame" Path="_Compiler_Options#Verbosity" HasHelp="True" IsRoot="True"/> <Node6 Name="CompilerVerbosityOptionsFrame" Path="_Compiler_Options#Verbosity" HasHelp="True" IsRoot="True"/>
@ -198,4 +198,6 @@
<Node70 Name="TMacroListView" Path="Editor Macros" HasHelp="True" IsRoot="True"/> <Node70 Name="TMacroListView" Path="Editor Macros" HasHelp="True" IsRoot="True"/>
<Node71 Name="TShowCompilerOptionsDlg" Path="Show_Compiler_Options" HasHelp="True" IsRoot="True"/> <Node71 Name="TShowCompilerOptionsDlg" Path="Show_Compiler_Options" HasHelp="True" IsRoot="True"/>
<Node72 Name="TBuildModesForm" Path="_Project_Options#Build_modes" HasHelp="True" IsRoot="True"/> <Node72 Name="TBuildModesForm" Path="_Project_Options#Build_modes" HasHelp="True" IsRoot="True"/>
<Node73 Name="TDefinesGuiForm" Path="_Compiler_Options#Custom_Options" HasHelp="True" IsRoot="True"/>
<Node74 Name="TfrmAllCompilerOptions" Path="_Compiler_Options#Other" HasHelp="True" IsRoot="True"/>
</CONFIG> </CONFIG>

1
ide/allcompileroptions.lfm
View File

@ -37,6 +37,7 @@ object frmAllCompilerOptions: TfrmAllCompilerOptions
OKButton.DefaultCaption = True OKButton.DefaultCaption = True
HelpButton.Name = 'HelpButton' HelpButton.Name = 'HelpButton'
HelpButton.DefaultCaption = True HelpButton.DefaultCaption = True
HelpButton.OnClick = HelpButtonClick
CloseButton.Name = 'CloseButton' CloseButton.Name = 'CloseButton'
CloseButton.DefaultCaption = True CloseButton.DefaultCaption = True
CancelButton.Name = 'CancelButton' CancelButton.Name = 'CancelButton'

8
ide/allcompileroptions.pas
View File

@ -34,7 +34,7 @@ uses
// LazUtils // LazUtils
LazUTF8, LazLoggerBase, LazUTF8, LazLoggerBase,
// IdeIntf // IdeIntf
IDEImagesIntf, IDEWindowIntf, IDEImagesIntf, IDEWindowIntf, IDEHelpIntf,
// IDE // IDE
Compiler, LazarusIDEStrConsts; Compiler, LazarusIDEStrConsts;
@ -53,6 +53,7 @@ type
txtErrorMsg: TStaticText; txtErrorMsg: TStaticText;
procedure btnResetOptionsFilterClick(Sender: TObject); procedure btnResetOptionsFilterClick(Sender: TObject);
procedure cbShowModifiedClick(Sender: TObject); procedure cbShowModifiedClick(Sender: TObject);
procedure HelpButtonClick(Sender: TObject);
procedure sbMouseWheel(Sender: TObject; {%H-}Shift: TShiftState; procedure sbMouseWheel(Sender: TObject; {%H-}Shift: TShiftState;
WheelDelta: Integer; {%H-}MousePos: TPoint; var Handled: Boolean); WheelDelta: Integer; {%H-}MousePos: TPoint; var Handled: Boolean);
procedure edOptionsFilterChange(Sender: TObject); procedure edOptionsFilterChange(Sender: TObject);
@ -146,6 +147,11 @@ begin
IdleConnected := True; IdleConnected := True;
end; end;
procedure TfrmAllCompilerOptions.HelpButtonClick(Sender: TObject);
begin
LazarusHelp.ShowHelpForIDEControl(self);
end;
procedure TfrmAllCompilerOptions.SetIdleConnected(AValue: Boolean); procedure TfrmAllCompilerOptions.SetIdleConnected(AValue: Boolean);
begin begin
if csDestroying in ComponentState then if csDestroying in ComponentState then