From d5f84d41a43a4f3080b861535893dcf90f4dd256 Mon Sep 17 00:00:00 2001 From: Lunalo Date: Mon, 31 Oct 2016 10:56:37 +0300 Subject: [PATCH 1/2] Changing dlgTablePlus to Show Model --- ...us.Designer.vb => dlgShowModel.Designer.vb} | 8 ++++---- instat/{dlgTablePlus.vb => dlgShowModel.vb} | 2 +- instat/frmMain.vb | 2 +- instat/instat.vbproj | 18 +++++++++--------- 4 files changed, 15 insertions(+), 15 deletions(-) rename instat/{dlgTablePlus.Designer.vb => dlgShowModel.Designer.vb} (96%) rename instat/{dlgTablePlus.vb => dlgShowModel.vb} (97%) diff --git a/instat/dlgTablePlus.Designer.vb b/instat/dlgShowModel.Designer.vb similarity index 96% rename from instat/dlgTablePlus.Designer.vb rename to instat/dlgShowModel.Designer.vb index ba3266d72ee..8db7d373144 100644 --- a/instat/dlgTablePlus.Designer.vb +++ b/instat/dlgShowModel.Designer.vb @@ -1,5 +1,5 @@  -Partial Class dlgTablePlus +Partial Class dlgShowModel Inherits System.Windows.Forms.Form 'Form overrides dispose to clean up the component list. @@ -156,7 +156,7 @@ Partial Class dlgTablePlus Me.ucrBase.Size = New System.Drawing.Size(410, 52) Me.ucrBase.TabIndex = 0 ' - 'dlgTablePlus + 'dlgShowModel ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font @@ -177,9 +177,9 @@ Partial Class dlgTablePlus Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False - Me.Name = "dlgTablePlus" + Me.Name = "dlgShowModel" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "Tables Plus" + Me.Text = "Show Model" Me.ResumeLayout(False) Me.PerformLayout() diff --git a/instat/dlgTablePlus.vb b/instat/dlgShowModel.vb similarity index 97% rename from instat/dlgTablePlus.vb rename to instat/dlgShowModel.vb index 9821b08b4a6..56f48799b79 100644 --- a/instat/dlgTablePlus.vb +++ b/instat/dlgShowModel.vb @@ -14,7 +14,7 @@ ' 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 dlgTablePlus +Public Class dlgShowModel Public bFirstLoad As Boolean = True Private Sub dlgTablePlus_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 913cbf0da1d..ef7dd7ba7b8 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -1115,7 +1115,7 @@ Public Class frmMain End Sub Private Sub TablesPlusToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuModelProbabilityDistributionsShowModel.Click - dlgTablePlus.ShowDialog() + dlgShowModel.ShowDialog() End Sub Private Sub mnuDescribeUseGraph_Click(sender As Object, e As EventArgs) Handles mnuDescribeUseGraph.Click diff --git a/instat/instat.vbproj b/instat/instat.vbproj index b05e3d1b3b8..63e2d9d0c3a 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -248,10 +248,10 @@ Form - - dlgTablePlus.vb + + dlgShowModel.vb - + Form @@ -2622,14 +2622,14 @@ dlgSummaryBarOrPieChart.vb - - dlgTablePlus.vb + + dlgShowModel.vb - - dlgTablePlus.vb + + dlgShowModel.vb - - dlgTablePlus.vb + + dlgShowModel.vb dlgThemes.vb From 7bf09a5532804e827380d1c52377df716aa12149 Mon Sep 17 00:00:00 2001 From: Lunalo Date: Mon, 31 Oct 2016 11:19:53 +0300 Subject: [PATCH 2/2] minow edits on frmMain --- instat/frmMain.vb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index ef7dd7ba7b8..5e05361dcd1 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -1237,4 +1237,8 @@ Public Class frmMain Private Sub mnuFileSaveAsDataAs_Click(sender As Object, e As EventArgs) Handles mnuFileSaveAsDataAs.Click dlgSaveAs.ShowDialog() End Sub + + Private Sub mnuModelProbabilityDistributionsCompareModels_Click(sender As Object, e As EventArgs) Handles mnuModelProbabilityDistributionsCompareModels.Click + dlgCompareModels.ShowDialog() + End Sub End Class \ No newline at end of file