LazStats: Remove Cancel button from SpBrUnit. Add text from pdf to chm help file.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7393 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2020-04-18 21:43:43 +00:00
parent 66ad457a1c
commit 2d80d005dd
4 changed files with 53 additions and 58 deletions

View File

@ -15,90 +15,72 @@ object SpBrFrm: TSpBrFrm
object ResetBtn: TButton
AnchorSideTop.Control = Bevel1
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = CancelBtn
Left = 172
AnchorSideRight.Control = ComputeBtn
Left = 264
Height = 25
Top = 101
Top = 111
Width = 54
Anchors = [akTop, akRight]
AutoSize = True
BorderSpacing.Left = 12
BorderSpacing.Left = 8
BorderSpacing.Top = 8
BorderSpacing.Right = 12
BorderSpacing.Right = 8
BorderSpacing.Bottom = 8
Caption = 'Reset'
OnClick = ResetBtnClick
TabOrder = 2
end
object CancelBtn: TButton
AnchorSideTop.Control = Bevel1
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = ComputeBtn
Left = 238
Height = 25
Top = 101
Width = 62
Anchors = [akTop, akRight]
AutoSize = True
BorderSpacing.Left = 12
BorderSpacing.Top = 8
BorderSpacing.Right = 12
BorderSpacing.Bottom = 8
Caption = 'Cancel'
ModalResult = 2
TabOrder = 3
end
object ComputeBtn: TButton
AnchorSideTop.Control = Bevel1
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = ReturnBtn
Left = 312
AnchorSideRight.Control = CloseBtn
Left = 326
Height = 25
Top = 101
Top = 111
Width = 76
Anchors = [akTop, akRight]
AutoSize = True
BorderSpacing.Left = 12
BorderSpacing.Left = 8
BorderSpacing.Top = 8
BorderSpacing.Right = 12
BorderSpacing.Right = 8
BorderSpacing.Bottom = 8
Caption = 'Compute'
OnClick = ComputeBtnClick
TabOrder = 4
TabOrder = 3
end
object ReturnBtn: TButton
object CloseBtn: TButton
AnchorSideTop.Control = Bevel1
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 400
Left = 410
Height = 25
Top = 101
Width = 61
Top = 111
Width = 55
Anchors = [akTop, akRight]
AutoSize = True
BorderSpacing.Left = 12
BorderSpacing.Left = 8
BorderSpacing.Top = 8
BorderSpacing.Right = 12
BorderSpacing.Right = 8
BorderSpacing.Bottom = 8
Caption = 'Return'
ModalResult = 1
TabOrder = 5
Caption = 'Close'
ModalResult = 11
TabOrder = 4
end
object HelpBtn: TButton
Tag = 147
AnchorSideTop.Control = Bevel1
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = ResetBtn
Left = 109
Left = 205
Height = 25
Top = 101
Top = 111
Width = 51
Anchors = [akTop, akRight]
AutoSize = True
BorderSpacing.Left = 12
BorderSpacing.Left = 8
BorderSpacing.Top = 8
BorderSpacing.Right = 12
BorderSpacing.Right = 8
BorderSpacing.Bottom = 8
Caption = 'Help'
OnClick = HelpBtnClick
@ -109,15 +91,15 @@ object SpBrFrm: TSpBrFrm
AnchorSideLeft.Side = asrCenter
AnchorSideTop.Control = Owner
Left = 120
Height = 77
Height = 87
Top = 8
Width = 233
AutoSize = True
BorderSpacing.Left = 12
BorderSpacing.Left = 16
BorderSpacing.Top = 8
BorderSpacing.Right = 12
BorderSpacing.Right = 16
BevelOuter = bvNone
ClientHeight = 77
ClientHeight = 87
ClientWidth = 233
TabOrder = 0
object Label1: TLabel
@ -152,7 +134,7 @@ object SpBrFrm: TSpBrFrm
AnchorSideRight.Control = NewRelEdit
Left = 21
Height = 15
Top = 58
Top = 68
Width = 129
Anchors = [akTop, akRight]
BorderSpacing.Right = 8
@ -190,23 +172,36 @@ object SpBrFrm: TSpBrFrm
end
object NewRelEdit: TEdit
AnchorSideLeft.Control = OldRelEdit
AnchorSideTop.Control = MultKEdit
AnchorSideTop.Control = Bevel2
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Panel1
AnchorSideRight.Side = asrBottom
Left = 158
Height = 23
Top = 54
Top = 64
Width = 75
Alignment = taRightJustify
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 4
BorderSpacing.Top = 6
Font.Style = [fsBold]
ParentFont = False
ReadOnly = True
TabOrder = 2
Text = 'Edit1'
end
object Bevel2: TBevel
AnchorSideLeft.Control = Panel1
AnchorSideTop.Control = MultKEdit
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Panel1
AnchorSideRight.Side = asrBottom
Left = 0
Height = 8
Top = 50
Width = 233
Anchors = [akTop, akLeft, akRight]
Shape = bsBottomLine
end
end
object Bevel1: TBevel
AnchorSideLeft.Control = Owner
@ -216,7 +211,7 @@ object SpBrFrm: TSpBrFrm
AnchorSideRight.Side = asrBottom
Left = 0
Height = 8
Top = 85
Top = 95
Width = 473
Anchors = [akTop, akLeft, akRight]
Shape = bsBottomLine

View File

@ -15,12 +15,12 @@ type
TSpBrFrm = class(TForm)
Bevel1: TBevel;
Bevel2: TBevel;
HelpBtn: TButton;
Panel1: TPanel;
ResetBtn: TButton;
CancelBtn: TButton;
ComputeBtn: TButton;
ReturnBtn: TButton;
CloseBtn: TButton;
OldRelEdit: TEdit;
MultKEdit: TEdit;
NewRelEdit: TEdit;
@ -59,11 +59,11 @@ procedure TSpBrFrm.FormActivate(Sender: TObject);
var
w: Integer;
begin
w := MaxValue([ResetBtn.Width, CancelBtn.Width, ComputeBtn.Width, ReturnBtn.Width]);
w := MaxValue([ResetBtn.Width, ComputeBtn.Width, CloseBtn.Width, HelpBtn.Width]);
HelpBtn.Constraints.MinWidth := w;
ResetBtn.Constraints.MinWidth := w;
CancelBtn.Constraints.MinWidth := w;
ComputeBtn.Constraints.MinWidth := w;
ReturnBtn.Constraints.MinWidth := w;
CloseBtn.Constraints.MinWidth := w;
Constraints.MaxHeight := Height;
Constraints.MinHeight := Height;
@ -78,12 +78,12 @@ procedure TSpBrFrm.HelpBtnClick(Sender: TObject);
begin
if ContextHelpForm = nil then
Application.CreateForm(TContextHelpForm, ContextHelpForm);
ContextHelpForm.HelpMessage((Sender as TButton).tag);
ContextHelpForm.HelpMessage((Sender as TButton).Tag);
end;
procedure TSpBrFrm.ComputeBtnClick(Sender: TObject);
var
oldrel, newrel, Factor : double;
oldrel, newrel, Factor: double;
begin
oldrel := StrToFloat(OldRelEdit.Text);
Factor := StrToFloat(MultKEdit.Text);