Merge pull request IDEMSInternational#6257 from Patowhiz/DateTimeCalc…

…ulator Improved the date/time features of the Calculator
Ivanluv · Mar 16, 2021 · 0d664c0 · 0d664c0
2 parents a5fd75a + fb44ecd
commit 0d664c0
Show file tree

Hide file tree

Showing 4 changed files with 2,547 additions and 2,490 deletions.
diff --git a/instat/dlgCalculator.vb b/instat/dlgCalculator.vb
@@ -26,7 +26,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", "Strings (Character Columns)", "Factor", "Probability", "Dates", "Transform", "Circular", "Wakefield", "Modifier", "Symbols", "HydroGOF"}
+    Private strKeyboards() As String = {"Maths", "Logical and Symbols", "Summary", "Strings (Character Columns)", "Factor", "Probability", "Dates/Times", "Transform", "Circular", "Wakefield", "Modifier", "Symbols", "HydroGOF"}
 
 
     Private Sub dlgCalculator_Load(sender As Object, e As EventArgs) Handles MyBase.Load
@@ -149,8 +149,8 @@ Public Class dlgCalculator
                 Me.Width = iBasicWidth * 1.4
             Case "Probability"
                 Me.Width = iBasicWidth * 1.5
-            Case "Dates"
-                Me.Width = iBasicWidth * 1.3
+            Case "Dates/Times"
+                Me.Width = iBasicWidth * 1.37
             Case "Transform"
                 Me.Width = iBasicWidth * 1.37
             Case "Circular"