diff --git a/PROMS/Formats/fmtall/RGEall.xml b/PROMS/Formats/fmtall/RGEall.xml index c14f6c86..0a5d7250 100644 Binary files a/PROMS/Formats/fmtall/RGEall.xml and b/PROMS/Formats/fmtall/RGEall.xml differ diff --git a/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs b/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs index d3f354d7..7dbea98c 100644 --- a/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs @@ -42,7 +42,7 @@ namespace VEPROMS this.btnGeneral = new DevComponents.DotNetBar.ButtonX(); this.tcSysOpts = new DevComponents.DotNetBar.TabControl(); this.tabControlPanel3 = new DevComponents.DotNetBar.TabControlPanel(); - this.grPanUCFImpOpt = new DevComponents.DotNetBar.Controls.GroupPanel(); + //this.grPanUCFImpOpt = new DevComponents.DotNetBar.Controls.GroupPanel(); // C2024-041 remove from Options panel in V button. this.cbUCFLForSetOnly = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.cbUCFLUseAll = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.cbUCFLOnlyImport = new DevComponents.DotNetBar.Controls.CheckBoxX(); @@ -86,7 +86,7 @@ namespace VEPROMS ((System.ComponentModel.ISupportInitialize)(this.tcSysOpts)).BeginInit(); this.tcSysOpts.SuspendLayout(); this.tabControlPanel3.SuspendLayout(); - this.grPanUCFImpOpt.SuspendLayout(); + //this.grPanUCFImpOpt.SuspendLayout(); // C2024-041 remove from Options panel in V button. this.gpVisioPath.SuspendLayout(); this.gpSeparateWindows.SuspendLayout(); this.gpEnhancedDocs.SuspendLayout(); @@ -305,7 +305,7 @@ namespace VEPROMS // this.tabControlPanel3.Controls.Add(this.gpOpenTabs); this.tabControlPanel3.Controls.Add(this.gpShwRplWords); - this.tabControlPanel3.Controls.Add(this.grPanUCFImpOpt); + //this.tabControlPanel3.Controls.Add(this.grPanUCFImpOpt); // C2024-041 remove from Options panel in V button. this.tabControlPanel3.Controls.Add(this.gpVisioPath); this.tabControlPanel3.Controls.Add(this.gpSeparateWindows); this.tabControlPanel3.Controls.Add(this.gpEnhancedDocs); @@ -334,48 +334,50 @@ namespace VEPROMS // // grPanUCFImpOpt // - this.grPanUCFImpOpt.CanvasColor = System.Drawing.SystemColors.Control; - this.grPanUCFImpOpt.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.grPanUCFImpOpt.Controls.Add(this.cbUCFLForSetOnly); - this.grPanUCFImpOpt.Controls.Add(this.cbUCFLUseAll); - this.grPanUCFImpOpt.Controls.Add(this.cbUCFLOnlyImport); - this.grPanUCFImpOpt.Controls.Add(this.cbUCFLNotUsed); - this.grPanUCFImpOpt.Controls.Add(this.cbUCFIgnore); - this.grPanUCFImpOpt.DisabledBackColor = System.Drawing.Color.Empty; - this.grPanUCFImpOpt.Location = new System.Drawing.Point(313, 12); - this.grPanUCFImpOpt.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); - this.grPanUCFImpOpt.Name = "grPanUCFImpOpt"; - this.grPanUCFImpOpt.Size = new System.Drawing.Size(146, 138); + // C2024-041 remove from Options panel in V button. + /*this.grPanUCFImpOpt.CanvasColor = System.Drawing.SystemColors.Control; + this.grPanUCFImpOpt.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; // C2024-041 remove from Options panel in V button. + this.grPanUCFImpOpt.Controls.Add(this.cbUCFLForSetOnly); // C2024-041 remove from Options panel in V button. + this.grPanUCFImpOpt.Controls.Add(this.cbUCFLUseAll); // C2024-041 remove from Options panel in V button. + this.grPanUCFImpOpt.Controls.Add(this.cbUCFLOnlyImport); + this.grPanUCFImpOpt.Controls.Add(this.cbUCFLNotUsed); + this.grPanUCFImpOpt.Controls.Add(this.cbUCFIgnore); + this.grPanUCFImpOpt.DisabledBackColor = System.Drawing.Color.Empty; + this.grPanUCFImpOpt.Location = new System.Drawing.Point(313, 12); + this.grPanUCFImpOpt.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.grPanUCFImpOpt.Name = "grPanUCFImpOpt"; + this.grPanUCFImpOpt.Size = new System.Drawing.Size(146, 138); // // // - this.grPanUCFImpOpt.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.grPanUCFImpOpt.Style.BackColorGradientAngle = 90; - this.grPanUCFImpOpt.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.grPanUCFImpOpt.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.grPanUCFImpOpt.Style.BorderBottomWidth = 1; - this.grPanUCFImpOpt.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.grPanUCFImpOpt.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.grPanUCFImpOpt.Style.BorderLeftWidth = 1; - this.grPanUCFImpOpt.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.grPanUCFImpOpt.Style.BorderRightWidth = 1; - this.grPanUCFImpOpt.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.grPanUCFImpOpt.Style.BorderTopWidth = 1; - this.grPanUCFImpOpt.Style.CornerDiameter = 4; - this.grPanUCFImpOpt.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.grPanUCFImpOpt.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.grPanUCFImpOpt.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.grPanUCFImpOpt.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + this.grPanUCFImpOpt.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.grPanUCFImpOpt.Style.BackColorGradientAngle = 90; + this.grPanUCFImpOpt.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.grPanUCFImpOpt.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.grPanUCFImpOpt.Style.BorderBottomWidth = 1; + this.grPanUCFImpOpt.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.grPanUCFImpOpt.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.grPanUCFImpOpt.Style.BorderLeftWidth = 1; + this.grPanUCFImpOpt.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.grPanUCFImpOpt.Style.BorderRightWidth = 1; + this.grPanUCFImpOpt.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.grPanUCFImpOpt.Style.BorderTopWidth = 1; + this.grPanUCFImpOpt.Style.CornerDiameter = 4; + this.grPanUCFImpOpt.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.grPanUCFImpOpt.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.grPanUCFImpOpt.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.grPanUCFImpOpt.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; // // // - this.grPanUCFImpOpt.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.grPanUCFImpOpt.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.grPanUCFImpOpt.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.grPanUCFImpOpt.TabIndex = 12; - this.grPanUCFImpOpt.Text = "UCF Import Options"; + this.grPanUCFImpOpt.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.grPanUCFImpOpt.TabIndex = 12; + this.grPanUCFImpOpt.Text = "UCF Import Options"; + */ // C2024-041 remove from Options panel in V button. // // cbUCFLForSetOnly // @@ -1263,7 +1265,7 @@ namespace VEPROMS ((System.ComponentModel.ISupportInitialize)(this.tcSysOpts)).EndInit(); this.tcSysOpts.ResumeLayout(false); this.tabControlPanel3.ResumeLayout(false); - this.grPanUCFImpOpt.ResumeLayout(false); + //this.grPanUCFImpOpt.ResumeLayout(false); // C2024-041 remove from Options panel in V button. this.gpVisioPath.ResumeLayout(false); this.gpSeparateWindows.ResumeLayout(false); this.gpEnhancedDocs.ResumeLayout(false); @@ -1323,8 +1325,8 @@ namespace VEPROMS private DevComponents.DotNetBar.Controls.CheckBoxX cbSeparateWindows; private DevComponents.DotNetBar.Controls.GroupPanel gpVisioPath; private DevComponents.DotNetBar.Controls.TextBoxX txbxVisioPath; - private DevComponents.DotNetBar.Controls.GroupPanel grPanUCFImpOpt; - private DevComponents.DotNetBar.Controls.CheckBoxX cbUCFLForSetOnly; + //private DevComponents.DotNetBar.Controls.GroupPanel grPanUCFImpOpt; // C2024-041 remove from Options panel in V button. + private DevComponents.DotNetBar.Controls.CheckBoxX cbUCFLForSetOnly; private DevComponents.DotNetBar.Controls.CheckBoxX cbUCFLUseAll; private DevComponents.DotNetBar.Controls.CheckBoxX cbUCFLOnlyImport; private DevComponents.DotNetBar.Controls.CheckBoxX cbUCFLNotUsed; diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 0b4d1e64..9c78ae63 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -2118,24 +2118,45 @@ namespace VEPROMS 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"); + //btnFormats.SubItems.Add(btnUpdateFormats); + //btnFormats.SubItems.Add(btnUserControlOfFormats); + //btnUserControlOfFormats.Click += new EventHandler(btnUserControlOfFormats_Click); + //btnUserControlOfFormatsExport = new ButtonItem("btnUserControlOfFormatsExport", "Export User Control of Formats"); + //btnFormats.SubItems.Add(btnUserControlOfFormatsExport); + //btnUserControlOfFormatsExport.Click += new EventHandler(btnUserControlOfFormatsExport_Click); + //btnUserControlOfFormatsImport = new ButtonItem("btnUserControlOfFormatsImport", "Import User Control of Formats"); + //btnFormats.SubItems.Add(btnUserControlOfFormatsImport); + //btnUserControlOfFormatsImport.Click += new EventHandler(btnUserControlOfFormatsImport_Click); + //btnManageSecurity = new ButtonItem("btnManageSecurity", "Manage Security"); + //btnSecurity.SubItems.Add(btnManageSecurity); + //btnManageSecurity.Click += new EventHandler(btnManageSecurity_Click); + + 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); + // btnAdmin.SubItems.Add(btnFormats); // C2024 - 041 remove from Admin(V button) menu + btnAdmin.SubItems.Add(btnUpdateFormats); // C2024 - 041 remove from Admin(V button) menu btnUserControlOfFormats = new ButtonItem("btnUserControlOfFormats", "User Control of Formats"); - btnFormats.SubItems.Add(btnUpdateFormats); - btnFormats.SubItems.Add(btnUserControlOfFormats); + //btnFormats.SubItems.Add(btnUpdateFormats); + //btnFormats.SubItems.Add(btnUserControlOfFormats); // C2024-041 remove from Admin (V button) menu btnUserControlOfFormats.Click += new EventHandler(btnUserControlOfFormats_Click); btnUserControlOfFormatsExport = new ButtonItem("btnUserControlOfFormatsExport", "Export User Control of Formats"); - btnFormats.SubItems.Add(btnUserControlOfFormatsExport); + //btnFormats.SubItems.Add(btnUserControlOfFormatsExport); // C2024-041 remove from Admin (V button) menu btnUserControlOfFormatsExport.Click += new EventHandler(btnUserControlOfFormatsExport_Click); btnUserControlOfFormatsImport = new ButtonItem("btnUserControlOfFormatsImport", "Import User Control of Formats"); - btnFormats.SubItems.Add(btnUserControlOfFormatsImport); + //btnFormats.SubItems.Add(btnUserControlOfFormatsImport); // C2024-041 remove from Admin (V button) menu btnUserControlOfFormatsImport.Click += new EventHandler(btnUserControlOfFormatsImport_Click); btnManageSecurity = new ButtonItem("btnManageSecurity", "Manage Security"); 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"); btnSecurity.SubItems.Add(btnResetSecurity);