C2024-041-Disable-UCF-(User-Control-of-Format)-options-2

Format only change.  Good for testing phase

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(btnUpdateFormats);
-			btnFormats.SubItems.Add(btnUserControlOfFormats);
+			//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);

PROMS/Volian.Controls.Library/vlnTreeView.cs

@@ -983,19 +983,22 @@ namespace Volian.Controls.Library
 									SectionInfo si2 = (tn as VETreeNode).VEObject as SectionInfo;
 									if (si2.MyDocVersion.MultiUnitCount > 1)
 									{
-										MenuItem mps = new MenuItem("Print Section");
+										if (!si2.IsSubsection)
-										int k = 0;
-										foreach (string s in si2.MyDocVersion.UnitNames)
 										{
-											k++;
+											MenuItem mps = new MenuItem("Print Section");
-											MenuItem mp = mps.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
+											int k = 0;
-											mp.Tag = k;
+											foreach (string s in si2.MyDocVersion.UnitNames)
+											{
+												k++;
+												MenuItem mp = mps.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
+												mp.Tag = k;
+											}
+											cm.MenuItems.Add(mps);
 										}
-										cm.MenuItems.Add(mps);
 									}
 									else
 									{
-										cm.MenuItems.Add("Print Section", new EventHandler(mi_Click));
+										if(!si2.IsSubsection) cm.MenuItems.Add("Print Section", new EventHandler(mi_Click));
 									}
 								}
 							}