From 6eb21d1873131a106890a2f4bb2f923884a39c3b Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Mon, 5 Oct 2020 20:11:41 +0000 Subject: [PATCH] LazStats: Fix TabOrder git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7747 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../analysis/descriptive/boxplotunit.lfm | 8 ++-- .../analysis/descriptive/bubbleplotunit.lfm | 13 +++--- .../analysis/descriptive/descriptiveunit.lfm | 45 +++++++++---------- .../analysis/descriptive/normalityunit.lfm | 39 ++++++---------- .../analysis/descriptive/normalityunit.pas | 7 ++- .../forms/analysis/descriptive/plotxyunit.lfm | 27 ++++++----- .../analysis/descriptive/xvsmultyunit.lfm | 8 ++-- 7 files changed, 69 insertions(+), 78 deletions(-) diff --git a/applications/lazstats/source/forms/analysis/descriptive/boxplotunit.lfm b/applications/lazstats/source/forms/analysis/descriptive/boxplotunit.lfm index 98ae760cc..10420878f 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/boxplotunit.lfm +++ b/applications/lazstats/source/forms/analysis/descriptive/boxplotunit.lfm @@ -16,22 +16,22 @@ inherited BoxPlotFrm: TBoxPlotFrm inherited CloseBtn: TButton Left = 278 Top = 459 - TabOrder = 7 + TabOrder = 10 end inherited ComputeBtn: TButton Left = 195 Top = 459 - TabOrder = 8 + TabOrder = 9 end inherited ResetBtn: TButton Left = 133 Top = 459 - TabOrder = 9 + TabOrder = 8 end inherited HelpBtn: TButton Left = 74 Top = 459 - TabOrder = 10 + TabOrder = 7 end inherited ButtonBevel: TBevel Top = 443 diff --git a/applications/lazstats/source/forms/analysis/descriptive/bubbleplotunit.lfm b/applications/lazstats/source/forms/analysis/descriptive/bubbleplotunit.lfm index 9cd14189b..7fff22ffc 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/bubbleplotunit.lfm +++ b/applications/lazstats/source/forms/analysis/descriptive/bubbleplotunit.lfm @@ -16,19 +16,22 @@ inherited BubbleForm: TBubbleForm inherited CloseBtn: TButton Left = 321 Top = 424 - TabOrder = 4 + TabOrder = 8 end inherited ComputeBtn: TButton Left = 238 Top = 424 + TabOrder = 7 end inherited ResetBtn: TButton Left = 176 Top = 424 + TabOrder = 6 end inherited HelpBtn: TButton Left = 117 Top = 424 + TabOrder = 5 end inherited ButtonBevel: TBevel Top = 408 @@ -372,7 +375,7 @@ inherited BubbleForm: TBubbleForm Width = 313 Anchors = [akLeft, akRight, akBottom] BorderSpacing.Left = 8 - TabOrder = 5 + TabOrder = 1 TextHint = 'Title of the Diagram' end object XLabelEdit: TEdit[10] @@ -386,7 +389,7 @@ inherited BubbleForm: TBubbleForm Width = 313 Anchors = [akLeft, akRight, akBottom] BorderSpacing.Top = 4 - TabOrder = 6 + TabOrder = 2 TextHint = 'X Axis Title' end object YLabelEdit: TEdit[11] @@ -400,7 +403,7 @@ inherited BubbleForm: TBubbleForm Width = 313 Anchors = [akLeft, akRight, akBottom] BorderSpacing.Top = 4 - TabOrder = 7 + TabOrder = 3 TextHint = 'Y Axis Title' end object TransformChk: TCheckBox[12] @@ -415,7 +418,7 @@ inherited BubbleForm: TBubbleForm BorderSpacing.Top = 12 BorderSpacing.Bottom = 4 Caption = 'Transform Data Grid for ANOVA (Treatments by Subjects ANOVA)' - TabOrder = 8 + TabOrder = 4 end end inherited ParamsSplitter: TSplitter diff --git a/applications/lazstats/source/forms/analysis/descriptive/descriptiveunit.lfm b/applications/lazstats/source/forms/analysis/descriptive/descriptiveunit.lfm index 197ce97c6..2cd0c14e9 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/descriptiveunit.lfm +++ b/applications/lazstats/source/forms/analysis/descriptive/descriptiveunit.lfm @@ -9,37 +9,34 @@ inherited DescriptiveFrm: TDescriptiveFrm ClientHeight = 432 ClientWidth = 900 inherited ParamsPanel: TPanel - Left = 16 - Height = 400 - Top = 16 + Height = 416 Width = 322 - BorderSpacing.Around = 8 - ClientHeight = 400 + ClientHeight = 416 ClientWidth = 322 inherited CloseBtn: TButton Left = 267 - Top = 375 - TabOrder = 9 + Top = 391 + TabOrder = 11 end inherited ComputeBtn: TButton AnchorSideBottom.Control = ParamsPanel AnchorSideBottom.Side = asrBottom Left = 184 - Top = 375 + Top = 391 TabOrder = 10 end inherited ResetBtn: TButton Left = 122 - Top = 375 - TabOrder = 8 + Top = 391 + TabOrder = 9 end inherited HelpBtn: TButton Left = 63 - Top = 375 - TabOrder = 7 + Top = 391 + TabOrder = 8 end inherited ButtonBevel: TBevel - Top = 359 + Top = 375 Width = 322 end object Label2: TLabel[5] @@ -59,7 +56,7 @@ inherited DescriptiveFrm: TDescriptiveFrm AnchorSideRight.Control = AllBtn AnchorSideBottom.Control = OptionsGroup Left = 0 - Height = 202 + Height = 218 Top = 17 Width = 130 Anchors = [akTop, akLeft, akRight, akBottom] @@ -92,7 +89,7 @@ inherited DescriptiveFrm: TDescriptiveFrm AnchorSideBottom.Control = VarList AnchorSideBottom.Side = asrBottom Left = 192 - Height = 202 + Height = 218 Top = 17 Width = 130 Anchors = [akTop, akLeft, akRight, akBottom] @@ -157,7 +154,7 @@ inherited DescriptiveFrm: TDescriptiveFrm AnchorSideRight.Control = CIEdit Left = 0 Height = 15 - Top = 311 + Top = 327 Width = 174 BorderSpacing.Right = 8 Caption = 'Confidence Interval for the Mean' @@ -169,7 +166,7 @@ inherited DescriptiveFrm: TDescriptiveFrm AnchorSideBottom.Control = CIEdit Left = 0 Height = 72 - Top = 227 + Top = 243 Width = 306 Anchors = [akLeft, akBottom] AutoSize = True @@ -235,7 +232,7 @@ inherited DescriptiveFrm: TDescriptiveFrm AnchorSideBottom.Control = DecPlacesEdit Left = 182 Height = 23 - Top = 307 + Top = 323 Width = 50 Alignment = taRightJustify Anchors = [akLeft, akBottom] @@ -251,14 +248,14 @@ inherited DescriptiveFrm: TDescriptiveFrm AnchorSideBottom.Control = ButtonBevel Left = 182 Height = 23 - Top = 334 + Top = 350 Width = 50 Alignment = taRightJustify Anchors = [akLeft, akRight, akBottom] BorderSpacing.Top = 4 BorderSpacing.Bottom = 2 MaxValue = 10 - TabOrder = 11 + TabOrder = 7 Value = 3 end object Label4: TLabel[16] @@ -267,21 +264,21 @@ inherited DescriptiveFrm: TDescriptiveFrm AnchorSideTop.Side = asrCenter Left = 0 Height = 15 - Top = 338 + Top = 354 Width = 79 Caption = 'Decimal places' ParentColor = False end end inherited ParamsSplitter: TSplitter - Left = 350 + Left = 334 Height = 432 end object PageControl: TPageControl[2] - Left = 359 + Left = 343 Height = 416 Top = 8 - Width = 533 + Width = 549 ActivePage = ReportPage Align = alClient BorderSpacing.Left = 4 diff --git a/applications/lazstats/source/forms/analysis/descriptive/normalityunit.lfm b/applications/lazstats/source/forms/analysis/descriptive/normalityunit.lfm index b76cee588..6714bcf1b 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/normalityunit.lfm +++ b/applications/lazstats/source/forms/analysis/descriptive/normalityunit.lfm @@ -13,7 +13,7 @@ inherited NormalityFrm: TNormalityFrm ClientHeight = 500 inherited CloseBtn: TButton Top = 475 - TabOrder = 5 + TabOrder = 7 end inherited ComputeBtn: TButton Top = 475 @@ -21,29 +21,16 @@ inherited NormalityFrm: TNormalityFrm end inherited ResetBtn: TButton Top = 475 - TabOrder = 7 + TabOrder = 5 end inherited HelpBtn: TButton Top = 475 - TabOrder = 8 + TabOrder = 4 end inherited ButtonBevel: TBevel Top = 459 end - object Panel1: TPanel[5] - AnchorSideRight.Control = ParamsPanel - AnchorSideRight.Side = asrBottom - Left = 0 - Height = 0 - Top = 500 - Width = 291 - Align = alBottom - AutoSize = True - BorderSpacing.Top = 6 - BevelOuter = bvNone - TabOrder = 0 - end - object Label1: TLabel[6] + object Label1: TLabel[5] AnchorSideLeft.Control = ParamsPanel AnchorSideTop.Control = ParamsPanel Left = 0 @@ -53,7 +40,7 @@ inherited NormalityFrm: TNormalityFrm Caption = 'Variables:' ParentColor = False end - object VarList: TListBox[7] + object VarList: TListBox[6] AnchorSideLeft.Control = ParamsPanel AnchorSideTop.Control = Label1 AnchorSideTop.Side = asrBottom @@ -69,9 +56,9 @@ inherited NormalityFrm: TNormalityFrm ItemHeight = 0 OnDblClick = VarListDblClick OnSelectionChange = VarListSelectionChange - TabOrder = 1 + TabOrder = 0 end - object VarInBtn: TBitBtn[8] + object VarInBtn: TBitBtn[7] AnchorSideLeft.Control = ParamsPanel AnchorSideLeft.Side = asrCenter AnchorSideTop.Control = VarList @@ -85,9 +72,9 @@ inherited NormalityFrm: TNormalityFrm ImageIndex = 1 OnClick = VarInBtnClick Spacing = 0 - TabOrder = 2 + TabOrder = 1 end - object VarOutBtn: TBitBtn[9] + object VarOutBtn: TBitBtn[8] AnchorSideLeft.Control = ParamsPanel AnchorSideLeft.Side = asrCenter AnchorSideTop.Control = VarInBtn @@ -102,9 +89,9 @@ inherited NormalityFrm: TNormalityFrm ImageIndex = 0 OnClick = VarOutBtnClick Spacing = 0 - TabOrder = 3 + TabOrder = 2 end - object TestVarEdit: TEdit[10] + object TestVarEdit: TEdit[9] AnchorSideLeft.Control = VarOutBtn AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = Label2 @@ -118,10 +105,10 @@ inherited NormalityFrm: TNormalityFrm Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 BorderSpacing.Top = 2 - TabOrder = 4 + TabOrder = 3 Text = 'TestVarEdit' end - object Label2: TLabel[11] + object Label2: TLabel[10] AnchorSideLeft.Control = TestVarEdit AnchorSideBottom.Control = VarInBtn AnchorSideBottom.Side = asrBottom diff --git a/applications/lazstats/source/forms/analysis/descriptive/normalityunit.pas b/applications/lazstats/source/forms/analysis/descriptive/normalityunit.pas index a2ec54d35..018972716 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/normalityunit.pas +++ b/applications/lazstats/source/forms/analysis/descriptive/normalityunit.pas @@ -18,7 +18,6 @@ type { TNormalityFrm } TNormalityFrm = class(TBasicStatsReportAndChartForm) - Panel1: TPanel; TestVarEdit: TEdit; Label2: TLabel; VarInBtn: TBitBtn; @@ -135,11 +134,11 @@ begin inherited; ParamsPanel.Constraints.MinWidth := Max( - 3*CloseBtn.Width + 2*CloseBtn.BorderSpacing.Left, + 4*CloseBtn.Width + 3*CloseBtn.BorderSpacing.Left, Max(Label1.Width, Label2.Width) + VarInBtn.Width + 2*VarList.BorderSpacing.Right); ParamsPanel.Constraints.MinHeight := VarOutBtn.Top + VarOutBtn.Height + - VarOutBtn.BorderSpacing.Bottom + ButtonBevel.Height + Panel1.Height + - Panel1.BorderSpacing.Top; + VarOutBtn.BorderSpacing.Bottom + ButtonBevel.Height + CloseBtn.Height + + CloseBtn.BorderSpacing.Top; Constraints.MinWidth := ParamsPanel.Constraints.MinWidth + 300; Constraints.MinHeight := ParamsPanel.Constraints.MinHeight + 2*ParamsPanel.BorderSpacing.Top; diff --git a/applications/lazstats/source/forms/analysis/descriptive/plotxyunit.lfm b/applications/lazstats/source/forms/analysis/descriptive/plotxyunit.lfm index dc80cdc91..2b42da7f2 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/plotxyunit.lfm +++ b/applications/lazstats/source/forms/analysis/descriptive/plotxyunit.lfm @@ -16,19 +16,22 @@ inherited PlotXYFrm: TPlotXYFrm inherited CloseBtn: TButton Left = 321 Top = 459 + TabOrder = 11 end inherited ComputeBtn: TButton Left = 238 Top = 459 + TabOrder = 10 end inherited ResetBtn: TButton Left = 176 Top = 459 + TabOrder = 9 end inherited HelpBtn: TButton Left = 117 Top = 459 - TabOrder = 11 + TabOrder = 8 end inherited ButtonBevel: TBevel Top = 443 @@ -61,7 +64,7 @@ inherited PlotXYFrm: TPlotXYFrm ItemHeight = 0 OnDblClick = VarListDblClick OnSelectionChange = VarListSelectionChange - TabOrder = 3 + TabOrder = 0 end object Label2: TLabel[7] AnchorSideLeft.Control = XEdit @@ -102,7 +105,7 @@ inherited PlotXYFrm: TPlotXYFrm ImageIndex = 1 OnClick = XInBtnClick Spacing = 0 - TabOrder = 4 + TabOrder = 1 end object XOutBtn: TBitBtn[10] AnchorSideLeft.Control = ParamsPanel @@ -118,7 +121,7 @@ inherited PlotXYFrm: TPlotXYFrm ImageIndex = 0 OnClick = XOutBtnClick Spacing = 0 - TabOrder = 5 + TabOrder = 2 end object YInBtn: TBitBtn[11] AnchorSideLeft.Control = ParamsPanel @@ -136,7 +139,7 @@ inherited PlotXYFrm: TPlotXYFrm ImageIndex = 1 OnClick = YInBtnClick Spacing = 0 - TabOrder = 6 + TabOrder = 4 end object YOutBtn: TBitBtn[12] AnchorSideLeft.Control = ParamsPanel @@ -154,7 +157,7 @@ inherited PlotXYFrm: TPlotXYFrm ImageIndex = 0 OnClick = YOutBtnClick Spacing = 0 - TabOrder = 7 + TabOrder = 5 end object XEdit: TEdit[13] AnchorSideLeft.Control = XInBtn @@ -173,7 +176,7 @@ inherited PlotXYFrm: TPlotXYFrm BorderSpacing.Right = 8 BorderSpacing.Bottom = 12 ReadOnly = True - TabOrder = 8 + TabOrder = 3 Text = 'XEdit' end object YEdit: TEdit[14] @@ -189,7 +192,7 @@ inherited PlotXYFrm: TPlotXYFrm Anchors = [akLeft, akRight, akBottom] BorderSpacing.Bottom = 12 ReadOnly = True - TabOrder = 9 + TabOrder = 6 Text = 'YEdit' end object OptionsGroup: TGroupBox[15] @@ -207,7 +210,7 @@ inherited PlotXYFrm: TPlotXYFrm ChildSizing.LeftRightSpacing = 12 ClientHeight = 100 ClientWidth = 187 - TabOrder = 10 + TabOrder = 7 object Label4: TLabel AnchorSideLeft.Control = ConfChk AnchorSideTop.Control = ConfEdit @@ -234,7 +237,7 @@ inherited PlotXYFrm: TPlotXYFrm BorderSpacing.Left = 8 BorderSpacing.Right = 8 BorderSpacing.Bottom = 8 - TabOrder = 0 + TabOrder = 2 Text = '95.0' end object LineChk: TCheckBox @@ -245,7 +248,7 @@ inherited PlotXYFrm: TPlotXYFrm Width = 146 BorderSpacing.Top = 4 Caption = 'Plot the Regression Line' - TabOrder = 1 + TabOrder = 0 end object MeansChk: TCheckBox AnchorSideLeft.Control = LineChk @@ -257,7 +260,7 @@ inherited PlotXYFrm: TPlotXYFrm Width = 99 BorderSpacing.Top = 4 Caption = 'Plot the Means' - TabOrder = 2 + TabOrder = 1 end object ConfChk: TCheckBox AnchorSideLeft.Control = MeansChk diff --git a/applications/lazstats/source/forms/analysis/descriptive/xvsmultyunit.lfm b/applications/lazstats/source/forms/analysis/descriptive/xvsmultyunit.lfm index ec34ee55d..e80dc75ed 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/xvsmultyunit.lfm +++ b/applications/lazstats/source/forms/analysis/descriptive/xvsmultyunit.lfm @@ -16,15 +16,17 @@ inherited XvsMultYForm: TXvsMultYForm inherited CloseBtn: TButton Left = 241 Top = 459 - TabOrder = 4 + TabOrder = 6 end inherited ComputeBtn: TButton Left = 158 Top = 459 + TabOrder = 5 end inherited ResetBtn: TButton Left = 96 Top = 459 + TabOrder = 4 end inherited HelpBtn: TButton Left = 37 @@ -227,7 +229,7 @@ inherited XvsMultYForm: TXvsMultYForm ChildSizing.ControlsPerLine = 2 ClientHeight = 31 ClientWidth = 181 - TabOrder = 5 + TabOrder = 2 object LinesBox: TCheckBox AnchorSideTop.Side = asrBottom Left = 12 @@ -265,7 +267,7 @@ inherited XvsMultYForm: TXvsMultYForm Width = 231 Anchors = [akLeft, akRight, akBottom] BorderSpacing.Left = 8 - TabOrder = 6 + TabOrder = 1 TextHint = 'Title above the chart' end end