Fixed John dialogs, also did part of task 4:h)

instat/dlgMerge.vb

@@ -0,0 +1,3 @@
+Public Class dlgMerge
+
+End Class

instat/dlgSubset.vb

@@ -0,0 +1,3 @@
+Public Class dlgSubset
+
+End Class

instat/frmMain.vb

@@ -64,14 +64,6 @@ Public Class frmMain
         dlgDescriptiveStatistics.ShowDialog()
     End Sub
 
-    Private Sub SortToolStripMenuItem_Click(sender As Object, e As EventArgs)
-        dlgSort.ShowDialog()
-    End Sub
-
-    Private Sub mnuSriptLog_Click(sender As Object, e As EventArgs)
-        frmLog.ShowDialog()
-    End Sub
-
     Private Sub KiswahiliToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles KiswahiliToolStripMenuItem1.Click
         Thread.CurrentThread.CurrentCulture = New CultureInfo("sw-KE")
         Thread.CurrentThread.CurrentUICulture = New CultureInfo("sw-KE")
@@ -98,14 +90,6 @@ Public Class frmMain
         dlgFileNew.ShowDialog()
     End Sub
 
-    Private Sub LogWindowMenu_Click(sender As Object, e As EventArgs) Handles LogWindowMenu.Click
-        If frmLog.Visible = True Then
-            frmLog.Visible = False
-        Else
-            frmLog.Visible = True
-        End If
-    End Sub
-
     Private Sub StartOfTheRainsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles StartOfTheRainsToolStripMenuItem.Click
         dlgStartofRains.ShowDialog()
     End Sub
@@ -198,46 +182,6 @@ Public Class frmMain
         dlgYearRaincount.ShowDialog()
     End Sub
 
-    Private Sub mnuWindowMetadata_Click(sender As Object, e As EventArgs)
-        frmMetaData.Show()
-    End Sub
-
-    Private Sub mnuWindowVariables_Click(sender As Object, e As EventArgs)
-        frmVariables.Show()
-    End Sub
-
-    Private Sub mnuManageWorksheetInformation_Click(sender As Object, e As EventArgs) Handles mnuManageWorksheetInformation.Click
-        If frmVariables.Visible = True Then
-            frmVariables.Visible = False
-        Else
-            frmVariables.Visible = True
-        End If
-    End Sub
-
-    Private Sub mnuManageLogWindow_Click(sender As Object, e As EventArgs) Handles mnuManageLogWindow.Click
-        If frmLog.Visible = True Then
-            frmLog.Visible = False
-        Else
-            frmLog.Visible = True
-        End If
-    End Sub
-
-    Private Sub mnuManageScriptWindow_Click(sender As Object, e As EventArgs) Handles mnuManageScriptWindow.Click
-        If frmScript.Visible = True Then
-            frmScript.Visible = False
-        Else
-            frmScript.Visible = True
-        End If
-    End Sub
-
-    Private Sub mnuManageWorksheetMetadata_Click(sender As Object, e As EventArgs) Handles mnuManageWorksheetMetadata.Click
-        If frmMetaData.Visible = True Then
-            frmMetaData.Visible = False
-        Else
-            frmMetaData.Visible = True
-        End If
-    End Sub
-
     Private Sub mnuClmateMethodThreeSummaries_Click(sender As Object, e As EventArgs) Handles mnuClmateMethodThreeSummaries.Click
         dlgThreeSummaries.ShowDialog()
     End Sub
@@ -323,10 +267,6 @@ Public Class frmMain
         'dlgOneWayAnova.ShowDialog()
     End Sub
 
-    Private Sub mnuStatsNonParametricTwoWayAnova_Click(sender As Object, e As EventArgs)
-        dlgTwoWayAnova.ShowDialog()
-    End Sub
-
     Private Sub mnuStatsSummaryColumnStat_Click(sender As Object, e As EventArgs) Handles mnuStatsSummaryColumnStat.Click
         dlgColumnStats.ShowDialog()
     End Sub
@@ -709,10 +649,6 @@ Public Class frmMain
         Return New KeyValuePair(Of String, String)("", "")
     End Function
 
-    Private Sub mnuFileClose_Click(sender As Object, e As EventArgs) Handles mnuFileClose.Click
-
-    End Sub
-
     Private Sub mnuFileOpenFromLibrary_Click(sender As Object, e As EventArgs) Handles mnuFileOpenFromLibrary.Click
         'TODO decide what Open From Library does and edit below
         'Dim kvpFile As KeyValuePair(Of String, String)
@@ -725,7 +661,7 @@ Public Class frmMain
         'clsGrids.UpdateGrids()
     End Sub
 
-    Private Sub mnuManageDataSubset_Click(sender As Object, e As EventArgs) Handles mnuManageDataSubset.Click
+    Private Sub mnuManageDataSubset_Click(sender As Object, e As EventArgs) Handles mnuManageSubset.Click
         dlgSubset.ShowDialog()
     End Sub
 
@@ -736,4 +672,40 @@ Public Class frmMain
     Private Sub mnuManageDataMerge_Click(sender As Object, e As EventArgs) Handles mnuManageDataMerge.Click
         dlgMerge.ShowDialog()
     End Sub
+
+    Private Sub mnuWindowVariable_Click(sender As Object, e As EventArgs) Handles mnuWindowVariable.Click
+        If frmVariables.Visible = True Then
+            frmVariables.Visible = False
+        Else
+            frmVariables.Visible = True
+        End If
+    End Sub
+
+    Private Sub mnuWindowDataFrame_Click(sender As Object, e As EventArgs) Handles mnuWindowDataFrame.Click
+        If frmMetaData.Visible = True Then
+            frmMetaData.Visible = False
+        Else
+            frmMetaData.Visible = True
+        End If
+    End Sub
+
+    Private Sub LogToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles LogToolStripMenuItem.Click
+        If frmLog.Visible = True Then
+            frmLog.Visible = False
+        Else
+            frmLog.Visible = True
+        End If
+    End Sub
+
+    Private Sub ScriptToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ScriptToolStripMenuItem.Click
+        If frmScript.Visible = True Then
+            frmScript.Visible = False
+        Else
+            frmScript.Visible = True
+        End If
+    End Sub
+
+    Private Sub SubsetToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SubsetToolStripMenuItem.Click
+        dlgSubset.ShowDialog()
+    End Sub
 End Class

instat/instat.vbproj

@@ -503,6 +503,12 @@
     <Compile Include="dlgMakeFactor.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="dlgMerge.Designer.vb">
+      <DependentUpon>dlgMerge.vb</DependentUpon>
+    </Compile>
+    <Compile Include="dlgMerge.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="dlgMissingData.designer.vb">
       <DependentUpon>dlgMissingData.vb</DependentUpon>
     </Compile>
@@ -779,6 +785,12 @@
     <Compile Include="dlgStemAndLeaf.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="dlgSubset.Designer.vb">
+      <DependentUpon>dlgSubset.vb</DependentUpon>
+    </Compile>
+    <Compile Include="dlgSubset.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="dlgSummary.Designer.vb">
       <DependentUpon>dlgSummary.vb</DependentUpon>
     </Compile>