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

Merge pull request 'F2025-004 Customer requested the addition of a Two Column Attachment section type' (#531 ) from F2025-004_Ginna into Development
2025-03-20 15:05:12 -04:00 · 2025-03-19 23:05:14 -04:00 · 2025-03-06 16:15:32 -05:00 · 2025-03-06 16:13:52 -05:00 · 2025-02-28 08:16:52 -05:00 · 2025-02-27 19:16:47 -05:00
18 changed files with 137 additions and 171 deletions
--- a/PROMS/Formats/fmtall/FNPNew2all.xml
+++ b/PROMS/Formats/fmtall/FNPNew2all.xml
--- a/PROMS/Formats/fmtall/RGEall.xml
+++ b/PROMS/Formats/fmtall/RGEall.xml
--- a/PROMS/Formats/fmtall/vcb1all.xml
+++ b/PROMS/Formats/fmtall/vcb1all.xml
--- a/PROMS/Formats/fmtall/vcb2all.xml
+++ b/PROMS/Formats/fmtall/vcb2all.xml
--- a/PROMS/Formats/fmtall/vcbaall.xml
+++ b/PROMS/Formats/fmtall/vcbaall.xml
--- a/PROMS/Formats/fmtall/vcbalrall.xml
+++ b/PROMS/Formats/fmtall/vcbalrall.xml
--- a/PROMS/Formats/fmtall/vcbbckall.xml
+++ b/PROMS/Formats/fmtall/vcbbckall.xml
--- a/PROMS/Formats/fmtall/vcbeppall.xml
+++ b/PROMS/Formats/fmtall/vcbeppall.xml
--- a/PROMS/Formats/frmFormatCopy.Designer.cs
+++ b/PROMS/Formats/frmFormatCopy.Designer.cs
@@ -33,6 +33,8 @@ namespace Formats
 			this.btnCopyFormats = new DevComponents.DotNetBar.ButtonX();
 			this.btnBrowse = new DevComponents.DotNetBar.ButtonX();
 			this.buttonX2 = new DevComponents.DotNetBar.ButtonX();
+			this.labelX2 = new DevComponents.DotNetBar.LabelX();
+			this.LstBxExcludeFiles = new DevComponents.DotNetBar.ListBoxAdv();
 			this.SuspendLayout();
 			// 
 			// txbxPROMSFormatsPath
@@ -64,7 +66,7 @@ namespace Formats
 			// 
 			this.btnCopyFormats.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
 			this.btnCopyFormats.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnCopyFormats.Location = new System.Drawing.Point(152, 68);
+			this.btnCopyFormats.Location = new System.Drawing.Point(232, 156);
 			this.btnCopyFormats.Name = "btnCopyFormats";
 			this.btnCopyFormats.Size = new System.Drawing.Size(84, 27);
 			this.btnCopyFormats.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -88,7 +90,7 @@ namespace Formats
 			// 
 			this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
 			this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.buttonX2.Location = new System.Drawing.Point(329, 68);
+			this.buttonX2.Location = new System.Drawing.Point(409, 156);
 			this.buttonX2.Name = "buttonX2";
 			this.buttonX2.Size = new System.Drawing.Size(75, 23);
 			this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -96,17 +98,52 @@ namespace Formats
 			this.buttonX2.Text = "Exit";
 			this.buttonX2.Click += new System.EventHandler(this.buttonX2_Click);
 			// 
-			// Form1
+			// labelX2
+			// 
+			// 
+			// 
+			// 
+			this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.labelX2.Location = new System.Drawing.Point(12, 41);
+			this.labelX2.Name = "labelX2";
+			this.labelX2.Size = new System.Drawing.Size(200, 23);
+			this.labelX2.TabIndex = 5;
+			this.labelX2.Text = "Excluding Format Files that Start with:";
+			// 
+			// LstBxExcludeFiles
+			// 
+			this.LstBxExcludeFiles.AutoScroll = true;
+			// 
+			// 
+			// 
+			this.LstBxExcludeFiles.BackgroundStyle.Class = "ListBoxAdv";
+			this.LstBxExcludeFiles.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.LstBxExcludeFiles.CausesValidation = false;
+			this.LstBxExcludeFiles.CheckStateMember = null;
+			this.LstBxExcludeFiles.ContainerControlProcessDialogKey = true;
+			this.LstBxExcludeFiles.DragDropSupport = true;
+			this.LstBxExcludeFiles.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.LstBxExcludeFiles.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
+			this.LstBxExcludeFiles.Location = new System.Drawing.Point(57, 70);
+			this.LstBxExcludeFiles.Name = "LstBxExcludeFiles";
+			this.LstBxExcludeFiles.ShowToolTips = false;
+			this.LstBxExcludeFiles.Size = new System.Drawing.Size(134, 76);
+			this.LstBxExcludeFiles.TabIndex = 6;
+			this.LstBxExcludeFiles.Text = "listBoxAdv1";
+			// 
+			// frmFormatCopy
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(496, 107);
+			this.ClientSize = new System.Drawing.Size(496, 191);
+			this.Controls.Add(this.LstBxExcludeFiles);
+			this.Controls.Add(this.labelX2);
 			this.Controls.Add(this.buttonX2);
 			this.Controls.Add(this.btnBrowse);
 			this.Controls.Add(this.btnCopyFormats);
 			this.Controls.Add(this.labelX1);
 			this.Controls.Add(this.txbxPROMSFormatsPath);
-			this.Name = "Form1";
+			this.Name = "frmFormatCopy";
 			this.Text = "Form1";
 			this.ResumeLayout(false);

@@ -119,6 +156,8 @@ namespace Formats
 		private DevComponents.DotNetBar.ButtonX btnCopyFormats;
 		private DevComponents.DotNetBar.ButtonX btnBrowse;
 		private DevComponents.DotNetBar.ButtonX buttonX2;
+		private DevComponents.DotNetBar.LabelX labelX2;
+		private DevComponents.DotNetBar.ListBoxAdv LstBxExcludeFiles;
 	}
 }

--- a/PROMS/Formats/frmFormatCopy.cs
+++ b/PROMS/Formats/frmFormatCopy.cs
@@ -14,7 +14,11 @@ namespace Formats
 		public frmFormatCopy()
 		{
 			InitializeComponent();
-			SetDefaults();
+			foreach (string excludeThis in excludeThese)
+			{
+				LstBxExcludeFiles.Items.Add(excludeThis);
+			}
+				SetDefaults();
 		}

 		private void SetDefaults()
@@ -92,10 +96,11 @@ namespace Formats
 			if (!txbxPROMSFormatsPath.Text.EndsWith(@"\")) txbxPROMSFormatsPath.Text += @"\";
 		}

+		public string[] excludeThese = { "WPS", "WPB", "VCBEPP" };
+
 		private bool ExcludeFromCopy(string fn)
 		{
 			// don't copy formats whos file name starts with..
-			string[] excludeThese = { "WPS", "WEP", "WPB", "VCBEPP" };
 			foreach (string excludeThis in excludeThese)
 				if (fn.ToUpper().StartsWith(excludeThis)) return true;
 			return false;
--- a/PROMS/Formats/frmFormatCopy.resx
+++ b/PROMS/Formats/frmFormatCopy.resx
@@ -112,9 +112,9 @@
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
 </root>
--- a/Interface/VEPROMS_UI.csproj
+++ b/Interface/VEPROMS_UI.csproj
@@ -103,7 +103,7 @@
    <Reference Include="C1.Win.C1Command.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=e808566f358766d8" />
    <Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL" />
    <Reference Include="C1.Win.C1Input.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=7e7ff60f0c214f9a, processorArchitecture=MSIL" />
-    <Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
+    <Reference Include="Csla, Version=3.8.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\CSLA20cs_DLL_Net_4.8.1_Build\Csla.dll</HintPath>
    </Reference>
--- a/Interface/frmVEPROMS.cs
+++ b/Interface/frmVEPROMS.cs
@@ -2121,16 +2121,17 @@ namespace VEPROMS
 			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);
--- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
@@ -805,7 +805,21 @@ namespace VEPROMS.CSLA.Library
 							}
 						}
 					}
-
+					// B2025-020 Null Reference fix. Added check for valid index into the TransitionTypeList
+					if (!forceConvertToText)
+					{
+						if (traninfo.TranType >= itemInfo.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList.Count)
+						{
+							forceConvertToText = true;
+							TranFixCount++;
+							itemInfo.MyContent.FixTransitionText(traninfo, itemInfo, "Reason for Change: Transition type is not available");
+							using (Content content = Content.Get(itemInfo.MyContent.ContentID)) 
+							{
+								content.FixTransitionText(traninfo, true);
+								content.Save();
+							}
+						}
+					}
 					if (!forceConvertToText)
 					{
 						if (itemInfo.MyProcedure.ItemID != traninfo.MyItemToID.MyProcedure.ItemID)  //different proc
--- a/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj
+++ b/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj
@@ -83,7 +83,7 @@
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
+    <Reference Include="Csla, Version=3.8.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\CSLA20cs_DLL_Net_4.8.1_Build\Csla.dll</HintPath>
    </Reference>
@@ -167,9 +167,7 @@
    <Compile Include="Format\PageStyles.cs" />
    <Compile Include="Format\PlantFormat.cs" />
    <Compile Include="Format\vlnFormat.cs" />
-    <Compile Include="frmRofstLoadStatus.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="frmRofstLoadStatus.cs" />
    <Compile Include="frmRofstLoadStatus.designer.cs">
      <DependentUpon>frmRofstLoadStatus.cs</DependentUpon>
    </Compile>
--- a/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj
+++ b/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj
@@ -89,7 +89,7 @@
    </Reference>
    <Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL" />
    <Reference Include="C1.Win.C1SpellChecker.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL" />
-    <Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
+    <Reference Include="Csla, Version=3.8.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\CSLA20cs_DLL_Net_4.8.1_Build\Csla.dll</HintPath>
    </Reference>
@@ -125,164 +125,110 @@
  </ItemGroup>
  <ItemGroup>
    <Compile Include="AlphabeticalNumbering.cs" />
-    <Compile Include="AnnotationDetails.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="AnnotationDetails.cs" />
    <Compile Include="AnnotationDetails.designer.cs">
      <DependentUpon>AnnotationDetails.cs</DependentUpon>
    </Compile>
-    <Compile Include="AnnotationSearch.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="AnnotationSearch.cs" />
    <Compile Include="AnnotationSearch.designer.cs">
      <DependentUpon>AnnotationSearch.cs</DependentUpon>
    </Compile>
-    <Compile Include="BorderListBox.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="BorderListBox.cs" />
    <Compile Include="BorderListBox.designer.cs">
      <DependentUpon>BorderListBox.cs</DependentUpon>
    </Compile>
-    <Compile Include="BorderSelectionPanel.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="BorderSelectionPanel.cs" />
    <Compile Include="BorderSelectionPanel.Designer.cs">
      <DependentUpon>BorderSelectionPanel.cs</DependentUpon>
    </Compile>
-    <Compile Include="ConvertTable.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="DisplayApplicability.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="ConvertTable.cs" />
+    <Compile Include="DisplayApplicability.cs" />
    <Compile Include="DisplayApplicability.designer.cs">
      <DependentUpon>DisplayApplicability.cs</DependentUpon>
    </Compile>
-    <Compile Include="DisplayBookMarks.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="DisplayBookMarks.cs" />
    <Compile Include="DisplayBookMarks.Designer.cs">
      <DependentUpon>DisplayBookMarks.cs</DependentUpon>
    </Compile>
-    <Compile Include="DisplayFoldoutMaint.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="DisplayFoldoutMaint.cs" />
    <Compile Include="DisplayFoldoutMaint.Designer.cs">
      <DependentUpon>DisplayFoldoutMaint.cs</DependentUpon>
    </Compile>
-    <Compile Include="DisplayHistory.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="DisplayHistory.cs" />
    <Compile Include="DisplayHistory.designer.cs">
      <DependentUpon>DisplayHistory.cs</DependentUpon>
    </Compile>
-    <Compile Include="DisplayLibDocs.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="DisplayLibDocs.cs" />
    <Compile Include="DisplayLibDocs.Designer.cs">
      <DependentUpon>DisplayLibDocs.cs</DependentUpon>
    </Compile>
-    <Compile Include="DisplayReports.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="DisplayReports.cs" />
    <Compile Include="DisplayReports.designer.cs">
      <DependentUpon>DisplayReports.cs</DependentUpon>
    </Compile>
-    <Compile Include="DisplaySearch.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="DisplaySearch.cs" />
    <Compile Include="DisplaySearch.Designer.cs">
      <DependentUpon>DisplaySearch.cs</DependentUpon>
    </Compile>
-    <Compile Include="DisplayTags.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="DisplayTags.cs" />
    <Compile Include="DisplayTags.Designer.cs">
      <DependentUpon>DisplayTags.cs</DependentUpon>
    </Compile>
-    <Compile Include="dlgChgId.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="dlgChgId.cs" />
    <Compile Include="dlgChgId.designer.cs">
      <DependentUpon>dlgChgId.cs</DependentUpon>
    </Compile>
-    <Compile Include="dlgDelProcReason.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="dlgDelProcReason.cs" />
    <Compile Include="dlgDelProcReason.designer.cs">
      <DependentUpon>dlgDelProcReason.cs</DependentUpon>
    </Compile>
-    <Compile Include="dlgEnhMissingItem.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="dlgEnhMissingItem.cs" />
    <Compile Include="dlgEnhMissingItem.Designer.cs">
      <DependentUpon>dlgEnhMissingItem.cs</DependentUpon>
    </Compile>
-    <Compile Include="dlgUCFImportOptions.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="dlgUCFImportOptions.cs" />
    <Compile Include="dlgUCFImportOptions.Designer.cs">
      <DependentUpon>dlgUCFImportOptions.cs</DependentUpon>
    </Compile>
-    <Compile Include="EditItem.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="EditItem.cs" />
    <Compile Include="EditItem.Designer.cs">
      <DependentUpon>EditItem.cs</DependentUpon>
    </Compile>
-    <Compile Include="FindReplace.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="FindReplace.cs" />
    <Compile Include="FindReplace.designer.cs">
      <DependentUpon>FindReplace.cs</DependentUpon>
    </Compile>
    <Compile Include="FormatUtility.cs" />
-    <Compile Include="frmEnhanced.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="frmEnhanced.cs" />
    <Compile Include="frmEnhanced.Designer.cs">
      <DependentUpon>frmEnhanced.cs</DependentUpon>
    </Compile>
-    <Compile Include="frmImportWordContents.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="frmImportWordContents.cs" />
    <Compile Include="frmImportWordContents.Designer.cs">
      <DependentUpon>frmImportWordContents.cs</DependentUpon>
    </Compile>
-    <Compile Include="frmSendErrorLog.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="frmSendErrorLog.cs" />
    <Compile Include="frmSendErrorLog.designer.cs">
      <DependentUpon>frmSendErrorLog.cs</DependentUpon>
    </Compile>
-    <Compile Include="frmViewTextFile.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="frmViewTextFile.cs" />
    <Compile Include="frmViewTextFile.designer.cs">
      <DependentUpon>frmViewTextFile.cs</DependentUpon>
    </Compile>
-    <Compile Include="GridItem.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="GridItem.cs" />
    <Compile Include="GridItem.Designer.cs">
      <DependentUpon>GridItem.cs</DependentUpon>
    </Compile>
-    <Compile Include="ImageItem.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="ImageItem.cs" />
    <Compile Include="ImageItem.designer.cs">
      <DependentUpon>ImageItem.cs</DependentUpon>
    </Compile>
    <Compile Include="LinkText.cs" />
-    <Compile Include="PreviewMultiLineRO.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="PreviewMultiLineRO.cs" />
    <Compile Include="PreviewMultiLineRO.designer.cs">
      <DependentUpon>PreviewMultiLineRO.cs</DependentUpon>
    </Compile>
-    <Compile Include="PreviewROImage.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="PreviewROImage.cs" />
    <Compile Include="PreviewROImage.designer.cs">
      <DependentUpon>PreviewROImage.cs</DependentUpon>
    </Compile>
@@ -291,28 +237,20 @@
      <DesignTimeSharedInput>True</DesignTimeSharedInput>
      <DependentUpon>Settings.settings</DependentUpon>
    </Compile>
-    <Compile Include="RTBItem.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="RTBItem.cs" />
    <Compile Include="RTBItem.designer.cs">
      <DependentUpon>RTBItem.cs</DependentUpon>
    </Compile>
-    <Compile Include="RtfRawItem.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="RtfRawItem.cs" />
    <Compile Include="RtfRawItem.designer.cs">
      <DependentUpon>RtfRawItem.cs</DependentUpon>
    </Compile>
    <Compile Include="Settings.cs" />
-    <Compile Include="StepPanel.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="StepPanel.cs" />
    <Compile Include="StepPanel.designer.cs">
      <DependentUpon>StepPanel.cs</DependentUpon>
    </Compile>
-    <Compile Include="DisplayRO.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="DisplayRO.cs" />
    <Compile Include="DisplayRO.Designer.cs">
      <DependentUpon>DisplayRO.cs</DependentUpon>
    </Compile>
@@ -322,43 +260,29 @@
    <Compile Include="DisplayTabControl.designer.cs">
      <DependentUpon>DisplayTabControl.cs</DependentUpon>
    </Compile>
-    <Compile Include="DisplayTabItem.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="DisplayTabItem.cs" />
    <Compile Include="DisplayTabItem.designer.cs">
      <DependentUpon>DisplayTabItem.cs</DependentUpon>
    </Compile>
-    <Compile Include="StepTabPanel.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="StepTabPanel.cs" />
    <Compile Include="StepTabPanel.designer.cs">
      <DependentUpon>StepTabPanel.cs</DependentUpon>
    </Compile>
-    <Compile Include="StepTabRibbon.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="StepTabRibbon.cs" />
    <Compile Include="StepTabRibbon.designer.cs">
      <DependentUpon>StepTabRibbon.cs</DependentUpon>
    </Compile>
-    <Compile Include="DisplayTransition.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="DisplayTransition.cs" />
    <Compile Include="DisplayTransition.Designer.cs">
      <DependentUpon>DisplayTransition.cs</DependentUpon>
    </Compile>
    <Compile Include="DropDownNode.cs" />
-    <Compile Include="DropDownTree.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="DSOTabPanel.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="DropDownTree.cs" />
+    <Compile Include="DSOTabPanel.cs" />
    <Compile Include="DSOTabPanel.designer.cs">
      <DependentUpon>DSOTabPanel.cs</DependentUpon>
    </Compile>
-    <Compile Include="FlagEnumEditor.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="FlagEnumEditor.cs" />
    <Compile Include="MostRecentItem.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="Properties\Resources.Designer.cs">
@@ -366,65 +290,47 @@
      <DesignTime>True</DesignTime>
      <DependentUpon>Resources.resx</DependentUpon>
    </Compile>
-    <Compile Include="RichTextBox41.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="RichTextBox41.cs" />
    <Compile Include="RichTextBox41.Designer.cs">
      <DependentUpon>RichTextBox41.cs</DependentUpon>
    </Compile>
    <Compile Include="RomanNumeral.cs" />
    <Compile Include="RTBAPI.cs" />
-    <Compile Include="TransPanel.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="TransPanel.cs" />
    <Compile Include="TransPanel.designer.cs">
      <DependentUpon>TransPanel.cs</DependentUpon>
    </Compile>
    <Compile Include="VlnBorders.cs" />
-    <Compile Include="vlnExpander.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="vlnExpander.cs" />
    <Compile Include="vlnExpander.designer.cs">
      <DependentUpon>vlnExpander.cs</DependentUpon>
    </Compile>
-    <Compile Include="StepRTB.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="StepRTB.cs" />
    <Compile Include="StepRTB.designer.cs">
      <DependentUpon>StepRTB.cs</DependentUpon>
    </Compile>
-    <Compile Include="VlnFlexGrid.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="VlnFlexGrid.cs" />
    <Compile Include="VlnFlexGrid.Designer.cs">
      <DependentUpon>VlnFlexGrid.cs</DependentUpon>
    </Compile>
    <Compile Include="VlnGridCellShading.cs" />
    <Compile Include="VlnSpellCheck.cs" />
-    <Compile Include="VlnSpellCheckDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="VlnSpellCheckDlg.cs" />
    <Compile Include="VlnSpellCheckDlg.designer.cs">
      <DependentUpon>VlnSpellCheckDlg.cs</DependentUpon>
    </Compile>
-    <Compile Include="vlnTreeCombo.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="vlnTreeCombo.cs" />
    <Compile Include="vlnTreeView.cs">
      <SubType>Component</SubType>
    </Compile>
    <Compile Include="vlnTreeView.Designer.cs">
      <DependentUpon>vlnTreeView.cs</DependentUpon>
    </Compile>
-    <Compile Include="vlnTreeView3.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="vlnTreeView3.cs" />
    <Compile Include="vlnTreeView3.Designer.cs">
      <DependentUpon>vlnTreeView3.cs</DependentUpon>
    </Compile>
-    <Compile Include="WebBrowser.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="WebBrowser.cs" />
    <Compile Include="WebBrowser.designer.cs">
      <DependentUpon>WebBrowser.cs</DependentUpon>
    </Compile>
--- a/PROMS/Volian.Controls.Library/vlnTreeView.cs
+++ b/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");
-										int k = 0;
-										foreach (string s in si2.MyDocVersion.UnitNames)
+										if (!si2.IsSubsection)
 										{
-											k++;
-											MenuItem mp = mps.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
-											mp.Tag = k;
+											MenuItem mps = new MenuItem("Print Section");
+											int k = 0;
+											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));
 									}
 								}
 							}
--- a/PROMS/Volian.Print.Library/Volian.Print.Library.csproj
+++ b/PROMS/Volian.Print.Library/Volian.Print.Library.csproj
@@ -66,7 +66,7 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL" />
-    <Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
+    <Reference Include="Csla, Version=3.8.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\CSLA20cs_DLL_Net_4.8.1_Build\Csla.dll</HintPath>
    </Reference>
Author	SHA1	Message	Date
Paul Larsen	648ac8e744	C2024-041-Disable-UCF-(User-Control-of-Format)-options	2025-03-20 15:05:12 -04:00
Paul Larsen	992a8bfc49	C2024-041-Disable-UCF-(User-Control-of-Format)-options	2025-03-19 23:05:14 -04:00
John Jenko	74f9fc0c18	Merge pull request 'F2025-004 Customer requested the addition of a Two Column Attachment section type' (#531 ) from F2025-004_Ginna into Development Format only change. Good for testing phase	2025-03-06 16:15:32 -05:00
John Jenko	c2c90a2c2e	F2025-004 Customer requested the addition of a Two Column Attachment section type	2025-03-06 16:13:52 -05:00
John Jenko	05ab077dda	Merge pull request 'B2025-017-Print-Section-Sub-Section-v2' (#529 ) from B2025-017-Print-Section-Sub-Section-v2 into Development good for testing phase	2025-02-28 08:16:52 -05:00
Paul Larsen	1ae422c74e	B2025-017-Print-Section-Sub-Section-v2	2025-02-27 19:16:47 -05:00
John Jenko	5da62c3a5d	Merge pull request 'Updated the developer tool that copied the format files to the FMTall an GENMACall folders. Added a list box to show what format files will not be copied.' (#528 ) from DeveloperToolUpdate into Development This is an update to a tool that the developers use and is not released to the customers. No testing required,	2025-02-27 11:21:53 -05:00
John Jenko	86a98118fb	Updated the developer tool that copied the format files to the FMTall an GENMACall folders. Added a list box to show what format files will not be copied.	2025-02-27 11:20:31 -05:00
Matthew Schill	6a51208a13	Merge pull request 'B2025-020 Fixed NULL reference error while running the Refresh Transitions administrator tool.' (#527 ) from B2025-020_UpdateTransitions into Development Looks good. Ready for QA.	2025-02-26 11:48:06 -05:00
John Jenko	0749f5e724	B2025-020 Fixed NULL reference error while running the Refresh Transitions administrator tool.	2025-02-26 11:07:17 -05:00
John Jenko	f65644f553	Merge pull request 'B2025-018 PROMS - Issues with folder order in tree view.' (#526 ) from B2025-018 into Development good for testing phase	2025-02-21 16:05:19 -05:00