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/FlexableMessageBox/FlexibleMessageBox.cs

@@ -241,21 +241,6 @@ namespace JR.Utils.GUI.Forms
             return FlexibleMessageBoxForm.Show(owner, text, caption, buttons, icon, defaultButton);
         }
 
-        /// <summary>
-        /// Shows the specified message box.
-        /// </summary>
-        /// <param name="owner">The owner.</param>
-        /// <param name="text">The text.</param>
-        /// <param name="caption">The caption.</param>
-        /// <param name="buttons">The buttons.</param>
-        /// <param name="icon">The icon.</param>
-        /// <param name="defaultButton">The default button.</param>
-        /// <returns>The dialog result.</returns>
-        public static DialogResult ShowCustom(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
-        {
-            return FlexibleMessageBoxForm.ShowCustom(null, text, caption, buttons, icon);
-        }
-
         #endregion
 
         #region Internal form class
@@ -435,15 +420,15 @@ namespace JR.Utils.GUI.Forms
             private static readonly String STANDARD_MESSAGEBOX_SEPARATOR_SPACES = "   ";
 
             //These are the possible buttons (in a standard MessageBox)
-            private enum ButtonID { OK = 0, CANCEL, YES, NO, ABORT, RETRY, IGNORE, OVERWRITE, RENAME };
-
+            private enum ButtonID { OK = 0, CANCEL, YES, NO, ABORT, RETRY, IGNORE };
+            
             //These are the buttons texts for different languages. 
             //If you want to add a new language, add it here and in the GetButtonText-Function
             private enum TwoLetterISOLanguageID { en, de, es, it };
-            private static readonly String[] BUTTON_TEXTS_ENGLISH_EN = { "OK", "Cancel", "&Yes", "&No", "&Abort", "&Retry", "&Ignore", "&Overwrite", "&Rename" }; //Note: This is also the fallback language
-            private static readonly String[] BUTTON_TEXTS_GERMAN_DE = { "OK", "Abbrechen", "&Ja", "&Nein", "&Abbrechen", "&Wiederholen", "&Ignorieren", "&Overwrite", "&Rename" };
-            private static readonly String[] BUTTON_TEXTS_SPANISH_ES = { "Aceptar", "Cancelar", "&Sí", "&No", "&Abortar", "&Reintentar", "&Ignorar", "&Overwrite", "&Rename" };
-            private static readonly String[] BUTTON_TEXTS_ITALIAN_IT = { "OK", "Annulla", "&Sì", "&No", "&Interrompi", "&Riprova", "&Ignora", "&Overwrite", "&Rename" };
+            private static readonly String[] BUTTON_TEXTS_ENGLISH_EN = { "OK", "Cancel", "&Yes", "&No", "&Abort", "&Retry", "&Ignore" }; //Note: This is also the fallback language
+            private static readonly String[] BUTTON_TEXTS_GERMAN_DE = { "OK", "Abbrechen", "&Ja", "&Nein", "&Abbrechen", "&Wiederholen", "&Ignorieren" };
+            private static readonly String[] BUTTON_TEXTS_SPANISH_ES = { "Aceptar", "Cancelar", "&Sí", "&No", "&Abortar", "&Reintentar", "&Ignorar" };
+            private static readonly String[] BUTTON_TEXTS_ITALIAN_IT = { "OK", "Annulla", "&Sì", "&No", "&Interrompi", "&Riprova", "&Ignora" };
 
             #endregion
 
@@ -708,7 +693,6 @@ namespace JR.Utils.GUI.Forms
 
                         flexibleMessageBoxForm.CancelButton = flexibleMessageBoxForm.button3;
                         break;
-             
 
                     case MessageBoxButtons.OK:
                     default:
@@ -725,38 +709,16 @@ namespace JR.Utils.GUI.Forms
                 flexibleMessageBoxForm.defaultButton = defaultButton;
             }
 
-            private static void SetDialogButtonsCustom(FlexibleMessageBoxForm flexibleMessageBoxForm)
-            {
-                flexibleMessageBoxForm.visibleButtonsCount = 3;
+            #endregion
 
-                flexibleMessageBoxForm.button1.Visible = true;
-                flexibleMessageBoxForm.button1.Text = flexibleMessageBoxForm.GetButtonText(ButtonID.CANCEL);
-                flexibleMessageBoxForm.button1.DialogResult = DialogResult.Abort;
+            #region Private event handlers
 
-                flexibleMessageBoxForm.button2.Visible = true;
-                flexibleMessageBoxForm.button2.Text = flexibleMessageBoxForm.GetButtonText(ButtonID.OVERWRITE);
-                flexibleMessageBoxForm.button2.DialogResult = DialogResult.Retry;
-
-                flexibleMessageBoxForm.button3.Visible = true;
-                flexibleMessageBoxForm.button3.Text = flexibleMessageBoxForm.GetButtonText(ButtonID.RENAME);
-                flexibleMessageBoxForm.button3.DialogResult = DialogResult.Ignore;
-
-                flexibleMessageBoxForm.ControlBox = false;
-            }
-
-
-
-
-                #endregion
-
-                #region Private event handlers
-
-                /// <summary>
-                /// Handles the Shown event of the FlexibleMessageBoxForm control.
-                /// </summary>
-                /// <param name="sender">The source of the event.</param>
-                /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
-                private void FlexibleMessageBoxForm_Shown(object sender, EventArgs e)
+            /// <summary>
+            /// Handles the Shown event of the FlexibleMessageBoxForm control.
+            /// </summary>
+            /// <param name="sender">The source of the event.</param>
+            /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
+            private void FlexibleMessageBoxForm_Shown(object sender, EventArgs e)
             {
                 int buttonIndexToFocus = 1;
                 Button buttonToFocus;
@@ -904,46 +866,6 @@ namespace JR.Utils.GUI.Forms
                 return flexibleMessageBoxForm.ShowDialog(owner);
             }
 
-            /// <summary>
-            /// Shows the specified message box.
-            /// </summary>
-            /// <param name="owner">The owner.</param>
-            /// <param name="text">The text.</param>
-            /// <param name="caption">The caption.</param>
-            /// <param name="buttons">The buttons.</param>
-            /// <param name="icon">The icon.</param>
-            /// <param name="defaultButton">The default button.</param>
-            /// <returns>The dialog result.</returns>
-            public static DialogResult ShowCustom(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
-            {
-                //Create a new instance of the FlexibleMessageBox form
-                var flexibleMessageBoxForm = new FlexibleMessageBoxForm();
-                flexibleMessageBoxForm.ShowInTaskbar = false;
-
-                //Bind the caption and the message text
-                flexibleMessageBoxForm.CaptionText = caption;
-                flexibleMessageBoxForm.MessageText = text;
-                flexibleMessageBoxForm.FlexibleMessageBoxFormBindingSource.DataSource = flexibleMessageBoxForm;
-
-                //Set the buttons visibilities and texts. Also set a default button.
-                SetDialogButtonsCustom(flexibleMessageBoxForm);
-
-                //Set the dialogs icon. When no icon is used: Correct placement and width of rich text box.
-                SetDialogIcon(flexibleMessageBoxForm, icon);
-
-                //Set the font for all controls
-                flexibleMessageBoxForm.Font = FONT;
-                flexibleMessageBoxForm.richTextBoxMessage.Font = FONT;
-
-                //Calculate the dialogs start size (Try to auto-size width to show longest text row). Also set the maximum dialog size. 
-                SetDialogSizes(flexibleMessageBoxForm, text, caption);
-
-				//Set the dialogs start position when given. Otherwise center the dialog on the current screen.
-				SetDialogStartPosition(flexibleMessageBoxForm, owner);
-				//Show the dialog
-				return flexibleMessageBoxForm.ShowDialog(owner);
-			}
-
             #endregion
         } //class FlexibleMessageBoxForm
 

PROMS/Formats/Formats.csproj

@@ -18,7 +18,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
@@ -126,7 +126,6 @@
     <Content Include="fmtall\BVPSAOPall.xml" />
     <Content Include="fmtall\BVPSAtchall.xml" />
     <Content Include="fmtall\BVPSBCKall.xml" />
-    <Content Include="fmtall\BVPSAOPDEVall.xml" />
     <Content Include="fmtall\BVPSFlexDEVall.xml" />
     <Content Include="fmtall\BVPSDEVall.xml" />
     <Content Include="fmtall\BVPSNIBCKall.xml" />
@@ -407,7 +406,6 @@
     <Content Include="genmacall\BVPSAOP.svg" />
     <Content Include="genmacall\BVPSAtch.svg" />
     <Content Include="genmacall\BVPSbck.svg" />
-    <Content Include="genmacall\BVPSAOPdev.svg" />
     <Content Include="genmacall\BVPSFlexdev.svg" />
     <Content Include="genmacall\BVPSdev.svg" />
     <Content Include="genmacall\BVPSNIBCK.svg" />

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();
 
 		}
@@ -1320,10 +1323,6 @@ namespace VEPROMS
 			if (swtbtnPDFLinks.Value)
 				swtbtnPDFdtPrefixSuffix.Value = false;
 			BuildPDFFileName();
-			// C2024-013: When Create RO & Transition Hyperlinks in pdf is ON, disable the MergePdf
-			//	button.  The Create RO & Transition Hyperlinks option looks for individual file names
-			//	for procedures.
-			btnMergePDFs.Enabled = !swtbtnPDFLinks.Value; 
 		}
 
 		// C2019-004: Allow user to define duplex blank page text.  The text box for blank page text is always enabled for procedures with
@@ -1338,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/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/dlgExportImport.cs

@@ -99,10 +99,6 @@ namespace VEPROMS
 			MyProcedure = procedureInfo;
 			InitializeComponent();
 			this.Text = mode + " Dialog for " + procedureInfo.DisplayNumber;
-
-			//Preset path for single procedures.
-			PEIPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\VEPROMS\PEI_" + Database.VEPROMS_SqlConnection.Database;
-			txtExport.Text = string.Format(@"{0}\{1}.pxml", PEIPath, MyProcedure.DisplayNumber.Replace("/", "_").Replace("\\", "_"));
 		}
 		private void dlgExportImport_Load(object sender, EventArgs e)
 		{
@@ -176,7 +172,6 @@ namespace VEPROMS
 			}
 			else if (MyProcedure != null)
 			{
-				txtExport.Enabled = true;
 				txtExport.Text = string.Format(@"{0}\{1}.pxml", PEIPath, MyProcedure.DisplayNumber.Replace("/", "_").Replace("\\", "_"));
 			}
 		}
@@ -195,8 +190,6 @@ namespace VEPROMS
 		private bool successfullExport = true;
 		private void btnDoExport_Click(object sender, EventArgs e)
 		{
-		
-
 			btnExport.Enabled = false;
 			string msg = "Finished Exporting:\n\n";
 			if (_MyMode.ToUpper().Contains("FORMAT"))
@@ -227,42 +220,6 @@ namespace VEPROMS
 			}
 			else if (MyProcedure != null)
 			{
-				var fileLocation = txtExport.Text;
-				if (File.Exists(fileLocation))
-					{   // C2022-029 if an existing export of the same name is found, provide option to overwrite it
-					DialogResult ovewriteEx = FlexibleMessageBox.ShowCustom(null, "There is already another export file with the same name.  You can choose to either overwrite the existing file or have the existing file renamed with the original creation date appended.\r\n\r\nSelecting 'Cancel' will cancel the export.", "What would you like to do?", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);// == DialogResult.Yes;
-
-					// Extract directory, filename, and extension
-					string directory = Path.GetDirectoryName(fileLocation);
-					string filename = Path.GetFileNameWithoutExtension(fileLocation);
-					string extension = Path.GetExtension(fileLocation);
-					fileLocation = $"{directory}\\{filename}{extension}";
-
-					if (ovewriteEx == DialogResult.Abort)
-					{
-						MessageBox.Show("Export has been cancelled", "You have chosen to cancel the export.", MessageBoxButtons.OK, MessageBoxIcon.Information); // C2020-042 changed mesage box title
-						btnCloseExport.Enabled = true;
-						return;
-					}
-					else if (ovewriteEx == DialogResult.Retry)
-					{
-						//Overwrite will occur, set msg.
-						msg = "The export file has been overwritten.  ";
-					}
-					else if (ovewriteEx == DialogResult.Ignore)
-					{
-						// Get the modified date of the existing file, create a datestamp for use in name, set newlocation to move to
-						DateTime modifiedDate = File.GetLastWriteTime(fileLocation);
-						string datestamp = modifiedDate.ToString("yyyyMMddHHmmss");
-						string newFileLocation = $"{directory}\\{filename}_{datestamp}{extension}";
-
-						//Move and set msg.
-						File.Move(fileLocation, newFileLocation);
-						msg = "The previous export has been renamed, the export file has been created.  ";
-					}
-
-				}
-
 				this.Cursor = Cursors.WaitCursor;
 				MyStart = DateTime.Now;
 				btnDoExport.Enabled = false;
@@ -273,7 +230,7 @@ namespace VEPROMS
 				XmlElement xe = xd.CreateElement("formats");
 				xd.DocumentElement.AppendChild(xe);
 				ExportFormats(FormatInfoList.GetFormatInfoListUsed(), xe, "formats", false);
-				xd.Save(fileLocation);
+				xd.Save(txtExport.Text);
 				TimeSpan elapsed = DateTime.Now.Subtract(MyStart);
 				lblExportStatus.Text = "Export Completed in " + elapsed.ToString();
 				this.Cursor = Cursors.Default;
@@ -749,7 +706,7 @@ namespace VEPROMS
 			}
 			catch (Exception ex)
 			{
-				FlexibleMessageBox.Show(null, "The import failed, check the error log for more information.", "Import Failed", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+				FlexibleMessageBox.Show("The import failed, check the error log for more information.", "Import Failed", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
 				_MyLog.Warn("Failure During Import", ex);
 			}
 			return false;

PROMS/VEPROMS User Interface/dlgExportImport.designer.cs

@@ -400,7 +400,6 @@ namespace VEPROMS
 			this.pnlImport.PerformLayout();
 			this.ResumeLayout(false);
 
-
 		}
 
 		#endregion

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

@@ -45,6 +45,7 @@ namespace VEPROMS
 			this.itemContainer3 = new DevComponents.DotNetBar.ItemContainer();
 			this.btnNew = new DevComponents.DotNetBar.ButtonItem();
 			this.btnOpen = new DevComponents.DotNetBar.ButtonItem();
+			this.btnPrint = new DevComponents.DotNetBar.ButtonItem();
 			this.btnPrepare = new DevComponents.DotNetBar.ButtonItem();
 			this.btnAdmin = new DevComponents.DotNetBar.ButtonItem();
 			this.btnUpdateFormats = new DevComponents.DotNetBar.ButtonItem();
@@ -67,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();
@@ -338,6 +338,7 @@ namespace VEPROMS
 			this.itemContainer3.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
             this.btnNew,
             this.btnOpen,
+            this.btnPrint,
             this.btnPrepare,
             this.btnAdmin});
 			// 
@@ -363,7 +364,16 @@ namespace VEPROMS
 			this.btnOpen.SubItemsExpandWidth = 24;
 			this.btnOpen.Text = "&Open...";
 			this.btnOpen.Click += new System.EventHandler(this.btnOpen_Click);
-
+			// 
+			// btnPrint
+			// 
+			this.btnPrint.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
+			this.btnPrint.Enabled = false;
+			this.btnPrint.Image = ((System.Drawing.Image)(resources.GetObject("btnPrint.Image")));
+			this.btnPrint.Name = "btnPrint";
+			this.btnPrint.SubItemsExpandWidth = 24;
+			this.btnPrint.Text = "Create &PDF";
+			this.btnPrint.Click += new System.EventHandler(this.btnPrint_Click);
 			// 
 			// btnPrepare
 			// 
@@ -504,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;
@@ -592,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;
@@ -1635,6 +1635,7 @@ namespace VEPROMS
 		private DevComponents.DotNetBar.ButtonItem btnNew;
 		private DevComponents.DotNetBar.ButtonItem btnOpen;
 		private DevComponents.DotNetBar.ButtonItem btnPrepare;
+		private DevComponents.DotNetBar.ButtonItem btnPrint;
 		private DevComponents.DotNetBar.ItemContainer icRecentDocs;
 		private DevComponents.DotNetBar.LabelItem labelItem8;
 		private DevComponents.DotNetBar.ItemContainer itemContainer5;
@@ -1731,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,12 +2106,13 @@ 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);
 			btnAdmin.SubItems.Add(btnAdministrativeTools);
 
+			this.superTooltip1.SetSuperTooltip(btnPrint, new SuperTooltipInfo("Create PDF", null, null, null, null, eTooltipColor.Gray));
 			this.superTooltip1.SetSuperTooltip(btnExit, new SuperTooltipInfo("Exit", null, null, null, null, eTooltipColor.Gray));
 			this.superTooltip1.SetSuperTooltip(btnOptions, new SuperTooltipInfo("Options", null, null, null, null, eTooltipColor.Gray));
 			this.superTooltip1.SetSuperTooltip(btnManageSecurity, new SuperTooltipInfo("Manage Security", null, null, null, null, eTooltipColor.Gray));
@@ -2105,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);
@@ -2152,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);
@@ -2160,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");
@@ -2204,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;
@@ -2376,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;
@@ -2424,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
@@ -2521,7 +2536,7 @@ namespace VEPROMS
 			}
 
 			DialogResult dr = System.Windows.Forms.DialogResult.Yes;
-			
+
 			// RHM20150507 Table Scrunch
 			Rtf2Pdf.AllowTableScrunching = cbScrunch.Checked ? _DefaultScrunchingRules : TableScrunching.None;
 
@@ -2753,7 +2768,7 @@ namespace VEPROMS
 			tmrCloseTabItems.Enabled = false;
 
 			_TimeActivity1.Open();
-			
+
 			while (MyCloseTabList.CountDTI > 0)
 			{
 				DisplayTabItem dti = MyCloseTabList.PopDTI();
@@ -3125,45 +3140,23 @@ namespace VEPROMS
 							if (dvi != null)
 							{
 								DlgPrintProcedure prnDlg = new DlgPrintProcedure(dvi, true);
-								if (dvi.MultiUnitCount == 0)
-								{
-									prnDlg.SelectedSlave = -1;
-								}
-								else if (dvi.MultiUnitCount > 0)
-								{
-									string[] arguments = Environment.GetCommandLineArgs();
-									for (int i = 0; i < arguments.Length; i++)
-									{
-										if (arguments[i].Contains("/C="))
-										{
-											Console.WriteLine("In arguments loop");
-											//int num;
-											string[] childarg = arguments[i].Split('=');
-											if (int.TryParse(childarg[1], out int num))
-											{
-												prnDlg.SelectedSlave = num;
-											}
-										}
-									}
-
-								}
+								if (dvi.MultiUnitCount == 0) prnDlg.SelectedSlave = -1;
 								prnDlg.AllowDateTimePrefixSuffix = false; //C2018-033 don't append any selected date/time pdf file prefix or suffix (defined in working draft properties)
 								prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window
 														 //prnDlg.FormClosed += new FormClosedEventHandler(prnDlg_FormClosed);
 														 //while (!_RunNext) Application.DoEvents();
-
 							}
-							
 						}
+
 						ranAuto = true;
 					}
-
-					if (ranAuto)
-					{
-						this.Close();
-					}
 				}
 			}
+
+			if (ranAuto)
+			{
+				this.Close();
+			}
 		}
 
 		private FontFamily GetFamily(string name)
@@ -3223,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");
 			}
 		}
 
@@ -3895,7 +3880,7 @@ namespace VEPROMS
 		{
 			infoPanel.Expanded = true;
 			infoTabs.SelectedTab = infotabRO;
-			
+
 			displayRO.ProgressBar = bottomProgBar;
 
 			displayRO.MyRTB = (SelectedStepTabPanel == null) ? null :
@@ -4054,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)
@@ -4097,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;
@@ -4113,6 +4098,10 @@ namespace VEPROMS
 
 			lblUser.Text = tc.SelectedDisplayTabItem.MyUserRole;
 
+			if (tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion.MultiUnitCount > 1)
+				btnPrint.Visible = false;
+			else
+				btnPrint.Visible = true;
 
 			// Reset the ribbon buttons B2016-148 (ex. a copystep done in a different procedure tab my require the paste step options to be active
 			if (tc.SelectedDisplayTabItem != null && tc.SelectedDisplayTabItem.MyStepTabPanel != null) // MyStepTabPanel will be null if the active tab is a Word Attachment
@@ -4308,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;
@@ -4327,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];
 
@@ -4367,6 +4356,7 @@ namespace VEPROMS
 				ctrlAnnotationDetails.UpdateAnnotationGrid(_CurrentItem); // set the CurrentItem (send Message) when the MSWord section is opened.
 			}
 
+			btnPrint.Enabled = (_CurrentItem != null);
 		}
 
 		void _LastStepRTB_EditModeChanged(object sender, EventArgs args)
@@ -4444,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;
@@ -4470,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
@@ -4858,7 +4848,12 @@ namespace VEPROMS
 			StepRTB.MyFontFamily = cmbFont.SelectedValue as FontFamily;
 		}
 
-
+		private void btnPrint_Click(object sender, EventArgs e)
+		{
+			DlgPrintProcedure prnDlg = new DlgPrintProcedure(this._CurrentItem.MyProcedure);
+			prnDlg.MySessionInfo = MySessionInfo;
+			prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window
+		}
 
 		private void lblResolution_Click(object sender, EventArgs e)
 		{
@@ -4903,7 +4898,7 @@ namespace VEPROMS
 
 		private void btnUpdateFormat_Click(object sender, EventArgs e)
 		{
-            UpdateFormats(null);
+			UpdateFormats(null);
 		}
 
 		private void UpdateFormats(string mypath)
@@ -4974,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,13 +247,14 @@ namespace VEPROMS
 			this.panVerBtns.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.ROPrefixBindingSource)).BeginInit();
 			((System.ComponentModel.ISupportInitialize)(this.formatInfoListBindingSource)).BeginInit();
+			this.gpxMOSLandLocation.SuspendLayout();
 			this.SuspendLayout();
 			// 
 			// ppBtnCancel
 			// 
 			this.ppBtnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.ppBtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.ppBtnCancel.Location = new System.Drawing.Point(742, 338);
+			this.ppBtnCancel.Location = new System.Drawing.Point(742, 342);
 			this.ppBtnCancel.Margin = new System.Windows.Forms.Padding(2);
 			this.ppBtnCancel.Name = "ppBtnCancel";
 			this.ppBtnCancel.Size = new System.Drawing.Size(56, 21);
@@ -266,7 +266,7 @@ namespace VEPROMS
 			// ppBtnOK
 			// 
 			this.ppBtnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.ppBtnOK.Location = new System.Drawing.Point(669, 338);
+			this.ppBtnOK.Location = new System.Drawing.Point(669, 342);
 			this.ppBtnOK.Margin = new System.Windows.Forms.Padding(2);
 			this.ppBtnOK.Name = "ppBtnOK";
 			this.ppBtnOK.Size = new System.Drawing.Size(56, 21);
@@ -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

@@ -29,7 +29,6 @@ namespace VEPROMS
 		private List<MiniConfig> _DeletedApples;
 		private List<EnhancedMiniConfig> _Enhanced;
 		private DocVersionConfig _DocVersionConfig;
-		private string _OrgPDFPath; // B2024-030 used to save last PDF path
 		
 		// Default values
 		private string _DefaultFormatName = null;
@@ -98,7 +97,6 @@ namespace VEPROMS
 
 			_Initializing = true;
 			InitializeComponent();
-			_OrgPDFPath = _DocVersionConfig.Print_PDFLocation; // B2024-030 save last PDF path
 			btnGeneral.PerformClick(); // always start with General tab or button
 			_Initializing = false;
 
@@ -325,6 +323,8 @@ namespace VEPROMS
 				tiApplicability.Visible = false;
 			}
 
+			ppTxtBxPDFLoc.TextChanged += new EventHandler(ppTxtBxPDFLoc_TextChanged);
+
 			//end add new applicability stuff
 			lblProcSetRev.Visible = ppRTxtProcSetRev.Visible = _DocVersionConfig.MyDocVersion.MyDocVersionInfo.ActiveFormat.MyStepSectionPrintData.UseXtraRevNumber;
 
@@ -538,32 +538,11 @@ namespace VEPROMS
 			}
 		}
 
-		//B2024-030 Check the PDF Location path and prompt to create the folders if needed
-		private void CheckPDFLocationPath()
+		// The following code was added to fix Bug B2013-117
+		private void ppTxtBxPDFLoc_TextChanged(object sender, EventArgs e)
 		{
-			string pdfloc = ppTxtBxPDFLoc.Text;
-			if (pdfloc == string.Empty) return;
-			if (!Directory.Exists(ppTxtBxPDFLoc.Text))
-			{
-				string msg = string.Format(" The Folder: '{0}' does not exist. \n\nCreate it?", ppTxtBxPDFLoc.Text);
-				DialogResult dr = MessageBox.Show(msg, "PDF Location Folder Not Found", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
-				if (dr == DialogResult.Yes)
-				{
-					try
-					{
-						Directory.CreateDirectory(ppTxtBxPDFLoc.Text);
-					}
-					catch (Exception ex)
-					{
-						MessageBox.Show(ex.Message, "Error trying to create folder", MessageBoxButtons.OK, MessageBoxIcon.Error);
-						_DocVersionConfig.Print_PDFLocation = _OrgPDFPath; // reset to the path we started with
-					}
-				}
-				else
-				{
-					_DocVersionConfig.Print_PDFLocation = _OrgPDFPath; // reset to the path we started with
-				}
-			}
+			if (_Initializing == false)
+				_DocVersionConfig.Print_PDFLocation = ppTxtBxPDFLoc.Text;
 		}
 
 		private string AddSlaveNode(MiniConfig mc)
@@ -609,9 +588,6 @@ namespace VEPROMS
 
 		private void btnVersionsPropOK_Click(object sender, EventArgs e)
 		{
-			//B2024-030 Check the PDF Location path and prompt to create the folders if needed
-			CheckPDFLocationPath();
-
 			docVersionConfigBindingSource.EndEdit(); // need to end the edit session first or any format selection chanage will not stick  B2015-157
 
 			// if there is a change to the format, clean up any overridden formats that point to the selected item before saving the format change:
@@ -797,6 +773,7 @@ namespace VEPROMS
 
 			// B2019-132 update the association count for this working draft
 			_DocVersionConfig.MyDocVersion.MyDocVersionInfo.RefreshDocVersionAssociations();
+
 			this.Close();
 		}
 
@@ -1951,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/ItemInsertExt.cs

@@ -1309,8 +1309,7 @@ namespace VEPROMS.CSLA.Library
 					else if (addType == EAddpingPart.Replace)   // what about user interface for enhanced pasted steps?
 					{
 						ItemInfo enhReplaceItem = ItemInfo.Get(edSource.ItemID);
-						TreeNode trn = null;
-						newEnhancedItemInfo = Item.PasteReplace(enhReplaceItem, tmpCopyEnhancedID, chgid, trn);
+						newEnhancedItemInfo = Item.PasteReplace(enhReplaceItem, tmpCopyEnhancedID, chgid);
 					}
 
 					// update the config data for the new enhanced item (procedure, section or step) to point back to the correct source
@@ -2498,16 +2497,13 @@ namespace VEPROMS.CSLA.Library
 		}
 		#endregion
 		#region PasteReplace
-
-
-
-		public static ItemInfo PasteReplace(ItemInfo itemInfo, int copyStartID, string chgid, TreeNode treeNodeReplace)
+		public static ItemInfo PasteReplace(ItemInfo itemInfo, int copyStartID, string chgid)
 		{
-			bool tmp = false;
-			return PasteReplace(itemInfo, copyStartID, chgid, treeNodeReplace, ref tmp);
+			bool tmp= false;
+			return PasteReplace(itemInfo, copyStartID, chgid, ref tmp);
 		}
 		// B2017-179 return a bool (firstTrans) if  we could not replace the step but the user wants to position to the first transition that needs resolved
-		public static ItemInfo PasteReplace(ItemInfo itemInfo, int copyStartID, string chgid, TreeNode treeNodeReplace, ref bool firstTrans)
+		public static ItemInfo PasteReplace(ItemInfo itemInfo, int copyStartID, string chgid, ref bool firstTrans)
 		{
 			firstTrans = false;
 			if (!CanDeleteObject())
@@ -2564,14 +2560,7 @@ namespace VEPROMS.CSLA.Library
 				}
 				else
 				{
-					//Create tree node for copied procedure when no other procedures exist in the folder
-					VETreeNode vtn = treeNodeReplace as VETreeNode;
-					DocVersionInfo dvi = vtn.VEObject as DocVersionInfo;
-	
-					ItemInfo newProc = dvi.PasteChild(copyStartID);
-					VETreeNode tn1 = new VETreeNode(newProc);
-					treeNodeReplace.Nodes.Add(tn1);        // add tree node to end of list.
-					treeNodeReplace = tn1;
+					newItemInfo.MyParent.OnNewChild(new ItemInfoInsertEventArgs(newItemInfo, ItemInfo.EAddpingPart.Child));
 				}
 				return newItemInfo;
 			}

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;