From 77c31c978a0c7f1bb3808374c284a4f2d4806de5 Mon Sep 17 00:00:00 2001 From: Vitalis95 Date: Tue, 15 Mar 2022 14:25:30 +0300 Subject: [PATCH 01/11] Changes to check data --- instat/frmMain.Designer.vb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index e2e8af70ebc..c58791869e2 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -3554,7 +3554,7 @@ Partial Class frmMain ' Me.mnuPrepareCheckDataDuplicates.Name = "mnuPrepareCheckDataDuplicates" Me.mnuPrepareCheckDataDuplicates.Size = New System.Drawing.Size(245, 22) - Me.mnuPrepareCheckDataDuplicates.Text = "Duplicates..." + Me.mnuPrepareCheckDataDuplicates.Text = "Duplicate Rows..." ' 'mnuPrepareCheckDataCompareColumns ' @@ -3613,6 +3613,7 @@ Partial Class frmMain Me.mnuPrepareCheckDataImportOpenRefine.Name = "mnuPrepareCheckDataImportOpenRefine" Me.mnuPrepareCheckDataImportOpenRefine.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataImportOpenRefine.Text = "Import From OpenRefine..." + Me.mnuPrepareCheckDataImportOpenRefine.Visible = False ' 'ToolStripSeparator40 ' From bfbfd640b8da57bee8527ac7e1ebdac7fcbf068d Mon Sep 17 00:00:00 2001 From: Vitalis95 Date: Tue, 15 Mar 2022 15:52:31 +0300 Subject: [PATCH 02/11] changes --- instat/frmMain.Designer.vb | 78 +++++++++----------------------------- instat/frmMain.vb | 16 +++++--- 2 files changed, 28 insertions(+), 66 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index c58791869e2..1e1c4a9b565 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -54,12 +54,6 @@ Partial Class frmMain Me.ToolStripSeparator34 = New System.Windows.Forms.ToolStripSeparator() Me.mnuDescribeTwoVariablesFrequencies = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeTwoVariablesPivotTable = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuDescribeThreeVariable = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuDescribeThreeVariableSummarise = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuDescribeThreeVariableGraph = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator36 = New System.Windows.Forms.ToolStripSeparator() - Me.mnuDescribeThreeVariableFrequencies = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuDescribeThreeVariablePivotTable = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificTablesGraphs = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificFrequency = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificSummary = New System.Windows.Forms.ToolStripMenuItem() @@ -678,6 +672,7 @@ Partial Class frmMain Me.mnuDataFrameMetadata = New System.Windows.Forms.ToolStripMenuItem() Me.mnuScriptFile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuLogFile = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuDescribeTwoThreeVariablesCorrelations = New System.Windows.Forms.ToolStripMenuItem() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -705,7 +700,7 @@ Partial Class frmMain ' 'mnuDescribe ' - Me.mnuDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariable, Me.mnuDescribeTwoVariables, Me.mnuDescribeThreeVariable, Me.mnuDescribeSpecificTablesGraphs, Me.mnuDescribeGeneral, Me.ToolStripSeparator9, Me.mnuDescribeMultivariate, Me.ToolStripSeparator13, Me.mnuDescribeUseGraph, Me.mnuDescribeCombineGraph, Me.mnuDescribeThemes, Me.mnuDescribeViewGraph}) + Me.mnuDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariable, Me.mnuDescribeTwoVariables, Me.mnuDescribeSpecificTablesGraphs, Me.mnuDescribeGeneral, Me.ToolStripSeparator9, Me.mnuDescribeMultivariate, Me.ToolStripSeparator13, Me.mnuDescribeUseGraph, Me.mnuDescribeCombineGraph, Me.mnuDescribeThemes, Me.mnuDescribeViewGraph}) Me.mnuDescribe.Name = "mnuDescribe" Me.mnuDescribe.Size = New System.Drawing.Size(64, 20) Me.mnuDescribe.Tag = "Describe" @@ -763,83 +758,45 @@ Partial Class frmMain ' 'mnuDescribeTwoVariables ' - Me.mnuDescribeTwoVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeTwoVariablesSummarise, Me.mnuDescribeTwoVariablesGraph, Me.ToolStripSeparator34, Me.mnuDescribeTwoVariablesFrequencies, Me.mnuDescribeTwoVariablesPivotTable}) + Me.mnuDescribeTwoVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeTwoVariablesSummarise, Me.mnuDescribeTwoVariablesGraph, Me.ToolStripSeparator34, Me.mnuDescribeTwoThreeVariablesCorrelations, Me.mnuDescribeTwoVariablesFrequencies, Me.mnuDescribeTwoVariablesPivotTable}) Me.mnuDescribeTwoVariables.Name = "mnuDescribeTwoVariables" Me.mnuDescribeTwoVariables.Size = New System.Drawing.Size(192, 22) Me.mnuDescribeTwoVariables.Tag = "Two_Variables" - Me.mnuDescribeTwoVariables.Text = "Two Variables" + Me.mnuDescribeTwoVariables.Text = "Two/Three Variables" ' 'mnuDescribeTwoVariablesSummarise ' Me.mnuDescribeTwoVariablesSummarise.DoubleClickEnabled = True Me.mnuDescribeTwoVariablesSummarise.Name = "mnuDescribeTwoVariablesSummarise" - Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(146, 22) + Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeTwoVariablesSummarise.Tag = "Summarise..." Me.mnuDescribeTwoVariablesSummarise.Text = "Summarise..." ' 'mnuDescribeTwoVariablesGraph ' Me.mnuDescribeTwoVariablesGraph.Name = "mnuDescribeTwoVariablesGraph" - Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(146, 22) + Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeTwoVariablesGraph.Tag = "Graph..." Me.mnuDescribeTwoVariablesGraph.Text = "Graph..." ' 'ToolStripSeparator34 ' Me.ToolStripSeparator34.Name = "ToolStripSeparator34" - Me.ToolStripSeparator34.Size = New System.Drawing.Size(143, 6) + Me.ToolStripSeparator34.Size = New System.Drawing.Size(177, 6) ' 'mnuDescribeTwoVariablesFrequencies ' Me.mnuDescribeTwoVariablesFrequencies.DoubleClickEnabled = True Me.mnuDescribeTwoVariablesFrequencies.Name = "mnuDescribeTwoVariablesFrequencies" - Me.mnuDescribeTwoVariablesFrequencies.Size = New System.Drawing.Size(146, 22) + Me.mnuDescribeTwoVariablesFrequencies.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeTwoVariablesFrequencies.Text = "Frequencies..." ' 'mnuDescribeTwoVariablesPivotTable ' Me.mnuDescribeTwoVariablesPivotTable.Name = "mnuDescribeTwoVariablesPivotTable" - Me.mnuDescribeTwoVariablesPivotTable.Size = New System.Drawing.Size(146, 22) + Me.mnuDescribeTwoVariablesPivotTable.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeTwoVariablesPivotTable.Text = "Pivot Table..." ' - 'mnuDescribeThreeVariable - ' - Me.mnuDescribeThreeVariable.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeThreeVariableSummarise, Me.mnuDescribeThreeVariableGraph, Me.ToolStripSeparator36, Me.mnuDescribeThreeVariableFrequencies, Me.mnuDescribeThreeVariablePivotTable}) - Me.mnuDescribeThreeVariable.Name = "mnuDescribeThreeVariable" - Me.mnuDescribeThreeVariable.Size = New System.Drawing.Size(192, 22) - Me.mnuDescribeThreeVariable.Text = "Three Variables" - ' - 'mnuDescribeThreeVariableSummarise - ' - Me.mnuDescribeThreeVariableSummarise.Enabled = False - Me.mnuDescribeThreeVariableSummarise.Name = "mnuDescribeThreeVariableSummarise" - Me.mnuDescribeThreeVariableSummarise.Size = New System.Drawing.Size(146, 22) - Me.mnuDescribeThreeVariableSummarise.Text = "Summarise..." - ' - 'mnuDescribeThreeVariableGraph - ' - Me.mnuDescribeThreeVariableGraph.Enabled = False - Me.mnuDescribeThreeVariableGraph.Name = "mnuDescribeThreeVariableGraph" - Me.mnuDescribeThreeVariableGraph.Size = New System.Drawing.Size(146, 22) - Me.mnuDescribeThreeVariableGraph.Text = "Graph..." - ' - 'ToolStripSeparator36 - ' - Me.ToolStripSeparator36.Name = "ToolStripSeparator36" - Me.ToolStripSeparator36.Size = New System.Drawing.Size(143, 6) - ' - 'mnuDescribeThreeVariableFrequencies - ' - Me.mnuDescribeThreeVariableFrequencies.Name = "mnuDescribeThreeVariableFrequencies" - Me.mnuDescribeThreeVariableFrequencies.Size = New System.Drawing.Size(146, 22) - Me.mnuDescribeThreeVariableFrequencies.Text = "Frequencies..." - ' - 'mnuDescribeThreeVariablePivotTable - ' - Me.mnuDescribeThreeVariablePivotTable.Name = "mnuDescribeThreeVariablePivotTable" - Me.mnuDescribeThreeVariablePivotTable.Size = New System.Drawing.Size(146, 22) - Me.mnuDescribeThreeVariablePivotTable.Text = "Pivot Table..." - ' 'mnuDescribeSpecificTablesGraphs ' Me.mnuDescribeSpecificTablesGraphs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeSpecificFrequency, Me.mnuDescribeSpecificSummary, Me.mnuDescribeSpecificMultipleResponse, Me.ToolStripSeparator26, Me.mnuDescribeSpecificBarPieChart, Me.mnuDescribeSpecificBoxplotJitterViolinPlot, Me.mnuDescribeSpecificHistogramDensityFrequencyPlot, Me.mnuDescribeSpecificPointPlot, Me.mnuDescribeSpecificLineSmoothPlot, Me.mnuDescribeSpecificMapPlot, Me.mnuDescribeSpecificDotPlot, Me.ToolStripSeparator27, Me.mnuDescribeSpecificMosaic, Me.mnuDescribeSpecificCummulativeDistribution, Me.mnuDescribeSpecificParallelCoordinatePlot}) @@ -3457,13 +3414,13 @@ Partial Class frmMain Me.mnuPrepareDataFrameFilter.Name = "mnuPrepareDataFrameFilter" Me.mnuPrepareDataFrameFilter.Size = New System.Drawing.Size(200, 22) Me.mnuPrepareDataFrameFilter.Tag = "Filter..." - Me.mnuPrepareDataFrameFilter.Text = "Filter..." + Me.mnuPrepareDataFrameFilter.Text = "Filter Rows..." ' 'mnuPrepareDataFrameSelectColumns ' Me.mnuPrepareDataFrameSelectColumns.Name = "mnuPrepareDataFrameSelectColumns" Me.mnuPrepareDataFrameSelectColumns.Size = New System.Drawing.Size(200, 22) - Me.mnuPrepareDataFrameSelectColumns.Text = "Column Selection..." + Me.mnuPrepareDataFrameSelectColumns.Text = "Select Columns..." ' 'mnuPrepareDataFrameReplaceValues ' @@ -5099,6 +5056,12 @@ Partial Class frmMain Me.mnuLogFile.Text = "Log Window..." Me.mnuLogFile.ToolTipText = "Log Window" ' + 'mnuDescribeTwoThreeVariablesCorrelations + ' + Me.mnuDescribeTwoThreeVariablesCorrelations.Name = "mnuDescribeTwoThreeVariablesCorrelations" + Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeTwoThreeVariablesCorrelations.Text = "Correlations..." + ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -5499,11 +5462,6 @@ Partial Class frmMain Friend WithEvents mnuFileImportFromDatabases As ToolStripMenuItem Friend WithEvents mnuClimaticFileImportandTidyNetCDF As ToolStripMenuItem Friend WithEvents mnuProcurementPrepareRecodeNumericIntoQuantiles As ToolStripMenuItem - Friend WithEvents mnuDescribeThreeVariable As ToolStripMenuItem - Friend WithEvents mnuDescribeThreeVariableSummarise As ToolStripMenuItem - Friend WithEvents mnuDescribeThreeVariableGraph As ToolStripMenuItem - Friend WithEvents ToolStripSeparator36 As ToolStripSeparator - Friend WithEvents mnuDescribeThreeVariableFrequencies As ToolStripMenuItem Friend WithEvents ToolStripSeparator35 As ToolStripSeparator Friend WithEvents splOverall As SplitContainer Friend WithEvents splDataOutput As SplitContainer @@ -5780,7 +5738,6 @@ Partial Class frmMain Friend WithEvents ToolStripSeparator71 As ToolStripSeparator Friend WithEvents mnuEditScript As ToolStripMenuItem Friend WithEvents mnuPrepareDataFrameSelectColumns As ToolStripMenuItem - Friend WithEvents mnuDescribeThreeVariablePivotTable As ToolStripMenuItem Friend WithEvents mnuClimaticFileExportToClimsoft As ToolStripMenuItem Friend WithEvents mnuClimaticTidyandExamineCompareColumns As ToolStripMenuItem Friend WithEvents mnuPrepareDataFrameDuplicateColumn As ToolStripMenuItem @@ -5792,4 +5749,5 @@ Partial Class frmMain Friend WithEvents mnuOptionsByContextDefine As ToolStripMenuItem Friend WithEvents mnuOptionsByContextDefineOnStation As ToolStripMenuItem Friend WithEvents mnuOptionsByContextDefineOnFarm As ToolStripMenuItem + Friend WithEvents mnuDescribeTwoThreeVariablesCorrelations As ToolStripMenuItem End Class diff --git a/instat/frmMain.vb b/instat/frmMain.vb index bc81ce1a85f..d662f081a50 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -1456,9 +1456,9 @@ Public Class frmMain dlgStringDistance.ShowDialog() End Sub - Private Sub mnuDescribeThreeVariableFrequencies_Click(sender As Object, e As EventArgs) Handles mnuDescribeThreeVariableFrequencies.Click - dlgThreeVariableFrequencies.ShowDialog() - End Sub + 'Private Sub mnuDescribeThreeVariableFrequencies_Click(sender As Object, e As EventArgs) Handles mnuDescribeThreeVariableFrequencies.Click + ' dlgThreeVariableFrequencies.ShowDialog() + 'End Sub Private Sub mnuDescribeViewGraph_Click(sender As Object, e As EventArgs) Handles mnuDescribeViewGraph.Click dlgViewGraph.ShowDialog() @@ -2396,9 +2396,9 @@ Public Class frmMain dlgSelect.ShowDialog() End Sub - Private Sub mnuDescribeThreeVariablePivotTable_Click(sender As Object, e As EventArgs) Handles mnuDescribeThreeVariablePivotTable.Click - dlgThreeVariablePivotTable.ShowDialog() - End Sub + 'Private Sub mnuDescribeThreeVariablePivotTable_Click(sender As Object, e As EventArgs) Handles mnuDescribeThreeVariablePivotTable.Click + ' dlgThreeVariablePivotTable.ShowDialog() + 'End Sub Private Sub mnuClimaticFileExportToClimsoft_Click(sender As Object, e As EventArgs) Handles mnuClimaticFileExportToClimsoft.Click dlgExportToClimsoft.ShowDialog() @@ -2431,4 +2431,8 @@ Public Class frmMain Private Sub mnuOptionsByContextDefineOnFarm_Click(sender As Object, e As EventArgs) Handles mnuOptionsByContextDefineOnFarm.Click dlgDefineOptionsByContext.ShowDialog() End Sub + + Private Sub mnuDescribeTwoThreeVariablesCorrelations_Click(sender As Object, e As EventArgs) Handles mnuDescribeTwoThreeVariablesCorrelations.Click + dlgCorrelation.ShowDialog() + End Sub End Class From 2118f9b77bae4a19c97144279df819589fcc35be Mon Sep 17 00:00:00 2001 From: Vitalis95 Date: Tue, 15 Mar 2022 16:03:04 +0300 Subject: [PATCH 03/11] Changes --- instat/frmMain.vb | 8 -------- 1 file changed, 8 deletions(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index d662f081a50..e3884b493c3 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -1456,10 +1456,6 @@ Public Class frmMain dlgStringDistance.ShowDialog() End Sub - 'Private Sub mnuDescribeThreeVariableFrequencies_Click(sender As Object, e As EventArgs) Handles mnuDescribeThreeVariableFrequencies.Click - ' dlgThreeVariableFrequencies.ShowDialog() - 'End Sub - Private Sub mnuDescribeViewGraph_Click(sender As Object, e As EventArgs) Handles mnuDescribeViewGraph.Click dlgViewGraph.ShowDialog() End Sub @@ -2396,10 +2392,6 @@ Public Class frmMain dlgSelect.ShowDialog() End Sub - 'Private Sub mnuDescribeThreeVariablePivotTable_Click(sender As Object, e As EventArgs) Handles mnuDescribeThreeVariablePivotTable.Click - ' dlgThreeVariablePivotTable.ShowDialog() - 'End Sub - Private Sub mnuClimaticFileExportToClimsoft_Click(sender As Object, e As EventArgs) Handles mnuClimaticFileExportToClimsoft.Click dlgExportToClimsoft.ShowDialog() End Sub From f47e28715d5007bd434ba7ab9a47783fd63edf74 Mon Sep 17 00:00:00 2001 From: Vitalis95 Date: Wed, 16 Mar 2022 11:00:03 +0300 Subject: [PATCH 04/11] Changing the labels --- instat/ucrDataView.Designer.vb | 164 ++++++++++++++++----------------- 1 file changed, 82 insertions(+), 82 deletions(-) diff --git a/instat/ucrDataView.Designer.vb b/instat/ucrDataView.Designer.vb index 8902cefb358..8ca24a6c85e 100644 --- a/instat/ucrDataView.Designer.vb +++ b/instat/ucrDataView.Designer.vb @@ -62,12 +62,14 @@ Partial Class ucrDataView Me.mnuColumnContextColumnSelection = New System.Windows.Forms.ToolStripMenuItem() Me.mnuColumnContextRemoveCurrentColumnSelection = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClearColumnFilter = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator8 = New System.Windows.Forms.ToolStripSeparator() + Me.mnuHelp = New System.Windows.Forms.ToolStripMenuItem() Me.cellContextMenuStrip = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.mnuDeleteCells = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() Me.mnuRenameColumn = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDuplColumn = New System.Windows.Forms.ToolStripMenuItem() Me.mnuReorderColumn = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuDeleteCells = New System.Windows.Forms.ToolStripMenuItem() Me.mnuCellPasteRange = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator() Me.mnuConvertToFact = New System.Windows.Forms.ToolStripMenuItem() @@ -81,9 +83,11 @@ Partial Class ucrDataView Me.mnuSorts = New System.Windows.Forms.ToolStripMenuItem() Me.mnuComment = New System.Windows.Forms.ToolStripMenuItem() Me.mnuFilters = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuRemoveCurrentFilters = New System.Windows.Forms.ToolStripMenuItem() Me.mnuCellContextColumnSelection = New System.Windows.Forms.ToolStripMenuItem() Me.mnuCellContextRemoveCurrentColumnSelection = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuRemoveCurrentFilters = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator9 = New System.Windows.Forms.ToolStripSeparator() + Me.mnuHelp1 = New System.Windows.Forms.ToolStripMenuItem() Me.rowContextMenuStrip = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.mnuInsertRowsBefore = New System.Windows.Forms.ToolStripMenuItem() Me.mnuInsertRowsAfter = New System.Windows.Forms.ToolStripMenuItem() @@ -95,6 +99,8 @@ Partial Class ucrDataView Me.mnuRowContextColumnSelection = New System.Windows.Forms.ToolStripMenuItem() Me.mnuRowContextRemoveCurrentColumnSelection = New System.Windows.Forms.ToolStripMenuItem() Me.mnuRemoveCurrentFilter = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator10 = New System.Windows.Forms.ToolStripSeparator() + Me.mnuHelp2 = New System.Windows.Forms.ToolStripMenuItem() Me.statusColumnMenu = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.deleteDataFrame = New System.Windows.Forms.ToolStripMenuItem() Me.renameSheet = New System.Windows.Forms.ToolStripMenuItem() @@ -104,6 +110,8 @@ Partial Class ucrDataView Me.CopySheet = New System.Windows.Forms.ToolStripMenuItem() Me.reorderSheet = New System.Windows.Forms.ToolStripMenuItem() Me.ViewSheet = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator11 = New System.Windows.Forms.ToolStripSeparator() + Me.mnuHelp3 = New System.Windows.Forms.ToolStripMenuItem() Me.lblHeaderDataView = New System.Windows.Forms.Label() Me.tlpTableContainer = New System.Windows.Forms.TableLayoutPanel() Me.panelSectionsAll = New System.Windows.Forms.Panel() @@ -132,16 +140,8 @@ 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.ToolStripSeparator8 = New System.Windows.Forms.ToolStripSeparator() - Me.mnuHelp = New System.Windows.Forms.ToolStripMenuItem() Me.ucrReoGrid = New instat.ucrDataViewReoGrid() Me.ucrLinuxGrid = New instat.ucrDataViewLinuxGrid() - Me.ToolStripSeparator9 = New System.Windows.Forms.ToolStripSeparator() - Me.mnuHelp1 = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator10 = New System.Windows.Forms.ToolStripSeparator() - Me.mnuHelp2 = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator11 = New System.Windows.Forms.ToolStripSeparator() - Me.mnuHelp3 = New System.Windows.Forms.ToolStripMenuItem() Me.columnContextMenuStrip.SuspendLayout() Me.cellContextMenuStrip.SuspendLayout() Me.rowContextMenuStrip.SuspendLayout() @@ -270,13 +270,13 @@ Partial Class ucrDataView ' Me.mnuColumnFilter.Name = "mnuColumnFilter" Me.mnuColumnFilter.Size = New System.Drawing.Size(214, 22) - Me.mnuColumnFilter.Text = "Filter..." + Me.mnuColumnFilter.Text = "Filter Rows..." ' 'mnuColumnContextColumnSelection ' Me.mnuColumnContextColumnSelection.Name = "mnuColumnContextColumnSelection" Me.mnuColumnContextColumnSelection.Size = New System.Drawing.Size(214, 22) - Me.mnuColumnContextColumnSelection.Text = "Column Selection..." + Me.mnuColumnContextColumnSelection.Text = "Select Columns..." ' 'mnuColumnContextRemoveCurrentColumnSelection ' @@ -290,6 +290,17 @@ Partial Class ucrDataView Me.mnuClearColumnFilter.Size = New System.Drawing.Size(214, 22) Me.mnuClearColumnFilter.Text = "Remove Current Filter" ' + 'ToolStripSeparator8 + ' + Me.ToolStripSeparator8.Name = "ToolStripSeparator8" + Me.ToolStripSeparator8.Size = New System.Drawing.Size(211, 6) + ' + 'mnuHelp + ' + Me.mnuHelp.Name = "mnuHelp" + Me.mnuHelp.Size = New System.Drawing.Size(214, 22) + Me.mnuHelp.Text = "Help" + ' 'cellContextMenuStrip ' Me.cellContextMenuStrip.ImageScalingSize = New System.Drawing.Size(20, 20) @@ -297,6 +308,12 @@ Partial Class ucrDataView Me.cellContextMenuStrip.Name = "cellContextMenuStrip" Me.cellContextMenuStrip.Size = New System.Drawing.Size(215, 430) ' + 'mnuDeleteCells + ' + Me.mnuDeleteCells.Name = "mnuDeleteCells" + Me.mnuDeleteCells.Size = New System.Drawing.Size(214, 22) + Me.mnuDeleteCells.Text = "Delete Cell(s)" + ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" @@ -320,12 +337,6 @@ Partial Class ucrDataView Me.mnuReorderColumn.Size = New System.Drawing.Size(214, 22) Me.mnuReorderColumn.Text = "Reorder Column(s)..." ' - 'mnuDeleteCells - ' - Me.mnuDeleteCells.Name = "mnuDeleteCells" - Me.mnuDeleteCells.Size = New System.Drawing.Size(214, 22) - Me.mnuDeleteCells.Text = "Delete Cell(s)" - ' 'mnuCellPasteRange ' Me.mnuCellPasteRange.Name = "mnuCellPasteRange" @@ -399,19 +410,13 @@ Partial Class ucrDataView ' Me.mnuFilters.Name = "mnuFilters" Me.mnuFilters.Size = New System.Drawing.Size(214, 22) - Me.mnuFilters.Text = "Filter..." - ' - 'mnuRemoveCurrentFilters - ' - Me.mnuRemoveCurrentFilters.Name = "mnuRemoveCurrentFilters" - Me.mnuRemoveCurrentFilters.Size = New System.Drawing.Size(214, 22) - Me.mnuRemoveCurrentFilters.Text = "Remove Current Filter" + Me.mnuFilters.Text = "Filter Rows..." ' 'mnuCellContextColumnSelection ' Me.mnuCellContextColumnSelection.Name = "mnuCellContextColumnSelection" Me.mnuCellContextColumnSelection.Size = New System.Drawing.Size(214, 22) - Me.mnuCellContextColumnSelection.Text = "Column Selection..." + Me.mnuCellContextColumnSelection.Text = "Select Columns..." ' 'mnuCellContextRemoveCurrentColumnSelection ' @@ -419,12 +424,29 @@ Partial Class ucrDataView Me.mnuCellContextRemoveCurrentColumnSelection.Size = New System.Drawing.Size(214, 22) Me.mnuCellContextRemoveCurrentColumnSelection.Text = "Remove Column Selection" ' + 'mnuRemoveCurrentFilters + ' + Me.mnuRemoveCurrentFilters.Name = "mnuRemoveCurrentFilters" + Me.mnuRemoveCurrentFilters.Size = New System.Drawing.Size(214, 22) + Me.mnuRemoveCurrentFilters.Text = "Remove Current Filter" + ' + 'ToolStripSeparator9 + ' + Me.ToolStripSeparator9.Name = "ToolStripSeparator9" + Me.ToolStripSeparator9.Size = New System.Drawing.Size(211, 6) + ' + 'mnuHelp1 + ' + Me.mnuHelp1.Name = "mnuHelp1" + Me.mnuHelp1.Size = New System.Drawing.Size(214, 22) + Me.mnuHelp1.Text = "Help" + ' 'rowContextMenuStrip ' Me.rowContextMenuStrip.ImageScalingSize = New System.Drawing.Size(20, 20) Me.rowContextMenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuInsertRowsBefore, Me.mnuInsertRowsAfter, Me.mnuDeleteRows, Me.ToolStripSeparator2, Me.mnuAddComment, Me.ToolStripSeparator4, Me.mnuFilter, Me.mnuRowContextColumnSelection, Me.mnuRowContextRemoveCurrentColumnSelection, Me.mnuRemoveCurrentFilter, Me.ToolStripSeparator10, Me.mnuHelp2}) Me.rowContextMenuStrip.Name = "columnContextMenuStrip" - Me.rowContextMenuStrip.Size = New System.Drawing.Size(215, 220) + Me.rowContextMenuStrip.Size = New System.Drawing.Size(215, 242) ' 'mnuInsertRowsBefore ' @@ -465,13 +487,13 @@ Partial Class ucrDataView Me.mnuFilter.Name = "mnuFilter" Me.mnuFilter.Size = New System.Drawing.Size(214, 22) Me.mnuFilter.Tag = "Filter..." - Me.mnuFilter.Text = "Filter..." + Me.mnuFilter.Text = "Filter Rows..." ' 'mnuRowContextColumnSelection ' Me.mnuRowContextColumnSelection.Name = "mnuRowContextColumnSelection" Me.mnuRowContextColumnSelection.Size = New System.Drawing.Size(214, 22) - Me.mnuRowContextColumnSelection.Text = "Column Selection..." + Me.mnuRowContextColumnSelection.Text = "Select Columns..." ' 'mnuRowContextRemoveCurrentColumnSelection ' @@ -486,62 +508,84 @@ Partial Class ucrDataView Me.mnuRemoveCurrentFilter.Tag = "Remove_Current_Filter" Me.mnuRemoveCurrentFilter.Text = "Remove Current Filter" ' + 'ToolStripSeparator10 + ' + Me.ToolStripSeparator10.Name = "ToolStripSeparator10" + Me.ToolStripSeparator10.Size = New System.Drawing.Size(211, 6) + ' + 'mnuHelp2 + ' + Me.mnuHelp2.Name = "mnuHelp2" + Me.mnuHelp2.Size = New System.Drawing.Size(214, 22) + Me.mnuHelp2.Text = "Help" + ' 'statusColumnMenu ' Me.statusColumnMenu.ImageScalingSize = New System.Drawing.Size(20, 20) Me.statusColumnMenu.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.deleteDataFrame, Me.renameSheet, Me.mnuBottomAddComment, Me.HideSheet, Me.unhideSheet, Me.CopySheet, Me.reorderSheet, Me.ViewSheet, Me.ToolStripSeparator11, Me.mnuHelp3}) Me.statusColumnMenu.Name = "statusColumnMenu" - Me.statusColumnMenu.Size = New System.Drawing.Size(181, 230) + Me.statusColumnMenu.Size = New System.Drawing.Size(163, 208) ' 'deleteDataFrame ' Me.deleteDataFrame.Name = "deleteDataFrame" - Me.deleteDataFrame.Size = New System.Drawing.Size(180, 22) + Me.deleteDataFrame.Size = New System.Drawing.Size(162, 22) Me.deleteDataFrame.Text = "Delete..." ' 'renameSheet ' Me.renameSheet.Name = "renameSheet" - Me.renameSheet.Size = New System.Drawing.Size(180, 22) + Me.renameSheet.Size = New System.Drawing.Size(162, 22) Me.renameSheet.Text = "Rename..." ' 'mnuBottomAddComment ' Me.mnuBottomAddComment.Name = "mnuBottomAddComment" - Me.mnuBottomAddComment.Size = New System.Drawing.Size(180, 22) + Me.mnuBottomAddComment.Size = New System.Drawing.Size(162, 22) Me.mnuBottomAddComment.Text = "Add Comment..." ' 'HideSheet ' Me.HideSheet.Name = "HideSheet" - Me.HideSheet.Size = New System.Drawing.Size(180, 22) + Me.HideSheet.Size = New System.Drawing.Size(162, 22) Me.HideSheet.Text = "Hide" ' 'unhideSheet ' Me.unhideSheet.Name = "unhideSheet" - Me.unhideSheet.Size = New System.Drawing.Size(180, 22) + Me.unhideSheet.Size = New System.Drawing.Size(162, 22) Me.unhideSheet.Text = "Unhide..." ' 'CopySheet ' Me.CopySheet.Name = "CopySheet" - Me.CopySheet.Size = New System.Drawing.Size(180, 22) + Me.CopySheet.Size = New System.Drawing.Size(162, 22) Me.CopySheet.Text = "Copy..." ' 'reorderSheet ' Me.reorderSheet.Enabled = False Me.reorderSheet.Name = "reorderSheet" - Me.reorderSheet.Size = New System.Drawing.Size(180, 22) + Me.reorderSheet.Size = New System.Drawing.Size(162, 22) Me.reorderSheet.Text = "Reorder..." ' 'ViewSheet ' Me.ViewSheet.Name = "ViewSheet" - Me.ViewSheet.Size = New System.Drawing.Size(180, 22) + Me.ViewSheet.Size = New System.Drawing.Size(162, 22) Me.ViewSheet.Text = "View Data Frame" ' + 'ToolStripSeparator11 + ' + Me.ToolStripSeparator11.Name = "ToolStripSeparator11" + Me.ToolStripSeparator11.Size = New System.Drawing.Size(159, 6) + ' + 'mnuHelp3 + ' + Me.mnuHelp3.Name = "mnuHelp3" + Me.mnuHelp3.Size = New System.Drawing.Size(162, 22) + Me.mnuHelp3.Text = "Help" + ' 'lblHeaderDataView ' Me.lblHeaderDataView.BackColor = System.Drawing.Color.FromArgb(CType(CType(35, Byte), Integer), CType(CType(105, Byte), Integer), CType(CType(190, Byte), Integer)) @@ -908,17 +952,6 @@ Partial Class ucrDataView Me.lblRowBack.Text = "<" Me.lblRowBack.TextAlign = System.Drawing.ContentAlignment.MiddleCenter ' - 'ToolStripSeparator8 - ' - Me.ToolStripSeparator8.Name = "ToolStripSeparator8" - Me.ToolStripSeparator8.Size = New System.Drawing.Size(211, 6) - ' - 'mnuHelp - ' - Me.mnuHelp.Name = "mnuHelp" - Me.mnuHelp.Size = New System.Drawing.Size(214, 22) - Me.mnuHelp.Text = "Help" - ' 'ucrReoGrid ' Me.ucrReoGrid.Dock = System.Windows.Forms.DockStyle.Fill @@ -937,39 +970,6 @@ Partial Class ucrDataView Me.ucrLinuxGrid.Size = New System.Drawing.Size(245, 437) Me.ucrLinuxGrid.TabIndex = 13 ' - 'ToolStripSeparator9 - ' - Me.ToolStripSeparator9.Name = "ToolStripSeparator9" - Me.ToolStripSeparator9.Size = New System.Drawing.Size(211, 6) - ' - 'mnuHelp1 - ' - Me.mnuHelp1.Name = "mnuHelp1" - Me.mnuHelp1.Size = New System.Drawing.Size(214, 22) - Me.mnuHelp1.Text = "Help" - ' - 'ToolStripSeparator10 - ' - Me.ToolStripSeparator10.Name = "ToolStripSeparator10" - Me.ToolStripSeparator10.Size = New System.Drawing.Size(211, 6) - ' - 'mnuHelp2 - ' - Me.mnuHelp2.Name = "mnuHelp2" - Me.mnuHelp2.Size = New System.Drawing.Size(214, 22) - Me.mnuHelp2.Text = "Help" - ' - 'ToolStripSeparator11 - ' - Me.ToolStripSeparator11.Name = "ToolStripSeparator11" - Me.ToolStripSeparator11.Size = New System.Drawing.Size(177, 6) - ' - 'mnuHelp3 - ' - Me.mnuHelp3.Name = "mnuHelp3" - Me.mnuHelp3.Size = New System.Drawing.Size(180, 22) - Me.mnuHelp3.Text = "Help" - ' 'ucrDataView ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) From e96acbed954c8edcea729f11cf1452458f8e1fd7 Mon Sep 17 00:00:00 2001 From: Vitalis95 Date: Wed, 16 Mar 2022 15:02:30 +0300 Subject: [PATCH 05/11] changes --- instat/frmMain.Designer.vb | 74 +++++++++++++++++++------------------- instat/frmMain.vb | 4 +-- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 1e1c4a9b565..6f6584e22e5 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -52,6 +52,7 @@ Partial Class frmMain Me.mnuDescribeTwoVariablesSummarise = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeTwoVariablesGraph = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator34 = New System.Windows.Forms.ToolStripSeparator() + Me.mnuDescribeTwoThreeVariablesCorrelations = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeTwoVariablesFrequencies = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeTwoVariablesPivotTable = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificTablesGraphs = New System.Windows.Forms.ToolStripMenuItem() @@ -202,7 +203,7 @@ Partial Class frmMain Me.mnuClimaticTidyandExamineTidyDailyData = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticTidyandExamineNonNumericCases = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticTidyandExamineReplaceValues = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuClimaticTidyandExamineDuplicates = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticTidyandExamineDuplicateRows = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator54 = New System.Windows.Forms.ToolStripSeparator() Me.mnuClimaticTidyandExamineStack = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticTidyandExamineUnstack = New System.Windows.Forms.ToolStripMenuItem() @@ -622,7 +623,7 @@ Partial Class frmMain Me.mnuProcurementUseCRISummariseCRIbyCountry = New System.Windows.Forms.ToolStripMenuItem() Me.mnuOptionsByContext = New System.Windows.Forms.ToolStripMenuItem() Me.mnuOptionsByContextCheckData = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuOptionsByContextCheckDataDuplicates = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuOptionsByContextCheckDataDuplicateRows = New System.Windows.Forms.ToolStripMenuItem() Me.mnuOptionsByContextCheckDataCompareColumns = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator47 = New System.Windows.Forms.ToolStripSeparator() Me.mnuOptionsByContextCheckDataOneVariableSummarise = New System.Windows.Forms.ToolStripMenuItem() @@ -672,7 +673,6 @@ Partial Class frmMain Me.mnuDataFrameMetadata = New System.Windows.Forms.ToolStripMenuItem() Me.mnuScriptFile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuLogFile = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuDescribeTwoThreeVariablesCorrelations = New System.Windows.Forms.ToolStripMenuItem() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -768,33 +768,39 @@ Partial Class frmMain ' Me.mnuDescribeTwoVariablesSummarise.DoubleClickEnabled = True Me.mnuDescribeTwoVariablesSummarise.Name = "mnuDescribeTwoVariablesSummarise" - Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(147, 22) Me.mnuDescribeTwoVariablesSummarise.Tag = "Summarise..." Me.mnuDescribeTwoVariablesSummarise.Text = "Summarise..." ' 'mnuDescribeTwoVariablesGraph ' Me.mnuDescribeTwoVariablesGraph.Name = "mnuDescribeTwoVariablesGraph" - Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(147, 22) Me.mnuDescribeTwoVariablesGraph.Tag = "Graph..." Me.mnuDescribeTwoVariablesGraph.Text = "Graph..." ' 'ToolStripSeparator34 ' Me.ToolStripSeparator34.Name = "ToolStripSeparator34" - Me.ToolStripSeparator34.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator34.Size = New System.Drawing.Size(144, 6) + ' + 'mnuDescribeTwoThreeVariablesCorrelations + ' + Me.mnuDescribeTwoThreeVariablesCorrelations.Name = "mnuDescribeTwoThreeVariablesCorrelations" + Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(147, 22) + Me.mnuDescribeTwoThreeVariablesCorrelations.Text = "Correlations..." ' 'mnuDescribeTwoVariablesFrequencies ' Me.mnuDescribeTwoVariablesFrequencies.DoubleClickEnabled = True Me.mnuDescribeTwoVariablesFrequencies.Name = "mnuDescribeTwoVariablesFrequencies" - Me.mnuDescribeTwoVariablesFrequencies.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeTwoVariablesFrequencies.Size = New System.Drawing.Size(147, 22) Me.mnuDescribeTwoVariablesFrequencies.Text = "Frequencies..." ' 'mnuDescribeTwoVariablesPivotTable ' Me.mnuDescribeTwoVariablesPivotTable.Name = "mnuDescribeTwoVariablesPivotTable" - Me.mnuDescribeTwoVariablesPivotTable.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeTwoVariablesPivotTable.Size = New System.Drawing.Size(147, 22) Me.mnuDescribeTwoVariablesPivotTable.Text = "Pivot Table..." ' 'mnuDescribeSpecificTablesGraphs @@ -1749,7 +1755,7 @@ Partial Class frmMain ' 'mnuClimaticTidyandExamine ' - Me.mnuClimaticTidyandExamine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticTidyandExamineVisualiseData, Me.mnuClimaticTidyandExamineTidyDailyData, Me.mnuClimaticTidyandExamineNonNumericCases, Me.mnuClimaticTidyandExamineReplaceValues, Me.mnuClimaticTidyandExamineDuplicates, Me.ToolStripSeparator54, Me.mnuClimaticTidyandExamineStack, Me.mnuClimaticTidyandExamineUnstack, Me.mnuClimaticTidyandExamineMerge, Me.mnuClimaticTidyandExamineAppend, Me.ToolStripSeparator69, Me.mnuSetupForDataEntry, Me.mnuTidyandExamineClimaticDataEntry, Me.mnuClimaticTidyandExamineCompareColumns, Me.ToolStripSeparator50, Me.mnuClimaticTidyandExamineOneVariableSummarize, Me.mnuClimaticTidyandExamineOneVariableGraph, Me.mnuClimaticTidyandExamineOneVariableFrequencies}) + Me.mnuClimaticTidyandExamine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticTidyandExamineVisualiseData, Me.mnuClimaticTidyandExamineTidyDailyData, Me.mnuClimaticTidyandExamineNonNumericCases, Me.mnuClimaticTidyandExamineReplaceValues, Me.mnuClimaticTidyandExamineDuplicateRows, Me.ToolStripSeparator54, Me.mnuClimaticTidyandExamineStack, Me.mnuClimaticTidyandExamineUnstack, Me.mnuClimaticTidyandExamineMerge, Me.mnuClimaticTidyandExamineAppend, Me.ToolStripSeparator69, Me.mnuSetupForDataEntry, Me.mnuTidyandExamineClimaticDataEntry, Me.mnuClimaticTidyandExamineCompareColumns, Me.ToolStripSeparator50, Me.mnuClimaticTidyandExamineOneVariableSummarize, Me.mnuClimaticTidyandExamineOneVariableGraph, Me.mnuClimaticTidyandExamineOneVariableFrequencies}) Me.mnuClimaticTidyandExamine.Name = "mnuClimaticTidyandExamine" Me.mnuClimaticTidyandExamine.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticTidyandExamine.Text = "Tidy and Examine" @@ -1778,11 +1784,11 @@ Partial Class frmMain Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(215, 22) Me.mnuClimaticTidyandExamineReplaceValues.Text = "Replace Values..." ' - 'mnuClimaticTidyandExamineDuplicates + 'mnuClimaticTidyandExamineDuplicateRows ' - Me.mnuClimaticTidyandExamineDuplicates.Name = "mnuClimaticTidyandExamineDuplicates" - Me.mnuClimaticTidyandExamineDuplicates.Size = New System.Drawing.Size(215, 22) - Me.mnuClimaticTidyandExamineDuplicates.Text = "Duplicates..." + Me.mnuClimaticTidyandExamineDuplicateRows.Name = "mnuClimaticTidyandExamineDuplicateRows" + Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(215, 22) + Me.mnuClimaticTidyandExamineDuplicateRows.Text = "Duplicate Rows..." ' 'ToolStripSeparator54 ' @@ -1869,32 +1875,32 @@ Partial Class frmMain 'mnuClimaticDatesGenerateDates ' Me.mnuClimaticDatesGenerateDates.Name = "mnuClimaticDatesGenerateDates" - Me.mnuClimaticDatesGenerateDates.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesGenerateDates.Size = New System.Drawing.Size(180, 22) Me.mnuClimaticDatesGenerateDates.Text = "Generate Dates..." ' 'mnuClimaticDatesMakeDate ' Me.mnuClimaticDatesMakeDate.Name = "mnuClimaticDatesMakeDate" - Me.mnuClimaticDatesMakeDate.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesMakeDate.Size = New System.Drawing.Size(180, 22) Me.mnuClimaticDatesMakeDate.Text = "Make Date..." ' 'mnuClimaticDatesInfillMissingDates ' Me.mnuClimaticDatesInfillMissingDates.Name = "mnuClimaticDatesInfillMissingDates" - Me.mnuClimaticDatesInfillMissingDates.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesInfillMissingDates.Size = New System.Drawing.Size(180, 22) Me.mnuClimaticDatesInfillMissingDates.Text = "Fill Date Gaps..." ' 'mnuClimaticDatesUseDate ' Me.mnuClimaticDatesUseDate.Name = "mnuClimaticDatesUseDate" - Me.mnuClimaticDatesUseDate.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesUseDate.Size = New System.Drawing.Size(180, 22) Me.mnuClimaticDatesUseDate.Text = "Use Date..." ' 'mnuClimaticDatesMakeTime ' Me.mnuClimaticDatesMakeTime.Enabled = False Me.mnuClimaticDatesMakeTime.Name = "mnuClimaticDatesMakeTime" - Me.mnuClimaticDatesMakeTime.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesMakeTime.Size = New System.Drawing.Size(180, 22) Me.mnuClimaticDatesMakeTime.Text = "Make Time..." Me.mnuClimaticDatesMakeTime.Visible = False ' @@ -1902,7 +1908,7 @@ Partial Class frmMain ' Me.mnuClimaticDatesUseTime.Enabled = False Me.mnuClimaticDatesUseTime.Name = "mnuClimaticDatesUseTime" - Me.mnuClimaticDatesUseTime.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesUseTime.Size = New System.Drawing.Size(180, 22) Me.mnuClimaticDatesUseTime.Text = "Use Time..." Me.mnuClimaticDatesUseTime.Visible = False ' @@ -4620,16 +4626,16 @@ Partial Class frmMain ' 'mnuOptionsByContextCheckData ' - Me.mnuOptionsByContextCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCheckDataDuplicates, Me.mnuOptionsByContextCheckDataCompareColumns, Me.ToolStripSeparator47, Me.mnuOptionsByContextCheckDataOneVariableSummarise, Me.mnuOptionsByContextCheckDataOneVariableGraph, Me.mnuOptionsByContextCheckDataOneVariableFrequencies}) + 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(134, 22) + Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(180, 22) Me.mnuOptionsByContextCheckData.Text = "Check Data" ' - 'mnuOptionsByContextCheckDataDuplicates + 'mnuOptionsByContextCheckDataDuplicateRows ' - Me.mnuOptionsByContextCheckDataDuplicates.Name = "mnuOptionsByContextCheckDataDuplicates" - Me.mnuOptionsByContextCheckDataDuplicates.Size = New System.Drawing.Size(215, 22) - Me.mnuOptionsByContextCheckDataDuplicates.Text = "Duplicates..." + Me.mnuOptionsByContextCheckDataDuplicateRows.Name = "mnuOptionsByContextCheckDataDuplicateRows" + Me.mnuOptionsByContextCheckDataDuplicateRows.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataDuplicateRows.Text = "Duplicate Rows..." ' 'mnuOptionsByContextCheckDataCompareColumns ' @@ -4664,7 +4670,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(134, 22) + Me.mnuOptionsByContextDefine.Size = New System.Drawing.Size(180, 22) Me.mnuOptionsByContextDefine.Text = "Define" ' 'mnuOptionsByContextDefineOnStation @@ -4683,7 +4689,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(134, 22) + Me.mnuOptionsByContextPrepare.Size = New System.Drawing.Size(180, 22) Me.mnuOptionsByContextPrepare.Text = "Prepare" ' 'mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions @@ -4719,7 +4725,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(134, 22) + Me.mnuOptionsByContextDescribe.Size = New System.Drawing.Size(180, 22) Me.mnuOptionsByContextDescribe.Text = "Describe" ' 'mnuOptionsByContextDescribeCompareTwoTreatments @@ -4745,7 +4751,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(134, 22) + Me.mnuOptionsByContextModel.Size = New System.Drawing.Size(180, 22) Me.mnuOptionsByContextModel.Text = "Model" ' 'mnuOptionsByContextModelFitModel @@ -5056,12 +5062,6 @@ Partial Class frmMain Me.mnuLogFile.Text = "Log Window..." Me.mnuLogFile.ToolTipText = "Log Window" ' - 'mnuDescribeTwoThreeVariablesCorrelations - ' - Me.mnuDescribeTwoThreeVariablesCorrelations.Name = "mnuDescribeTwoThreeVariablesCorrelations" - Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(180, 22) - Me.mnuDescribeTwoThreeVariablesCorrelations.Text = "Correlations..." - ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -5546,7 +5546,7 @@ Partial Class frmMain Friend WithEvents mnuOptionsByContextDescribe As ToolStripMenuItem Friend WithEvents mnuOptionsByContextDescribeCompareTwoTreatments As ToolStripMenuItem Friend WithEvents mnuOptionsByContextDescribeCompareMultipleTreatments As ToolStripMenuItem - Friend WithEvents mnuOptionsByContextCheckDataDuplicates As ToolStripMenuItem + Friend WithEvents mnuOptionsByContextCheckDataDuplicateRows As ToolStripMenuItem Friend WithEvents mnuOptionsByContextCheckDataCompareColumns As ToolStripMenuItem Friend WithEvents mnuOptionsByContextModel As ToolStripMenuItem Friend WithEvents mnuOptionsByContextModelFitModel As ToolStripMenuItem @@ -5598,7 +5598,7 @@ Partial Class frmMain Friend WithEvents mnuClimaticMapping As ToolStripMenuItem Friend WithEvents mnuHelpWindows As ToolStripMenuItem Friend WithEvents mnuHelpDataViewSpreadsheet As ToolStripMenuItem - Friend WithEvents mnuClimaticTidyandExamineDuplicates As ToolStripMenuItem + Friend WithEvents mnuClimaticTidyandExamineDuplicateRows As ToolStripMenuItem Friend WithEvents mnuClimaticTidyandExamineOneVariableGraph As ToolStripMenuItem Friend WithEvents mnuClimaticTidyandExamineOneVariableFrequencies As ToolStripMenuItem Friend WithEvents mnuModelUseModel As ToolStripMenuItem diff --git a/instat/frmMain.vb b/instat/frmMain.vb index e3884b493c3..d25eb467faf 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -1834,7 +1834,7 @@ Public Class frmMain dlgMergeAdditionalData.ShowDialog() End Sub - Private Sub mnuOptionsByContextsCheckDataDuplicates_Click(sender As Object, e As EventArgs) Handles mnuOptionsByContextCheckDataDuplicates.Click + Private Sub mnuOptionsByContextsCheckDataDuplicates_Click(sender As Object, e As EventArgs) Handles mnuOptionsByContextCheckDataDuplicateRows.Click dlgDuplicates.ShowDialog() End Sub @@ -1997,7 +1997,7 @@ Public Class frmMain dlgOneWayFrequencies.ShowDialog() End Sub - Private Sub mnuClimaticTidyandExamineDuplicates_Click(sender As Object, e As EventArgs) Handles mnuClimaticTidyandExamineDuplicates.Click + Private Sub mnuClimaticTidyandExamineDuplicates_Click(sender As Object, e As EventArgs) Handles mnuClimaticTidyandExamineDuplicateRows.Click dlgDuplicates.ShowDialog() End Sub From 16a55c8f3d0185cdcccfc963429479bd1f276643 Mon Sep 17 00:00:00 2001 From: Vitalis95 Date: Wed, 16 Mar 2022 15:14:29 +0300 Subject: [PATCH 06/11] more Changes --- instat/ucrDataView.Designer.vb | 28 ++++++++++++++-------------- instat/ucrDataView.vb | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/instat/ucrDataView.Designer.vb b/instat/ucrDataView.Designer.vb index 8ca24a6c85e..07d8153dead 100644 --- a/instat/ucrDataView.Designer.vb +++ b/instat/ucrDataView.Designer.vb @@ -58,7 +58,7 @@ Partial Class ucrDataView Me.toolStripMenuItem21 = New System.Windows.Forms.ToolStripSeparator() Me.mnuSort = New System.Windows.Forms.ToolStripMenuItem() Me.mnuColumnAddComment = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuColumnFilter = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuColumnFilterRows = New System.Windows.Forms.ToolStripMenuItem() Me.mnuColumnContextColumnSelection = New System.Windows.Forms.ToolStripMenuItem() Me.mnuColumnContextRemoveCurrentColumnSelection = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClearColumnFilter = New System.Windows.Forms.ToolStripMenuItem() @@ -82,7 +82,7 @@ Partial Class ucrDataView Me.ToolStripSeparator7 = New System.Windows.Forms.ToolStripSeparator() Me.mnuSorts = New System.Windows.Forms.ToolStripMenuItem() Me.mnuComment = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuFilters = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuFilterRows = New System.Windows.Forms.ToolStripMenuItem() Me.mnuCellContextColumnSelection = New System.Windows.Forms.ToolStripMenuItem() Me.mnuCellContextRemoveCurrentColumnSelection = New System.Windows.Forms.ToolStripMenuItem() Me.mnuRemoveCurrentFilters = New System.Windows.Forms.ToolStripMenuItem() @@ -157,7 +157,7 @@ Partial Class ucrDataView 'columnContextMenuStrip ' Me.columnContextMenuStrip.ImageScalingSize = New System.Drawing.Size(20, 20) - Me.columnContextMenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuColumnRename, Me.mnuDuplicateColumn, Me.mnuReorderColumns, Me.mnuInsertColsBefore, Me.mnuInsertColsAfter, Me.mnuDeleteCol, Me.mnuPaste, Me.toolStripMenuItem2, Me.mnuConvertToFactor, Me.mnuCovertToOrderedFactors, Me.mnuConvertText, Me.mnuConvertToLogical, Me.mnuConvertVariate, Me.ToolStripSeparator1, Me.mnuLevelsLabels, Me.toolStripMenuItem21, Me.mnuSort, Me.mnuColumnAddComment, Me.mnuColumnFilter, Me.mnuColumnContextColumnSelection, Me.mnuColumnContextRemoveCurrentColumnSelection, Me.mnuClearColumnFilter, Me.ToolStripSeparator8, Me.mnuHelp}) + Me.columnContextMenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuColumnRename, Me.mnuDuplicateColumn, Me.mnuReorderColumns, Me.mnuInsertColsBefore, Me.mnuInsertColsAfter, Me.mnuDeleteCol, Me.mnuPaste, Me.toolStripMenuItem2, Me.mnuConvertToFactor, Me.mnuCovertToOrderedFactors, Me.mnuConvertText, Me.mnuConvertToLogical, Me.mnuConvertVariate, Me.ToolStripSeparator1, Me.mnuLevelsLabels, Me.toolStripMenuItem21, Me.mnuSort, Me.mnuColumnAddComment, Me.mnuColumnFilterRows, Me.mnuColumnContextColumnSelection, Me.mnuColumnContextRemoveCurrentColumnSelection, Me.mnuClearColumnFilter, Me.ToolStripSeparator8, Me.mnuHelp}) Me.columnContextMenuStrip.Name = "columnContextMenuStrip" Me.columnContextMenuStrip.Size = New System.Drawing.Size(215, 468) ' @@ -266,11 +266,11 @@ Partial Class ucrDataView Me.mnuColumnAddComment.Size = New System.Drawing.Size(214, 22) Me.mnuColumnAddComment.Text = "Add Comment..." ' - 'mnuColumnFilter + 'mnuColumnFilterRows ' - Me.mnuColumnFilter.Name = "mnuColumnFilter" - Me.mnuColumnFilter.Size = New System.Drawing.Size(214, 22) - Me.mnuColumnFilter.Text = "Filter Rows..." + Me.mnuColumnFilterRows.Name = "mnuColumnFilterRows" + Me.mnuColumnFilterRows.Size = New System.Drawing.Size(214, 22) + Me.mnuColumnFilterRows.Text = "Filter Rows..." ' 'mnuColumnContextColumnSelection ' @@ -304,7 +304,7 @@ Partial Class ucrDataView 'cellContextMenuStrip ' Me.cellContextMenuStrip.ImageScalingSize = New System.Drawing.Size(20, 20) - Me.cellContextMenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDeleteCells, Me.ToolStripSeparator3, Me.mnuRenameColumn, Me.mnuDuplColumn, Me.mnuReorderColumn, Me.mnuCellPasteRange, Me.ToolStripSeparator5, Me.mnuConvertToFact, Me.mnuConvertToOrderedFactor, Me.mnuConvertToCharacter, Me.mnuConvertToLogic, Me.mnuConvertToNumeric, Me.ToolStripSeparator6, Me.mnuLabelsLevel, Me.ToolStripSeparator7, Me.mnuSorts, Me.mnuComment, Me.mnuFilters, Me.mnuCellContextColumnSelection, Me.mnuCellContextRemoveCurrentColumnSelection, Me.mnuRemoveCurrentFilters, Me.ToolStripSeparator9, Me.mnuHelp1}) + Me.cellContextMenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDeleteCells, Me.ToolStripSeparator3, Me.mnuRenameColumn, Me.mnuDuplColumn, Me.mnuReorderColumn, Me.mnuCellPasteRange, Me.ToolStripSeparator5, Me.mnuConvertToFact, Me.mnuConvertToOrderedFactor, Me.mnuConvertToCharacter, Me.mnuConvertToLogic, Me.mnuConvertToNumeric, Me.ToolStripSeparator6, Me.mnuLabelsLevel, Me.ToolStripSeparator7, Me.mnuSorts, Me.mnuComment, Me.mnuFilterRows, Me.mnuCellContextColumnSelection, Me.mnuCellContextRemoveCurrentColumnSelection, Me.mnuRemoveCurrentFilters, Me.ToolStripSeparator9, Me.mnuHelp1}) Me.cellContextMenuStrip.Name = "cellContextMenuStrip" Me.cellContextMenuStrip.Size = New System.Drawing.Size(215, 430) ' @@ -406,11 +406,11 @@ Partial Class ucrDataView Me.mnuComment.Size = New System.Drawing.Size(214, 22) Me.mnuComment.Text = "Add Comment..." ' - 'mnuFilters + 'mnuFilterRows ' - Me.mnuFilters.Name = "mnuFilters" - Me.mnuFilters.Size = New System.Drawing.Size(214, 22) - Me.mnuFilters.Text = "Filter Rows..." + Me.mnuFilterRows.Name = "mnuFilterRows" + Me.mnuFilterRows.Size = New System.Drawing.Size(214, 22) + Me.mnuFilterRows.Text = "Filter Rows..." ' 'mnuCellContextColumnSelection ' @@ -1002,7 +1002,7 @@ Partial Class ucrDataView Private WithEvents mnuDeleteCol As ToolStripMenuItem Private WithEvents toolStripMenuItem2 As ToolStripSeparator Private WithEvents toolStripMenuItem21 As ToolStripSeparator - Private WithEvents mnuColumnFilter As ToolStripMenuItem + Private WithEvents mnuColumnFilterRows As ToolStripMenuItem Private WithEvents mnuClearColumnFilter As ToolStripMenuItem Private WithEvents cellContextMenuStrip As ContextMenuStrip Private WithEvents rowContextMenuStrip As ContextMenuStrip @@ -1050,7 +1050,7 @@ Partial Class ucrDataView Friend WithEvents mnuLabelsLevel As ToolStripMenuItem Friend WithEvents ToolStripSeparator7 As ToolStripSeparator Friend WithEvents mnuSorts As ToolStripMenuItem - Private WithEvents mnuFilters As ToolStripMenuItem + Private WithEvents mnuFilterRows As ToolStripMenuItem Private WithEvents mnuRemoveCurrentFilters As ToolStripMenuItem Friend WithEvents mnuComment As ToolStripMenuItem Friend WithEvents mnuColumnAddComment As ToolStripMenuItem diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index 3259b11764c..0d3c53de422 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -423,7 +423,7 @@ Public Class ucrDataView EndWait() End Sub - Private Sub mnuColumnFilter_Click(sender As Object, e As EventArgs) Handles mnuColumnFilter.Click + Private Sub mnuColumnFilter_Click(sender As Object, e As EventArgs) Handles mnuColumnFilterRows.Click dlgRestrict.bIsSubsetDialog = False dlgRestrict.strDefaultDataframe = _grid.CurrentWorksheet.Name dlgRestrict.ShowDialog() @@ -612,7 +612,7 @@ Public Class ucrDataView dlgSort.ShowDialog() End Sub - Private Sub mnuFilters_Click(sender As Object, e As EventArgs) Handles mnuFilters.Click + Private Sub mnuFilters_Click(sender As Object, e As EventArgs) Handles mnuFilterRows.Click dlgRestrict.bIsSubsetDialog = False dlgRestrict.strDefaultDataframe = _grid.CurrentWorksheet.Name dlgRestrict.ShowDialog() From 7df2faf4bf3515ea560b31ca8754579cf6be9b34 Mon Sep 17 00:00:00 2001 From: Vitalis95 Date: Wed, 16 Mar 2022 17:16:55 +0300 Subject: [PATCH 07/11] Transalation Changes --- instat/frmMain.Designer.vb | 68 ++++++++++----------- instat/frmMain.vb | 2 +- instat/translations/rInstatTranslations.db | Bin 4849664 -> 4849664 bytes 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 6f6584e22e5..a63167df3fd 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -48,7 +48,7 @@ Partial Class frmMain Me.ToolStripSeparator33 = New System.Windows.Forms.ToolStripSeparator() Me.mnuDescribeOneVariableFrequencies = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeOneVariableRatingData = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuDescribeTwoVariables = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuDescribeTwoThreeVariables = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeTwoVariablesSummarise = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeTwoVariablesGraph = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator34 = New System.Windows.Forms.ToolStripSeparator() @@ -434,7 +434,7 @@ Partial Class frmMain Me.mnuPrepareDataFrameRowNumbersNames = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() Me.mnuPrepareDataFrameSort = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuPrepareDataFrameFilter = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuPrepareDataFrameFilterRows = New System.Windows.Forms.ToolStripMenuItem() Me.mnuPrepareDataFrameSelectColumns = New System.Windows.Forms.ToolStripMenuItem() Me.mnuPrepareDataFrameReplaceValues = New System.Windows.Forms.ToolStripMenuItem() Me.mnuPrepareDataFrameConvertColumns = New System.Windows.Forms.ToolStripMenuItem() @@ -700,7 +700,7 @@ Partial Class frmMain ' 'mnuDescribe ' - Me.mnuDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariable, Me.mnuDescribeTwoVariables, Me.mnuDescribeSpecificTablesGraphs, Me.mnuDescribeGeneral, Me.ToolStripSeparator9, Me.mnuDescribeMultivariate, Me.ToolStripSeparator13, Me.mnuDescribeUseGraph, Me.mnuDescribeCombineGraph, Me.mnuDescribeThemes, Me.mnuDescribeViewGraph}) + Me.mnuDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariable, Me.mnuDescribeTwoThreeVariables, Me.mnuDescribeSpecificTablesGraphs, Me.mnuDescribeGeneral, Me.ToolStripSeparator9, Me.mnuDescribeMultivariate, Me.ToolStripSeparator13, Me.mnuDescribeUseGraph, Me.mnuDescribeCombineGraph, Me.mnuDescribeThemes, Me.mnuDescribeViewGraph}) Me.mnuDescribe.Name = "mnuDescribe" Me.mnuDescribe.Size = New System.Drawing.Size(64, 20) Me.mnuDescribe.Tag = "Describe" @@ -756,51 +756,51 @@ Partial Class frmMain Me.mnuDescribeOneVariableRatingData.Size = New System.Drawing.Size(155, 22) Me.mnuDescribeOneVariableRatingData.Text = "Rating Data..." ' - 'mnuDescribeTwoVariables + 'mnuDescribeTwoThreeVariables ' - Me.mnuDescribeTwoVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeTwoVariablesSummarise, Me.mnuDescribeTwoVariablesGraph, Me.ToolStripSeparator34, Me.mnuDescribeTwoThreeVariablesCorrelations, Me.mnuDescribeTwoVariablesFrequencies, Me.mnuDescribeTwoVariablesPivotTable}) - Me.mnuDescribeTwoVariables.Name = "mnuDescribeTwoVariables" - Me.mnuDescribeTwoVariables.Size = New System.Drawing.Size(192, 22) - Me.mnuDescribeTwoVariables.Tag = "Two_Variables" - Me.mnuDescribeTwoVariables.Text = "Two/Three Variables" + Me.mnuDescribeTwoThreeVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeTwoVariablesSummarise, Me.mnuDescribeTwoVariablesGraph, Me.ToolStripSeparator34, Me.mnuDescribeTwoThreeVariablesCorrelations, Me.mnuDescribeTwoVariablesFrequencies, Me.mnuDescribeTwoVariablesPivotTable}) + Me.mnuDescribeTwoThreeVariables.Name = "mnuDescribeTwoThreeVariables" + Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(192, 22) + Me.mnuDescribeTwoThreeVariables.Tag = "Two_Variables" + Me.mnuDescribeTwoThreeVariables.Text = "Two/Three Variables" ' 'mnuDescribeTwoVariablesSummarise ' Me.mnuDescribeTwoVariablesSummarise.DoubleClickEnabled = True Me.mnuDescribeTwoVariablesSummarise.Name = "mnuDescribeTwoVariablesSummarise" - Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(147, 22) + Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeTwoVariablesSummarise.Tag = "Summarise..." Me.mnuDescribeTwoVariablesSummarise.Text = "Summarise..." ' 'mnuDescribeTwoVariablesGraph ' Me.mnuDescribeTwoVariablesGraph.Name = "mnuDescribeTwoVariablesGraph" - Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(147, 22) + Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeTwoVariablesGraph.Tag = "Graph..." Me.mnuDescribeTwoVariablesGraph.Text = "Graph..." ' 'ToolStripSeparator34 ' Me.ToolStripSeparator34.Name = "ToolStripSeparator34" - Me.ToolStripSeparator34.Size = New System.Drawing.Size(144, 6) + Me.ToolStripSeparator34.Size = New System.Drawing.Size(177, 6) ' 'mnuDescribeTwoThreeVariablesCorrelations ' Me.mnuDescribeTwoThreeVariablesCorrelations.Name = "mnuDescribeTwoThreeVariablesCorrelations" - Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(147, 22) + Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeTwoThreeVariablesCorrelations.Text = "Correlations..." ' 'mnuDescribeTwoVariablesFrequencies ' Me.mnuDescribeTwoVariablesFrequencies.DoubleClickEnabled = True Me.mnuDescribeTwoVariablesFrequencies.Name = "mnuDescribeTwoVariablesFrequencies" - Me.mnuDescribeTwoVariablesFrequencies.Size = New System.Drawing.Size(147, 22) + Me.mnuDescribeTwoVariablesFrequencies.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeTwoVariablesFrequencies.Text = "Frequencies..." ' 'mnuDescribeTwoVariablesPivotTable ' Me.mnuDescribeTwoVariablesPivotTable.Name = "mnuDescribeTwoVariablesPivotTable" - Me.mnuDescribeTwoVariablesPivotTable.Size = New System.Drawing.Size(147, 22) + Me.mnuDescribeTwoVariablesPivotTable.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeTwoVariablesPivotTable.Text = "Pivot Table..." ' 'mnuDescribeSpecificTablesGraphs @@ -1875,32 +1875,32 @@ Partial Class frmMain 'mnuClimaticDatesGenerateDates ' Me.mnuClimaticDatesGenerateDates.Name = "mnuClimaticDatesGenerateDates" - Me.mnuClimaticDatesGenerateDates.Size = New System.Drawing.Size(180, 22) + Me.mnuClimaticDatesGenerateDates.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesGenerateDates.Text = "Generate Dates..." ' 'mnuClimaticDatesMakeDate ' Me.mnuClimaticDatesMakeDate.Name = "mnuClimaticDatesMakeDate" - Me.mnuClimaticDatesMakeDate.Size = New System.Drawing.Size(180, 22) + Me.mnuClimaticDatesMakeDate.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesMakeDate.Text = "Make Date..." ' 'mnuClimaticDatesInfillMissingDates ' Me.mnuClimaticDatesInfillMissingDates.Name = "mnuClimaticDatesInfillMissingDates" - Me.mnuClimaticDatesInfillMissingDates.Size = New System.Drawing.Size(180, 22) + Me.mnuClimaticDatesInfillMissingDates.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesInfillMissingDates.Text = "Fill Date Gaps..." ' 'mnuClimaticDatesUseDate ' Me.mnuClimaticDatesUseDate.Name = "mnuClimaticDatesUseDate" - Me.mnuClimaticDatesUseDate.Size = New System.Drawing.Size(180, 22) + Me.mnuClimaticDatesUseDate.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesUseDate.Text = "Use Date..." ' 'mnuClimaticDatesMakeTime ' Me.mnuClimaticDatesMakeTime.Enabled = False Me.mnuClimaticDatesMakeTime.Name = "mnuClimaticDatesMakeTime" - Me.mnuClimaticDatesMakeTime.Size = New System.Drawing.Size(180, 22) + Me.mnuClimaticDatesMakeTime.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesMakeTime.Text = "Make Time..." Me.mnuClimaticDatesMakeTime.Visible = False ' @@ -1908,7 +1908,7 @@ Partial Class frmMain ' Me.mnuClimaticDatesUseTime.Enabled = False Me.mnuClimaticDatesUseTime.Name = "mnuClimaticDatesUseTime" - Me.mnuClimaticDatesUseTime.Size = New System.Drawing.Size(180, 22) + Me.mnuClimaticDatesUseTime.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesUseTime.Text = "Use Time..." Me.mnuClimaticDatesUseTime.Visible = False ' @@ -3370,7 +3370,7 @@ Partial Class frmMain ' 'mnuPrepareDataFrame ' - Me.mnuPrepareDataFrame.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrameViewData, Me.mnuPrepareDataFrameRenameColumn, Me.mnuPrepareDataFrameDuplicateColumn, Me.mnuPrepareDataFrameRowNumbersNames, Me.ToolStripSeparator1, Me.mnuPrepareDataFrameSort, Me.mnuPrepareDataFrameFilter, Me.mnuPrepareDataFrameSelectColumns, Me.mnuPrepareDataFrameReplaceValues, Me.mnuPrepareDataFrameConvertColumns, Me.ToolStripSeparator2, Me.mnuPrepareDataFrameReorderColumns, Me.mnuPrepareDataFrameInsertColumnsRows, Me.mnuPrepareDataFrameDeleteColumnsRows, Me.mnuPrepareDataFrameProtectColumn, Me.mnuPrepareDataFrameHideColumns, Me.mnuPrepareDataFrameFreezeColumns, Me.mnuPrepareDataframeColourByProperty}) + 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.mnuPrepareDataFrameInsertColumnsRows, Me.mnuPrepareDataFrameDeleteColumnsRows, Me.mnuPrepareDataFrameProtectColumn, Me.mnuPrepareDataFrameHideColumns, Me.mnuPrepareDataFrameFreezeColumns, Me.mnuPrepareDataframeColourByProperty}) Me.mnuPrepareDataFrame.Name = "mnuPrepareDataFrame" Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareDataFrame.Tag = "Data_Frame" @@ -3415,12 +3415,12 @@ Partial Class frmMain Me.mnuPrepareDataFrameSort.Tag = "Sort..." Me.mnuPrepareDataFrameSort.Text = "Sort..." ' - 'mnuPrepareDataFrameFilter + 'mnuPrepareDataFrameFilterRows ' - Me.mnuPrepareDataFrameFilter.Name = "mnuPrepareDataFrameFilter" - Me.mnuPrepareDataFrameFilter.Size = New System.Drawing.Size(200, 22) - Me.mnuPrepareDataFrameFilter.Tag = "Filter..." - Me.mnuPrepareDataFrameFilter.Text = "Filter Rows..." + Me.mnuPrepareDataFrameFilterRows.Name = "mnuPrepareDataFrameFilterRows" + Me.mnuPrepareDataFrameFilterRows.Size = New System.Drawing.Size(200, 22) + Me.mnuPrepareDataFrameFilterRows.Tag = "Filter..." + Me.mnuPrepareDataFrameFilterRows.Text = "Filter Rows..." ' 'mnuPrepareDataFrameSelectColumns ' @@ -4628,7 +4628,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(180, 22) + Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(134, 22) Me.mnuOptionsByContextCheckData.Text = "Check Data" ' 'mnuOptionsByContextCheckDataDuplicateRows @@ -4670,7 +4670,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(180, 22) + Me.mnuOptionsByContextDefine.Size = New System.Drawing.Size(134, 22) Me.mnuOptionsByContextDefine.Text = "Define" ' 'mnuOptionsByContextDefineOnStation @@ -4689,7 +4689,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(180, 22) + Me.mnuOptionsByContextPrepare.Size = New System.Drawing.Size(134, 22) Me.mnuOptionsByContextPrepare.Text = "Prepare" ' 'mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions @@ -4725,7 +4725,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(180, 22) + Me.mnuOptionsByContextDescribe.Size = New System.Drawing.Size(134, 22) Me.mnuOptionsByContextDescribe.Text = "Describe" ' 'mnuOptionsByContextDescribeCompareTwoTreatments @@ -4751,7 +4751,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(180, 22) + Me.mnuOptionsByContextModel.Size = New System.Drawing.Size(134, 22) Me.mnuOptionsByContextModel.Text = "Model" ' 'mnuOptionsByContextModelFitModel @@ -5216,7 +5216,7 @@ Partial Class frmMain Friend WithEvents mnuPrepareColumnTextMatch As ToolStripMenuItem Friend WithEvents mnuPrepareColumnTextDistance As ToolStripMenuItem Friend WithEvents ToolStripSeparator7 As ToolStripSeparator - Friend WithEvents mnuPrepareDataFrameFilter As ToolStripMenuItem + Friend WithEvents mnuPrepareDataFrameFilterRows As ToolStripMenuItem Friend WithEvents ToolStripSeparator10 As ToolStripSeparator Friend WithEvents ToolStripSeparator11 As ToolStripSeparator Friend WithEvents mnuPrepareColumnReshapeTranspose As ToolStripMenuItem @@ -5251,7 +5251,7 @@ Partial Class frmMain Friend WithEvents mnuDescribeOneVariable As ToolStripMenuItem Friend WithEvents mnuDescribeOneVariableSummarise As ToolStripMenuItem Friend WithEvents mnuDescribeOneVariableGraph As ToolStripMenuItem - Friend WithEvents mnuDescribeTwoVariables As ToolStripMenuItem + Friend WithEvents mnuDescribeTwoThreeVariables As ToolStripMenuItem Friend WithEvents mnuDescribeTwoVariablesSummarise As ToolStripMenuItem Friend WithEvents mnuDescribeTwoVariablesTabulate As ToolStripMenuItem Friend WithEvents mnuDescribeTwoVariablesGraph As ToolStripMenuItem diff --git a/instat/frmMain.vb b/instat/frmMain.vb index d25eb467faf..35dc43b8870 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -702,7 +702,7 @@ Public Class frmMain dlgCombineText.ShowDialog() End Sub - Private Sub mnuPrepareDataFilter_Click(sender As Object, e As EventArgs) Handles mnuPrepareDataFrameFilter.Click + Private Sub mnuPrepareDataFilter_Click(sender As Object, e As EventArgs) Handles mnuPrepareDataFrameFilterRows.Click dlgRestrict.bIsSubsetDialog = False dlgRestrict.strDefaultDataframe = "" dlgRestrict.ShowDialog() diff --git a/instat/translations/rInstatTranslations.db b/instat/translations/rInstatTranslations.db index 2cd5580aa499c86bfdd206b02542291fa2cb0edb..ae2de87614e5360402aa56521daeaef41c66286c 100644 GIT binary patch delta 521 zcmY+3W9LDkM_3X9WXUEB5=q)7jP!;l zEGAYR-oY+7p>Z+M-0J9tE>8XpB>n~Z1``s7&u@69-?!V{)w@d13DsX`=0kNKM2OId zFkukKhzMa4Q6feR5Efw*$B7d}oJbH!VvtA?X<~>tNemMs#3^EwaEJ_XniwO-i7YWe zoFUE<=ZG9}p143v5>v!Q;u3M0m?o|ed7?nf5JjRyTqUl3g}alt;-9po$d(rW8QBW# zg4>SB+DCUdwY<5p{Jhm@JYH$7t*ov$+O=lz!F9tiL({aJ+}U;0ve&O#+k2j?%m#bj z_2LiRdL+XM@kF;pu$mBm226WKD>&Y`e2^BSvg3$vcGS5y{jB)6WjNl{!JJ%NTkkYl z|8Mr;#%4QcW`x<%t=~bXC*H(N`+Mk@;oO%KNih;UeLwpuB)_~9lhLx@Z5qx(N&22U zlso#b3dkQU*~5g2-+du{yF4Z%7+S~hmp_G+5rJ_`o8;YmY Zl$**eWnQ_hEGUc0l5!{5@82D){{tonycqxh delta 447 zcmWm2zfV(97zW_m+heb7ue4xM;8viB{L)%z^_Ejwi&O<;9E?sT#5YZtNEo1lo43Oo z789$>8Eit(1rkThncY|n`Zu_nxSQz5@GMUh9l4R{1+n(~d@I)Of`}0=5hoOJfk+S@ zagj(8DI!hy#3f>Y$Pig#kQgE^6FFj-xI$bdMu<^jj0lK4ag7)!CWuL*Kui(WiD}{n zF+GXXcCb7sI`Td6QZg z@JfHns?ZuW-`3QyJr2WoQcbI1#T*`mIn(Pm()(x4P*m+%bGiJ(^_NUMt2f>BbKB19 zKPj*HZ&wA)3G*zc$IQ#T_DvM%6V(Ww6wj|>xAWTTxc;f_^z?_M=QwUo1y4<3P>JFScHH% Date: Wed, 16 Mar 2022 20:44:32 +0300 Subject: [PATCH 08/11] database changes --- instat/translations/rInstatTranslations.db | Bin 4849664 -> 4849664 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/instat/translations/rInstatTranslations.db b/instat/translations/rInstatTranslations.db index ae2de87614e5360402aa56521daeaef41c66286c..2a7e47dcb0940af2712d8fbc97fbf6271eaff697 100644 GIT binary patch delta 1094 zcmZvaTWl0n7{}+FIdj=9^g?gQv~(A?P8YV@cDvK*E>q}s=^|bNXde)bep--_)VA7I znwXd!&DX6lk!_4Um8K{fygUdm>Y#}d5?@R-(gYJ@LTeK-H742z3H#{TT@9G{@O$~s z_y2#FGuiBiG%Ls(8G#`v2r7bxpd~6YhP)vX@|9lM%ACxFVrPqIi^*Nv4)DsP z{WKeJ-P4@xu|uVmn~M?qr^ZK44L>z`q7)d7M$@i4$&5$4O19ie(iZf3E6GILO|rnX zK=NQnT2N+`4EuwfV*~QKd|A%OD*c>6_mw_zk`7)|uyz*D zQUAX!y|)9&4VGJOO$zpS%dJl5F`t%_2Gwz*j&pz32{4sct$5L_GobQ6ZPTd9oEn)t z@q8&R7GS1H`T0esK`jX_{PK+Rs!};5Z7<8-<2k3GD&iu|{|IBRJEKIEg3Jt;mCA{d zHN9ERNg3%AuH~IB>hI&pyc43*O%8b{K!yHt-ihh$?rd5(!=;`^$yuJ~-y_D{*%&js z!~Dt_r(x@zS^rz*8FS7E)wCh0jhR9I&Z5)kU3kN}B@L3kC%l P!2!X2-qPa1;p2Y;1te>4 delta 971 zcmX}oTWDNW6b9gP_Sxq$lVqkbW)gdn%;e@Y=02IzlT3Hg%S;jjmbBW38nv#Nwh~CD zZ3tFTWTvt@2~s;{XqP6|v=6-qQU%cyEVLDhB4~>bQeWB_#9lxlqS8JLv8tpxmIVYAfgxxJ96?7g5KIIM!H3{SC_*SkC_xAy1QFIClp;KW zP=@d*LODVRp#q^2;W31@2sT0$LN!7SLKq=}P>WE9P>;}n(1`FjLKI;gLKDIh2+asB z2(1Wh2<-?R2%QKqgs#sZes*cs4Mn-3u2ElB2h~5+%W8qW&knGDR-;X6DJ{w#u&;TZ z@8J#)YWK9O+Jd#q>b1(vU(GMfBj$)1HvTrgH$F6GjR_-Vg!J3`r}`WEpkA+Q{AYfF zcK;L~skUZ)4}5jpcG+Gh;v|{*qxaN`b6ulIi`7bNTP;6t z=k|75{>!oH=DtMG%lzr=)OZ)SpMCgvr6J)vyy|?ux}J3#0mW6HV`O!>g86QH10C)+ zrunUsk`Y~0d(LU1BiC6mPft(1M#J6iJ<~raXWLup%X2+tv@PaVQM$){)!LBF9_02j zQOde*gaQfoC4ER{^!}ewX(hASX}Lt_e=WIN30La&ZY6rw{h}_A8A%K^=tuRG&iP0D zd9G+@wO2IGuCjy59c6*_tG}xSb*I{L{4{I!mLrK3ZuMo~>XnI6DqVHzPpmqADtfos zpS#wWkT!VN8b#NLPkvUvv8V)Zl0PFNJg~#u?6qaY7J~pqkUrr)y)d^Jq>DcUt7-Tv z*P_M4VwPUaiE>&f2-ABZC+-`16_17)ot_sVZ{Is2t@1h^ZKlx~QAYpdh2NKomG~WH zK()!ti%wSb9wqXkftfo9@*={t939Gw814VgZ7vL73edKTeI@LWpCU04_UvO~f|(83 znIwEPfYKbdRV Date: Wed, 16 Mar 2022 20:48:58 +0300 Subject: [PATCH 09/11] database change --- .../translations/rInstatTranslations.db-journal | Bin 0 -> 8720 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 instat/translations/rInstatTranslations.db-journal diff --git a/instat/translations/rInstatTranslations.db-journal b/instat/translations/rInstatTranslations.db-journal new file mode 100644 index 0000000000000000000000000000000000000000..1d008d3a02cd700f476d8ce145c886217d6e89d8 GIT binary patch literal 8720 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 BpJM<3 literal 0 HcmV?d00001 From 3c3868173b77598917568363a3fe0c6c1ee1c8ca Mon Sep 17 00:00:00 2001 From: Vitalis95 Date: Wed, 16 Mar 2022 20:50:24 +0300 Subject: [PATCH 10/11] database change --- instat/translations/rInstatTranslations.db | Bin 4849664 -> 4849664 bytes .../rInstatTranslations.db-journal | Bin 8720 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 instat/translations/rInstatTranslations.db-journal diff --git a/instat/translations/rInstatTranslations.db b/instat/translations/rInstatTranslations.db index 2a7e47dcb0940af2712d8fbc97fbf6271eaff697..bac1ceaebfba72966c447b38ef724799b6dde9f1 100644 GIT binary patch delta 375 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 BpJM<3 From 27e14189e26da314bcec1da0f40c099066095856 Mon Sep 17 00:00:00 2001 From: Vitalis95 Date: Wed, 16 Mar 2022 21:21:04 +0300 Subject: [PATCH 11/11] columnMetadata --- instat/translations/rInstatTranslations.db | Bin 4849664 -> 4849664 bytes instat/ucrColumnMetadata.Designer.vb | 112 ++++++++++----------- instat/ucrColumnMetadata.vb | 4 +- 3 files changed, 58 insertions(+), 58 deletions(-) diff --git a/instat/translations/rInstatTranslations.db b/instat/translations/rInstatTranslations.db index bac1ceaebfba72966c447b38ef724799b6dde9f1..238be12f453222b7f607546147a82b0e685e57f3 100644 GIT binary patch delta 422 zcmW;H%Ps?97zW_Zn5oubR2fBo<4{#+Rmbu>RFz7^!p8O!%`gd?IK)O|M80$<`&$9OK=Ak-dH>r@VM@~>cT@@aUMlpac+r8VN#iDm^3DxDacgI6k-Z9)iKpG zH83?Y8B9$~5vFFQC{qhlE0f98#uQ^}XX;?;WQu>1cx_VkJFg}pvZ`_8FGoZ{*9|j} zP`zVY3jfU%7a_&*zVBtsOIu>cb7R8vu5H;6+$~?7=YJ|yOF$P`&<#D%3w@A)en`Rq zq+k$+U>HVV6vkj2CLj%ykbx?Ka-bf zfN7A)$K+=UFby#cGmS8fG6k8&m_kfprU=tGQ}mO>t6%j6EoVSvRQ=J;21G&E<60u6 zTGwSM?6;t}cPkz1=ShaFv>{6R&0W=uSk1N!d5hJ{TQltccATrNo*`fY42Z!bOhFu` zVFqSl4iYdANmzgsEW#2j!wRHf71m%KHeeIBU>kNI1G}(i_YC=wQ(YD7g5