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

Merging F2024-022 from development into master.  No testing required since formats are under development.

PROMS/AdjustBuildRevision/AdjustBuildRevision.csproj

@@ -27,7 +27,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>

PROMS/AdjustBuildRevision/Program.cs

@@ -32,9 +32,9 @@ namespace AdjustBuildRevision
 						{
 							// Allow for setting build revision on either proms or the roeditor:
 							if (Directory.GetCurrentDirectory().ToUpper().Contains("REFOBJ"))
-								outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.3.yyMM.dHH") + "\")");
-							else
 								outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.2.yyMM.dHH") + "\")");
+							else
+								outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.1.yyMM.dHH") + "\")");
 					//		if (outline != line)
 					//		{
 					//			Console.WriteLine("Before: '{0}'", line);

PROMS/AdjustBuildRevision/app.config

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>

PROMS/Baseline/App.config

@@ -6,7 +6,7 @@
         </sectionGroup>
     </configSections>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
     </startup>
     <userSettings>
         <Baseline.Properties.Settings>

PROMS/Baseline/Baseline.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Baseline</RootNamespace>
     <AssemblyName>Baseline</AssemblyName>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>
     </SccProjectName>

PROMS/DropDownPanel/DropDownPanel.csproj

@@ -18,7 +18,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>

PROMS/FlexableMessageBox/FlexableMessageBox.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FlexableMessageBox</RootNamespace>
     <AssemblyName>FlexableMessageBox</AssemblyName>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <SccProjectName>

PROMS/Formats/Formats.csproj

@@ -18,7 +18,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>

PROMS/Formats/app.config

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>

PROMS/LBWordLibrary/LBWordLibrary.csproj

@@ -18,7 +18,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>

PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/CmpRpt.csproj

@@ -33,7 +33,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/app.config

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <configuration>
 	<startup>
-	<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup><runtime>
+	<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup><runtime>
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705">
 		</assemblyBinding></runtime></configuration>

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/AssemblyInfo.cs

@@ -23,8 +23,8 @@ using System.Runtime.CompilerServices;
 //      Build YYMM (two digit year, two digit month)
 //      Revision DHH (day - no leading zero, two digit hour - military time
 //
-[assembly: AssemblyVersion("2.3.2404.1611")]
-[assembly: AssemblyFileVersion("2.3.2404.1611")]
+[assembly: AssemblyVersion("2.2.2306.2212")]
+[assembly: AssemblyFileVersion("2.2.2306.2212")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -89,8 +89,6 @@ using System.Runtime.CompilerServices;
 
 
 
-
-
 
 
 

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.csproj

@@ -44,7 +44,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/app.config

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <configuration>
 	<startup>
-	<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup><runtime>
+	<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup><runtime>
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705">
 		</assemblyBinding></runtime>
 	<appSettings>

PROMS/ReferencedObjects/LibSource/DBEncapsulation/DBEncapsulation.csproj

@@ -35,7 +35,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/Org.Mentalis.Files/Org.Mentalis.Files.csproj

@@ -18,7 +18,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>

PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.csproj

@@ -35,7 +35,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/ROFST/ROFST.csproj

@@ -35,7 +35,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/ROField/ROFields.csproj

@@ -35,7 +35,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/Utils/Utils.csproj

@@ -51,7 +51,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

PROMS/ReferencedObjects/LibSource/VlnProfiler/VlnProfiler.csproj

@@ -46,7 +46,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/VlnStatus/VlnStatus.csproj

@@ -35,7 +35,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEditLib.csproj

@@ -35,7 +35,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/RoAccessToSql/App.config

@@ -60,6 +60,6 @@
 			</logger>
 		</log4net>
 		<startup>
-			<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
+			<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
 		</startup>
 	</configuration>

PROMS/RoAccessToSql/RoAccessToSql.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RoAccessToSql</RootNamespace>
     <AssemblyName>RoAccessToSql</AssemblyName>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <SccProjectName>

PROMS/TablePicker/TablePicker.csproj

@@ -33,7 +33,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/VEPROMS User Interface/App.config

@@ -1,73 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="VEPROMS.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
-      <section name="UISampleNetBar1.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
+      <section name="VEPROMS.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+      <section name="UISampleNetBar1.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
     </sectionGroup>
   </configSections>
   <log4net>
     <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <param name="File" value="${USERPROFILE}/My Documents/VEPROMS/ErrorLog.txt"/>
+      <param name="File" value="${USERPROFILE}/My Documents/VEPROMS/ErrorLog.txt" />
       <!--<param name="File" value="${APPDATA}/Volian/Proms2010/ErrorLog.txt" />-->
       <!--<param name="File" value="${LOCALAPPDATA}/Temp/VEPROMS/ErrorLog.txt" />-->
-      <param name="AppendToFile" value="true"/>
+      <param name="AppendToFile" value="true" />
       <layout type="log4net.Layout.PatternLayout">
         <!--<param name="Header" value="[Header]\r\n" />-->
         <!--<param name="Footer" value="[Footer]\r\n" />-->
-        <param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n"/>
+        <param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n" />
       </layout>
     </appender>
     <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
       <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="--&gt; %date [%thread] %-5level %logger (%property{log4net:HostName}) [%ndc] - %message%newline"/>
+        <conversionPattern value="--&gt; %date [%thread] %-5level %logger (%property{log4net:HostName}) [%ndc] - %message%newline" />
       </layout>
     </appender>
     <appender name="EventLogAppender" type="log4net.Appender.EventLogAppender">
-      <threshold value="WARN"/>
+      <threshold value="WARN" />
       <mapping>
-        <level value="DEBUG"/>
-        <eventLogEntryType value="Information"/>
+        <level value="DEBUG" />
+        <eventLogEntryType value="Information" />
       </mapping>
       <mapping>
-        <level value="INFO"/>
-        <eventLogEntryType value="Information"/>
+        <level value="INFO" />
+        <eventLogEntryType value="Information" />
       </mapping>
       <mapping>
-        <level value="WARN"/>
-        <eventLogEntryType value="Warning"/>
+        <level value="WARN" />
+        <eventLogEntryType value="Warning" />
       </mapping>
       <mapping>
-        <level value="ERROR"/>
-        <eventLogEntryType value="Error"/>
+        <level value="ERROR" />
+        <eventLogEntryType value="Error" />
       </mapping>
       <mapping>
-        <level value="FATAL"/>
-        <eventLogEntryType value="Error"/>
+        <level value="FATAL" />
+        <eventLogEntryType value="Error" />
       </mapping>
       <layout type="log4net.Layout.PatternLayout">
-        <param name="ConversionPattern" value="---&gt; %d [%t] %-5p %c - %m%n"/>
+        <param name="ConversionPattern" value="---&gt; %d [%t] %-5p %c - %m%n" />
       </layout>
     </appender>
     <root>
-      <level value="ALL"/>
-      <appender-ref ref="ConsoleAppender"/>
-      <appender-ref ref="LogFileAppender"/>
-      <appender-ref ref="EventLogAppender"/>
+      <level value="ALL" />
+      <appender-ref ref="ConsoleAppender" />
+      <appender-ref ref="LogFileAppender" />
+      <appender-ref ref="EventLogAppender" />
     </root>
     <logger name="VEPROMS.CSLA.Library">
-      <level value="INFO"/>
+      <level value="INFO" />
     </logger>
     <logger name="Volian.Controls.Library">
-      <level value="INFO"/>
+      <level value="INFO" />
     </logger>
   </log4net>
   <appSettings>
-    <add key="OperatingMode" value="Production"/>
+    <add key="OperatingMode" value="Production" />
     <!--"Debug" "Production" "Demo"/-->
-    <add key="OriginalPageBreak" value="False"/>
-    <add key="CslaAuthentication" value="Windows"/>
+    <add key="OriginalPageBreak" value="False" />
+    <add key="CslaAuthentication" value="Windows" />
     <!--
     <add key="CslaDataPortalProxy" 
       value="Csla.DataPortalClient.RemotingProxy, Csla"/>
@@ -85,17 +85,17 @@
       value="EnterpriseServicesHost.EnterpriseServicesProxy,
       EnterpriseServicesHost"/>      
       -->
-    <add key="ClientSettingsProvider.ServiceUri" value=""/>
+    <add key="ClientSettingsProvider.ServiceUri" value="" />
   </appSettings>
   <connectionStrings>
-    <add name="VEPROMS" connectionString="Data Source=VOLIAN-SERVER;User Id=proms2010;password=proms2010;Initial Catalog=VEPROMS" providerName="System.Data.SqlClient"/>
-    <add name="VEPROMS_LOCAL" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
-    <add name="VEPROMS_RMARK_DEBUG" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
-    <add name="VEPROMS_RMARK_DEMO" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
+    <add name="VEPROMS" connectionString="Data Source=VOLIAN-SERVER;User Id=proms2010;password=proms2010;Initial Catalog=VEPROMS" providerName="System.Data.SqlClient" />
+    <add name="VEPROMS_LOCAL" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
+    <add name="VEPROMS_RMARK_DEBUG" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
+    <add name="VEPROMS_RMARK_DEMO" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
     <!--<add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
 	  <add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />-->
-    <add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=JCB2-HP\VOLIAN08;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
-    <add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=JCB2-HP\VOLIAN08;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
+    <add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=JCB2-HP\VOLIAN08;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
+    <add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=JCB2-HP\VOLIAN08;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
     <!--<add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=JCB2-HP\VOLIAN12;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
     <add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=JCB2-HP\VOLIAN12;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />-->
   </connectionStrings>
@@ -135,10 +135,10 @@
         <value>True</value>
       </setting>
       <setting name="QATItems" serializeAs="String">
-        <value/>
+        <value />
       </setting>
       <setting name="DefaultDB" serializeAs="String">
-        <value/>
+        <value />
       </setting>
       <setting name="LastVersion" serializeAs="String">
         <value>0.0</value>
@@ -150,10 +150,10 @@
         <value>True</value>
       </setting>
       <setting name="SMTPServer" serializeAs="String">
-        <value/>
+        <value />
       </setting>
       <setting name="SMTPUser" serializeAs="String">
-        <value/>
+        <value />
       </setting>
       <setting name="UpdateSettings" serializeAs="String">
         <value>True</value>
@@ -181,22 +181,18 @@
     </UISampleNetBar1.Properties.Settings>
   </userSettings>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
   </startup>
-  <runtime>
-    <AppContextSwitchOverrides
-      value="Switch.System.Windows.Forms.DoNotLoadLatestRichEditControl=true" />
-  </runtime>
   <system.web>
     <membership defaultProvider="ClientAuthenticationMembershipProvider">
       <providers>
-        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
+        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
       </providers>
     </membership>
     <roleManager defaultProvider="ClientRoleProvider" enabled="true">
       <providers>
-        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
+        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
       </providers>
     </roleManager>
   </system.web>
-</configuration>
+</configuration>

PROMS/VEPROMS User Interface/DlgPrintProcedure.cs

@@ -18,14 +18,14 @@ namespace VEPROMS
 	{
 		public bool SaveLinks
 		{
-			get 
-			{ 
+			get
+			{
 				return swtbtnPDFLinks.Value;
 			}
 		}
 		public int RemoveTrailingHardReturnsAndManualPageBreaks
 		{
-			get 
+			get
 			{
 				// C2021-010: Remove trailing returns/spaces & manual page breaks & allow save.
 				//	return values: 0=None; 1=Trailing; 2=ManualPgBrk; 3=Both.
@@ -33,7 +33,7 @@ namespace VEPROMS
 				if (!cbxRemoveManualPgBrk.Checked && !cbxRemoveTrailing.Checked) return 0;
 				if (!cbxRemoveManualPgBrk.Checked && cbxRemoveTrailing.Checked) return 1;
 				if (cbxRemoveManualPgBrk.Checked && !cbxRemoveTrailing.Checked) return 2;
-				return 3; 
+				return 3;
 			}
 		}
 		private string _Prefix = "";  // RHM20150506 Multiline ItemID TextBox
@@ -59,8 +59,10 @@ namespace VEPROMS
 			get { return _Automatic; }
 			set { _Automatic = value; }
 		}
-		private int _prtSectID = -1;
-		public int PrtSectID
+		// C2024-003 parameter contains parent section, child section, issubsection flag.
+		// C2024-003 values needed to print section.
+		private int[] _prtSectID = new int[] { -1, -1, 0 };  
+		public int[] PrtSectID
 		{
 			get { return _prtSectID; }
 			set { _prtSectID = value; }
@@ -73,8 +75,8 @@ namespace VEPROMS
 		public bool AllowDateTimePrefixSuffix
 		{
 			get { return _AllowDateTimePrefixSuffix; }
-			set 
-			{ 
+			set
+			{
 				_AllowDateTimePrefixSuffix = value;
 				swtbtnPDFdtPrefixSuffix.Value = swtbtnPDFdtPrefixSuffix.Enabled = _AllowDateTimePrefixSuffix;
 			}
@@ -86,7 +88,7 @@ namespace VEPROMS
 		{
 			cbxDebugPagination.Checked = true;
 			cbxDebugText.Checked = true;
-      cbxMetaFile.Checked = true; // C2018-004 create meta file for baseline compares
+			cbxMetaFile.Checked = true; // C2018-004 create meta file for baseline compares
 			_IncludeWordSecTextInMetafile = true;
 			Application.DoEvents();
 			string[] parameters = System.Environment.CommandLine.Split(" ".ToCharArray());
@@ -101,7 +103,7 @@ namespace VEPROMS
 					cbxDebug.Checked = false;
 				else if (parameter.ToUpper() == "/NM")
 					cbxMetaFile.Checked = false; // C2018-004 turn off create meta file for baseline compares
-        else if (parameter.ToUpper() == "/NW")
+				else if (parameter.ToUpper() == "/NW")
 					_IncludeWordSecTextInMetafile = false; // C2018-023 turn off putting Word attachment text in the meta file for baseline compares
 			}
 			CreatePDFs();
@@ -143,10 +145,11 @@ namespace VEPROMS
 		}
 		public string PDFPath
 		{
-			get {// B2018-069 Revert to Temporary for Baseline testing
+			get
+			{// B2018-069 Revert to Temporary for Baseline testing
 				if (PromsPrinter.BaselineTesting)
 					return VlnSettings.TemporaryFolder;
-				return txbPDFLocation.Text; 
+				return txbPDFLocation.Text;
 			}
 			set { txbPDFLocation.Text = value; }
 		}
@@ -190,7 +193,7 @@ namespace VEPROMS
 			if (_MyProcedure != null && _MyProcedure.ProcHasSupInfoData)
 			{
 				swtbtnBlankPgsForDuplex.Enabled = false;
-				tbBlankPage.Enabled = true;		// C2019-004: Allow user to define duplex blank page text (similar changes throughout file are not commented)
+				tbBlankPage.Enabled = true;     // C2019-004: Allow user to define duplex blank page text (similar changes throughout file are not commented)
 			}
 			btnCreatePDF.Text = "Create PDFs";
 			HandleDocVersionSettings();
@@ -235,7 +238,7 @@ namespace VEPROMS
 			gpnlDebug.Visible = Volian.Base.Library.VlnSettings.DebugMode;
 			swtbtnGeneratePlacekeeper.Value = false;
 			cbxGenerateConActSum.Checked = false;
-			swtbtnGeneratePlacekeeper.Visible = lblGeneratePlacekeeper.Visible = oneProcedure && 
+			swtbtnGeneratePlacekeeper.Visible = lblGeneratePlacekeeper.Visible = oneProcedure &&
 				((MyProcedure.ActiveFormat.PlantFormat.FormatData.PurchaseOptions & E_PurchaseOptions.AutoPlacekeeper) == E_PurchaseOptions.AutoPlacekeeper);
 			// C2021-062 make visable the check box to assign rev number for all procedures being printed
 			//           also make visable the Rev Num entry field.
@@ -280,7 +283,7 @@ namespace VEPROMS
 			expPrnSetting.Expanded = swtbtnBlankPgsForDuplex.Value || swtbtnChgBar.Value || swtbtnGeneratePlacekeeper.Value || swtbtnPDFLinks.Value || swtbtnPROMSVersion.Value || swtbtnWaterMark.Value || swtbtnPDFdtPrefixSuffix.Value;
 		}
 		public DlgPrintProcedure(ProcedureInfo pi, bool automatic)  // RHM20150506 Multiline ItemID TextBox
-		{		
+		{
 			InitializeComponent();
 			Automatic = automatic;
 			_AllProcedures = false;
@@ -309,7 +312,7 @@ namespace VEPROMS
 		{
 			base.OnActivated(e);
 			if (Owner != null)
-				Location = new Point(Owner.Left + Owner.Width / 2 - Width / 2, Owner.Top + Owner.Height/2 - Height/2);
+				Location = new Point(Owner.Left + Owner.Width / 2 - Width / 2, Owner.Top + Owner.Height / 2 - Height / 2);
 		}
 		private void HandleDocVersionSettings()
 		{
@@ -323,10 +326,10 @@ namespace VEPROMS
 			// if the default setting is 'SelectBeforePrinting', expand the Additional Print Settings panel
 			if (_DocVersionConfig.Print_ChangeBar == PrintChangeBar.SelectBeforePrinting)
 			{
-					swtbtnChgBar.Value = false;
-					cbxOvrrideDefChgBars.Checked = false;
-					expPrnSetting.Expanded = true;
-				}
+				swtbtnChgBar.Value = false;
+				cbxOvrrideDefChgBars.Checked = false;
+				expPrnSetting.Expanded = true;
+			}
 		}
 
 		private void GetDocVersionSettings()
@@ -341,14 +344,14 @@ namespace VEPROMS
 			cbxOpenAfterCreate2.Checked = _DocVersionConfig.Print_AlwaysViewPDFAfterCreate;
 			// Changebars on/off
 			if (_DocVersionConfig.Print_ChangeBar == PrintChangeBar.Without)
-				swtbtnChgBar.Value = false; 
+				swtbtnChgBar.Value = false;
 			else
-				swtbtnChgBar.Value = true; 
+				swtbtnChgBar.Value = true;
 			// Watermark on/off
 			if (_DocVersionConfig.Print_Watermark == PrintWatermark.None)
-				swtbtnWaterMark.Value = false; 
+				swtbtnWaterMark.Value = false;
 			else
-				swtbtnWaterMark.Value = true; 
+				swtbtnWaterMark.Value = true;
 			// Auto Duplexing on/off - Auto duplex was used only by Point Beach formats These buttons were removed from the dialog
 			//                         There was not print coding to support this format flag
 
@@ -373,7 +376,7 @@ namespace VEPROMS
 			// default to using OriginalPageBreaks (16bit page breaks) if App.config is set
 			// to true:
 			//cbxOrPgBrk.Visible = VlnSettings.OriginalPageBreak && VlnSettings.DebugMode;
-      cbxOrPgBrk.Visible = false; //per Harry
+			cbxOrPgBrk.Visible = false; //per Harry
 			cbxOrPgBrk.Checked = false;
 		}
 
@@ -410,7 +413,7 @@ namespace VEPROMS
 		private Timer _MyTimer;
 		public void SetupForProcedure() // RHM20150506 Multiline ItemID TextBox
 		{
-			if(_DocVersionInfo == null)this.Text = "Create PDF for " + ProcNum;
+			if (_DocVersionInfo == null) this.Text = "Create PDF for " + ProcNum;
 			// get list of previous pdf files
 			// if no previous pdf file, then get path from frmVersionProperties
 			// dlgSelectFile.InitialDirectory = pdf path from frmVersionProperties
@@ -419,20 +422,20 @@ namespace VEPROMS
 			//txbPDFLocation.Text = _PDFPath;
 			BuildPDFFileName();
 			ProcedureConfig pc = _MyProcedure.MyConfig as ProcedureConfig;
-			if(SelectedSlave > 0) pc.SelectedSlave = SelectedSlave;
+			if (SelectedSlave > 0) pc.SelectedSlave = SelectedSlave;
 			if (pc != null)
 			{
 				//C2021-062 use the save rev number for all procedures if set, or just use the rev number in the current procedure config
 				RevNum = (_NewRevForAllProcs == null) ? pc.Print_Rev : _NewRevForAllProcs;
 				RevDate = pc.Print_RevDate; //== null || pc.Print_RevDate=="" ? DateTime.Today : Convert.ToDateTime(pc.Print_RevDate);
 				ReviewDate = pc.Print_ReviewDate; // == null ? DateTime.Today : Convert.ToDateTime(pc.Print_ReviewDate);
-				 //Now check the format flags to determine if/how the Rev string should be parsed.
+				//Now check the format flags to determine if/how the Rev string should be parsed.
 				// This will covert the old way (16-bit) of setting a RevDate (appending it to the RevNumber)
 				// to the new way saving the RevNumber and RevDate in there own config fields
 				if ((_MyProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.DoRevDate && RevNum.Contains("/"))
-				    || (_MyProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.RevDateWithForwardSlash && RevNum.Contains("\\")))
+					|| (_MyProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.RevDateWithForwardSlash && RevNum.Contains("\\")))
 				{
-				    int indx = RevNum.IndexOf(_MyProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.RevDateWithForwardSlash ? '\\' : '/');
+					int indx = RevNum.IndexOf(_MyProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.RevDateWithForwardSlash ? '\\' : '/');
 					pc.Print_RevDate = RevDate = RevNum.Substring(indx + 1);
 					pc.Print_Rev = RevNum = RevNum.Substring(0, indx);
 					// save the RevNumber and RevDate to the procedure's config.
@@ -530,8 +533,8 @@ namespace VEPROMS
 			if (dtPre != PDFDTPrefix.None) PDFFilePrefix = ""; // incase user entered prefix text but then selected a date/time (in working draft properties)
 			if (dtSuf != PDFDTSuffix.None) PDFFileSuffix = ""; // incase user entered suffix text but then selected a date/time (in working draft properties)
 			// B2020-062 control the toggle of date/time prefix/suffix on pdf file name
-			//           disable the date/time Prefix/Suffix switch if no date/time was selected
-			//           This switch is does not affect the use of it if the user typed in text for prefix/suffix
+			// disable the date/time Prefix/Suffix switch if no date/time was selected
+			// This switch is does not affect the use of it if the user typed in text for prefix/suffix
 			if (!AllowDateTimePrefixSuffix || (dtPre == PDFDTPrefix.None && dtSuf == PDFDTSuffix.None))
 			{
 				swtbtnPDFdtPrefixSuffix.Value = false;
@@ -607,7 +610,7 @@ namespace VEPROMS
 
 		private void swtbtnWaterMark_ValueChanged(object sender, EventArgs e)
 		{
-			if (!swtbtnWaterMark.Value)		// C2021-019: make both invisible
+			if (!swtbtnWaterMark.Value)     // C2021-019: make both invisible
 			{
 				cbxWaterMark.Visible = swtbtnWaterMark.Value;
 				lblWaterMarkOvrd.Visible = swtbtnWaterMark.Value;
@@ -634,7 +637,7 @@ namespace VEPROMS
 			if (!Directory.Exists(PDFPath))
 			{
 				string msg = string.Format("'{0}' does not exist. \n\nCreate it?", PDFPath);
-				DialogResult dr= MessageBox.Show(msg, "Folder Not Found", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
+				DialogResult dr = MessageBox.Show(msg, "Folder Not Found", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
 				if (dr == DialogResult.Yes)
 				{
 					try
@@ -668,7 +671,7 @@ namespace VEPROMS
 		public ProcedureInfo MyProcedure
 		{
 			get { return _MyProcedure; }
-			set 
+			set
 			{
 				_MyProcedure = value;
 				// if procedure has supplemental information, the automatially check the add blank pages for duplex printing
@@ -730,11 +733,11 @@ namespace VEPROMS
 			int i = 0;
 			pbPDFsStatus.Maximum = n;
 			pbPDFsStatus.Visible = true;
-			VlnSvgPageHelper.CountInApplProcs = 1;	// B2021-127: BNPPalr - Auto set of serial #, skip Front Matter as per PAL 11/1/21 (set to 1 not 0)
+			VlnSvgPageHelper.CountInApplProcs = 1;  // B2021-127: BNPPalr - Auto set of serial #, skip Front Matter as per PAL 11/1/21 (set to 1 not 0)
 			this.Text = string.Format("Processing {0}", _DocVersionInfo.MyFolder.Name);
 			foreach (ProcedureInfo myProc in _DocVersionInfo.Procedures)
 			{
-				string locpdfname = null;		// get pdf file name for later merge code
+				string locpdfname = null;       // get pdf file name for later merge code
 				MyProcedure = myProc;
 				// C2021-019: Override Watermark Text, 'waterMarkText' will have whatever watermark text should be printed
 				ProcedureConfig procConfig = MyProcedure.MyConfig as ProcedureConfig;
@@ -771,7 +774,7 @@ namespace VEPROMS
 
 							string myPDFPath = GetMultiunitPDFPath();
 							_MergedPdfPath = myPDFPath;     // If Slave, need its subdirectory/unit path for merging
-															// RHM 20120925 Overlay the bottom of the dialog so that cancel button is covered.
+							// RHM 20120925 Overlay the bottom of the dialog so that cancel button is covered.
 							// B2021-102 put in the using for better memory management
 							using (frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNumAndDate, waterMarkText, cbxDebug.Checked, cbxOrPgBrk.Checked,
 								cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, myPDFPath, cbd, txbPDFName.Text, new Point(Left, Bottom - 50),
@@ -871,7 +874,7 @@ namespace VEPROMS
 				}
 			}
 			pbPDFsStatus.Visible = false;
-			if(!Automatic) 
+			if (!Automatic)
 				ShowDebugFiles();
 			ProfileTimer.Pop(profileDepth);
 			ProfileTimer.ShowTimerTable();
@@ -943,7 +946,7 @@ namespace VEPROMS
 			if (cbxDebugText.Checked)
 				Volian.Base.Library.DebugText.Show();
 			if (cbxMetaFile.Checked)// C2018-004 create meta file for baseline compares
-        Volian.Base.Library.BaselineMetaFile.Show(); // baseline
+				Volian.Base.Library.BaselineMetaFile.Show(); // baseline
 		}
 		public void CreatePDF()  // RHM20150506 Multiline ItemID TextBox
 		{
@@ -959,8 +962,8 @@ namespace VEPROMS
 			}
 			MyProcedure.SelectedChildToPrint = SelectedSlave; // B2023-035 for BNPP Alarms save the number of the child selected to print
 			// B2021-127: BNPPalr - Auto set of serial #, skip Front Matter as per PAL 11/1/21 (set to 1 not 0)
-			//		Only do if set has applicability, printing an individual procedure, need to determine 
-			//		applicability count.
+			// Only do if set has applicability, printing an individual procedure, need to determine 
+			// applicability count.
 			if (MyProcedure.MyDocVersion.MultiUnitCount > 1)
 			{
 				VlnSvgPageHelper.CountInApplProcs = 1;
@@ -977,12 +980,12 @@ namespace VEPROMS
 			Volian.Print.Library.Rtf2Pdf.PdfDebug = cbxDebug.Checked;
 			// B2019-044 don't print the watermark if the watermark switch on the print dialog is turned off
 			cbxWaterMark.Visible = true;
-			string waterMarkText = (swtbtnWaterMark.Value) ? cbxWaterMark.Text : "None" ; // B2018-124 use text of watermark form drop down list instead of enum value
+			string waterMarkText = (swtbtnWaterMark.Value) ? cbxWaterMark.Text : "None"; // B2018-124 use text of watermark form drop down list instead of enum value
 			string watermarkColor = "Blue"; // this is the default watermark color
 			frmPDFStatusForm.SetUnitWatermark(MyProcedure, ref waterMarkText, ref watermarkColor); //C2022-004 Unit Designator Watermark
 			ProcedureConfig procConfig = MyProcedure.MyConfig as ProcedureConfig;
 			string waterMarkTextOverride = "";
-			if (procConfig != null) waterMarkTextOverride = procConfig.GetValue("PSI", "WATERMARKOVERRIDE");	// C2021-019: override watermark text
+			if (procConfig != null) waterMarkTextOverride = procConfig.GetValue("PSI", "WATERMARKOVERRIDE");    // C2021-019: override watermark text
 			if (swtbtnWaterMark.Value && waterMarkTextOverride != null && waterMarkTextOverride != "") waterMarkText = waterMarkTextOverride;
 			// Determine change bar settings.  First get from config & then see if override from dialog. 
 			// Also check that format allows override.
@@ -1199,7 +1202,7 @@ namespace VEPROMS
 			grpDateSelector.Text = "Select Revision Date";
 			grpDateSelector.Visible = calDateSelector.Visible = true;
 			//C2021-007 position the calendar to the current RevDate or if no RevDate, position to today's date
-			DateTime initSelDate =(txbDate.Text != null && txbDate.Text.Length != 0)? Convert.ToDateTime(txbDate.Text) : DateTime.Today;
+			DateTime initSelDate = (txbDate.Text != null && txbDate.Text.Length != 0) ? Convert.ToDateTime(txbDate.Text) : DateTime.Today;
 			calDateSelector.DisplayMonth = calDateSelector.SelectedDate = initSelDate;
 		}
 
@@ -1298,11 +1301,11 @@ namespace VEPROMS
 		}
 
 		private void expPrnSetting_ExpandedChanging(object sender, DevComponents.DotNetBar.ExpandedChangeEventArgs e)
-	{
-				if (expPrnSetting.Expanded)
+		{
+			if (expPrnSetting.Expanded)
 				//this.Size = new Size(this.Size.Width+(expPrnSetting.Size.Width-expPrnSetting.TitlePanel.Size.Height), this.Size.Height);
-			//else
-				this.Size = new Size(this.Size.Width-(expPrnSetting.Size.Width-expPrnSetting.TitlePanel.Size.Height), this.Size.Height);
+				//else
+				this.Size = new Size(this.Size.Width - (expPrnSetting.Size.Width - expPrnSetting.TitlePanel.Size.Height), this.Size.Height);
 			//Refresh();
 
 		}
@@ -1334,12 +1337,12 @@ namespace VEPROMS
 		{
 			DateTime dtStart = DateTime.Now;
 			_MergedPfd = new MergedPdf(PDFPath, _DocVersionInfo);
-			PromsPrinter.MergedLandscapePages = null;		// B2019-152: MergedLandscapePages has data set when creating separate pdfs (DoCreatePDF)
-			DoCreatePDF();		// create indivitual pdfs
+			PromsPrinter.MergedLandscapePages = null;       // B2019-152: MergedLandscapePages has data set when creating separate pdfs (DoCreatePDF)
+			DoCreatePDF();      // create indivitual pdfs
 			if (_MergedPdfPath != null && _MergedPdfPath != PDFPath) PDFPath = _MergedPfd.Folder = _MergedPdfPath;
 			// C2021-063 pass in whether to generate Alarm Point List text when a merge is done
-			if (!_MergedPfd.DoTheMerge(PromsPrinter.MergedLandscapePages,cbxAlmPtTxt.Checked)) return;		// merge them together.
-			// if the property to show the file after printing is set (on the version dialog), display it.  Otherwise do a dialog to let user know it's done
+			if (!_MergedPfd.DoTheMerge(PromsPrinter.MergedLandscapePages, cbxAlmPtTxt.Checked)) return;     // merge them together.
+																											// if the property to show the file after printing is set (on the version dialog), display it.  Otherwise do a dialog to let user know it's done
 			if (_DocVersionConfig.Print_MergedPdfsViewAfter)
 			{
 				if (_MergedPfd.MergedPdfs != null && _MergedPfd.MergedPdfs.Count > 0)

PROMS/VEPROMS User Interface/PROMSFixes.Sql

@@ -22148,84 +22148,8 @@ AS
 		[Folders].[FormatID]=@FormatID
 
 	RETURN
-	GO
 
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_ListUnlinkedItems]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-	DROP PROCEDURE [vesp_ListUnlinkedItems];
-GO
-	
-	/*****************************************************************************
-	   Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
-		   Copyright 2024 - Volian Enterprises, Inc. All rights reserved.
-	*****************************************************************************/
-	/*
-	==========================================================================================================
-	 Author:		Kathy Ruffing
-	 Create Date:	03/27/2024
-	 Description:	B2024-018: Gets list of procedures/sections/steps for possible enhanced linking
-	==========================================================================================================
-	 */
-Create Procedure[dbo].[vesp_ListUnlinkedItems]
-(
-	@ItemID int,
-	@EnhType int
-)
-WITH EXECUTE AS OWNER
-AS
-BEGIN 
-DECLARE @ParItemID int
-	DECLARE @EItemID int
-	set @EItemID = (select top 1 VIS.EItemID from vefn_AllSiblingItems(@ItemID)--Find All Siblings 
-	outer apply vefn_GetNewEnhancedData(ItemID,@EnhType) VIS -- That are Linked
-	where EitemID is not null)
 
-	if @EItemID is null
-	BEGIN
-		select @EItemID = epp.ItemID  
-			from (select * from Parts where ItemID in(select itemID from vefn_AllSiblingItems(@ItemID)))SPP -- FindParent
-			JOIN  ITEMS SII ON sPP.ContentID = sII.ContentID -- Get Parent Content ID
-			outer apply vefn_GetNewEnhancedData(SII.ItemID,@EnhType) VIS -- Get Enhanced ID for Parent
-			JOIN ITEMS EII ON VIS.EItemID = EII.ItemID -- Get Enhanced Parent Content ID 
-			JOIN PARTS EPP ON EPP.ContentID = EII.ContentID and SPP.FromType = epp.FromType -- Get first Child
-	END
-	if @EItemID is null	-- B2024-018: If not found at the current level, check at the parent level
-	BEGIN
-	
-		select @ParItemID = dbo.ve_getparentitem(@ItemID)
-		select @EItemID = epp.ItemID  
-			from (select * from Parts where ItemID in(select itemID from vefn_AllSiblingItems(@ParItemID)))SPP -- FindParent
-			JOIN  ITEMS SII ON sPP.ContentID = sII.ContentID -- Get Parent Content ID
-			outer apply vefn_GetNewEnhancedData(SII.ItemID,@EnhType) VIS -- Get Enhanced ID for Parent
-			JOIN ITEMS EII ON VIS.EItemID = EII.ItemID -- Get Enhanced Parent Content ID 
-			JOIN PARTS EPP ON EPP.ContentID = EII.ContentID --and SPP.FromType = epp.FromType (had to remove types may be proc/sect) 
-	
-	END
-	if @EItemID is null
-	BEGIN
-		select @EItemID = DV2.ItemID from (select *,cast(config as xml) xconfig from DocVersions 
-		where ItemID in(select itemID from vefn_AllSiblingItems(@ItemID))) SDV -- Source DocVersion
-		cross apply (select * from vefn_GetEnhancedDocVersions(SDV.VersionID) where @EnhType = Type) EDV -- Enhanced DocVersion
-		Join DocVersions DV2 ON DV2.VersionID = EDV.VersionID -- First Procedure
-	END
-	Select ItemID,PreviousID,II.ContentID,II.[DTS],II.[UserID],II.[LastChanged],
-		(SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[ItemID]=[II].[ItemID]) [AnnotationCount],
-		(SELECT COUNT(*) FROM [DocVersions] WHERE [DocVersions].[ItemID]=[II].[ItemID]) [DocVersionCount],
-		(SELECT COUNT(*) FROM [Items] [Children] WHERE [Children].[PreviousID]=[II].[ItemID]) [NextCount],
-		(SELECT COUNT(*) FROM [Parts] WHERE [Parts].[ItemID]=[II].[ItemID]) [PartCount],
-		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[RangeID]=[II].[ItemID]) [Transition_RangeIDCount],
-		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[ToID]=[II].[ItemID]) [Transition_ToIDCount]
-		from Items II 
-		Left Join Entries EE ON II.ContentID = EE.ContentID	
-		where ItemID In (select SIB.ItemID from vefn_AllSiblingItems(@EItemID) SIB 
-		outer apply vefn_GetNewEnhancedData(ItemID,0) VIE
-		Where VIE.EItemID is null)
-		and EE.ContentID is null
-END
-Go
-
-	IF (@@Error = 0) PRINT 'Procedure Creation: [vesp_ListUnlinkedItems] Succeeded'
-	ELSE PRINT 'Procedure Creation: [vesp_ListUnlinkedItems] Error on Creation'
-	GO
 -----------------------------------------------------------------------------
 /*
   ---------------------------------------------------------------------------
@@ -22260,8 +22184,8 @@ BEGIN TRY -- Try Block
 	DECLARE @RevDate varchar(255)
 	DECLARE @RevDescription varchar(255)
 
-	set @RevDate = '03/27/2024 11:00 AM'
-	set @RevDescription = 'B2024-018: Enhanced link issue with sub-sections in source but not in enhanced'
+	set @RevDate = '10/03/2023 11:00 AM'
+	set @RevDescription = 'C2023-017: Added logic to filter the format list when selecting a format to be applied to a section'
 
 	Select  cast(@RevDate as datetime) RevDate, @RevDescription  RevDescription
 	PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription

PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs.bak

@@ -0,0 +1,92 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("PROMS")]
+[assembly: AssemblyDescription("Create, Edit, and Maintain Procedures Sets.")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Volian Enterprises, Inc.")]
+[assembly: AssemblyProduct("PROMS")]
+[assembly: AssemblyCopyright("Copyright © 2012. All Rights Reserved.")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("2ffeb031-bf85-4153-baa2-2d4da2fd5556")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build YYMM (two digit year, two digit month)
+//      Revision DHH (day - no leading zero, two digit hour - military time
+//
+[assembly: AssemblyVersion("11.6.1205.316")]
+[assembly: AssemblyFileVersion("11.6.1205.316")]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

PROMS/VEPROMS User Interface/VEPROMS.gclicx

@@ -1,2 +0,0 @@
-da3d5d14-691f-4908-aa3c-fd3239734232;-8584908724854775808;VkVQUk9NUy5leGU=;ZGEzZDVkMTQtNjkxZi00OTA4LWFhM2MtZmQzMjM5NzM0MjMy,MjQyNzYxODZYWFhYWFhYWDAzNg,Sk9ITi1XSU4xMA,RmFsc2U,ODg0Mw,RmFsc2U,MA,MA,djIwMjQuMQ,,;PxeAWRi6mhDqvUMfJhk9Tniu/8ZnOLQv64hLh05xWM+MPyBs3yYfs3vEn5TLW779QNr1k8F6tV3gOAoLG+JSPZoG3NXmdTe6LJya05W+zWyb0H+jj2ReXN2dNR9fbZNDd3ClAeuzNpsM0pw62aYpOe2Tp6fx9gOFx1/0g8g4/8g
-da3d5d14-691f-4908-aa3c-fd3239734232;-8584865524854775808;VkVQUk9NUy5leGU=;ZGEzZDVkMTQtNjkxZi00OTA4LWFhM2MtZmQzMjM5NzM0MjMy,NjE5MDczODdYWFhYWFhYWDA1Mw,Q0hSSVM,RmFsc2U,ODg5NA,RmFsc2U,MA,MA,djIwMjQuMQ,,;luo/kWHt4XRAYR+3s8m8QoRagBcvXLv0mHvCYU2VCIeACFord4tdtTGmSUvmGhEmUiAd7YvaTlDlFrlni6CWaVlxa1mdbWuWsNVUkRnyJZ8kOAt1A+3SGfHecCsqotTW7apXjwW5qXLZ/fcgutioe7xaXgniFQysshTdUWt26T8

PROMS/VEPROMS User Interface/VEPROMS_UI.csproj

@@ -19,7 +19,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
@@ -99,7 +99,12 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL" />
+    <Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="C1.Win.C1SpellChecker.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
     <Reference Include="Csla">
       <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
     </Reference>
@@ -134,7 +139,6 @@
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
-    <Reference Include="UIAutomationProvider" />
     <Reference Include="VEPROMS.CSLA.Library, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\VEPROMS.CSLA.Library\bin\Debug\VEPROMS.CSLA.Library.dll</HintPath>
@@ -423,7 +427,6 @@
     <Compile Include="VlnWeb.Designer.cs">
       <DependentUpon>VlnWeb.cs</DependentUpon>
     </Compile>
-    <EmbeddedResource Include="VEPROMS.gclicx" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources\Separator.png" />

PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.Designer.cs

@@ -57,7 +57,7 @@
 			this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
 			this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.btnCancel.Location = new System.Drawing.Point(179, 111);
+			this.btnCancel.Location = new System.Drawing.Point(165, 111);
 			this.btnCancel.Name = "btnCancel";
 			this.btnCancel.Size = new System.Drawing.Size(64, 23);
 			this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -88,7 +88,7 @@
 			this.dateTimeInput1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.dateTimeInput1.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown;
 			this.dateTimeInput1.ButtonDropDown.Visible = true;
-			this.dateTimeInput1.CustomFormat = "MM/dd/yyyy HH:mm:ss";
+			this.dateTimeInput1.CustomFormat = "MM/dd/yyyy";
 			this.dateTimeInput1.DateTimeSelectorVisibility = DevComponents.Editors.DateTimeAdv.eDateTimeSelectorVisibility.DateSelector;
 			this.dateTimeInput1.Format = DevComponents.Editors.eDateTimePickerFormat.Custom;
 			this.dateTimeInput1.IsPopupCalendarOpen = false;
@@ -122,7 +122,7 @@
 			this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.dateTimeInput1.MonthCalendar.TodayButtonVisible = true;
 			this.dateTimeInput1.Name = "dateTimeInput1";
-			this.dateTimeInput1.Size = new System.Drawing.Size(146, 20);
+			this.dateTimeInput1.Size = new System.Drawing.Size(113, 20);
 			this.dateTimeInput1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.dateTimeInput1, new DevComponents.DotNetBar.SuperTooltipInfo("Change Bar Start Date", "", "Only the changes made after this date will have change bars.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(138, 67)));
 			this.dateTimeInput1.TabIndex = 4;
@@ -133,7 +133,7 @@
 			// 
 			this.btnNow.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
 			this.btnNow.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnNow.Location = new System.Drawing.Point(182, 51);
+			this.btnNow.Location = new System.Drawing.Point(149, 51);
 			this.btnNow.Name = "btnNow";
 			this.btnNow.Size = new System.Drawing.Size(49, 23);
 			this.btnNow.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -146,7 +146,7 @@
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(268, 144);
+			this.ClientSize = new System.Drawing.Size(241, 144);
 			this.Controls.Add(this.btnNow);
 			this.Controls.Add(this.dateTimeInput1);
 			this.Controls.Add(this.label1);

PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.cs

@@ -32,46 +32,13 @@ namespace VEPROMS
 		{
 			string cbdt = MyProcConfig.Print_ChangeBarDate;
 			string[] tmp = cbdt.Split(' ');
-
-			if (tmp[0] == null || tmp[0] == "")  // First time date set.
-			{
-				cbdt = DateTime.Now.ToString("MM/dd/yyyy") + " " + DateTime.Now.ToString("HH:mm:ss");
-				dateTimeInput1.Value = DateTime.Parse(cbdt);
-				return;
-			}
-			else
-			{
-				DateTime tmpdt = DateTime.Parse(cbdt);
-				if (tmpdt.Date == DateTime.Today) // Date has before been set.
-				{
-					TimeSpan start = TimeSpan.Parse("00:00:00");
-
-					var time = tmpdt.TimeOfDay;
-					if (start < time) // If time is greater than 12:00:00 AM
-					{
-						cbdt = DateTime.Now.ToString("MM/dd/yyyy") + " " + tmpdt.TimeOfDay.ToString();
-						dateTimeInput1.Value = DateTime.Parse(cbdt);
-						return;
-					}
-					else // if time is 12:00:00 AM
-					{
-						cbdt = DateTime.Now.ToString("MM/dd/yyyy") + " " + " 00:00:00";
-						dateTimeInput1.Value = DateTime.Parse(cbdt);
-						return;
-					}
-				}
-				else
-				{
-					cbdt = tmpdt.ToString();
-					dateTimeInput1.Value = DateTime.Parse(cbdt);
-					return;
-				}
-			}
+			cbdt = tmp[0] + " 00:00:00";
+			dateTimeInput1.Value = (cbdt == null || cbdt == "") ? DateTime.Now : DateTime.Parse(cbdt);
 		}
 
 		private void btnOK_Click(object sender, EventArgs e)
 		{
-			MyProcConfig.Print_ChangeBarDate = dateTimeInput1.Value.ToString("MM/dd/yyyy HH:mm:ss");// ("MM/dd/yyyy HH:mm:ss");
+			MyProcConfig.Print_ChangeBarDate = dateTimeInput1.Value.ToString("MM/dd/yyyy 00:00:00");// ("MM/dd/yyyy HH:mm:ss");
 		}
 
 

PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.resx

@@ -112,12 +112,12 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
 </root>

PROMS/VEPROMS User Interface/frmPDFStatusForm.cs

@@ -91,13 +91,15 @@ namespace VEPROMS
 			get { return _DidAll; }
 			set { _DidAll = value; }
 		}
-		private int _prtSectID = -1;
-		public int PrtSectID
+		// C2024-003 parameter contains parent section itemid, child section itemid, issubsection flag.
+		// C2024-003 values needed to print section.
+		private int[] _prtSectID = new int[] { -1, -1, 0 };
+		public int[] PrtSectID
 		{
 			get { return _prtSectID; }
 			set { _prtSectID = value; }
 		}
-		public frmPDFStatusForm(ItemInfo myItem, string rev, string watermark, bool debugOutput, bool origPgBrk, bool openPDF, bool overWrite, string pdfPath, ChangeBarDefinition cbd, string pdfFile, Point newLocation, bool insertBlankPages, bool allOrAuto, string prefix, bool saveLinks, int removeTrailingHardReturnsAndManualPageBreaks, bool showPROMSVer, bool didAll, string blankPageText, MergedPdf mergedPdf, string watermarkColor, int PrtSectID = -1)
+		public frmPDFStatusForm(ItemInfo myItem, string rev, string watermark, bool debugOutput, bool origPgBrk, bool openPDF, bool overWrite, string pdfPath, ChangeBarDefinition cbd, string pdfFile, Point newLocation, bool insertBlankPages, bool allOrAuto, string prefix, bool saveLinks, int removeTrailingHardReturnsAndManualPageBreaks, bool showPROMSVer, bool didAll, string blankPageText, MergedPdf mergedPdf, string watermarkColor, int[] PrtSectID = null)
 		{
 			// B2021-088 moved this if/else from CreatePDF() so that the Approval logic will have access to this logic
 			ProcedureInfo MyProcedure = myItem as ProcedureInfo;
@@ -107,7 +109,7 @@ namespace VEPROMS
 			if (MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave > 0 || MyProcedure.ActiveFormat.PlantFormat.FormatData.TransData.UseTransitionModifier || MyProcedure.ActiveFormat.PlantFormat.FormatData.TransData.UseSpecificTransitionModifier)
 			{
 				// B2023-035 Pass in the select child (selectedSlave) which may be different than docversionconfig's SelectedSlave
-				MyProcedure = ProcedureInfo.GetItemAndChildrenByUnit(MyProcedure.ItemID, 0,		    MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave, allOrAuto, MyProcedure.SelectedChildToPrint);
+				MyProcedure = ProcedureInfo.GetItemAndChildrenByUnit(MyProcedure.ItemID, 0, MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave, allOrAuto, MyProcedure.SelectedChildToPrint);
 			}
 			else
 				MyProcedure = ProcedureInfo.GetItemAndChildren(MyProcedure.ItemID, allOrAuto);
@@ -129,11 +131,11 @@ namespace VEPROMS
 			// if the version number of PROMS is 1.0, then we are running a Demo version.
 			// When running a Demo version, force a "Sample" watermark when printing.
 			// B2020-022 append a ".pdf" extension if the file name does on have one.
-			MyPromsPrinter = new PromsPrinter(myItem, rev, (VlnSettings.ReleaseMode.Equals("DEMO")) ? "Sample" : watermark, debugOutput, origPgBrk, pdfPath + @"\Compare", false, overWrite, cbd, (pdfFile.ToUpper().EndsWith(".PDF"))?pdfFile:pdfFile+".pdf", insertBlankPages, allOrAuto,Prefix,saveLinks,removeTrailingHardReturnsAndManualPageBreaks, blankPageText, DidAll, mergedPdf, watermarkColor);
-			
+			MyPromsPrinter = new PromsPrinter(myItem, rev, (VlnSettings.ReleaseMode.Equals("DEMO")) ? "Sample" : watermark, debugOutput, origPgBrk, pdfPath + @"\Compare", false, overWrite, cbd, (pdfFile.ToUpper().EndsWith(".PDF")) ? pdfFile : pdfFile + ".pdf", insertBlankPages, allOrAuto, Prefix, saveLinks, removeTrailingHardReturnsAndManualPageBreaks, blankPageText, DidAll, mergedPdf, watermarkColor);
+
 			MyPromsPrinter.PromsVersion = (showPROMSVer) ? AboutVEPROMS.PROMSVersion : ""; //C2018-009 print PROMS version
-			
-			
+
+
 			PDFPath = pdfPath;
 			this.Text = "Creating PDF of " + myItem.DisplayNumber;
 			_NewLocation = newLocation;
@@ -296,8 +298,8 @@ namespace VEPROMS
 
 			}
 			while (!MyPromsPrinter.MergeNotIncluded && _PdfFile == null && MessageBox.Show("Try Again?", "PDF Creation Failed", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes);
-			
-			
+
+
 			if (_PdfFile == null)
 			{
 				this.Close();
@@ -318,7 +320,7 @@ namespace VEPROMS
 			DateTime tEnd = DateTime.Now;
 			MyStatus = _PdfFile + " created.";
 			MyStatus = string.Format("{0} created in {1:0.} milliseconds", _PdfFile, (TimeSpan.FromTicks(tEnd.Ticks - tStart.Ticks).TotalMilliseconds));
-			
+
 			if (OpenPDF)
 			{
 				OpenPDFandPlacekeeper(_PdfFile);
@@ -332,8 +334,8 @@ namespace VEPROMS
 					if (UserInfo.CanEdit(frmVEPROMS.SMyUserInfo, MyPromsPrinter.MyItem.MyDocVersion))
 					{
 						// C2023-018: Clarify message on temporary/permanent removal of returns/spaces & page breaks
-						if (FlexibleMessageBox.Show(this, "The procedure PDF file was created by temporarily removing certain hard returns,\r\ntrailing spaces, and/or manual page breaks that could affect the pagination\r\n"+
-							"of the procedure.\r\n\r\nAfter reviewing the PDF file, do you want to permanently remove the deleted hard returns, \r\nspaces and/or manual page breaks?\r\n\r\n"+
+						if (FlexibleMessageBox.Show(this, "The procedure PDF file was created by temporarily removing certain hard returns,\r\ntrailing spaces, and/or manual page breaks that could affect the pagination\r\n" +
+							"of the procedure.\r\n\r\nAfter reviewing the PDF file, do you want to permanently remove the deleted hard returns, \r\nspaces and/or manual page breaks?\r\n\r\n" +
 							"An annotation will be added to every location where data has been deleted.  The locations \r\ncan be found by performing a Global Search for the \"Manual Pagination Issues\" annotation type.",
 							"Confirm Pagination Changes", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
 						{
@@ -345,7 +347,7 @@ namespace VEPROMS
 			}
 
 			btnOpenFolder.Visible = btnOpenPDF.Visible = true;
-			
+
 			if (CloseWhenDone)
 			{
 				OpenPDFandPlacekeeper(null);
@@ -422,7 +424,7 @@ namespace VEPROMS
 			}
 			catch (Exception ex)
 			{
-				string str = string.Format("{0} - {1} - {2}",pdffile,ex.GetType().Name,ex.Message);
+				string str = string.Format("{0} - {1} - {2}", pdffile, ex.GetType().Name, ex.Message);
 				MessageBox.Show(str, "Error Opening PDFFile", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
 			}
 		}

PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs

@@ -68,7 +68,6 @@ namespace VEPROMS
 			this.cbScrunch = new System.Windows.Forms.CheckBox();
 			this.btnNext = new System.Windows.Forms.Button();
 			this.cmbFont = new System.Windows.Forms.ComboBox();
-			this.lblDummy = new System.Windows.Forms.Label();
 			this.labelItem10 = new DevComponents.DotNetBar.LabelItem();
 			this.bottomProgBar = new DevComponents.DotNetBar.ProgressBarItem();
 			this.labelItem9 = new DevComponents.DotNetBar.LabelItem();
@@ -515,7 +514,6 @@ namespace VEPROMS
 			this.bottomBar.Controls.Add(this.cbScrunch);
 			this.bottomBar.Controls.Add(this.btnNext);
 			this.bottomBar.Controls.Add(this.cmbFont);
-			this.bottomBar.Controls.Add(this.lblDummy);
 			this.bottomBar.Dock = System.Windows.Forms.DockStyle.Bottom;
 			this.bottomBar.Font = new System.Drawing.Font("Segoe UI", 9F);
 			this.bottomBar.IsMaximized = false;
@@ -603,15 +601,6 @@ namespace VEPROMS
 			this.cmbFont.TabIndex = 0;
 			this.cmbFont.SelectedIndexChanged += new System.EventHandler(this.cmbFont_SelectedIndexChanged);
 			// 
-			// lblDummy
-			// 
-			this.lblDummy.Dock = System.Windows.Forms.DockStyle.Right;
-			this.lblDummy.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
-			this.lblDummy.Location = new System.Drawing.Point(1013, 0);
-			this.lblDummy.Name = "lblDummy";
-			this.lblDummy.Size = new System.Drawing.Size(10, 25);
-			this.lblDummy.Visible = false;
-			// 
 			// labelItem10
 			// 
 			this.labelItem10.BorderSide = DevComponents.DotNetBar.eBorderSide.Left;
@@ -1743,7 +1732,6 @@ namespace VEPROMS
 		private DevComponents.DotNetBar.ButtonItem btnShortCuts;
 		private DevComponents.DotNetBar.LabelItem lblItemID;
 		private System.Windows.Forms.ComboBox cmbFont;
-		private System.Windows.Forms.Label lblDummy;
 		private DevComponents.DotNetBar.LabelItem lblResolution;
 		private DevComponents.DotNetBar.LabelItem lblUser;
 		private DevComponents.DotNetBar.LabelItem lblLastChange;

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -116,7 +116,7 @@ namespace VEPROMS
 
 			//added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
 			pi.MyDocVersion.DocVersionConfig.SelectedSlave = pi.ProcedureConfig.SelectedSlave;
-			
+
 			DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi);
 
 			//added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
@@ -356,12 +356,12 @@ namespace VEPROMS
 			cmbFont.SelectedIndex = -1;
 			string[] parameters = System.Environment.CommandLine.Split(" ".ToCharArray());
 			string db = Volian.Base.Library.VlnSettings.GetDB();
-			
+
 			if (db != null)
 				Database.SelectedDatabase = db;
 
 			//B2018-129 Most Recently Used list was being cleared. Needed to remove a (string) type case in the IF statement
-			if (!string.IsNullOrEmpty((string)Properties.Settings.Default["DefaultDB"])) 
+			if (!string.IsNullOrEmpty((string)Properties.Settings.Default["DefaultDB"]))
 				Database.LastDatabase = Properties.Settings.Default.DefaultDB;
 
 			// Setup the Context menu for DisplaySearch including the symbols
@@ -400,7 +400,7 @@ namespace VEPROMS
 			// B2019-107 Error Log message for inconsistent PromsFixes
 			_MyLog.InfoFormat("\r\nSession Beginning\r\n<===={0}[SQL:{1:yyMM.ddHH}]====== User: {2}/{3} Started {4} ===============>{5}"
 				, Application.ProductVersion, Database.RevDate, Environment.UserDomainName, Environment.UserName, DateTime.Now.ToString("dddd MMMM d, yyyy h:mm:ss tt"), FormatInfo.Failed ?? "");
-			
+
 			// C2022-030 Notify the user if the stored procedure in the database are not update to date
 			//           with those in the PROMSFixes.sql delivered with the PROMS executable
 			string pfVersion = ExeInfo.GetAssocicatedPROMSFixesVersion();
@@ -418,8 +418,8 @@ namespace VEPROMS
 				sbMsg.Append("\n\nPlease have your DBA update the database with the PROMSFixes.sql script file that was\ndelivered with this PROMS executable.");
 				sbMsg.Append("\n\nThe PROMSFixes.sql file is included with the PROMS installation download.");
 				sbMsg.Append("\n\nIt can also be found in your PROMS executable folder:");
-				sbMsg.AppendFormat("\n\t{0}",ExeInfo.PROMSExecutableFolderPath());
-				FlexibleMessageBox.Show(sbMsg.ToString(),"SQL Stored Procedures Version Difference");
+				sbMsg.AppendFormat("\n\t{0}", ExeInfo.PROMSExecutableFolderPath());
+				FlexibleMessageBox.Show(sbMsg.ToString(), "SQL Stored Procedures Version Difference");
 			}
 
 			foreach (string parameter in parameters)
@@ -527,7 +527,7 @@ namespace VEPROMS
 			tv.ViewPDF += new vlnTreeViewPdfEvent(tv_ViewPDF);
 
 			displayApplicability.ApplicabilityViewModeChanged += new DisplayApplicability.DisplayApplicabilityEvent(displayApplicability_ApplicabilityViewModeChanged);
-			
+
 			tv.ExportImportProcedureSets += new vlnTreeViewEvent(tv_ExportImportProcedureSets);
 			tv.PrintTransitionReport += new vlnTreeViewEvent(tv_PrintTransitionReport);
 			tv.ProcessingComplete += tv_ProcessingComplete;
@@ -690,7 +690,7 @@ namespace VEPROMS
 				else
 				{
 					int ownerid = MySessionInfo.CheckOutItem(fi.FolderID, CheckOutType.Session);
-					
+
 					dlgExportImport dlg = new dlgExportImport(args.Index == 0 ? "Export" : "Import", fi, this, (E_UCFImportOptions)Properties.Settings.Default.UCFImportOpt);//Added frmVEPROMS Parameter
 					dlg.ShowDialog(this);
 
@@ -1139,7 +1139,7 @@ namespace VEPROMS
 
 			dvi.DocVersionConfig.SelectedSlave = 0;
 		}
-		
+
 		void tv_PrintProcedure(object sender, vlnTreeEventArgs args)
 		{
 			ProcedureInfo pi = (args.Node as VETreeNode).VEObject as ProcedureInfo;
@@ -1178,8 +1178,8 @@ namespace VEPROMS
 					pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
 				}
 			}
-            catch(Exception ex)
-            {
+			catch (Exception ex)
+			{
 				StringBuilder sb = new StringBuilder();
 
 				sb.AppendLine("Could not create PDF Print");
@@ -1197,7 +1197,21 @@ namespace VEPROMS
 			{
 				//args.Node.Parent.
 				SectionInfo si2 = (args.Node as VETreeNode).VEObject as SectionInfo;
-				int _prtSectID = si2.ItemID;
+				int[] _prtSectID = new int[3]; // C2024-003 parameter contains parent section itemid, child section itemid, issubsection flag.
+				if (si2.IsSubsection == true)
+				{
+					// If section is a subsection. Assigned values are section and subsection.
+					_prtSectID[0] = si2.MyParent.ItemID; // section
+					_prtSectID[1] = si2.ItemID;  // sub section
+					_prtSectID[2] = Convert.ToInt32(si2.IsSubsection); // IsSubSection flag
+				}
+				else
+				{
+					// If section is a regular section.  assign values is section is not a subsection.
+					_prtSectID[0] = si2.ItemID; // section
+					_prtSectID[1] = -1; // sub section
+					_prtSectID[2] = Convert.ToInt32(si2.IsSubsection); // IsSubSection flag
+				}
 
 				if (si2 == null) return;
 
@@ -1207,7 +1221,7 @@ namespace VEPROMS
 
 				using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(si2.MyProcedure))
 				{
-					prnDlg.PrtSectID = _prtSectID;
+					prnDlg.PrtSectID = _prtSectID; // Assign Section print values to parameter used in print secetions / sub sections.
 					prnDlg.SelectedSlave = args.UnitIndex;
 					prnDlg.MySessionInfo = MySessionInfo;
 					prnDlg.SetupForProcedure();  // Setup filename
@@ -1641,11 +1655,11 @@ namespace VEPROMS
 			if (!_WeAreExitingPROMS && !ClosingWithError && tc.SelectedDisplayTabItem != null && tc._MyDisplayTabItems.Count > 0)
 			{
 				// B2019-071 dialog to ask user if we are to close one tab or exit
-				DlgCloseTabsOrExit dctoe = new DlgCloseTabsOrExit(MyParent == null, PROMSWindowForms.Count > 0); 
+				DlgCloseTabsOrExit dctoe = new DlgCloseTabsOrExit(MyParent == null, PROMSWindowForms.Count > 0);
 				dctoe.ShowDialog();
 
 				// B2019-101 flag that we are exiting from PROMS main window (separate windows)
-				_WeAreExitingPROMS = (MyParent == null && dctoe.ExitPROMS); 
+				_WeAreExitingPROMS = (MyParent == null && dctoe.ExitPROMS);
 
 				if (dctoe.Cancel) // B2019-071 user decided to not close any tab and not exit PROMS - so do nothing and continue working
 				{
@@ -1667,7 +1681,7 @@ namespace VEPROMS
 						tc.CloseTabItem(tc.SelectedDisplayTabItem);
 
 						// B2019-071 close just the current tab and continue working
-						if (!dctoe.ExitPROMS) 
+						if (!dctoe.ExitPROMS)
 						{
 							n = 0;
 							e.Cancel = true;
@@ -1700,7 +1714,7 @@ namespace VEPROMS
 			}
 
 			// This keeps PROMS from Hanging under certain circumstances
-			tc.ShuttingDown = true; 
+			tc.ShuttingDown = true;
 
 			// B2019-161 When shutting down output the timing information (to the error log)
 			if (VolianTimer.TimingsOn)
@@ -1882,12 +1896,12 @@ namespace VEPROMS
 		private DevComponents.DotNetBar.ButtonItem btnUserControlOfFormatsExport;
 		private DevComponents.DotNetBar.ButtonItem btnUserControlOfFormatsImport;
 		private TabItemsToClose _MyCloseTabList = new TabItemsToClose();
-		
+
 		public TabItemsToClose MyCloseTabList
 		{
 			get { return _MyCloseTabList; }
 		}
-		
+
 		private bool _DisablePing = false;
 		public bool DisablePing
 		{
@@ -1997,7 +2011,7 @@ namespace VEPROMS
 						if (ContentInfo.IsInCache(id))
 						{
 							ContentInfo ci = ContentInfo.Get(id);
-									
+
 							if (MySessionInfo.LastContentChange >= ci.LastChangedInt64)
 							{
 								using (Content c = Content.Get(id))
@@ -2021,7 +2035,7 @@ namespace VEPROMS
 				}
 			}
 			catch { }
-			
+
 			//MySemaphore.Release();
 			//_MyLog.DebugFormat("{0},{1:X},{2:X},{3:X}", DateTime.Now.ToLongTimeString(), lastChanged,  MySessionInfo.LastContentChange, MySessionInfo.LastChangedInt64);
 		}
@@ -2092,7 +2106,7 @@ namespace VEPROMS
 			btnResetSecurity = new ButtonItem("btnResetSecurity", "Reset Security");
 			btnSecurity.SubItems.Add(btnResetSecurity);
 			btnResetSecurity.Click += new EventHandler(btnResetSecurity_Click);
-			
+
 			//batch refresh transitions
 			btnAdministrativeTools = new ButtonItem("btnAdministrativeTools", "Administrative Tools");
 			btnAdministrativeTools.Click += new EventHandler(btnAdministrativeTools_Click);
@@ -2106,7 +2120,7 @@ namespace VEPROMS
 			this.superTooltip1.SetSuperTooltip(btnResetSecurity, new SuperTooltipInfo("Reset Security", null, null, null, null, eTooltipColor.Gray));
 			this.superTooltip1.SetSuperTooltip(btnAdministrativeTools, new SuperTooltipInfo("Administrative Tools", null, null, null, null, eTooltipColor.Gray));
 			this.superTooltip1.SetSuperTooltip(btnUpdateFormats, new SuperTooltipInfo("Update Formats", null, null, null, null, eTooltipColor.Gray));
-			
+
 			try
 			{
 				MyUserInfo = UserInfo.GetByUserID(VlnSettings.UserID);
@@ -2153,7 +2167,7 @@ namespace VEPROMS
 			btnFormats.Visible = isVisible;
 			btnSecurity.Visible = isVisible;
 			btnAdmin.Enabled = (isVisible || HasSetAdministrator(MyUserInfo));
-			
+
 			tmrCloseTabItems = new Timer();
 			tmrCloseTabItems.Interval = 100;
 			tmrCloseTabItems.Tick += new EventHandler(tmrCloseTabItems_Tick);
@@ -2161,7 +2175,7 @@ namespace VEPROMS
 
 			CloseSessionsNoLongerActive();
 			MySessionInfo = SessionInfo.BeginSession(Environment.MachineName, System.Diagnostics.Process.GetCurrentProcess().Id);
-			
+
 			if (MySessionInfo == null)
 			{
 				MessageBox.Show("This database is locked by the Administrator.  Please try again later", "PROMS is Locked");
@@ -2205,7 +2219,7 @@ namespace VEPROMS
 			if (Settings.Default["Size"] != null) this.Size = Settings.Default.Size;
 			//if (Settings.Default["WindowState"] != null) this.WindowState = Settings.Default.WindowState;
 			//if (Settings.Default.SaveTreeviewExpanded) epProcedures.Expanded = Settings.Default.TreeviewExpanded;
-			
+
 			// if the Procedures panel was left open from the last session, then open it
 			epProcedures.Expanded = Settings.Default.TreeviewExpanded;
 			if (Settings.Default["QATItems"] != null) ribbonControl1.QatLayout = Settings.Default.QATItems;
@@ -2377,7 +2391,7 @@ namespace VEPROMS
 				TurnChangeManagerOn.Execute();
 			}
 		}
-		
+
 		// C2015-022 Separate Windows. This is a dictionary of child PROMS windows forms (frmVEPROMS)
 		// 
 		Dictionary<int, frmVEPROMS> _PROMSWindowForms = null;
@@ -2425,7 +2439,7 @@ namespace VEPROMS
 				while (!(_tn.VEObject is FolderInfo))
 				{
 					// back up to the first folder tree node
-					_tn = (VETreeNode)_tn.Parent; 
+					_tn = (VETreeNode)_tn.Parent;
 				}
 
 				_tn.Nodes.Clear(); // remove the child nodes from main window - child window now has this part of the procedure tree
@@ -2522,7 +2536,7 @@ namespace VEPROMS
 			}
 
 			DialogResult dr = System.Windows.Forms.DialogResult.Yes;
-			
+
 			// RHM20150507 Table Scrunch
 			Rtf2Pdf.AllowTableScrunching = cbScrunch.Checked ? _DefaultScrunchingRules : TableScrunching.None;
 
@@ -2754,7 +2768,7 @@ namespace VEPROMS
 			tmrCloseTabItems.Enabled = false;
 
 			_TimeActivity1.Open();
-			
+
 			while (MyCloseTabList.CountDTI > 0)
 			{
 				DisplayTabItem dti = MyCloseTabList.PopDTI();
@@ -3202,14 +3216,6 @@ namespace VEPROMS
 				txtSearch.Visible = false;
 				lblLastChange.Visible = false;
 				btnStepRTF.Visible = false;
-				lblDummy.Visible = false;
-			}
-			else
-			{
-				// C2024-007: On Proms main form, allow for control of whether the FontMenu
-				//	combo box is displayed.  Only done when running in debugmode
-				cmbFont.Visible = Volian.Base.Library.VlnSettings.GetCommandFlag("FontMenu");
-				lblDummy.Visible = !Volian.Base.Library.VlnSettings.GetCommandFlag("FontMenu");
 			}
 		}
 
@@ -3874,7 +3880,7 @@ namespace VEPROMS
 		{
 			infoPanel.Expanded = true;
 			infoTabs.SelectedTab = infotabRO;
-			
+
 			displayRO.ProgressBar = bottomProgBar;
 
 			displayRO.MyRTB = (SelectedStepTabPanel == null) ? null :
@@ -4033,7 +4039,7 @@ namespace VEPROMS
 
 				// need this to update RO Tree after UpdateRofst (B2015-226)
 				// B2022-026 RO Memory reduction coding (Jakes Merge)
-				displayRO.MyROFST = SelectedROFst;      
+				displayRO.MyROFST = SelectedROFst;
 				displayRO.LoadTree();
 
 				// resetting the MyROFSTLookup for the search & reports panels will refresh the RO trees after UpdateRofst in each of those panels (B2015-226)
@@ -4076,7 +4082,7 @@ namespace VEPROMS
 
 			SetCaption(tv.SelectedNode as VETreeNode);
 			displayApplicability.MyDisplayTabItem = tc.SelectedDisplayTabItem;
-			
+
 			if (tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion.DocVersionAssociationCount > 0)
 			{
 				displayRO.MyROFST = tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst;
@@ -4291,7 +4297,7 @@ namespace VEPROMS
 					// B2022-026 RO Memory reduction coding (Jakes Merge)
 					displayRO.ProgressBar = bottomProgBar;
 					displayRO.MyRTB = args.MyEditItem.MyStepRTB;
-					displayRO.LoadTree(); 
+					displayRO.LoadTree();
 
 					displayBookMarks.MyEditItem = args.MyEditItem;
 					displayHistory.MyEditItem = args.MyEditItem;
@@ -4310,7 +4316,7 @@ namespace VEPROMS
 
 					displayRO.ROTypeFilter = SelectedStepTabPanel.MyStepPanel.SelectedEditItem is Volian.Controls.Library.GridItem && (SelectedStepTabPanel.MyStepPanel.SelectedEditItem as Volian.Controls.Library.GridItem).MyFlexGrid.IsRoTable ?
 						E_ROValueType.Table : (SelectedStepTabPanel.MyStepPanel.SelectedEditItem.MyItemInfo.IsFigure) ? E_ROValueType.Image : E_ROValueType.Text;
-					
+
 					if (_LastStepRTB.IsRoTable && _LastStepRTB.MyItemInfo.MyContent.ContentRoUsageCount > 0)
 						displayRO.CurROLink = _LastStepRTB.MyItemInfo.MyContent.ContentRoUsages[0];
 
@@ -4428,7 +4434,7 @@ namespace VEPROMS
 
 			displayRO.ROTypeFilter = SelectedStepTabPanel.MyStepPanel.SelectedEditItem is Volian.Controls.Library.GridItem && (SelectedStepTabPanel.MyStepPanel.SelectedEditItem as Volian.Controls.Library.GridItem).MyFlexGrid.IsRoTable ?
 				E_ROValueType.Table : (SelectedStepTabPanel.MyStepPanel.SelectedEditItem.MyItemInfo.IsFigure) ? E_ROValueType.Image : E_ROValueType.Text;
-			
+
 			displayRO.ProgressBar = bottomProgBar;
 			displayRO.MyRTB = SelectedStepTabPanel.MyStepPanel.SelectedEditItem.MyStepRTB;
 			displayRO.CurROLink = args.MyLinkText.MyRoUsageInfo;
@@ -4454,7 +4460,7 @@ namespace VEPROMS
 			if (!tv.Focused && tc.SelectedDisplayTabItem != null && tc.SelectedDisplayTabItem.SelectedItemInfo != null)
 				tv.AdjustTree(tc.SelectedDisplayTabItem.SelectedItemInfo);
 
-      VETreeNode vtn = tv.SelectedNode as VETreeNode;
+			VETreeNode vtn = tv.SelectedNode as VETreeNode;
 			if (vtn == null) return;
 			StepInfo stpinf = vtn.VEObject as StepInfo;
 			if (stpinf == null || !stpinf.IsRNOPart) //B2017-037 is this a RNO step type element - don't allow insert before/after
@@ -4892,7 +4898,7 @@ namespace VEPROMS
 
 		private void btnUpdateFormat_Click(object sender, EventArgs e)
 		{
-            UpdateFormats(null);
+			UpdateFormats(null);
 		}
 
 		private void UpdateFormats(string mypath)
@@ -4963,7 +4969,7 @@ namespace VEPROMS
 			try
 			{
 				frmSendErrorLog frm = new frmSendErrorLog(Properties.Settings.Default.OutlookEmail, Properties.Settings.Default["SMTPServer"].ToString(), Properties.Settings.Default["SMTPUser"].ToString(), ErrorLogFileName);
-				
+
 				if (frm.ShowDialog(this) == DialogResult.OK)
 				{
 					Properties.Settings.Default.OutlookEmail = frm.OutlookEmail;

PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs

@@ -30,8 +30,8 @@ namespace VEPROMS
     {
 			this.components = new System.ComponentModel.Container();
 			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmVersionsProperties));
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
 			this.ppBtnCancel = new System.Windows.Forms.Button();
 			this.ppBtnOK = new System.Windows.Forms.Button();
 			this.ppBtnDefaultChgBar = new DevComponents.DotNetBar.ButtonX();
@@ -95,14 +95,17 @@ namespace VEPROMS
 			this.ppLblDefSettingsInfo = new System.Windows.Forms.Label();
 			this.dlgROFolder = new System.Windows.Forms.FolderBrowserDialog();
 			this.tcVersions = new DevComponents.DotNetBar.TabControl();
+			this.tcpGeneral = new DevComponents.DotNetBar.TabControlPanel();
+			this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components);
+			this.tcpRefereceObjects = new DevComponents.DotNetBar.TabControlPanel();
+			this.ppBtnRoToSql = new System.Windows.Forms.Button();
+			this.tbRoDb = new System.Windows.Forms.TextBox();
+			this.ppBtnRoDbBrowse = new System.Windows.Forms.Button();
+			this.btnRoDbProperties = new DevComponents.DotNetBar.ButtonX();
+			this.cmbRoDb = new System.Windows.Forms.ComboBox();
+			this.ppGpbxUpROvals = new DevComponents.DotNetBar.Controls.GroupPanel();
+			this.tiRefObjs = new DevComponents.DotNetBar.TabItem(this.components);
 			this.tabControlPanel2 = new DevComponents.DotNetBar.TabControlPanel();
-			this.gpxMOSLandLocation = new DevComponents.DotNetBar.Controls.GroupPanel();
-			this.ppCmbxMOSLandcornerLoc = new DevComponents.DotNetBar.Controls.ComboBoxEx();
-			this.tbxMOSLandyloc = new DevComponents.DotNetBar.Controls.TextBoxX();
-			this.tbxMOSLandxloc = new DevComponents.DotNetBar.Controls.TextBoxX();
-			this.lblMOSLandcorner = new System.Windows.Forms.Label();
-			this.lblMOSLandyloc = new System.Windows.Forms.Label();
-			this.lblMOSLandxloc = new System.Windows.Forms.Label();
 			this.ppChbxMOSview = new DevComponents.DotNetBar.Controls.CheckBoxX();
 			this.gpxMOSLocation = new DevComponents.DotNetBar.Controls.GroupPanel();
 			this.ppCmbxMOScornerLoc = new DevComponents.DotNetBar.Controls.ComboBoxEx();
@@ -121,16 +124,6 @@ namespace VEPROMS
 			this.ppCmbxMOSformat = new DevComponents.DotNetBar.Controls.ComboBoxEx();
 			this.lblMOSformat = new System.Windows.Forms.Label();
 			this.tiMergedOutputSettings = new DevComponents.DotNetBar.TabItem(this.components);
-			this.tcpGeneral = new DevComponents.DotNetBar.TabControlPanel();
-			this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components);
-			this.tcpRefereceObjects = new DevComponents.DotNetBar.TabControlPanel();
-			this.ppBtnRoToSql = new System.Windows.Forms.Button();
-			this.tbRoDb = new System.Windows.Forms.TextBox();
-			this.ppBtnRoDbBrowse = new System.Windows.Forms.Button();
-			this.btnRoDbProperties = new DevComponents.DotNetBar.ButtonX();
-			this.cmbRoDb = new System.Windows.Forms.ComboBox();
-			this.ppGpbxUpROvals = new DevComponents.DotNetBar.Controls.GroupPanel();
-			this.tiRefObjs = new DevComponents.DotNetBar.TabItem(this.components);
 			this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel();
 			this.ppChbxEnhancedAllowMods = new System.Windows.Forms.CheckBox();
 			this.btnUnlinkDocVersion = new System.Windows.Forms.Button();
@@ -217,19 +210,25 @@ namespace VEPROMS
 			this.ROPrefixBindingSource = new System.Windows.Forms.BindingSource(this.components);
 			this.PDFLocationBrowserDialog = new System.Windows.Forms.FolderBrowserDialog();
 			this.formatInfoListBindingSource = new System.Windows.Forms.BindingSource(this.components);
+			this.gpxMOSLandLocation = new DevComponents.DotNetBar.Controls.GroupPanel();
+			this.ppCmbxMOSLandcornerLoc = new DevComponents.DotNetBar.Controls.ComboBoxEx();
+			this.tbxMOSLandyloc = new DevComponents.DotNetBar.Controls.TextBoxX();
+			this.tbxMOSLandxloc = new DevComponents.DotNetBar.Controls.TextBoxX();
+			this.lblMOSLandcorner = new System.Windows.Forms.Label();
+			this.lblMOSLandyloc = new System.Windows.Forms.Label();
+			this.lblMOSLandxloc = new System.Windows.Forms.Label();
 			((System.ComponentModel.ISupportInitialize)(this.docVersionConfigBindingSource)).BeginInit();
 			((System.ComponentModel.ISupportInitialize)(this.imageCodecInfoBindingSource)).BeginInit();
 			this.ppGpbxUserSpecCB.SuspendLayout();
 			this.ppGpbxUserSpecTxt.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.tcVersions)).BeginInit();
 			this.tcVersions.SuspendLayout();
-			this.tabControlPanel2.SuspendLayout();
-			this.gpxMOSLandLocation.SuspendLayout();
-			this.gpxMOSLocation.SuspendLayout();
-			this.gpxMOSfont.SuspendLayout();
 			this.tcpGeneral.SuspendLayout();
 			this.tcpRefereceObjects.SuspendLayout();
 			this.ppGpbxUpROvals.SuspendLayout();
+			this.tabControlPanel2.SuspendLayout();
+			this.gpxMOSLocation.SuspendLayout();
+			this.gpxMOSfont.SuspendLayout();
 			this.tabControlPanel1.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.bsMiniEnhanced)).BeginInit();
 			((System.ComponentModel.ISupportInitialize)(this.bsEnhanced)).BeginInit();
@@ -248,6 +247,7 @@ namespace VEPROMS
 			this.panVerBtns.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.ROPrefixBindingSource)).BeginInit();
 			((System.ComponentModel.ISupportInitialize)(this.formatInfoListBindingSource)).BeginInit();
+			this.gpxMOSLandLocation.SuspendLayout();
 			this.SuspendLayout();
 			// 
 			// ppBtnCancel
@@ -1102,9 +1102,9 @@ namespace VEPROMS
 			this.tcVersions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
 			this.tcVersions.BackColor = System.Drawing.Color.Transparent;
 			this.tcVersions.CanReorderTabs = true;
-			this.tcVersions.Controls.Add(this.tcpRefereceObjects);
-			this.tcVersions.Controls.Add(this.tcpGeneral);
 			this.tcVersions.Controls.Add(this.tabControlPanel2);
+			this.tcVersions.Controls.Add(this.tcpGeneral);
+			this.tcVersions.Controls.Add(this.tcpRefereceObjects);
 			this.tcVersions.Controls.Add(this.tabControlPanel1);
 			this.tcVersions.Controls.Add(this.tcpApplicability);
 			this.tcVersions.Controls.Add(this.tabControlPanel5);
@@ -1130,6 +1130,173 @@ namespace VEPROMS
 			this.tcVersions.TabsVisible = false;
 			this.tcVersions.Text = "tabControl1";
 			// 
+			// tcpGeneral
+			// 
+			this.tcpGeneral.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+			this.tcpGeneral.Controls.Add(this.ppCmbxProcSetType);
+			this.tcpGeneral.Controls.Add(this.ppRTxtName);
+			this.tcpGeneral.Controls.Add(this.label9);
+			this.tcpGeneral.Controls.Add(this.ppRTxtProcSetRev);
+			this.tcpGeneral.Controls.Add(this.lblProcSetRev);
+			this.tcpGeneral.Controls.Add(this.label4);
+			this.tcpGeneral.Controls.Add(this.label3);
+			this.tcpGeneral.Controls.Add(this.ppRTxtTitle);
+			this.tcpGeneral.Controls.Add(this.ppTxtBxUserID);
+			this.tcpGeneral.Controls.Add(this.ppDTPicker);
+			this.tcpGeneral.Controls.Add(this.label2);
+			this.tcpGeneral.Controls.Add(this.label1);
+			this.tcpGeneral.DisabledBackColor = System.Drawing.Color.Empty;
+			this.tcpGeneral.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.tcpGeneral.Location = new System.Drawing.Point(0, 22);
+			this.tcpGeneral.Margin = new System.Windows.Forms.Padding(2);
+			this.tcpGeneral.Name = "tcpGeneral";
+			this.tcpGeneral.Padding = new System.Windows.Forms.Padding(2);
+			this.tcpGeneral.Size = new System.Drawing.Size(625, 311);
+			this.tcpGeneral.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
+			this.tcpGeneral.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
+			this.tcpGeneral.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+			this.tcpGeneral.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
+			this.tcpGeneral.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
+            | DevComponents.DotNetBar.eBorderSide.Bottom)));
+			this.tcpGeneral.Style.GradientAngle = 90;
+			this.tcpGeneral.TabIndex = 1;
+			this.tcpGeneral.TabItem = this.tiGeneral;
+			// 
+			// tiGeneral
+			// 
+			this.tiGeneral.AttachedControl = this.tcpGeneral;
+			this.tiGeneral.Name = "tiGeneral";
+			this.tiGeneral.Text = "General";
+			// 
+			// tcpRefereceObjects
+			// 
+			this.tcpRefereceObjects.Controls.Add(this.ppBtnRoToSql);
+			this.tcpRefereceObjects.Controls.Add(this.tbRoDb);
+			this.tcpRefereceObjects.Controls.Add(this.ppBtnRoDbBrowse);
+			this.tcpRefereceObjects.Controls.Add(this.btnRoDbProperties);
+			this.tcpRefereceObjects.Controls.Add(this.cmbRoDb);
+			this.tcpRefereceObjects.Controls.Add(this.ppGpbxUpROvals);
+			this.tcpRefereceObjects.Controls.Add(this.label6);
+			this.tcpRefereceObjects.DisabledBackColor = System.Drawing.Color.Empty;
+			this.tcpRefereceObjects.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.tcpRefereceObjects.Location = new System.Drawing.Point(0, 22);
+			this.tcpRefereceObjects.Margin = new System.Windows.Forms.Padding(2);
+			this.tcpRefereceObjects.Name = "tcpRefereceObjects";
+			this.tcpRefereceObjects.Padding = new System.Windows.Forms.Padding(2);
+			this.tcpRefereceObjects.Size = new System.Drawing.Size(625, 311);
+			this.tcpRefereceObjects.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
+			this.tcpRefereceObjects.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
+			this.tcpRefereceObjects.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+			this.tcpRefereceObjects.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
+			this.tcpRefereceObjects.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
+            | DevComponents.DotNetBar.eBorderSide.Bottom)));
+			this.tcpRefereceObjects.Style.GradientAngle = 90;
+			this.tcpRefereceObjects.TabIndex = 2;
+			this.tcpRefereceObjects.TabItem = this.tiRefObjs;
+			this.tcpRefereceObjects.Enter += new System.EventHandler(this.tabpage_Enter);
+			// 
+			// ppBtnRoToSql
+			// 
+			this.ppBtnRoToSql.Location = new System.Drawing.Point(337, 146);
+			this.ppBtnRoToSql.Name = "ppBtnRoToSql";
+			this.ppBtnRoToSql.Size = new System.Drawing.Size(163, 46);
+			this.ppBtnRoToSql.TabIndex = 48;
+			this.ppBtnRoToSql.Text = "Migrate Data to Sql";
+			this.ppBtnRoToSql.UseVisualStyleBackColor = true;
+			this.ppBtnRoToSql.Visible = false;
+			this.ppBtnRoToSql.Click += new System.EventHandler(this.ppBtnRoToSql_Click);
+			// 
+			// tbRoDb
+			// 
+			this.tbRoDb.Enabled = false;
+			this.tbRoDb.Location = new System.Drawing.Point(80, 13);
+			this.tbRoDb.Margin = new System.Windows.Forms.Padding(2);
+			this.tbRoDb.Name = "tbRoDb";
+			this.tbRoDb.Size = new System.Drawing.Size(318, 20);
+			this.tbRoDb.TabIndex = 20;
+			// 
+			// ppBtnRoDbBrowse
+			// 
+			this.ppBtnRoDbBrowse.Location = new System.Drawing.Point(406, 34);
+			this.ppBtnRoDbBrowse.Margin = new System.Windows.Forms.Padding(2);
+			this.ppBtnRoDbBrowse.Name = "ppBtnRoDbBrowse";
+			this.ppBtnRoDbBrowse.Size = new System.Drawing.Size(51, 20);
+			this.ppBtnRoDbBrowse.TabIndex = 22;
+			this.ppBtnRoDbBrowse.Text = "Browse...";
+			this.ppBtnRoDbBrowse.UseVisualStyleBackColor = true;
+			this.ppBtnRoDbBrowse.Click += new System.EventHandler(this.ppBtnRoDbBrowse_Click);
+			// 
+			// btnRoDbProperties
+			// 
+			this.btnRoDbProperties.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+			this.btnRoDbProperties.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+			this.btnRoDbProperties.Image = ((System.Drawing.Image)(resources.GetObject("btnRoDbProperties.Image")));
+			this.btnRoDbProperties.Location = new System.Drawing.Point(406, 10);
+			this.btnRoDbProperties.Margin = new System.Windows.Forms.Padding(2);
+			this.btnRoDbProperties.Name = "btnRoDbProperties";
+			this.btnRoDbProperties.Size = new System.Drawing.Size(33, 23);
+			this.btnRoDbProperties.TabIndex = 21;
+			this.btnRoDbProperties.Click += new System.EventHandler(this.btnRoDbProperties_Click);
+			// 
+			// cmbRoDb
+			// 
+			this.cmbRoDb.FormattingEnabled = true;
+			this.cmbRoDb.Location = new System.Drawing.Point(80, 13);
+			this.cmbRoDb.Margin = new System.Windows.Forms.Padding(2);
+			this.cmbRoDb.Name = "cmbRoDb";
+			this.cmbRoDb.Size = new System.Drawing.Size(318, 21);
+			this.cmbRoDb.TabIndex = 47;
+			this.cmbRoDb.SelectedIndexChanged += new System.EventHandler(this.cmbRoDb_SelectedIndexChanged);
+			// 
+			// ppGpbxUpROvals
+			// 
+			this.ppGpbxUpROvals.BackColor = System.Drawing.Color.Transparent;
+			this.ppGpbxUpROvals.CanvasColor = System.Drawing.SystemColors.Control;
+			this.ppGpbxUpROvals.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+			this.ppGpbxUpROvals.Controls.Add(this.ppBtnResetRoVals);
+			this.ppGpbxUpROvals.Controls.Add(this.ppBtnUpRoVals);
+			this.ppGpbxUpROvals.DisabledBackColor = System.Drawing.Color.Empty;
+			this.ppGpbxUpROvals.Location = new System.Drawing.Point(34, 69);
+			this.ppGpbxUpROvals.Margin = new System.Windows.Forms.Padding(2);
+			this.ppGpbxUpROvals.Name = "ppGpbxUpROvals";
+			this.ppGpbxUpROvals.Size = new System.Drawing.Size(112, 162);
+			// 
+			// 
+			// 
+			this.ppGpbxUpROvals.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+			this.ppGpbxUpROvals.Style.BackColorGradientAngle = 90;
+			this.ppGpbxUpROvals.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+			this.ppGpbxUpROvals.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+			this.ppGpbxUpROvals.Style.BorderBottomWidth = 1;
+			this.ppGpbxUpROvals.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+			this.ppGpbxUpROvals.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
+			this.ppGpbxUpROvals.Style.BorderLeftWidth = 1;
+			this.ppGpbxUpROvals.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+			this.ppGpbxUpROvals.Style.BorderRightWidth = 1;
+			this.ppGpbxUpROvals.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+			this.ppGpbxUpROvals.Style.BorderTopWidth = 1;
+			this.ppGpbxUpROvals.Style.CornerDiameter = 4;
+			this.ppGpbxUpROvals.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+			this.ppGpbxUpROvals.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+			this.ppGpbxUpROvals.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+			this.ppGpbxUpROvals.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+			// 
+			// 
+			// 
+			this.ppGpbxUpROvals.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			// 
+			// 
+			// 
+			this.ppGpbxUpROvals.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.ppGpbxUpROvals.TabIndex = 46;
+			this.ppGpbxUpROvals.Text = "RO Values";
+			// 
+			// tiRefObjs
+			// 
+			this.tiRefObjs.AttachedControl = this.tcpRefereceObjects;
+			this.tiRefObjs.Name = "tiRefObjs";
+			this.tiRefObjs.Text = "Referenced Objects";
+			// 
 			// tabControlPanel2
 			// 
 			this.tabControlPanel2.Controls.Add(this.gpxMOSLandLocation);
@@ -1157,128 +1324,6 @@ namespace VEPROMS
 			this.tabControlPanel2.TabIndex = 30;
 			this.tabControlPanel2.TabItem = this.tiMergedOutputSettings;
 			// 
-			// gpxMOSLandLocation
-			// 
-			this.gpxMOSLandLocation.BackColor = System.Drawing.Color.Transparent;
-			this.gpxMOSLandLocation.CanvasColor = System.Drawing.SystemColors.Control;
-			this.gpxMOSLandLocation.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-			this.gpxMOSLandLocation.Controls.Add(this.ppCmbxMOSLandcornerLoc);
-			this.gpxMOSLandLocation.Controls.Add(this.tbxMOSLandyloc);
-			this.gpxMOSLandLocation.Controls.Add(this.tbxMOSLandxloc);
-			this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandcorner);
-			this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandyloc);
-			this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandxloc);
-			this.gpxMOSLandLocation.DisabledBackColor = System.Drawing.Color.Empty;
-			this.gpxMOSLandLocation.Location = new System.Drawing.Point(284, 164);
-			this.gpxMOSLandLocation.Margin = new System.Windows.Forms.Padding(2);
-			this.gpxMOSLandLocation.Name = "gpxMOSLandLocation";
-			this.gpxMOSLandLocation.Size = new System.Drawing.Size(209, 98);
-			// 
-			// 
-			// 
-			this.gpxMOSLandLocation.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-			this.gpxMOSLandLocation.Style.BackColorGradientAngle = 90;
-			this.gpxMOSLandLocation.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-			this.gpxMOSLandLocation.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.gpxMOSLandLocation.Style.BorderBottomWidth = 1;
-			this.gpxMOSLandLocation.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-			this.gpxMOSLandLocation.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.gpxMOSLandLocation.Style.BorderLeftWidth = 1;
-			this.gpxMOSLandLocation.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.gpxMOSLandLocation.Style.BorderRightWidth = 1;
-			this.gpxMOSLandLocation.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.gpxMOSLandLocation.Style.BorderTopWidth = 1;
-			this.gpxMOSLandLocation.Style.CornerDiameter = 4;
-			this.gpxMOSLandLocation.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
-			this.gpxMOSLandLocation.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
-			this.gpxMOSLandLocation.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-			this.gpxMOSLandLocation.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
-			// 
-			// 
-			// 
-			this.gpxMOSLandLocation.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			// 
-			// 
-			// 
-			this.gpxMOSLandLocation.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.gpxMOSLandLocation.TabIndex = 7;
-			this.gpxMOSLandLocation.Text = "Landscape Location";
-			// 
-			// ppCmbxMOSLandcornerLoc
-			// 
-			this.ppCmbxMOSLandcornerLoc.DisplayMember = "Text";
-			this.ppCmbxMOSLandcornerLoc.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
-			this.ppCmbxMOSLandcornerLoc.FormattingEnabled = true;
-			this.ppCmbxMOSLandcornerLoc.ItemHeight = 16;
-			this.ppCmbxMOSLandcornerLoc.Location = new System.Drawing.Point(59, 53);
-			this.ppCmbxMOSLandcornerLoc.Margin = new System.Windows.Forms.Padding(2);
-			this.ppCmbxMOSLandcornerLoc.Name = "ppCmbxMOSLandcornerLoc";
-			this.ppCmbxMOSLandcornerLoc.Size = new System.Drawing.Size(144, 22);
-			this.ppCmbxMOSLandcornerLoc.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.ppCmbxMOSLandcornerLoc.TabIndex = 9;
-			this.ppCmbxMOSLandcornerLoc.WatermarkText = "corner location";
-			// 
-			// tbxMOSLandyloc
-			// 
-			// 
-			// 
-			// 
-			this.tbxMOSLandyloc.Border.Class = "TextBoxBorder";
-			this.tbxMOSLandyloc.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.tbxMOSLandyloc.Location = new System.Drawing.Point(62, 30);
-			this.tbxMOSLandyloc.Margin = new System.Windows.Forms.Padding(2);
-			this.tbxMOSLandyloc.Name = "tbxMOSLandyloc";
-			this.tbxMOSLandyloc.PreventEnterBeep = true;
-			this.tbxMOSLandyloc.Size = new System.Drawing.Size(75, 20);
-			this.tbxMOSLandyloc.TabIndex = 8;
-			// 
-			// tbxMOSLandxloc
-			// 
-			// 
-			// 
-			// 
-			this.tbxMOSLandxloc.Border.Class = "TextBoxBorder";
-			this.tbxMOSLandxloc.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.tbxMOSLandxloc.Location = new System.Drawing.Point(62, 10);
-			this.tbxMOSLandxloc.Margin = new System.Windows.Forms.Padding(2);
-			this.tbxMOSLandxloc.Name = "tbxMOSLandxloc";
-			this.tbxMOSLandxloc.PreventEnterBeep = true;
-			this.tbxMOSLandxloc.Size = new System.Drawing.Size(75, 20);
-			this.tbxMOSLandxloc.TabIndex = 7;
-			// 
-			// lblMOSLandcorner
-			// 
-			this.lblMOSLandcorner.AutoSize = true;
-			this.lblMOSLandcorner.BackColor = System.Drawing.Color.Transparent;
-			this.lblMOSLandcorner.Location = new System.Drawing.Point(14, 54);
-			this.lblMOSLandcorner.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-			this.lblMOSLandcorner.Name = "lblMOSLandcorner";
-			this.lblMOSLandcorner.Size = new System.Drawing.Size(41, 13);
-			this.lblMOSLandcorner.TabIndex = 6;
-			this.lblMOSLandcorner.Text = "Corner:";
-			// 
-			// lblMOSLandyloc
-			// 
-			this.lblMOSLandyloc.AutoSize = true;
-			this.lblMOSLandyloc.BackColor = System.Drawing.Color.Transparent;
-			this.lblMOSLandyloc.Location = new System.Drawing.Point(14, 32);
-			this.lblMOSLandyloc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-			this.lblMOSLandyloc.Name = "lblMOSLandyloc";
-			this.lblMOSLandyloc.Size = new System.Drawing.Size(34, 13);
-			this.lblMOSLandyloc.TabIndex = 5;
-			this.lblMOSLandyloc.Text = "Y (in):";
-			// 
-			// lblMOSLandxloc
-			// 
-			this.lblMOSLandxloc.AutoSize = true;
-			this.lblMOSLandxloc.BackColor = System.Drawing.Color.Transparent;
-			this.lblMOSLandxloc.Location = new System.Drawing.Point(14, 10);
-			this.lblMOSLandxloc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-			this.lblMOSLandxloc.Name = "lblMOSLandxloc";
-			this.lblMOSLandxloc.Size = new System.Drawing.Size(34, 13);
-			this.lblMOSLandxloc.TabIndex = 4;
-			this.lblMOSLandxloc.Text = "X (in):";
-			// 
 			// ppChbxMOSview
 			// 
 			this.ppChbxMOSview.BackColor = System.Drawing.Color.Transparent;
@@ -1568,174 +1613,6 @@ namespace VEPROMS
 			this.tiMergedOutputSettings.Name = "tiMergedOutputSettings";
 			this.tiMergedOutputSettings.Text = "Merged Output Settings";
 			// 
-			// tcpGeneral
-			// 
-			this.tcpGeneral.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-			this.tcpGeneral.Controls.Add(this.ppCmbxProcSetType);
-			this.tcpGeneral.Controls.Add(this.ppRTxtName);
-			this.tcpGeneral.Controls.Add(this.label9);
-			this.tcpGeneral.Controls.Add(this.ppRTxtProcSetRev);
-			this.tcpGeneral.Controls.Add(this.lblProcSetRev);
-			this.tcpGeneral.Controls.Add(this.label4);
-			this.tcpGeneral.Controls.Add(this.label3);
-			this.tcpGeneral.Controls.Add(this.ppRTxtTitle);
-			this.tcpGeneral.Controls.Add(this.ppTxtBxUserID);
-			this.tcpGeneral.Controls.Add(this.ppDTPicker);
-			this.tcpGeneral.Controls.Add(this.label2);
-			this.tcpGeneral.Controls.Add(this.label1);
-			this.tcpGeneral.DisabledBackColor = System.Drawing.Color.Empty;
-			this.tcpGeneral.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.tcpGeneral.Location = new System.Drawing.Point(0, 22);
-			this.tcpGeneral.Margin = new System.Windows.Forms.Padding(2);
-			this.tcpGeneral.Name = "tcpGeneral";
-			this.tcpGeneral.Padding = new System.Windows.Forms.Padding(2);
-			this.tcpGeneral.Size = new System.Drawing.Size(625, 311);
-			this.tcpGeneral.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
-			this.tcpGeneral.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
-			this.tcpGeneral.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
-			this.tcpGeneral.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
-			this.tcpGeneral.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
-            | DevComponents.DotNetBar.eBorderSide.Bottom)));
-			this.tcpGeneral.Style.GradientAngle = 90;
-			this.tcpGeneral.TabIndex = 1;
-			this.tcpGeneral.TabItem = this.tiGeneral;
-			// 
-			// tiGeneral
-			// 
-			this.tiGeneral.AttachedControl = this.tcpGeneral;
-			this.tiGeneral.Name = "tiGeneral";
-			this.tiGeneral.Text = "General";
-			// 
-			// tcpRefereceObjects
-			// 
-			this.tcpRefereceObjects.Controls.Add(this.ppBtnRoToSql);
-			this.tcpRefereceObjects.Controls.Add(this.tbRoDb);
-			this.tcpRefereceObjects.Controls.Add(this.ppBtnRoDbBrowse);
-			this.tcpRefereceObjects.Controls.Add(this.btnRoDbProperties);
-			this.tcpRefereceObjects.Controls.Add(this.cmbRoDb);
-			this.tcpRefereceObjects.Controls.Add(this.ppGpbxUpROvals);
-			this.tcpRefereceObjects.Controls.Add(this.label6);
-			this.tcpRefereceObjects.DisabledBackColor = System.Drawing.Color.Empty;
-			this.tcpRefereceObjects.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.tcpRefereceObjects.Location = new System.Drawing.Point(0, 22);
-			this.tcpRefereceObjects.Margin = new System.Windows.Forms.Padding(2);
-			this.tcpRefereceObjects.Name = "tcpRefereceObjects";
-			this.tcpRefereceObjects.Padding = new System.Windows.Forms.Padding(2);
-			this.tcpRefereceObjects.Size = new System.Drawing.Size(625, 311);
-			this.tcpRefereceObjects.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
-			this.tcpRefereceObjects.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
-			this.tcpRefereceObjects.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
-			this.tcpRefereceObjects.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
-			this.tcpRefereceObjects.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
-            | DevComponents.DotNetBar.eBorderSide.Bottom)));
-			this.tcpRefereceObjects.Style.GradientAngle = 90;
-			this.tcpRefereceObjects.TabIndex = 2;
-			this.tcpRefereceObjects.TabItem = this.tiRefObjs;
-			this.tcpRefereceObjects.Enter += new System.EventHandler(this.tabpage_Enter);
-			// 
-			// ppBtnRoToSql
-			// 
-			this.ppBtnRoToSql.Location = new System.Drawing.Point(337, 146);
-			this.ppBtnRoToSql.Name = "ppBtnRoToSql";
-			this.ppBtnRoToSql.Size = new System.Drawing.Size(163, 46);
-			this.ppBtnRoToSql.TabIndex = 48;
-			this.ppBtnRoToSql.Text = "Migrate Data to Sql";
-			this.ppBtnRoToSql.UseVisualStyleBackColor = true;
-			this.ppBtnRoToSql.Visible = false;
-			this.ppBtnRoToSql.Click += new System.EventHandler(this.ppBtnRoToSql_Click);
-			// 
-			// tbRoDb
-			// 
-			this.tbRoDb.Enabled = false;
-			this.tbRoDb.Location = new System.Drawing.Point(80, 13);
-			this.tbRoDb.Margin = new System.Windows.Forms.Padding(2);
-			this.tbRoDb.Name = "tbRoDb";
-			this.tbRoDb.Size = new System.Drawing.Size(318, 20);
-			this.tbRoDb.TabIndex = 20;
-			this.tbRoDb.TextChanged += new System.EventHandler(this.tbRoDb_TextChanged);
-			// 
-			// ppBtnRoDbBrowse
-			// 
-			this.ppBtnRoDbBrowse.Location = new System.Drawing.Point(406, 34);
-			this.ppBtnRoDbBrowse.Margin = new System.Windows.Forms.Padding(2);
-			this.ppBtnRoDbBrowse.Name = "ppBtnRoDbBrowse";
-			this.ppBtnRoDbBrowse.Size = new System.Drawing.Size(51, 20);
-			this.ppBtnRoDbBrowse.TabIndex = 22;
-			this.ppBtnRoDbBrowse.Text = "Browse...";
-			this.ppBtnRoDbBrowse.UseVisualStyleBackColor = true;
-			this.ppBtnRoDbBrowse.Click += new System.EventHandler(this.ppBtnRoDbBrowse_Click);
-			// 
-			// btnRoDbProperties
-			// 
-			this.btnRoDbProperties.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.btnRoDbProperties.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnRoDbProperties.Image = ((System.Drawing.Image)(resources.GetObject("btnRoDbProperties.Image")));
-			this.btnRoDbProperties.Location = new System.Drawing.Point(406, 10);
-			this.btnRoDbProperties.Margin = new System.Windows.Forms.Padding(2);
-			this.btnRoDbProperties.Name = "btnRoDbProperties";
-			this.btnRoDbProperties.Size = new System.Drawing.Size(33, 23);
-			this.btnRoDbProperties.TabIndex = 21;
-			this.btnRoDbProperties.Click += new System.EventHandler(this.btnRoDbProperties_Click);
-			// 
-			// cmbRoDb
-			// 
-			this.cmbRoDb.FormattingEnabled = true;
-			this.cmbRoDb.Location = new System.Drawing.Point(80, 13);
-			this.cmbRoDb.Margin = new System.Windows.Forms.Padding(2);
-			this.cmbRoDb.Name = "cmbRoDb";
-			this.cmbRoDb.Size = new System.Drawing.Size(318, 21);
-			this.cmbRoDb.TabIndex = 47;
-			this.cmbRoDb.SelectedIndexChanged += new System.EventHandler(this.cmbRoDb_SelectedIndexChanged);
-			// 
-			// ppGpbxUpROvals
-			// 
-			this.ppGpbxUpROvals.BackColor = System.Drawing.Color.Transparent;
-			this.ppGpbxUpROvals.CanvasColor = System.Drawing.SystemColors.Control;
-			this.ppGpbxUpROvals.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-			this.ppGpbxUpROvals.Controls.Add(this.ppBtnResetRoVals);
-			this.ppGpbxUpROvals.Controls.Add(this.ppBtnUpRoVals);
-			this.ppGpbxUpROvals.DisabledBackColor = System.Drawing.Color.Empty;
-			this.ppGpbxUpROvals.Location = new System.Drawing.Point(34, 69);
-			this.ppGpbxUpROvals.Margin = new System.Windows.Forms.Padding(2);
-			this.ppGpbxUpROvals.Name = "ppGpbxUpROvals";
-			this.ppGpbxUpROvals.Size = new System.Drawing.Size(112, 162);
-			// 
-			// 
-			// 
-			this.ppGpbxUpROvals.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-			this.ppGpbxUpROvals.Style.BackColorGradientAngle = 90;
-			this.ppGpbxUpROvals.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-			this.ppGpbxUpROvals.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.ppGpbxUpROvals.Style.BorderBottomWidth = 1;
-			this.ppGpbxUpROvals.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-			this.ppGpbxUpROvals.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.ppGpbxUpROvals.Style.BorderLeftWidth = 1;
-			this.ppGpbxUpROvals.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.ppGpbxUpROvals.Style.BorderRightWidth = 1;
-			this.ppGpbxUpROvals.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.ppGpbxUpROvals.Style.BorderTopWidth = 1;
-			this.ppGpbxUpROvals.Style.CornerDiameter = 4;
-			this.ppGpbxUpROvals.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
-			this.ppGpbxUpROvals.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
-			this.ppGpbxUpROvals.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-			this.ppGpbxUpROvals.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
-			// 
-			// 
-			// 
-			this.ppGpbxUpROvals.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			// 
-			// 
-			// 
-			this.ppGpbxUpROvals.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.ppGpbxUpROvals.TabIndex = 46;
-			this.ppGpbxUpROvals.Text = "RO Values";
-			// 
-			// tiRefObjs
-			// 
-			this.tiRefObjs.AttachedControl = this.tcpRefereceObjects;
-			this.tiRefObjs.Name = "tiRefObjs";
-			this.tiRefObjs.Text = "Referenced Objects";
-			// 
 			// tabControlPanel1
 			// 
 			this.tabControlPanel1.Controls.Add(this.ppChbxEnhancedAllowMods);
@@ -2295,14 +2172,14 @@ namespace VEPROMS
             this.documentEntryCountDataGridViewTextBoxColumn,
             this.libTitleDataGridViewTextBoxColumn});
 			this.ppGrdLibDocList.DataSource = this.documentInfoListBindingSource;
-			dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-			dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
-			dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText;
-			dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-			dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.ControlText;
-			dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-			this.ppGrdLibDocList.DefaultCellStyle = dataGridViewCellStyle4;
+			dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+			dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
+			dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
+			dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+			dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText;
+			dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+			this.ppGrdLibDocList.DefaultCellStyle = dataGridViewCellStyle2;
 			this.ppGrdLibDocList.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.ppGrdLibDocList.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229)))));
 			this.ppGrdLibDocList.HighlightSelectedColumnHeaders = false;
@@ -2319,8 +2196,8 @@ namespace VEPROMS
 			// documentEntryCountDataGridViewTextBoxColumn
 			// 
 			this.documentEntryCountDataGridViewTextBoxColumn.DataPropertyName = "DocumentEntryCount";
-			dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-			this.documentEntryCountDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle3;
+			dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			this.documentEntryCountDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1;
 			this.documentEntryCountDataGridViewTextBoxColumn.HeaderText = "Number of Usages";
 			this.documentEntryCountDataGridViewTextBoxColumn.Name = "documentEntryCountDataGridViewTextBoxColumn";
 			this.documentEntryCountDataGridViewTextBoxColumn.ReadOnly = true;
@@ -2787,14 +2664,132 @@ namespace VEPROMS
 			this.btnGeneral.Text = "General";
 			this.btnGeneral.Click += new System.EventHandler(this.btnGeneral_Click);
 			// 
-			// ROPrefixBindingSource
-			// 
-			this.ROPrefixBindingSource.CurrentChanged += new System.EventHandler(this.ROPrefixBindingSource_CurrentChanged);
-			// 
 			// formatInfoListBindingSource
 			// 
 			this.formatInfoListBindingSource.DataSource = typeof(VEPROMS.CSLA.Library.FormatInfo);
 			// 
+			// gpxMOSLandLocation
+			// 
+			this.gpxMOSLandLocation.BackColor = System.Drawing.Color.Transparent;
+			this.gpxMOSLandLocation.CanvasColor = System.Drawing.SystemColors.Control;
+			this.gpxMOSLandLocation.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+			this.gpxMOSLandLocation.Controls.Add(this.ppCmbxMOSLandcornerLoc);
+			this.gpxMOSLandLocation.Controls.Add(this.tbxMOSLandyloc);
+			this.gpxMOSLandLocation.Controls.Add(this.tbxMOSLandxloc);
+			this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandcorner);
+			this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandyloc);
+			this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandxloc);
+			this.gpxMOSLandLocation.DisabledBackColor = System.Drawing.Color.Empty;
+			this.gpxMOSLandLocation.Location = new System.Drawing.Point(284, 164);
+			this.gpxMOSLandLocation.Margin = new System.Windows.Forms.Padding(2);
+			this.gpxMOSLandLocation.Name = "gpxMOSLandLocation";
+			this.gpxMOSLandLocation.Size = new System.Drawing.Size(209, 98);
+			// 
+			// 
+			// 
+			this.gpxMOSLandLocation.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+			this.gpxMOSLandLocation.Style.BackColorGradientAngle = 90;
+			this.gpxMOSLandLocation.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+			this.gpxMOSLandLocation.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+			this.gpxMOSLandLocation.Style.BorderBottomWidth = 1;
+			this.gpxMOSLandLocation.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+			this.gpxMOSLandLocation.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
+			this.gpxMOSLandLocation.Style.BorderLeftWidth = 1;
+			this.gpxMOSLandLocation.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+			this.gpxMOSLandLocation.Style.BorderRightWidth = 1;
+			this.gpxMOSLandLocation.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+			this.gpxMOSLandLocation.Style.BorderTopWidth = 1;
+			this.gpxMOSLandLocation.Style.CornerDiameter = 4;
+			this.gpxMOSLandLocation.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+			this.gpxMOSLandLocation.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+			this.gpxMOSLandLocation.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+			this.gpxMOSLandLocation.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+			// 
+			// 
+			// 
+			this.gpxMOSLandLocation.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			// 
+			// 
+			// 
+			this.gpxMOSLandLocation.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.gpxMOSLandLocation.TabIndex = 7;
+			this.gpxMOSLandLocation.Text = "Landscape Location";
+			// 
+			// ppCmbxMOSLandcornerLoc
+			// 
+			this.ppCmbxMOSLandcornerLoc.DisplayMember = "Text";
+			this.ppCmbxMOSLandcornerLoc.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+			this.ppCmbxMOSLandcornerLoc.FormattingEnabled = true;
+			this.ppCmbxMOSLandcornerLoc.ItemHeight = 16;
+			this.ppCmbxMOSLandcornerLoc.Location = new System.Drawing.Point(59, 53);
+			this.ppCmbxMOSLandcornerLoc.Margin = new System.Windows.Forms.Padding(2);
+			this.ppCmbxMOSLandcornerLoc.Name = "ppCmbxMOSLandcornerLoc";
+			this.ppCmbxMOSLandcornerLoc.Size = new System.Drawing.Size(144, 22);
+			this.ppCmbxMOSLandcornerLoc.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+			this.ppCmbxMOSLandcornerLoc.TabIndex = 9;
+			this.ppCmbxMOSLandcornerLoc.WatermarkText = "corner location";
+			// 
+			// tbxMOSLandyloc
+			// 
+			// 
+			// 
+			// 
+			this.tbxMOSLandyloc.Border.Class = "TextBoxBorder";
+			this.tbxMOSLandyloc.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.tbxMOSLandyloc.Location = new System.Drawing.Point(62, 30);
+			this.tbxMOSLandyloc.Margin = new System.Windows.Forms.Padding(2);
+			this.tbxMOSLandyloc.Name = "tbxMOSLandyloc";
+			this.tbxMOSLandyloc.PreventEnterBeep = true;
+			this.tbxMOSLandyloc.Size = new System.Drawing.Size(75, 20);
+			this.tbxMOSLandyloc.TabIndex = 8;
+			// 
+			// tbxMOSLandxloc
+			// 
+			// 
+			// 
+			// 
+			this.tbxMOSLandxloc.Border.Class = "TextBoxBorder";
+			this.tbxMOSLandxloc.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.tbxMOSLandxloc.Location = new System.Drawing.Point(62, 10);
+			this.tbxMOSLandxloc.Margin = new System.Windows.Forms.Padding(2);
+			this.tbxMOSLandxloc.Name = "tbxMOSLandxloc";
+			this.tbxMOSLandxloc.PreventEnterBeep = true;
+			this.tbxMOSLandxloc.Size = new System.Drawing.Size(75, 20);
+			this.tbxMOSLandxloc.TabIndex = 7;
+			// 
+			// lblMOSLandcorner
+			// 
+			this.lblMOSLandcorner.AutoSize = true;
+			this.lblMOSLandcorner.BackColor = System.Drawing.Color.Transparent;
+			this.lblMOSLandcorner.Location = new System.Drawing.Point(14, 54);
+			this.lblMOSLandcorner.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+			this.lblMOSLandcorner.Name = "lblMOSLandcorner";
+			this.lblMOSLandcorner.Size = new System.Drawing.Size(41, 13);
+			this.lblMOSLandcorner.TabIndex = 6;
+			this.lblMOSLandcorner.Text = "Corner:";
+			// 
+			// lblMOSLandyloc
+			// 
+			this.lblMOSLandyloc.AutoSize = true;
+			this.lblMOSLandyloc.BackColor = System.Drawing.Color.Transparent;
+			this.lblMOSLandyloc.Location = new System.Drawing.Point(14, 32);
+			this.lblMOSLandyloc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+			this.lblMOSLandyloc.Name = "lblMOSLandyloc";
+			this.lblMOSLandyloc.Size = new System.Drawing.Size(34, 13);
+			this.lblMOSLandyloc.TabIndex = 5;
+			this.lblMOSLandyloc.Text = "Y (in):";
+			// 
+			// lblMOSLandxloc
+			// 
+			this.lblMOSLandxloc.AutoSize = true;
+			this.lblMOSLandxloc.BackColor = System.Drawing.Color.Transparent;
+			this.lblMOSLandxloc.Location = new System.Drawing.Point(14, 10);
+			this.lblMOSLandxloc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+			this.lblMOSLandxloc.Name = "lblMOSLandxloc";
+			this.lblMOSLandxloc.Size = new System.Drawing.Size(34, 13);
+			this.lblMOSLandxloc.TabIndex = 4;
+			this.lblMOSLandxloc.Text = "X (in):";
+			// 
 			// frmVersionsProperties
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -2802,7 +2797,7 @@ namespace VEPROMS
 			this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
 			this.CancelButton = this.ppBtnCancel;
 			this.CaptionFont = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.ClientSize = new System.Drawing.Size(802, 361);
+			this.ClientSize = new System.Drawing.Size(806, 365);
 			this.ControlBox = false;
 			this.Controls.Add(this.panVerBtns);
 			this.Controls.Add(this.tcVersions);
@@ -2829,19 +2824,17 @@ namespace VEPROMS
 			this.ppGpbxUserSpecTxt.PerformLayout();
 			((System.ComponentModel.ISupportInitialize)(this.tcVersions)).EndInit();
 			this.tcVersions.ResumeLayout(false);
-			this.tabControlPanel2.ResumeLayout(false);
-			this.tabControlPanel2.PerformLayout();
-			this.gpxMOSLandLocation.ResumeLayout(false);
-			this.gpxMOSLandLocation.PerformLayout();
-			this.gpxMOSLocation.ResumeLayout(false);
-			this.gpxMOSLocation.PerformLayout();
-			this.gpxMOSfont.ResumeLayout(false);
-			this.gpxMOSfont.PerformLayout();
 			this.tcpGeneral.ResumeLayout(false);
 			this.tcpGeneral.PerformLayout();
 			this.tcpRefereceObjects.ResumeLayout(false);
 			this.tcpRefereceObjects.PerformLayout();
 			this.ppGpbxUpROvals.ResumeLayout(false);
+			this.tabControlPanel2.ResumeLayout(false);
+			this.tabControlPanel2.PerformLayout();
+			this.gpxMOSLocation.ResumeLayout(false);
+			this.gpxMOSLocation.PerformLayout();
+			this.gpxMOSfont.ResumeLayout(false);
+			this.gpxMOSfont.PerformLayout();
 			this.tabControlPanel1.ResumeLayout(false);
 			this.tabControlPanel1.PerformLayout();
 			((System.ComponentModel.ISupportInitialize)(this.bsMiniEnhanced)).EndInit();
@@ -2866,6 +2859,8 @@ namespace VEPROMS
 			this.panVerBtns.ResumeLayout(false);
 			((System.ComponentModel.ISupportInitialize)(this.ROPrefixBindingSource)).EndInit();
 			((System.ComponentModel.ISupportInitialize)(this.formatInfoListBindingSource)).EndInit();
+			this.gpxMOSLandLocation.ResumeLayout(false);
+			this.gpxMOSLandLocation.PerformLayout();
 			this.ResumeLayout(false);
 			this.PerformLayout();
 

PROMS/VEPROMS User Interface/frmVersionsProperties.cs

@@ -1928,16 +1928,6 @@ namespace VEPROMS
 		#endregion
 
 		#endregion
-
-		private void tbRoDb_TextChanged(object sender, EventArgs e)
-		{
-
-		}
-
-		private void ROPrefixBindingSource_CurrentChanged(object sender, EventArgs e)
-		{
-
-		}
 	}
 
 

PROMS/VEPROMS User Interface/frmVersionsProperties.resx

@@ -123,12 +123,6 @@
   <metadata name="docVersionConfigBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>415, 17</value>
   </metadata>
-  <metadata name="docVersionConfigBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>415, 17</value>
-  </metadata>
-  <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>643, 17</value>
-  </metadata>
   <data name="ppCmbxFormat.SuperTooltip" xml:space="preserve">
     <value>Allows you to specify the default format to use for all procedures in this set.
 
@@ -216,21 +210,9 @@ Check "Show Default Settings" to display the "default" duplexing setting (below
   <metadata name="bsEnhanced.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>817, 17</value>
   </metadata>
-  <metadata name="bsMiniEnhanced.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 65</value>
-  </metadata>
-  <metadata name="bsEnhanced.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>817, 17</value>
-  </metadata>
   <metadata name="bsMiniApple.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>118, 17</value>
   </metadata>
-  <metadata name="bsMiniApple.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>118, 17</value>
-  </metadata>
-  <metadata name="bsApples.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <metadata name="bsApples.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>

PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs

@@ -285,22 +285,16 @@ namespace VEPROMS.CSLA.Library
 		#region ROTextConvertMethods
 		// B2023-037: Handle <=, >=, +-, -> and <- symbols. Convert to unicode for output, i.e. print and edit/view (when editing
 		//   step, will show as 2 characters, not unicode, unless ro inserted when code replaced link text with unicode.
-		public static string ROConvertSymbols(string retval, bool arr1, bool arr2)
+		public static string ROConvertSymbols(string retval)
 		{
-			if (arr1)
-			{ 
-				retval = retval.Replace("\\u8209?>", @"\u8594?"); // Right Arrow
-				retval = retval.Replace("<\\u8209?", @"\u8592?"); // Left Arrow
-				retval = retval.Replace("->", @"\u8594?"); // Right Arrow
-				retval = retval.Replace("<-", @"\u8592?"); // Left Arrow
-			}
-			if (arr2)
-			{
-				retval = retval.Replace("<=", @"\u8804?"); // Less than or Equal
-				retval = retval.Replace(">=", @"\u8805?"); // Greater than or Equal
-				retval = retval.Replace("+\\u8209?", @"\'b1"); // plus minus
-				retval = retval.Replace("+-", @"\'b1"); // plus minus
-			}
+			retval = retval.Replace("\\u8209?>", @"\u8594?"); // Right Arrow
+			retval = retval.Replace("<\\u8209?", @"\u8592?"); // Left Arrow
+			retval = retval.Replace("->", @"\u8594?"); // Right Arrow
+			retval = retval.Replace("<-", @"\u8592?"); // Left Arrow
+			retval = retval.Replace("<=", @"\u8804?"); // Less than or Equal
+			retval = retval.Replace(">=", @"\u8805?"); // Greater than or Equal
+			retval = retval.Replace("+\\u8209?", @"\'b1"); // plus minus
+			retval = retval.Replace("+-", @"\'b1"); // plus minus
 			return retval;
 		}
 		#endregion
@@ -490,7 +484,7 @@ namespace VEPROMS.CSLA.Library
 			return rc;
 		}
 
-		public string GetTranslatedRoValue(string roid, bool DoCaret, bool DoDOSSuperSubScript, bool convertRoSymbols, ItemInfo myiteminfo)
+		public string GetTranslatedRoValue(string roid, bool DoCaret, bool DoDOSSuperSubScript, bool convertRoSymbols)
 		{
 			roid = FormatRoidKey(roid, true);
 
@@ -502,13 +496,7 @@ namespace VEPROMS.CSLA.Library
 			retval = ReplaceUnicode(retval, DoCaret);
 			// B2023-037: Handle <=, >=, +-, -> and <- symbols. Convert to unicode for output, i.e. print and edit/view (when editing
 			//   step, will show as 2 characters, not unicode, unless ro inserted when code replaced link text with unicode.
-
-			//(_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue ||
-			//			_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue))
-			bool arrows1 = myiteminfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue;
-			bool arrows2 = myiteminfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue;
-
-			if (convertRoSymbols) retval = ROFSTLookup.ROConvertSymbols(retval, arrows1, arrows2);
+			if (convertRoSymbols) retval = ROFSTLookup.ROConvertSymbols(retval);
 
 			retval = ConvertFortranFormatToScienctificNotation(retval);
 

PROMS/VEPROMS.CSLA.Library/Extension/AuditExt.cs

@@ -1616,7 +1616,7 @@ namespace VEPROMS.CSLA.Library
 						foreach (ContentRoUsage ro in cont.ContentRoUsages)
 						{
 							RoUsageInfo rou = RoUsageInfo.Get(ro.ROUsageID);
-							string myvalue = mylookup.GetTranslatedRoValue(rou.ROID, tmp.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, tmp.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, tmp);
+							string myvalue = mylookup.GetTranslatedRoValue(rou.ROID, tmp.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, tmp.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false);
 							
 							ROFSTLookup.rochild rocc = mylookup.GetRoChild(rou.ROID);
 							
@@ -1844,7 +1844,7 @@ namespace VEPROMS.CSLA.Library
 						ROFSTLookup mylookup = myRoFst.GetROFSTLookup(tmp.ContentItems[0].MyProcedure.MyDocVersion);
 						foreach (RoUsageInfo rou in tmp.ContentRoUsages)
 						{
-							string myvalue = mylookup.GetTranslatedRoValue(rou.ROID, tmp.ContentItems[0].ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, tmp.ContentItems[0].ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, tmp.ContentItems[0]);
+							string myvalue = mylookup.GetTranslatedRoValue(rou.ROID, tmp.ContentItems[0].ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, tmp.ContentItems[0].ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false);
 							ROFSTLookup.rochild rocc = mylookup.GetRoChild(rou.ROID);
 							int mytype = rocc.type;
 							ctmp.FixContentText(rou, myvalue, mytype, myRoFst);

PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs

@@ -468,12 +468,10 @@ namespace VEPROMS.CSLA.Library
 			return text;
 		}
 		// B2022-035: resolve unit specific designators - moved code to here so that other objects can use it
-		// B2024-025 added <ID> to the replace list
 		public static string ResolveUnitSpecific(DocVersionInfo mydocversion, string text)
 		{
 			if (mydocversion == null) return text;
 			text = Regex.Replace(text, @"\<U\>", mydocversion.DocVersionConfig.Unit_Number, RegexOptions.IgnoreCase);
-			text = Regex.Replace(text, @"\<ID\>", mydocversion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase);
 			text = Regex.Replace(text, @"\<(U(-|\\u8209\?)ID)\>", mydocversion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase);
 			text = Regex.Replace(text, @"\<(U(-|\\u8209\?)NAME)\>", mydocversion.DocVersionConfig.Unit_Name, RegexOptions.IgnoreCase);
 			text = Regex.Replace(text, @"\<(U(-|\\u8209\?)TEXT)\>", mydocversion.DocVersionConfig.Unit_Text, RegexOptions.IgnoreCase);
@@ -696,12 +694,10 @@ namespace VEPROMS.CSLA.Library
 					// B2017-147: backquotes should be translated to degrees for edit/print:
 					newvalue = newvalue.Replace("`", @"\'b0");
 					// B2023-037: Handle <=, >=, +-, -> and <- symbols. If the format has flags to convert these RO symbols, it
-					bool arrows1 = _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue;
-					bool arrows2 = _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue;
 					//	is done here so that output (print & edit/view) has symbol, not 2 characters.
-					if (!_MyItemInfo.IsTable && (_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue ||
-						_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue))
-						newvalue = ROFSTLookup.ROConvertSymbols(newvalue, arrows1, arrows2);
+					if (_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue ||
+						_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue)
+						newvalue = ROFSTLookup.ROConvertSymbols(newvalue);
 
 					if (gg != newvalue)
 						text = text.Substring(0, myIndex) + newvalue + text.Substring(myIndex + myLength);

PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs

@@ -908,7 +908,7 @@ namespace VEPROMS.CSLA.Library
 					{
 						string oldText = this.MyContent.Text;
 
-						string roval = lookup.GetTranslatedRoValue(rousage.ROID, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, this);
+						string roval = lookup.GetTranslatedRoValue(rousage.ROID, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false);
 						ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID);
 						
 						this.MyContent.FixContentText(rousage, roval, roch.type, rofstinfo, this);
@@ -964,7 +964,7 @@ namespace VEPROMS.CSLA.Library
 						ROCheckCount++;
 						string oldText = itemInfo.MyContent.Text;
 
-						string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, sectionInfo);
+						string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false);
 						ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID);
 
 						itemInfo.MyContent.FixContentText(rousage, roval, roch.type, origROFst, itemInfo);
@@ -1184,10 +1184,7 @@ namespace VEPROMS.CSLA.Library
 						if (sectionInfo != null)
 						{
 							// B2023-037: loading print text, resolve the RO symbols 
-
-							bool GTLT = !itemInfo.IsTable && sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue;
-							bool GLTArrows = !itemInfo.IsTable &&  sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue;
-							string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta,    sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, GTLT || GLTArrows, itemInfo);
+							string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues,sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue|| sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue);
 							ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID);
 							itemInfo.MyContent.FixContentText(rousage, roval, roch.type, rofstinfo, itemInfo);
 						}
@@ -2934,22 +2931,8 @@ namespace VEPROMS.CSLA.Library
 			{
 				string str = MyContent.Text;
 				// B2022-035: resolve unit specific designators 
-				// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
-				str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(this.MyDocVersion, str);
-				return ConvertToDisplayText(str, false, " "); // B2024-013 added " " to replace hard returns with a space instead of semi-colon
-			}
-		}
-		// B2024-013 added for Vogtle Units 3 & 4, used with {TOPSECTIONTITLE} pagelist item
-		//           this will format the text and keep the hard return command
-		public string FormattedDisplayTextKeepHardReturn
-		{
-			get
-			{
-				string str = MyContent.Text;
-				// B2022-035: resolve unit specific designators 
-				// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
-				str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(this.MyDocVersion, str);
-				return ConvertToDisplayText(str, false, ""); // pass in empty string for hard retun char will keep hard return
+				if (str.ToUpper().Contains(@"<U")) str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(this.MyDocVersion, str);
+				return ConvertToDisplayText(str, false);
 			}
 		}
 		// Used in Comanche Peak EOP and Flex formats for step designators. Will allow a hard return to be used that that caution type.
@@ -2962,8 +2945,7 @@ namespace VEPROMS.CSLA.Library
 				string str = MyContent.Text;
 				if (MyDocVersion != null)
 				{
-					// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
-					str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
+					str = Regex.Replace(str, @"\<[uU]\>", MyDocVersion.DocVersionConfig.Unit_Number);
 				}
 				else
 				{
@@ -2982,13 +2964,16 @@ namespace VEPROMS.CSLA.Library
 				if (MyDocVersion != null)
 				{
 					// B2022-035: resolve unit specific designators 
-					// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
-					str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
+					if (str.ToUpper().Contains("<U")) str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
 				}
 				else
 				{
 					_MyLog.WarnFormat("Disconnected Data - ItemID = {0}", ItemID);
 				}
+				//if (str.Contains("<u>"))
+				//  str = str.Replace("<u>", MyDocVersion.DocVersionConfig.Unit_Number);
+				//if (str.Contains("<U>"))
+				//  str = str.Replace("<U>", MyDocVersion.DocVersionConfig.Unit_Number);
 				return ConvertToDisplayText(str);
 			}
 		}
@@ -3047,8 +3032,7 @@ namespace VEPROMS.CSLA.Library
 				string str = MyContent.Text;
 				if (MyDocVersion != null)
 				{
-					// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
-					str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
+					str = Regex.Replace(str, @"\<[uU]\>", MyDocVersion.DocVersionConfig.Unit_Number);
 				}
 				else
 				{
@@ -3081,8 +3065,8 @@ namespace VEPROMS.CSLA.Library
 					}
 					else
 						str = MyContent.Number;
-					// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
-					str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
+					str = Regex.Replace(str, @"\<U-ID\>", MyDocVersion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase);
+					str = Regex.Replace(str, @"\<ID\>", MyDocVersion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase);
 				}
 				else
 				{
@@ -3095,9 +3079,7 @@ namespace VEPROMS.CSLA.Library
 				//  str = str.Replace(@"<S\u8209?ID>", MyDocVersion.DocVersionConfig.Unit_ID);
 				str = ConvertToDisplayText(str);
 				if (MyDocVersion != null) // B2020-086 check for null doc version - happens if item we are trying to open is no longer there (disconnected)
-					// B2017-019 - process "<u>" in section number
-					// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
-					str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
+					str = Regex.Replace(str, @"\<[uU]\>", MyDocVersion.DocVersionConfig.Unit_Number); // B2017-019 - process "<u>" in section number
 				return str;
 			}
 			//get { return ConvertToDisplayText(MyContent.Number); }
@@ -3127,12 +3109,7 @@ namespace VEPROMS.CSLA.Library
 			return ConvertToDisplayText(txt, true);
 		}
 
-		// B2024-013  This allos us to control "what with" or "whether to" replace hard returns
-		//            Semi-colons where printing on auto table of contents for section titles with hard returns
-		//            added HardReturnChar string to parameter. The default is to use the semi-colon, for auto table of contents 
-		//            we replace it with a space, for Vogtle Unit 3 & 4 we retain the hard return when printing the section
-
-		public static string ConvertToDisplayText(string txt, bool stripRTF, string HardReturnChar = ";")
+		public static string ConvertToDisplayText(string txt, bool stripRTF)
 		{
 			string retval = txt;
 
@@ -3143,12 +3120,9 @@ namespace VEPROMS.CSLA.Library
 				retval = ReplaceSpecialCharacters(retval);
 				retval = retval.Replace("\u2011", "-");
 				retval = retval.Replace("\u2572", @"\"); // replace backslash symbol with a backslash
-				if (HardReturnChar != "") // B2024-013 if a null string don't replace the hard return
-				{
-					retval = Regex.Replace(retval, @"\\line ?", HardReturnChar); // better handing of hard returns - replace with semi-colon for use on tree view
-					retval = retval.Replace("\r\n", HardReturnChar);
-					retval = retval.Replace("\n", HardReturnChar); //added for consistency checking with approved version
-				}
+				retval = Regex.Replace(retval, @"\\line ?", ";"); // better handing of hard returns - replace with semi-colon for use on tree view
+				retval = retval.Replace("\r\n", ";");
+				retval = retval.Replace("\n", ";"); //added for consistency checking with approved version
 			}
 
 			return retval;
@@ -4446,7 +4420,7 @@ namespace VEPROMS.CSLA.Library
 				// F2018-025 Westinghouse when a high level step is used as a section number/title, 
 				//           adjust the step/substep numbering where the first level substep uses the high level step tabbing format
 				//           and the following sub-substeps tabbing format are "shifted" accordingly (ex should look like ASS-101 Attachment 1 section 4 tabbing)
-				if (!IsHigh && MyHLS != null && MyHLS.FormatStepData.AppendDotZero)
+					if (!IsHigh && MyHLS != null && MyHLS.FormatStepData.AppendDotZero)
 				{
 					if (localPrintLevel > 1)
 					{
@@ -4454,14 +4428,7 @@ namespace VEPROMS.CSLA.Library
 						itmp = (localPrintLevel + PrintBias + OffsetTab) % seqtabs.MaxIndex;
 					}
 				}
-				// F2024-037 reset the seq sub-step numbering if the parent is an un-numbered high level step
-				// F2024-049 changed to specify the level via the format file (Generic EOP and Vogtle 3&4)
-				else if (sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS != null && IsSequential && MyParent != null && MyParent.IsHigh && MyParent.MyTab.Text.Length == 0)
-				{
-					localPrintLevel = (int)sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS;
-					itmp = (localPrintLevel + PrintBias + OffsetTab) % seqtabs.MaxIndex;
-				}
-				if (!tbformat.Contains(@"{!C"))
+					if (!tbformat.Contains(@"{!C"))
 							tbformat = seqtabs[itmp].PrintTabFormat;  // seqtab in 16bit, i.e. '. or )' etc.
 					else
 							tbformat = tbformat.Replace("{seq}", seqtabs[itmp].PrintTabFormat);
@@ -4569,7 +4536,6 @@ namespace VEPROMS.CSLA.Library
 			}
 			bool isAlpha = tbformat.ToUpper().Contains("ALPHA");
 			int ordinal = Ordinal;
-			bool trimSeqValue = FormatStepData.TabData.TrimSeqTabValue; // F2024-043 remove space around SEQ tab value
 			bool useLinked = false;		// if this is enhanced, and the LinkedTab isn't numeric, flag to use 'LinkedTab' for the tab.
 			if (ActiveSection != null && ActiveSection.IsEnhancedSection) // C2018-003 fixed use of getting the active section
 			{
@@ -4601,7 +4567,6 @@ namespace VEPROMS.CSLA.Library
 				tbformat = tbformat.Replace("{numeric}", LinkedTab.Trim(" .".ToCharArray()).PadLeft(2));
 			}
 			string alpha = useLinked?LinkedTab.Trim():AlphabeticalNumbering(ordinal);
-			if (trimSeqValue) alpha = alpha.Trim(); // F2024-043 trim white around SEQ tab value (for sub-steps)
 			// B2017-211 Roman High Level steps should be followed by Uppercase alpha substeps - This is being limited to Calvert SAMG Format
 			if (_ActiveFormat.Name =="BGESAM1" &&MyParent != null && MyParent.IsHigh && MyParent.IsStep && MyParent.FormatStepData.TabData.IdentEdit.Contains("ROMAN"))
 				tbformat = tbformat.Replace("{alpha}", alpha);
@@ -4644,8 +4609,7 @@ namespace VEPROMS.CSLA.Library
 				tbformat = tbformat.Replace("{numeric}", stpTab);
 			}
 			else
-				// F2024-043  added trimSeqValue to trim white around SEQ tab value (for sub-steps)
-				tbformat = tbformat.Replace("{numeric}", (trimTabStart || trimSeqValue) ? ordinal.ToString() : FormatStepData.AtLeastTwoDigits ? ordinal.ToString().PadLeft(2, '0') : ordinal.ToString().PadLeft(2));
+				tbformat = tbformat.Replace("{numeric}", trimTabStart ? ordinal.ToString() : FormatStepData.AtLeastTwoDigits ? ordinal.ToString().PadLeft(2, '0') : ordinal.ToString().PadLeft(2));
 			if (tbformate != null)
 			{
 				if (useLinked)

PROMS/VEPROMS.CSLA.Library/Extension/ROFSTExt.cs

@@ -722,7 +722,7 @@ namespace VEPROMS.CSLA.Library
 								{
 									foreach (ItemInfo ii in roUsg.MyContent.ContentItems)
 									{
-										string val = newLookup.GetTranslatedRoValue(padroid, ii.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, ii.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, ii);
+										string val = newLookup.GetTranslatedRoValue(padroid, ii.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, ii.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false);
 										content.FixContentText(roUsg, val, roch.type, origROFstInfo, true);
 
 										if (content.IsDirty)

PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs

@@ -978,8 +978,7 @@ namespace VEPROMS.CSLA.Library
 				retstr = unitnum.Replace("#", retstr);
 			}
 			// B2022-004: Remove Proc PC/PC token from transition text.
-			// F2024-030 for Vogtle Units 3 & 4, added KeepOnePCPCTag flag to keep one of the PC/PC tokens when editing
-			if (tb._FromItem.ActiveFormat != null && !tb._FromItem.ActiveFormat.PlantFormat.FormatData.TransData.KeepOnePCPCTag  && tb._FromItem.ActiveFormat.PlantFormat.FormatData.TransData.ProcLevelPCPC && retstr.ToUpper().StartsWith("<U"))
+			if (tb._FromItem.ActiveFormat != null && tb._FromItem.ActiveFormat.PlantFormat.FormatData.TransData.ProcLevelPCPC && retstr.ToUpper().StartsWith("<U"))
 			{
 				int indx = retstr.IndexOf(">");
 				retstr = retstr.Substring(indx + 1);
@@ -1227,10 +1226,7 @@ namespace VEPROMS.CSLA.Library
 					case 0:
 						break;
 					default:
-						//F2024-048 use a hard space (\\u160;) instead of a space in the page number text
-						//          to keep that text together on the page
-						//B2024-026: hard space unicode ends with '?' not ';'
-						tb.Append(string.Format(" (Page{0}{1})", "\\u160?", tb._ToItem.PageNumber + 1));
+						tb.Append(string.Format(" (Page {0})", tb._ToItem.PageNumber + 1));
 						break;
 				}
 			}
@@ -1541,8 +1537,8 @@ namespace VEPROMS.CSLA.Library
 			ItemInfo tmpitm = TranGetSectionItem(itminfo);
 			if (!tmpitm.IsSection) return "";
 			string str = tmpitm.MyContent.Number;
-			// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
-			str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(itminfo.MyDocVersion, str);
+			str = Regex.Replace(str, @"\<U\>", itminfo.MyDocVersion.DocVersionConfig.Unit_Number, RegexOptions.IgnoreCase );
+			str = Regex.Replace(str, @"\<ID\>", itminfo.MyDocVersion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase);
 			return (str);
 		}
 		private static string TranGetSectionNumber(TransitionBuilder tb, bool allLevels)
@@ -1567,8 +1563,8 @@ namespace VEPROMS.CSLA.Library
 			}
 			//string str = tmpitm.MyContent.Number;
 			string str = BuildSectionPath(ToSections);
-			// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
-			str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(tb._ToItem.MyDocVersion, str);
+			str = Regex.Replace(str, @"\<U\>", tb._ToItem.MyDocVersion.DocVersionConfig.Unit_Number, RegexOptions.IgnoreCase);
+			str = Regex.Replace(str, @"\<ID\>", tb._ToItem.MyDocVersion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase);
 			//if (!str.EndsWith(".") && tb._ToItem.ItemID != tb._ToItem.ActiveSection.ItemID)
 			tb.StepPrefix = ".";
 			tb.SectionNumberLength = str.Length;

PROMS/VEPROMS.CSLA.Library/Format/ENums.cs

@@ -58,8 +58,7 @@ namespace VEPROMS.CSLA.Library
 		SectMenuStep = 0x0020,
 		StepAllowNone = 0x0040,
 		StepFirst = 0x0080,
-		StepLast = 0x0100,
-		StepAllChildren = 0x0200
+		StepLast = 0x0100
 	}
 	public enum E_EMode : uint
 	{

PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs

@@ -4508,15 +4508,6 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _AllowNoteCautionAdd, "@AllowNoteCautionAdd");
 			}
 		}
-		// F2024-049 changed to specify the sub-step level via the format file (Generic EOP and Vogtle 3&4)
-		private LazyLoad<int?> _ResetSeqNumberingAfterUnnumberedHLS;
-		public int? ResetSeqNumberingAfterUnnumberedHLS
-		{
-			get
-			{
-				return LazyLoad(ref _ResetSeqNumberingAfterUnnumberedHLS, "@ResetSeqNumberingAfterUnnumberedHLS");
-			}
-		}
 	}
 	#endregion
 	#region TopOfPage
@@ -6644,17 +6635,6 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _UseEntireSectionNum, "TabData/@UseEntireSectionNum");
 			}
 		}
-		// this will remove white space before/after the tab value
-		// put in for Vogtal Units 3 & 4 formats for continuous action sub-steps
-		// they have tab value within parenthesis and for a single digit/letter we don't want the white steps before or after it
-		private LazyLoad<bool> _TrimSeqTabValue;
-		public bool TrimSeqTabValue
-		{
-			get
-			{
-				return LazyLoad(ref _TrimSeqTabValue, "TabData/@TrimSeqTabValue");
-			}
-		}
 
 	}
 	#endregion
@@ -7280,15 +7260,6 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _ProcLevelPCPC, "@ProcLevelPCPC");
 			}
 		}
-		// F2024-030 for Vogtle Units 3 & 4, added KeepOnePCPCTag flag to keep one of the PC/PC tokens when editing
-		private LazyLoad<bool> _KeepOnePCPCTag;
-		public bool KeepOnePCPCTag
-		{
-			get
-			{
-				return LazyLoad(ref _KeepOnePCPCTag, "@KeepOnePCPCTag");
-			}
-		}
 	}
 	#endregion
 	#region TransType

PROMS/VEPROMS.CSLA.Library/VEObjects/VETreeNode.cs

@@ -199,12 +199,9 @@ namespace VEPROMS.CSLA.Library
 			LoadChildren(true);
 		}
 		private bool _allParts = true;
-		private bool _excludeTablesFigsEqu = false; // used for inserting Step Text transitions (BNPP)
-		public virtual void LoadChildren(bool allParts, bool excldTablesFigEq = false)
+		public virtual void LoadChildren(bool allParts)
 		{
 			_allParts = allParts;
-			// B2024-019 don't show Tables, Figures, or Equations in step tree when inserting Text Transitions
-			_excludeTablesFigsEqu = excldTablesFigEq;
 			if (!_ChildrenLoaded)
 			{
 				this.Nodes.Clear();
@@ -265,10 +262,6 @@ namespace VEPROMS.CSLA.Library
 					if (!skipIt)
 					{
 						VETreeNode tmp = new VETreeNode(o, _allParts);
-						// B2024-019 don't show Tables, Figures, or Equations in step tree when inserting Text Transitions
-						bool isTableFigEqu = tmp.Text.Equals("Table") ||
-									tmp.Text.Equals("Figure") ||
-									tmp.Text.Equals("Equation");
 						if (o.HasChildren)
 						{
 							if (o is PartInfo)
@@ -286,8 +279,7 @@ namespace VEPROMS.CSLA.Library
 							tmp._ChildrenLoaded = true;// Reset the children loaded flag
 						if (lastWasSection)
 							this.Nodes.Insert(0, tmp);
-						// B2024-019 don't show Tables, Figures, or Equations in step tree when inserting Text Transitions
-						else if (!_excludeTablesFigsEqu || !isTableFigEqu)
+						else
 							this.Nodes.Add(tmp);
 						// if last thing was section & this is step, do insert - i.e. so that steps go before sections.
 						lastWasSection = (o is PartInfo && (o as PartInfo).PartType == E_FromType.Section);

PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj

@@ -18,7 +18,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
@@ -83,7 +83,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Csla">
+    <Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
     </Reference>
     <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">

PROMS/VEPROMS.CSLA.Library/app.config

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.Serialization.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

PROMS/VEPROMS.CSLA.Library/packages.config

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="5.0.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Configuration" version="5.0.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Configuration.Abstractions" version="5.0.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Configuration.Binder" version="5.0.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.DependencyInjection" version="5.0.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="5.0.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Primitives" version="5.0.0" targetFramework="net462" />
-  <package id="System.Buffers" version="4.5.1" targetFramework="net462" />
-  <package id="System.ComponentModel" version="4.3.0" targetFramework="net462" />
-  <package id="System.ComponentModel.Annotations" version="4.7.0" targetFramework="net462" />
-  <package id="System.ComponentModel.Primitives" version="4.3.0" targetFramework="net462" />
-  <package id="System.Data.Common" version="4.3.0" targetFramework="net462" />
-  <package id="System.Memory" version="4.5.4" targetFramework="net462" />
-  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net462" />
-  <package id="System.Reflection" version="4.3.0" targetFramework="net462" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net462" />
-  <package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="net462" />
-  <package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net462" />
-  <package id="System.Runtime.Serialization.Xml" version="4.3.0" targetFramework="net462" />
-  <package id="System.Security.Principal" version="4.3.0" targetFramework="net462" />
-  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
-  <package id="System.Threading.ThreadPool" version="4.3.0" targetFramework="net462" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
-</packages>

PROMS/VG/VG.csproj

@@ -35,7 +35,7 @@
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/Volian.Base.Library/Volian.Base.Library.csproj

@@ -18,7 +18,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>

PROMS/Volian.Controls.Library/DisplayRO.cs

@@ -903,9 +903,9 @@ namespace Volian.Controls.Library
 						// Pad to 16 to store in the RoUsage table.
 						string padroid = ROFSTLookup.FormatRoidKey(roc.roid, true);
 						string linktxt = string.Format(@"#Link:ReferencedObject:<NewID> {0} {1}", padroid, MyROFST.RODbID);
-						
+
 						// Resolve symbols and scientific notation in the RO return value
-						string valtxt = MyROFSTLookup.GetTranslatedRoValue(padroid, MyRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, MyRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, MyRTB.MyItemInfo);
+						string valtxt = MyROFSTLookup.GetTranslatedRoValue(padroid, MyRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, MyRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false);
 
 						MyRTB.OnRoInsert(this, new StepRTBRoEventArgs(valtxt, selectedChld.value, linktxt, padroid, MyROFST.RODbID));
 					}

PROMS/Volian.Controls.Library/DisplayTransition.cs

@@ -687,8 +687,6 @@ namespace Volian.Controls.Library
 					cbPageNum.Checked = _ModExistingPageNum = tc != null && tc.Transition_Formatted.ToUpper() == "TRUE";
 				}
 			}
-			// B2024-016 if transition format does not have {First Step} then don't show step list
-			HideStepTreeIfNeeded();
 		}
 		#endregion
 		#region Events
@@ -898,11 +896,7 @@ namespace Volian.Controls.Library
 			// allow this (12/2/09).  Note that this was changed to not allow transitions
 			// to RNOs (10/2010), this 'feature' will be added at some later date.
 			tn.ChildrenLoaded = false;
-			// F2024-047 BNPP standard Text transition - pass True to LoadChildren to load all children.
-			E_TransUI etm = (E_TransUI) _CurItemFrom.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList[_TranFmtIndx].TransUI;
-			bool loadAllChildren = ((etm & E_TransUI.StepAllChildren) == E_TransUI.StepAllChildren);
-			bool excludeTableFigEqu = loadAllChildren; // don't show Tables, Figures, or Equations in step list
-			tn.LoadChildren(loadAllChildren, excludeTableFigEqu); 
+			tn.LoadChildren(false); 
 		}
 		private void cbTranSects_SelectedIndexChanged(object sender, EventArgs e)
 		{
@@ -922,10 +916,11 @@ namespace Volian.Controls.Library
 			}
 			else
 			{
-				_InitializingTrans = true;          // just initializing now, don't set any ranges, etc.
+				_InitializingTrans = true;			// just initializing now, don't set any ranges, etc.
 				tvTranFillIn((secitm.Steps == null || secitm.Steps.Count == 0) ? null : secitm.Steps[0]);
-				// B2024-016 only show the list of steps if used by the select transition
-				HideStepTreeIfNeeded();
+				tvTran.Enabled = true;
+				cbIncStepNum.Enabled = true;
+				cbIncStepNum.Checked = true;
 				// if doing a 'new' range, no node is selected in tree.  Without this, the first node in the
 				// tree was the selected node which was throwing off the logic for defining the _RangeNode1 
 				// and _RangeNode2
@@ -940,20 +935,6 @@ namespace Volian.Controls.Library
 				SaveCancelEnabling();
 			}
 		}
-		// B2024-016 Hide the step tree when the transition definition does not include a step number {First Step}
-		private void HideStepTreeIfNeeded()
-		{
-			string trnFmt = _CurItemFrom.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList[_TranFmtIndx].TransFormat;
-			// F2024-047 Added check for {Step Text} so that the step tree is displayed
-			//           Needed for BNPP transition to step text only for standard text
-			bool showStepList = trnFmt.Contains("{First Step}") || trnFmt.Contains("{Step Text}");
-			if (!showStepList)
-				tvTran.Nodes.Clear(); // clear the tree view of steps if not needed for selected transition
-			tvTran.Enabled = showStepList; // show the tree view of steps?
-			cbIncStepNum.Enabled = showStepList; // display the Include Step checkbox?
-			cbIncStepNum.Checked = showStepList; // uncheck the Include Step?
-		}
-
 		// B2018-002 - Invalid Transitions - Declare Default Section variables
 		private bool NeedsDefault;
 		private bool HasDefault;
@@ -1342,13 +1323,7 @@ namespace Volian.Controls.Library
 				return;
 			}
 			// B2015-170 - don't allow a transition to step that is not sequential
-			// B2024-019  - but allow if TranFmt only contains {Step Text}
-			//            - Calvert uses {Step Text} but also includes step number
-			//            - Barakah (BNPP) uses just {Step Text} to link to standard text
-			bool onlyStepText = false;
-			if (listBoxTranFmt.Text.Contains("{Step Text}") && !listBoxTranFmt.Text.Contains("{First Step}"))
-				onlyStepText = true;
-			if (!onlyStepText && (toItem != null &&!toItem.IsNumbered) || (rangeItem != null && !rangeItem.IsNumbered))
+			if ((toItem != null &&!toItem.IsNumbered) || (rangeItem != null && !rangeItem.IsNumbered))
 			{
 				FlexibleMessageBox.Show("For transitions containing step references, the transition must be to a numbered or lettered step.",
 					"Cannot add transition to a non-sequential step", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);

PROMS/Volian.Controls.Library/EditItem.cs

@@ -2185,9 +2185,6 @@ namespace Volian.Controls.Library
 			// B2017-043 account for Horizontal Scroll
 			int colT = MyStepPanel.DisplayRectangle.X + MyStepPanel.ToDisplay((int)myStepSectionLayoutData.ColT);
 			if (x < colT) x = colT;
-			// B2023-025: if x is <= 0, add 20 to it so that left column of table isn't cut-off. 20 was used because lesser numbers
-			//	still cut-off the left column (by trial and error).
-			if (x <= 0) x = 20;
 			int y = FindTop(myParentEditItem.Bottom);
 			return new Point(x, y);
 		}
@@ -3583,9 +3580,6 @@ namespace Volian.Controls.Library
 		private string ResolveUnitApp(DocVersionInfo dvi, string str)
 		{
 			if (dvi == null) return str;
-			// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
-			str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(dvi, str);
-			// look for un-resolved tokens and replace less/greater than chars with "*?" and "?*" respectively 
 			string tmp = str.ToUpper();
 			int sindx = tmp.IndexOf("<U");
 			int eindx = tmp.IndexOf(">", sindx + 1);
@@ -3594,34 +3588,21 @@ namespace Volian.Controls.Library
 			{
 				reptmp = str.Substring(sindx, eindx - sindx + 1);
 				tmp = reptmp.ToUpper();
-				str = str.Replace(reptmp, tmp.Replace("<", "*?").Replace(">", "?*")); // unresolved token
+				if (tmp == "<U>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Number);
+				else if (tmp == "<U-TEXT>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Text);
+				else if (tmp == "<U-NUMBER>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Number);
+				else if (tmp == "<U-NAME>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Name);
+				else if (tmp == "<U-ID>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_ID);
+				// B2021-145: For applicability, the tree view & pdf file name are not getting resolved when using any of the <20>OTHER<45> tokens
+				else if (tmp == "<U-OTHERTEXT>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Text);
+				else if (tmp == "<U-OTHERNUMBER>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Number);
+				else if (tmp == "<U-OTHERNAME>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Name);
+				else if (tmp == "<U-OTHERID>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_ID);
+				else str = str.Replace(reptmp, tmp.Replace("<", "*?").Replace(">", "?*"));
 				tmp = str.ToUpper();
 				sindx = tmp.IndexOf("<U");
 				eindx = tmp.IndexOf(">", sindx + 1);
 			}
-			//string tmp = str.ToUpper();
-			//int sindx = tmp.IndexOf("<U");
-			//int eindx = tmp.IndexOf(">", sindx + 1);
-			//string reptmp;
-			//while (sindx > -1 && eindx > -1) // B2022-007 added while loop to process more than one <U- RO value
-			//{
-			//	reptmp = str.Substring(sindx, eindx - sindx + 1);
-			//	tmp = reptmp.ToUpper();
-			//	if (tmp == "<U>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Number);
-			//	else if (tmp == "<U-TEXT>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Text);
-			//	else if (tmp == "<U-NUMBER>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Number);
-			//	else if (tmp == "<U-NAME>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Name);
-			//	else if (tmp == "<U-ID>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_ID);
-			//	// B2021-145: For applicability, the tree view & pdf file name are not getting resolved when using any of the <20>OTHER<45> tokens
-			//	else if (tmp == "<U-OTHERTEXT>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Text);
-			//	else if (tmp == "<U-OTHERNUMBER>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Number);
-			//	else if (tmp == "<U-OTHERNAME>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Name);
-			//	else if (tmp == "<U-OTHERID>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_ID);
-			//	else str = str.Replace(reptmp, tmp.Replace("<", "*?").Replace(">", "?*"));
-			//	tmp = str.ToUpper();
-			//	sindx = tmp.IndexOf("<U");
-			//	eindx = tmp.IndexOf(">", sindx + 1);
-			//}
 			return str;
 		}
 		// C2021-018 used to display Alarm Point Table RO values in the editor

PROMS/Volian.Controls.Library/Properties/licenses.licx

@@ -1,2 +0,0 @@
-C1.Win.C1FlexGrid.C1FlexGrid, C1.Win.C1FlexGrid.2
-C1.Win.C1SpellChecker.C1SpellChecker, C1.Win.C1SpellChecker.2

PROMS/Volian.Controls.Library/StepTabRibbon.cs

@@ -563,7 +563,7 @@ namespace Volian.Controls.Library
 			string linktxt = string.Format(@"#Link:ReferencedObject:<NewID> {0} {1}", padroid, MyLookup.MyDocVersionInfo.DocVersionAssociations[0].MyROFst.MyRODb.RODbID);
 			// Resolve symbols and scientific notation in the RO return value
 			string valtxt = MyLookup.GetTranslatedRoValue(padroid, MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues,
-			 false, MyStepRTB.MyItemInfo); //ConvertSymbolsAndStuff(selectedChld.value);
+			 false); //ConvertSymbolsAndStuff(selectedChld.value);
 			MyStepRTB.OnRoInsert(this, new StepRTBRoEventArgs(valtxt, myvalue, linktxt, padroid, MyLookup.MyDocVersionInfo.DocVersionAssociations[0].MyROFst.MyRODb.RODbID));
 		}
 		private void SaveROWithAnnotation_Click(object sender, EventArgs e)
@@ -580,7 +580,7 @@ namespace Volian.Controls.Library
 			string padroid = (myroid.Length <= 12) ? myroid + "0000" : myroid;
 			string linktxt = string.Format(@"#Link:ReferencedObject:<NewID> {0} {1}", padroid, MyLookup.MyDocVersionInfo.DocVersionAssociations[0].MyROFst.MyRODb.RODbID);
 			// Resolve symbols and scientific notation in the RO return value
-			string valtxt = MyLookup.GetTranslatedRoValue(padroid, MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, MyStepRTB.MyItemInfo); //ConvertSymbolsAndStuff(selectedChld.value);
+			string valtxt = MyLookup.GetTranslatedRoValue(padroid, MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false); //ConvertSymbolsAndStuff(selectedChld.value);
 			MyStepRTB.OnRoInsert(this, new StepRTBRoEventArgs(valtxt, myvalue, linktxt, padroid, MyLookup.MyDocVersionInfo.DocVersionAssociations[0].MyROFst.MyRODb.RODbID));
 		}
 		private void NoROFound_Click(object sender, EventArgs e)
@@ -1999,9 +1999,6 @@ namespace Volian.Controls.Library
 			btnReviewCreatePDF.SubItems.Clear();
 			btnReviewCreatePDF.Tag = null;
 			btnReviewCreatePDF.Click -= new System.EventHandler(btnPdfCreate_Click);
-			btnReviewPdfQuickCreate.SubItems.Clear();
-			btnReviewPdfQuickCreate.Tag = null;
-			btnReviewPdfQuickCreate.Click -= new System.EventHandler(btnPdfQuickCreate_Click);
 			int k = 0;
 			foreach (string s in unitNames)
 			{
@@ -2020,14 +2017,10 @@ namespace Volian.Controls.Library
 				btn = MakeSubMenuButton(s, k, miMultiUnit_Click);
 				btn.Enabled = procAppl;
 				btnCASCreate.SubItems.Add(btn);
-				btn = MakeSubMenuButton(s, k, miMultiUnit_Click);
-				btn.Enabled = procAppl;
-				btnReviewPdfQuickCreate.SubItems.Add(btn);
 			}
 			btnPdfCreate.AutoExpandOnClick = true;
 			btnPdfQuickCreate.AutoExpandOnClick = true;
 			btnReviewCreatePDF.AutoExpandOnClick = true;
-			btnReviewPdfQuickCreate.AutoExpandOnClick = true;
 			btnCASCreate.AutoExpandOnClick = true;
 		}
 		private DevComponents.DotNetBar.ButtonItem MakeSubMenuButton(string s, object tag, EventHandler ehandler)

PROMS/Volian.Controls.Library/StepTabRibbon.resx

@@ -475,6 +475,145 @@
         hGKxCEVRYBPCyOfzWNyNYH7nGXNbT+CFIHjXA9y+C72gZ5BH98AsuH4buL4ZdPVO07hkajqdRiKRQDwe
         hyRJFJ2ALCwm1+9oZF54hH3zXkdLgom1W7x9puARL2mDkaYC6+oN/WnzsEgvsyD3mM3/gbnZOjB9Aytc
         DAdFhtjSAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="btnTblOutline.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAADAFBMVEUEAgQEggQEgoQEAoQE/vwE/gSE
+        AoSEAgTEwsT8Avz8/gQEAvz8/vyEggSEgoT8AgT/////////////////////////////////////////
+        ////////////////////////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////////////////////////
+        //////////////////////////////////////9NzlhFAAAACXBIWXMAABJxAAAScQHz3HqOAAAAI0lE
+        QVQoU2PgQQMMPAwoACQAlQKDISaAAlDlQYCBAwVwcAAADI8JaX0nfcEAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="btnTblDgnInsertRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJxAAAScQHz3HqOAAAAIElE
+        QVQoU2P4//8/QcxQUFDwHx8GK0LWgQsPZ5P+MwAAVKncTluNXg0AAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="btnTblDgnInsertColumn.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr2AAAK9gHCr3ADAAAAyUlE
+        QVQ4T6WRMQtBYRhGLZTJZrTZ3DIZjUabvyGDwWK4ioEsSoqSWKREGfkBbEpStktSFkUpLj0+i+F9vsGX
+        4Qzn9LzT6wHwF9pogjaaoI0mUKhOXiiPH0jXdxedSyh8xmvnCSs1UMouoVAa3rA9uAgnu0rZJRTs/hUr
+        x0Uo0VTKLqGQ750x37gIxmtK2SUUcu0Tpss7ArGKUnYJhWzriNHiDn+0qJRdQiHT2KMzu8IbsZWySyh8
+        /u2zCt8D6RIKpmijCdr4O/C8AZF98ic9bkEXAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="btnTblDgnRemove.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr2AAAK9gHCr3ADAAACLUlE
+        QVQ4T52TvY/ScBjHuVIRKHA9JAgnL+VoC7TX0kLLS6EvFBTa0uj5J7gYF+PsfpOTMrg4ORgHY+LCYJwc
+        TYyJiYuDLu7GxHgxd/Hnr5fA8TZcrsmnzfN9nufTNPnVBwDw2ZYljGzr3ciyTNu2EC87L75eb+DvD67f
+        hU9g9vt/HNs5cMaOf9Owohro7YNbe8PhjfuzzBOgkDuabk6bbRXoxuBkNLIeus6yhKyIwY5umo5tHxmG
+        +Wwu8G5QkIa0jN5gqnR1oOkGuOk6b1x3jHl9uaWGhpb1UtXNY1luPmJ4KbIkmAElAcgD3egfa5oJxq77
+        oq3ovKJoE7XbBbwoTWhG2F7cWRJ4dFR1S9fNCvykT41mB9TqjSOxXvtJM9zrYokLrc4vFYtUBcngq9Lf
+        tqICvlr7RhQr8U1za4FHXZIIurT/mePFf1AEJLkFGJb7uml2LRBrcp4us1+g4KRcYV8lkmkplyenglgH
+        VIm9tzq/VJRZLpUlih9yBQrAt79Pp3bjkVgM244nsPwe/VQQ6r8pRsgu7pwtC61grkA/T10r/NrnxB8s
+        V2VmvQiOB0MhLMZVxY/pDPEkU6DnZ2Qu2M0STjJFAIpmAUmXD0NY9PQMzEBRPwJzkiSp71F8J1/ipNMj
+        f9rE8XggkUgexq9cBXmi+DYYjtCRGL72T+D4jr/RaE+waFgu8c0zgUcmT9UuBS4/9m0hmh9Fo7N8FXih
+        CIKE5/Vi8yJsDM8P8P0HLGwR4Wl3ICYAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="btnTblDgnAdjustSize.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr2AAAK9gHCr3ADAAABmUlE
+        QVQ4T7WSSyiEURiG/w32UpRiIYUm18Qgl5QsWJAkInaSSLk00zBTFv5RioUoC6SEkJCIwkLjNoqFzMal
+        KbdcakJIvc75dP7O0WwsLJ6+3nO+9z1/3/drAAyaRi5YgZZSNgROdEEvaUFt34miOYoQAZzfZs6fAvxR
+        pR+xop6RSWC167A5nISF0dGpo7HdifikVFTpbpR376HUvoNi6zZBAXKazaHj6eULD74v3D5/4ur+A0ub
+        p0hNz6Hmkq4dqjI0MCH4y9x8/fiJi7t3nHlfMTp/gFhTMvUUWbaMXgEFiIHxz755YubbH/Px+QuGp3YR
+        HhFF9wWt61RllGm3dzpxyV72eN/IfOjxYWDCheCQMOrJa14xegWK4AObXTvGyNw+BtnL/czcN+ZCQGAQ
+        u4aW1bBIVUYRaeZsZOYWIiHZjMioGISEhpNZozb2g9XNUJVRBF+TrH+TWDPJinqmVfa4weFmvqYi6xYK
+        2zaQ37KKnMZlZNQvIKV2GgnVkzBVTiCuYtyAAuQ0f2uSESYZRfhbk8z/B/wdaN/UwtLmFVaBLwAAAABJ
+        RU5ErkJggg==
+</value>
+  </data>
+  <data name="btnTblDgnSplitCells.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr2AAAK9gHCr3ADAAAAtklE
+        QVQ4T2P4//8/RRjOqKrv+F/T0AnGlUCcU9b5X8/QFCiFXw5uQE1DB0jg/6/ff/9//v4HjE0t7EFCeOWQ
+        DOgEKvj3P6Dp63/D1LP/7775/V9TxwisCJ8c3ACQ00AmWxY9+q+fdOL/ietP/0vLKYMV4ZODGwDyF0gR
+        yHSQgm1HL/8XEpEAK8InBzfA3NLuv7WDx399I8v/8soa/0XEpYGyICn8cnADyMVwxmg0DotoJA//ZwAA
+        qy/GB3Ky9SEAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="btnTblDgnMergeCells.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr2AAAK9gHCr3ADAAACMklE
+        QVQ4T6VT30tTcRT//gm+9OBbL/Xai3vooR9oUVbYjOnmdVyxTalFGxuJa+FljbVCy5WrLTOTvIgNM3Fk
+        rpb9kCyHrVoMNAqJkRgi9BSBL5885zIf7mW9dOG8fPh+zvmcz/lcEZ+J7N4sxDJhRJ9eRM8TBZFUAMGJ
+        DgTGvOgYPQuPegqnh5xw3G2BfLsZ0i0bGmMNVPuoAd4X3+HL+iIKa5/xYTWH+R9zeLk8g+mvjzG5OI5k
+        YQTDn+7hTi6O+EIfet92Q0kHIHltEDSZyPmfH5GaXcLD53moqXn0J19grDAKNT9kwJXMeThVGfWO4xDR
+        dJAnL6xk+RF9fzYAuzvC5IFcwoB3TvkgDzTjgKUGonuqi2W/Kb7mCb9+A9/XgKNyJ5Nj2agB9z1yw56w
+        wlRdBRGe9PPOz76lWV5xHcgtA6ZaB5Ovzl0x4O6kC9Y+C3bu2gGhjJ9jw1JLE4gNT7NEmkIPiRyZDW3h
+        hFG51HY0XDOjcnslhD/pYbdLhpVkl8hkGO1MsmkykdsHT8J8uQ4V2yogvCMuPlU5t4msx1sTMo6FjmgN
+        ztxv4zuXc5sm63H7DQm1XYe0Bm2DrRyScm6TbD1u62nEQX+N1qCl384JK+c27azHLZdOoNq3X2sgxZtw
+        M3sd4VdBwxVKhulxc7AOez17tAb0U4QyClwPnBxPShiFhO5MpyK3yTDamWTTZCKb5KqtBoebLlghuW2c
+        bYonJYxCQnemR/+oerFp7n8UxF+CFapvsjm7iAAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="btnTblDgnAlignText.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr2AAAK9gHCr3ADAAACMElE
+        QVQ4T6WS30uTURjHdx/+AeE/MBR2M3aZV90IXSx0Gl0YkRdFQoFdOMYu6iJsIghpKXNmmzPz53I618YY
+        U5zODMyKsjZ1plPX+5Y5WsrmPvm+rz9KEiEf+HIe+J7z4TnnfFWOwUmcQ1N0Dr+S1w53BMfgBE9dYZ70
+        j2HrDWHtDtLSFeBxp5+mjpc0Orw8tI/IkgGZXIbU1o6slY0sc2tZuoNx7jZ7/vKO+rria6icQxHZGJ3+
+        LGs4HJNNSdV1rgMvOBXFPxnDE57nxdgCfaFFBSBNUNPgOVB1nZtb913cuNdHpfk5V4xOLt+xU3a7jYs3
+        W7lwvYXiykecv9qoANoHxjmpcjnI7uTY2s6SSmf4vrnN+rdfCqC1J7S37bBEUaS+vp6KigoMBgOODidf
+        xU2EjS2+rP/k09IPfONzCqD5WYB4PI7FYiGVSsmAaDRKMplEEATyz+ZTXn6JWHyVlaRy2Gw20+9/owCk
+        bzEajej1ejQaDQUFBaTTaXw+H7W1D8g7k0dpqYEP0QQmk4mqqiq0Wi2FhYUKQPrL5eVl+WAsFpMnsNls
+        lJSUsJYUFYChjI8LAu/nN4i8W0OtVu9mZuYQcLSsVitFRUXUGE3odDrO7fYNTW28nhMZn00SmF7FPrh3
+        hX1AIpGQJQgii4tL9PQO4HJ78QfDuL2jjAQiTMzE6fK+xeGexeb6Y4JT5UACHBdlKYknRlkCSMa/oixN
+        sO8dG2UJIDX/K9Xu+51CqH4DsLwA5JN+awcAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="btnTblDgnCopy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJxAAAScQHz3HqOAAABaElE
+        QVQ4T6WQz0sCQRiG/XO02vof+kH0iw4WleRm0SGig6cigtworUsgblEQgV26lUERUUZSggZJQSsqGrgn
+        QfC0K7govjkDWbuMaPjBM4eZ+Z7vnTEBaAvTVSgLFs7j7DWrwQgVGIvsOQR/S5KGglD0Aw6nt6mkLvBH
+        f6EJ9moCA7wnhhUxpRMyE5AiDT9VrVZRLpdh334FZz3H0v57XcJMQPgr0DQNqqrC5nrBWSCGzvFTLLjD
+        VNI0QS0ylr0SQpEvTG0E0TF2AsvoESwjh+S4cQLyXjK1UCggl8tBlmVkMhkkk0l4DgIwD/n0gkqlglKp
+        hGKxCEVRYBPCyOfzWNyNYH7nGXNbT+CFIHjXA9y+C72gZ5BH98AsuH4buL4ZdPVO07hkajqdRiKRQDwe
+        hyRJFJ2ALCwm1+9oZF54hH3zXkdLgom1W7x9puARL2mDkaYC6+oN/WnzsEgvsyD3mM3/gbnZOjB9Aytc
+        DAdFhtjSAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="btnTblDgnPaste.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr2AAAK9gHCr3ADAAACX0lE
+        QVQ4T6WSa0hTYRjHD/TBvhRdqE99Koi+RFFB9SGjUAsvLYzEjMxFTKVkk6XpSC1N0eVtadqMvAw1b5Uo
+        KUUiJI7uGs7oIpEauZa1s3nP4tc5RwZNBgW98OPA+77/3/O8D0cA/gufmz3tOXTdzqS1KhVtTMh2X3c8
+        CC21RXoJPFQVHMdpr2PSfoORwXySNUEUZeu5ZjRgyk6SCVwsYEZsZs7VxIyzHku5nqnxGpJjVbbXvSlc
+        OBtKinoH9p6TjHesRxt9SMotEsjhOVcDZTkn6LPmI34qYWzQwAfrKdoqVMRG+VOXto4XRQLxx0K8BU01
+        BQsC8RbGtGgy9JEYEiI4Hx+OXqNCpw4lLiqAYu0GRRAZ7O8tqK80Mis2MuswMzWai+NVAraa1QoD1avo
+        K1/GU5OfEpYJ2L3VW2Ax5zDtqGJ6OIupN2eYfHkEsX05hdUd5JpbuXi1kRSjBV1mBbGpJqIT87wFlaWZ
+        TIyYmBzUMPEsFPejbXy5u0YJe9bc/E+crhmGx5xExF0iLMYgby8IKgrTEd9m4X4ShLt7M67OtYxUC0pl
+        eVXe6VEwN3QxMGRXwg96bRwIV8vHglCal8q3/nO4ujYh3luJo9mPoZuC0vaP+V98d0uVPzsZeG/H2v+R
+        4CgdQVJ4/8HD+O/Zi1B8OQnH4zgpvIKvLUsZrV2CrUxAK71ZbtvTwXWpgxJLJ23dNuUrs2vLRoQrGYnK
+        D+KZsgeNNLA/Kz+0vlPCzff7aOh47iUILEw/Lf1hKtThgYTt26kcyNOW3+yp5gtFIA/CF0elacsX/obP
+        8L+D8Bsb4cocWY3wtQAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="btnReviewFind.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -551,50 +690,6 @@
         CbORqIOmx6ffhPMAQEdHB3e69xx39GD3L6bHPAfnpxfPzk7NuWcmZtzTY9PuqZtT7snRSffkyKR7Ynii
         kesT7vHr443ztfH6681r9v7k8KR7amTKPX1j2j0zNuO+dOHS9hyfa1a862hra+O2tm/l2tvbW9raW9u3
         drR1tLa1dmxp3dLR0trS0bKlEa6F66CP/79ppdznn1OO+x8FMcZP/Ws5zwAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="btnReviewPdfQuickCreate.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr2AAAK9gHCr3ADAAAI0UlE
-        QVRYR53XSWwb1xkH8JElS+i50KUIempB9FyguQRoiya2gSyHOEWQADnkFtRxmwRBENcIigZx0sDNVsCJ
-        d1mSZcv0EluS7aS2JFv7QslaSIkUd3KG+zILZx/y3++RVBzvTgf4YzhDit/vfe89YsSx41/79nN79/yj
-        9ejBEz/vOtLb2XWkp7PrKOVYIydYjnffThdds/z43vGezu4TvZ09J04209d5svtUZy+d93/62c8unh+s
-        17rvMdh3k+s/fPmXKyPpq4GJ4mJwpugJe0qe6FLJE/eWPIn1socPlD1CqOxJRURPOip6MjE6s9DrVIS9
-        V/LwwaIn4S94Yms5T2Q16wkupT1+D+8ZuTL951K8yrW0tDQr3nVc7p3k3Ie+dwVuyKnYjIXkgoXUio3s
-        uo180EEx6qCcqEISapDTNShZoJID1HzjrGTZ/SrElINS0kI+qiMTUiH4ZcS9ZUwNL+2ChAcDhnonuDOH
-        vnP5RyUhOmUiMW9CWLaQ8VnIBQgRtlGMESLpEKJaL8aKVhIaKhnnNiLDEDYhTORjDFEBH5Awc2N5FzQ0
-        q93nGOwZ5/oPfudaHxEJYCA+b4BfMpH2Wsj6aUQhBmBf7EAUCJGhkS/zMD/8DMapoUYnCpQ8IbLUqbSN
-        smCikCBERMHc+Mou2I8EXHWtDYtCZJIAcwaStwykvCYBaDQhC4UoARLsiwlAI9aOnYVxqA/64E1oORta
-        ie5R1CJNUZ66RPfEDCF4DZ4pAuBhgO6xJqBMAB2xOb0JMJAhQC5IXxS1mgC7DjA+/gr6ue+hzaxBK9jQ
-        RUCXGtHEGtQyTU2REFkdi7OrDwcMMMA3DUB4UiOARgAdwioDGMiFGMCsL7AyzbFErTY+ovYfPQXzP0eg
-        FwwYSg1mBTDVZio16EoVFdHE0sJjAE5/c8XlGy7dCfDSHNYBBgoxAvAWxLQFqUSArw7D2vtPWJ9+AUO2
-        YWo1WHoNjgk4ViO2RZ/TLKwsex8OuNR9swkoEkBFbF5FYkmD4NOQCejIhQ0U4wZKtLDErAmZWqyfG4Kz
-        bQfs/V/ANGuwzSocu4ZqtYZajcrRwc62bcPr/QmA0GSlDkgu0z5eI8CGVt/XxaSBctqg9ptQJAf6og+1
-        X/0aztFjoLpwHIeKV6koAzQFdLD7jwQM9BDgIAMUhNAUATyVOiC1rtJeJkBMo9HrEHMG5JIBVTah58uo
-        PvscnCtXaIc1Cm0iNiE/HTBSEMJTCmILCpKrFaT8KrIRFYWkhnJGg1TUUZEMaJoJM51B7ckn4XzyCWwq
-        yFp9PwS79vl8jwLcIMBll2+UADMK4osKeF8F6WAFuZiKYkqFmNegiDrUig6dilk08urTT6P64ouwBQE2
-        FbobsQl4dAd6CXCIADfyQmSOfr+XZAjrCjJhBflkBaWsSitfRUXRaPQE0DQ4b70Fu6sLzjvvwPn6a1jN
-        LtyNeLxFuNkBBpiXkViVkdqQkY0pKKQUlAsVKLIKVVWhGbTnV1Zo/p+FGYnAXFhA9YUXYPl890U8FuBi
-        zyh36uCQyzuaE8JzEgEkpIIycgkZxawCqazQ6Ct1gEoAa98+2O++C51hTBM2daD66quwksl7EJZlPUYH
-        To5ypw8PuXw3c0LEIyHpJUBIQp6XUSrIkCUCVCqoUOu1cBjOjh0wJiagUfE6QpbhfPABqq+8Asvvh0Vz
-        b7NQVZMQPr//Lw9fA30jXP+RIdfaRFaI3hLBr4vIRCUU0hLEEgGogKIoUAhgfvkl7DfegEbXmq43EDRa
-        o1SCs3cvak89BbuvD/boKJyBAdi9vSi+/HJvjeN2EuE3lC33UAZOE+DYkGt9KivEVkQIGyKySRHFnARJ
-        lOoAmXWARm8//zy08XGorDitftYJ68gR2NQBZ/duVHfuRHXbNtSeeAK1Z56B8/77ELdvP09F/075N+UP
-        DHAHYrB/hDtzfNDln80I7AkmFS4jJ4goFUVIEiEoDGB8/jksKqLOz0Pv74d54ADM48dhXL0KY3kZBs/X
-        p8PI5WBfuFAvblMKO3ceog78lor+rpmWOwHuYe7MiUFXYD4j0PMf0tEy8pkyymURIgNQcYVWvvXSS9Au
-        XoQ6PQ01GESF2s46odI0sN3BpkSnsIVp0NybNGUGfS69Z88BAjxHRX9P+dM9iKGzw5y7e9C1sZAWkoES
-        MokSCjkCsOI0KimRgPHee9Bp/lknZNoNCpuSZuq7g21RKsgAdURzh7BF6l1fry/CZtE/UnZQbq+FoXME
-        6CHArZTABwnAl1AslCGPjUEZHITa0wPztdcg0zaT2Hpopr4wKT+GMMQmhCHY69XVxvNAnmpR0TbKVlb8
-        B8Dl89e5s70DruBSShDCRWSFAuTePqg0x9LMDCxaWMp/r0GUFYgiTQubms3QdX2himy7Eoo+U//NqDQw
-        DLUJeOBx+QIB+giwIghCvITyyTPQ3n4bZfp1M15/Her+/SgWWVeKKOaLND2FO1LM0X1KKU9/S50T2eIt
-        30YtL9FT8cMAVy5e586dGnCFvIKQCmWgvvk3SN9+C233X6HSqs/Hk8hmcsimssgIGZqie5Pls9S5LHKp
-        HPLpPP2CNkAsiwuLjwE4TQAfL6SiWZSPd6OyZw+kDz+iR7IgUnwaQlwAH+PBR5uJ3BW6J0QFpGIppONp
-        ZJIZ2sq5ejyznkcALm0CkkIymqEvSdLDSAB8nEcimkQinEA8FEcsGENsgxK4N/FAHPGNOBLBBJKhJPjw
-        bdDs5OyjANe48/0MkEglQikkIknEI4l6wWggiog/gvB6GOE1ii+MkDf0Q8JeusdC9yO+CKJrUUTXo4j7
-        CbORqIOmx6ffhPMAQEdHB3e69xx39GD3L6bHPAfnpxfPzk7NuWcmZtzTY9PuqZtT7snRSffkyKR7Ynii
-        kesT7vHr443ztfH6681r9v7k8KR7amTKPX1j2j0zNuO+dOHS9hyfa1a862hra+O2tm/l2tvbW9raW9u3
-        drR1tLa1dmxp3dLR0trS0bKlEa6F66CP/79ppdznn1OO+x8FMcZP/Ws5zwAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="btnListUsers.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -779,145 +874,6 @@
         H2NJV4iAugB9ah3sbteUU5JqGZY1LDNWYfKe1NI0XStXNCdKHrCEGK6bTDio1SEhIxcd5y/Cps6DJ+0c
         7lfXgExOgDiFrpX8DbAVLUOILI7jzF5RnHssHzvDCb21F8rwQ4Yag2ZzgzDuXyAcZ1yOXZ+7AfRvydB7
         DEPfk5d5yv3IB5rnwbndkP+p5+Ox6W+GqiqkGDTJEQAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="btnTblOutline.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAADAFBMVEUEAgQEggQEgoQEAoQE/vwE/gSE
-        AoSEAgTEwsT8Avz8/gQEAvz8/vyEggSEgoT8AgT/////////////////////////////////////////
-        ////////////////////////////////////////////////////////////////////////////////
-        ////////////////////////////////////////////////////////////////////////////////
-        ////////////////////////////////////////////////////////////////////////////////
-        ////////////////////////////////////////////////////////////////////////////////
-        ////////////////////////////////////////////////////////////////////////////////
-        ////////////////////////////////////////////////////////////////////////////////
-        ////////////////////////////////////////////////////////////////////////////////
-        ////////////////////////////////////////////////////////////////////////////////
-        ////////////////////////////////////////////////////////////////////////////////
-        ////////////////////////////////////////////////////////////////////////////////
-        ////////////////////////////////////////////////////////////////////////////////
-        //////////////////////////////////////9NzlhFAAAACXBIWXMAABJxAAAScQHz3HqOAAAAI0lE
-        QVQoU2PgQQMMPAwoACQAlQKDISaAAlDlQYCBAwVwcAAADI8JaX0nfcEAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="btnTblDgnInsertRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJxAAAScQHz3HqOAAAAIElE
-        QVQoU2P4//8/QcxQUFDwHx8GK0LWgQsPZ5P+MwAAVKncTluNXg0AAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="btnTblDgnInsertColumn.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr2AAAK9gHCr3ADAAAAyUlE
-        QVQ4T6WRMQtBYRhGLZTJZrTZ3DIZjUabvyGDwWK4ioEsSoqSWKREGfkBbEpStktSFkUpLj0+i+F9vsGX
-        4Qzn9LzT6wHwF9pogjaaoI0mUKhOXiiPH0jXdxedSyh8xmvnCSs1UMouoVAa3rA9uAgnu0rZJRTs/hUr
-        x0Uo0VTKLqGQ750x37gIxmtK2SUUcu0Tpss7ArGKUnYJhWzriNHiDn+0qJRdQiHT2KMzu8IbsZWySyh8
-        /u2zCt8D6RIKpmijCdr4O/C8AZF98ic9bkEXAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="btnTblDgnRemove.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr2AAAK9gHCr3ADAAACLUlE
-        QVQ4T52TvY/ScBjHuVIRKHA9JAgnL+VoC7TX0kLLS6EvFBTa0uj5J7gYF+PsfpOTMrg4ORgHY+LCYJwc
-        TYyJiYuDLu7GxHgxd/Hnr5fA8TZcrsmnzfN9nufTNPnVBwDw2ZYljGzr3ciyTNu2EC87L75eb+DvD67f
-        hU9g9vt/HNs5cMaOf9Owohro7YNbe8PhjfuzzBOgkDuabk6bbRXoxuBkNLIeus6yhKyIwY5umo5tHxmG
-        +Wwu8G5QkIa0jN5gqnR1oOkGuOk6b1x3jHl9uaWGhpb1UtXNY1luPmJ4KbIkmAElAcgD3egfa5oJxq77
-        oq3ovKJoE7XbBbwoTWhG2F7cWRJ4dFR1S9fNCvykT41mB9TqjSOxXvtJM9zrYokLrc4vFYtUBcngq9Lf
-        tqICvlr7RhQr8U1za4FHXZIIurT/mePFf1AEJLkFGJb7uml2LRBrcp4us1+g4KRcYV8lkmkplyenglgH
-        VIm9tzq/VJRZLpUlih9yBQrAt79Pp3bjkVgM244nsPwe/VQQ6r8pRsgu7pwtC61grkA/T10r/NrnxB8s
-        V2VmvQiOB0MhLMZVxY/pDPEkU6DnZ2Qu2M0STjJFAIpmAUmXD0NY9PQMzEBRPwJzkiSp71F8J1/ipNMj
-        f9rE8XggkUgexq9cBXmi+DYYjtCRGL72T+D4jr/RaE+waFgu8c0zgUcmT9UuBS4/9m0hmh9Fo7N8FXih
-        CIKE5/Vi8yJsDM8P8P0HLGwR4Wl3ICYAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="btnTblDgnAdjustSize.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr2AAAK9gHCr3ADAAABmUlE
-        QVQ4T7WSSyiEURiG/w32UpRiIYUm18Qgl5QsWJAkInaSSLk00zBTFv5RioUoC6SEkJCIwkLjNoqFzMal
-        KbdcakJIvc75dP7O0WwsLJ6+3nO+9z1/3/drAAyaRi5YgZZSNgROdEEvaUFt34miOYoQAZzfZs6fAvxR
-        pR+xop6RSWC167A5nISF0dGpo7HdifikVFTpbpR376HUvoNi6zZBAXKazaHj6eULD74v3D5/4ur+A0ub
-        p0hNz6Hmkq4dqjI0MCH4y9x8/fiJi7t3nHlfMTp/gFhTMvUUWbaMXgEFiIHxz755YubbH/Px+QuGp3YR
-        HhFF9wWt61RllGm3dzpxyV72eN/IfOjxYWDCheCQMOrJa14xegWK4AObXTvGyNw+BtnL/czcN+ZCQGAQ
-        u4aW1bBIVUYRaeZsZOYWIiHZjMioGISEhpNZozb2g9XNUJVRBF+TrH+TWDPJinqmVfa4weFmvqYi6xYK
-        2zaQ37KKnMZlZNQvIKV2GgnVkzBVTiCuYtyAAuQ0f2uSESYZRfhbk8z/B/wdaN/UwtLmFVaBLwAAAABJ
-        RU5ErkJggg==
-</value>
-  </data>
-  <data name="btnTblDgnSplitCells.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr2AAAK9gHCr3ADAAAAtklE
-        QVQ4T2P4//8/RRjOqKrv+F/T0AnGlUCcU9b5X8/QFCiFXw5uQE1DB0jg/6/ff/9//v4HjE0t7EFCeOWQ
-        DOgEKvj3P6Dp63/D1LP/7775/V9TxwisCJ8c3ACQ00AmWxY9+q+fdOL/ietP/0vLKYMV4ZODGwDyF0gR
-        yHSQgm1HL/8XEpEAK8InBzfA3NLuv7WDx399I8v/8soa/0XEpYGyICn8cnADyMVwxmg0DotoJA//ZwAA
-        qy/GB3Ky9SEAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="btnTblDgnMergeCells.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr2AAAK9gHCr3ADAAACMklE
-        QVQ4T6VT30tTcRT//gm+9OBbL/Xai3vooR9oUVbYjOnmdVyxTalFGxuJa+FljbVCy5WrLTOTvIgNM3Fk
-        rpb9kCyHrVoMNAqJkRgi9BSBL5885zIf7mW9dOG8fPh+zvmcz/lcEZ+J7N4sxDJhRJ9eRM8TBZFUAMGJ
-        DgTGvOgYPQuPegqnh5xw3G2BfLsZ0i0bGmMNVPuoAd4X3+HL+iIKa5/xYTWH+R9zeLk8g+mvjzG5OI5k
-        YQTDn+7hTi6O+EIfet92Q0kHIHltEDSZyPmfH5GaXcLD53moqXn0J19grDAKNT9kwJXMeThVGfWO4xDR
-        dJAnL6xk+RF9fzYAuzvC5IFcwoB3TvkgDzTjgKUGonuqi2W/Kb7mCb9+A9/XgKNyJ5Nj2agB9z1yw56w
-        wlRdBRGe9PPOz76lWV5xHcgtA6ZaB5Ovzl0x4O6kC9Y+C3bu2gGhjJ9jw1JLE4gNT7NEmkIPiRyZDW3h
-        hFG51HY0XDOjcnslhD/pYbdLhpVkl8hkGO1MsmkykdsHT8J8uQ4V2yogvCMuPlU5t4msx1sTMo6FjmgN
-        ztxv4zuXc5sm63H7DQm1XYe0Bm2DrRyScm6TbD1u62nEQX+N1qCl384JK+c27azHLZdOoNq3X2sgxZtw
-        M3sd4VdBwxVKhulxc7AOez17tAb0U4QyClwPnBxPShiFhO5MpyK3yTDamWTTZCKb5KqtBoebLlghuW2c
-        bYonJYxCQnemR/+oerFp7n8UxF+CFapvsjm7iAAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="btnTblDgnAlignText.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr2AAAK9gHCr3ADAAACMElE
-        QVQ4T6WS30uTURjHdx/+AeE/MBR2M3aZV90IXSx0Gl0YkRdFQoFdOMYu6iJsIghpKXNmmzPz53I618YY
-        U5zODMyKsjZ1plPX+5Y5WsrmPvm+rz9KEiEf+HIe+J7z4TnnfFWOwUmcQ1N0Dr+S1w53BMfgBE9dYZ70
-        j2HrDWHtDtLSFeBxp5+mjpc0Orw8tI/IkgGZXIbU1o6slY0sc2tZuoNx7jZ7/vKO+rria6icQxHZGJ3+
-        LGs4HJNNSdV1rgMvOBXFPxnDE57nxdgCfaFFBSBNUNPgOVB1nZtb913cuNdHpfk5V4xOLt+xU3a7jYs3
-        W7lwvYXiykecv9qoANoHxjmpcjnI7uTY2s6SSmf4vrnN+rdfCqC1J7S37bBEUaS+vp6KigoMBgOODidf
-        xU2EjS2+rP/k09IPfONzCqD5WYB4PI7FYiGVSsmAaDRKMplEEATyz+ZTXn6JWHyVlaRy2Gw20+9/owCk
-        bzEajej1ejQaDQUFBaTTaXw+H7W1D8g7k0dpqYEP0QQmk4mqqiq0Wi2FhYUKQPrL5eVl+WAsFpMnsNls
-        lJSUsJYUFYChjI8LAu/nN4i8W0OtVu9mZuYQcLSsVitFRUXUGE3odDrO7fYNTW28nhMZn00SmF7FPrh3
-        hX1AIpGQJQgii4tL9PQO4HJ78QfDuL2jjAQiTMzE6fK+xeGexeb6Y4JT5UACHBdlKYknRlkCSMa/oixN
-        sO8dG2UJIDX/K9Xu+51CqH4DsLwA5JN+awcAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="btnTblDgnCopy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJxAAAScQHz3HqOAAABaElE
-        QVQ4T6WQz0sCQRiG/XO02vof+kH0iw4WleRm0SGig6cigtworUsgblEQgV26lUERUUZSggZJQSsqGrgn
-        QfC0K7govjkDWbuMaPjBM4eZ+Z7vnTEBaAvTVSgLFs7j7DWrwQgVGIvsOQR/S5KGglD0Aw6nt6mkLvBH
-        f6EJ9moCA7wnhhUxpRMyE5AiDT9VrVZRLpdh334FZz3H0v57XcJMQPgr0DQNqqrC5nrBWSCGzvFTLLjD
-        VNI0QS0ylr0SQpEvTG0E0TF2AsvoESwjh+S4cQLyXjK1UCggl8tBlmVkMhkkk0l4DgIwD/n0gkqlglKp
-        hGKxCEVRYBPCyOfzWNyNYH7nGXNbT+CFIHjXA9y+C72gZ5BH98AsuH4buL4ZdPVO07hkajqdRiKRQDwe
-        hyRJFJ2ALCwm1+9oZF54hH3zXkdLgom1W7x9puARL2mDkaYC6+oN/WnzsEgvsyD3mM3/gbnZOjB9Aytc
-        DAdFhtjSAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="btnTblDgnPaste.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr2AAAK9gHCr3ADAAACX0lE
-        QVQ4T6WSa0hTYRjHD/TBvhRdqE99Koi+RFFB9SGjUAsvLYzEjMxFTKVkk6XpSC1N0eVtadqMvAw1b5Uo
-        KUUiJI7uGs7oIpEauZa1s3nP4tc5RwZNBgW98OPA+77/3/O8D0cA/gufmz3tOXTdzqS1KhVtTMh2X3c8
-        CC21RXoJPFQVHMdpr2PSfoORwXySNUEUZeu5ZjRgyk6SCVwsYEZsZs7VxIyzHku5nqnxGpJjVbbXvSlc
-        OBtKinoH9p6TjHesRxt9SMotEsjhOVcDZTkn6LPmI34qYWzQwAfrKdoqVMRG+VOXto4XRQLxx0K8BU01
-        BQsC8RbGtGgy9JEYEiI4Hx+OXqNCpw4lLiqAYu0GRRAZ7O8tqK80Mis2MuswMzWai+NVAraa1QoD1avo
-        K1/GU5OfEpYJ2L3VW2Ax5zDtqGJ6OIupN2eYfHkEsX05hdUd5JpbuXi1kRSjBV1mBbGpJqIT87wFlaWZ
-        TIyYmBzUMPEsFPejbXy5u0YJe9bc/E+crhmGx5xExF0iLMYgby8IKgrTEd9m4X4ShLt7M67OtYxUC0pl
-        eVXe6VEwN3QxMGRXwg96bRwIV8vHglCal8q3/nO4ujYh3luJo9mPoZuC0vaP+V98d0uVPzsZeG/H2v+R
-        4CgdQVJ4/8HD+O/Zi1B8OQnH4zgpvIKvLUsZrV2CrUxAK71ZbtvTwXWpgxJLJ23dNuUrs2vLRoQrGYnK
-        D+KZsgeNNLA/Kz+0vlPCzff7aOh47iUILEw/Lf1hKtThgYTt26kcyNOW3+yp5gtFIA/CF0elacsX/obP
-        8L+D8Bsb4cocWY3wtQAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="btnInsTrans.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

PROMS/Volian.Controls.Library/VlnFlexGrid.cs

@@ -3716,17 +3716,17 @@ namespace Volian.Controls.Library
 		/// Grid will be saved to an Excel file.
 		/// </summary>
 		/// <param name="initDir"></param>
-		//public void ExportToExcel(string initDir)
-		//{
-		//	SaveFileDialog sfd = new SaveFileDialog();
-		//	sfd.DefaultExt = ".xls";
-		//	sfd.Filter = "Excel files (*.xls)|*.xls|All files (*.*)|*.* ";
-		//	//sfd.InitialDirectory = @"C:\Development\SampleTableData";
-		//	sfd.InitialDirectory = initDir;
-		//	sfd.Title = "Save Excel File";
-		//	sfd.ShowDialog();
-		//	this.SaveExcel(sfd.FileName);
-		//}
+		public void ExportToExcel(string initDir)
+		{
+			SaveFileDialog sfd = new SaveFileDialog();
+			sfd.DefaultExt = ".xls";
+			sfd.Filter = "Excel files (*.xls)|*.xls|All files (*.*)|*.* ";
+			//sfd.InitialDirectory = @"C:\Development\SampleTableData";
+			sfd.InitialDirectory = initDir;
+			sfd.Title = "Save Excel File";
+			sfd.ShowDialog();
+			this.SaveExcel(sfd.FileName);
+		}
 
 		/// <summary>
 		/// Prompts user with Open File dialog.
@@ -3761,25 +3761,25 @@ namespace Volian.Controls.Library
 		/// </summary>
 		/// <param name="initDir"></param>
 		/// <returns></returns>
-		//public string ImportExcel(string initDir)
-		//{
-		//	string rtn = "";
-		//	//VlnFlexGrid grd = rbtDefaultTable.Checked ? vlnFlexGrid2 : vlnFlexGrid3; //GetActiveGrid();
-		//	OpenFileDialog ofd = new OpenFileDialog();
-		//	ofd.DefaultExt = ".xls";
-		//	ofd.Filter = "Excel files (*.xls)|*.xls|All files (*.*)|*.*";
-		//	//ofd.InitialDirectory = @"C:\Development\SampleTableData";
-		//	ofd.InitialDirectory = initDir;
-		//	ofd.Multiselect = false;
-		//	ofd.Title = "Select Excel File";
-		//	ofd.ShowDialog();
-		//	this.Clear();
-		//	this.MergedRanges.Clear();
-		//	this.LoadExcel(ofd.FileName);
-		//	this.AdjustGridControlSize();
-		//	rtn = ofd.SafeFileName;
-		//	return rtn;
-		//}
+		public string ImportExcel(string initDir)
+		{
+			string rtn = "";
+			//VlnFlexGrid grd = rbtDefaultTable.Checked ? vlnFlexGrid2 : vlnFlexGrid3; //GetActiveGrid();
+			OpenFileDialog ofd = new OpenFileDialog();
+			ofd.DefaultExt = ".xls";
+			ofd.Filter = "Excel files (*.xls)|*.xls|All files (*.*)|*.*";
+			//ofd.InitialDirectory = @"C:\Development\SampleTableData";
+			ofd.InitialDirectory = initDir;
+			ofd.Multiselect = false;
+			ofd.Title = "Select Excel File";
+			ofd.ShowDialog();
+			this.Clear();
+			this.MergedRanges.Clear();
+			this.LoadExcel(ofd.FileName);
+			this.AdjustGridControlSize();
+			rtn = ofd.SafeFileName;
+			return rtn;
+		}
 		public static List<string> ROTableUpdate(object sender, ROFstInfoROTableUpdateEventArgs args)
 		{
 			string xml = null;

PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj

@@ -18,7 +18,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
@@ -87,9 +87,14 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\3rdPartyLibraries\Edraw\AxInterop.EDWordLib.dll</HintPath>
     </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">
+    <Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="C1.Win.C1SpellChecker.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
     </Reference>
     <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
@@ -481,7 +486,6 @@
       <DependentUpon>PreviewROImage.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="RTBItem.resx">
       <DependentUpon>RTBItem.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -579,12 +583,10 @@
   <ItemGroup>
     <None Include="app.config" />
     <None Include="ClassDiagram1.cd" />
-    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <EmbeddedResource Include="Volian.Controls.Library.gclicx" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="DisplayApplicability.resx">

PROMS/Volian.Controls.Library/Volian.Controls.Library.gclicx

@@ -1,2 +0,0 @@
-da3d5d14-691f-4908-aa3c-fd3239734232;-8584914772854775808;Vm9saWFuLkNvbnRyb2xzLkxpYnJhcnkuZGxs;ZGEzZDVkMTQtNjkxZi00OTA4LWFhM2MtZmQzMjM5NzM0MjMy,MDEwODE5MjdYWFhYWFhYWDA1Mg,Sk9ITi1XSU4xMA,RmFsc2U,ODQzNA,RmFsc2U,MA,MA,djIwMjIuMw,,;c7VmK7aSALscK1Nd/lI1cS3mms+p4j4Fsa2LgKQ1JmeSkNKq5X8LWx2NLOHITkvv+3IbbTQcVPnGa7hKiEDHlfH3thfwEvtzoqprZSXMOYfNPiXTPIIYPNb6L31Qq7AGiogvw+dMD9o/AiUWt4Q7a5SRmYU+PbrlNAXVISIzndw
-da3d5d14-691f-4908-aa3c-fd3239734232;-8584865524854775808;Vm9saWFuLkNvbnRyb2xzLkxpYnJhcnkuZGxs;ZGEzZDVkMTQtNjkxZi00OTA4LWFhM2MtZmQzMjM5NzM0MjMy,NjE5MDczODdYWFhYWFhYWDA1Mw,Q0hSSVM,RmFsc2U,ODg5NA,RmFsc2U,MA,MA,djIwMjQuMQ,,;luo/kWHt4XRAYR+3s8m8QoRagBcvXLv0mHvCYU2VCIeACFord4tdtTGmSUvmGhEmUiAd7YvaTlDlFrlni6CWaVlxa1mdbWuWsNVUkRnyJZ8kOAt1A+3SGfHecCsqotTW7apXjwW5qXLZ/fcgutioe7xaXgniFQysshTdUWt26T8

PROMS/Volian.Controls.Library/app.config

@@ -12,4 +12,4 @@
             </setting>
         </Volian.Controls.Library.Properties.Settings>
     </userSettings>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>