Merge pull request IDEMSInternational#8944 from Fidel365/Calcorder.new

Adjusting keyboards order and changing labels in the calculator
rachelkg · Apr 23, 2024 · 5c85192 · 5c85192
2 parents ce9d7de + 3d22fdd
commit 5c85192
Show file tree

Hide file tree

Showing 4 changed files with 1,764 additions and 1,586 deletions.
diff --git a/instat/dlgCalculator.vb b/instat/dlgCalculator.vb
@@ -27,7 +27,7 @@ Public Class dlgCalculator
     Private iBasicWidth As Integer
     Private strDefaultKeyboard As String
     ' Note: This list needs to be updated when a new keyboard is added.
-    Private strKeyboards() As String = {"Maths", "Logical and Symbols", "Summary", "Text/Strings (Character Columns)", "Factor", "Probability", "Dates/Times", "Transform", "Circular", "Wakefield", "Modifier", "Symbols", "HydroGOF", "Integer", "Complex", "List"}
+    Private strKeyboards() As String = {"Basic", "Maths", "Logical and Symbols", "Transform", "Summary", "Probability", "Factor", "Text/Strings (Character Columns)", "Dates/Times", "Circular", "Wakefield", "Goodness of Fit", "List", "Complex", "Integer"}
 
     Private Sub dlgCalculator_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         If bFirstLoad Then
@@ -192,7 +192,7 @@ Public Class dlgCalculator
                 Me.Width = iBasicWidth * 1.39
             Case "Symbols"
                 Me.Width = iBasicWidth * 2.56
-            Case "hydroGOF"
+            Case "Goodness of Fit"
                 Me.Width = iBasicWidth * 1.27
                 ucrBase.iHelpTopicID = 598
             Case "Integer"