Merge pull request #102 from africanmathsinitiative/master

merge from main

instat/dlgColumnStats.vb

@@ -17,12 +17,25 @@
 
 Imports instat.Translations
 Public Class dlgColumnStats
+    Public bFirstLoad As Boolean = True
     Private Sub dlgColumnStats_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         autoTranslate(Me)
         ucrReceiverMultiple.Selector = ucrAddRemove
         ucrReceiverMultiple.SetMeAsReceiver()
         ucrBase.clsRsyntax.SetFunction("colStats")
-        ucrBase.clsRsyntax.iCallType = 2
+        ucrBase.clsRsyntax.iCallType = 2
+        ucrBase.iHelpTopicID = 64
+        If bFirstLoad Then
+            SetDefaults()
+            bFirstLoad = False
+        End If
+    End Sub
+    Private Sub SetDefaults()
+
+    End Sub
+
+    Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset
+        SetDefaults()
     End Sub
 
     Private Sub ucrReceiverMultiple_Leave(sender As Object, e As EventArgs) Handles ucrReceiverMultiple.Leave

instat/dlgCombineText.vb

@@ -19,8 +19,8 @@ Public Class dlgCombineText
     Private Sub dlgCombineText_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         autoTranslate(Me)
 
-        autoTranslate(Me)
-
+
+
         If bFirstLoad Then
             SetDefaults()
             bFirstLoad = False

instat/dlgContrasts.vb

@@ -15,7 +15,20 @@
 ' along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Imports instat.Translations
 Public Class dlgContrasts
+    Public bFirstLoad As Boolean = True
     Private Sub dlgContrasts_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         autoTranslate(Me)
+
+        If bFirstLoad Then
+            SetDefaults()
+            bFirstLoad = False
+        End If
+    End Sub
+    Private Sub SetDefaults()
+
+    End Sub
+
+    Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset
+        SetDefaults()
     End Sub
 End Class

instat/dlgDeleteDescriptive.vb

@@ -15,7 +15,20 @@
 ' along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Imports instat.Translations
 Public Class dlgDeleteDescriptive
+    Public bFirstLoad As Boolean
     Private Sub dlgDeleteDescriptive_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         autoTranslate(Me)
+
+        If bFirstLoad Then
+            SetDefaults()
+            bFirstLoad = False
+        End If
+    End Sub
+    Private Sub SetDefaults()
+
+    End Sub
+
+    Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset
+        SetDefaults()
     End Sub
 End Class

instat/dlgDeleteModels.vb

@@ -15,7 +15,21 @@
 ' along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Imports instat.Translations
 Public Class dlgDeleteModels
+    Public bFirstLoad As Boolean = True
     Private Sub dlgDeleteModels_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         autoTranslate(Me)
+
+        If bFirstLoad Then
+            SetDefaults()
+            bFirstLoad = False
+        End If
+
+    End Sub
+    Private Sub SetDefaults()
+
+    End Sub
+
+    Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset
+        SetDefaults()
     End Sub
 End Class

instat/dlgDeleteRows.vb

@@ -1,12 +1,25 @@
 Imports instat.Translations
 Public Class dlgDeleteRows
+    Public bFirstLoad As Boolean = True
     Private Sub dlgDeleteRows_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         ucrBase.clsRsyntax.SetFunction("subset")
         ucrBase.clsRsyntax.iCallType = 1
         ucrReceiverDeleteRows.Selector = ucrAddRemove
         ucrReceiverDeleteRows.SetMeAsReceiver()
         autoTranslate(Me)
 
+
+        If bFirstLoad Then
+            SetDefaults()
+            bFirstLoad = False
+        End If
+    End Sub
+    Private Sub SetDefaults()
+
+    End Sub
+
+    Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset
+        SetDefaults()
     End Sub
     Private Sub ucrReceiverDeleteRows_Enter(sender As Object, e As EventArgs) Handles ucrReceiverDeleteRows.Enter
         ucrReceiverDeleteRows.SetMeAsReceiver()

instat/dlgDeleteSheet.vb

@@ -15,12 +15,25 @@
 ' along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Imports instat.Translations
 Public Class dlgDeleteSheet
+    Public bFirstLoad As Boolean = True
     Private Sub dlgDeleteSheet_Load(sender As Object, e As EventArgs) Handles Me.Load
         ucrBase.iHelpTopicID = 63
         'set the function
         ucrBase.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$delete_dataframe")
         ucrDataFrameToDelete.Focus()
-        autoTranslate(Me)
+        autoTranslate(Me)
+
+        If bFirstLoad Then
+            SetDefaults()
+            bFirstLoad = False
+        End If
+    End Sub
+    Private Sub SetDefaults()
+
+    End Sub
+
+    Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset
+        SetDefaults()
     End Sub
 
     Private Sub ucrDataFrameToDelete_Leave(sender As Object, e As EventArgs) Handles ucrDataFrameToDelete.Leave

instat/dlgLabels.vb

@@ -1,3 +1,34 @@
-Public Class dlgLabels
-
+' Instat-R
+' Copyright (C) 2015
+'
+' This program is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 3 of the License, or
+' (at your option) any later version.
+'
+' This program is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+' GNU General Public License for more details.
+'
+' You should have received a copy of the GNU General Public License k
+' along with this program.  If not, see <http://www.gnu.org/licenses/>.
+Imports instat.Translations
+Public Class dlgLabels
+    Public bFirstLoad As Boolean = True
+    Private Sub dlgLabels_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        autoTranslate(Me)
+
+        If bFirstLoad Then
+            SetDefaults()
+            bFirstLoad = False
+        End If
+    End Sub
+    Private Sub SetDefaults()
+
+    End Sub
+
+    Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset
+        SetDefaults()
+    End Sub
 End Class

instat/dlgMakeSheets.vb

@@ -14,8 +14,22 @@
 ' You should have received a copy of the GNU General Public License k
 ' along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Imports instat.Translations
+
 Public Class dlgMakeSheets
+    Public bFirstLoad As Boolean = True
     Private Sub dlgMakeSheets_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         autoTranslate(Me)
+
+        If bFirstLoad Then
+            SetDefaults()
+            bFirstLoad = False
+        End If
+    End Sub
+    Private Sub SetDefaults()
+
+    End Sub
+
+    Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset
+        SetDefaults()
     End Sub
 End Class

instat/dlgRandomSubset.vb

@@ -1,3 +1,35 @@
-Public Class dlgRandomSubset
+' Instat-R
+' Copyright (C) 2015
+'
+' This program is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 3 of the License, or
+' (at your option) any later version.
+'
+' This program is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+' GNU General Public License for more details.
+'
+' You should have received a copy of the GNU General Public License k
+' along with this program.  If not, see <http://www.gnu.org/licenses/>.
+Imports instat.Translations
 
+Public Class dlgRandomSubset
+    Public bFirstLoad As Boolean = True
+    Private Sub dlgRandomSubset_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        autoTranslate(Me)
+
+        If bFirstLoad Then
+            SetDefaults()
+            bFirstLoad = False
+        End If
+    End Sub
+    Private Sub SetDefaults()
+
+    End Sub
+
+    Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset
+        SetDefaults()
+    End Sub
 End Class

instat/dlgReferenceLevel.vb

@@ -15,6 +15,7 @@
 ' along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Imports instat.Translations
 Public Class dlgReferenceLevel
+    Public bFirstLoad As Boolean = True
     Private Sub dlgReferenceLevel_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         ucrBase.clsRsyntax.SetFunction("relevel")
 
@@ -23,6 +24,18 @@ Public Class dlgReferenceLevel
         ucrFactorSelected.SetDataType("factor")
         autoTranslate(Me)
 
+        If bFirstLoad Then
+            SetDefaults()
+            bFirstLoad = False
+        End If
+
+    End Sub
+    Private Sub SetDefaults()
+
+    End Sub
+
+    Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset
+        SetDefaults()
     End Sub