B2024-041 - Update PromsFixes for the RevDate and RevDescriptions

Format only changes

PROMS/AdjustBuildRevision/AdjustBuildRevision.csproj

@@ -27,7 +27,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</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.2.yyMM.dHH") + "\")");
+								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.1.yyMM.dHH") + "\")");
+								outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.2.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.6.2"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>

PROMS/Baseline/App.config

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

PROMS/Baseline/Baseline.csproj

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

PROMS/DropDownPanel/DropDownPanel.csproj

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

PROMS/FlexableMessageBox/FlexableMessageBox.csproj

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

PROMS/FlexableMessageBox/FlexibleMessageBox.cs

@@ -241,6 +241,21 @@ 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
@@ -420,15 +435,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 };
+            private enum ButtonID { OK = 0, CANCEL, YES, NO, ABORT, RETRY, IGNORE, OVERWRITE, RENAME };
-            
+
             //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" }; //Note: This is also the fallback language
+            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" };
+            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" };
+            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" };
+            private static readonly String[] BUTTON_TEXTS_ITALIAN_IT = { "OK", "Annulla", "&Sì", "&No", "&Interrompi", "&Riprova", "&Ignora", "&Overwrite", "&Rename" };
 
             #endregion
 
@@ -693,6 +708,7 @@ namespace JR.Utils.GUI.Forms
 
                         flexibleMessageBoxForm.CancelButton = flexibleMessageBoxForm.button3;
                         break;
+             
 
                     case MessageBoxButtons.OK:
                     default:
@@ -709,16 +725,38 @@ namespace JR.Utils.GUI.Forms
                 flexibleMessageBoxForm.defaultButton = defaultButton;
             }
 
-            #endregion
+            private static void SetDialogButtonsCustom(FlexibleMessageBoxForm flexibleMessageBoxForm)
+            {
+                flexibleMessageBoxForm.visibleButtonsCount = 3;
 
-            #region Private event handlers
+                flexibleMessageBoxForm.button1.Visible = true;
+                flexibleMessageBoxForm.button1.Text = flexibleMessageBoxForm.GetButtonText(ButtonID.CANCEL);
+                flexibleMessageBoxForm.button1.DialogResult = DialogResult.Abort;
 
-            /// <summary>
+                flexibleMessageBoxForm.button2.Visible = true;
-            /// Handles the Shown event of the FlexibleMessageBoxForm control.
+                flexibleMessageBoxForm.button2.Text = flexibleMessageBoxForm.GetButtonText(ButtonID.OVERWRITE);
-            /// </summary>
+                flexibleMessageBoxForm.button2.DialogResult = DialogResult.Retry;
-            /// <param name="sender">The source of the event.</param>
+
-            /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
+                flexibleMessageBoxForm.button3.Visible = true;
-            private void FlexibleMessageBoxForm_Shown(object sender, EventArgs e)
+                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)
             {
                 int buttonIndexToFocus = 1;
                 Button buttonToFocus;
@@ -866,6 +904,46 @@ 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.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
@@ -126,6 +126,7 @@
     <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" />
@@ -406,6 +407,7 @@
     <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.6.2"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>

PROMS/LBWordLibrary/LBWordLibrary.csproj

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

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

@@ -33,7 +33,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</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.6.2"/></startup><runtime>
+	<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></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.2.2306.2212")]
+[assembly: AssemblyVersion("2.3.2404.1611")]
-[assembly: AssemblyFileVersion("2.2.2306.2212")]
+[assembly: AssemblyFileVersion("2.3.2404.1611")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -89,6 +89,8 @@ using System.Runtime.CompilerServices;
 
 
 
+
+
 
 
 

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

@@ -44,7 +44,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</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.6.2"/></startup><runtime>
+	<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></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.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</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.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>

PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.csproj

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

PROMS/ReferencedObjects/LibSource/ROFST/ROFST.csproj

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

PROMS/ReferencedObjects/LibSource/ROField/ROFields.csproj

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

PROMS/ReferencedObjects/LibSource/Utils/Utils.csproj

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

PROMS/ReferencedObjects/LibSource/VlnProfiler/VlnProfiler.csproj

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

PROMS/ReferencedObjects/LibSource/VlnStatus/VlnStatus.csproj

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

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEditLib.csproj

@@ -35,7 +35,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</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.6.2"/>
+			<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
 		</startup>
 	</configuration>

PROMS/RoAccessToSql/RoAccessToSql.csproj

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

PROMS/TablePicker/TablePicker.csproj

@@ -33,7 +33,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</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="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="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" />
+        <level value="DEBUG"/>
-        <eventLogEntryType value="Information" />
+        <eventLogEntryType value="Information"/>
       </mapping>
       <mapping>
-        <level value="INFO" />
+        <level value="INFO"/>
-        <eventLogEntryType value="Information" />
+        <eventLogEntryType value="Information"/>
       </mapping>
       <mapping>
-        <level value="WARN" />
+        <level value="WARN"/>
-        <eventLogEntryType value="Warning" />
+        <eventLogEntryType value="Warning"/>
       </mapping>
       <mapping>
-        <level value="ERROR" />
+        <level value="ERROR"/>
-        <eventLogEntryType value="Error" />
+        <eventLogEntryType value="Error"/>
       </mapping>
       <mapping>
-        <level value="FATAL" />
+        <level value="FATAL"/>
-        <eventLogEntryType value="Error" />
+        <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" />
+      <level value="ALL"/>
-      <appender-ref ref="ConsoleAppender" />
+      <appender-ref ref="ConsoleAppender"/>
-      <appender-ref ref="LogFileAppender" />
+      <appender-ref ref="LogFileAppender"/>
-      <appender-ref ref="EventLogAppender" />
+      <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="OriginalPageBreak" value="False"/>
-    <add key="CslaAuthentication" value="Windows" />
+    <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" 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_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_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_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_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_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,18 +181,22 @@
     </UISampleNetBar1.Properties.Settings>
   </userSettings>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
   </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

@@ -1320,6 +1320,10 @@ 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

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

@@ -1,92 +0,0 @@
-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 +1,2 @@
 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.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
@@ -99,12 +99,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
+    <Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20213.532, 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>

PROMS/VEPROMS User Interface/dlgExportImport.cs

@@ -99,6 +99,10 @@ 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)
 		{
@@ -172,6 +176,7 @@ namespace VEPROMS
 			}
 			else if (MyProcedure != null)
 			{
+				txtExport.Enabled = true;
 				txtExport.Text = string.Format(@"{0}\{1}.pxml", PEIPath, MyProcedure.DisplayNumber.Replace("/", "_").Replace("\\", "_"));
 			}
 		}
@@ -190,6 +195,8 @@ 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"))
@@ -220,6 +227,42 @@ 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;
@@ -230,7 +273,7 @@ namespace VEPROMS
 				XmlElement xe = xd.CreateElement("formats");
 				xd.DocumentElement.AppendChild(xe);
 				ExportFormats(FormatInfoList.GetFormatInfoListUsed(), xe, "formats", false);
-				xd.Save(txtExport.Text);
+				xd.Save(fileLocation);
 				TimeSpan elapsed = DateTime.Now.Subtract(MyStart);
 				lblExportStatus.Text = "Export Completed in " + elapsed.ToString();
 				this.Cursor = Cursors.Default;
@@ -706,7 +749,7 @@ namespace VEPROMS
 			}
 			catch (Exception ex)
 			{
-				FlexibleMessageBox.Show("The import failed, check the error log for more information.", "Import Failed", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+				FlexibleMessageBox.Show(null, "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,6 +400,7 @@ 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(165, 111);
+			this.btnCancel.Location = new System.Drawing.Point(179, 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";
+			this.dateTimeInput1.CustomFormat = "MM/dd/yyyy HH:mm:ss";
 			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(113, 20);
+			this.dateTimeInput1.Size = new System.Drawing.Size(146, 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(149, 51);
+			this.btnNow.Location = new System.Drawing.Point(182, 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(241, 144);
+			this.ClientSize = new System.Drawing.Size(268, 144);
 			this.Controls.Add(this.btnNow);
 			this.Controls.Add(this.dateTimeInput1);
 			this.Controls.Add(this.label1);

PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.cs

@@ -32,13 +32,46 @@ namespace VEPROMS
 		{
 			string cbdt = MyProcConfig.Print_ChangeBarDate;
 			string[] tmp = cbdt.Split(' ');
-			cbdt = tmp[0] + " 00:00:00";
+
-			dateTimeInput1.Value = (cbdt == null || cbdt == "") ? DateTime.Now : DateTime.Parse(cbdt);
+			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;
+				}
+			}
 		}
 
 		private void btnOK_Click(object sender, EventArgs e)
 		{
-			MyProcConfig.Print_ChangeBarDate = dateTimeInput1.Value.ToString("MM/dd/yyyy 00:00:00");// ("MM/dd/yyyy HH:mm:ss");
+			MyProcConfig.Print_ChangeBarDate = dateTimeInput1.Value.ToString("MM/dd/yyyy HH:mm:ss");// ("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=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
 </root>

PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs

@@ -45,7 +45,6 @@ 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();
@@ -68,6 +67,7 @@ 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,7 +338,6 @@ namespace VEPROMS
 			this.itemContainer3.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
             this.btnNew,
             this.btnOpen,
-            this.btnPrint,
             this.btnPrepare,
             this.btnAdmin});
 			// 
@@ -364,16 +363,7 @@ 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
 			// 
@@ -514,6 +504,7 @@ 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;
@@ -601,6 +592,15 @@ 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,7 +1635,6 @@ 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;
@@ -1732,6 +1731,7 @@ 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

@@ -2098,7 +2098,6 @@ namespace VEPROMS
 			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));
@@ -3126,22 +3125,44 @@ namespace VEPROMS
 							if (dvi != null)
 							{
 								DlgPrintProcedure prnDlg = new DlgPrintProcedure(dvi, true);
-								if (dvi.MultiUnitCount == 0) prnDlg.SelectedSlave = -1;
+								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;
+											}
+										}
+									}
+
+								}
 								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)
+					if (ranAuto)
-			{
+					{
-				this.Close();
+						this.Close();
+					}
+				}
 			}
 		}
 
@@ -3202,6 +3223,14 @@ 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");
 			}
 		}
 
@@ -4084,10 +4113,6 @@ 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
@@ -4342,7 +4367,6 @@ 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)
@@ -4834,12 +4858,7 @@ 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)
 		{

PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs

@@ -254,7 +254,7 @@ namespace VEPROMS
 			// 
 			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, 342);
+			this.ppBtnCancel.Location = new System.Drawing.Point(742, 338);
 			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, 342);
+			this.ppBtnOK.Location = new System.Drawing.Point(669, 338);
 			this.ppBtnOK.Margin = new System.Windows.Forms.Padding(2);
 			this.ppBtnOK.Name = "ppBtnOK";
 			this.ppBtnOK.Size = new System.Drawing.Size(56, 21);

PROMS/VEPROMS User Interface/frmVersionsProperties.cs

@@ -29,6 +29,7 @@ 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;
@@ -97,6 +98,7 @@ 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;
 
@@ -323,8 +325,6 @@ 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,11 +538,32 @@ namespace VEPROMS
 			}
 		}
 
-		// The following code was added to fix Bug B2013-117
+		//B2024-030 Check the PDF Location path and prompt to create the folders if needed
-		private void ppTxtBxPDFLoc_TextChanged(object sender, EventArgs e)
+		private void CheckPDFLocationPath()
 		{
-			if (_Initializing == false)
+			string pdfloc = ppTxtBxPDFLoc.Text;
-				_DocVersionConfig.Print_PDFLocation = 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
+				}
+			}
 		}
 
 		private string AddSlaveNode(MiniConfig mc)
@@ -588,6 +609,9 @@ 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:
@@ -773,7 +797,6 @@ namespace VEPROMS
 
 			// B2019-132 update the association count for this working draft
 			_DocVersionConfig.MyDocVersion.MyDocVersionInfo.RefreshDocVersionAssociations();
-
 			this.Close();
 		}
 

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

@@ -468,10 +468,12 @@ 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);

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

@@ -2934,7 +2934,8 @@ namespace VEPROMS.CSLA.Library
 			{
 				string str = MyContent.Text;
 				// B2022-035: resolve unit specific designators 
-				if (str.ToUpper().Contains(@"<U")) str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(this.MyDocVersion, str);
+				// 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
 			}
 		}
@@ -2946,7 +2947,8 @@ namespace VEPROMS.CSLA.Library
 			{
 				string str = MyContent.Text;
 				// B2022-035: resolve unit specific designators 
-				if (str.ToUpper().Contains(@"<U")) str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(this.MyDocVersion, str);
+				// 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
 			}
 		}
@@ -2960,7 +2962,8 @@ namespace VEPROMS.CSLA.Library
 				string str = MyContent.Text;
 				if (MyDocVersion != null)
 				{
-					str = Regex.Replace(str, @"\<[uU]\>", MyDocVersion.DocVersionConfig.Unit_Number);
+					// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
+					str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
 				}
 				else
 				{
@@ -2979,16 +2982,13 @@ namespace VEPROMS.CSLA.Library
 				if (MyDocVersion != null)
 				{
 					// B2022-035: resolve unit specific designators 
-					if (str.ToUpper().Contains("<U")) str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
+					// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
+					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,7 +3047,8 @@ namespace VEPROMS.CSLA.Library
 				string str = MyContent.Text;
 				if (MyDocVersion != null)
 				{
-					str = Regex.Replace(str, @"\<[uU]\>", MyDocVersion.DocVersionConfig.Unit_Number);
+					// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
+					str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
 				}
 				else
 				{
@@ -3080,8 +3081,8 @@ namespace VEPROMS.CSLA.Library
 					}
 					else
 						str = MyContent.Number;
-					str = Regex.Replace(str, @"\<U-ID\>", MyDocVersion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase);
+					// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
-					str = Regex.Replace(str, @"\<ID\>", MyDocVersion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase);
+					str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
 				}
 				else
 				{
@@ -3094,7 +3095,9 @@ 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)
-					str = Regex.Replace(str, @"\<[uU]\>", MyDocVersion.DocVersionConfig.Unit_Number); // B2017-019 - process "<u>" in section number
+					// 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);
 				return str;
 			}
 			//get { return ConvertToDisplayText(MyContent.Number); }
@@ -4452,9 +4455,10 @@ namespace VEPROMS.CSLA.Library
 					}
 				}
 				// F2024-037 reset the seq sub-step numbering if the parent is an un-numbered high level step
-				else if (sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS && IsSequential && MyParent != null && MyParent.IsHigh && MyParent.MyTab.Text.Length == 0)
+				// 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--; // since parent is a high level step we only need to go back one level
+					localPrintLevel = (int)sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS;
 					itmp = (localPrintLevel + PrintBias + OffsetTab) % seqtabs.MaxIndex;
 				}
 				if (!tbformat.Contains(@"{!C"))

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

@@ -1309,7 +1309,8 @@ namespace VEPROMS.CSLA.Library
 					else if (addType == EAddpingPart.Replace)   // what about user interface for enhanced pasted steps?
 					{
 						ItemInfo enhReplaceItem = ItemInfo.Get(edSource.ItemID);
-						newEnhancedItemInfo = Item.PasteReplace(enhReplaceItem, tmpCopyEnhancedID, chgid);
+						TreeNode trn = null;
+						newEnhancedItemInfo = Item.PasteReplace(enhReplaceItem, tmpCopyEnhancedID, chgid, trn);
 					}
 
 					// update the config data for the new enhanced item (procedure, section or step) to point back to the correct source
@@ -2497,13 +2498,16 @@ namespace VEPROMS.CSLA.Library
 		}
 		#endregion
 		#region PasteReplace
-		public static ItemInfo PasteReplace(ItemInfo itemInfo, int copyStartID, string chgid)
+
+
+
+		public static ItemInfo PasteReplace(ItemInfo itemInfo, int copyStartID, string chgid, TreeNode treeNodeReplace)
 		{
-			bool tmp= false;
+			bool tmp = false;
-			return PasteReplace(itemInfo, copyStartID, chgid, ref tmp);
+			return PasteReplace(itemInfo, copyStartID, chgid, treeNodeReplace, 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, ref bool firstTrans)
+		public static ItemInfo PasteReplace(ItemInfo itemInfo, int copyStartID, string chgid, TreeNode treeNodeReplace, ref bool firstTrans)
 		{
 			firstTrans = false;
 			if (!CanDeleteObject())
@@ -2560,7 +2564,14 @@ namespace VEPROMS.CSLA.Library
 				}
 				else
 				{
-					newItemInfo.MyParent.OnNewChild(new ItemInfoInsertEventArgs(newItemInfo, ItemInfo.EAddpingPart.Child));
+					//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;
 				}
 				return newItemInfo;
 			}

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

@@ -1229,7 +1229,8 @@ namespace VEPROMS.CSLA.Library
 					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
-						tb.Append(string.Format(" (Page{0}{1})", "\\u160;", tb._ToItem.PageNumber + 1));
+						//B2024-026: hard space unicode ends with '?' not ';'
+						tb.Append(string.Format(" (Page{0}{1})", "\\u160?", tb._ToItem.PageNumber + 1));
 						break;
 				}
 			}
@@ -1540,8 +1541,8 @@ namespace VEPROMS.CSLA.Library
 			ItemInfo tmpitm = TranGetSectionItem(itminfo);
 			if (!tmpitm.IsSection) return "";
 			string str = tmpitm.MyContent.Number;
-			str = Regex.Replace(str, @"\<U\>", itminfo.MyDocVersion.DocVersionConfig.Unit_Number, RegexOptions.IgnoreCase );
+			// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
-			str = Regex.Replace(str, @"\<ID\>", itminfo.MyDocVersion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase);
+			str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(itminfo.MyDocVersion, str);
 			return (str);
 		}
 		private static string TranGetSectionNumber(TransitionBuilder tb, bool allLevels)
@@ -1566,8 +1567,8 @@ namespace VEPROMS.CSLA.Library
 			}
 			//string str = tmpitm.MyContent.Number;
 			string str = BuildSectionPath(ToSections);
-			str = Regex.Replace(str, @"\<U\>", tb._ToItem.MyDocVersion.DocVersionConfig.Unit_Number, RegexOptions.IgnoreCase);
+			// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
-			str = Regex.Replace(str, @"\<ID\>", tb._ToItem.MyDocVersion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase);
+			str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(tb._ToItem.MyDocVersion, str);
 			//if (!str.EndsWith(".") && tb._ToItem.ItemID != tb._ToItem.ActiveSection.ItemID)
 			tb.StepPrefix = ".";
 			tb.SectionNumberLength = str.Length;

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

@@ -4508,8 +4508,9 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _AllowNoteCautionAdd, "@AllowNoteCautionAdd");
 			}
 		}
-		private LazyLoad<bool> _ResetSeqNumberingAfterUnnumberedHLS;
+		// F2024-049 changed to specify the sub-step level via the format file (Generic EOP and Vogtle 3&4)
-		public bool ResetSeqNumberingAfterUnnumberedHLS
+		private LazyLoad<int?> _ResetSeqNumberingAfterUnnumberedHLS;
+		public int? ResetSeqNumberingAfterUnnumberedHLS
 		{
 			get
 			{

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

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

PROMS/VG/VG.csproj

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

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

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

PROMS/Volian.Controls.Library/DisplayRO.cs

@@ -56,6 +56,9 @@ namespace Volian.Controls.Library
 
 		private ROFSTLookup.rochild selectedChld;
 
+		private DisplayTags displayTags;
+
+
 		#endregion
 
 		#region Properties
@@ -268,6 +271,10 @@ namespace Volian.Controls.Library
 				_searchTimer.Stop();
 			}
 
+
+			// Initialize the DisplayTags object
+			displayTags = new DisplayTags();
+
 			_progressBar = null;
 		}
 
@@ -927,7 +934,7 @@ namespace Volian.Controls.Library
 			bool replacingRO = (_savCurROLink != null);
 
 			string insrpl = (replacingRO) ? "Cannot Replace" : "Cannot Insert";
-			string errormsg = string.Empty;
+			string errormsg = string.Empty;	
 
 			switch (selectedRO.type)
 			{
@@ -968,7 +975,10 @@ namespace Volian.Controls.Library
 						errormsg = (replacingRO) ? "a graphics RO with a non-graphcis RO." : "a Graphics RO in an non-Figure or a non-Accessory Page type.";
 						//TODO: Prompt user to insert a new substep type that handles x/y Plots and place this RO into it
 						goodToGo = false;
-					}
+
+						
+
+	}
 					break;
 			}
 

PROMS/Volian.Controls.Library/DisplayTabControl.cs

@@ -688,8 +688,14 @@ namespace Volian.Controls.Library
 							edtitm.PasteSiblingAfter(copyStartID);
 							break;
 						case ItemInfo.EAddpingPart.Replace:
+							
 							EditItem ei = edtitm.PasteReplace(copyStartID);
-							if (ei == null) return false; //B2017-179 PasteReplace will return null if was aborted
+							if (ei == null)
+							{		
+								CloseTabItem(_MyDisplayTabItems["Item - " + myItemInfo.ItemID.ToString()]); //Grab itemID and set to close open tab.
+								return false; //B2017-179 PasteReplace will return null if was aborted
+							}
+							
 							if (ei.MyItemInfo.ItemID != edtitm.MyItemInfo.ItemID)
 							{
 								edtitm.Dispose();

PROMS/Volian.Controls.Library/DisplayTags.Designer.cs

@@ -640,7 +640,7 @@ namespace Volian.Controls.Library
 			this.btnFSrestore.Location = new System.Drawing.Point(112, 27);
 			this.btnFSrestore.Margin = new System.Windows.Forms.Padding(2);
 			this.btnFSrestore.Name = "btnFSrestore";
-			this.btnFSrestore.Size = new System.Drawing.Size(54, 26);
+			this.btnFSrestore.Size = new System.Drawing.Size(54, 20);
 			this.btnFSrestore.TabIndex = 6;
 			this.btnFSrestore.Text = "Restore";
 			this.btnFSrestore.UseVisualStyleBackColor = true;

PROMS/Volian.Controls.Library/DisplayTags.cs

@@ -96,6 +96,22 @@ namespace Volian.Controls.Library
 			get { return Visible; }
 			set { if (Visible != value) Visible = value; }
 		}
+
+		/// <summary>
+		/// Expose text properties for height and widht to handle selecting RO Image Types.
+		/// </summary>
+		public string TbFSwd
+		{
+			get	{return tbFSWd.Text;}
+			set { tbFSWd.Text = value; tbFSWd.Refresh(); trBarFS.Value = Convert.ToInt32(value); }
+		}
+
+		public string TbFSht
+		{
+			get { return tbFSHt.Text; }
+			set { tbFSHt.Text = value; tbFSHt.Refresh(); _origFigureSizeRatio = float.Parse(value) / float.Parse(tbFSWd.Text); }
+		}
+	
 		#endregion
 		#region Constructor
 		public DisplayTags()
@@ -383,6 +399,8 @@ namespace Volian.Controls.Library
 				cmbCheckoff.Enabled = false;
 			}
 
+			
+
 			// show the part of panel for resizing a figure (if figure already exists: MyImage is set for non-RO existing images & content.text has a link in it)
 			if (MyEditItem.MyItemInfo.IsFigure && (MyEditItem.MyItemInfo.MyContent.MyImage != null || MyEditItem.MyItemInfo.MyContent.Text.ToUpper().Contains("#LINK")))
 			{
@@ -391,20 +409,41 @@ namespace Volian.Controls.Library
 				int wd = (MyEditItem as ImageItem).MyPictureBox.Width;
 				_origFigureSizeRatio = (float)ht / (float)wd;   // use this to keep width/height ratio while changing size.
 				float wd1 = (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.PageWidth - (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.LeftMargin;
-				float ht1 = (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.PageLength - (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.TopMargin - 36;	// 36 is to allow for end message 
+				float ht1 = (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.PageLength - (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.TopMargin - 36;  // 36 is to allow for end message 
-				float wd2 = Math.Min(wd1, ht1 / _origFigureSizeRatio);		// keep original ratio
+				float wd2 = Math.Min(wd1, ht1 / _origFigureSizeRatio);      // keep original ratio
-				trBarFS.Maximum = Math.Max((int)wd2, trBarFS.Maximum);
+
-				if (wd > trBarFS.Maximum) trBarFS.Maximum = wd + 1;
+				SetFigure(wd1, wd2);
-				trBarFS.Minimum = Math.Min(wd, 72);
+
-				trBarFS.Value = (int)wd;
+				tbFSWd.Text = wd.ToString();
-				ImageItem ii = MyEditItem as ImageItem;
+				tbFSHt.Text = ht.ToString();
-				_origFigureSizeWidth = ii.MyPictureBox.Width;
+
-				tbFSWd.Text = ii.MyPictureBox.Width.ToString();
+				//trBarFS.Maximum = Math.Max((int)wd2, trBarFS.Maximum);
-				tbFSHt.Text = ii.MyPictureBox.Height.ToString();
+				//if (wd > trBarFS.Maximum) trBarFS.Maximum = wd + 1;
+				//trBarFS.Minimum = Math.Min(wd, 72);
+				//trBarFS.Value = (int)wd;
+				//ImageItem ii = MyEditItem as ImageItem;
+				//_origFigureSizeWidth = ii.MyPictureBox.Width;
+				//tbFSWd.Text = ii.MyPictureBox.Width.ToString();
+				//tbFSHt.Text = ii.MyPictureBox.Height.ToString();
 			}
 			else
 			{
-				groupPanelFigSize.Visible = false;
+				if (MyEditItem.MyItemInfo.IsFigure)
+				{
+					//No Current image, but still show groupPanelFigSize, will adjust when file is selected, but let's give it a default
+					//size on using the picturebox.
+					groupPanelFigSize.Visible = true;
+					int ht = (MyEditItem as ImageItem).MyPictureBox.Height;
+					int wd = (MyEditItem as ImageItem).MyPictureBox.Width;
+					_origFigureSizeRatio = (float)ht / (float)wd;   // use this to keep width/height ratio while changing size.
+					float wd1 = (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.PageWidth - (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.LeftMargin;
+					float ht1 = (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.PageLength - (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.TopMargin - 36;  // 36 is to allow for end message 
+					float wd2 = Math.Min(wd1, ht1 / _origFigureSizeRatio);      // keep original ratio
+
+					SetFigure(wd1, wd2);
+				}
+				else
+					groupPanelFigSize.Visible = false;
 			}
 
 			// change bar setting depends on whether step has changed (dts) as compared to date/time off the
@@ -516,6 +555,22 @@ namespace Volian.Controls.Library
 			}
 			_Initalizing = false;
 		}
+		public void SetFigure(double wd, double wd2)
+		{
+			// Check MyEditItem type and cast if needed
+			ImageItem ii = MyEditItem as ImageItem;
+			if (ii == null) return;
+
+			// Set the values as needed
+			trBarFS.Maximum = Math.Max((int)wd2, trBarFS.Maximum);
+			if (wd > trBarFS.Maximum) trBarFS.Maximum = (int)wd + 1;
+			trBarFS.Minimum = Math.Min((int)wd, 72);
+			trBarFS.Value = (int)wd;
+			_origFigureSizeWidth = ii.MyPictureBox.Width;
+			//tbFSWd.Text = ii.MyPictureBox.Width.ToString();
+			//tbFSHt.Text = ii.MyPictureBox.Height.ToString();
+		}
+
 		private int DoListStepTypes(FormatData fmtdata, StepData topType, string curType)
 		{
 			int cursel=-1;
@@ -857,7 +912,7 @@ namespace Volian.Controls.Library
 			}
 		}
 		private float _origFigureSizeRatio = 0;		// keep original ratio & width in case of 'restore'
-		private int _origFigureSizeWidth = 0;
+		public int _origFigureSizeWidth = 0;
 		// support user changing size using slider.  This saves change back to ImageItem and sets 
 		// width/height text boxes to slider values.
 		private void trBarFS_Scroll(object sender, EventArgs e)
@@ -871,11 +926,14 @@ namespace Volian.Controls.Library
 		// restore the orignal image size
 		private void btnFSrestore_Click(object sender, EventArgs e)
 		{
-			tbFSWd.Text = _origFigureSizeWidth.ToString();
+			if (_origFigureSizeWidth != 0)
-			int ht = (int)(_origFigureSizeRatio * _origFigureSizeWidth);
+			{
-			tbFSHt.Text = ht.ToString();
+				tbFSWd.Text = _origFigureSizeWidth.ToString();
-			(MyEditItem as ImageItem).SizeImage(_origFigureSizeWidth, ht);
+				int ht = (int)(_origFigureSizeRatio * _origFigureSizeWidth);
-			trBarFS.Value = _origFigureSizeWidth;
+				tbFSHt.Text = ht.ToString();
+				(MyEditItem as ImageItem).SizeImage(_origFigureSizeWidth, ht);
+				trBarFS.Value = _origFigureSizeWidth;
+			}
 		}
 		// user entered width in text box, this event gets called on leave of text box.
 		private void tbFSWd_Leave(object sender, EventArgs e)

PROMS/Volian.Controls.Library/EditItem.cs

@@ -1209,7 +1209,7 @@ namespace Volian.Controls.Library
 		{
 			EditItem child = null;
 			if (MyItemInfo.IsFigure)
-				child = new ImageItem(MyItemInfo, MyStepPanel, this, ChildRelation.After, true, nextEditItem, FigInsType);
+				child = new ImageItem(MyItemInfo, MyStepPanel, this, ChildRelation.After, true, nextEditItem, FigInsType, _MyStepPropertiesPanel);
 			else if (MyItemInfo.IsRtfRaw)
 				child = new RtfRawItem(MyItemInfo, MyStepPanel, this, ChildRelation.After, true, nextEditItem);
 			else if (MyItemInfo.MyContent.MyGrid != null)
@@ -1222,7 +1222,7 @@ namespace Volian.Controls.Library
 		{
 			EditItem child = null;
 			if (MyItemInfo.IsFigure)
-				child = new ImageItem(MyItemInfo, MyStepPanel, this, ChildRelation.Before, true, nextEditItem, FigInsType);
+				child = new ImageItem(MyItemInfo, MyStepPanel, this, ChildRelation.Before, true, nextEditItem, FigInsType, _MyStepPropertiesPanel);
 			else if (MyItemInfo.IsRtfRaw)
 				child = new RtfRawItem(MyItemInfo, MyStepPanel, this, ChildRelation.Before, true, nextEditItem);
 			if (MyItemInfo.MyContent.MyGrid != null)
@@ -1825,6 +1825,7 @@ namespace Volian.Controls.Library
 			EditItem newFocus = null;
 			EditItem nextEditItem = MyNextEditItem;
 			EditItem prevEditItem = MyPreviousEditItem;
+			if (MyStepPanel?.SelectedEditItem?.ActiveParent == null) return null; //Was causing an error when active parent was null and the replaced proc was opened in the editor.
 			EditItem parentEditItem = ActiveParent;
 
 			StepConfig savOrigPasteConfig = MyItemInfo.MyConfig as StepConfig;
@@ -1835,7 +1836,8 @@ namespace Volian.Controls.Library
 			bool gotoFirstTrans = false;
 			try
 			{
-				newItemInfo = Item.PasteReplace(MyItemInfo, copyStartID, GetChangeId(MyItemInfo), ref gotoFirstTrans);
+				TreeNode treeNodeReplace = null;
+				newItemInfo = Item.PasteReplace(MyItemInfo, copyStartID, GetChangeId(MyItemInfo), treeNodeReplace, ref gotoFirstTrans);
 				if (gotoFirstTrans)  //B2017-179 could not replace step, we are positioning onto the first transition that needs resolved
 				{
 					MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OpenItem(newItemInfo);
@@ -2185,6 +2187,9 @@ namespace Volian.Controls.Library
 			// B2017-043 account for Horizontal Scroll
 			int colT = MyStepPanel.DisplayRectangle.X + MyStepPanel.ToDisplay((int)myStepSectionLayoutData.ColT);
 			if (x < colT) x = colT;
+			// B2023-025: if x is <= 0, add 20 to it so that left column of table isn't cut-off. 20 was used because lesser numbers
+			//	still cut-off the left column (by trial and error).
+			if (x <= 0) x = 20;
 			int y = FindTop(myParentEditItem.Bottom);
 			return new Point(x, y);
 		}
@@ -3580,6 +3585,9 @@ namespace Volian.Controls.Library
 		private string ResolveUnitApp(DocVersionInfo dvi, string str)
 		{
 			if (dvi == null) return str;
+			// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
+			str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(dvi, str);
+			// look for un-resolved tokens and replace less/greater than chars with "*?" and "?*" respectively 
 			string tmp = str.ToUpper();
 			int sindx = tmp.IndexOf("<U");
 			int eindx = tmp.IndexOf(">", sindx + 1);
@@ -3588,21 +3596,34 @@ namespace Volian.Controls.Library
 			{
 				reptmp = str.Substring(sindx, eindx - sindx + 1);
 				tmp = reptmp.ToUpper();
-				if (tmp == "<U>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Number);
+				str = str.Replace(reptmp, tmp.Replace("<", "*?").Replace(">", "?*")); // unresolved token
-				else if (tmp == "<U-TEXT>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Text);
-				else if (tmp == "<U-NUMBER>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Number);
-				else if (tmp == "<U-NAME>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Name);
-				else if (tmp == "<U-ID>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_ID);
-				// B2021-145: For applicability, the tree view & pdf file name are not getting resolved when using any of the ‘OTHER’ tokens
-				else if (tmp == "<U-OTHERTEXT>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Text);
-				else if (tmp == "<U-OTHERNUMBER>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Number);
-				else if (tmp == "<U-OTHERNAME>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Name);
-				else if (tmp == "<U-OTHERID>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_ID);
-				else str = str.Replace(reptmp, tmp.Replace("<", "*?").Replace(">", "?*"));
 				tmp = str.ToUpper();
 				sindx = tmp.IndexOf("<U");
 				eindx = tmp.IndexOf(">", sindx + 1);
 			}
+			//string tmp = str.ToUpper();
+			//int sindx = tmp.IndexOf("<U");
+			//int eindx = tmp.IndexOf(">", sindx + 1);
+			//string reptmp;
+			//while (sindx > -1 && eindx > -1) // B2022-007 added while loop to process more than one <U- RO value
+			//{
+			//	reptmp = str.Substring(sindx, eindx - sindx + 1);
+			//	tmp = reptmp.ToUpper();
+			//	if (tmp == "<U>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Number);
+			//	else if (tmp == "<U-TEXT>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Text);
+			//	else if (tmp == "<U-NUMBER>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Number);
+			//	else if (tmp == "<U-NAME>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Name);
+			//	else if (tmp == "<U-ID>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_ID);
+			//	// B2021-145: For applicability, the tree view & pdf file name are not getting resolved when using any of the ‘OTHER’ tokens
+			//	else if (tmp == "<U-OTHERTEXT>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Text);
+			//	else if (tmp == "<U-OTHERNUMBER>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Number);
+			//	else if (tmp == "<U-OTHERNAME>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Name);
+			//	else if (tmp == "<U-OTHERID>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_ID);
+			//	else str = str.Replace(reptmp, tmp.Replace("<", "*?").Replace(">", "?*"));
+			//	tmp = str.ToUpper();
+			//	sindx = tmp.IndexOf("<U");
+			//	eindx = tmp.IndexOf(">", sindx + 1);
+			//}
 			return str;
 		}
 		// C2021-018 used to display Alarm Point Table RO values in the editor

PROMS/Volian.Controls.Library/ImageItem.cs

@@ -256,6 +256,8 @@ namespace Volian.Controls.Library
 		private int _origCfgHt = 0;	// keep track if original size was stored in cfg
 		private int _origCfgWd = 0;
 		private bool _pastedNew = false;   // need this for flagging newly pasted image (may need to clear cfg)
+		private DisplayTags _displayTags;
+
 		#endregion
 		#region Constructors
 		public ImageItem()
@@ -266,6 +268,7 @@ namespace Volian.Controls.Library
 		public ImageItem(ItemInfo itemInfo, StepPanel myStepPanel, EditItem myParentEditItem, ChildRelation myChildRelation, bool expand)
 		{
 			InitializeComponent();
+			
 			MyItemInfo = itemInfo;
 			SetupEditItem(itemInfo, myStepPanel, myParentEditItem, myChildRelation, expand, null, false);
 			if (MyItemInfo.MyContent.MyImage != null && MyItemInfo.MyContent.MyImage.Data != null)  // this is figure/image (not RO)
@@ -307,6 +310,7 @@ namespace Volian.Controls.Library
 			this.Height = MyPictureBox.Height + 10;
 			_newSizeWd = wd / (MyStepPanel.DPI / 72);
 			_newSizeHt = ht / (MyStepPanel.DPI / 72);
+
 			if (!MyItemInfo.FormatStepData.StepEditData.TypeMenu.MenuItem.ToUpper().Contains("AER")) ItemLocation = TableLocation(MyStepSectionLayoutData, ItemWidth);
 			_IsDirty = true;
 		}
@@ -330,13 +334,23 @@ namespace Volian.Controls.Library
 			MyPictureBox.SizeMode = PictureBoxSizeMode.Zoom;		// as resize matches width/height.
 			this.Width = MyPictureBox.Width + ImageMargin;
 			this.Height = MyPictureBox.Height + 10;
+			if (_displayTags != null)
+			{
+				_displayTags._origFigureSizeWidth = wd;
+				_displayTags.TbFSwd = wd.ToString();
+				_displayTags.TbFSht = ht.ToString();
+			}
+
+
 		}
 		// the following gets called for 'NEW' images
 		private E_ImageSource InsType = E_ImageSource.None;
-		public ImageItem(ItemInfo itemInfo, StepPanel myStepPanel, EditItem myParentEditItem, ChildRelation myChildRelation, bool expand, EditItem nextEditItem, ImageItem.E_ImageSource insType)
+		public ImageItem(ItemInfo itemInfo, StepPanel myStepPanel, EditItem myParentEditItem, ChildRelation myChildRelation, bool expand, EditItem nextEditItem, ImageItem.E_ImageSource insType, DisplayTags displayTags)
 		{
 			InitializeComponent();
 			MyItemInfo = itemInfo;
+			_displayTags = displayTags;
+			
 			if (MyItemInfo.MyContent.MyImage != null && MyItemInfo.MyContent.MyImage.Data != null)  // this is figure/image (not RO)
 			{
 				SetupEditItem(itemInfo, myStepPanel, myParentEditItem, myChildRelation, expand, nextEditItem, false);
@@ -368,8 +382,8 @@ namespace Volian.Controls.Library
 				FileName = null;
 				//InitializeComponent();
 				SetupEditItem(itemInfo, myStepPanel, myParentEditItem, myChildRelation, expand, nextEditItem, false);
-				MyPictureBox.Width = 100;
+				//MyPictureBox.Width = 100;
-				MyPictureBox.Height = 100;
+				//MyPictureBox.Height = 100;
 				this.Width = 100 + ImageMargin;
 				this.Height = 100;
 				if (insType == ImageItem.E_ImageSource.File)
@@ -546,6 +560,7 @@ namespace Volian.Controls.Library
 							imageText = val;
 					}
 					AddROImageToScreen(W, H, imageText);
+
 				}
 				catch (Exception ex)
 				{

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

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

PROMS/Volian.Controls.Library/StepTabRibbon.cs

@@ -1999,6 +1999,9 @@ namespace Volian.Controls.Library
 			btnReviewCreatePDF.SubItems.Clear();
 			btnReviewCreatePDF.Tag = null;
 			btnReviewCreatePDF.Click -= new System.EventHandler(btnPdfCreate_Click);
+			btnReviewPdfQuickCreate.SubItems.Clear();
+			btnReviewPdfQuickCreate.Tag = null;
+			btnReviewPdfQuickCreate.Click -= new System.EventHandler(btnPdfQuickCreate_Click);
 			int k = 0;
 			foreach (string s in unitNames)
 			{
@@ -2017,10 +2020,14 @@ namespace Volian.Controls.Library
 				btn = MakeSubMenuButton(s, k, miMultiUnit_Click);
 				btn.Enabled = procAppl;
 				btnCASCreate.SubItems.Add(btn);
+				btn = MakeSubMenuButton(s, k, miMultiUnit_Click);
+				btn.Enabled = procAppl;
+				btnReviewPdfQuickCreate.SubItems.Add(btn);
 			}
 			btnPdfCreate.AutoExpandOnClick = true;
 			btnPdfQuickCreate.AutoExpandOnClick = true;
 			btnReviewCreatePDF.AutoExpandOnClick = true;
+			btnReviewPdfQuickCreate.AutoExpandOnClick = true;
 			btnCASCreate.AutoExpandOnClick = true;
 		}
 		private DevComponents.DotNetBar.ButtonItem MakeSubMenuButton(string s, object tag, EventHandler ehandler)

PROMS/Volian.Controls.Library/StepTabRibbon.resx

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

PROMS/Volian.Controls.Library/VlnFlexGrid.cs

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

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

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

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

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

PROMS/Volian.Controls.Library/app.config

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

PROMS/Volian.Controls.Library/packages.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="C1.Win" version="8.0.20233.631" targetFramework="net481" />
+  <package id="C1.Win.C1FlexGrid" version="4.8.20233.631" targetFramework="net481" />
+  <package id="C1.Win.C1SpellChecker" version="4.8.20233.631" targetFramework="net481" />
+</packages>