From 7771cf66e05e49479266795d21915a3994bd3f7f Mon Sep 17 00:00:00 2001 From: Kathy Date: Fri, 5 Jun 2020 14:52:01 +0000 Subject: [PATCH] C2019-002: move security & format items into submenus --- .../frmVEPROMS.Designer.cs | 4 ++-- PROMS/VEPROMS User Interface/frmVEPROMS.cs | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index cbeffd11..18466f59 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -370,8 +370,8 @@ namespace VEPROMS this.btnAdmin.CanCustomize = false; this.btnAdmin.Image = global::VEPROMS.Properties.Resources.Admin; this.btnAdmin.Name = "btnAdmin"; - this.btnAdmin.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btnUpdateFormats}); + //this.btnAdmin.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { + //this.btnUpdateFormats}); this.btnAdmin.Text = "A&dministration"; // // btnUpdateFormats diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 5636bee6..844fcb97 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -1386,6 +1386,8 @@ namespace VEPROMS private DevComponents.DotNetBar.ButtonItem btnManageSecurity; private DevComponents.DotNetBar.ButtonItem btnResetSecurity; private DevComponents.DotNetBar.ButtonItem btnAdministrativeTools; + private DevComponents.DotNetBar.ButtonItem btnSecurity; + private DevComponents.DotNetBar.ButtonItem btnFormats; private DevComponents.DotNetBar.ButtonItem btnUserControlOfFormats; private DevComponents.DotNetBar.ButtonItem btnUserControlOfFormatsExport; private DevComponents.DotNetBar.ButtonItem btnUserControlOfFormatsImport; @@ -1539,24 +1541,28 @@ namespace VEPROMS Volian.Base.Library.VlnItextFont.RegisterPromsFonts(); InitializeSecurity(); UpdateUser(); - + btnSecurity = new ButtonItem("btnSecurity", "Security"); // C2019-002: move security & format items into submenus + btnFormats = new ButtonItem("btnFormats", "Formats"); + btnAdmin.SubItems.Add(btnSecurity); + btnAdmin.SubItems.Add(btnFormats); btnUserControlOfFormats = new ButtonItem("btnUserControlOfFormats", "User Control of Formats"); - btnAdmin.SubItems.Add(btnUserControlOfFormats); + btnFormats.SubItems.Add(btnUpdateFormats); + btnFormats.SubItems.Add(btnUserControlOfFormats); btnUserControlOfFormats.Click += new EventHandler(btnUserControlOfFormats_Click); btnUserControlOfFormatsExport = new ButtonItem("btnUserControlOfFormatsExport", "Export User Control of Formats"); - btnAdmin.SubItems.Add(btnUserControlOfFormatsExport); + btnFormats.SubItems.Add(btnUserControlOfFormatsExport); btnUserControlOfFormatsExport.Click += new EventHandler(btnUserControlOfFormatsExport_Click); btnUserControlOfFormatsImport = new ButtonItem("btnUserControlOfFormatsImport", "Import User Control of Formats"); - btnAdmin.SubItems.Add(btnUserControlOfFormatsImport); + btnFormats.SubItems.Add(btnUserControlOfFormatsImport); btnUserControlOfFormatsImport.Click += new EventHandler(btnUserControlOfFormatsImport_Click); btnManageSecurity = new ButtonItem("btnManageSecurity", "Manage Security"); - btnAdmin.SubItems.Add(btnManageSecurity); + btnSecurity.SubItems.Add(btnManageSecurity); btnManageSecurity.Click += new EventHandler(btnManageSecurity_Click); //added by jcb //menu item to reset security //requires password to implement btnResetSecurity = new ButtonItem("btnResetSecurity", "Reset Security"); - btnAdmin.SubItems.Add(btnResetSecurity); + btnSecurity.SubItems.Add(btnResetSecurity); btnResetSecurity.Click += new EventHandler(btnResetSecurity_Click); //end added by jcb //batch refresh transitions