Merge pull request #5626 from Wycklife/Keyboards

Improvements to the calculator.
IDEMSInternational · Feb 3, 2020 · 03b888e · 03b888e
2 parents f3788ca + 9a46d13
commit 03b888e
Show file tree

Hide file tree

Showing 5 changed files with 4,994 additions and 3,662 deletions.
diff --git a/instat/dlgCalculator.resx b/instat/dlgCalculator.resx
@@ -119,10 +119,14 @@
   </resheader>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="ucrBase.Location" type="System.Drawing.Point, System.Drawing">
-    <value>13, 369</value>
+    <value>17, 490</value>
+  </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="ucrBase.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>5, 5, 5, 5</value>
   </data>
   <data name="ucrBase.Size" type="System.Drawing.Size, System.Drawing">
-    <value>410, 52</value>
+    <value>547, 64</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="ucrBase.TabIndex" type="System.Int32, mscorlib">
@@ -141,10 +145,13 @@
     <value>0</value>
   </data>
   <data name="ucrCalc.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 5</value>
+    <value>16, 6</value>
+  </data>
+  <data name="ucrCalc.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>5, 5, 5, 5</value>
   </data>
   <data name="ucrCalc.Size" type="System.Drawing.Size, System.Drawing">
-    <value>493, 358</value>
+    <value>657, 441</value>
   </data>
   <data name="ucrCalc.TabIndex" type="System.Int32, mscorlib">
     <value>174</value>
@@ -165,17 +172,13 @@
     <value>True</value>
   </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 13</value>
+    <value>8, 16</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>517, 425</value>
-  </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
+    <value>689, 559</value>
   </data>
   <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>2, 3, 2, 3</value>
+    <value>3, 4, 3, 4</value>
   </data>
   <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
     <value>CenterScreen</value>

diff --git a/instat/dlgCalculator.vb b/instat/dlgCalculator.vb
@@ -136,23 +136,27 @@ Public Class dlgCalculator
             Case "Maths"
                 Me.Size = New System.Drawing.Size(iBasicWidth * 1.38, Me.Height)
             Case "Logical and Symbols"
-                Me.Size = New System.Drawing.Size(iBasicWidth * 1.46, Me.Height)
+                Me.Size = New System.Drawing.Size(iBasicWidth * 1.4, Me.Height)
             Case "Summary"
-                Me.Size = New System.Drawing.Size(iBasicWidth * 1.49, Me.Height)
+                Me.Size = New System.Drawing.Size(iBasicWidth * 1.43, Me.Height)
             Case "Strings (Character Columns)"
-                Me.Size = New System.Drawing.Size(iBasicWidth * 1.41, Me.Height)
+                Me.Size = New System.Drawing.Size(iBasicWidth * 1.47, Me.Height)
             Case "Factor"
-                Me.Size = New System.Drawing.Size(iBasicWidth * 1.42, Me.Height)
+                Me.Size = New System.Drawing.Size(iBasicWidth * 1.4, Me.Height)
             Case "Probability"
-                Me.Size = New System.Drawing.Size(iBasicWidth * 1.59, Me.Height)
+                Me.Size = New System.Drawing.Size(iBasicWidth * 1.5, Me.Height)
             Case "Dates"
                 Me.Size = New System.Drawing.Size(iBasicWidth * 1.3, Me.Height)
             Case "Transform"
                 Me.Size = New System.Drawing.Size(iBasicWidth * 1.35, Me.Height)
             Case "Circular"
-                Me.Size = New System.Drawing.Size(iBasicWidth * 1.39, Me.Height)
+                Me.Size = New System.Drawing.Size(iBasicWidth * 1.36, Me.Height)
             Case "Wakefield"
                 Me.Size = New System.Drawing.Size(iBasicWidth * 1.7, Me.Height)
+            Case "Modifier"
+                Me.Size = New Size(iBasicWidth * 1.39, Me.Height)
+            Case "Symbols"
+                Me.Size = New Size(iBasicWidth * 2.56, Me.Height)
             Case Else
                 Me.Size = New System.Drawing.Size(iBasicWidth, Me.Height)
         End Select