diff --git a/instat/dlgColumnStats.vb b/instat/dlgColumnStats.vb index 785d40e2caa..e4f0fff1e0c 100644 --- a/instat/dlgColumnStats.vb +++ b/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 diff --git a/instat/dlgCombineText.vb b/instat/dlgCombineText.vb index 44a27cb44bd..3f81d6625ab 100644 --- a/instat/dlgCombineText.vb +++ b/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 diff --git a/instat/dlgContrasts.vb b/instat/dlgContrasts.vb index fbb1a99a7a5..90f059f4f8f 100644 --- a/instat/dlgContrasts.vb +++ b/instat/dlgContrasts.vb @@ -15,7 +15,20 @@ ' along with this program. If not, see . 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 \ No newline at end of file diff --git a/instat/dlgDeleteDescriptive.vb b/instat/dlgDeleteDescriptive.vb index 9b8d2cff07f..cd70a63f3b4 100644 --- a/instat/dlgDeleteDescriptive.vb +++ b/instat/dlgDeleteDescriptive.vb @@ -15,7 +15,20 @@ ' along with this program. If not, see . 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 \ No newline at end of file diff --git a/instat/dlgDeleteModels.vb b/instat/dlgDeleteModels.vb index d9e9a3f6371..b313a4e604e 100644 --- a/instat/dlgDeleteModels.vb +++ b/instat/dlgDeleteModels.vb @@ -15,7 +15,21 @@ ' along with this program. If not, see . 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 \ No newline at end of file diff --git a/instat/dlgDeleteRows.vb b/instat/dlgDeleteRows.vb index 02ba4389897..30937d748ae 100644 --- a/instat/dlgDeleteRows.vb +++ b/instat/dlgDeleteRows.vb @@ -1,5 +1,6 @@ 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 @@ -7,6 +8,18 @@ Public Class dlgDeleteRows 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() diff --git a/instat/dlgDeleteSheet.vb b/instat/dlgDeleteSheet.vb index 7df4a24f5c3..b2e9e7589d5 100644 --- a/instat/dlgDeleteSheet.vb +++ b/instat/dlgDeleteSheet.vb @@ -15,12 +15,25 @@ ' along with this program. If not, see . 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 diff --git a/instat/dlgLabels.vb b/instat/dlgLabels.vb index 270f2e40cb8..155891a8117 100644 --- a/instat/dlgLabels.vb +++ b/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 . +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 \ No newline at end of file diff --git a/instat/dlgMakeSheets.vb b/instat/dlgMakeSheets.vb index b1a0b480a2d..cdebc5d9612 100644 --- a/instat/dlgMakeSheets.vb +++ b/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 . 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 \ No newline at end of file diff --git a/instat/dlgRandomSubset.vb b/instat/dlgRandomSubset.vb index 0a96bbb1be1..e527a30aafc 100644 --- a/instat/dlgRandomSubset.vb +++ b/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 . +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 \ No newline at end of file diff --git a/instat/dlgReferenceLevel.vb b/instat/dlgReferenceLevel.vb index 8ce5fc94d97..ede73a09c2c 100644 --- a/instat/dlgReferenceLevel.vb +++ b/instat/dlgReferenceLevel.vb @@ -15,6 +15,7 @@ ' along with this program. If not, see . 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 diff --git a/instat/dlgReferenceLevels.Designer.vb b/instat/dlgReferenceLevels.Designer.vb deleted file mode 100644 index b9a20047b2e..00000000000 --- a/instat/dlgReferenceLevels.Designer.vb +++ /dev/null @@ -1,51 +0,0 @@ - _ -Partial Class dlgReferenceLevels - Inherits System.Windows.Forms.Form - - 'Form overrides dispose to clean up the component list. - _ - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try - End Sub - - 'Required by the Windows Form Designer - Private components As System.ComponentModel.IContainer - - 'NOTE: The following procedure is required by the Windows Form Designer - 'It can be modified using the Windows Form Designer. - 'Do not modify it using the code editor. - _ - Private Sub InitializeComponent() - Me.ucrBase = New instat.ucrButtons() - Me.SuspendLayout() - ' - 'ucrBase - ' - Me.ucrBase.Location = New System.Drawing.Point(12, 196) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 53) - Me.ucrBase.TabIndex = 0 - ' - 'dlgReferenceLevels - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(432, 261) - Me.Controls.Add(Me.ucrBase) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Name = "dlgReferenceLevels" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Tag = "Reference_Levels" - Me.Text = "Reference Levels" - Me.ResumeLayout(False) - - End Sub - - Friend WithEvents ucrBase As ucrButtons -End Class diff --git a/instat/dlgReferenceLevels.fr-FR.resx b/instat/dlgReferenceLevels.fr-FR.resx deleted file mode 100644 index 9c9f69d752c..00000000000 --- a/instat/dlgReferenceLevels.fr-FR.resx +++ /dev/null @@ -1,15 +0,0 @@ - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/instat/dlgReferenceLevels.resx b/instat/dlgReferenceLevels.resx deleted file mode 100644 index 29dcb1b3a35..00000000000 --- a/instat/dlgReferenceLevels.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/instat/dlgReferenceLevels.sw-KE.resx b/instat/dlgReferenceLevels.sw-KE.resx deleted file mode 100644 index 9c9f69d752c..00000000000 --- a/instat/dlgReferenceLevels.sw-KE.resx +++ /dev/null @@ -1,15 +0,0 @@ - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/instat/dlgReferenceLevels.vb b/instat/dlgReferenceLevels.vb deleted file mode 100644 index ecdc7903194..00000000000 --- a/instat/dlgReferenceLevels.vb +++ /dev/null @@ -1,22 +0,0 @@ -' 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 . - -Imports instat.Translations -Public Class dlgReferenceLevels - Private Sub dlgReferenceLevels_Load(sender As Object, e As EventArgs) Handles MyBase.Load - autoTranslate(Me) - End Sub -End Class \ No newline at end of file diff --git a/instat/dlgRenameDescriptive.vb b/instat/dlgRenameDescriptive.vb index f0ecfc9ffd4..4d644cedd8d 100644 --- a/instat/dlgRenameDescriptive.vb +++ b/instat/dlgRenameDescriptive.vb @@ -15,7 +15,20 @@ ' along with this program. If not, see . Imports instat.Translations Public Class dlgRenameDescriptive + Public bFirstLoad As Boolean = True Private Sub dlgRenameDescriptive_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 \ No newline at end of file diff --git a/instat/dlgRenameModels.vb b/instat/dlgRenameModels.vb index e3ec42b861a..e49c3ca42df 100644 --- a/instat/dlgRenameModels.vb +++ b/instat/dlgRenameModels.vb @@ -15,7 +15,21 @@ ' along with this program. If not, see . Imports instat.Translations Public Class dlgRenameModels + Public bFirstLoad As Boolean = True Private Sub dlgRenameModels_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 \ No newline at end of file diff --git a/instat/dlgReoderDescriptives.vb b/instat/dlgReoderDescriptives.vb index 70cc0a25ff4..dc2bf330082 100644 --- a/instat/dlgReoderDescriptives.vb +++ b/instat/dlgReoderDescriptives.vb @@ -15,7 +15,29 @@ ' along with this program. If not, see . Imports instat.Translations Public Class dlgReoderDescriptives + Public bFirstLoad As Boolean = True Private Sub dlgReoderDescriptives_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) + If bFirstLoad Then + SetDefaults() + bFirstLoad = False + Else + ReopenDialog() + End If + 'Checks if Ok can be enabled. + TestOKEnabled() + End Sub + Private Sub ReopenDialog() + + End Sub + Private Sub TestOKEnabled() + + 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 \ No newline at end of file diff --git a/instat/dlgReoderModels.vb b/instat/dlgReoderModels.vb index f08d8fd7489..a90eb91d29f 100644 --- a/instat/dlgReoderModels.vb +++ b/instat/dlgReoderModels.vb @@ -15,7 +15,29 @@ ' along with this program. If not, see . Imports instat.Translations Public Class dlgReoderModels + Public bFirstLoad As Boolean = True Private Sub dlgReoderModels_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) + If bFirstLoad Then + SetDefaults() + bFirstLoad = False + Else + ReopenDialog() + End If + 'Checks if Ok can be enabled. + TestOKEnabled() + End Sub + Private Sub ReopenDialog() + + End Sub + Private Sub TestOKEnabled() + + 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 \ No newline at end of file diff --git a/instat/dlgReorderLevels.vb b/instat/dlgReorderLevels.vb index 4dfd9bdf3a5..15e4d6ec349 100644 --- a/instat/dlgReorderLevels.vb +++ b/instat/dlgReorderLevels.vb @@ -16,7 +16,21 @@ Imports instat.Translations Public Class dlgReorderLevels + Public bFirstLoad As Boolean = True Private Sub dlgReorderLevels_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 \ No newline at end of file diff --git a/instat/dlgViewDescriptives.vb b/instat/dlgViewDescriptives.vb index 3e3cf7a8aa3..359d3710cd4 100644 --- a/instat/dlgViewDescriptives.vb +++ b/instat/dlgViewDescriptives.vb @@ -15,7 +15,21 @@ ' along with this program. If not, see . Imports instat.Translations Public Class dlgViewDescriptives + Public bFirstLoad As Boolean = True Private Sub dlgViewDescriptives_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 \ No newline at end of file diff --git a/instat/dlgViewModels.vb b/instat/dlgViewModels.vb index 4bf3e3f3f95..f670d451457 100644 --- a/instat/dlgViewModels.vb +++ b/instat/dlgViewModels.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 . Imports instat.Translations + Public Class dlgViewModels + Public bFirstLoad As Boolean = True Private Sub dlgViewModels_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 \ No newline at end of file diff --git a/instat/instat.vbproj b/instat/instat.vbproj index bc034d85168..d8f9c927843 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -370,12 +370,6 @@ Form - - dlgReferenceLevels.vb - - - Form - dlgRenameDescriptive.vb @@ -1850,15 +1844,6 @@ dlgRandomSubset.vb - - dlgReferenceLevels.vb - - - dlgReferenceLevels.vb - - - dlgReferenceLevels.vb - dlgRenameDescriptive.vb