Merge pull request IDEMSInternational#5646 from Ivanluv/TABORDER

Tab order for the Describe>Specific dialogues
Ivanluv · Feb 3, 2020 · 1e2e1ed · 1e2e1ed
2 parents 3f1d5a1 + d569862
commit 1e2e1ed
Show file tree

Hide file tree

Showing 20 changed files with 855 additions and 776 deletions.
diff --git a/instat/dlgBarAndPieChart.resx b/instat/dlgBarAndPieChart.resx
diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb
@@ -65,7 +65,7 @@ Public Class dlgBarAndPieChart
 
         ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False
         ucrBase.clsRsyntax.iCallType = 3
-        ucrBase.iHelpTopicID = 439
+        ucrBase.iHelpTopicID = 438
 
         ucrPnlOptions.AddRadioButton(rdoBarChart)
         ucrPnlOptions.AddRadioButton(rdoPieChart)

diff --git a/instat/dlgBoxPlot.resx b/instat/dlgBoxPlot.resx
@@ -451,7 +451,7 @@
     <value>93, 20</value>
   </data>
   <data name="ucrChkAddPoints.TabIndex" type="System.Int32, mscorlib">
-    <value>17</value>
+    <value>14</value>
   </data>
   <data name="&gt;&gt;ucrChkAddPoints.Name" xml:space="preserve">
     <value>ucrChkAddPoints</value>
@@ -475,7 +475,7 @@
     <value>120, 20</value>
   </data>
   <data name="ucrChkSwapParameters.TabIndex" type="System.Int32, mscorlib">
-    <value>16</value>
+    <value>17</value>
   </data>
   <data name="&gt;&gt;ucrChkSwapParameters.Name" xml:space="preserve">
     <value>ucrChkSwapParameters</value>
@@ -492,11 +492,14 @@
   <data name="ucrSaveBoxplot.Location" type="System.Drawing.Point, System.Drawing">
     <value>10, 401</value>
   </data>
+  <data name="ucrSaveBoxplot.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 5, 4, 5</value>
+  </data>
   <data name="ucrSaveBoxplot.Size" type="System.Drawing.Size, System.Drawing">
     <value>254, 24</value>
   </data>
   <data name="ucrSaveBoxplot.TabIndex" type="System.Int32, mscorlib">
-    <value>14</value>
+    <value>16</value>
   </data>
   <data name="&gt;&gt;ucrSaveBoxplot.Name" xml:space="preserve">
     <value>ucrSaveBoxplot</value>
@@ -568,7 +571,7 @@
     <value>137, 21</value>
   </data>
   <data name="ucrInputSummaries.TabIndex" type="System.Int32, mscorlib">
-    <value>25</value>
+    <value>22</value>
   </data>
   <data name="&gt;&gt;ucrInputSummaries.Name" xml:space="preserve">
     <value>ucrInputSummaries</value>
@@ -589,7 +592,7 @@
     <value>151, 20</value>
   </data>
   <data name="ucrChkGrouptoConnect.TabIndex" type="System.Int32, mscorlib">
-    <value>24</value>
+    <value>15</value>
   </data>
   <data name="&gt;&gt;ucrChkGrouptoConnect.Name" xml:space="preserve">
     <value>ucrChkGrouptoConnect</value>
@@ -682,7 +685,7 @@
     <value>410, 52</value>
   </data>
   <data name="ucrBase.TabIndex" type="System.Int32, mscorlib">
-    <value>15</value>
+    <value>23</value>
   </data>
   <data name="&gt;&gt;ucrBase.Name" xml:space="preserve">
     <value>ucrBase</value>

diff --git a/instat/dlgCumulativeDistribution.Designer.vb b/instat/dlgCumulativeDistribution.Designer.vb
diff --git a/instat/dlgCumulativeDistribution.resx b/instat/dlgCumulativeDistribution.resx
@@ -221,6 +221,10 @@
   <data name="ucrSaveCumDist.Location" type="System.Drawing.Point, System.Drawing">
     <value>10, 338</value>
   </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="ucrSaveCumDist.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 5, 4, 5</value>
+  </data>
   <data name="ucrSaveCumDist.Size" type="System.Drawing.Size, System.Drawing">
     <value>255, 24</value>
   </data>
@@ -293,7 +297,6 @@
   <data name="ucrFactorReceiver.Location" type="System.Drawing.Point, System.Drawing">
     <value>255, 188</value>
   </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="ucrFactorReceiver.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>0, 0, 0, 0</value>
   </data>

diff --git a/instat/dlgFrequency.resx b/instat/dlgFrequency.resx
@@ -180,7 +180,7 @@
     <value>86, 23</value>
   </data>
   <data name="cmdOptions.TabIndex" type="System.Int32, mscorlib">
-    <value>11</value>
+    <value>10</value>
   </data>
   <data name="cmdOptions.Text" xml:space="preserve">
     <value>Options</value>
@@ -411,7 +411,7 @@
     <value>186, 192</value>
   </data>
   <data name="GroupBox1.TabIndex" type="System.Int32, mscorlib">
-    <value>8</value>
+    <value>3</value>
   </data>
   <data name="GroupBox1.Text" xml:space="preserve">
     <value>Display</value>
@@ -467,11 +467,15 @@
   <data name="ucrSaveTable.Location" type="System.Drawing.Point, System.Drawing">
     <value>10, 391</value>
   </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="ucrSaveTable.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 5, 4, 5</value>
+  </data>
   <data name="ucrSaveTable.Size" type="System.Drawing.Size, System.Drawing">
     <value>270, 24</value>
   </data>
   <data name="ucrSaveTable.TabIndex" type="System.Int32, mscorlib">
-    <value>10</value>
+    <value>9</value>
   </data>
   <data name="&gt;&gt;ucrSaveTable.Name" xml:space="preserve">
     <value>ucrSaveTable</value>
@@ -492,7 +496,7 @@
     <value>104, 20</value>
   </data>
   <data name="ucrChkDisplayMargins.TabIndex" type="System.Int32, mscorlib">
-    <value>7</value>
+    <value>8</value>
   </data>
   <data name="&gt;&gt;ucrChkDisplayMargins.Name" xml:space="preserve">
     <value>ucrChkDisplayMargins</value>
@@ -513,7 +517,7 @@
     <value>91, 20</value>
   </data>
   <data name="ucrChkStoreResults.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
+    <value>7</value>
   </data>
   <data name="&gt;&gt;ucrChkStoreResults.Name" xml:space="preserve">
     <value>ucrChkStoreResults</value>
@@ -530,15 +534,14 @@
   <data name="ucrReceiverSingle.Location" type="System.Drawing.Point, System.Drawing">
     <value>101, 200</value>
   </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="ucrReceiverSingle.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>0, 0, 0, 0</value>
   </data>
   <data name="ucrReceiverSingle.Size" type="System.Drawing.Size, System.Drawing">
     <value>117, 20</value>
   </data>
   <data name="ucrReceiverSingle.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
+    <value>6</value>
   </data>
   <data name="&gt;&gt;ucrReceiverSingle.Name" xml:space="preserve">
     <value>ucrReceiverSingle</value>
@@ -559,7 +562,7 @@
     <value>88, 20</value>
   </data>
   <data name="ucrChkWeights.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
+    <value>5</value>
   </data>
   <data name="&gt;&gt;ucrChkWeights.Name" xml:space="preserve">
     <value>ucrChkWeights</value>
@@ -628,7 +631,7 @@
     <value>425, 55</value>
   </data>
   <data name="ucrBase.TabIndex" type="System.Int32, mscorlib">
-    <value>12</value>
+    <value>11</value>
   </data>
   <data name="&gt;&gt;ucrBase.Name" xml:space="preserve">
     <value>ucrBase</value>
@@ -727,7 +730,7 @@
     <value>155, 192</value>
   </data>
   <data name="grpDisplay.TabIndex" type="System.Int32, mscorlib">
-    <value>9</value>
+    <value>4</value>
   </data>
   <data name="grpDisplay.Text" xml:space="preserve">
     <value>Percentages</value>

diff --git a/instat/dlgFrequency.vb b/instat/dlgFrequency.vb
@@ -41,6 +41,8 @@ Public Class dlgFrequency
     Private Sub InitialiseDialog()
         Dim dctPercentageType As New Dictionary(Of String, String)
         ucrBase.clsRsyntax.iCallType = 4
+        ucrBase.iHelpTopicID = 425
+
         ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False
         cmdOptions.Enabled = False ' Temporarily disabled
 

diff --git a/instat/dlgHistogram.resx b/instat/dlgHistogram.resx
@@ -301,7 +301,7 @@
     <value>32, 18</value>
   </data>
   <data name="lblStats.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
+    <value>10</value>
   </data>
   <data name="lblStats.Text" xml:space="preserve">
     <value>Stats</value>
@@ -328,7 +328,7 @@
     <value>137, 21</value>
   </data>
   <data name="ucrInputStats.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
+    <value>11</value>
   </data>
   <data name="&gt;&gt;ucrInputStats.Name" xml:space="preserve">
     <value>ucrInputStats</value>
@@ -352,7 +352,7 @@
     <value>100, 20</value>
   </data>
   <data name="ucrChkPercentages.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
+    <value>13</value>
   </data>
   <data name="&gt;&gt;ucrChkPercentages.Name" xml:space="preserve">
     <value>ucrChkPercentages</value>
@@ -376,7 +376,7 @@
     <value>255, 24</value>
   </data>
   <data name="ucrSaveHist.TabIndex" type="System.Int32, mscorlib">
-    <value>10</value>
+    <value>12</value>
   </data>
   <data name="&gt;&gt;ucrSaveHist.Name" xml:space="preserve">
     <value>ucrSaveHist</value>
@@ -457,7 +457,7 @@
     <value>410, 52</value>
   </data>
   <data name="ucrBase.TabIndex" type="System.Int32, mscorlib">
-    <value>11</value>
+    <value>14</value>
   </data>
   <data name="&gt;&gt;ucrBase.Name" xml:space="preserve">
     <value>ucrBase</value>

diff --git a/instat/dlgLinePlot.resx b/instat/dlgLinePlot.resx
@@ -133,7 +133,7 @@
     <value>58, 13</value>
   </data>
   <data name="lblXVariable.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
+    <value>3</value>
   </data>
   <data name="lblXVariable.Text" xml:space="preserve">
     <value>X Variable:</value>
@@ -187,7 +187,7 @@
     <value>119, 23</value>
   </data>
   <data name="cmdOptions.TabIndex" type="System.Int32, mscorlib">
-    <value>7</value>
+    <value>10</value>
   </data>
   <data name="cmdOptions.Text" xml:space="preserve">
     <value>Plot Options</value>
@@ -214,7 +214,7 @@
     <value>119, 23</value>
   </data>
   <data name="cmdLineOptions.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
+    <value>9</value>
   </data>
   <data name="cmdLineOptions.Text" xml:space="preserve">
     <value>Line Options</value>
@@ -244,7 +244,7 @@
     <value>88, 13</value>
   </data>
   <data name="lblFactorOptional.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
+    <value>5</value>
   </data>
   <data name="lblFactorOptional.Text" xml:space="preserve">
     <value>Factor (Optional):</value>
@@ -274,7 +274,7 @@
     <value>39, 13</value>
   </data>
   <data name="lblGroupLine.TabIndex" type="System.Int32, mscorlib">
-    <value>15</value>
+    <value>7</value>
   </data>
   <data name="lblGroupLine.Text" xml:space="preserve">
     <value>Group:</value>
@@ -298,7 +298,7 @@
     <value>100, 20</value>
   </data>
   <data name="ucrChkValley.TabIndex" type="System.Int32, mscorlib">
-    <value>14</value>
+    <value>15</value>
   </data>
   <data name="&gt;&gt;ucrChkValley.Name" xml:space="preserve">
     <value>ucrChkValley</value>
@@ -319,7 +319,7 @@
     <value>100, 20</value>
   </data>
   <data name="ucrChkPeak.TabIndex" type="System.Int32, mscorlib">
-    <value>13</value>
+    <value>14</value>
   </data>
   <data name="&gt;&gt;ucrChkPeak.Name" xml:space="preserve">
     <value>ucrChkPeak</value>
@@ -349,7 +349,7 @@
     <value>135, 20</value>
   </data>
   <data name="ucrChkWithSE.TabIndex" type="System.Int32, mscorlib">
-    <value>9</value>
+    <value>13</value>
   </data>
   <data name="&gt;&gt;ucrChkWithSE.Name" xml:space="preserve">
     <value>ucrChkWithSE</value>
@@ -370,7 +370,7 @@
     <value>127, 24</value>
   </data>
   <data name="ucrChkLineofBestFit.TabIndex" type="System.Int32, mscorlib">
-    <value>10</value>
+    <value>12</value>
   </data>
   <data name="&gt;&gt;ucrChkLineofBestFit.Name" xml:space="preserve">
     <value>ucrChkLineofBestFit</value>
@@ -391,7 +391,7 @@
     <value>100, 24</value>
   </data>
   <data name="ucrChkPoints.TabIndex" type="System.Int32, mscorlib">
-    <value>8</value>
+    <value>11</value>
   </data>
   <data name="&gt;&gt;ucrChkPoints.Name" xml:space="preserve">
     <value>ucrChkPoints</value>
@@ -408,11 +408,14 @@
   <data name="ucrSave.Location" type="System.Drawing.Point, System.Drawing">
     <value>9, 366</value>
   </data>
+  <data name="ucrSave.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 5, 4, 5</value>
+  </data>
   <data name="ucrSave.Size" type="System.Drawing.Size, System.Drawing">
     <value>254, 24</value>
   </data>
   <data name="ucrSave.TabIndex" type="System.Int32, mscorlib">
-    <value>11</value>
+    <value>16</value>
   </data>
   <data name="&gt;&gt;ucrSave.Name" xml:space="preserve">
     <value>ucrSave</value>
@@ -433,7 +436,7 @@
     <value>125, 136</value>
   </data>
   <data name="ucrVariablesAsFactorForLinePlot.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
+    <value>2</value>
   </data>
   <data name="&gt;&gt;ucrVariablesAsFactorForLinePlot.Name" xml:space="preserve">
     <value>ucrVariablesAsFactorForLinePlot</value>
@@ -478,7 +481,7 @@
     <value>410, 53</value>
   </data>
   <data name="ucrBase.TabIndex" type="System.Int32, mscorlib">
-    <value>12</value>
+    <value>17</value>
   </data>
   <data name="&gt;&gt;ucrBase.Name" xml:space="preserve">
     <value>ucrBase</value>
@@ -502,7 +505,7 @@
     <value>125, 26</value>
   </data>
   <data name="ucrFactorOptionalReceiver.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
+    <value>6</value>
   </data>
   <data name="&gt;&gt;ucrFactorOptionalReceiver.Name" xml:space="preserve">
     <value>ucrFactorOptionalReceiver</value>
@@ -526,7 +529,7 @@
     <value>125, 26</value>
   </data>
   <data name="ucrReceiverX.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
+    <value>4</value>
   </data>
   <data name="&gt;&gt;ucrReceiverX.Name" xml:space="preserve">
     <value>ucrReceiverX</value>
@@ -562,7 +565,7 @@
     <value>125, 20</value>
   </data>
   <data name="ucrReceiverGroup.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
+    <value>8</value>
   </data>
   <data name="&gt;&gt;ucrReceiverGroup.Name" xml:space="preserve">
     <value>ucrReceiverGroup</value>