From f0ea61893c3f64cdcd0fe077a073cd8ba1334b7c Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Tue, 9 Jul 2024 08:22:22 +0300 Subject: [PATCH 01/13] Changing the dialogue and help options --- instat/dlgMerge.vb | 16 ---------------- instat/dlgMergeAdditionalData.vb | 16 ++++++++++++++++ instat/frmMain.vb | 5 ++--- instat/sdgMerge.vb | 8 +++++--- instat/sdgMergeColumnsToInclude.vb | 12 ++---------- 5 files changed, 25 insertions(+), 32 deletions(-) diff --git a/instat/dlgMerge.vb b/instat/dlgMerge.vb index 3ddbab1caa8..a93fdeafbb1 100644 --- a/instat/dlgMerge.vb +++ b/instat/dlgMerge.vb @@ -18,12 +18,6 @@ Imports instat Imports instat.Translations Public Class dlgMerge - Public enumMergeMode As String = MergeMode.Prepare - Public Enum MergeMode - Prepare - Climatic - End Enum - Private bFirstLoad As Boolean = True Private clsMergeFunction As New RFunction Private clsByListFunction As New RFunction @@ -48,7 +42,6 @@ Public Class dlgMerge SetDefaults() End If SetRCodeForControls(bReset) - SetHelpOptions() bReset = False SetMergingBy() TestOKEnabled() @@ -155,15 +148,6 @@ Public Class dlgMerge SetMergingBy() End Sub - Private Sub SetHelpOptions() - Select Case enumMergeMode - Case MergeMode.Prepare - ucrBase.iHelpTopicID = 60 - Case MergeMode.Climatic - ucrBase.iHelpTopicID = 609 - End Select - End Sub - Private Sub ucrInputJoinType_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputJoinType.ControlValueChanged Dim bFound As Boolean = True diff --git a/instat/dlgMergeAdditionalData.vb b/instat/dlgMergeAdditionalData.vb index 3248859496b..f07ff383f6b 100644 --- a/instat/dlgMergeAdditionalData.vb +++ b/instat/dlgMergeAdditionalData.vb @@ -18,6 +18,12 @@ Imports instat.Translations Imports RDotNet Public Class dlgMergeAdditionalData + Public enumMergeMode As String = MergeMode.Prepare + Public Enum MergeMode + Prepare + Climatic + End Enum + Private bFirstLoad As Boolean = True Private bReset As Boolean = True Private clsInsertColumnFunction, clsGetColumnsFromData, clsListFunction, clsImportDataFunction As New RFunction @@ -39,6 +45,7 @@ Public Class dlgMergeAdditionalData End If SetRCodeforControls(bReset) bReset = False + SetHelpOptions() SetMergingBy() autoTranslate(Me) TestOkEnabled() @@ -111,6 +118,15 @@ Public Class dlgMergeAdditionalData ucrChkSaveDataFrame.SetRCode(ucrBase.clsRsyntax.clsBaseFunction, bReset) End Sub + Private Sub SetHelpOptions() + Select Case enumMergeMode + Case MergeMode.Prepare + ucrBase.iHelpTopicID = 186 + Case MergeMode.Climatic + ucrBase.iHelpTopicID = 609 + End Select + End Sub + Private Sub TestOkEnabled() If ucrToDataFrame.cboAvailableDataFrames.Text <> "" AndAlso ucrFromDataFrame.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" AndAlso Not ucrReceiverSecond.IsEmpty() AndAlso bBySpecified AndAlso bJoinColsAreUnique Then diff --git a/instat/frmMain.vb b/instat/frmMain.vb index c2351ac4d28..b2c315696c3 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -733,7 +733,6 @@ Public Class frmMain End Sub Private Sub mnuPrepareReshapeMerge_Click(sender As Object, e As EventArgs) Handles mnuPrepareColumnReshapeMerge.Click - dlgMerge.enumMergeMode = dlgMerge.MergeMode.Prepare dlgMerge.ShowDialog() End Sub @@ -2103,8 +2102,8 @@ Public Class frmMain End Sub Private Sub mnuClimaticTidyandExamineMerge_Click(sender As Object, e As EventArgs) Handles mnuClimaticTidyandExamineMerge.Click - dlgMerge.enumMergeMode = dlgMerge.MergeMode.Climatic - dlgMerge.ShowDialog() + dlgMergeAdditionalData.enumMergeMode = dlgMergeAdditionalData.MergeMode.Climatic + dlgMergeAdditionalData.ShowDialog() End Sub Private Sub mnuClimaticCMSAFExporttoCMSAFRToolbox_Click(sender As Object, e As EventArgs) Handles mnuClimaticCMSAFExporttoCMSAFRToolbox.Click diff --git a/instat/sdgMerge.vb b/instat/sdgMerge.vb index 6a33452f39a..9ec6c6ff849 100644 --- a/instat/sdgMerge.vb +++ b/instat/sdgMerge.vb @@ -28,6 +28,8 @@ Public Class sdgMerge End Sub Public Sub InitiatiseControls() + ucrSubBase.iHelpTopicID = 51 + ucrSelectorFirstDF.SetLabelText("First Data Frame") ucrSelectorSecondDF.SetLabelText("Second Data Frame") @@ -95,10 +97,10 @@ Public Class sdgMerge End Sub Private Sub SetHelpOptions() - Select Case dlgMerge.enumMergeMode - Case dlgMerge.MergeMode.Prepare + Select Case dlgMergeAdditionalData.enumMergeMode + Case dlgMergeAdditionalData.MergeMode.Prepare ucrSubBase.iHelpTopicID = 51 - Case dlgMerge.MergeMode.Climatic + Case dlgMergeAdditionalData.MergeMode.Climatic ucrSubBase.iHelpTopicID = 624 End Select End Sub diff --git a/instat/sdgMergeColumnsToInclude.vb b/instat/sdgMergeColumnsToInclude.vb index 29116770125..d78862f4f6b 100644 --- a/instat/sdgMergeColumnsToInclude.vb +++ b/instat/sdgMergeColumnsToInclude.vb @@ -23,11 +23,12 @@ Public Class sdgMergeColumnstoInclude Private clsMerge As RFunction Private Sub sdgMerge_Load(sender As Object, e As EventArgs) Handles MyBase.Load - SetHelpOptions() autoTranslate(Me) End Sub Public Sub InitiatiseControls() + ucrSubBase.iHelpTopicID = 154 + ucrChkMergeWithSubsetFirst.SetText("Choose Subset of Columns to Merge") ucrChkMergeWithSubsetFirst.AddToLinkedControls(ucrReceiverFirstSelected, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkMergeWithSubsetFirst.AddParameterValueFunctionNamesCondition(True, "x", frmMain.clsRLink.strInstatDataObject & "$get_columns_from_data") @@ -130,13 +131,4 @@ Public Class sdgMergeColumnstoInclude Next End If End Sub - - Private Sub SetHelpOptions() - Select Case dlgMerge.enumMergeMode - Case dlgMerge.MergeMode.Prepare - ucrSubBase.iHelpTopicID = 154 - Case dlgMerge.MergeMode.Climatic - ucrSubBase.iHelpTopicID = 636 - End Select - End Sub End Class From 134abc4ffc052a84671333cf82c9d13a418320b0 Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Tue, 9 Jul 2024 08:47:29 +0300 Subject: [PATCH 02/13] help navigations --- instat/dlgMergeAdditionalData.vb | 1 - instat/frmMain.vb | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgMergeAdditionalData.vb b/instat/dlgMergeAdditionalData.vb index f07ff383f6b..e61e9a9e594 100644 --- a/instat/dlgMergeAdditionalData.vb +++ b/instat/dlgMergeAdditionalData.vb @@ -52,7 +52,6 @@ Public Class dlgMergeAdditionalData End Sub Private Sub InitialiseDialog() - ucrBase.iHelpTopicID = 186 ucrToDataFrame.SetParameter(New RParameter("x", 0)) ucrToDataFrame.SetParameterIsRFunction() ucrToDataFrame.SetLabelText("To Data Frame:") diff --git a/instat/frmMain.vb b/instat/frmMain.vb index b2c315696c3..ab2ebb686d0 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2603,6 +2603,7 @@ Public Class frmMain End Sub Private Sub mnuPrepareDataFrameAddMergeColumns_Click(sender As Object, e As EventArgs) Handles mnuPrepareDataFrameAddMergeColumns.Click + dlgMergeAdditionalData.enumMergeMode = dlgMergeAdditionalData.MergeMode.Prepare dlgMergeAdditionalData.ShowDialog() End Sub From 52f739ad0109fda22dbb1aee1a1218d6d9d12094 Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Tue, 9 Jul 2024 09:13:39 +0300 Subject: [PATCH 03/13] fnl --- instat/dlgCalculator.vb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/instat/dlgCalculator.vb b/instat/dlgCalculator.vb index 52822e1cdf7..0ee8c2c9893 100644 --- a/instat/dlgCalculator.vb +++ b/instat/dlgCalculator.vb @@ -85,6 +85,8 @@ Public Class dlgCalculator End Sub Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 14 + ucrCalc.ucrReceiverForCalculation.SetMeAsReceiver() ucrCalc.ucrTryCalculator.SetIsCommand() ucrCalc.ucrTryCalculator.SetReceiver(ucrCalc.ucrReceiverForCalculation) @@ -262,7 +264,7 @@ Public Class dlgCalculator Private Sub SetHelpOptions() Select Case enumCalculatorMode Case CalculatorMode.Prepare - ucrBase.iHelpTopicID = 14 + ' ucrBase.iHelpTopicID = 14 Case CalculatorMode.Structured ucrCalc.ucrInputCalOptions.SetName("Circular") ucrBase.iHelpTopicID = 677 From 67a8a96d0f9ec63ef5c65730ddd59dfe96364784 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 9 Jul 2024 14:06:48 +0100 Subject: [PATCH 04/13] Added text in Define Climatic Dialog --- instat/DlgDefineClimaticData.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instat/DlgDefineClimaticData.vb b/instat/DlgDefineClimaticData.vb index f392852cd60..f5eca3cef4e 100644 --- a/instat/DlgDefineClimaticData.vb +++ b/instat/DlgDefineClimaticData.vb @@ -54,8 +54,8 @@ Public Class DlgDefineClimaticData Dim kvpLongitude As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("lon", {"lon", "lont", "longitude"}.ToList()) Dim kvpLatitude As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("lat", {"lat", "latitude"}.ToList()) Dim kvpCloudCover As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("cloud_cover", {"cloud"}.ToList()) - Dim kvpTempMax As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("temp_max", {"tmax", "tx", "tempmax", "tmp_max"}.ToList()) - Dim kvpTempMin As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("temp_min", {"tmin", "tn", "tempmin", "tmp_min"}.ToList()) + Dim kvpTempMax As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("temp_max", {"tmax", "tx", "tempmax", "tmp_max", "tmpmax"}.ToList()) + Dim kvpTempMin As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("temp_min", {"tmin", "tn", "tempmin", "tmp_min", "tmpmin"}.ToList()) Dim kvpRadiation As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("radiation", {"radiation", "rad"}.ToList()) Dim kvpSunshineHours As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("sunshine_hours", {"sunshine", "sunh", "sunhrs"}.ToList()) Dim kvpWindDirection As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("wind_direction", {"winddirection"}.ToList()) From 31e8d3e2d2c4a862089d218f65818b2a17f39924 Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Wed, 10 Jul 2024 01:49:15 +0300 Subject: [PATCH 05/13] changes --- instat/dlgCalculator.vb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/instat/dlgCalculator.vb b/instat/dlgCalculator.vb index 0ee8c2c9893..ad2f1dc9777 100644 --- a/instat/dlgCalculator.vb +++ b/instat/dlgCalculator.vb @@ -264,7 +264,7 @@ Public Class dlgCalculator Private Sub SetHelpOptions() Select Case enumCalculatorMode Case CalculatorMode.Prepare - ' ucrBase.iHelpTopicID = 14 + ucrBase.iHelpTopicID = 14 Case CalculatorMode.Structured ucrCalc.ucrInputCalOptions.SetName("Circular") ucrBase.iHelpTopicID = 677 @@ -337,6 +337,7 @@ Public Class dlgCalculator ucrBase.iHelpTopicID = 439 Case Else Me.Width = iBasicWidth + ucrBase.iHelpTopicID = 14 End Select End Sub End Class From 6f3cb26bfbdd159857371eb107c88dd3e5eb462c Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Wed, 10 Jul 2024 02:09:47 +0300 Subject: [PATCH 06/13] changes --- instat/frmMain.Designer.vb | 80 ++++++++++----------- instat/translations/rInstatTranslations.db | Bin 8306688 -> 8306688 bytes 2 files changed, 39 insertions(+), 41 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index c0909e4c30b..949f21f824a 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -1919,87 +1919,87 @@ Partial Class frmMain 'mnuClimaticTidyandExamineTidyDailyData ' Me.mnuClimaticTidyandExamineTidyDailyData.Name = "mnuClimaticTidyandExamineTidyDailyData" - Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(197, 22) + Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineTidyDailyData.Text = "Tidy Daily Data..." ' 'ToolStripSeparator71 ' Me.ToolStripSeparator71.Name = "ToolStripSeparator71" - Me.ToolStripSeparator71.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator71.Size = New System.Drawing.Size(198, 6) ' 'mnuClimaticTidyandExamineReplaceValues ' Me.mnuClimaticTidyandExamineReplaceValues.Name = "mnuClimaticTidyandExamineReplaceValues" - Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(197, 22) + Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineReplaceValues.Text = "Replace Values..." ' 'mnuClimaticTidyandExamineDuplicateRows ' Me.mnuClimaticTidyandExamineDuplicateRows.Name = "mnuClimaticTidyandExamineDuplicateRows" - Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(197, 22) + Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineDuplicateRows.Text = "Duplicate Rows..." ' 'mnuClimaticTidyandExamineNonNumericCases ' Me.mnuClimaticTidyandExamineNonNumericCases.Name = "mnuClimaticTidyandExamineNonNumericCases" - Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(197, 22) + Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineNonNumericCases.Text = "Non-Numeric Values..." ' 'ToolStripSeparator54 ' Me.ToolStripSeparator54.Name = "ToolStripSeparator54" - Me.ToolStripSeparator54.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator54.Size = New System.Drawing.Size(198, 6) ' 'mnuClimaticTidyandExamineTransformText ' Me.mnuClimaticTidyandExamineTransformText.Name = "mnuClimaticTidyandExamineTransformText" - Me.mnuClimaticTidyandExamineTransformText.Size = New System.Drawing.Size(197, 22) + Me.mnuClimaticTidyandExamineTransformText.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineTransformText.Text = "Transform Text..." ' 'mnuClimaticTidyandExamineSplitText ' Me.mnuClimaticTidyandExamineSplitText.Name = "mnuClimaticTidyandExamineSplitText" - Me.mnuClimaticTidyandExamineSplitText.Size = New System.Drawing.Size(197, 22) + Me.mnuClimaticTidyandExamineSplitText.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineSplitText.Text = "Split Text..." ' 'ToolStripSeparator80 ' Me.ToolStripSeparator80.Name = "ToolStripSeparator80" - Me.ToolStripSeparator80.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator80.Size = New System.Drawing.Size(198, 6) ' 'mnuClimaticTidyandExamineStack ' Me.mnuClimaticTidyandExamineStack.Name = "mnuClimaticTidyandExamineStack" - Me.mnuClimaticTidyandExamineStack.Size = New System.Drawing.Size(197, 22) + Me.mnuClimaticTidyandExamineStack.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineStack.Text = "Stack (Pivot Longer)..." ' 'mnuClimaticTidyandExamineUnstack ' Me.mnuClimaticTidyandExamineUnstack.Name = "mnuClimaticTidyandExamineUnstack" - Me.mnuClimaticTidyandExamineUnstack.Size = New System.Drawing.Size(197, 22) + Me.mnuClimaticTidyandExamineUnstack.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuClimaticTidyandExamineMerge ' Me.mnuClimaticTidyandExamineMerge.Name = "mnuClimaticTidyandExamineMerge" - Me.mnuClimaticTidyandExamineMerge.Size = New System.Drawing.Size(197, 22) - Me.mnuClimaticTidyandExamineMerge.Text = "Merge..." + Me.mnuClimaticTidyandExamineMerge.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineMerge.Text = "Add (Merge) Columns..." ' 'mnuClimaticTidyandExamineAppend ' Me.mnuClimaticTidyandExamineAppend.Name = "mnuClimaticTidyandExamineAppend" - Me.mnuClimaticTidyandExamineAppend.Size = New System.Drawing.Size(197, 22) + Me.mnuClimaticTidyandExamineAppend.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineAppend.Text = "Append (Bind Rows)..." ' 'ToolStripSeparator69 ' Me.ToolStripSeparator69.Name = "ToolStripSeparator69" - Me.ToolStripSeparator69.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator69.Size = New System.Drawing.Size(198, 6) ' 'mnuClimaticTidyDataKey ' Me.mnuClimaticTidyDataKey.Name = "mnuClimaticTidyDataKey" - Me.mnuClimaticTidyDataKey.Size = New System.Drawing.Size(197, 22) + Me.mnuClimaticTidyDataKey.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyDataKey.Text = "Add Key..." ' 'mnuClimaticDates @@ -3523,7 +3523,7 @@ Partial Class frmMain ' Me.mnuPrepareDataFrame.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrameViewData, Me.mnuPrepareDataFrameRenameColumn, Me.mnuPrepareDataFrameDuplicateColumn, Me.mnuPrepareDataFrameRowNumbersNames, Me.ToolStripSeparator1, Me.mnuPrepareDataFrameSort, Me.mnuPrepareDataFrameFilterRows, Me.mnuPrepareDataFrameSelectColumns, Me.mnuPrepareDataFrameReplaceValues, Me.mnuPrepareDataFrameConvertColumns, Me.ToolStripSeparator2, Me.mnuPrepareDataFrameReorderColumns, Me.mnuPrepareDataFrameAddMergeColumns, Me.mnuPrepareDataFrameInsertColumnsRows, Me.mnuPrepareDataFrameDeleteColumnsRows, Me.mnuPrepareDataFrameProtectColumn, Me.mnuPrepareDataFrameFreezeColumns, Me.mnuPrepareDataframeColourByProperty}) Me.mnuPrepareDataFrame.Name = "mnuPrepareDataFrame" - Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareDataFrame.Tag = "Data_Frame" Me.mnuPrepareDataFrame.Text = "Data Frame" ' @@ -3654,7 +3654,7 @@ Partial Class frmMain Me.mnuPrepareCheckData.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right Me.mnuPrepareCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareCheckDataVisualiseData, Me.mnuPrepareCheckDataPivotTable, Me.ToolStripSeparator50, Me.mnuPrepareCheckDataDuplicates, Me.mnuPrepareCheckDataCompareColumns, Me.mnuPrepareCheckDataNonNumericCases, Me.ToolStripSeparator49, Me.mnuPrepareCheckDataBoxplot, Me.mnuPrepareCheckDataOneVariableSummarise, Me.mnuPrepareCheckDataOneVariableGraph, Me.mnuPrepareCheckDataOneWayFrequencies, Me.mnuPrepareCheckDataViewDeleteLabels, Me.ToolStripSeparator41, Me.mnuPrepareCheckDataExportOpenRefine, Me.mnuPrepareCheckDataImportOpenRefine, Me.ToolStripSeparator40, Me.mnuPreparePrepareToShareJitter, Me.mnuPrepareCheckDataPrePareToShareSdcPackage, Me.mnuPrepareCheckDataAnonymiseIDColumn}) Me.mnuPrepareCheckData.Name = "mnuPrepareCheckData" - Me.mnuPrepareCheckData.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareCheckData.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareCheckData.Text = "Check Data" ' 'mnuPrepareCheckDataVisualiseData @@ -3775,25 +3775,25 @@ Partial Class frmMain 'ToolStripSeparator6 ' Me.ToolStripSeparator6.Name = "ToolStripSeparator6" - Me.ToolStripSeparator6.Size = New System.Drawing.Size(166, 6) + Me.ToolStripSeparator6.Size = New System.Drawing.Size(177, 6) ' 'mnuPrepareCalculator ' Me.mnuPrepareCalculator.Name = "mnuPrepareCalculator" - Me.mnuPrepareCalculator.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareCalculator.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareCalculator.Tag = "Calculator..." Me.mnuPrepareCalculator.Text = "Calculator..." ' 'ToolStripSeparator79 ' Me.ToolStripSeparator79.Name = "ToolStripSeparator79" - Me.ToolStripSeparator79.Size = New System.Drawing.Size(166, 6) + Me.ToolStripSeparator79.Size = New System.Drawing.Size(177, 6) ' 'mnuPrepareColumnCalculate ' Me.mnuPrepareColumnCalculate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnNumericRegularSequence, Me.mnuPrepareColumnNumericEnter, Me.ToolStripSeparator25, Me.mnuPrepareColumnNumericRowSummaries, Me.mnuPrepareColumnNumericTransform, Me.mnuPrepareColumnNumericPolynomials, Me.ToolStripSeparator56, Me.mnuPrepareColumnNumericRandomSamples, Me.mnuPrepareColumnNumericPermuteRows}) Me.mnuPrepareColumnCalculate.Name = "mnuPrepareColumnCalculate" - Me.mnuPrepareColumnCalculate.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareColumnCalculate.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareColumnCalculate.Tag = "Column:_Calculate" Me.mnuPrepareColumnCalculate.Text = "Column: Numeric" ' @@ -3858,7 +3858,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnFactor.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnFactorConvertToFactor, Me.mnuPrepareColumnFactorRecodeNumeric, Me.mnuPrepareColumnFactorCountInFactor, Me.ToolStripSeparator12, Me.mnuPrepareColumnFactorRecodeFactor, Me.mnuPrepareColumnFactorCombineFactors, Me.mnuPrepareColumnFactorDummyVariables, Me.ToolStripSeparator14, Me.mnuPrepareColumnFactorLevelsLabels, Me.mnuPrepareColumnFactorReorderLevels, Me.mnuPrepareColumnFactorReferenceLevel, Me.mnuPrepareColumnFactorUnusedLevels, Me.mnuPrepareColumnFactorContrasts, Me.ToolStripSeparator19, Me.mnuPrepareColumnFactorFactorDataFrame}) Me.mnuPrepareColumnFactor.Name = "mnuPrepareColumnFactor" - Me.mnuPrepareColumnFactor.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareColumnFactor.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareColumnFactor.Tag = "Column:_Factor" Me.mnuPrepareColumnFactor.Text = "Column: Factor" ' @@ -3964,7 +3964,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnText.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnTextFindReplace, Me.mnuPrepareColumnTextSearch, Me.mnuPrepareColumnTextTransform, Me.mnuPrepareColumnTextSplit, Me.mnuPrepareColumnTextCombine, Me.mnuPrepareColumnTextMatch, Me.mnuPrepareColumnTextDistance}) Me.mnuPrepareColumnText.Name = "mnuPrepareColumnText" - Me.mnuPrepareColumnText.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareColumnText.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareColumnText.Tag = "Column:_Text" Me.mnuPrepareColumnText.Text = "Column: Text" ' @@ -4023,7 +4023,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnDate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnDateGenerateDate, Me.mnuPrepareColumnDateMakeDate, Me.mnuPrepareColumnDateInfillMissingDates, Me.mnuPrepareColumnDateUseDate, Me.mnuPrepareColumnDateMakeTime, Me.mnuPrepareColumnDateUseTime}) Me.mnuPrepareColumnDate.Name = "mnuPrepareColumnDate" - Me.mnuPrepareColumnDate.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareColumnDate.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareColumnDate.Text = "Column: Date" ' 'mnuPrepareColumnDateGenerateDate @@ -4070,7 +4070,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnDefine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnDefineConvertColumns, Me.ToolStripSeparator55, Me.mnuPrepareColumnDefineCircular}) Me.mnuPrepareColumnDefine.Name = "mnuPrepareColumnDefine" - Me.mnuPrepareColumnDefine.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareColumnDefine.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareColumnDefine.Text = "Column: Define" ' 'mnuPrepareColumnDefineConvertColumns @@ -4093,13 +4093,13 @@ Partial Class frmMain 'ToolStripSeparator4 ' Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(166, 6) + Me.ToolStripSeparator4.Size = New System.Drawing.Size(177, 6) ' 'mnuPrepareDataReshape ' Me.mnuPrepareDataReshape.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnReshapeColumnSummaries, Me.mnuPrepareColumnReshapeGeneralSummaries, Me.ToolStripSeparator10, Me.mnuPrepareColumnReshapeStack, Me.mnuPrepareColumnReshapeUnstack, Me.mnuPrepareColumnReshapeMerge, Me.ToolStripSeparator11, Me.mnuPrepareAppendDataFrame, Me.mnuPrepareColumnReshapeSubset, Me.mnuPrepareColumnReshapeRandomSubset, Me.mnuPrepareColumnReshapeTranspose, Me.mnuPrepareDataReshapeScaleOrDistance, Me.mnuPrepareDataReshapeRandomSplit}) Me.mnuPrepareDataReshape.Name = "mnuPrepareDataReshape" - Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareDataReshape.Tag = "" Me.mnuPrepareDataReshape.Text = "Data Reshape" ' @@ -4189,13 +4189,13 @@ Partial Class frmMain 'ToolStripSeparator7 ' Me.ToolStripSeparator7.Name = "ToolStripSeparator7" - Me.ToolStripSeparator7.Size = New System.Drawing.Size(166, 6) + Me.ToolStripSeparator7.Size = New System.Drawing.Size(177, 6) ' 'mnuPrepareKeysAndLinks ' Me.mnuPrepareKeysAndLinks.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareKeysAndLinksAddKey, Me.mnuPrepareKeysAndLinksViewAndRemoveKey, Me.mnuPrepareKeysAndLinksAddLink, Me.mnuPrepareKeysAndLinksViewAndRemoveKeys, Me.mnuPrepareKeysAndLinksAddComment}) Me.mnuPrepareKeysAndLinks.Name = "mnuPrepareKeysAndLinks" - Me.mnuPrepareKeysAndLinks.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareKeysAndLinks.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareKeysAndLinks.Text = "Keys and Links" ' 'mnuPrepareKeysAndLinksAddKey @@ -4232,7 +4232,7 @@ Partial Class frmMain ' Me.mnuPrepareDataBook.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataObjectDataFrameMetadata, Me.mnuPrepareDataObjectRenameDataFrame, Me.mnuPrepareDataObjectReorderDataFrames, Me.mnuPrepareDataObjectCopyDataFrame, Me.mnuPrepareDataObjectDeleteDataFrame, Me.ToolStripSeparator21, Me.mnuPrepareDataObjectHideDataframes, Me.mnuPrepareDataObjectMetadata, Me.mnuPrepareDataObjectRenameMetadata, Me.mnuPrepareDataObjectReorderMetadata, Me.mnuPrepareDataObjectDeleteMetadata}) Me.mnuPrepareDataBook.Name = "mnuPrepareDataBook" - Me.mnuPrepareDataBook.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareDataBook.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareDataBook.Tag = "Data_Object" Me.mnuPrepareDataBook.Text = "Data Book" ' @@ -4322,7 +4322,7 @@ Partial Class frmMain ' Me.mnuPrepareRObjects.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareRObjectsView, Me.mnuPrepareRObjectsRename, Me.mnuPrepareRObjectsReorder, Me.mnuPrepareRObjectsDelete}) Me.mnuPrepareRObjects.Name = "mnuPrepareRObjects" - Me.mnuPrepareRObjects.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareRObjects.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareRObjects.Tag = "R_Objects" Me.mnuPrepareRObjects.Text = "R Objects" ' @@ -4819,7 +4819,7 @@ Partial Class frmMain ' Me.mnuOptionsByContextCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCheckDataDuplicateRows, Me.mnuOptionsByContextCheckDataCompareColumns, Me.ToolStripSeparator47, Me.mnuOptionsByContextCheckDataOneVariableSummarise, Me.mnuOptionsByContextCheckDataOneVariableGraph, Me.mnuOptionsByContextCheckDataOneVariableFrequencies}) Me.mnuOptionsByContextCheckData.Name = "mnuOptionsByContextCheckData" - Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(180, 22) Me.mnuOptionsByContextCheckData.Text = "Check Data" ' 'mnuOptionsByContextCheckDataDuplicateRows @@ -4861,7 +4861,7 @@ Partial Class frmMain ' Me.mnuOptionsByContextDefine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextDefineOnStation, Me.mnuOptionsByContextDefineOnFarm}) Me.mnuOptionsByContextDefine.Name = "mnuOptionsByContextDefine" - Me.mnuOptionsByContextDefine.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextDefine.Size = New System.Drawing.Size(180, 22) Me.mnuOptionsByContextDefine.Text = "Define" ' 'mnuOptionsByContextDefineOnStation @@ -4880,7 +4880,7 @@ Partial Class frmMain ' Me.mnuOptionsByContextPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions, Me.ToolStripSeparator48, Me.mnuOptionsByContextMergeAdditionalData, Me.mnuOptionsByContextPrepareStack, Me.mnuOptionsByContextPrepareUnstack}) Me.mnuOptionsByContextPrepare.Name = "mnuOptionsByContextPrepare" - Me.mnuOptionsByContextPrepare.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextPrepare.Size = New System.Drawing.Size(180, 22) Me.mnuOptionsByContextPrepare.Text = "Prepare" ' 'mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions @@ -4916,7 +4916,7 @@ Partial Class frmMain ' Me.mnuOptionsByContextDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextDescribeCompareTwoTreatments, Me.mnuOptionsByContextDescribeCompareMultipleTreatments, Me.mnuOptionsByContextDescribeBoxplot}) Me.mnuOptionsByContextDescribe.Name = "mnuOptionsByContextDescribe" - Me.mnuOptionsByContextDescribe.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextDescribe.Size = New System.Drawing.Size(180, 22) Me.mnuOptionsByContextDescribe.Text = "Describe" ' 'mnuOptionsByContextDescribeCompareTwoTreatments @@ -4942,7 +4942,7 @@ Partial Class frmMain ' Me.mnuOptionsByContextModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextModelFitModel, Me.mnuOptionsByContextGeneralFitModel}) Me.mnuOptionsByContextModel.Name = "mnuOptionsByContextModel" - Me.mnuOptionsByContextModel.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextModel.Size = New System.Drawing.Size(180, 22) Me.mnuOptionsByContextModel.Text = "Model" ' 'mnuOptionsByContextModelFitModel @@ -4961,7 +4961,7 @@ Partial Class frmMain ' Me.mnuOptionsByContextCropModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCropModelApsimxExamples}) Me.mnuOptionsByContextCropModel.Name = "mnuOptionsByContextCropModel" - Me.mnuOptionsByContextCropModel.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextCropModel.Size = New System.Drawing.Size(180, 22) Me.mnuOptionsByContextCropModel.Text = "Crop Model" ' 'mnuOptionsByContextCropModelApsimxExamples @@ -5238,9 +5238,7 @@ Partial Class frmMain Me.IsMdiContainer = True Me.MainMenuStrip = Me.mnuBar Me.Name = "frmMain" - Me.Text = "R-Instat " + My.Application.Info.Version.Major.ToString + "." + - My.Application.Info.Version.Minor.ToString + "." + - My.Application.Info.Version.Build.ToString + Me.Text = "R-Instat .." Me.WindowState = System.Windows.Forms.FormWindowState.Maximized Me.stsStrip.ResumeLayout(False) Me.stsStrip.PerformLayout() diff --git a/instat/translations/rInstatTranslations.db b/instat/translations/rInstatTranslations.db index 2425ae6c2ac56ad8f24b0e142fce67d93e197e61..9f9e8ebd4dea91c5fe0d359543f761ced4ecd58d 100644 GIT binary patch delta 553 zcmW;B+g6ML0EXfDr>0+#vMWp_d-Ib-HkArV2Gz)BLg`CQMK;rh%5IH=Z#m^?j$K4+ z&by6nK-XX`%ex#rM^B;fr>uY<$sqr;p)bgPlNDHTtIR655>|y3THCBjtIFDL?Xaq? zomP!iYwfajTYId%);_Dws<-xA2dslu(rU08ttRV`)odNMj#x*nW7cu&gmuz7Wu?{? z{Ti+aH)5UfR58p%{qcCJG?a-pgRu8^b$K$~QC#@j-JBTAEzahO!B|*VnjeX>i7*z6 zwI|b!|M&Y=Ho|F~K?}~J73a`~^SFR^T*M_@#uap+6J5B9ZuFoR*Ki#-(1)Ao$1M!t zHqy9*ySRrz3}F}<+{XwW;2|F2F|ruN6FkK;jA0zlF#%x`FEE8^I-%;6dpZf|LcgM|G)y*WM`{ciwDAe;GfLTOje~DF<>)_l5!Rf$ z4L9JZ8(>-9XRW7L{8Lus*JQNtE!7__e3lipVpf?|ZpEz%D`D-hc3QivN^7@OW$m%{ zTKla1R<(7&I%w5chpfX^t#!mYY9+0dRc9Tuj$8HC39G?sv`$)0)+y_>b;fG`q2T*? zMI;hQ$CkrHHW-K{ewN0v!LMjI^fyx*Hg5zirPW+85l^)Lt}0KC)P-yRGWB6L7sS78 z=L4Q)3tM@P=h?<~cCeFO?B)gb@FIJe<|STchJC!ktGveR?B@**aF9bB<_K@{7DsuT zV;pCecbMZ{-s1%CGtUQn$VZ&y6sI}E#}uD%mQVSN&pF3=E^v`cT;>W_`GN($ Date: Thu, 11 Jul 2024 10:44:19 +0300 Subject: [PATCH 07/13] changes --- instat/ucrDataView.Designer.vb | 32 ++++++++++++++++---------------- instat/ucrDataView.resx | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/instat/ucrDataView.Designer.vb b/instat/ucrDataView.Designer.vb index 312d7b4de5d..ec0dd7c60a1 100644 --- a/instat/ucrDataView.Designer.vb +++ b/instat/ucrDataView.Designer.vb @@ -150,9 +150,9 @@ Partial Class ucrDataView Me.lblRowNext = New System.Windows.Forms.Label() Me.lblColLast = New System.Windows.Forms.Label() Me.lblRowBack = New System.Windows.Forms.Label() + Me.ttGoToRowOrColPage = New System.Windows.Forms.ToolTip(Me.components) Me.ucrReoGrid = New instat.ucrDataViewReoGrid() Me.ucrLinuxGrid = New instat.ucrDataViewLinuxGrid() - Me.ttGoToRowOrColPage = New System.Windows.Forms.ToolTip(Me.components) Me.columnContextMenuStrip.SuspendLayout() Me.cellContextMenuStrip.SuspendLayout() Me.rowContextMenuStrip.SuspendLayout() @@ -684,7 +684,7 @@ Partial Class ucrDataView Me.panelSectionAdvanced.Controls.Add(Me.lblAdvanced) Me.panelSectionAdvanced.Controls.Add(Me.linkStartRestoreBackup) Me.panelSectionAdvanced.Controls.Add(Me.linkStartPasteScriptfromClipboard) - Me.panelSectionAdvanced.Location = New System.Drawing.Point(28, 431) + Me.panelSectionAdvanced.Location = New System.Drawing.Point(28, 444) Me.panelSectionAdvanced.Name = "panelSectionAdvanced" Me.panelSectionAdvanced.Size = New System.Drawing.Size(374, 105) Me.panelSectionAdvanced.TabIndex = 12 @@ -695,7 +695,7 @@ Partial Class ucrDataView Me.linkStartAddRPackage.AutoSize = True Me.linkStartAddRPackage.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartAddRPackage.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartAddRPackage.Location = New System.Drawing.Point(7, 65) + Me.linkStartAddRPackage.Location = New System.Drawing.Point(5, 66) Me.linkStartAddRPackage.Name = "linkStartAddRPackage" Me.linkStartAddRPackage.Size = New System.Drawing.Size(143, 13) Me.linkStartAddRPackage.TabIndex = 6 @@ -719,7 +719,7 @@ Partial Class ucrDataView Me.linkStartRestoreBackup.AutoSize = True Me.linkStartRestoreBackup.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartRestoreBackup.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartRestoreBackup.Location = New System.Drawing.Point(7, 47) + Me.linkStartRestoreBackup.Location = New System.Drawing.Point(5, 48) Me.linkStartRestoreBackup.Name = "linkStartRestoreBackup" Me.linkStartRestoreBackup.Size = New System.Drawing.Size(166, 13) Me.linkStartRestoreBackup.TabIndex = 4 @@ -732,7 +732,7 @@ Partial Class ucrDataView Me.linkStartPasteScriptfromClipboard.AutoSize = True Me.linkStartPasteScriptfromClipboard.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartPasteScriptfromClipboard.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartPasteScriptfromClipboard.Location = New System.Drawing.Point(8, 30) + Me.linkStartPasteScriptfromClipboard.Location = New System.Drawing.Point(5, 30) Me.linkStartPasteScriptfromClipboard.Name = "linkStartPasteScriptfromClipboard" Me.linkStartPasteScriptfromClipboard.Size = New System.Drawing.Size(134, 13) Me.linkStartPasteScriptfromClipboard.TabIndex = 5 @@ -755,7 +755,7 @@ Partial Class ucrDataView Me.lblRecent.AutoSize = True Me.lblRecent.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblRecent.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblRecent.Location = New System.Drawing.Point(4, 8) + Me.lblRecent.Location = New System.Drawing.Point(5, 8) Me.lblRecent.Name = "lblRecent" Me.lblRecent.Size = New System.Drawing.Size(80, 25) Me.lblRecent.TabIndex = 1 @@ -766,7 +766,7 @@ Partial Class ucrDataView Me.panelRecentMenuItems.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.panelRecentMenuItems.AutoScroll = True - Me.panelRecentMenuItems.Location = New System.Drawing.Point(9, 44) + Me.panelRecentMenuItems.Location = New System.Drawing.Point(5, 34) Me.panelRecentMenuItems.Name = "panelRecentMenuItems" Me.panelRecentMenuItems.Size = New System.Drawing.Size(159, 138) Me.panelRecentMenuItems.TabIndex = 6 @@ -779,7 +779,7 @@ Partial Class ucrDataView Me.panelSectionHelp.Controls.Add(Me.linkHelpRInstatResourcesSite) Me.panelSectionHelp.Location = New System.Drawing.Point(28, 314) Me.panelSectionHelp.Name = "panelSectionHelp" - Me.panelSectionHelp.Size = New System.Drawing.Size(374, 109) + Me.panelSectionHelp.Size = New System.Drawing.Size(374, 111) Me.panelSectionHelp.TabIndex = 12 ' 'linkHelpData @@ -788,7 +788,7 @@ Partial Class ucrDataView Me.linkHelpData.AutoSize = True Me.linkHelpData.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkHelpData.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkHelpData.Location = New System.Drawing.Point(8, 49) + Me.linkHelpData.Location = New System.Drawing.Point(5, 47) Me.linkHelpData.Name = "linkHelpData" Me.linkHelpData.Size = New System.Drawing.Size(30, 13) Me.linkHelpData.TabIndex = 12 @@ -801,7 +801,7 @@ Partial Class ucrDataView Me.linkHelpGettingStarted.AutoSize = True Me.linkHelpGettingStarted.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkHelpGettingStarted.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkHelpGettingStarted.Location = New System.Drawing.Point(8, 33) + Me.linkHelpGettingStarted.Location = New System.Drawing.Point(5, 29) Me.linkHelpGettingStarted.Name = "linkHelpGettingStarted" Me.linkHelpGettingStarted.Size = New System.Drawing.Size(78, 13) Me.linkHelpGettingStarted.TabIndex = 11 @@ -813,7 +813,7 @@ Partial Class ucrDataView Me.lblHelp.AutoSize = True Me.lblHelp.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblHelp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHelp.Location = New System.Drawing.Point(6, 3) + Me.lblHelp.Location = New System.Drawing.Point(5, 3) Me.lblHelp.Name = "lblHelp" Me.lblHelp.Size = New System.Drawing.Size(56, 25) Me.lblHelp.TabIndex = 2 @@ -825,7 +825,7 @@ Partial Class ucrDataView Me.linkHelpRInstatResourcesSite.AutoSize = True Me.linkHelpRInstatResourcesSite.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkHelpRInstatResourcesSite.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkHelpRInstatResourcesSite.Location = New System.Drawing.Point(8, 65) + Me.linkHelpRInstatResourcesSite.Location = New System.Drawing.Point(5, 65) Me.linkHelpRInstatResourcesSite.Name = "linkHelpRInstatResourcesSite" Me.linkHelpRInstatResourcesSite.Size = New System.Drawing.Size(119, 13) Me.linkHelpRInstatResourcesSite.TabIndex = 9 @@ -850,7 +850,7 @@ Partial Class ucrDataView Me.linkStartPasteData.AutoSize = True Me.linkStartPasteData.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartPasteData.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartPasteData.Location = New System.Drawing.Point(7, 84) + Me.linkStartPasteData.Location = New System.Drawing.Point(5, 84) Me.linkStartPasteData.Name = "linkStartPasteData" Me.linkStartPasteData.Size = New System.Drawing.Size(136, 13) Me.linkStartPasteData.TabIndex = 7 @@ -874,7 +874,7 @@ Partial Class ucrDataView Me.linkStartNewDataFrame.AutoSize = True Me.linkStartNewDataFrame.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartNewDataFrame.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartNewDataFrame.Location = New System.Drawing.Point(7, 31) + Me.linkStartNewDataFrame.Location = New System.Drawing.Point(5, 30) Me.linkStartNewDataFrame.Name = "linkStartNewDataFrame" Me.linkStartNewDataFrame.Size = New System.Drawing.Size(96, 13) Me.linkStartNewDataFrame.TabIndex = 3 @@ -887,7 +887,7 @@ Partial Class ucrDataView Me.linkStartOpenFile.AutoSize = True Me.linkStartOpenFile.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartOpenFile.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartOpenFile.Location = New System.Drawing.Point(7, 48) + Me.linkStartOpenFile.Location = New System.Drawing.Point(5, 48) Me.linkStartOpenFile.Name = "linkStartOpenFile" Me.linkStartOpenFile.Size = New System.Drawing.Size(90, 13) Me.linkStartOpenFile.TabIndex = 4 @@ -900,7 +900,7 @@ Partial Class ucrDataView Me.linkStartOpenLibrary.AutoSize = True Me.linkStartOpenLibrary.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartOpenLibrary.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartOpenLibrary.Location = New System.Drawing.Point(7, 66) + Me.linkStartOpenLibrary.Location = New System.Drawing.Point(5, 66) Me.linkStartOpenLibrary.Name = "linkStartOpenLibrary" Me.linkStartOpenLibrary.Size = New System.Drawing.Size(105, 13) Me.linkStartOpenLibrary.TabIndex = 5 diff --git a/instat/ucrDataView.resx b/instat/ucrDataView.resx index 796dfc9bc07..59af2d7d414 100644 --- a/instat/ucrDataView.resx +++ b/instat/ucrDataView.resx @@ -133,6 +133,6 @@ 706, 17 - 50 + 25 \ No newline at end of file From 2d70476576f9daf0c5a2727f823c427117a055d0 Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Thu, 11 Jul 2024 11:09:16 +0300 Subject: [PATCH 08/13] Adjusting locations --- instat/ucrDataView.Designer.vb | 36 +++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/instat/ucrDataView.Designer.vb b/instat/ucrDataView.Designer.vb index ec0dd7c60a1..6643a567f46 100644 --- a/instat/ucrDataView.Designer.vb +++ b/instat/ucrDataView.Designer.vb @@ -684,7 +684,7 @@ Partial Class ucrDataView Me.panelSectionAdvanced.Controls.Add(Me.lblAdvanced) Me.panelSectionAdvanced.Controls.Add(Me.linkStartRestoreBackup) Me.panelSectionAdvanced.Controls.Add(Me.linkStartPasteScriptfromClipboard) - Me.panelSectionAdvanced.Location = New System.Drawing.Point(28, 444) + Me.panelSectionAdvanced.Location = New System.Drawing.Point(28, 446) Me.panelSectionAdvanced.Name = "panelSectionAdvanced" Me.panelSectionAdvanced.Size = New System.Drawing.Size(374, 105) Me.panelSectionAdvanced.TabIndex = 12 @@ -695,12 +695,12 @@ Partial Class ucrDataView Me.linkStartAddRPackage.AutoSize = True Me.linkStartAddRPackage.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartAddRPackage.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartAddRPackage.Location = New System.Drawing.Point(5, 66) + Me.linkStartAddRPackage.Location = New System.Drawing.Point(5, 68) Me.linkStartAddRPackage.Name = "linkStartAddRPackage" - Me.linkStartAddRPackage.Size = New System.Drawing.Size(143, 13) + Me.linkStartAddRPackage.Size = New System.Drawing.Size(182, 13) Me.linkStartAddRPackage.TabIndex = 6 Me.linkStartAddRPackage.TabStop = True - Me.linkStartAddRPackage.Text = "Add R package to R-Instat..." + Me.linkStartAddRPackage.Text = "Add R package to R-Instat... (Online)" ' 'lblAdvanced ' @@ -719,7 +719,7 @@ Partial Class ucrDataView Me.linkStartRestoreBackup.AutoSize = True Me.linkStartRestoreBackup.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartRestoreBackup.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartRestoreBackup.Location = New System.Drawing.Point(5, 48) + Me.linkStartRestoreBackup.Location = New System.Drawing.Point(5, 50) Me.linkStartRestoreBackup.Name = "linkStartRestoreBackup" Me.linkStartRestoreBackup.Size = New System.Drawing.Size(166, 13) Me.linkStartRestoreBackup.TabIndex = 4 @@ -732,7 +732,7 @@ Partial Class ucrDataView Me.linkStartPasteScriptfromClipboard.AutoSize = True Me.linkStartPasteScriptfromClipboard.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartPasteScriptfromClipboard.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartPasteScriptfromClipboard.Location = New System.Drawing.Point(5, 30) + Me.linkStartPasteScriptfromClipboard.Location = New System.Drawing.Point(5, 32) Me.linkStartPasteScriptfromClipboard.Name = "linkStartPasteScriptfromClipboard" Me.linkStartPasteScriptfromClipboard.Size = New System.Drawing.Size(134, 13) Me.linkStartPasteScriptfromClipboard.TabIndex = 5 @@ -755,7 +755,7 @@ Partial Class ucrDataView Me.lblRecent.AutoSize = True Me.lblRecent.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblRecent.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblRecent.Location = New System.Drawing.Point(5, 8) + Me.lblRecent.Location = New System.Drawing.Point(5, 4) Me.lblRecent.Name = "lblRecent" Me.lblRecent.Size = New System.Drawing.Size(80, 25) Me.lblRecent.TabIndex = 1 @@ -766,7 +766,7 @@ Partial Class ucrDataView Me.panelRecentMenuItems.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.panelRecentMenuItems.AutoScroll = True - Me.panelRecentMenuItems.Location = New System.Drawing.Point(5, 34) + Me.panelRecentMenuItems.Location = New System.Drawing.Point(5, 32) Me.panelRecentMenuItems.Name = "panelRecentMenuItems" Me.panelRecentMenuItems.Size = New System.Drawing.Size(159, 138) Me.panelRecentMenuItems.TabIndex = 6 @@ -788,7 +788,7 @@ Partial Class ucrDataView Me.linkHelpData.AutoSize = True Me.linkHelpData.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkHelpData.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkHelpData.Location = New System.Drawing.Point(5, 47) + Me.linkHelpData.Location = New System.Drawing.Point(5, 50) Me.linkHelpData.Name = "linkHelpData" Me.linkHelpData.Size = New System.Drawing.Size(30, 13) Me.linkHelpData.TabIndex = 12 @@ -801,7 +801,7 @@ Partial Class ucrDataView Me.linkHelpGettingStarted.AutoSize = True Me.linkHelpGettingStarted.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkHelpGettingStarted.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkHelpGettingStarted.Location = New System.Drawing.Point(5, 29) + Me.linkHelpGettingStarted.Location = New System.Drawing.Point(5, 32) Me.linkHelpGettingStarted.Name = "linkHelpGettingStarted" Me.linkHelpGettingStarted.Size = New System.Drawing.Size(78, 13) Me.linkHelpGettingStarted.TabIndex = 11 @@ -813,7 +813,7 @@ Partial Class ucrDataView Me.lblHelp.AutoSize = True Me.lblHelp.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblHelp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHelp.Location = New System.Drawing.Point(5, 3) + Me.lblHelp.Location = New System.Drawing.Point(5, 4) Me.lblHelp.Name = "lblHelp" Me.lblHelp.Size = New System.Drawing.Size(56, 25) Me.lblHelp.TabIndex = 2 @@ -825,12 +825,12 @@ Partial Class ucrDataView Me.linkHelpRInstatResourcesSite.AutoSize = True Me.linkHelpRInstatResourcesSite.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkHelpRInstatResourcesSite.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkHelpRInstatResourcesSite.Location = New System.Drawing.Point(5, 65) + Me.linkHelpRInstatResourcesSite.Location = New System.Drawing.Point(5, 68) Me.linkHelpRInstatResourcesSite.Name = "linkHelpRInstatResourcesSite" - Me.linkHelpRInstatResourcesSite.Size = New System.Drawing.Size(119, 13) + Me.linkHelpRInstatResourcesSite.Size = New System.Drawing.Size(158, 13) Me.linkHelpRInstatResourcesSite.TabIndex = 9 Me.linkHelpRInstatResourcesSite.TabStop = True - Me.linkHelpRInstatResourcesSite.Text = "R-Instat Resources Site" + Me.linkHelpRInstatResourcesSite.Text = "R-Instat Resources Site (Online)" ' 'panelSectionStart ' @@ -850,7 +850,7 @@ Partial Class ucrDataView Me.linkStartPasteData.AutoSize = True Me.linkStartPasteData.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartPasteData.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartPasteData.Location = New System.Drawing.Point(5, 84) + Me.linkStartPasteData.Location = New System.Drawing.Point(5, 86) Me.linkStartPasteData.Name = "linkStartPasteData" Me.linkStartPasteData.Size = New System.Drawing.Size(136, 13) Me.linkStartPasteData.TabIndex = 7 @@ -874,7 +874,7 @@ Partial Class ucrDataView Me.linkStartNewDataFrame.AutoSize = True Me.linkStartNewDataFrame.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartNewDataFrame.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartNewDataFrame.Location = New System.Drawing.Point(5, 30) + Me.linkStartNewDataFrame.Location = New System.Drawing.Point(5, 32) Me.linkStartNewDataFrame.Name = "linkStartNewDataFrame" Me.linkStartNewDataFrame.Size = New System.Drawing.Size(96, 13) Me.linkStartNewDataFrame.TabIndex = 3 @@ -887,7 +887,7 @@ Partial Class ucrDataView Me.linkStartOpenFile.AutoSize = True Me.linkStartOpenFile.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartOpenFile.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartOpenFile.Location = New System.Drawing.Point(5, 48) + Me.linkStartOpenFile.Location = New System.Drawing.Point(5, 50) Me.linkStartOpenFile.Name = "linkStartOpenFile" Me.linkStartOpenFile.Size = New System.Drawing.Size(90, 13) Me.linkStartOpenFile.TabIndex = 4 @@ -900,7 +900,7 @@ Partial Class ucrDataView Me.linkStartOpenLibrary.AutoSize = True Me.linkStartOpenLibrary.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartOpenLibrary.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartOpenLibrary.Location = New System.Drawing.Point(5, 66) + Me.linkStartOpenLibrary.Location = New System.Drawing.Point(5, 68) Me.linkStartOpenLibrary.Name = "linkStartOpenLibrary" Me.linkStartOpenLibrary.Size = New System.Drawing.Size(105, 13) Me.linkStartOpenLibrary.TabIndex = 5 From 97e220ab4cd9ab1b205d4bb42e6e7b56262ec823 Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Sat, 13 Jul 2024 09:22:14 +0300 Subject: [PATCH 09/13] frontmenu --- instat/ucrDataView.Designer.vb | 44 +++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/instat/ucrDataView.Designer.vb b/instat/ucrDataView.Designer.vb index 6643a567f46..77e79a42f2b 100644 --- a/instat/ucrDataView.Designer.vb +++ b/instat/ucrDataView.Designer.vb @@ -668,9 +668,9 @@ Partial Class ucrDataView 'panelSectionsAll ' Me.panelSectionsAll.Controls.Add(Me.panelSectionAdvanced) - Me.panelSectionsAll.Controls.Add(Me.panelSectionRecent) Me.panelSectionsAll.Controls.Add(Me.panelSectionHelp) Me.panelSectionsAll.Controls.Add(Me.panelSectionStart) + Me.panelSectionsAll.Controls.Add(Me.panelSectionRecent) Me.panelSectionsAll.Dock = System.Windows.Forms.DockStyle.Fill Me.panelSectionsAll.Location = New System.Drawing.Point(3, 23) Me.panelSectionsAll.Name = "panelSectionsAll" @@ -684,9 +684,9 @@ Partial Class ucrDataView Me.panelSectionAdvanced.Controls.Add(Me.lblAdvanced) Me.panelSectionAdvanced.Controls.Add(Me.linkStartRestoreBackup) Me.panelSectionAdvanced.Controls.Add(Me.linkStartPasteScriptfromClipboard) - Me.panelSectionAdvanced.Location = New System.Drawing.Point(28, 446) + Me.panelSectionAdvanced.Location = New System.Drawing.Point(27, 410) Me.panelSectionAdvanced.Name = "panelSectionAdvanced" - Me.panelSectionAdvanced.Size = New System.Drawing.Size(374, 105) + Me.panelSectionAdvanced.Size = New System.Drawing.Size(374, 83) Me.panelSectionAdvanced.TabIndex = 12 ' 'linkStartAddRPackage @@ -695,7 +695,7 @@ Partial Class ucrDataView Me.linkStartAddRPackage.AutoSize = True Me.linkStartAddRPackage.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartAddRPackage.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartAddRPackage.Location = New System.Drawing.Point(5, 68) + Me.linkStartAddRPackage.Location = New System.Drawing.Point(5, 64) Me.linkStartAddRPackage.Name = "linkStartAddRPackage" Me.linkStartAddRPackage.Size = New System.Drawing.Size(182, 13) Me.linkStartAddRPackage.TabIndex = 6 @@ -707,7 +707,7 @@ Partial Class ucrDataView Me.lblAdvanced.AutoSize = True Me.lblAdvanced.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAdvanced.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblAdvanced.Location = New System.Drawing.Point(5, 4) + Me.lblAdvanced.Location = New System.Drawing.Point(3, 4) Me.lblAdvanced.Name = "lblAdvanced" Me.lblAdvanced.Size = New System.Drawing.Size(108, 25) Me.lblAdvanced.TabIndex = 0 @@ -719,7 +719,7 @@ Partial Class ucrDataView Me.linkStartRestoreBackup.AutoSize = True Me.linkStartRestoreBackup.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartRestoreBackup.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartRestoreBackup.Location = New System.Drawing.Point(5, 50) + Me.linkStartRestoreBackup.Location = New System.Drawing.Point(5, 47) Me.linkStartRestoreBackup.Name = "linkStartRestoreBackup" Me.linkStartRestoreBackup.Size = New System.Drawing.Size(166, 13) Me.linkStartRestoreBackup.TabIndex = 4 @@ -732,7 +732,7 @@ Partial Class ucrDataView Me.linkStartPasteScriptfromClipboard.AutoSize = True Me.linkStartPasteScriptfromClipboard.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartPasteScriptfromClipboard.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartPasteScriptfromClipboard.Location = New System.Drawing.Point(5, 32) + Me.linkStartPasteScriptfromClipboard.Location = New System.Drawing.Point(5, 30) Me.linkStartPasteScriptfromClipboard.Name = "linkStartPasteScriptfromClipboard" Me.linkStartPasteScriptfromClipboard.Size = New System.Drawing.Size(134, 13) Me.linkStartPasteScriptfromClipboard.TabIndex = 5 @@ -755,7 +755,7 @@ Partial Class ucrDataView Me.lblRecent.AutoSize = True Me.lblRecent.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblRecent.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblRecent.Location = New System.Drawing.Point(5, 4) + Me.lblRecent.Location = New System.Drawing.Point(3, 4) Me.lblRecent.Name = "lblRecent" Me.lblRecent.Size = New System.Drawing.Size(80, 25) Me.lblRecent.TabIndex = 1 @@ -766,7 +766,7 @@ Partial Class ucrDataView Me.panelRecentMenuItems.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.panelRecentMenuItems.AutoScroll = True - Me.panelRecentMenuItems.Location = New System.Drawing.Point(5, 32) + Me.panelRecentMenuItems.Location = New System.Drawing.Point(5, 30) Me.panelRecentMenuItems.Name = "panelRecentMenuItems" Me.panelRecentMenuItems.Size = New System.Drawing.Size(159, 138) Me.panelRecentMenuItems.TabIndex = 6 @@ -777,9 +777,9 @@ Partial Class ucrDataView Me.panelSectionHelp.Controls.Add(Me.linkHelpGettingStarted) Me.panelSectionHelp.Controls.Add(Me.lblHelp) Me.panelSectionHelp.Controls.Add(Me.linkHelpRInstatResourcesSite) - Me.panelSectionHelp.Location = New System.Drawing.Point(28, 314) + Me.panelSectionHelp.Location = New System.Drawing.Point(28, 317) Me.panelSectionHelp.Name = "panelSectionHelp" - Me.panelSectionHelp.Size = New System.Drawing.Size(374, 111) + Me.panelSectionHelp.Size = New System.Drawing.Size(374, 81) Me.panelSectionHelp.TabIndex = 12 ' 'linkHelpData @@ -788,7 +788,7 @@ Partial Class ucrDataView Me.linkHelpData.AutoSize = True Me.linkHelpData.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkHelpData.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkHelpData.Location = New System.Drawing.Point(5, 50) + Me.linkHelpData.Location = New System.Drawing.Point(5, 47) Me.linkHelpData.Name = "linkHelpData" Me.linkHelpData.Size = New System.Drawing.Size(30, 13) Me.linkHelpData.TabIndex = 12 @@ -801,7 +801,7 @@ Partial Class ucrDataView Me.linkHelpGettingStarted.AutoSize = True Me.linkHelpGettingStarted.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkHelpGettingStarted.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkHelpGettingStarted.Location = New System.Drawing.Point(5, 32) + Me.linkHelpGettingStarted.Location = New System.Drawing.Point(5, 30) Me.linkHelpGettingStarted.Name = "linkHelpGettingStarted" Me.linkHelpGettingStarted.Size = New System.Drawing.Size(78, 13) Me.linkHelpGettingStarted.TabIndex = 11 @@ -813,7 +813,7 @@ Partial Class ucrDataView Me.lblHelp.AutoSize = True Me.lblHelp.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblHelp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHelp.Location = New System.Drawing.Point(5, 4) + Me.lblHelp.Location = New System.Drawing.Point(3, 4) Me.lblHelp.Name = "lblHelp" Me.lblHelp.Size = New System.Drawing.Size(56, 25) Me.lblHelp.TabIndex = 2 @@ -825,7 +825,7 @@ Partial Class ucrDataView Me.linkHelpRInstatResourcesSite.AutoSize = True Me.linkHelpRInstatResourcesSite.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkHelpRInstatResourcesSite.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkHelpRInstatResourcesSite.Location = New System.Drawing.Point(5, 68) + Me.linkHelpRInstatResourcesSite.Location = New System.Drawing.Point(5, 64) Me.linkHelpRInstatResourcesSite.Name = "linkHelpRInstatResourcesSite" Me.linkHelpRInstatResourcesSite.Size = New System.Drawing.Size(158, 13) Me.linkHelpRInstatResourcesSite.TabIndex = 9 @@ -839,9 +839,9 @@ Partial Class ucrDataView Me.panelSectionStart.Controls.Add(Me.linkStartNewDataFrame) Me.panelSectionStart.Controls.Add(Me.linkStartOpenFile) Me.panelSectionStart.Controls.Add(Me.linkStartOpenLibrary) - Me.panelSectionStart.Location = New System.Drawing.Point(28, 6) + Me.panelSectionStart.Location = New System.Drawing.Point(28, 15) Me.panelSectionStart.Name = "panelSectionStart" - Me.panelSectionStart.Size = New System.Drawing.Size(374, 113) + Me.panelSectionStart.Size = New System.Drawing.Size(374, 100) Me.panelSectionStart.TabIndex = 11 ' 'linkStartPasteData @@ -850,7 +850,7 @@ Partial Class ucrDataView Me.linkStartPasteData.AutoSize = True Me.linkStartPasteData.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartPasteData.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartPasteData.Location = New System.Drawing.Point(5, 86) + Me.linkStartPasteData.Location = New System.Drawing.Point(5, 81) Me.linkStartPasteData.Name = "linkStartPasteData" Me.linkStartPasteData.Size = New System.Drawing.Size(136, 13) Me.linkStartPasteData.TabIndex = 7 @@ -862,7 +862,7 @@ Partial Class ucrDataView Me.lblStart.AutoSize = True Me.lblStart.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblStart.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblStart.Location = New System.Drawing.Point(5, 4) + Me.lblStart.Location = New System.Drawing.Point(3, 4) Me.lblStart.Name = "lblStart" Me.lblStart.Size = New System.Drawing.Size(57, 25) Me.lblStart.TabIndex = 0 @@ -874,7 +874,7 @@ Partial Class ucrDataView Me.linkStartNewDataFrame.AutoSize = True Me.linkStartNewDataFrame.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartNewDataFrame.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartNewDataFrame.Location = New System.Drawing.Point(5, 32) + Me.linkStartNewDataFrame.Location = New System.Drawing.Point(5, 47) Me.linkStartNewDataFrame.Name = "linkStartNewDataFrame" Me.linkStartNewDataFrame.Size = New System.Drawing.Size(96, 13) Me.linkStartNewDataFrame.TabIndex = 3 @@ -887,7 +887,7 @@ Partial Class ucrDataView Me.linkStartOpenFile.AutoSize = True Me.linkStartOpenFile.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartOpenFile.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartOpenFile.Location = New System.Drawing.Point(5, 50) + Me.linkStartOpenFile.Location = New System.Drawing.Point(5, 30) Me.linkStartOpenFile.Name = "linkStartOpenFile" Me.linkStartOpenFile.Size = New System.Drawing.Size(90, 13) Me.linkStartOpenFile.TabIndex = 4 @@ -900,7 +900,7 @@ Partial Class ucrDataView Me.linkStartOpenLibrary.AutoSize = True Me.linkStartOpenLibrary.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartOpenLibrary.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartOpenLibrary.Location = New System.Drawing.Point(5, 68) + Me.linkStartOpenLibrary.Location = New System.Drawing.Point(5, 64) Me.linkStartOpenLibrary.Name = "linkStartOpenLibrary" Me.linkStartOpenLibrary.Size = New System.Drawing.Size(105, 13) Me.linkStartOpenLibrary.TabIndex = 5 From cf331465ad338d7150e043e68af76fd2ac1cef39 Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Sat, 13 Jul 2024 13:40:07 +0300 Subject: [PATCH 10/13] Changing the label to "restore backup" --- instat/ucrDataView.Designer.vb | 82 +++++++++++++++++----------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/instat/ucrDataView.Designer.vb b/instat/ucrDataView.Designer.vb index 77e79a42f2b..98725d1c360 100644 --- a/instat/ucrDataView.Designer.vb +++ b/instat/ucrDataView.Designer.vb @@ -125,9 +125,6 @@ Partial Class ucrDataView Me.lblAdvanced = New System.Windows.Forms.Label() Me.linkStartRestoreBackup = New System.Windows.Forms.LinkLabel() Me.linkStartPasteScriptfromClipboard = New System.Windows.Forms.LinkLabel() - Me.panelSectionRecent = New System.Windows.Forms.Panel() - Me.lblRecent = New System.Windows.Forms.Label() - Me.panelRecentMenuItems = New System.Windows.Forms.Panel() Me.panelSectionHelp = New System.Windows.Forms.Panel() Me.linkHelpData = New System.Windows.Forms.LinkLabel() Me.linkHelpGettingStarted = New System.Windows.Forms.LinkLabel() @@ -139,6 +136,9 @@ Partial Class ucrDataView Me.linkStartNewDataFrame = New System.Windows.Forms.LinkLabel() Me.linkStartOpenFile = New System.Windows.Forms.LinkLabel() Me.linkStartOpenLibrary = New System.Windows.Forms.LinkLabel() + Me.panelSectionRecent = New System.Windows.Forms.Panel() + Me.lblRecent = New System.Windows.Forms.Label() + Me.panelRecentMenuItems = New System.Windows.Forms.Panel() Me.TblPanPageDisplay = New System.Windows.Forms.TableLayoutPanel() Me.lblColFirst = New System.Windows.Forms.Label() Me.lblColDisplay = New System.Windows.Forms.Label() @@ -150,9 +150,9 @@ Partial Class ucrDataView Me.lblRowNext = New System.Windows.Forms.Label() Me.lblColLast = New System.Windows.Forms.Label() Me.lblRowBack = New System.Windows.Forms.Label() - Me.ttGoToRowOrColPage = New System.Windows.Forms.ToolTip(Me.components) Me.ucrReoGrid = New instat.ucrDataViewReoGrid() Me.ucrLinuxGrid = New instat.ucrDataViewLinuxGrid() + Me.ttGoToRowOrColPage = New System.Windows.Forms.ToolTip(Me.components) Me.columnContextMenuStrip.SuspendLayout() Me.cellContextMenuStrip.SuspendLayout() Me.rowContextMenuStrip.SuspendLayout() @@ -160,9 +160,9 @@ Partial Class ucrDataView Me.tlpTableContainer.SuspendLayout() Me.panelSectionsAll.SuspendLayout() Me.panelSectionAdvanced.SuspendLayout() - Me.panelSectionRecent.SuspendLayout() Me.panelSectionHelp.SuspendLayout() Me.panelSectionStart.SuspendLayout() + Me.panelSectionRecent.SuspendLayout() Me.TblPanPageDisplay.SuspendLayout() Me.SuspendLayout() ' @@ -721,10 +721,10 @@ Partial Class ucrDataView Me.linkStartRestoreBackup.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline Me.linkStartRestoreBackup.Location = New System.Drawing.Point(5, 47) Me.linkStartRestoreBackup.Name = "linkStartRestoreBackup" - Me.linkStartRestoreBackup.Size = New System.Drawing.Size(166, 13) + Me.linkStartRestoreBackup.Size = New System.Drawing.Size(142, 13) Me.linkStartRestoreBackup.TabIndex = 4 Me.linkStartRestoreBackup.TabStop = True - Me.linkStartRestoreBackup.Text = "Restore Data or Log from Backup" + Me.linkStartRestoreBackup.Text = "Restore Data from Backup..." ' 'linkStartPasteScriptfromClipboard ' @@ -739,38 +739,6 @@ Partial Class ucrDataView Me.linkStartPasteScriptfromClipboard.TabStop = True Me.linkStartPasteScriptfromClipboard.Text = "Paste Script from Clipboard" ' - 'panelSectionRecent - ' - Me.panelSectionRecent.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.panelSectionRecent.Controls.Add(Me.lblRecent) - Me.panelSectionRecent.Controls.Add(Me.panelRecentMenuItems) - Me.panelSectionRecent.Location = New System.Drawing.Point(28, 124) - Me.panelSectionRecent.Name = "panelSectionRecent" - Me.panelSectionRecent.Size = New System.Drawing.Size(179, 186) - Me.panelSectionRecent.TabIndex = 13 - ' - 'lblRecent - ' - Me.lblRecent.AutoSize = True - Me.lblRecent.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblRecent.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblRecent.Location = New System.Drawing.Point(3, 4) - Me.lblRecent.Name = "lblRecent" - Me.lblRecent.Size = New System.Drawing.Size(80, 25) - Me.lblRecent.TabIndex = 1 - Me.lblRecent.Text = "Recent" - ' - 'panelRecentMenuItems - ' - Me.panelRecentMenuItems.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.panelRecentMenuItems.AutoScroll = True - Me.panelRecentMenuItems.Location = New System.Drawing.Point(5, 30) - Me.panelRecentMenuItems.Name = "panelRecentMenuItems" - Me.panelRecentMenuItems.Size = New System.Drawing.Size(159, 138) - Me.panelRecentMenuItems.TabIndex = 6 - ' 'panelSectionHelp ' Me.panelSectionHelp.Controls.Add(Me.linkHelpData) @@ -907,6 +875,38 @@ Partial Class ucrDataView Me.linkStartOpenLibrary.TabStop = True Me.linkStartOpenLibrary.Text = "Import From Library..." ' + 'panelSectionRecent + ' + Me.panelSectionRecent.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.panelSectionRecent.Controls.Add(Me.lblRecent) + Me.panelSectionRecent.Controls.Add(Me.panelRecentMenuItems) + Me.panelSectionRecent.Location = New System.Drawing.Point(28, 124) + Me.panelSectionRecent.Name = "panelSectionRecent" + Me.panelSectionRecent.Size = New System.Drawing.Size(179, 186) + Me.panelSectionRecent.TabIndex = 13 + ' + 'lblRecent + ' + Me.lblRecent.AutoSize = True + Me.lblRecent.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblRecent.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblRecent.Location = New System.Drawing.Point(3, 4) + Me.lblRecent.Name = "lblRecent" + Me.lblRecent.Size = New System.Drawing.Size(80, 25) + Me.lblRecent.TabIndex = 1 + Me.lblRecent.Text = "Recent" + ' + 'panelRecentMenuItems + ' + Me.panelRecentMenuItems.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.panelRecentMenuItems.AutoScroll = True + Me.panelRecentMenuItems.Location = New System.Drawing.Point(5, 30) + Me.panelRecentMenuItems.Name = "panelRecentMenuItems" + Me.panelRecentMenuItems.Size = New System.Drawing.Size(159, 138) + Me.panelRecentMenuItems.TabIndex = 6 + ' 'TblPanPageDisplay ' Me.TblPanPageDisplay.AutoSize = True @@ -1091,12 +1091,12 @@ Partial Class ucrDataView Me.panelSectionsAll.ResumeLayout(False) Me.panelSectionAdvanced.ResumeLayout(False) Me.panelSectionAdvanced.PerformLayout() - Me.panelSectionRecent.ResumeLayout(False) - Me.panelSectionRecent.PerformLayout() Me.panelSectionHelp.ResumeLayout(False) Me.panelSectionHelp.PerformLayout() Me.panelSectionStart.ResumeLayout(False) Me.panelSectionStart.PerformLayout() + Me.panelSectionRecent.ResumeLayout(False) + Me.panelSectionRecent.PerformLayout() Me.TblPanPageDisplay.ResumeLayout(False) Me.TblPanPageDisplay.PerformLayout() Me.ResumeLayout(False) From 0b775335613a80645f193b752dd5fb0ecad653be Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 15 Jul 2024 19:55:33 +0200 Subject: [PATCH 11/13] Additional feature in the Find dialog --- instat/dlgFindInVariableOrFilter.Designer.vb | 33 +++++++++++++------ instat/dlgFindInVariableOrFilter.vb | 8 ++++- .../InstatObject/R/stand_alone_functions.R | 19 ++++++++--- 3 files changed, 44 insertions(+), 16 deletions(-) diff --git a/instat/dlgFindInVariableOrFilter.Designer.vb b/instat/dlgFindInVariableOrFilter.Designer.vb index 5417a14424f..ccb4f07ef7f 100644 --- a/instat/dlgFindInVariableOrFilter.Designer.vb +++ b/instat/dlgFindInVariableOrFilter.Designer.vb @@ -28,7 +28,6 @@ Partial Class dlgFindInVariableOrFilter Me.grpSelect = New System.Windows.Forms.GroupBox() Me.rdoRow = New System.Windows.Forms.RadioButton() Me.rdoCell = New System.Windows.Forms.RadioButton() - Me.ucrPnlSelect = New instat.UcrPanel() Me.lblLabel = New System.Windows.Forms.Label() Me.rdoVariable = New System.Windows.Forms.RadioButton() Me.rdoInFilter = New System.Windows.Forms.RadioButton() @@ -44,10 +43,12 @@ Partial Class dlgFindInVariableOrFilter Me.ucrBase = New instat.ucrButtons() Me.ucrChkIncludeRegularExpressions = New instat.ucrCheck() Me.ucrChkIgnoreCase = New instat.ucrCheck() + Me.ucrPnlSelect = New instat.UcrPanel() Me.ucrPnlOptions = New instat.UcrPanel() Me.ucrSelectorFind = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrReceiverVariable = New instat.ucrReceiverSingle() Me.ucrInputPattern = New instat.ucrInputComboBox() + Me.ucrWholeValue = New instat.ucrCheck() Me.grpSelect.SuspendLayout() Me.SuspendLayout() ' @@ -108,15 +109,6 @@ Partial Class dlgFindInVariableOrFilter Me.rdoCell.Text = "Cell" Me.rdoCell.UseVisualStyleBackColor = True ' - 'ucrPnlSelect - ' - Me.ucrPnlSelect.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlSelect.Location = New System.Drawing.Point(6, 13) - Me.ucrPnlSelect.Margin = New System.Windows.Forms.Padding(4) - Me.ucrPnlSelect.Name = "ucrPnlSelect" - Me.ucrPnlSelect.Size = New System.Drawing.Size(121, 31) - Me.ucrPnlSelect.TabIndex = 0 - ' 'lblLabel ' Me.lblLabel.AutoSize = True @@ -276,6 +268,15 @@ Partial Class dlgFindInVariableOrFilter Me.ucrChkIgnoreCase.Size = New System.Drawing.Size(131, 23) Me.ucrChkIgnoreCase.TabIndex = 66 ' + 'ucrPnlSelect + ' + Me.ucrPnlSelect.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlSelect.Location = New System.Drawing.Point(6, 13) + Me.ucrPnlSelect.Margin = New System.Windows.Forms.Padding(4) + Me.ucrPnlSelect.Name = "ucrPnlSelect" + Me.ucrPnlSelect.Size = New System.Drawing.Size(121, 31) + Me.ucrPnlSelect.TabIndex = 0 + ' 'ucrPnlOptions ' Me.ucrPnlOptions.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink @@ -322,12 +323,23 @@ Partial Class dlgFindInVariableOrFilter Me.ucrInputPattern.Size = New System.Drawing.Size(127, 21) Me.ucrInputPattern.TabIndex = 65 ' + 'ucrWholeValue + ' + Me.ucrWholeValue.AutoSize = True + Me.ucrWholeValue.Checked = False + Me.ucrWholeValue.Location = New System.Drawing.Point(139, 230) + Me.ucrWholeValue.Margin = New System.Windows.Forms.Padding(4) + Me.ucrWholeValue.Name = "ucrWholeValue" + Me.ucrWholeValue.Size = New System.Drawing.Size(131, 23) + Me.ucrWholeValue.TabIndex = 76 + ' 'dlgFindInVariableOrFilter ' 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(417, 350) + Me.Controls.Add(Me.ucrWholeValue) Me.Controls.Add(Me.lblLabel) Me.Controls.Add(Me.lblName) Me.Controls.Add(Me.lblVariableFound) @@ -387,4 +399,5 @@ Partial Class dlgFindInVariableOrFilter Friend WithEvents lblVariableFound As Label Friend WithEvents cmdFindNext As Button Friend WithEvents ttLabels As ToolTip + Friend WithEvents ucrWholeValue As ucrCheck End Class diff --git a/instat/dlgFindInVariableOrFilter.vb b/instat/dlgFindInVariableOrFilter.vb index b4964cbbc12..badec084dfe 100644 --- a/instat/dlgFindInVariableOrFilter.vb +++ b/instat/dlgFindInVariableOrFilter.vb @@ -77,7 +77,11 @@ Public Class dlgFindInVariableOrFilter ucrChkIncludeRegularExpressions.SetParameter(New RParameter("use_regex", 4)) ucrChkIncludeRegularExpressions.SetValuesCheckedAndUnchecked("TRUE", "FALSE") - ucrPnlOptions.AddToLinkedControls({ucrInputPattern, ucrPnlSelect, ucrChkIgnoreCase, ucrChkIncludeRegularExpressions}, {rdoVariable}, bNewLinkedHideIfParameterMissing:=True) + ucrWholeValue.SetText("Whole Value") + ucrWholeValue.SetParameter(New RParameter("match_entire_cell", 5)) + ucrWholeValue.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + + ucrPnlOptions.AddToLinkedControls({ucrInputPattern, ucrPnlSelect, ucrChkIgnoreCase, ucrChkIncludeRegularExpressions, ucrWholeValue}, {rdoVariable}, bNewLinkedHideIfParameterMissing:=True) ucrInputPattern.SetLinkedDisplayControl(lblPattern) ucrPnlSelect.SetLinkedDisplayControl(grpSelect) @@ -113,6 +117,7 @@ Public Class dlgFindInVariableOrFilter clsGetRowHeadersFunction.AddParameter("data", clsRFunctionParameter:=clsGetDataFrameFunction, iPosition:=0) clsGetRowHeadersFunction.AddParameter("ignore_case", "TRUE", iPosition:=3) clsGetRowHeadersFunction.AddParameter("use_regex", "FALSE", iPosition:=4) + clsGetRowHeadersFunction.AddParameter("match_entire_cell", "TRUE", iPosition:=5) ucrReceiverVariable.SetMeAsReceiver() cmdFindNext.Enabled = False @@ -126,6 +131,7 @@ Public Class dlgFindInVariableOrFilter ucrSelectorFind.SetRCode(clsGetDataFrameFunction, bReset) ucrReceiverVariable.SetRCode(clsGetRowHeadersFunction, bReset) ucrChkIgnoreCase.SetRCode(clsGetRowHeadersFunction, bReset) + ucrWholeValue.SetRCode(clsGetRowHeadersFunction, bReset) ucrChkIncludeRegularExpressions.SetRCode(clsGetRowHeadersFunction, bReset) ucrPnlOptions.SetRCode(clsDummyFunction, bReset) ucrPnlSelect.SetRCode(clsDummyFunction, bReset) diff --git a/instat/static/InstatObject/R/stand_alone_functions.R b/instat/static/InstatObject/R/stand_alone_functions.R index 83c7eaa8091..79b7472c29f 100644 --- a/instat/static/InstatObject/R/stand_alone_functions.R +++ b/instat/static/InstatObject/R/stand_alone_functions.R @@ -2977,14 +2977,23 @@ cumulative_inventory <- function(data, station = NULL, from, to){ return(data) } -getRowHeadersWithText <- function(data, column, searchText, ignore_case, use_regex) { - if(use_regex){ +getRowHeadersWithText <- function(data, column, searchText, ignore_case, use_regex, match_entire_cell) { + if (use_regex) { + # Adjust the search text to match the entire cell if required + if (match_entire_cell) { + searchText <- paste0("^", searchText, "$") + } # Find the rows that match the search text using regex matchingRows <- stringr::str_detect(data[[column]], stringr::regex(searchText, ignore_case = ignore_case)) - }else if (is.na(searchText)){ + } else if (is.na(searchText)) { matchingRows <- apply(data[, column, drop = FALSE], 1, function(row) any(is.na(row))) - }else{ - matchingRows <- grepl(searchText, data[[column]], ignore.case = ignore_case) + } else { + # Adjust the search text to match the entire cell if required + if (match_entire_cell) { + searchText <- paste0("^", searchText, "$") + } + # Find the rows that match the search text + matchingRows <- grepl(searchText, data[[column]], ignore.case = ignore_case, perl = TRUE) } # Get the row headers where the search text is found rowHeaders <- rownames(data)[matchingRows] From a234fee68778f670735d04863df91e4d08ecdf7b Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Tue, 16 Jul 2024 10:32:11 +0200 Subject: [PATCH 12/13] making sure ucrWhole is uncheck when the dialog is opened --- instat/dlgFindInVariableOrFilter.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgFindInVariableOrFilter.vb b/instat/dlgFindInVariableOrFilter.vb index badec084dfe..cc128859ad8 100644 --- a/instat/dlgFindInVariableOrFilter.vb +++ b/instat/dlgFindInVariableOrFilter.vb @@ -117,7 +117,7 @@ Public Class dlgFindInVariableOrFilter clsGetRowHeadersFunction.AddParameter("data", clsRFunctionParameter:=clsGetDataFrameFunction, iPosition:=0) clsGetRowHeadersFunction.AddParameter("ignore_case", "TRUE", iPosition:=3) clsGetRowHeadersFunction.AddParameter("use_regex", "FALSE", iPosition:=4) - clsGetRowHeadersFunction.AddParameter("match_entire_cell", "TRUE", iPosition:=5) + clsGetRowHeadersFunction.AddParameter("match_entire_cell", "FALSE", iPosition:=5) ucrReceiverVariable.SetMeAsReceiver() cmdFindNext.Enabled = False From 03ff97726cc81ac0d02028fcbf5d7f99f9c6c644 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Wed, 17 Jul 2024 19:09:58 +0200 Subject: [PATCH 13/13] Implemented the reset buttom for the find dialogue --- instat/dlgFindInVariableOrFilter.vb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/instat/dlgFindInVariableOrFilter.vb b/instat/dlgFindInVariableOrFilter.vb index cc128859ad8..0a33c2fe132 100644 --- a/instat/dlgFindInVariableOrFilter.vb +++ b/instat/dlgFindInVariableOrFilter.vb @@ -86,7 +86,7 @@ Public Class dlgFindInVariableOrFilter ucrPnlSelect.SetLinkedDisplayControl(grpSelect) ucrBase.OKEnabled(False) - ucrBase.cmdReset.Enabled = False + ucrBase.cmdReset.Enabled = True End Sub Private Sub SetDefaults() @@ -161,6 +161,14 @@ Public Class dlgFindInVariableOrFilter End If End Function + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + ucrSelectorFind.Reset() + rdoVariable.Checked = True + rdoCell.Checked = True + ucrReceiverVariable.Clear() + ucrInputPattern.cboInput.ResetText() + End Sub + Private Sub cmdFind_Click(sender As Object, e As EventArgs) Handles cmdFind.Click Try If rdoVariable.Checked OrElse rdoInFilter.Checked Then