From c9e2e06abefb3d66a5d5514e897fb77ef9468010 Mon Sep 17 00:00:00 2001 From: Maxim Ganetsky Date: Mon, 27 Nov 2023 02:38:15 +0300 Subject: [PATCH] IDE: cleanup of GenericCheckListForm/GenericListEditorForm/GenericListSelectForm, patch from n7800 --- ide/genericchecklist.lfm | 1 - ide/genericchecklist.pas | 20 ++------------------ ide/genericlisteditor.pas | 9 +-------- ide/genericlistselect.lfm | 1 - ide/genericlistselect.pas | 22 ++-------------------- 5 files changed, 5 insertions(+), 48 deletions(-) diff --git a/ide/genericchecklist.lfm b/ide/genericchecklist.lfm index d9b4fafb9c..9a9ccd9601 100644 --- a/ide/genericchecklist.lfm +++ b/ide/genericchecklist.lfm @@ -52,7 +52,6 @@ object GenericCheckListForm: TGenericCheckListForm Width = 331 Align = alTop BorderSpacing.Around = 6 - Caption = 'InfoLabel' ParentColor = False WordWrap = True end diff --git a/ide/genericchecklist.pas b/ide/genericchecklist.pas index 039b4ec12d..8cc6302dd8 100644 --- a/ide/genericchecklist.pas +++ b/ide/genericchecklist.pas @@ -24,33 +24,22 @@ type fActionBtn: TBitBtn; procedure UpdateButtons; public - constructor Create(TheOwner: TComponent); override; constructor CreateWithActionButton(aCaption: TCaption; aResourceGlyphName: string = ''); - destructor Destroy; override; end; -var - GenericCheckListForm: TGenericCheckListForm; - implementation {$R *.lfm} { TGenericCheckListForm } -constructor TGenericCheckListForm.Create(TheOwner: TComponent); -begin - inherited Create(TheOwner); - InfoLabel.Caption := ''; -end; - constructor TGenericCheckListForm.CreateWithActionButton(aCaption: TCaption; aResourceGlyphName: string); begin - Create(Nil); + inherited Create(nil); fActionBtn := TBitBtn.Create(ButtonPanel1); fActionBtn.Caption := aCaption; - fActionBtn.ModalResult := mrYes; // ActionButton will return mrYes. + fActionBtn.ModalResult := mrYes; // ActionButton will return mrYes. fActionBtn.Align := alRight; fActionBtn.BorderSpacing.Left := 6; fActionBtn.BorderSpacing.Right := 6; @@ -60,11 +49,6 @@ begin fActionBtn.Parent := ButtonPanel1; end; -destructor TGenericCheckListForm.Destroy; -begin - inherited Destroy; -end; - procedure TGenericCheckListForm.FormShow(Sender: TObject); begin UpdateButtons; diff --git a/ide/genericlisteditor.pas b/ide/genericlisteditor.pas index 431621a66d..4b85bc1f3c 100644 --- a/ide/genericlisteditor.pas +++ b/ide/genericlisteditor.pas @@ -14,14 +14,7 @@ type TGenericListEditForm = class(TForm) ButtonPanel1: TButtonPanel; Memo1: TMemo; - private - - public - - end; - -var - GenericListEditForm: TGenericListEditForm; + end; implementation diff --git a/ide/genericlistselect.lfm b/ide/genericlistselect.lfm index 9a41244c0d..3d2a003f09 100644 --- a/ide/genericlistselect.lfm +++ b/ide/genericlistselect.lfm @@ -35,7 +35,6 @@ object GenericListSelectForm: TGenericListSelectForm Width = 454 Align = alTop BorderSpacing.Around = 6 - Caption = 'InfoLabel' ParentColor = False WordWrap = True end diff --git a/ide/genericlistselect.pas b/ide/genericlistselect.pas index e7a441a9ad..6a2df737dc 100644 --- a/ide/genericlistselect.pas +++ b/ide/genericlistselect.pas @@ -21,31 +21,14 @@ type procedure ListBoxDblClick(Sender: TObject); private procedure UpdateButtons; - public - constructor Create(TheOwner: TComponent); override; - destructor Destroy; override; end; -var - GenericListSelectForm: TGenericListSelectForm; - implementation {$R *.lfm} { TGenericListSelectForm } -constructor TGenericListSelectForm.Create(TheOwner: TComponent); -begin - inherited Create(TheOwner); - InfoLabel.Caption := ''; -end; - -destructor TGenericListSelectForm.Destroy; -begin - inherited Destroy; -end; - procedure TGenericListSelectForm.FormShow(Sender: TObject); begin UpdateButtons; @@ -58,14 +41,13 @@ end; procedure TGenericListSelectForm.ListBoxDblClick(Sender: TObject); begin - if ListBox.ItemIndex > -1 then - ModalResult:=mrOK; + if ListBox.ItemIndex >= 0 then + ModalResult := mrOK; end; procedure TGenericListSelectForm.UpdateButtons; begin ButtonPanel1.OKButton.Enabled := ListBox.ItemIndex >= 0; - //ListBox.Selected[1]; end; end.