From 0ac73dea00e622fd8ad1a2d9e12c6a267d2278c6 Mon Sep 17 00:00:00 2001 From: ivanluv Date: Mon, 14 Feb 2022 15:44:02 +0300 Subject: [PATCH] Adding the top radio button --- instat/dlgOneVariableSummarise.Designer.vb | 139 ++++++++++----------- instat/dlgOneVariableSummarise.vb | 2 +- 2 files changed, 69 insertions(+), 72 deletions(-) diff --git a/instat/dlgOneVariableSummarise.Designer.vb b/instat/dlgOneVariableSummarise.Designer.vb index 7a832ca6076..66cfb237627 100644 --- a/instat/dlgOneVariableSummarise.Designer.vb +++ b/instat/dlgOneVariableSummarise.Designer.vb @@ -41,23 +41,22 @@ Partial Class dlgOneVariableSummarise Me.lblSelectedVariable = New System.Windows.Forms.Label() Me.lblMaxSum = New System.Windows.Forms.Label() Me.cmdSummaries = New System.Windows.Forms.Button() - Me.lblSummaries = New System.Windows.Forms.Label() - Me.rdoDefault = New System.Windows.Forms.RadioButton() Me.rdoCustomised = New System.Windows.Forms.RadioButton() + Me.rdoDefault = New System.Windows.Forms.RadioButton() + Me.ucrPnlSummaries = New instat.UcrPanel() + Me.ucrChkDisplaySummariesAsRows = New instat.ucrCheck() + Me.ucrChkDisplayVariablesAsRows = New instat.ucrCheck() Me.ucrNudMaxSum = New instat.ucrNud() Me.ucrChkOmitMissing = New instat.ucrCheck() Me.ucrSelectorOneVarSummarise = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrReceiverOneVarSummarise = New instat.ucrReceiverMultiple() Me.ucrBase = New instat.ucrButtons() - Me.ucrPnlSummaries = New instat.UcrPanel() - Me.ucrChkDisplaySummariesAsRows = New instat.ucrCheck() - Me.ucrChkDisplayVariablesAsRows = New instat.ucrCheck() Me.SuspendLayout() ' 'lblSelectedVariable ' Me.lblSelectedVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSelectedVariable.Location = New System.Drawing.Point(258, 46) + Me.lblSelectedVariable.Location = New System.Drawing.Point(258, 64) Me.lblSelectedVariable.Name = "lblSelectedVariable" Me.lblSelectedVariable.Size = New System.Drawing.Size(142, 14) Me.lblSelectedVariable.TabIndex = 1 @@ -67,9 +66,9 @@ Partial Class dlgOneVariableSummarise 'lblMaxSum ' Me.lblMaxSum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMaxSum.Location = New System.Drawing.Point(10, 236) + Me.lblMaxSum.Location = New System.Drawing.Point(13, 253) Me.lblMaxSum.Name = "lblMaxSum" - Me.lblMaxSum.Size = New System.Drawing.Size(187, 19) + Me.lblMaxSum.Size = New System.Drawing.Size(189, 24) Me.lblMaxSum.TabIndex = 7 Me.lblMaxSum.Text = "Maximum Factor Levels Shown:" ' @@ -77,7 +76,7 @@ Partial Class dlgOneVariableSummarise ' Me.cmdSummaries.AutoSize = True Me.cmdSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSummaries.Location = New System.Drawing.Point(261, 197) + Me.cmdSummaries.Location = New System.Drawing.Point(261, 215) Me.cmdSummaries.Name = "cmdSummaries" Me.cmdSummaries.Size = New System.Drawing.Size(120, 23) Me.cmdSummaries.TabIndex = 6 @@ -85,46 +84,72 @@ Partial Class dlgOneVariableSummarise Me.cmdSummaries.Text = "Choose Summaries..." Me.cmdSummaries.UseVisualStyleBackColor = True ' - 'lblSummaries + 'rdoCustomised ' - Me.lblSummaries.AutoSize = True - Me.lblSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSummaries.Location = New System.Drawing.Point(10, 205) - Me.lblSummaries.Name = "lblSummaries" - Me.lblSummaries.Size = New System.Drawing.Size(61, 13) - Me.lblSummaries.TabIndex = 3 - Me.lblSummaries.Text = "Summaries:" + Me.rdoCustomised.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoCustomised.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoCustomised.FlatAppearance.BorderSize = 2 + Me.rdoCustomised.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoCustomised.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoCustomised.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoCustomised.Location = New System.Drawing.Point(200, 12) + Me.rdoCustomised.Name = "rdoCustomised" + Me.rdoCustomised.Size = New System.Drawing.Size(128, 27) + Me.rdoCustomised.TabIndex = 22 + Me.rdoCustomised.TabStop = True + Me.rdoCustomised.Text = "Customised" + Me.rdoCustomised.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoCustomised.UseVisualStyleBackColor = True ' 'rdoDefault ' - Me.rdoDefault.AutoSize = True + Me.rdoDefault.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoDefault.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoDefault.FlatAppearance.BorderSize = 2 + Me.rdoDefault.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoDefault.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoDefault.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoDefault.Location = New System.Drawing.Point(79, 203) + Me.rdoDefault.Location = New System.Drawing.Point(77, 12) Me.rdoDefault.Name = "rdoDefault" - Me.rdoDefault.Size = New System.Drawing.Size(59, 17) - Me.rdoDefault.TabIndex = 4 + Me.rdoDefault.Size = New System.Drawing.Size(125, 27) + Me.rdoDefault.TabIndex = 21 Me.rdoDefault.TabStop = True - Me.rdoDefault.Text = "Default" + Me.rdoDefault.Text = "Defaults" + Me.rdoDefault.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoDefault.UseVisualStyleBackColor = True ' - 'rdoCustomised + 'ucrPnlSummaries ' - Me.rdoCustomised.AutoSize = True - Me.rdoCustomised.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoCustomised.Location = New System.Drawing.Point(157, 203) - Me.rdoCustomised.Name = "rdoCustomised" - Me.rdoCustomised.Size = New System.Drawing.Size(79, 17) - Me.rdoCustomised.TabIndex = 5 - Me.rdoCustomised.TabStop = True - Me.rdoCustomised.Text = "Customised" - Me.rdoCustomised.UseVisualStyleBackColor = True + Me.ucrPnlSummaries.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlSummaries.Location = New System.Drawing.Point(75, 11) + Me.ucrPnlSummaries.Name = "ucrPnlSummaries" + Me.ucrPnlSummaries.Size = New System.Drawing.Size(255, 29) + Me.ucrPnlSummaries.TabIndex = 20 + ' + 'ucrChkDisplaySummariesAsRows + ' + Me.ucrChkDisplaySummariesAsRows.AutoSize = True + Me.ucrChkDisplaySummariesAsRows.Checked = False + Me.ucrChkDisplaySummariesAsRows.Location = New System.Drawing.Point(13, 270) + Me.ucrChkDisplaySummariesAsRows.Name = "ucrChkDisplaySummariesAsRows" + Me.ucrChkDisplaySummariesAsRows.Size = New System.Drawing.Size(241, 23) + Me.ucrChkDisplaySummariesAsRows.TabIndex = 19 + ' + 'ucrChkDisplayVariablesAsRows + ' + Me.ucrChkDisplayVariablesAsRows.AutoSize = True + Me.ucrChkDisplayVariablesAsRows.Checked = False + Me.ucrChkDisplayVariablesAsRows.Location = New System.Drawing.Point(13, 294) + Me.ucrChkDisplayVariablesAsRows.Name = "ucrChkDisplayVariablesAsRows" + Me.ucrChkDisplayVariablesAsRows.Size = New System.Drawing.Size(227, 23) + Me.ucrChkDisplayVariablesAsRows.TabIndex = 18 ' 'ucrNudMaxSum ' Me.ucrNudMaxSum.AutoSize = True Me.ucrNudMaxSum.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxSum.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudMaxSum.Location = New System.Drawing.Point(261, 235) + Me.ucrNudMaxSum.Location = New System.Drawing.Point(261, 248) Me.ucrNudMaxSum.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudMaxSum.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxSum.Name = "ucrNudMaxSum" @@ -136,7 +161,7 @@ Partial Class dlgOneVariableSummarise ' Me.ucrChkOmitMissing.AutoSize = True Me.ucrChkOmitMissing.Checked = False - Me.ucrChkOmitMissing.Location = New System.Drawing.Point(13, 235) + Me.ucrChkOmitMissing.Location = New System.Drawing.Point(13, 247) Me.ucrChkOmitMissing.Name = "ucrChkOmitMissing" Me.ucrChkOmitMissing.Size = New System.Drawing.Size(241, 23) Me.ucrChkOmitMissing.TabIndex = 9 @@ -147,7 +172,7 @@ Partial Class dlgOneVariableSummarise Me.ucrSelectorOneVarSummarise.bDropUnusedFilterLevels = False Me.ucrSelectorOneVarSummarise.bShowHiddenColumns = False Me.ucrSelectorOneVarSummarise.bUseCurrentFilter = True - Me.ucrSelectorOneVarSummarise.Location = New System.Drawing.Point(10, 10) + Me.ucrSelectorOneVarSummarise.Location = New System.Drawing.Point(10, 55) Me.ucrSelectorOneVarSummarise.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorOneVarSummarise.Name = "ucrSelectorOneVarSummarise" Me.ucrSelectorOneVarSummarise.Size = New System.Drawing.Size(213, 183) @@ -157,7 +182,7 @@ Partial Class dlgOneVariableSummarise ' Me.ucrReceiverOneVarSummarise.AutoSize = True Me.ucrReceiverOneVarSummarise.frmParent = Me - Me.ucrReceiverOneVarSummarise.Location = New System.Drawing.Point(261, 60) + Me.ucrReceiverOneVarSummarise.Location = New System.Drawing.Point(261, 82) Me.ucrReceiverOneVarSummarise.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverOneVarSummarise.Name = "ucrReceiverOneVarSummarise" Me.ucrReceiverOneVarSummarise.Selector = Nothing @@ -170,48 +195,22 @@ Partial Class dlgOneVariableSummarise ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(10, 316) + Me.ucrBase.Location = New System.Drawing.Point(10, 319) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(405, 52) Me.ucrBase.TabIndex = 11 ' - 'ucrPnlSummaries - ' - Me.ucrPnlSummaries.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlSummaries.Location = New System.Drawing.Point(10, 192) - Me.ucrPnlSummaries.Name = "ucrPnlSummaries" - Me.ucrPnlSummaries.Size = New System.Drawing.Size(226, 37) - Me.ucrPnlSummaries.TabIndex = 12 - ' - 'ucrChkDisplaySummariesAsRows - ' - Me.ucrChkDisplaySummariesAsRows.AutoSize = True - Me.ucrChkDisplaySummariesAsRows.Checked = False - Me.ucrChkDisplaySummariesAsRows.Location = New System.Drawing.Point(13, 258) - Me.ucrChkDisplaySummariesAsRows.Name = "ucrChkDisplaySummariesAsRows" - Me.ucrChkDisplaySummariesAsRows.Size = New System.Drawing.Size(241, 23) - Me.ucrChkDisplaySummariesAsRows.TabIndex = 19 - ' - 'ucrChkDisplayVariablesAsRows - ' - Me.ucrChkDisplayVariablesAsRows.AutoSize = True - Me.ucrChkDisplayVariablesAsRows.Checked = False - Me.ucrChkDisplayVariablesAsRows.Location = New System.Drawing.Point(13, 282) - Me.ucrChkDisplayVariablesAsRows.Name = "ucrChkDisplayVariablesAsRows" - Me.ucrChkDisplayVariablesAsRows.Size = New System.Drawing.Size(227, 23) - Me.ucrChkDisplayVariablesAsRows.TabIndex = 18 - ' 'dlgOneVariableSummarise ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True Me.ClientSize = New System.Drawing.Size(421, 383) - Me.Controls.Add(Me.ucrChkDisplaySummariesAsRows) - Me.Controls.Add(Me.ucrChkDisplayVariablesAsRows) Me.Controls.Add(Me.rdoCustomised) Me.Controls.Add(Me.rdoDefault) - Me.Controls.Add(Me.lblSummaries) + Me.Controls.Add(Me.ucrPnlSummaries) + Me.Controls.Add(Me.ucrChkDisplaySummariesAsRows) + Me.Controls.Add(Me.ucrChkDisplayVariablesAsRows) Me.Controls.Add(Me.ucrNudMaxSum) Me.Controls.Add(Me.ucrChkOmitMissing) Me.Controls.Add(Me.ucrSelectorOneVarSummarise) @@ -219,7 +218,6 @@ Partial Class dlgOneVariableSummarise Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.lblSelectedVariable) Me.Controls.Add(Me.cmdSummaries) - Me.Controls.Add(Me.ucrPnlSummaries) Me.Controls.Add(Me.lblMaxSum) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False @@ -241,10 +239,9 @@ Partial Class dlgOneVariableSummarise Friend WithEvents lblMaxSum As Label Friend WithEvents ucrNudMaxSum As ucrNud Friend WithEvents cmdSummaries As Button - Friend WithEvents rdoCustomised As RadioButton - Friend WithEvents rdoDefault As RadioButton - Friend WithEvents lblSummaries As Label - Friend WithEvents ucrPnlSummaries As UcrPanel Friend WithEvents ucrChkDisplaySummariesAsRows As ucrCheck Friend WithEvents ucrChkDisplayVariablesAsRows As ucrCheck + Friend WithEvents ucrPnlSummaries As UcrPanel + Friend WithEvents rdoCustomised As RadioButton + Friend WithEvents rdoDefault As RadioButton End Class \ No newline at end of file diff --git a/instat/dlgOneVariableSummarise.vb b/instat/dlgOneVariableSummarise.vb index 4432b37c85f..a268ba3050f 100644 --- a/instat/dlgOneVariableSummarise.vb +++ b/instat/dlgOneVariableSummarise.vb @@ -243,7 +243,7 @@ Public Class dlgOneVariableSummarise strDefaultColumns = Nothing End Sub - Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverOneVarSummarise.ControlContentsChanged, ucrNudMaxSum.ControlContentsChanged, ucrPnlSummaries.ControlValueChanged + Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverOneVarSummarise.ControlContentsChanged, ucrNudMaxSum.ControlContentsChanged TestOKEnabled() End Sub