Merge pull request #12 from africanmathsinitiative/master

Update master

.gitignore

@@ -239,3 +239,6 @@ installer/Output/
 /instat/dlgFrequency.sw-KE.resx
 /instat/dlgFrequency.resx
 /instat/dlgFrequency.Designer.vb
+
+# Package used by script window
+/packages/jacobslusser.ScintillaNET.*/

instat/Model/DataFrame/clsDataFramePage.vb

@@ -273,7 +273,8 @@ Public Class clsDataFramePage
         ElseIf strHeaderType.Contains("logical") Then
             columnHeader.strTypeShortCode = "(L)"
             ' Structured columns e.g. "circular" are coded with "(S)"
-        ElseIf strHeaderType.Contains("circular") Then
+        ElseIf strHeaderType.Contains("circular") OrElse strHeaderType.Contains("bigz") OrElse
+               strHeaderType.Contains("bigq") Then
             columnHeader.strTypeShortCode = "(S)"
             ' Types of data for specific Application areas e.g. survival are coded with "(A)"
             ' No examples implemented yet.

instat/dlgCalculator.vb

@@ -188,7 +188,7 @@ Public Class dlgCalculator
                 Me.Width = iBasicWidth * 1.27
                 ucrBase.iHelpTopicID = 598
             Case "Integer"
-                Me.Width = iBasicWidth * 1.37
+                Me.Width = iBasicWidth * 1.38
             Case Else
                 Me.Width = iBasicWidth
         End Select

instat/dlgExportDataset.vb

@@ -22,9 +22,6 @@ Public Class dlgExportDataset
     Private clsDefaultFunction As New RFunction
 
     Private Sub dlgExportDataset_Load(sender As Object, e As EventArgs) Handles Me.Load
-        'temporarily commented out because it overwrites lblConfirm text contents
-        'autoTranslate(Me) 
-
         If bFirstLoad Then
             InitialiseDialog()
             bFirstLoad = False
@@ -34,6 +31,7 @@ Public Class dlgExportDataset
         End If
         SetRCodeForControls(bReset)
         bReset = False
+        autoTranslate(Me)
     End Sub
 
     Private Sub InitialiseDialog()