From 975c46a7fa0fdaa26eb8ccd1ac5efde03f5df0b2 Mon Sep 17 00:00:00 2001 From: n7800 <14154601-n7800@users.noreply.gitlab.com> Date: Sun, 22 Jun 2025 15:55:15 +0500 Subject: [PATCH] Packager: Cleaning up unnecessary help button code --- packager/addfiletoapackagedlg.pas | 9 +-------- packager/installpkgsetdlg.lfm | 1 - packager/installpkgsetdlg.pas | 8 +------- packager/openinstalledpkgdlg.lfm | 1 - packager/openinstalledpkgdlg.pas | 8 +------- packager/packageeditor.pas | 10 ++-------- 6 files changed, 5 insertions(+), 32 deletions(-) diff --git a/packager/addfiletoapackagedlg.pas b/packager/addfiletoapackagedlg.pas index 44fffd00b8..f49d746e87 100644 --- a/packager/addfiletoapackagedlg.pas +++ b/packager/addfiletoapackagedlg.pas @@ -45,7 +45,7 @@ uses // LazUtils FileUtil, LazFileUtils, // IdeIntf - IdeIntfStrConsts, IDEWindowIntf, PackageIntf, IDEHelpIntf, + IdeIntfStrConsts, IDEWindowIntf, PackageIntf, // IDE LazarusIDEStrConsts, PackageDefs, PackageSystem, EnvironmentOpts; @@ -63,7 +63,6 @@ type procedure AddFileToAPackageDlgClose(Sender: TObject; var {%H-}CloseAction: TCloseAction); procedure FormCreate(Sender: TObject); - procedure HelpButtonClick(Sender: TObject); procedure OkButtonClick(Sender: TObject); procedure PackagesGroupBoxResize(Sender: TObject); procedure ShowAllCheckBoxClick(Sender: TObject); @@ -106,11 +105,6 @@ begin IDEDialogLayoutList.SaveLayout(Self); end; -procedure TAddFileToAPackageDialog.HelpButtonClick(Sender: TObject); -begin - LazarusHelp.ShowHelpForIDEControl(Self); -end; - procedure TAddFileToAPackageDialog.OkButtonClick(Sender: TObject); var PkgID: TLazPackageID; @@ -185,7 +179,6 @@ begin BtnPanel.OkButton.Caption:=lisBtnOk; BtnPanel.OkButton.OnClick:=@OkButtonClick; BtnPanel.OkButton.ModalResult:=mrNone; - BtnPanel.HelpButton.OnClick:=@HelpButtonClick; end; procedure TAddFileToAPackageDialog.SetFilename(const AValue: string); diff --git a/packager/installpkgsetdlg.lfm b/packager/installpkgsetdlg.lfm index 1589a7370b..11fc0389b0 100644 --- a/packager/installpkgsetdlg.lfm +++ b/packager/installpkgsetdlg.lfm @@ -98,7 +98,6 @@ object InstallPkgSetDialog: TInstallPkgSetDialog Constraints.MinWidth = 75 Kind = bkHelp TabOrder = 0 - OnClick = HelpButtonClick end object CancelButton: TBitBtn Left = 519 diff --git a/packager/installpkgsetdlg.pas b/packager/installpkgsetdlg.pas index 778d32f92c..04c5eda329 100644 --- a/packager/installpkgsetdlg.pas +++ b/packager/installpkgsetdlg.pas @@ -50,7 +50,7 @@ uses // BuildIntf PackageIntf, PackageLinkIntf, PackageDependencyIntf, // IdeIntf - IDEImagesIntf, IdeIntfStrConsts, IDEHelpIntf, IDEDialogs, IDEWindowIntf, InputHistory, + IDEImagesIntf, IdeIntfStrConsts, IDEDialogs, IDEWindowIntf, InputHistory, // IdeUtils IdeUtilsPkgStrConsts, // IdeProject @@ -107,7 +107,6 @@ type var PaintImages, {%H-}DefaultDraw: Boolean); procedure AvailableTreeViewSelectionChanged(Sender: TObject); procedure ExportButtonClick(Sender: TObject); - procedure HelpButtonClick(Sender: TObject); procedure ImportButtonClick(Sender: TObject); procedure SaveAndRebuildButtonClick(Sender: TObject); procedure InstallPkgSetDialogCreate(Sender: TObject); @@ -329,11 +328,6 @@ begin end; end; -procedure TInstallPkgSetDialog.HelpButtonClick(Sender: TObject); -begin - LazarusHelp.ShowHelpForIDEControl(Self); -end; - procedure TInstallPkgSetDialog.ImportButtonClick(Sender: TObject); var OpenDialog: TOpenDialog; diff --git a/packager/openinstalledpkgdlg.lfm b/packager/openinstalledpkgdlg.lfm index 3c032f72b1..cda42178e6 100644 --- a/packager/openinstalledpkgdlg.lfm +++ b/packager/openinstalledpkgdlg.lfm @@ -69,7 +69,6 @@ object OpenLoadedPackagesDlg: TOpenLoadedPackagesDlg OKButton.OnClick = OpenButtonClick HelpButton.Name = 'HelpButton' HelpButton.DefaultCaption = True - HelpButton.OnClick = HelpButtonClick CloseButton.Name = 'CloseButton' CloseButton.DefaultCaption = True CancelButton.Name = 'CancelButton' diff --git a/packager/openinstalledpkgdlg.pas b/packager/openinstalledpkgdlg.pas index 7493359461..e3631bf3ca 100644 --- a/packager/openinstalledpkgdlg.pas +++ b/packager/openinstalledpkgdlg.pas @@ -39,7 +39,7 @@ uses // LazControls ListViewFilterEdit, // IdeIntf - IDEHelpIntf, IDEWindowIntf, PackageIntf, + IDEWindowIntf, PackageIntf, // IDE PackageDefs, LazarusIDEStrConsts, PackageSystem; @@ -55,7 +55,6 @@ type Splitter1: TSplitter; procedure FormClose(Sender: TObject; var {%H-}CloseAction: TCloseAction); procedure FormCreate(Sender: TObject); - procedure HelpButtonClick(Sender: TObject); procedure OpenButtonClick(Sender: TObject); procedure PkgListViewDblClick(Sender: TObject); procedure PkgListViewKeyPress(Sender: TObject; var Key: char); @@ -177,11 +176,6 @@ begin IDEDialogLayoutList.SaveLayout(Self); end; -procedure TOpenLoadedPackagesDlg.HelpButtonClick(Sender: TObject); -begin - LazarusHelp.ShowHelpForIDEControl(Self); -end; - function PkgStateToString(APackage: TLazPackage): string; procedure AddState(const s: string); diff --git a/packager/packageeditor.pas b/packager/packageeditor.pas index 0bc272625d..46de60ffe7 100644 --- a/packager/packageeditor.pas +++ b/packager/packageeditor.pas @@ -47,7 +47,7 @@ uses ProjectIntf, PackageDependencyIntf, PackageIntf, PackageLinkIntf, IDEOptionsIntf, NewItemIntf, ComponentReg, // IDEIntf - IDEImagesIntf, MenuIntf, LazIDEIntf, FormEditingIntf, IDEHelpIntf, InputHistory, + IDEImagesIntf, MenuIntf, LazIDEIntf, FormEditingIntf, InputHistory, IdeIntfStrConsts, IDEWindowIntf, IDEDialogs, IDEOptEditorIntf, SrcEditorIntf, // IdeConfig EnvironmentOpts, SearchPathProcs, ParsedCompilerOpts, CompilerOptions, @@ -235,7 +235,6 @@ type procedure ItemsTreeViewDblClick(Sender: TObject); procedure ItemsTreeViewSelectionChanged(Sender: TObject); procedure FixFilesCaseMenuItemClick(Sender: TObject); - procedure HelpBitBtnClick(Sender: TObject); procedure InstallClick(Sender: TObject); procedure MoveDownBtnClick(Sender: TObject); procedure MoveUpBtnClick(Sender: TObject); @@ -1160,11 +1159,6 @@ begin UpdateButtons; end; -procedure TPackageEditorForm.HelpBitBtnClick(Sender: TObject); -begin - LazarusHelp.ShowHelpForIDEControl(Self); -end; - procedure TPackageEditorForm.InstallClick(Sender: TObject); begin PackageEditors.InstallPackage(LazPackage); @@ -1981,7 +1975,7 @@ begin RemoveBitBtn := CreateToolButton('RemoveBitBtn', lisRemove, lisPckEditRemoveSelectedItem, 'laz_delete', @RemoveBitBtnClick); CreateDivider; OptionsBitBtn := CreateToolButton('OptionsBitBtn', lisOptions, lisPckEditEditGeneralOptions, 'pkg_properties', @OptionsBitBtnClick); - HelpBitBtn := CreateToolButton('HelpBitBtn', GetButtonCaption(idButtonHelp), lisMenuOnlineHelp, 'btn_help', @HelpBitBtnClick); + HelpBitBtn := CreateToolButton('HelpButton', GetButtonCaption(idButtonHelp), lisMenuOnlineHelp, 'btn_help', nil); MoreBitBtn := CreateToolButton('MoreBitBtn', lisMoreSub, lisPkgEdMoreFunctionsForThePackage, '', nil); MoreBitBtn.Style:=tbsButtonDrop;