Merge pull request 'Development' (#535 ) from Development into master

Merging all changes from development into master after successful testing.
Merge pull request 'C2024-041-Disable-UCF-(User-Control-of-Format)-options-3' (#534 ) from C2024-041-Disable-UCF-(User-Control-of-Format)-options-3 into Development
2025-03-26 09:25:11 -04:00 · 2025-03-24 08:15:21 -04:00 · 2025-03-23 19:35:06 -04:00 · 2025-03-21 08:18:08 -04:00 · 2025-03-20 17:06:28 -04:00 · 2025-03-04 10:24:28 -05:00
6 changed files with 209 additions and 91 deletions
--- 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=3.8.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
+    <Reference Include="Csla, Version=2.1.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/frmSysOptions.Designer.cs
+++ b/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;
--- a/Interface/frmVEPROMS.cs
+++ b/Interface/frmVEPROMS.cs
@@ -2118,6 +2118,25 @@ 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);
@@ -2137,6 +2156,7 @@ namespace VEPROMS
 			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);
--- 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=3.8.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
+    <Reference Include="Csla, Version=2.1.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,7 +167,9 @@
    <Compile Include="Format\PageStyles.cs" />
    <Compile Include="Format\PlantFormat.cs" />
    <Compile Include="Format\vlnFormat.cs" />
-    <Compile Include="frmRofstLoadStatus.cs" />
+    <Compile Include="frmRofstLoadStatus.cs">
+      <SubType>Form</SubType>
+    </Compile>
    <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=3.8.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
+    <Reference Include="Csla, Version=2.1.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,110 +125,164 @@
  </ItemGroup>
  <ItemGroup>
    <Compile Include="AlphabeticalNumbering.cs" />
-    <Compile Include="AnnotationDetails.cs" />
+    <Compile Include="AnnotationDetails.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="AnnotationDetails.designer.cs">
      <DependentUpon>AnnotationDetails.cs</DependentUpon>
    </Compile>
-    <Compile Include="AnnotationSearch.cs" />
+    <Compile Include="AnnotationSearch.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="AnnotationSearch.designer.cs">
      <DependentUpon>AnnotationSearch.cs</DependentUpon>
    </Compile>
-    <Compile Include="BorderListBox.cs" />
+    <Compile Include="BorderListBox.cs">
+      <SubType>Component</SubType>
+    </Compile>
    <Compile Include="BorderListBox.designer.cs">
      <DependentUpon>BorderListBox.cs</DependentUpon>
    </Compile>
-    <Compile Include="BorderSelectionPanel.cs" />
+    <Compile Include="BorderSelectionPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
    <Compile Include="BorderSelectionPanel.Designer.cs">
      <DependentUpon>BorderSelectionPanel.cs</DependentUpon>
    </Compile>
-    <Compile Include="ConvertTable.cs" />
-    <Compile Include="DisplayApplicability.cs" />
+    <Compile Include="ConvertTable.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DisplayApplicability.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="DisplayApplicability.designer.cs">
      <DependentUpon>DisplayApplicability.cs</DependentUpon>
    </Compile>
-    <Compile Include="DisplayBookMarks.cs" />
+    <Compile Include="DisplayBookMarks.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="DisplayBookMarks.Designer.cs">
      <DependentUpon>DisplayBookMarks.cs</DependentUpon>
    </Compile>
-    <Compile Include="DisplayFoldoutMaint.cs" />
+    <Compile Include="DisplayFoldoutMaint.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="DisplayFoldoutMaint.Designer.cs">
      <DependentUpon>DisplayFoldoutMaint.cs</DependentUpon>
    </Compile>
-    <Compile Include="DisplayHistory.cs" />
+    <Compile Include="DisplayHistory.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="DisplayHistory.designer.cs">
      <DependentUpon>DisplayHistory.cs</DependentUpon>
    </Compile>
-    <Compile Include="DisplayLibDocs.cs" />
+    <Compile Include="DisplayLibDocs.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="DisplayLibDocs.Designer.cs">
      <DependentUpon>DisplayLibDocs.cs</DependentUpon>
    </Compile>
-    <Compile Include="DisplayReports.cs" />
+    <Compile Include="DisplayReports.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="DisplayReports.designer.cs">
      <DependentUpon>DisplayReports.cs</DependentUpon>
    </Compile>
-    <Compile Include="DisplaySearch.cs" />
+    <Compile Include="DisplaySearch.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="DisplaySearch.Designer.cs">
      <DependentUpon>DisplaySearch.cs</DependentUpon>
    </Compile>
-    <Compile Include="DisplayTags.cs" />
+    <Compile Include="DisplayTags.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="DisplayTags.Designer.cs">
      <DependentUpon>DisplayTags.cs</DependentUpon>
    </Compile>
-    <Compile Include="dlgChgId.cs" />
+    <Compile Include="dlgChgId.cs">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="dlgChgId.designer.cs">
      <DependentUpon>dlgChgId.cs</DependentUpon>
    </Compile>
-    <Compile Include="dlgDelProcReason.cs" />
+    <Compile Include="dlgDelProcReason.cs">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="dlgDelProcReason.designer.cs">
      <DependentUpon>dlgDelProcReason.cs</DependentUpon>
    </Compile>
-    <Compile Include="dlgEnhMissingItem.cs" />
+    <Compile Include="dlgEnhMissingItem.cs">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="dlgEnhMissingItem.Designer.cs">
      <DependentUpon>dlgEnhMissingItem.cs</DependentUpon>
    </Compile>
-    <Compile Include="dlgUCFImportOptions.cs" />
+    <Compile Include="dlgUCFImportOptions.cs">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="dlgUCFImportOptions.Designer.cs">
      <DependentUpon>dlgUCFImportOptions.cs</DependentUpon>
    </Compile>
-    <Compile Include="EditItem.cs" />
+    <Compile Include="EditItem.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="EditItem.Designer.cs">
      <DependentUpon>EditItem.cs</DependentUpon>
    </Compile>
-    <Compile Include="FindReplace.cs" />
+    <Compile Include="FindReplace.cs">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="FindReplace.designer.cs">
      <DependentUpon>FindReplace.cs</DependentUpon>
    </Compile>
    <Compile Include="FormatUtility.cs" />
-    <Compile Include="frmEnhanced.cs" />
+    <Compile Include="frmEnhanced.cs">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="frmEnhanced.Designer.cs">
      <DependentUpon>frmEnhanced.cs</DependentUpon>
    </Compile>
-    <Compile Include="frmImportWordContents.cs" />
+    <Compile Include="frmImportWordContents.cs">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="frmImportWordContents.Designer.cs">
      <DependentUpon>frmImportWordContents.cs</DependentUpon>
    </Compile>
-    <Compile Include="frmSendErrorLog.cs" />
+    <Compile Include="frmSendErrorLog.cs">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="frmSendErrorLog.designer.cs">
      <DependentUpon>frmSendErrorLog.cs</DependentUpon>
    </Compile>
-    <Compile Include="frmViewTextFile.cs" />
+    <Compile Include="frmViewTextFile.cs">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="frmViewTextFile.designer.cs">
      <DependentUpon>frmViewTextFile.cs</DependentUpon>
    </Compile>
-    <Compile Include="GridItem.cs" />
+    <Compile Include="GridItem.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="GridItem.Designer.cs">
      <DependentUpon>GridItem.cs</DependentUpon>
    </Compile>
-    <Compile Include="ImageItem.cs" />
+    <Compile Include="ImageItem.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="ImageItem.designer.cs">
      <DependentUpon>ImageItem.cs</DependentUpon>
    </Compile>
    <Compile Include="LinkText.cs" />
-    <Compile Include="PreviewMultiLineRO.cs" />
+    <Compile Include="PreviewMultiLineRO.cs">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="PreviewMultiLineRO.designer.cs">
      <DependentUpon>PreviewMultiLineRO.cs</DependentUpon>
    </Compile>
-    <Compile Include="PreviewROImage.cs" />
+    <Compile Include="PreviewROImage.cs">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="PreviewROImage.designer.cs">
      <DependentUpon>PreviewROImage.cs</DependentUpon>
    </Compile>
@@ -237,20 +291,28 @@
      <DesignTimeSharedInput>True</DesignTimeSharedInput>
      <DependentUpon>Settings.settings</DependentUpon>
    </Compile>
-    <Compile Include="RTBItem.cs" />
+    <Compile Include="RTBItem.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="RTBItem.designer.cs">
      <DependentUpon>RTBItem.cs</DependentUpon>
    </Compile>
-    <Compile Include="RtfRawItem.cs" />
+    <Compile Include="RtfRawItem.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="RtfRawItem.designer.cs">
      <DependentUpon>RtfRawItem.cs</DependentUpon>
    </Compile>
    <Compile Include="Settings.cs" />
-    <Compile Include="StepPanel.cs" />
+    <Compile Include="StepPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
    <Compile Include="StepPanel.designer.cs">
      <DependentUpon>StepPanel.cs</DependentUpon>
    </Compile>
-    <Compile Include="DisplayRO.cs" />
+    <Compile Include="DisplayRO.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="DisplayRO.Designer.cs">
      <DependentUpon>DisplayRO.cs</DependentUpon>
    </Compile>
@@ -260,29 +322,43 @@
    <Compile Include="DisplayTabControl.designer.cs">
      <DependentUpon>DisplayTabControl.cs</DependentUpon>
    </Compile>
-    <Compile Include="DisplayTabItem.cs" />
+    <Compile Include="DisplayTabItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
    <Compile Include="DisplayTabItem.designer.cs">
      <DependentUpon>DisplayTabItem.cs</DependentUpon>
    </Compile>
-    <Compile Include="StepTabPanel.cs" />
+    <Compile Include="StepTabPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
    <Compile Include="StepTabPanel.designer.cs">
      <DependentUpon>StepTabPanel.cs</DependentUpon>
    </Compile>
-    <Compile Include="StepTabRibbon.cs" />
+    <Compile Include="StepTabRibbon.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="StepTabRibbon.designer.cs">
      <DependentUpon>StepTabRibbon.cs</DependentUpon>
    </Compile>
-    <Compile Include="DisplayTransition.cs" />
+    <Compile Include="DisplayTransition.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="DisplayTransition.Designer.cs">
      <DependentUpon>DisplayTransition.cs</DependentUpon>
    </Compile>
    <Compile Include="DropDownNode.cs" />
-    <Compile Include="DropDownTree.cs" />
-    <Compile Include="DSOTabPanel.cs" />
+    <Compile Include="DropDownTree.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="DSOTabPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
    <Compile Include="DSOTabPanel.designer.cs">
      <DependentUpon>DSOTabPanel.cs</DependentUpon>
    </Compile>
-    <Compile Include="FlagEnumEditor.cs" />
+    <Compile Include="FlagEnumEditor.cs">
+      <SubType>Component</SubType>
+    </Compile>
    <Compile Include="MostRecentItem.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="Properties\Resources.Designer.cs">
@@ -290,47 +366,65 @@
      <DesignTime>True</DesignTime>
      <DependentUpon>Resources.resx</DependentUpon>
    </Compile>
-    <Compile Include="RichTextBox41.cs" />
+    <Compile Include="RichTextBox41.cs">
+      <SubType>Component</SubType>
+    </Compile>
    <Compile Include="RichTextBox41.Designer.cs">
      <DependentUpon>RichTextBox41.cs</DependentUpon>
    </Compile>
    <Compile Include="RomanNumeral.cs" />
    <Compile Include="RTBAPI.cs" />
-    <Compile Include="TransPanel.cs" />
+    <Compile Include="TransPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
    <Compile Include="TransPanel.designer.cs">
      <DependentUpon>TransPanel.cs</DependentUpon>
    </Compile>
    <Compile Include="VlnBorders.cs" />
-    <Compile Include="vlnExpander.cs" />
+    <Compile Include="vlnExpander.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="vlnExpander.designer.cs">
      <DependentUpon>vlnExpander.cs</DependentUpon>
    </Compile>
-    <Compile Include="StepRTB.cs" />
+    <Compile Include="StepRTB.cs">
+      <SubType>Component</SubType>
+    </Compile>
    <Compile Include="StepRTB.designer.cs">
      <DependentUpon>StepRTB.cs</DependentUpon>
    </Compile>
-    <Compile Include="VlnFlexGrid.cs" />
+    <Compile Include="VlnFlexGrid.cs">
+      <SubType>Component</SubType>
+    </Compile>
    <Compile Include="VlnFlexGrid.Designer.cs">
      <DependentUpon>VlnFlexGrid.cs</DependentUpon>
    </Compile>
    <Compile Include="VlnGridCellShading.cs" />
    <Compile Include="VlnSpellCheck.cs" />
-    <Compile Include="VlnSpellCheckDlg.cs" />
+    <Compile Include="VlnSpellCheckDlg.cs">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="VlnSpellCheckDlg.designer.cs">
      <DependentUpon>VlnSpellCheckDlg.cs</DependentUpon>
    </Compile>
-    <Compile Include="vlnTreeCombo.cs" />
+    <Compile Include="vlnTreeCombo.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="vlnTreeView.cs">
      <SubType>Component</SubType>
    </Compile>
    <Compile Include="vlnTreeView.Designer.cs">
      <DependentUpon>vlnTreeView.cs</DependentUpon>
    </Compile>
-    <Compile Include="vlnTreeView3.cs" />
+    <Compile Include="vlnTreeView3.cs">
+      <SubType>Component</SubType>
+    </Compile>
    <Compile Include="vlnTreeView3.Designer.cs">
      <DependentUpon>vlnTreeView3.cs</DependentUpon>
    </Compile>
-    <Compile Include="WebBrowser.cs" />
+    <Compile Include="WebBrowser.cs">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="WebBrowser.designer.cs">
      <DependentUpon>WebBrowser.cs</DependentUpon>
    </Compile>
--- 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=3.8.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
+    <Reference Include="Csla, Version=2.1.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>