From 0ead47296ff522802b32e4fee42259fa30aa19a1 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 9 Dec 2024 11:28:42 +0100 Subject: [PATCH 1/5] Hided Model, Structured, experiments, and Procuremen menus --- instat/frmMain.Designer.vb | 5 +++-- instat/frmMain.vb | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 1ace18cf46..97c28d30c0 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -1057,6 +1057,7 @@ Partial Class frmMain Me.mnuModel.Size = New System.Drawing.Size(53, 22) Me.mnuModel.Tag = "Model" Me.mnuModel.Text = "Model" + Me.mnuModel.Visible = False ' 'mnuModelProbabilityDistributions ' @@ -3215,7 +3216,7 @@ Partial Class frmMain ' Me.mnuDataViewWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuDataViewWindow.Name = "mnuDataViewWindow" - Me.mnuDataViewWindow.Size = New System.Drawing.Size(180, 22) + Me.mnuDataViewWindow.Size = New System.Drawing.Size(148, 22) Me.mnuDataViewWindow.Text = "Data View" ' 'mnuRDataViewerWindow @@ -3223,7 +3224,7 @@ Partial Class frmMain Me.mnuRDataViewerWindow.Enabled = False Me.mnuRDataViewerWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuRDataViewerWindow.Name = "mnuRDataViewerWindow" - Me.mnuRDataViewerWindow.Size = New System.Drawing.Size(180, 22) + Me.mnuRDataViewerWindow.Size = New System.Drawing.Size(148, 22) Me.mnuRDataViewerWindow.Text = "R-Data Viewer" ' 'mnuTbOutput diff --git a/instat/frmMain.vb b/instat/frmMain.vb index d5c70d0953..0f2e0c86ff 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -1863,11 +1863,13 @@ Public Class frmMain Public Sub SetShowProcurementMenu(bNewShowProcurementMenu As Boolean) mnuProcurement.Visible = bNewShowProcurementMenu mnuViewProcurementMenu.Checked = bNewShowProcurementMenu + mnuProcurement.Visible = False End Sub Public Sub SetShowStructuredMenu(bNewShowStructuredMenu As Boolean) mnuStructured.Visible = bNewShowStructuredMenu mnuViewStructuredMenu.Checked = bNewShowStructuredMenu + mnuStructured.Visible = False End Sub Public Sub SetShowClimaticMenu(bNewShowClimaticMenu As Boolean) mnuClimatic.Visible = bNewShowClimaticMenu @@ -1877,6 +1879,7 @@ Public Class frmMain Public Sub SetShowOptionsByContextMenu(bNewShowOptionsByContextMenu As Boolean) mnuOptionsByContext.Visible = bNewShowOptionsByContextMenu mnuViewOptionsByContextMenu.Checked = bNewShowOptionsByContextMenu + mnuOptionsByContext.Visible = False End Sub Private Sub mnuViewStructuredMenu_Click(sender As Object, e As EventArgs) Handles mnuViewStructuredMenu.Click From c69acbcbb46dc883c8d9fc6393a261ffbf14fd49 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 10 Dec 2024 14:24:41 +0100 Subject: [PATCH 2/5] Change made --- instat/frmMain.Designer.vb | 1 - instat/frmMain.vb | 11 ++++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 97c28d30c0..e9119897dc 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -1057,7 +1057,6 @@ Partial Class frmMain Me.mnuModel.Size = New System.Drawing.Size(53, 22) Me.mnuModel.Tag = "Model" Me.mnuModel.Text = "Model" - Me.mnuModel.Visible = False ' 'mnuModelProbabilityDistributions ' diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 0f2e0c86ff..4f9beeceec 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -227,6 +227,7 @@ Public Class frmMain '------------------------------------- SetAppVersionNumber() isMaximised = True 'Need to get the windowstate when the application is loaded + SetHideMenus() End Sub Private Sub CheckForUpdates() @@ -595,6 +596,13 @@ Public Class frmMain My.Application.Info.Version.Build.ToString() End Sub + Public Sub SetHideMenus() + mnuViewProcurementMenu.Checked = False + mnuProcurement.Visible = False + mnuViewOptionsByContextMenu.Checked = False + mnuOptionsByContext.Visible = False + End Sub + Private Sub SetMainMenusEnabled(bEnabled As Boolean) mnuFile.Enabled = bEnabled mnuEdit.Enabled = bEnabled @@ -1863,13 +1871,11 @@ Public Class frmMain Public Sub SetShowProcurementMenu(bNewShowProcurementMenu As Boolean) mnuProcurement.Visible = bNewShowProcurementMenu mnuViewProcurementMenu.Checked = bNewShowProcurementMenu - mnuProcurement.Visible = False End Sub Public Sub SetShowStructuredMenu(bNewShowStructuredMenu As Boolean) mnuStructured.Visible = bNewShowStructuredMenu mnuViewStructuredMenu.Checked = bNewShowStructuredMenu - mnuStructured.Visible = False End Sub Public Sub SetShowClimaticMenu(bNewShowClimaticMenu As Boolean) mnuClimatic.Visible = bNewShowClimaticMenu @@ -1879,7 +1885,6 @@ Public Class frmMain Public Sub SetShowOptionsByContextMenu(bNewShowOptionsByContextMenu As Boolean) mnuOptionsByContext.Visible = bNewShowOptionsByContextMenu mnuViewOptionsByContextMenu.Checked = bNewShowOptionsByContextMenu - mnuOptionsByContext.Visible = False End Sub Private Sub mnuViewStructuredMenu_Click(sender As Object, e As EventArgs) Handles mnuViewStructuredMenu.Click From 43aaadb4af0726a146545d4c6be92b3271888d8d Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 12 Dec 2024 09:04:09 +0100 Subject: [PATCH 3/5] minor change made --- instat/frmMain.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 4f9beeceec..bb91d80a05 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -596,7 +596,7 @@ Public Class frmMain My.Application.Info.Version.Build.ToString() End Sub - Public Sub SetHideMenus() + Private Sub SetHideMenus() mnuViewProcurementMenu.Checked = False mnuProcurement.Visible = False mnuViewOptionsByContextMenu.Checked = False From b4e0b0bf5825aec692fc09e5a0f0e71006395ab1 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 12 Dec 2024 10:08:44 +0100 Subject: [PATCH 4/5] minor change made --- instat/frmMain.vb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index bb91d80a05..e20a724234 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -596,11 +596,13 @@ Public Class frmMain My.Application.Info.Version.Build.ToString() End Sub - Private Sub SetHideMenus() + Public Sub SetHideMenus() mnuViewProcurementMenu.Checked = False mnuProcurement.Visible = False mnuViewOptionsByContextMenu.Checked = False mnuOptionsByContext.Visible = False + mnuViewStructuredMenu.Checked = False + mnuStructured.Visible = False End Sub Private Sub SetMainMenusEnabled(bEnabled As Boolean) From b745f6d74cdf653f929b98f9126d6ded315cbdda Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 12 Dec 2024 13:23:24 +0100 Subject: [PATCH 5/5] minor change --- instat/frmMain.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index e20a724234..6b37bf3c29 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -596,7 +596,7 @@ Public Class frmMain My.Application.Info.Version.Build.ToString() End Sub - Public Sub SetHideMenus() + Private Sub SetHideMenus() mnuViewProcurementMenu.Checked = False mnuProcurement.Visible = False mnuViewOptionsByContextMenu.Checked = False