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

Merging Development into master after successful testing.

.gitignore

@@ -401,5 +401,4 @@ FodyWeavers.xsd
 
 /fmtall
 /genmacall
-*AssemblyInfo.cs
-/PROMS/Baseline/Baseline.sln
+*AssemblyInfo.cs

PROMS/AdjustBuildRevision/Program.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Text;
 using System.IO;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
@@ -33,7 +35,31 @@ namespace AdjustBuildRevision
 								outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.4.yyMM.dHH") + "\")");
 							else
 								outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.3.yyMM.dHH") + "\")");
-							
+					//		if (outline != line)
+					//		{
+					//			Console.WriteLine("Before: '{0}'", line);
+					//			Console.WriteLine("After:  '{0}'", outline);
+					//			lines[i] = outline;
+					//			changed = true;
+					//		}
+					//		else
+					//		{
+					//			Console.WriteLine("No change: '{0}'", line);
+					//		}
+					//	}
+					//}
+					//if (changed)
+					//{
+					//	if (!fi.IsReadOnly) fi.IsReadOnly = false;
+					//	StreamWriter sw = fi.CreateText();
+					//	foreach (string line in lines)
+					//		sw.WriteLine(line);
+					//	sw.Close();
+					//	string line = lines[i];
+					//	string outline = line;
+					//	if (line.Contains("AssemblyVersion") || line.Contains("AssemblyFileVersion"))
+					//	{
+							//outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("1.1.yyMM.dHH") + "\")");
 							if (outline != line)
 							{
 								Console.WriteLine("Before: '{0}'", line);
@@ -58,7 +84,7 @@ namespace AdjustBuildRevision
 				}
 				else
 				{
-					MessageBox.Show($"File {fi.FullName} does not exist");
+					MessageBox.Show("File " + fi.FullName + " does not exist");
 				}
 			}
 			catch (Exception ex)
@@ -67,6 +93,10 @@ namespace AdjustBuildRevision
 			}
 		}
 
+		//private static DateTime GetLatestDateTime(string path)
+		//{
+		//	return GetLatestDateTime(new DirectoryInfo(path));
+		//}
 		private static DateTime GetLatestDateTime(DirectoryInfo di, DateTime dtCheck)
 		{
 			DateTime dtMax = dtCheck;
@@ -74,14 +104,24 @@ namespace AdjustBuildRevision
 			foreach(FileInfo myFile in myFiles)
 			{
 				DateTime dt = myFile.LastWriteTime;
-				if(dtMax < dt) dtMax = dt;
+				//if (dt > dtCheck)
+				//{
+					//Console.WriteLine("\"File\"\t\"{0}\"\t\"{1}\"\t{2}\t{3}",myFile.FullName,dt.ToString("1.1.yyMM.dHH"),dt,dtCheck);
+					if(dtMax < dt) dtMax = dt;
+				//}
 			}
 			DirectoryInfo[] myFolders = di.GetDirectories();
 			foreach (DirectoryInfo diChild in myFolders)
 			{
 				DateTime dtChild = GetLatestDateTime(diChild,dtCheck);
-				if(dtChild > dtMax) dtMax = dtChild;
+				//if (dtChild > dtCheck)
+				//{
+					//Console.WriteLine("\"SubFolder\"\t\"{0}\"\t\"{1}\"\t{2}\t{3}", diChild.FullName, dtChild.ToString("1.1.yyMM.dHH"),dtChild,dtCheck);
+					if(dtChild > dtMax) dtMax = dtChild;
+				//}
 			}
+			//if(dtMax > dtCheck)
+			//	Console.WriteLine("\"Folder\"\t\"{0}\"\t\"{1}\"", di.FullName, dtMax.ToString("1.1.yyMM.dHH"));
 			return dtMax;
 		}
 	}

PROMS/Baseline/Baseline.csproj

@@ -67,7 +67,6 @@
     <Compile Include="frmSettings.Designer.cs">
       <DependentUpon>frmSettings.cs</DependentUpon>
     </Compile>
-    <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <EmbeddedResource Include="frmBaseline.resx">

PROMS/Baseline/GlobalSuppressions.cs

@@ -1,8 +0,0 @@
-// This file is used by Code Analysis to maintain SuppressMessage
-// attributes that are applied to this project.
-// Project-level suppressions either have no target or are given
-// a specific target and scoped to a namespace, type, member, etc.
-
-using System.Diagnostics.CodeAnalysis;
-
-[assembly: SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Not modifying Naming Styles")]

PROMS/Baseline/Program.cs

@@ -1,4 +1,7 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace Baseline

PROMS/Baseline/frmBaseline.cs

@@ -43,9 +43,12 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
+using System.Drawing;
 using System.Linq;
 using System.Text;
+using System.Threading.Tasks;
 using System.Windows.Forms;
+using System.Collections.Specialized;
 using System.IO;
 using System.Text.RegularExpressions;
 using System.Xml.Serialization;
@@ -70,8 +73,13 @@ namespace Baseline
 	}
 	public partial class frmBaseline : Form
 	{
-        public IgnoreLines MyIgnore { get; set; } = new IgnoreLines();
-        private LastWas myLast = LastWas.Search;
+		private IgnoreLines _MyIgnore = new IgnoreLines();
+		public IgnoreLines MyIgnore
+		{
+			get { return _MyIgnore; }
+			set { _MyIgnore = value; }
+		}
+		private LastWas myLast = LastWas.Search;
 		private Settings MySettings;
 		public string MyStatus
 		{
@@ -143,11 +151,9 @@ namespace Baseline
 			this.WindowState = Properties.Settings.Default.WidnowState;
 			if(Properties.Settings.Default.Ignore != null && Properties.Settings.Default.Ignore != "")
 				MyIgnore = IgnoreLines.Get(Properties.Settings.Default.Ignore);
-            MySettings = new Settings
-            {
-                IgnoreLines = new BindingList<string>()
-            };
-            splitContainer1.SplitterDistance = Properties.Settings.Default.Split1;
+			MySettings= new Settings();
+			MySettings.IgnoreLines = new BindingList<string>();
+			splitContainer1.SplitterDistance = Properties.Settings.Default.Split1;
 			splitContainer2.SplitterDistance = Properties.Settings.Default.Split2;
 			splitContainer3.SplitterDistance = Properties.Settings.Default.Split3;
 			if (Properties.Settings.Default.MRU1 != null && Properties.Settings.Default.MRU1.Count > 0)
@@ -234,27 +240,28 @@ namespace Baseline
 			lbProcedures.Items.Clear();
 			lbResults1.Items.Clear();
 			lbResults2.Items.Clear();
-            if (lbDifferent.SelectedItem is FindFile ff)
-            {
-                // Fill Procedure or Result ListBoxes
-                switch (myLast)
-                {
-                    case LastWas.Pagination:
-                        CompareContent(ff.File1, ff.File2);// Compare DebugPagination
-                        break;
-                    case LastWas.Baseline:
-                        CompareContent3(ff.File1, ff.File2);// Compare DebugMeta
-                        break;
-                    case LastWas.Search:
-                        ShowSearchResults(ff.File1, ff.File2);// Perform search on DebugMeta
-                        break;
-                    default:
-                        CompareContent(ff.File1, ff.File2);//Default DebugPagination
-                        break;
-                }
-                //CompareOneFile(ff.File1, ff.File2);
-            }
-        }
+			FindFile ff = lbDifferent.SelectedItem as FindFile;
+			if (ff != null)
+			{
+				// Fill Procedure or Result ListBoxes
+				switch (myLast)
+				{
+					case LastWas.Pagination:
+						CompareContent(ff.File1, ff.File2);// Compare DebugPagination
+						break;
+					case LastWas.Baseline:
+						CompareContent3(ff.File1, ff.File2);// Compare DebugMeta
+						break;
+					case LastWas.Search:
+						ShowSearchResults(ff.File1, ff.File2);// Perform search on DebugMeta
+						break;
+					default:
+						CompareContent(ff.File1, ff.File2);//Default DebugPagination
+						break;
+				}
+				//CompareOneFile(ff.File1, ff.File2);
+			}
+		}
 		Procedures MyProcs1;
 		Procedures MyProcs2;
 		/// <summary>
@@ -354,6 +361,13 @@ namespace Baseline
 			lines1 = list1.AsEnumerable<string>();// Convert back to Enumerable to work with LINQ
 			return lines1;
 		}
+		private string GetProcNum(string line)
+		{
+			string retval =  line.Substring(3, line.IndexOf(" | ") - 3);
+			if (retval.Contains("_"))
+				retval = retval.Substring(0, retval.IndexOf("_") - 1);
+			return retval;
+		}
 		/// <summary>
 		/// Include lines for Procedure or Page or Search is true
 		/// Account for Case Insensitive CheckBox
@@ -436,13 +450,13 @@ namespace Baseline
 		private void lbResults1_SelectedIndexChanged(object sender, EventArgs e)
 		{
 			string line=null;
-			if (lbResults1.SelectedItem is string v)
-				line = v;
+			if (lbResults1.SelectedItem is string)
+				line = (string)lbResults1.SelectedItem;
 			Line myLine = lbResults1.SelectedItem as Line;
 				switch (myLast)
 				{
 					case LastWas.Pagination:
-						OpenPDF(line);
+						line = OpenPDF(line);
 						break;
 					case LastWas.Baseline: // TODO: Need to add code here to open matching file
 						OpenOnePDF(myLine,1);
@@ -458,14 +472,14 @@ namespace Baseline
 		{
 
 			string line=null;
-			if(lbResults2.SelectedItem is string v)
-				line = v;
+			if(lbResults2.SelectedItem is string)
+				line = (string)lbResults2.SelectedItem;
 			Line myLine = lbResults2.SelectedItem as Line;
 
 			switch (myLast)
 			{
 				case LastWas.Pagination:
-					OpenPDF(line);
+					line = OpenPDF(line);
 					break;
 				case LastWas.Baseline: // TODO: Need to add code here to open matching file
 					OpenOnePDF(myLine,2);
@@ -477,97 +491,34 @@ namespace Baseline
 					break;
 			}
 		}
-
-		/// <summary>
-		/// This will return the full path to the PDF file
-		/// </summary>
-		/// <param name="fi"></param>
-		/// <param name="patern"></param>
-		/// <returns></returns>
-		private string GetPFDFileAndPath(FileInfo fi, string patern)
-		{
-			string[] fileList = Directory.GetFiles(fi.DirectoryName, patern);
-			// sort the list of file list
-			Array.Sort((string[])fileList);
-			return fileList.FirstOrDefault(); // the PDF file that we what should be top of the list then.
-		}
-
-		/// <summary>
-		/// This will parse out the procedure number for the PROMS ShortPath representation of a procedure section or step part
-		/// In the PROMS ShortPath, ".S" is used to delimit the procedure number, section then uses "..S" for the step parts
-		/// This method was written to handle cases where ".S" is used as part of the procedure number
-		/// </summary>
-		/// <param name="txt"></param>
-		/// <returns></returns>
-		private string ParseOutProcedureNumberFromLine(string txt)
-		{
-            // if the item is to a high levels step or sub-step the short path as "..S" for each part of the step
-            // so look for the last occurence of ".." which will be the end of the section information
-            int lidx = txt.LastIndexOf("..");
-            if (lidx > 0)
-			{
-				lidx = txt.LastIndexOf(".S", lidx); // this will position us to the end of the procedure number
-			}
-			else
-			{
-				lidx = txt.LastIndexOf(".S"); // this will position us to the end of the procedure number if there was no step information
-			}
-            // old logic was looking for the first occurence of ".S" in the txt string as the ending point of the procedure nuumber
-            // Beaver Valley has a procedure number "1.SBGEN" in which the old logic would not work
-            // 1.SBGEN.SC. ==> short path of attachment section "C"
-            // 1.SBGEN.SC..S1. ==> short path of Step 1 in attachment section "C"
-            // B2018-113 - Replace slashes and backslashes with underscores just as PROMS does when creating a PDF file.
-            string rtnstr = txt.Substring(8, lidx - 8).Replace("/", "_").Replace("\\", "_");
-            return rtnstr;
-		}
-
 		string exePath;
-		private void OpenPDF(string line)
+		private string OpenPDF(string line)
 		{
-			int pageNum = int.Parse(line.Substring(0, 6));
+			int page = int.Parse(line.Substring(0, 6));
 			// B2018-113 - Replace slashes and backslashes with underscores just as PROMS does when creating a PDF file.
-			string ProcNum = ParseOutProcedureNumberFromLine(line);
-			string procPatern = string.Format("*{0}*.pdf", string.IsNullOrEmpty(line) ? "noProcNumber" : ProcNum);
-
+			line = line.Substring(8, line.IndexOf(".S") - 8).Replace("/", "_").Replace("\\", "_");
 			FindFile ff = lbDifferent.SelectedItem as FindFile;
 			FileInfo fi1 = new FileInfo(ff.File1);
 			FileInfo fi2 = new FileInfo(ff.File2);
-			string PDFfileName1 = GetPFDFileAndPath(fi1,procPatern);
-			string PDFfileName2 = GetPFDFileAndPath(fi2,procPatern);
-			if (string.IsNullOrEmpty(PDFfileName1) || string.IsNullOrEmpty(PDFfileName2)) return;
-
 			// If you don't know where the Reader executable is for PDFs Open a PDF and Check to see where the path points
 			if (exePath == null)
 			{
-				try
-				{
-					System.Diagnostics.Process p = System.Diagnostics.Process.Start(PDFfileName1);
-					exePath = TryToGetPath(p);
-					p.Kill(); // No need to keep it open
-				}
-				catch (Exception ex)
-				{
-					Application.DoEvents();
-					string msg = string.Format("{0} - {1}", ex.GetType().Name, ex.Message);
-					Console.WriteLine(msg);
-					MessageBox.Show(msg, "Error opening default PDF Viewer");
-					return;
-				}
+				System.Diagnostics.Process p = System.Diagnostics.Process.Start(fi1.DirectoryName + "\\" + line + ".pdf");
+				exePath = TryToGetPath(p);
+				p.Kill(); // No need to keep it open
 			}
-
 			// Open the first PDF on a Specific Page
-			System.Diagnostics.ProcessStartInfo psi1 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format(" /A \"page={0}\" \"{1}\" ", pageNum,PDFfileName1));
+			System.Diagnostics.ProcessStartInfo psi1 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format("/A page={0} ", page) + fi1.DirectoryName + "\\" + line + ".pdf ");
 			System.Diagnostics.Process p1 = System.Diagnostics.Process.Start(psi1);
 			// Move the PDF Reader window to 0,0
 			MoveProcess(p1, 0, 0);
-
-			// Open the second PDF on a Specific Page
-			System.Diagnostics.ProcessStartInfo psi2 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format(" /A \"page={0}\" \"{1}\" ", pageNum, PDFfileName2));
+			// Open the first PDF on a Specific Page
+			System.Diagnostics.ProcessStartInfo psi2 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format("/A page={0} ", page) + fi2.DirectoryName + "\\" + line + ".pdf ");
 			System.Diagnostics.Process p2 = System.Diagnostics.Process.Start(psi2);
 			// Move the PDF Reader window to 960,0
 			// TODO: This Offset could be a Setting
 			MoveProcess(p2, 960, 0);
-			return;
+			return line;
 		}
 		/// <summary>
 		/// Try to get the location of the PDF Reader executable
@@ -579,7 +530,7 @@ namespace Baseline
 			p.WaitForInputIdle();
 			while (p.MainModule == null)
 			{
-				Console.WriteLine("{0} -  {1}", p.MainWindowTitle, p.ProcessName);
+				Console.WriteLine("{0} -  {1}", p.MainWindowTitle,p.ProcessName);
 				p.WaitForInputIdle();
 				Application.DoEvents();
 			}
@@ -600,10 +551,10 @@ namespace Baseline
 				progname = @"C:\Program Files (x86)\IDM Computer Solutions\UltraCompare\UC.exe";
 			System.Diagnostics.ProcessStartInfo psi =
 				new System.Diagnostics.ProcessStartInfo(progname, string.Format(@" -t ""{0}"" ""{1}""", compareFile, baseFile));
-            _ = System.Diagnostics.Process.Start(psi);
-        }
+			System.Diagnostics.Process prc = System.Diagnostics.Process.Start(psi);
+		}
 
-		private readonly ProcessLocationQueue myQueue= new ProcessLocationQueue();
+		private ProcessLocationQueue myQueue= new ProcessLocationQueue();
 		private Timer queueTimer = null;
 		/// <summary>
 		/// Move a Process to a specific screen location - This is done with a timer so 
@@ -616,11 +567,9 @@ namespace Baseline
 		{
 			if (queueTimer == null)
 			{
-                queueTimer = new Timer
-                {
-                    Enabled = false
-                };
-                queueTimer.Tick += queueTimer_Tick;
+				queueTimer = new Timer();
+				queueTimer.Enabled = false;
+				queueTimer.Tick += queueTimer_Tick;
 				queueTimer.Interval = 1000;
 			}
 			myQueue.Add(proc, x, y);
@@ -645,55 +594,41 @@ namespace Baseline
 		/// <param name="list"></param>
 		private void OpenOnePDF(Line myLine, int list)
 		{
-			if (myLine == null) return; // no PDF to open
 			// B2018-113 - Replace slashes and backslashes with underscores just as PROMS does when creating a PDF file.
 			string proc = myLine.MyProc.Number.Replace("/","_").Replace("\\","_");
-
-			// if no procedure number, PROMS creates pdf filename "NoProcNumber.pdf"
-			// create pattern to use to get the PDF from the directory
-			// add wildcards (*) to file the file if any prefix or suffix was added to the filename
-			string procPatern = string.Format("*{0}*.pdf", proc == string.Empty ? "noProcNumber" : proc);
 			int pagenum = myLine.MyPage.Number;
 			FindFile ff = lbDifferent.SelectedItem as FindFile;
-            string PDFfileName;
-            if (list == 1)
-			{
-				FileInfo fi1 = new FileInfo(ff.File1);
-				PDFfileName = GetPFDFileAndPath(fi1, procPatern);
-			}
-			else // list == 2
-			{
-				FileInfo fi2 = new FileInfo(ff.File2);
-				PDFfileName = GetPFDFileAndPath(fi2, procPatern);
-			}
-			if (string.IsNullOrEmpty(PDFfileName)) return; // no PDF to open
-
-			// if exePath is null, then open the found PDF with the default PDF viewer and
-			// capture/save the entire name and path of the default PDF viewer
+			FileInfo fi1 = new FileInfo(ff.File1);
+			FileInfo fi2 = new FileInfo(ff.File2);
 			if (exePath == null)
 			{
-				try
+				System.Diagnostics.Process p = System.Diagnostics.Process.Start(fi1.DirectoryName + "\\" + proc + ".pdf");
+				while (exePath == null)
 				{
-					System.Diagnostics.Process tp = System.Diagnostics.Process.Start(PDFfileName);
-					exePath = TryToGetPath(tp);
-					tp.Kill();
-				}
-				catch (Exception ex)
-				{
-					Application.DoEvents();
-					string msg = string.Format("{0} - {1}", ex.GetType().Name, ex.Message);
-					Console.WriteLine(msg);
-					MessageBox.Show(msg, "Error opening default PDF Viewer");
-					return;
+					try
+					{
+
+						exePath = p.MainModule.FileName;
+					}
+					catch (Exception ex)
+					{
+						Application.DoEvents();
+						Console.WriteLine("{0} - {1}", ex.GetType().Name, ex.Message);
+					}
 				}
+				p.Kill();
 			}
-            // open the PDF and jump to the page number
-            System.Diagnostics.ProcessStartInfo psi1 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format("/A \"page={0}\" \"{1}\" ", pagenum, PDFfileName))
-            {
-                UseShellExecute = false
-            };
-            _ = System.Diagnostics.Process.Start(psi1);
-        }
+			if (list == 1)
+			{
+				System.Diagnostics.ProcessStartInfo psi1 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format("/A page={0} ", pagenum) + fi1.DirectoryName + "\\" + proc + ".pdf ");
+				System.Diagnostics.Process p1 = System.Diagnostics.Process.Start(psi1);
+			}
+			else
+			{
+				System.Diagnostics.ProcessStartInfo psi2 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format("/A page={0} ", pagenum) + fi2.DirectoryName + "\\" + proc + ".pdf ");
+				System.Diagnostics.Process p1 = System.Diagnostics.Process.Start(psi2);
+			}
+		}
 		/// <summary>
 		/// Perform Debug Meta file comparison for all of the folders within the automated testing folders 
 		/// </summary>
@@ -773,12 +708,12 @@ namespace Baseline
 		}
 		private void lbProcedures_SelectedIndexChanged(object sender, EventArgs e)
 		{
-            //Initialize Results List Box
-            if (!(lbProcedures.SelectedItem is Procedure myProc)) return; // clicked on the white space (blank line) in the list of different procedures
-                                                                          //TODO: May need to consider if there are duplicate procedure numers and titles
-            Procedure myProc1 = MyProcs1.Find(x => x.Number == myProc.Number && x.Title == myProc.Title);
-			// Build the results ListBox for the left window
+			//Initialize Results List Box
 			lbResults1.Items.Clear();
+			Procedure myProc = lbProcedures.SelectedItem as Procedure;
+			//TODO: May need to consider if there are duplicate procedure numers and titles
+			Procedure myProc1 = MyProcs1.Find(x => x.Number == myProc.Number && x.Title == myProc.Title);
+			// Build the results ListBox for the left window
 			if (myProc1 != null)
 			{
 				foreach (Page myPage in myProc1.MyPages)
@@ -823,13 +758,28 @@ namespace Baseline
 		};
 	public class Settings
 	{
-        public BindingList<string> IgnoreLines { get; set; }
-    }
+		private BindingList<string> _IgnoreLines;
+		public BindingList<string> IgnoreLines
+		{
+			get { return _IgnoreLines; }
+			set { _IgnoreLines = value; }
+		}
+	}
 	public partial class FindFile
 	{
-        public string File1 { get; set; }
-        public string File2 { get; set; }
-        public FindFile(string file1, string file2)
+		private string _File1;
+		public string File1
+		{
+			get { return _File1; }
+			set { _File1 = value; }
+		}
+		private string _File2;
+		public string File2
+		{
+			get { return _File2; }
+			set { _File2 = value; }
+		}
+		public FindFile(string file1, string file2)
 		{
 			File1 = file1;
 			File2 = file2;
@@ -837,16 +787,19 @@ namespace Baseline
 	}
 	public partial class FindFiles : List<FindFile>
 	{
-		private readonly string _FileName;
-        public string FileName => _FileName;
-        /// <summary>
-        /// Build list of DocVersion Folders with differences
-        /// </summary>
-        /// <param name="path1">Base path</param>
-        /// <param name="path2">Compare path</param>
-        /// <param name="fileName">filename</param>
-        /// <param name="myIgnore">Ignore list</param>
-        public FindFiles(string path1, string path2, string fileName,IgnoreLines myIgnore)
+		private string _FileName;
+		public string FileName
+		{
+			get { return _FileName; }
+		}
+		/// <summary>
+		/// Build list of DocVersion Folders with differences
+		/// </summary>
+		/// <param name="path1">Base path</param>
+		/// <param name="path2">Compare path</param>
+		/// <param name="fileName">filename</param>
+		/// <param name="myIgnore">Ignore list</param>
+		public FindFiles(string path1, string path2, string fileName,IgnoreLines myIgnore)
 		{
 			DirectoryInfo di1 = new DirectoryInfo(path1);
 			DirectoryInfo di2 = new DirectoryInfo(path2);
@@ -1072,16 +1025,34 @@ namespace Baseline
 	// Text - the line of text
 	public partial class Procedure
 	{
-        public string Number { get; set; }
-        public string Title { get; set; }
-        public Pages MyPages { get; set; } = new Pages();
-        public Procedure(string number, string title)
+		private string _Number;
+		public string Number
 		{
-			Number = number;
-			Title = title;
+			get { return _Number; }
+			set { _Number = value; }
 		}
-        public override string ToString() => string.Format("{0} - {1}", Number, Title);
-    }
+		private string _Title;
+		public string Title
+		{
+			get { return _Title; }
+			set { _Title = value; }
+		}
+		private Pages _MyPages = new Pages();
+		public Pages MyPages
+		{
+			get { return _MyPages; }
+			set { _MyPages = value; }
+		}
+		public Procedure(string number, string title)
+		{
+			_Number = number;
+			_Title = title;
+		}
+		public override string ToString()
+		{
+			return string.Format("{0} - {1}", Number, Title);
+		}
+	}
 	public partial class Procedures : List<Procedure>
 	{
 		// Sample data for a Procedure Number line
@@ -1112,34 +1083,77 @@ namespace Baseline
 	}
 	public partial class Page
 	{
-        public int Number { get; set; }
+		private int _Number;
+		public int Number
+		{
+			get { return _Number; }
+			set { _Number = value; }
+		}
+		private Lines _MyLines = new Lines();
 
-        public Lines MyLines { get; set; } = new Lines();
-        public Page(int number) => Number = number;
-        public override string ToString() => string.Format("Page {0}", Number);
-    }
+		public Lines MyLines
+		{
+			get { return _MyLines; }
+			set { _MyLines = value; }
+		}
+		public Page(int number)
+		{
+			_Number = number;
+		}
+		public override string ToString()
+		{
+			return string.Format("Page {0}", Number);
+		}
+	}
 	public partial class Pages : List<Page>
 	{
-        public void Add(int number) => Add(new Page(number));
-    }
+		public void Add(int number)
+		{
+			Add(new Page(number));
+		}
+	}
 	public partial class Line
 	{
-        public Procedure MyProc { get; set; }
-        public Page MyPage { get; set; }
-        public string Text { get; set; }
-        public Line(string text) => Text = text;
-        public Line(string text, Procedure myProc, Page myPage)
+		private Procedure _MyProc;
+		public Procedure MyProc
 		{
-			Text = text;
-			MyProc = myProc;
-			MyPage = myPage;
+			get { return _MyProc; }
+			set { _MyProc = value; }
 		}
-        public override string ToString() => Text;
-    }
+		private Page _MyPage;
+		public Page MyPage
+		{
+			get { return _MyPage; }
+			set { _MyPage = value; }
+		}
+		private string _Text;
+		public string Text
+		{
+			get { return _Text; }
+			set { _Text = value; }
+		}
+		public Line(string text)
+		{
+			_Text = text;
+		}
+		public Line(string text, Procedure myProc, Page myPage)
+		{
+			_Text = text;
+			_MyProc = myProc;
+			_MyPage = myPage;
+		}
+		public override string ToString()
+		{
+			return Text;
+		}
+	}
 	public partial class Lines : List<Line>
 	{
-        public void Add(string text) => Add(new Line(text));
-    }
+		public void Add(string text)
+		{
+			Add(new Line(text));
+		}
+	}
 	[Serializable]
 	public partial class IgnoreLine
 	{
@@ -1177,12 +1191,21 @@ namespace Baseline
 		public IgnoreLines()
 		{
 		}
-        public void Add(string text, Relation searchType, bool active) => Add(new IgnoreLine(text, searchType, active));
-        // Convert IgnoreLines to string (XML)
-        public override string ToString() => GenericSerializer<IgnoreLines>.StringSerialize(this);
-        // Convert string to IgnoreLines
-        public static IgnoreLines Get(string xml) => GenericSerializer<IgnoreLines>.StringDeserialize(xml);
-    }
+		public void Add(string text, Relation searchType, bool active)
+		{
+			Add(new IgnoreLine(text, searchType, active));
+		}
+		// Convert IgnoreLines to string (XML)
+		public override string ToString()
+		{
+			return GenericSerializer<IgnoreLines>.StringSerialize(this);
+		}
+		// Convert string to IgnoreLines
+		public static IgnoreLines Get(string xml)
+		{
+			return GenericSerializer<IgnoreLines>.StringDeserialize(xml);
+		}
+	}
 	/// <summary>
 	/// This is a simple serializer that takes a class and converts it to and from string (XML)
 	/// </summary>
@@ -1210,7 +1233,7 @@ namespace Baseline
 			string ss = s.Replace("encoding=\"utf-16\"", "");
 			XmlSerializer xs = new XmlSerializer(typeof(T));
 			UTF8Encoding enc = new UTF8Encoding();
-            byte[] arrBytData = enc.GetBytes(ss);
+			Byte[] arrBytData = enc.GetBytes(ss);
 			using (MemoryStream ms = new MemoryStream(arrBytData))
 			{
 				t = (T)xs.Deserialize(ms);
@@ -1224,9 +1247,12 @@ namespace Baseline
 	public class NonXsiTextWriter : XmlTextWriter
 	{
 		public NonXsiTextWriter(TextWriter w) : base(w) { }
-        public NonXsiTextWriter(Stream w, Encoding encoding)
-            : base(w, encoding) => Formatting = Formatting.Indented;
-        public NonXsiTextWriter(string filename, Encoding encoding) : base(filename, encoding) { }
+		public NonXsiTextWriter(Stream w, Encoding encoding)
+			: base(w, encoding)
+		{
+			this.Formatting = Formatting.Indented;
+		}
+		public NonXsiTextWriter(string filename, Encoding encoding) : base(filename, encoding) { }
 		bool _skip = false;
 		public override void WriteStartAttribute(string prefix, string localName, string ns)
 		{
@@ -1268,16 +1294,32 @@ namespace Baseline
 		public const short SWP_NOZORDER = 0X4;
 		public const int SWP_SHOWWINDOW = 0x0040;
 
-        public System.Diagnostics.Process Process { get; set; }
-        public int X { get; set; }
-        public int Y { get; set; }
-        public ProcessLocation(System.Diagnostics.Process process, int x, int y)
+		private System.Diagnostics.Process _Process;
+
+		public System.Diagnostics.Process Process
+		{
+			get { return _Process; }
+			set { _Process = value; }
+		}
+		private int _X;
+		public int X
+		{
+			get { return _X; }
+			set { _X = value; }
+		}
+		private int _Y;
+		public int Y
+		{
+			get { return _Y; }
+			set { _Y = value; }
+		}
+		public ProcessLocation(System.Diagnostics.Process process, int x, int y)
 		{
 			Process = process;
 			X = x;
 			Y = y;
 		}
-		private static bool FoxitSettingInfo = true;
+		private static Boolean FoxitSettingInfo = true;
 
 		/// <summary>
 		/// MoveIt() moves the window containing the PDF viewer to the right so the two pdf viewer windows will not overlap.
@@ -1298,8 +1340,11 @@ namespace Baseline
 	}
 	public class ProcessLocationQueue: Queue<ProcessLocation>
 	{
-        public void Add(System.Diagnostics.Process process, int x, int y) => Enqueue(new ProcessLocation(process, x, y));
-        public void ProcessNext()
+		public void Add(System.Diagnostics.Process process, int x, int y)
+		{
+			Enqueue(new ProcessLocation(process,x,y));
+		}
+		public void ProcessNext()
 		{
 			ProcessLocation pl = Dequeue();
 			pl.MoveIt();

PROMS/Baseline/frmSettings.cs

@@ -1,4 +1,11 @@
 using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace Baseline
@@ -12,7 +19,17 @@ namespace Baseline
 			set {
 				_MyIgnore = value; 
 				dgv.DataSource=null;
+				//dgvcSearchType.ValueType = typeof(Relation);
+				//dgvcSearchType.ValueMember = "Value";
+				//dgvcSearchType.DisplayMember = "Display";
+				//dgvcSearchType.DataSource = new Relation[] { Relation.Contains, Relation.StartsWith, Relation.EndsWith, Relation.Regex }
+				//.Select(x => new { Display = x.ToString(), Value = x })
+				//.ToList();
 				dgv.DataSource=value;
+				//dgvcSearchType.DataSource =
+				//new List<Relation>((Relation[]) Enum.GetValues(typeof(Relation)))
+				//.Select(x => new { Display=x.ToString(), Value=(int)x })
+				//.ToList();;
 			}
 		}
 		public frmSettings(IgnoreLines myIgnore)
@@ -29,16 +46,19 @@ namespace Baseline
 			col.ValueType = typeof(Relation);
 		}
 
-        private void dgv_DataError(object sender, DataGridViewDataErrorEventArgs e) => Console.WriteLine("Here");
-        private void btnOK_Click(object sender, EventArgs e)
+		private void dgv_DataError(object sender, DataGridViewDataErrorEventArgs e)
 		{
-			DialogResult = System.Windows.Forms.DialogResult.OK;
-			Close();
+			Console.WriteLine("Here");
+		}
+		private void btnOK_Click(object sender, EventArgs e)
+		{
+			this.DialogResult = System.Windows.Forms.DialogResult.OK;
+			this.Close();
 		}
 		private void btnCancel_Click(object sender, EventArgs e)
 		{
-			DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			Close();
+			this.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.Close();
 		}
 	}
 }

PROMS/DropDownPanel/Controls/DropDownPanel.cs

@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Drawing;
 using System.Windows.Forms;
 
@@ -14,7 +15,7 @@ namespace AT.STO.UI.Win
 	{
 	#region Private Variable Declarations
 		private IDropDownAware			_dropDownControl	= null;
-		private readonly DropDownWindowHelper	_dropDownHelper		= null;
+		private DropDownWindowHelper	_dropDownHelper		= null;
 		private Form					_owner				= null;
 	#endregion
 	#region Constructor / Destructor
@@ -46,7 +47,7 @@ namespace AT.STO.UI.Win
 		/// <param name="e"></param>
 		protected override void OnHandleCreated(EventArgs e)
 		{	
-			_owner = FindForm();
+			_owner = this.FindForm();
 			_dropDownHelper.ReleaseHandle();
 			
 			if (_owner != null)
@@ -65,8 +66,8 @@ namespace AT.STO.UI.Win
 		{
 			base.OnResize(e);
 			combo.Location = new Point(0, 0);
-			combo.Width = ClientRectangle.Width;
-			Height = combo.Height;
+			combo.Width = this.ClientRectangle.Width;
+			this.Height = combo.Height;
 		}
 	#endregion
 	#region Event Handler
@@ -95,7 +96,7 @@ namespace AT.STO.UI.Win
 			else
 			{
 				_dropDownHelper.CloseDropDown();
-				Focus();
+				this.Focus();
 			}
 		}
 		
@@ -114,7 +115,7 @@ namespace AT.STO.UI.Win
 
 		private void DropDownHelper_DropDownCancel(object sender, DropDownCancelEventArgs e)
 		{
-			if (Bounds.Contains(Parent.PointToClient(e.CursorLocation)))
+			if (this.Bounds.Contains(Parent.PointToClient(e.CursorLocation)))
 			{
 				e.Cancel = true;
 			}
@@ -136,22 +137,31 @@ namespace AT.STO.UI.Win
 			{
 				SetValue<long>(e.Value as ILookupItem<long>);
 			}
-
-            FinishEditing?.Invoke(this, e);
-
-            _dropDownControl.FinishEditing -= new DropDownValueChangedEventHandler(DropDown_FinishEditing);
+			
+			if (this.FinishEditing != null)
+			{
+				this.FinishEditing(this, e);
+			}
+			
+			_dropDownControl.FinishEditing -= new DropDownValueChangedEventHandler(DropDown_FinishEditing);
 			_dropDownControl.ValueChanged -= new DropDownValueChangedEventHandler(DropDown_ValueChanged);
 			_dropDownHelper.CloseDropDown();
 		}
-
-        private void DropDown_ValueChanged(object sender, DropDownValueChangedEventArgs e) => ValueChanged?.Invoke(this, e);
-        #endregion
-        #region Public Properties
-        /// <summary>
-        /// Get or set the control (has to implement IDropDownAware) that is to 
-        /// be displayed as the dropdown portion of the combobox. 
-        /// </summary>
-        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		
+		private void DropDown_ValueChanged(object sender, DropDownValueChangedEventArgs e)
+		{
+			if (this.ValueChanged != null)
+			{
+				this.ValueChanged(this, e);
+			}
+		}
+	#endregion
+	#region Public Properties
+		/// <summary>
+		/// Get or set the control (has to implement IDropDownAware) that is to 
+		/// be displayed as the dropdown portion of the combobox. 
+		/// </summary>
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
 		public IDropDownAware DropDownControl
 		{
 			get { return _dropDownControl; }
@@ -159,21 +169,24 @@ namespace AT.STO.UI.Win
 			{ 
 				_dropDownControl = value; 
 				
-				Controls.Add(_dropDownControl as Control);
+				this.Controls.Add(_dropDownControl as Control);
 			}
 		}
-        #endregion
-        #region Public Methods
-        public override string ToString() => Name;
-        #endregion
-        #region Private Methods
-        /// <summary>
-        /// Calculate an acceptable position of the DropDownForm even in a 
-        /// multi screen environment.
-        /// </summary>
-        /// <param name="DropDown"></param>
-        /// <returns></returns>
-        private Point GetDropDownPosition(DropDownForm DropDown)
+	#endregion
+	#region Public Methods
+		public override string ToString()
+		{
+			return this.Name;
+		}
+	#endregion
+	#region Private Methods
+		/// <summary>
+		/// Calculate an acceptable position of the DropDownForm even in a 
+		/// multi screen environment.
+		/// </summary>
+		/// <param name="DropDown"></param>
+		/// <returns></returns>
+		private Point GetDropDownPosition(DropDownForm DropDown)
 		{
 			Point		lt		= Parent.PointToScreen(new Point(Left, Top));
 			Point		rb		= Parent.PointToScreen(new Point(Right, Bottom));

PROMS/DropDownPanel/Events/Events.cs

@@ -35,9 +35,10 @@ namespace AT.STO.UI.Win
 	/// </summary>
 	public class DropDownCancelEventArgs : EventArgs
 	{
-        #region Private Variable Declarations
-        private Point	_cursorLocation;
-		private readonly Form	_dropDown			= null;
+	#region Private Variable Declarations
+		private bool	_cancel				= false;
+		private Point	_cursorLocation;
+		private Form	_dropDown			= null;
 	#endregion
 	#region Constructor / Destructor
 		/// <summary>
@@ -50,26 +51,36 @@ namespace AT.STO.UI.Win
 		{
 			_dropDown		= DropDown;
 			_cursorLocation = CursorLocation;
-			Cancel			= false;
+			_cancel			= false;
+		}
+	#endregion
+	#region Public Properties	
+		/// <summary>
+		/// 
+		/// </summary>
+		public bool Cancel
+		{
+			get { return _cancel; }
+			set { _cancel = value; }
 		}
-        #endregion
-        #region Public Properties	
-        /// <summary>
-        /// 
-        /// </summary>
-        public bool Cancel { get; set; } = false;
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public Point CursorLocation => _cursorLocation;
+		/// <summary>
+		/// 
+		/// </summary>
+		public Point CursorLocation
+		{
+			get { return _cursorLocation; }
+		}
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public Form DropDown => _dropDown;
-        #endregion
-    }
+		/// <summary>
+		/// 
+		/// </summary>
+		public Form DropDown
+		{
+			get { return _dropDown; }
+		}
+	#endregion
+	}
 
 	/// <summary>
 	/// Contains event information for a <see cref="DropDownClosed"/> event.
@@ -80,50 +91,64 @@ namespace AT.STO.UI.Win
 	public class DropDownClosedEventArgs : EventArgs
 	{
 	#region Private Variable Declarations
-		private readonly Form _dropDown = null;
-        #endregion
-        #region Constructor / Destructor
-        /// <summary>
-        /// Constructs a new instance of this class for the specified
-        /// popup form.
-        /// </summary>
-        /// <param name="DropDown">DropDown Form which is being closed.</param>
-        public DropDownClosedEventArgs(Form DropDown) => _dropDown = DropDown;
-        #endregion
-        #region Public Properties
-        /// <summary>
-        /// Gets the dropdown form which is being closed.
-        /// </summary>
-        public Form DropDown => _dropDown;
-        #endregion
-    }
+		private Form _dropDown = null;
+	#endregion
+	#region Constructor / Destructor
+		/// <summary>
+		/// Constructs a new instance of this class for the specified
+		/// popup form.
+		/// </summary>
+		/// <param name="DropDown">DropDown Form which is being closed.</param>
+		public DropDownClosedEventArgs(Form DropDown)
+		{
+			_dropDown = DropDown;
+		}
+	#endregion
+	#region Public Properties
+		/// <summary>
+		/// Gets the dropdown form which is being closed.
+		/// </summary>
+		public Form DropDown
+		{
+			get { return _dropDown; }
+		}
+	#endregion
+	}
 	
 	/// <summary>
 	/// Contains event information for DropDownValueChangedEventHandler.
 	/// </summary>
 	public class DropDownValueChangedEventArgs : EventArgs
 	{
-        #region Private Variable Declarations
-        #endregion
-        #region Constructor / Destructor
-        /// <summary>
-        /// Default Constructor
-        /// </summary>
-        public DropDownValueChangedEventArgs()
+	#region Private Variable Declarations
+		private object _value = null;
+	#endregion
+	#region Constructor / Destructor
+		/// <summary>
+		/// Default Constructor
+		/// </summary>
+		public DropDownValueChangedEventArgs()
 		{
 		}
-
-        /// <summary>
-        /// Initialization with the control's value.
-        /// </summary>
-        /// <param name="Value"></param>
-        public DropDownValueChangedEventArgs(object Value) => this.Value = Value;
-        #endregion
-        #region Public Properties
-        /// <summary>
-        /// Gets or sets the control's value.
-        /// </summary>
-        public object Value { get; set; } = null;
-        #endregion
-    }
+		
+		/// <summary>
+		/// Initialization with the control's value.
+		/// </summary>
+		/// <param name="Value"></param>
+		public DropDownValueChangedEventArgs(object Value)
+		{
+			_value = Value;
+		}
+	#endregion
+	#region Public Properties
+		/// <summary>
+		/// Gets or sets the control's value.
+		/// </summary>
+		public object Value
+		{
+			get { return _value; }
+			set { _value = value; }
+		}
+	#endregion
+	}
 }

PROMS/DropDownPanel/Forms/DropDownForm.cs

@@ -13,19 +13,22 @@ namespace AT.STO.UI.Win
 	internal partial class DropDownForm : Form, IDropDownAware
 	{
 	#region Private Variable Declaration
-		private readonly IDropDownAware _control = null;
-        #endregion
-        #region Constructor / Destructor
-        /// <summary>
-        /// Default Constructor
-        /// </summary>
-        public DropDownForm() => InitializeComponent();
+		private IDropDownAware _control = null;
+	#endregion
+	#region Constructor / Destructor
+		/// <summary>
+		/// Default Constructor
+		/// </summary>
+		public DropDownForm()
+		{
+			InitializeComponent();
+		}
 
-        /// <summary>
-        /// Constructor to initialize the for with the control to display.
-        /// </summary>
-        /// <param name="Ctrl">The control to display.</param>
-        public DropDownForm(IDropDownAware Ctrl) : this()
+		/// <summary>
+		/// Constructor to initialize the for with the control to display.
+		/// </summary>
+		/// <param name="Ctrl">The control to display.</param>
+		public DropDownForm(IDropDownAware Ctrl) : this()
 		{	
 			if (Ctrl != null)
 			{
@@ -38,7 +41,7 @@ namespace AT.STO.UI.Win
 	#region Form Events
 		protected override void OnClosing(CancelEventArgs e)
 		{
-			Controls.Remove(_control as Control);
+			this.Controls.Remove(_control as Control);
 			base.OnClosing(e);
 		}
 
@@ -55,20 +58,29 @@ namespace AT.STO.UI.Win
 	#region Event Handler
 	    private void Ctrl_FinishEditing(object sender, DropDownValueChangedEventArgs e)
 	    {
-            FinishEditing?.Invoke(this, e);
+			if (this.FinishEditing != null)
+			{
+				this.FinishEditing(this, e);
+			}
 
-            _control.FinishEditing -= new DropDownValueChangedEventHandler(Ctrl_FinishEditing);
+			_control.FinishEditing -= new DropDownValueChangedEventHandler(Ctrl_FinishEditing);
 			_control.ValueChanged -= new DropDownValueChangedEventHandler(Ctrl_ValueChanged);
 	    }
-
-        private void Ctrl_ValueChanged(object sender, DropDownValueChangedEventArgs e) => ValueChanged?.Invoke(this, e);
-        #endregion
-        #region IDropDownAware Implementation
-        /// <summary>
-        /// Fired either on OK, Cancel or a click outside the control to indicate
-        /// that the user has finished editing.
-        /// </summary>
-        public event DropDownValueChangedEventHandler FinishEditing;
+	    
+	    private void Ctrl_ValueChanged(object sender, DropDownValueChangedEventArgs e)
+	    {
+			if (this.ValueChanged != null)
+			{
+				this.ValueChanged(this, e);
+			}
+	    }
+	#endregion
+	#region IDropDownAware Implementation
+		/// <summary>
+		/// Fired either on OK, Cancel or a click outside the control to indicate
+		/// that the user has finished editing.
+		/// </summary>
+		public event DropDownValueChangedEventHandler FinishEditing;
 		
 		/// <summary>
 		/// Fired on any change of the controls's value during the editing process. 
@@ -88,15 +100,15 @@ namespace AT.STO.UI.Win
 		private void InitializeControl(Control Ctrl)
 		{
 			Size	size	= Ctrl.Size;
-			Size	inner	= ClientRectangle.Size;
-			Size	outer	= Size;
+			Size	inner	= this.ClientRectangle.Size;
+			Size	outer	= this.Size;
 			int		gap		= outer.Width - inner.Width;
 			
 			size.Width += gap;
 			size.Height += gap;
 			
-			Size = size;
-			Controls.Add(Ctrl);
+			this.Size = size;
+			this.Controls.Add(Ctrl);
 			Ctrl.Location = new Point(0, 0);
 			Ctrl.Visible = true;
 			Ctrl.Invalidate();

PROMS/DropDownPanel/Helper/DropDownMessageFilter.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Drawing;
 using System.Windows.Forms;
 
@@ -20,48 +21,59 @@ namespace AT.STO.UI.Win
 		private const int WM_NCLBUTTONDOWN	= 0x0A1;
 		private const int WM_NCRBUTTONDOWN	= 0x0A4;
 		private const int WM_NCMBUTTONDOWN	= 0x0A7;
-        #endregion
-        #region Private Variable Declarations
-        private readonly DropDownWindowHelper	_owner		= null;
+	#endregion
+	#region Private Variable Declarations
+		private Form					_dropDown	= null;
+		private DropDownWindowHelper	_owner		= null;
 	#endregion
 	#region Event Declarations
 		public event DropDownCancelEventHandler DropDownCancel;
-        #endregion
-        #region Constructor / Destructor
-        /// <summary>
-        /// Constructs a new instance of this class and sets the owning
-        /// object.
-        /// </summary>
-        /// <param name="Owner">The <see cref="DropDownWindowHelper"/> object
-        /// which owns this class.</param>
-        public DropDownMessageFilter(DropDownWindowHelper Owner) => _owner = Owner;
-        #endregion
-        #region Public Properties
-        /// <summary>
-        /// Gets/sets the dropdown form which is being displayed.
-        /// </summary>
-        public Form DropDown { get; set; } = null;
-        #endregion
-        #region Private Methods
-        private void OnMouseDown()
+	#endregion
+	#region Constructor / Destructor
+		/// <summary>
+		/// Constructs a new instance of this class and sets the owning
+		/// object.
+		/// </summary>
+		/// <param name="Owner">The <see cref="DropDownWindowHelper"/> object
+		/// which owns this class.</param>
+		public DropDownMessageFilter(DropDownWindowHelper Owner)
+		{
+			_owner = Owner;
+		}
+	#endregion
+	#region Public Properties
+		/// <summary>
+		/// Gets/sets the dropdown form which is being displayed.
+		/// </summary>
+		public Form DropDown
+		{
+			get { return _dropDown; }
+			set { _dropDown = value; }
+		}
+	#endregion
+	#region Private Methods
+		private void OnMouseDown()
 		{
 			Point cursorPos = Cursor.Position;											// Get the cursor location
 
-			if (!DropDown.Bounds.Contains(cursorPos))									// Check if it is within the popup form
+			if (!_dropDown.Bounds.Contains(cursorPos))									// Check if it is within the popup form
 			{
-				OnDropDownCancel(new DropDownCancelEventArgs(DropDown, cursorPos));	// If not, then call to see if it should be closed
+				OnDropDownCancel(new DropDownCancelEventArgs(_dropDown, cursorPos));	// If not, then call to see if it should be closed
 			}
 		}
 	#endregion
 	#region DropDownCancelEvent Implementation
 		protected virtual void OnDropDownCancel(DropDownCancelEventArgs e)
 		{
-            DropDownCancel?.Invoke(this, e);
+			if (this.DropDownCancel != null)
+			{
+				this.DropDownCancel(this, e);
+			}
 
-            if (!e.Cancel)
+			if (!e.Cancel)
 			{
 				_owner.CloseDropDown();
-				DropDown = null;					// Clear reference for GC
+				_dropDown = null;					// Clear reference for GC
 			}
 		}
 	#endregion
@@ -78,7 +90,7 @@ namespace AT.STO.UI.Win
 		/// This implementation always returns <c>false</c>.</returns>
 		public bool PreFilterMessage(ref Message m)
 		{
-			if (DropDown != null)
+			if (_dropDown != null)
 			{
 				switch (m.Msg)
 				{

PROMS/DropDownPanel/Helper/DropDownWindowHelper.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Drawing;
+using System.Runtime.InteropServices;
 using System.Windows.Forms;
 
 namespace AT.STO.UI.Win
@@ -21,7 +22,7 @@ namespace AT.STO.UI.Win
 		
 		private Form					_dropDown			= null;
 		private bool					_dropDownShowing	= false;
-		private readonly DropDownMessageFilter	_filter				= null;
+		private DropDownMessageFilter	_filter				= null;
 		private Form					_owner				= null;
 		private bool					_skipClose			= false;
 	#endregion
@@ -41,25 +42,31 @@ namespace AT.STO.UI.Win
 			_filter.DropDownCancel -= new DropDownCancelEventHandler(Popup_Cancel);
 			_filter.DropDownCancel += new DropDownCancelEventHandler(Popup_Cancel);
 		}
-        #endregion
-        #region Event Handler
-        private void Popup_Cancel(object sender, DropDownCancelEventArgs e) => OnDropDownCancel(e);
+	#endregion
+	#region Event Handler
+		private void Popup_Cancel(object sender, DropDownCancelEventArgs e)
+		{
+			OnDropDownCancel(e);
+		}
 
-        /// <summary>
-        /// Responds to the <see cref="System.Windows.Forms.Form.Closed"/>
-        /// event from the popup form.
-        /// </summary>
-        /// <param name="sender">Popup form that has been closed.</param>
-        /// <param name="e">Not used.</param>
-        private void Popup_Closed(object sender, EventArgs e) => CloseDropDown();
-
-        /// <summary>
-        /// Subclasses the owning form's existing Window Procedure to enables the 
-        /// title bar to remain active when a popup is show, and to detect if
-        /// the user clicks onto another application whilst the popup is visible.
-        /// </summary>
-        /// <param name="m">Window Procedure Message</param>
-        protected override void WndProc(ref Message m)
+		/// <summary>
+		/// Responds to the <see cref="System.Windows.Forms.Form.Closed"/>
+		/// event from the popup form.
+		/// </summary>
+		/// <param name="sender">Popup form that has been closed.</param>
+		/// <param name="e">Not used.</param>
+		private void Popup_Closed(object sender, EventArgs e)
+		{
+			CloseDropDown();
+		}
+	
+		/// <summary>
+		/// Subclasses the owning form's existing Window Procedure to enables the 
+		/// title bar to remain active when a popup is show, and to detect if
+		/// the user clicks onto another application whilst the popup is visible.
+		/// </summary>
+		/// <param name="m">Window Procedure Message</param>
+		protected override void WndProc(ref Message m)
 		{
 			base.WndProc(ref m);
 
@@ -69,7 +76,7 @@ namespace AT.STO.UI.Win
 				{
 					if (((int)m.WParam) == 0)																// Check if the title bar will made inactive:
 					{	// Note it's no good to try and consume this message; if you try to do that you'll end up with windows
-						UIApiCalls.SendMessage(Handle, UIApiCalls.WM_NCACTIVATE, 1, IntPtr.Zero);		// If so reactivate it.
+						UIApiCalls.SendMessage(this.Handle, UIApiCalls.WM_NCACTIVATE, 1, IntPtr.Zero);		// If so reactivate it.
 					}
 				}
 				else if (m.Msg == UIApiCalls.WM_ACTIVATEAPP)
@@ -77,7 +84,7 @@ namespace AT.STO.UI.Win
 					if ((int)m.WParam == 0)																	// Check if the application is being deactivated.
 					{
 						CloseDropDown();																		// It is so cancel the popup:
-						UIApiCalls.PostMessage(Handle, UIApiCalls.WM_NCACTIVATE, 0, IntPtr.Zero);		// And put the title bar into the inactive state:
+						UIApiCalls.PostMessage(this.Handle, UIApiCalls.WM_NCACTIVATE, 0, IntPtr.Zero);		// And put the title bar into the inactive state:
 					}
 				}
 			}
@@ -161,19 +168,22 @@ namespace AT.STO.UI.Win
 				_owner = null;				
 			}
 		}
-        #endregion
-        #region Public Properties
-        /// <summary>
-        /// Indicator weither the DropDown is showing.
-        /// </summary>
-        public bool DropDownShowing => _dropDownShowing;
-        #endregion
-        #region Event Implementation
-        protected virtual void OnDropDownCancel(DropDownCancelEventArgs e)
+	#endregion
+	#region Public Properties
+		/// <summary>
+		/// Indicator weither the DropDown is showing.
+		/// </summary>
+		public bool DropDownShowing
 		{
-			if (DropDownCancel != null)
+			get { return _dropDownShowing; }
+		}
+	#endregion
+	#region Event Implementation
+		protected virtual void OnDropDownCancel(DropDownCancelEventArgs e)
+		{
+			if (this.DropDownCancel != null)
 			{
-				DropDownCancel(this, e);
+				this.DropDownCancel(this, e);
 
 				if (!e.Cancel)
 				{
@@ -181,8 +191,14 @@ namespace AT.STO.UI.Win
 				}
 			}
 		}
-
-        protected virtual void OnPDropDownClosed(DropDownClosedEventArgs e) => DropDownClosed?.Invoke(this, e);
-        #endregion
-    }
+		
+		protected virtual void OnPDropDownClosed(DropDownClosedEventArgs e)
+		{
+		    if (this.DropDownClosed != null)
+		    {
+		        this.DropDownClosed(this, e);
+		    }
+		}
+	#endregion
+	}
 }

PROMS/DropDownPanel/Interfaces/IDropDownAware.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace AT.STO.UI.Win
 {
 	/// <summary>

PROMS/DropDownPanel/Interfaces/ILookupItem.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace AT.STO.UI.Win
 {
 	public interface ILookupItem<T> where T: struct

PROMS/FlexableMessageBox/FlexibleMessageBox.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Diagnostics;
 using System.Drawing;
+using System.Globalization;
+//using System.Linq;
 using System.Windows.Forms;
 
 
@@ -119,7 +121,10 @@ namespace JR.Utils.GUI.Forms
         /// </summary>
         /// <param name="text">The text.</param>
         /// <returns>The dialog result.</returns>
-        public static DialogResult Show(string text) => FlexibleMessageBoxForm.Show(null, text, string.Empty, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
+        public static DialogResult Show(string text)
+        {
+            return FlexibleMessageBoxForm.Show(null, text, string.Empty, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
+        }
 
         /// <summary>
         /// Shows the specified message box.
@@ -127,7 +132,10 @@ namespace JR.Utils.GUI.Forms
         /// <param name="owner">The owner.</param>
         /// <param name="text">The text.</param>
         /// <returns>The dialog result.</returns>
-        public static DialogResult Show(IWin32Window owner, string text) => FlexibleMessageBoxForm.Show(owner, text, string.Empty, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
+        public static DialogResult Show(IWin32Window owner, string text)
+        {
+            return FlexibleMessageBoxForm.Show(owner, text, string.Empty, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
+        }
 
         /// <summary>
         /// Shows the specified message box.
@@ -135,7 +143,10 @@ namespace JR.Utils.GUI.Forms
         /// <param name="text">The text.</param>
         /// <param name="caption">The caption.</param>
         /// <returns>The dialog result.</returns>
-        public static DialogResult Show(string text, string caption) => FlexibleMessageBoxForm.Show(null, text, caption, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
+        public static DialogResult Show(string text, string caption)
+        {
+            return FlexibleMessageBoxForm.Show(null, text, caption, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
+        }
 
         /// <summary>
         /// Shows the specified message box.
@@ -144,7 +155,10 @@ namespace JR.Utils.GUI.Forms
         /// <param name="text">The text.</param>
         /// <param name="caption">The caption.</param>
         /// <returns>The dialog result.</returns>
-        public static DialogResult Show(IWin32Window owner, string text, string caption) => FlexibleMessageBoxForm.Show(owner, text, caption, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
+        public static DialogResult Show(IWin32Window owner, string text, string caption)
+        {
+            return FlexibleMessageBoxForm.Show(owner, text, caption, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
+        }
 
         /// <summary>
         /// Shows the specified message box.
@@ -153,7 +167,10 @@ namespace JR.Utils.GUI.Forms
         /// <param name="caption">The caption.</param>
         /// <param name="buttons">The buttons.</param>
         /// <returns>The dialog result.</returns>
-        public static DialogResult Show(string text, string caption, MessageBoxButtons buttons) => FlexibleMessageBoxForm.Show(null, text, caption, buttons, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
+        public static DialogResult Show(string text, string caption, MessageBoxButtons buttons)
+        {
+            return FlexibleMessageBoxForm.Show(null, text, caption, buttons, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
+        }
 
         /// <summary>
         /// Shows the specified message box.
@@ -163,7 +180,10 @@ namespace JR.Utils.GUI.Forms
         /// <param name="caption">The caption.</param>
         /// <param name="buttons">The buttons.</param>
         /// <returns>The dialog result.</returns>
-        public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons) => FlexibleMessageBoxForm.Show(owner, text, caption, buttons, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
+        public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons)
+        {
+            return FlexibleMessageBoxForm.Show(owner, text, caption, buttons, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
+        }
 
         /// <summary>
         /// Shows the specified message box.
@@ -173,7 +193,10 @@ namespace JR.Utils.GUI.Forms
         /// <param name="buttons">The buttons.</param>
         /// <param name="icon">The icon.</param>
         /// <returns></returns>
-        public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon) => FlexibleMessageBoxForm.Show(null, text, caption, buttons, icon, MessageBoxDefaultButton.Button1);
+        public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
+        {
+            return FlexibleMessageBoxForm.Show(null, text, caption, buttons, icon, MessageBoxDefaultButton.Button1);
+        }
 
         /// <summary>
         /// Shows the specified message box.
@@ -184,7 +207,10 @@ namespace JR.Utils.GUI.Forms
         /// <param name="buttons">The buttons.</param>
         /// <param name="icon">The icon.</param>
         /// <returns>The dialog result.</returns>
-        public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon) => FlexibleMessageBoxForm.Show(owner, text, caption, buttons, icon, MessageBoxDefaultButton.Button1);
+        public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
+        {
+            return FlexibleMessageBoxForm.Show(owner, text, caption, buttons, icon, MessageBoxDefaultButton.Button1);
+        }
 
         /// <summary>
         /// Shows the specified message box.
@@ -195,7 +221,10 @@ namespace JR.Utils.GUI.Forms
         /// <param name="icon">The icon.</param>
         /// <param name="defaultButton">The default button.</param>
         /// <returns>The dialog result.</returns>
-        public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton) => FlexibleMessageBoxForm.Show(null, text, caption, buttons, icon, defaultButton);
+        public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton)
+        {
+            return FlexibleMessageBoxForm.Show(null, text, caption, buttons, icon, defaultButton);
+        }
 
         /// <summary>
         /// Shows the specified message box.
@@ -207,7 +236,10 @@ namespace JR.Utils.GUI.Forms
         /// <param name="icon">The icon.</param>
         /// <param name="defaultButton">The default button.</param>
         /// <returns>The dialog result.</returns>
-        public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton) => FlexibleMessageBoxForm.Show(owner, text, caption, buttons, icon, defaultButton);
+        public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton)
+        {
+            return FlexibleMessageBoxForm.Show(owner, text, caption, buttons, icon, defaultButton);
+        }
 
         /// <summary>
         /// Shows the specified message box.
@@ -219,8 +251,10 @@ namespace JR.Utils.GUI.Forms
         /// <param name="icon">The icon.</param>
         /// <param name="defaultButton">The default button.</param>
         /// <returns>The dialog result.</returns>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "Keeping owner for legacy reasons")]
-        public static DialogResult ShowCustom(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon) => FlexibleMessageBoxForm.ShowCustom(null, text, caption, buttons, icon);
+        public static DialogResult ShowCustom(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
+        {
+            return FlexibleMessageBoxForm.ShowCustom(null, text, caption, buttons, icon);
+        }
 
         #endregion
 
@@ -307,7 +341,7 @@ namespace JR.Utils.GUI.Forms
                 this.richTextBoxMessage.TabIndex = 0;
                 this.richTextBoxMessage.TabStop = false;
                 this.richTextBoxMessage.Text = "<Message>";
-                this.richTextBoxMessage.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.RichTextBoxMessage_LinkClicked);
+                this.richTextBoxMessage.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.richTextBoxMessage_LinkClicked);
                 // 
                 // panel1
                 // 
@@ -397,8 +431,8 @@ namespace JR.Utils.GUI.Forms
             #region Private constants
 
             //These separators are used for the "copy to clipboard" standard operation, triggered by Ctrl + C (behavior and clipboard format is like in a standard MessageBox)
-            private static readonly string STANDARD_MESSAGEBOX_SEPARATOR_LINES = "---------------------------\n";
-            private static readonly string STANDARD_MESSAGEBOX_SEPARATOR_SPACES = "   ";
+            private static readonly String STANDARD_MESSAGEBOX_SEPARATOR_LINES = "---------------------------\n";
+            private static readonly String STANDARD_MESSAGEBOX_SEPARATOR_SPACES = "   ";
 
             //These are the possible buttons (in a standard MessageBox)
             private enum ButtonID { OK = 0, CANCEL, YES, NO, ABORT, RETRY, IGNORE, OVERWRITE, RENAME };
@@ -406,10 +440,10 @@ namespace JR.Utils.GUI.Forms
             //These are the buttons texts for different languages. 
             //If you want to add a new language, add it here and in the GetButtonText-Function
             private enum TwoLetterISOLanguageID { en, de, es, it };
-            private static readonly string[] BUTTON_TEXTS_ENGLISH_EN = { "OK", "Cancel", "&Yes", "&No", "&Abort", "&Retry", "&Ignore", "&Overwrite", "&Rename" }; //Note: This is also the fallback language
-            private static readonly string[] BUTTON_TEXTS_GERMAN_DE = { "OK", "Abbrechen", "&Ja", "&Nein", "&Abbrechen", "&Wiederholen", "&Ignorieren", "&Overwrite", "&Rename" };
-            private static readonly string[] BUTTON_TEXTS_SPANISH_ES = { "Aceptar", "Cancelar", "&Sí", "&No", "&Abortar", "&Reintentar", "&Ignorar", "&Overwrite", "&Rename" };
-            private static readonly string[] BUTTON_TEXTS_ITALIAN_IT = { "OK", "Annulla", "&Sì", "&No", "&Interrompi", "&Riprova", "&Ignora", "&Overwrite", "&Rename" };
+            private static readonly String[] BUTTON_TEXTS_ENGLISH_EN = { "OK", "Cancel", "&Yes", "&No", "&Abort", "&Retry", "&Ignore", "&Overwrite", "&Rename" }; //Note: This is also the fallback language
+            private static readonly String[] BUTTON_TEXTS_GERMAN_DE = { "OK", "Abbrechen", "&Ja", "&Nein", "&Abbrechen", "&Wiederholen", "&Ignorieren", "&Overwrite", "&Rename" };
+            private static readonly String[] BUTTON_TEXTS_SPANISH_ES = { "Aceptar", "Cancelar", "&Sí", "&No", "&Abortar", "&Reintentar", "&Ignorar", "&Overwrite", "&Rename" };
+            private static readonly String[] BUTTON_TEXTS_ITALIAN_IT = { "OK", "Annulla", "&Sì", "&No", "&Interrompi", "&Riprova", "&Ignora", "&Overwrite", "&Rename" };
 
             #endregion
 
@@ -417,7 +451,7 @@ namespace JR.Utils.GUI.Forms
 
             private MessageBoxDefaultButton defaultButton;
             private int visibleButtonsCount;
-            private readonly TwoLetterISOLanguageID languageID = TwoLetterISOLanguageID.en;
+            private TwoLetterISOLanguageID languageID = TwoLetterISOLanguageID.en;
 
             #endregion
 
@@ -724,9 +758,9 @@ namespace JR.Utils.GUI.Forms
                 /// <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;
 
-                int buttonIndexToFocus;
                 //Set the default button...
                 switch (this.defaultButton)
                 {
@@ -765,7 +799,7 @@ namespace JR.Utils.GUI.Forms
             /// </summary>
             /// <param name="sender">The source of the event.</param>
             /// <param name="e">The <see cref="System.Windows.Forms.LinkClickedEventArgs"/> instance containing the event data.</param>
-            private void RichTextBoxMessage_LinkClicked(object sender, LinkClickedEventArgs e)
+            private void richTextBoxMessage_LinkClicked(object sender, LinkClickedEventArgs e)
             {
                 try
                 {
@@ -843,14 +877,12 @@ namespace JR.Utils.GUI.Forms
             public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton)
             {
                 //Create a new instance of the FlexibleMessageBox form
-                var flexibleMessageBoxForm = new FlexibleMessageBoxForm
-                {
-                    ShowInTaskbar = false,
+                var flexibleMessageBoxForm = new FlexibleMessageBoxForm();
+                flexibleMessageBoxForm.ShowInTaskbar = false;
 
-                    //Bind the caption and the message text
-                    CaptionText = caption,
-                    MessageText = text
-                };
+                //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.
@@ -882,18 +914,15 @@ namespace JR.Utils.GUI.Forms
             /// <param name="icon">The icon.</param>
             /// <param name="defaultButton">The default button.</param>
             /// <returns>The dialog result.</returns>
-            [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "Keeping buttons for legacy reasons")]
             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
-                {
-                    ShowInTaskbar = false,
+                var flexibleMessageBoxForm = new FlexibleMessageBoxForm();
+                flexibleMessageBoxForm.ShowInTaskbar = false;
 
-                    //Bind the caption and the message text
-                    CaptionText = caption,
-                    MessageText = text
-                };
+                //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.

PROMS/Formats/Formats.csproj

@@ -66,7 +66,6 @@
     <Compile Include="frmFormatCopy.Designer.cs">
       <DependentUpon>frmFormatCopy.cs</DependentUpon>
     </Compile>
-    <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <EmbeddedResource Include="frmFormatCopy.resx">
@@ -180,7 +179,6 @@
     <Content Include="fmtall\CPL_00all.xml" />
     <Content Include="fmtall\CPL_01all.xml" />
     <Content Include="fmtall\CPL_02all.xml" />
-    <Content Include="fmtall\CPL_04all.xml" />
     <Content Include="fmtall\CPL_03all.xml" />
     <Content Include="fmtall\CPSAMGDataall.xml" />
     <Content Include="fmtall\CPSAMGDEVall.xml" />

PROMS/Formats/GlobalSuppressions.cs

@@ -1,8 +0,0 @@
-// This file is used by Code Analysis to maintain SuppressMessage
-// attributes that are applied to this project.
-// Project-level suppressions either have no target or are given
-// a specific target and scoped to a namespace, type, member, etc.
-
-using System.Diagnostics.CodeAnalysis;
-
-[assembly: SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Not modifying Naming Styles")]

PROMS/Formats/Program.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Windows.Forms;
 
 namespace Formats

PROMS/Formats/frmFormatCopy.cs

@@ -1,4 +1,9 @@
 using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
 using System.IO;
 using System.Windows.Forms;
 
@@ -23,7 +28,7 @@ namespace Formats
 				txbxPROMSFormatsPath.Text = savedFormatPath;
 			else
 			{
-				string curFolder = Environment.CurrentDirectory; // .../PROMS/Formats/bin/debug
+				string curFolder = Environment.CurrentDirectory; // C:\development/PROMS/Formats/bin/debug
 				int idx = curFolder.ToUpper().IndexOf(@"\PROMS\");
 				txbxPROMSFormatsPath.Text = curFolder.Substring(0, idx);
 			}
@@ -35,8 +40,9 @@ namespace Formats
 			DirectoryInfo di = new DirectoryInfo(path);
 			if (di.Exists == false) //return;
 			{
-                DialogResult dlgrslt = MessageBox.Show(string.Format("{0} does not exist. Create it?", path), "Create Folder?", MessageBoxButtons.YesNo);
-                if (dlgrslt == DialogResult.Yes)
+				DialogResult dlgrslt = DialogResult.No;
+				dlgrslt = MessageBox.Show(string.Format("{0} does not exist. Create it?", path), "Create Folder?", MessageBoxButtons.YesNo);
+				if (dlgrslt == DialogResult.Yes)
 				{
 					di.Create();
 					di.CreateSubdirectory("fmtall");
@@ -80,11 +86,10 @@ namespace Formats
 
 		private void btnBrowse_Click(object sender, EventArgs e)
 		{
-            FolderBrowserDialog fbd = new FolderBrowserDialog
-            {
-                SelectedPath = txbxPROMSFormatsPath.Text
-            };
-            if (fbd.ShowDialog() == DialogResult.OK)
+			FolderBrowserDialog fbd = new FolderBrowserDialog();
+
+			fbd.SelectedPath = txbxPROMSFormatsPath.Text;
+			if (fbd.ShowDialog() == DialogResult.OK)
 			{
 				if (Directory.Exists(fbd.SelectedPath)) txbxPROMSFormatsPath.Text = fbd.SelectedPath + @"\";
 			}
@@ -111,9 +116,9 @@ namespace Formats
 			if (!txbxPROMSFormatsPath.Text.EndsWith(@"\")) txbxPROMSFormatsPath.Text += @"\";
 
 			// There should be a "fmtall" and "genmacall" folder in the delelopment project folder
-			// ex: ...\PROMS\Formats\fmtall and ...\PROMS\Formats\genmacall
-			string destFmtallPath = $@"{txbxPROMSFormatsPath.Text}fmtall\";
-			string destGenmacallPath = $@"{txbxPROMSFormatsPath.Text}genmacall\";
+			// ex: C:\development\PROMS\Formats\fmtall and C:\development\PROMS\Formats\genmacall
+			string destFmtallPath = txbxPROMSFormatsPath.Text + @"fmtall\";
+			string destGenmacallPath = txbxPROMSFormatsPath.Text + @"genmacall\";
 			string srcFmtallPath = @"..\..\"; // up to levels from startup path
 
 			// clear the destination fmtall and genmacall folders
@@ -151,10 +156,14 @@ namespace Formats
 			}
 			Properties.Settings.Default.FormatPath = txbxPROMSFormatsPath.Text.Substring(0,txbxPROMSFormatsPath.Text.Length-1); // save the copy format path minus the ending backslash
 			Properties.Settings.Default.Save();
+			//if(MessageBox.Show("Do you want to end the Format Copier?","Formats Copied.", MessageBoxButtons.YesNo, MessageBoxIcon.Question)== DialogResult.Yes)
+				Application.Exit();
+		}
+
+		private void buttonX2_Click(object sender, EventArgs e)
+		{
 			Application.Exit();
 		}
 
-        private void buttonX2_Click(object sender, EventArgs e) => Application.Exit();
-
-    }
+	}
 }

PROMS/LBWordLibrary/GlobalSuppressions.cs

@@ -1,8 +0,0 @@
-// This file is used by Code Analysis to maintain SuppressMessage
-// attributes that are applied to this project.
-// Project-level suppressions either have no target or are given
-// a specific target and scoped to a namespace, type, member, etc.
-
-using System.Diagnostics.CodeAnalysis;
-
-[assembly: SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Not modifying Naming Styles")]

PROMS/LBWordLibrary/LBWordLibrary.csproj

@@ -79,7 +79,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="LBComObject.cs" />
     <Compile Include="LBObjectExtension.cs" />
     <Compile Include="OutlookLBComObject.cs" />

PROMS/LBWordLibrary/OutlookLBComObject.cs

@@ -1,45 +1,64 @@
 using System;
+using System.Collections.Generic;
+using System.Text;
 using System.Reflection;
 
 namespace LBOutlookLibrary
 {
 	public abstract partial class LBComObject
 	{
-		private object _Item;
-		internal object Item
+		private Object _Item;
+		internal Object Item
 		{
 			get { return _Item; }
 			set
 			{
 				_Item = value;
-				if (value != null) MyType = _Item.GetType();
+				if (value != null) _MyType = _Item.GetType();
 			}
 		}
-
-        public Type MyType { get; set; }
-        protected LBComObject() { }
+		private Type _MyType;
+		public Type MyType
+		{
+			get { return _MyType; }
+			set { _MyType = value; }
+		}
+		protected LBComObject() { }
 		protected LBComObject(string ProgID)
 		{
 			Type objClassType;
 			objClassType = Type.GetTypeFromProgID(ProgID);
 			Item = Activator.CreateInstance(objClassType);
 		}
-        protected LBComObject(object item) => Item = item;
-        private object DoInvokeMember(string name, object[] parameters, BindingFlags bf, Binder b)
+		protected LBComObject(Object item)
+		{
+			Item = item;
+		}
+		private Object DoInvokeMember(string name, Object[] parameters, BindingFlags bf, Binder b)
 		{
 			try
 			{
-				return MyType.InvokeMember(name, bf, b, _Item, parameters);
+				return _MyType.InvokeMember(name, bf, b, _Item, parameters);
 			}
 			catch (Exception ex)
 			{
-				throw new Exception(string.Format("LBComObject.DoInvokeMember {0}.{1}", MyType.Name, name), ex);
+				throw new Exception(string.Format("LBComObject.DoInvokeMember {0}.{1}", _MyType.Name, name), ex);
 			}
+			return null;
 		}
-        protected void SetProperty(string propertyName, params object[] parameters) => DoInvokeMember(propertyName, parameters, BindingFlags.SetProperty, null);
-        protected object GetProperty(string propertyName) => DoInvokeMember(propertyName, null, BindingFlags.GetProperty, null);
-        protected object GetProperty(string propertyName, params object[] parameters) => DoInvokeMember(propertyName, parameters, BindingFlags.GetProperty, null);
-        protected object InvokeMethod(string methodName, params object[] parameters)
+		protected void SetProperty(string propertyName, params Object[] parameters)
+		{
+			DoInvokeMember(propertyName, parameters, BindingFlags.SetProperty, null);
+		}
+		protected Object GetProperty(string propertyName)
+		{
+			return DoInvokeMember(propertyName, null, BindingFlags.GetProperty, null);
+		}
+		protected Object GetProperty(string propertyName, params Object[] parameters)
+		{
+			return DoInvokeMember(propertyName, parameters, BindingFlags.GetProperty, null);
+		}
+		protected Object InvokeMethod(string methodName, params Object[] parameters)
 		{
 			if (parameters != null)
 				FixParameters(parameters);
@@ -52,15 +71,45 @@ namespace LBOutlookLibrary
 				if (parameters[i] is LBComObject)
 					parameters[i] = (parameters[i] as LBComObject).Item;
 		}
-        protected object InvokeMethod(string methodName) => InvokeMethod(methodName, null);
-    }
+		protected Object InvokeMethod(string methodName)
+		{
+			return InvokeMethod(methodName, null);
+		}
+	}
+	public class LBComObjectList<TList, TItem> : LBComObject
+		where TList : LBComObjectList<TList, TItem>
+		where TItem : LBComObject, new()
+	{
+		//public new(Object item):base(item){}
+		public TItem Add()
+		{
+			TItem tmp = new TItem();
+			tmp.Item = InvokeMethod("Add");
+			return tmp;
+		}
+		//public TItem this[int item]
+		//{
+		//	get
+		//	{
+		//		TItem tmp = new TItem();
+		//		tmp.Item = GetProperty("Item", item);
+		//		return tmp;
+		//	}
+		//}
+	}
 	public partial class LBApplicationClass : LBComObject
 	{
 		public LBApplicationClass() : base("Outlook.Application") { }
-		public LBApplicationClass(object item) : base(item) { }
-        public object CreateItem(LBOlItemType ItemType) => InvokeMethod("CreateItem", ItemType);
-        public void Quit() => InvokeMethod("Quit");
-    }
+		public LBApplicationClass(Object item) : base(item) { }
+		public System.Object CreateItem(LBOlItemType ItemType)
+		{
+			return InvokeMethod("CreateItem", ItemType);
+		}
+		public void Quit()
+		{
+			InvokeMethod("Quit");
+		}
+	}
 	public enum LBOlItemType
 	{
 		olMailItem = 0,
@@ -75,13 +124,13 @@ namespace LBOutlookLibrary
 	public partial class LBMailItem : LBComObject
 	{
 		public LBMailItem() { }
-		public LBMailItem(object item) : base(item) { }
+		public LBMailItem(Object item) : base(item) { }
 	}
 	public partial class LBMailItemClass : LBComObject
 	{
 		public LBMailItemClass() { }
-		public LBMailItemClass(object item) : base(item) { }
-		public string Body
+		public LBMailItemClass(Object item) : base(item) { }
+		public String Body
 		{
 			get { return (GetProperty("Body").ToString()); }
 			set { SetProperty("Body", value); }
@@ -91,20 +140,29 @@ namespace LBOutlookLibrary
 			get { return (LBOlBodyFormat)GetProperty("BodyFormat"); }
 			set { SetProperty("BodyFormat", value); }
 		}
-        public LBAttachments Attachments => new LBAttachments(GetProperty("Attachments"));
-        public string Subject
+		public LBAttachments Attachments
+		{
+			get { return new LBAttachments(GetProperty("Attachments")); }
+		}
+		public String Subject
 		{
 			get { return (GetProperty("Subject").ToString()); }
 			set { SetProperty("Subject", value); }
 		}
-        public LBRecipients Recipients => new LBRecipients(GetProperty("Recipients"));
-        public string To
+		public LBRecipients Recipients
+		{
+			get { return new LBRecipients(GetProperty("Recipients")); }
+		}
+		public String To
 		{
 			get { return (GetProperty("To").ToString()); }
 			set { SetProperty("To", value); }
 		}
-        public void Send() => InvokeMethod("Send");
-    }
+		public void Send()
+		{
+			InvokeMethod("Send");
+		}
+	}
 	public enum LBOlBodyFormat
 	{
 		olFormatUnspecified = 0,
@@ -115,40 +173,79 @@ namespace LBOutlookLibrary
 	public partial class LBAttachments : LBComObject
 	{
 		public LBAttachments() { }
-		public LBAttachments(object item) : base(item) { }
-        public int Count => (GetProperty("Count") as int? ?? 0);
-        public new LBAttachment Item => new LBAttachment(GetProperty("Item"));
-        public LBAttachment Add(object Source) => new LBAttachment(InvokeMethod("Add", Source, Missing.Value, Missing.Value, Missing.Value));
-        public LBAttachment Add(object Source, object Type, object Position, object DisplayName)
+		public LBAttachments(Object item) : base(item) { }
+		public int Count
+		{
+			get { return (GetProperty("Count") as int? ?? 0); }
+		}
+		public LBAttachment Item
+		{
+			get { return new LBAttachment(GetProperty("Item")); }
+		}
+		public LBAttachment Add(object Source)
+		{
+			return new LBAttachment(InvokeMethod("Add", Source, Missing.Value, Missing.Value, Missing.Value));
+		}
+		public LBAttachment Add(object Source, object Type, object Position, object DisplayName)
 		{
 			return new LBAttachment(InvokeMethod("Add", Source, Type, Position, DisplayName));
 		}
-        public void Remove(int Index) => InvokeMethod("Remove", Index);
-    }
+		public void Remove(int Index)
+		{
+			InvokeMethod("Remove", Index);
+		}
+	}
 	public partial class LBRecipients : LBComObject
 	{
 		public LBRecipients() { }
-		public LBRecipients(object item) : base(item) { }
-        public int Count => (GetProperty("Count") as int? ?? 0);
-        public new LBRecipient Item => new LBRecipient(GetProperty("Item"));
-        public LBRecipient Add(string Name) => new LBRecipient(InvokeMethod("Add", Name));
-        public void Remove(int Index) => InvokeMethod("Remove", Index);
-        public bool ResolveAll() => InvokeMethod("ResolveAll") as bool? ?? false;
-    }
+		public LBRecipients(Object item) : base(item) { }
+		public int Count
+		{
+			get { return (GetProperty("Count") as int? ?? 0); }
+		}
+		public LBRecipient Item
+		{
+			get { return new LBRecipient(GetProperty("Item")); }
+		}
+		public LBRecipient Add(string Name)
+		{
+			return new LBRecipient(InvokeMethod("Add", Name));
+		}
+		public void Remove(int Index)
+		{
+			InvokeMethod("Remove", Index);
+		}
+		public Boolean ResolveAll()
+		{
+			return InvokeMethod("ResolveAll") as Boolean? ?? false;
+		}
+	}
 	public partial class LBAttachment : LBComObject
 	{
 		public LBAttachment() { }
-		public LBAttachment(object item) : base(item) { }
-        public LBOlAttachmentType Type => (LBOlAttachmentType)GetProperty("Type");
-    }
+		public LBAttachment(Object item) : base(item) { }
+		public LBOlAttachmentType Type
+		{
+			get { return (LBOlAttachmentType)GetProperty("Type"); }
+		}
+	}
 	public partial class LBRecipient : LBComObject
 	{
 		public LBRecipient() { }
-		public LBRecipient(object item) : base(item) { }
-        public string Address => (GetProperty("Address").ToString());
-        public string Name => (GetProperty("Name").ToString());
-        public bool Resolve() => InvokeMethod("Resolve") as bool? ?? false;
-    }
+		public LBRecipient(Object item) : base(item) { }
+		public String Address
+		{
+			get { return (GetProperty("Address").ToString()); }
+		}
+		public String Name
+		{
+			get { return (GetProperty("Name").ToString()); }
+		}
+		public Boolean Resolve()
+		{
+			return InvokeMethod("Resolve") as Boolean? ?? false;
+		}
+	}
 	public enum LBOlAttachmentType
 	{
 		olByValue = 1,

PROMS/LBWordLibrary/OutlookLBComObjectExt.cs

@@ -1,13 +1,21 @@
 using System;
+using System.Collections.Generic;
+using System.Text;
 
 namespace LBOutlookLibrary
 {
 	public partial class LBApplicationClass
 	{
-        public LBMailItemClass CreateMailItem() => new LBMailItemClass(CreateItem(LBOlItemType.olMailItem));
-    }
+		public LBMailItemClass CreateMailItem()
+		{
+			return new LBMailItemClass(CreateItem(LBOlItemType.olMailItem));
+		}
+	}
 	public partial class LBMailItemClass
 	{
-        public void AddAttachment(string filename) => Attachments.Add(filename, LBOlAttachmentType.olByValue, Type.Missing, Type.Missing);
-    }
+		public void AddAttachment(string filename)
+		{
+			Attachments.Add(filename, LBOlAttachmentType.olByValue, Type.Missing, Type.Missing);
+		}
+	}
 }

PROMS/LBWordLibrary/RegHive.cs

@@ -49,13 +49,19 @@ namespace Read64bitRegistryFrom32bitApp
 				ref uint lpType,
 				System.Text.StringBuilder lpData,
 				ref uint lpcbData);
-        #endregion
-        #endregion
+		#endregion
+		#endregion
 
-        #region Functions
-        static public string GetRegKey64Value(UIntPtr inHive, string inKeyName, string inPropertyName) => GetRegKey64Value(inHive, inKeyName, RegSAM.WOW64_64Key, inPropertyName);
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "inHive kept to match dll signature")]
-        static public string GetRegKey64Value(UIntPtr inHive, string inKeyName, RegSAM in32or64key, string inPropertyName)
+		#region Functions
+		static public string GetRegKey64Value(UIntPtr inHive, String inKeyName, String inPropertyName)
+		{
+			return GetRegKey64Value(inHive, inKeyName, RegSAM.WOW64_64Key, inPropertyName);
+		}
+		static public string GetRegKey32Value(UIntPtr inHive, String inKeyName, String inPropertyName)
+		{
+			return GetRegKey64Value(inHive, inKeyName, RegSAM.WOW64_32Key, inPropertyName);
+		}
+		static public string GetRegKey64Value(UIntPtr inHive, String inKeyName, RegSAM in32or64key, String inPropertyName)
 		{
 			int hkey = 0;
 			try
@@ -74,10 +80,15 @@ namespace Read64bitRegistryFrom32bitApp
 				if (0 != hkey) RegCloseKey(hkey);
 			}
 		}
-        static public bool CheckRegKey64Valid(UIntPtr inHive, string inKeyName) => CheckRegKey64Valid(inHive, inKeyName, RegSAM.WOW64_64Key);
-        static public bool GetRegKey32Valid(UIntPtr inHive, string inKeyName) => CheckRegKey64Valid(inHive, inKeyName, RegSAM.WOW64_32Key);
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "inHive kept to match dll signature")]
-        static public bool CheckRegKey64Valid(UIntPtr inHive, string inKeyName, RegSAM in32or64key)
+		static public bool CheckRegKey64Valid(UIntPtr inHive, String inKeyName)
+		{
+			return CheckRegKey64Valid(inHive, inKeyName, RegSAM.WOW64_64Key);
+		}
+		static public bool GetRegKey32Valid(UIntPtr inHive, String inKeyName)
+		{
+			return CheckRegKey64Valid(inHive, inKeyName, RegSAM.WOW64_32Key);
+		}
+		static public bool CheckRegKey64Valid(UIntPtr inHive, String inKeyName, RegSAM in32or64key)
 		{
 			int hkey = 0;
 			try
@@ -92,5 +103,8 @@ namespace Read64bitRegistryFrom32bitApp
 			}
 		}
 		#endregion
+
+		#region Enums
+		#endregion
 	}
 }

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

@@ -77,7 +77,6 @@ using System.Xml.Schema;
 using System.Text;
 using ROFields;
 using RODBInterface;
-using System.Linq;
 
 namespace ROEditor
 {
@@ -281,7 +280,6 @@ namespace ROEditor
 			this.tbXYPlotWid.Size = new System.Drawing.Size(40, 22);
 			this.tbXYPlotWid.TabIndex = 11;
 			this.tbXYPlotWid.Text = "";
-			this.tbXYPlotWid.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBox_KeyDown);
 			// 
 			// tbTableWid
 			// 
@@ -290,7 +288,6 @@ namespace ROEditor
 			this.tbTableWid.Size = new System.Drawing.Size(40, 22);
 			this.tbTableWid.TabIndex = 10;
 			this.tbTableWid.Text = "";
-			this.tbTableWid.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBox_KeyDown);
 			// 
 			// tbVariableTxtWid
 			// 
@@ -299,7 +296,6 @@ namespace ROEditor
 			this.tbVariableTxtWid.Size = new System.Drawing.Size(40, 22);
 			this.tbVariableTxtWid.TabIndex = 9;
 			this.tbVariableTxtWid.Text = "";
-			this.tbVariableTxtWid.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBox_KeyDown);
 			// 
 			// tbSingleTxtWid
 			// 
@@ -308,7 +304,6 @@ namespace ROEditor
 			this.tbSingleTxtWid.Size = new System.Drawing.Size(40, 22);
 			this.tbSingleTxtWid.TabIndex = 8;
 			this.tbSingleTxtWid.Text = "";
-			this.tbSingleTxtWid.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBox_KeyDown);
 			// 
 			// lblW4
 			// 
@@ -591,18 +586,5 @@ namespace ROEditor
 			
 			this.Close();
 		}
-		private void txtBox_KeyDown(object sender, KeyEventArgs e)
-		{
-			if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text))
-			{
-				string clpBrd = Clipboard.GetText();
-				if (clpBrd.Any(c => c > 166))
-				{
-					MessageBox.Show("Symbols are not allowed in the field. Clipbroad: '" + clpBrd + "'");
-					Clipboard.Clear();
-				}
-			}
-		}
 	}
 }
-

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

@@ -77,7 +77,6 @@ using System.Xml.Schema;
 using System.Text;
 using ROFields;
 using RODBInterface;
-using System.Linq;
 
 namespace ROEditor
 {
@@ -317,22 +316,6 @@ namespace ROEditor
 			}
 			base.Dispose( disposing );
 		}
-		private void txtBox_KeyDown(object sender, KeyEventArgs e)
-		{
-			bool symFlg = false;
-			if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text))
-			{
-				if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text))
-				{
-					string clpBrd = Clipboard.GetText();
-					if (clpBrd.Any(c => c > 166))
-					{
-						MessageBox.Show("Symbols are not allowed in the field. Clipbroad: '" + clpBrd + "'");
-						Clipboard.Clear();
-					}
-				}
-			}
-		}
 
 		#region Windows Form Designer generated code
 		/// <summary>
@@ -374,7 +357,6 @@ namespace ROEditor
 			this.tbFieldName.Size = new System.Drawing.Size(320, 22);
 			this.tbFieldName.TabIndex = 2;
 			this.tbFieldName.Text = "";
-			this.tbFieldName.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBox_KeyDown);
 			// 
 			// tbWidth
 			// 
@@ -383,7 +365,6 @@ namespace ROEditor
 			this.tbWidth.Size = new System.Drawing.Size(32, 22);
 			this.tbWidth.TabIndex = 3;
 			this.tbWidth.Text = "";
-			this.tbWidth.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBox_KeyDown);
 			// 
 			// btnOK
 			// 
@@ -421,7 +402,6 @@ namespace ROEditor
 			this.tbPattern.TabIndex = 7;
 			this.tbPattern.Text = "";
 			this.tbPattern.Visible = false;
-			this.tbPattern.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBox_KeyDown);
 			// 
 			// FieldTextFrm
 			// 
@@ -445,4 +425,3 @@ namespace ROEditor
 		#endregion
 	}
 }
-

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

@@ -72,7 +72,6 @@ using System.Xml;
 using System.Text;
 using RODBInterface;
 using ROFields;
-using System.Linq;
 
 namespace ROEditor
 {
@@ -278,22 +277,6 @@ namespace ROEditor
 
 			this.Close();
 		}
-		private void txtBox_KeyDown(object sender, KeyEventArgs e)
-		{
-			bool symFlg = false;
-			if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text))
-			{
-				if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text))
-				{
-					string clpBrd = Clipboard.GetText();
-					if (clpBrd.Any(c => c > 166))
-					{
-						MessageBox.Show("Symbols are not allowed in the field. Clipbroad: '" + clpBrd + "'");
-						Clipboard.Clear();
-					}
-				}
-			}
-		}
 		#region Windows Form Designer generated code
 		/// <summary>
 		/// Required method for Designer support - do not modify
@@ -332,7 +315,6 @@ namespace ROEditor
 			this.tbFieldName.Size = new System.Drawing.Size(368, 22);
 			this.tbFieldName.TabIndex = 1;
 			this.tbFieldName.Text = "";
-			this.tbFieldName.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBox_KeyDown);
 			// 
 			// gbFldType
 			// 
@@ -455,4 +437,3 @@ namespace ROEditor
 		#endregion
 	}
 }
-

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

@@ -52,7 +52,6 @@ using System.Xml;
 using System.Text;
 using ROFields;
 using RODBInterface;
-using System.Linq;
 
 namespace ROEditor
 {
@@ -156,7 +155,6 @@ namespace ROEditor
 			this.tbGroup.Size = new System.Drawing.Size(248, 22);
 			this.tbGroup.TabIndex = 8;
 			this.tbGroup.Text = "";
-			this.tbGroup.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBox_KeyDown);
 			// 
 			// lblGroup
 			// 
@@ -423,21 +421,5 @@ namespace ROEditor
 			GroupDefFrm grdef = new GroupDefFrm(nelem,myrodb,nelem.InnerText,dbtype);
 			grdef.ShowDialog();
 		}
-		private void txtBox_KeyDown(object sender, KeyEventArgs e)
-		{		
-			if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text))
-			{
-				if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text))
-				{
-					string clpBrd = Clipboard.GetText();
-					if (clpBrd.Any(c => c > 166))
-					{
-						MessageBox.Show("Symbols are not allowed in the field. Clipbroad: '" + clpBrd + "'");
-						Clipboard.Clear();
-					}
-				}
-			}
-		}
 	}
 }
-

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

@@ -106,7 +106,6 @@ using ROFields;
 using RODBInterface;
 using VlnStatus;
 using System.Collections.Generic;
-using System.Linq;
 
 
 namespace ROEditor
@@ -1312,22 +1311,6 @@ namespace ROEditor
 					}
 			}
 		}
-		private void txtBox_KeyDown(object sender, KeyEventArgs e)
-		{
-			bool symFlg = false;
-			if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text))
-			{
-				if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text))
-				{
-					string clpBrd = Clipboard.GetText();
-					if (clpBrd.Any(c => c > 166))
-					{
-						MessageBox.Show("Symbols are not allowed in the field. Clipbroad: '" + clpBrd + "'");
-						Clipboard.Clear();
-					}
-				}
-			}
-		}
 
 		#region Windows Form Designer generated code
 		/// <summary>
@@ -1392,7 +1375,6 @@ namespace ROEditor
 			this.tbRetVal.Size = new System.Drawing.Size(464, 22);
 			this.tbRetVal.TabIndex = 4;
 			this.tbRetVal.Text = "textBox1";
-			this.tbRetVal.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBox_KeyDown);
 			// 
 			// tbMenuVal
 			// 
@@ -1401,7 +1383,6 @@ namespace ROEditor
 			this.tbMenuVal.Size = new System.Drawing.Size(464, 22);
 			this.tbMenuVal.TabIndex = 5;
 			this.tbMenuVal.Text = "textBox1";
-			this.tbMenuVal.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBox_KeyDown);
 			// 
 			// lblGroupText
 			// 
@@ -1627,4 +1608,3 @@ namespace ROEditor
 		#endregion
 	}
 }
-

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

@@ -109,10 +109,6 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\3rdPartyLibraries\DotNetBar\DotNetBar4.6Build\DevComponents.DotNetBar2.dll</HintPath>
-    </Reference>
     <Reference Include="System">
       <Name>System</Name>
     </Reference>
@@ -128,6 +124,10 @@
     <Reference Include="System.Xml">
       <Name>System.XML</Name>
     </Reference>
+    <Reference Include="Volian.Base.Library, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\Volian.Base.Library\bin\Debug\Volian.Base.Library.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AboutROEditor.cs">
@@ -168,7 +168,6 @@
     <Compile Include="RO_FST.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Content Include="Symbols.xml" />
     <EmbeddedResource Include="AboutROEditor.resx">
       <SubType>Designer</SubType>
       <DependentUpon>AboutROEditor.cs</DependentUpon>

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.resx

@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACE
-        CAAAAk1TRnQBSQFMAgEBAgEAAUQBAAFEAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CAAAAk1TRnQBSQFMAgEBAgEAASwBAAEsAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -175,7 +175,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAe
-        CwAAAk1TRnQBSQFMAgEBBgEAAUQBAAFEAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CwAAAk1TRnQBSQFMAgEBBgEAASwBAAEsAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

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

@@ -101,6 +101,7 @@ using System.Runtime.InteropServices;
 using VlnStatus;
 using System.Collections.Specialized;
 using ROFST_FILE;
+using Volian.Base.Library;
 
 //using VlnProfiler; //don't forget to add VlnProfiler to the reference list
 
@@ -116,12 +117,12 @@ namespace ROEditor
 		public uint thisoff;
 		public string title;
 
-        public FstTmpSTRC(ushort type, uint offset, string tl)
+		public FstTmpSTRC(ushort type, uint offset, string tl)
 		{
 			thistype = type;
 			thisoff = offset;
 			title = tl;
-        }
+		}
 
 		void WriteString(BinaryWriter bw, string str)
 		{
@@ -150,7 +151,7 @@ namespace ROEditor
 			bw.Write(thisoff);
 			bw.Write(thistype);
 			WriteString(bw,title);
-        }
+		}
 	}
 
 // The Sorted Array was not sorting via the ASCII value of each character in a given string.
@@ -565,8 +566,8 @@ namespace ROEditor
 			string RecIdStr = elem.GetAttribute("RecID");
 			curRecID = System.Convert.ToUInt32(RecIdStr,16);
 
-            // Get the current node's parent id
-            string ParIdStr = elem.GetAttribute("ParentID");
+			// Get the current node's parent id
+			string ParIdStr = elem.GetAttribute("ParentID");
 			elemParentID = Convert.ToUInt32(ParIdStr,16);
 
 			string HasKids = elem.GetAttribute("HasChild");
@@ -771,8 +772,8 @@ namespace ROEditor
 		private ushort SaveROToFST(XmlNode RONode,ArrayList InUseList,string RtnValTmplate, string AccPageIDTplate)
 		{
 			ushort RtnVal;
-            uint startFST = (uint)fhFST.BaseStream.Position;
-            uint RORecID;
+			uint startFST = (uint)fhFST.BaseStream.Position;
+			uint RORecID;
 			uint ParID;
 			byte nullbyte=0;
 
@@ -844,12 +845,8 @@ namespace ROEditor
 				AccPageID = " ";
 			WriteString(AccPageID);
 
-            //C2026-008 Re-Architect RO.FST to include RO Modification date/time
-            string moddt = ROdatabase.RODB_GetModDateTime(elem.GetAttribute("RecID"), elem.GetAttribute("Table"));
-            if (!string.IsNullOrEmpty(moddt)) WriteString(moddt);
-
-            // Save the ID and offset entry for the current ID
-            IdsAndOffsets.Add(RORecID, startFST);
+			// Save the ID and offset entry for the current ID
+			IdsAndOffsets.Add(RORecID,startFST);
 
 			// Save the RecID and Accessory Page id
 			IdsAndAccPgIds[AccPageID] = RORecID;
@@ -888,4 +885,3 @@ namespace ROEditor
 
 	}
 }
-

PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs

@@ -263,7 +263,6 @@ using System.Collections.Specialized;
 using Org.Mentalis.Files;
 using System.Data.SqlClient;
 using System.Collections.Generic;
-using System.Text.RegularExpressions;
 
 
 namespace RODBInterface
@@ -322,9 +321,9 @@ namespace RODBInterface
 			get { return _PCChildList; } 
 			set { _PCChildList = value; } 
 		}
-        #endregion
-        #region abstracts   // need these for each method that must be defined for each database type
-        public abstract string RODB_GetNextGroupTable();
+		#endregion
+		#region abstracts   // need these for each method that must be defined for each database type
+		public abstract string RODB_GetNextGroupTable();
 		public abstract string RODB_GetNextRecId(string table);
 		public abstract bool RODB_GetRootGroups(VlnXmlElement root);
 		public abstract bool RODB_DeleteGroup(XmlNode group, string tbname, string toprecid);
@@ -355,10 +354,9 @@ namespace RODBInterface
 		public abstract string RODB_GetDBServerForAbout();
 		public abstract string RODB_HasBeenConverted();
 		public abstract bool RODB_WriteSqlConnectToAccess(string newConectStr);
-		public abstract string RODB_GetModDateTime(string Recid, string table);
-        #endregion
+		#endregion
 
-        public RODB()
+		public RODB()
 		{
 
 		}
@@ -1911,8 +1909,6 @@ namespace RODBInterface
 				string Info = DBE.GetString(3);
 				//B2022-043 &pos; was missing the ;
 				Info = Info.Replace("'", "\'");		// B2021-071: crash when getting/saving field names
-				Info = Regex.Replace(Info, @"\\u([0-9]{1,4})\?", m => Convert.ToChar(int.Parse(m.Groups[1].Value)).ToString());  // RO Editor add symbols C2022 - 003
-
 				node.SetAttribute("HasChild", "True");
 
 				// Store data in the VlnXmlElement as a subgroup
@@ -2143,20 +2139,7 @@ namespace RODBInterface
 					wraccid = accid;
 				string dt = string.Format("{0:yyyyMMddHHmmss}", System.DateTime.Now);
 				string xmlstr = GenerateXmlString(ro, false);
-				StringBuilder xmlstrTmp = new StringBuilder(); // B2026-025 prep the info field data so it will be saved correctly.
-				char[] chrAry = xmlstr.ToCharArray();
-				foreach (int chr in chrAry)
-				{
-					if (chr > 166)
-					{
-						xmlstrTmp.Append($"\\u{(int)chr}?");
-					}
-					else
-					{
-						xmlstrTmp.Append((char)chr);
-					}
-				}
-				string strUpdate = "UPDATE " + ro.GetAttribute("Table") + " SET Info = '" + xmlstrTmp.ToString() + "'";
+				string strUpdate = "UPDATE " + ro.GetAttribute("Table") + " SET Info = '" + xmlstr + "'";
 				if (movedRO)
 				{
 					VlnXmlElement parent = (VlnXmlElement)ro.ParentNode;
@@ -2199,27 +2182,10 @@ namespace RODBInterface
 				parent.SetAttribute("ChildLoaded", "True");
 			}
 			string xmlstr = GenerateXmlString(ro, false);
-
-			StringBuilder xmlstrTmp = new StringBuilder(); // B2026-025 prep the info field data so it will be saved correctly.
-			char[] chrAry = xmlstr.ToCharArray();
-			foreach (int chr in chrAry)
-			{
-				if (chr > 166)
-				{
-					xmlstrTmp.Append($"\\u{(int)chr}?");
-				}
-				else
-				{
-					xmlstrTmp.Append((char)chr);
-				}
-			}
-
 			string wraccid = null;
 			if (ro.HasAttribute("AccPageID"))
 			{
 				string accid = ro.GetAttribute("AccPageID");
-
-
 				int quote = accid.IndexOf("'");
 				if (quote >= 0)
 					wraccid = accid.Insert(quote, "'");
@@ -2237,13 +2203,13 @@ namespace RODBInterface
 					//    strInsert = "INSERT INTO " + parent.GetAttribute("Table") + "( RecID, RecType, ParentID, AccPageID, ModDateTime, Info ) ";
 					strInsert = "INSERT INTO " + parent.GetAttribute("Table") + "( RecID, RecType, ParentID, ModDateTime, AccPageID, Info ) ";
 					strInsert = strInsert + " VALUES ('" + ro.GetAttribute("RecID") + "'," + (uint)RecordType.Group + ",'" + ro.GetAttribute("ParentID");
-					strInsert = strInsert + "','" + wraccid + "','" + dt + "','" + xmlstrTmp.ToString() + "');";
+					strInsert = strInsert + "','" + wraccid + "','" + dt + "','" + xmlstr + "');";
 				}
 				else
 				{
 					strInsert = "INSERT INTO " + parent.GetAttribute("Table") + "( RecID, RecType, ParentID, ModDateTime, Info ) ";
 					strInsert = strInsert + " VALUES ('" + ro.GetAttribute("RecID") + "'," + (uint)RecordType.Group + ",'" + ro.GetAttribute("ParentID");
-					strInsert = strInsert + "','" + dt + "','" + xmlstrTmp.ToString() + "');";
+					strInsert = strInsert + "','" + dt + "','" + xmlstr + "');";
 				}
 
 			}
@@ -2251,7 +2217,7 @@ namespace RODBInterface
 			{
 				strInsert = "INSERT INTO " + parent.GetAttribute("Table") + "( RecID, RecType, ParentID, AccPageId, ModDateTime, Info ) ";
 				strInsert = strInsert + " VALUES ('" + ro.GetAttribute("RecID") + "'," + (uint)RecordType.RRO + ",'" + ro.GetAttribute("ParentID");
-				strInsert = strInsert + "','" + wraccid + "','" + dt + "','" + xmlstrTmp.ToString() + "');";
+				strInsert = strInsert + "','" + wraccid + "','" + dt + "','" + xmlstr + "');";
 			}
 
 			try
@@ -2285,7 +2251,7 @@ namespace RODBInterface
 				// select all of the field definition records in this table.
 				//			strGetFields = "SELECT RecID, Info from " + elem.GetAttribute("Table");
 				strGetFields = "SELECT RecID, Info from " + TableName;
-				strGetFields = strGetFields + " where RecType = 2";  
+				strGetFields = strGetFields + " where RecType = 2";  //  + rtype.ToString();
 				DBE.Command(strGetFields);
 				DBE.Reader();
 
@@ -2383,9 +2349,9 @@ namespace RODBInterface
 				RecID = DBE.GetString(0);
 				MyRecID = RecID;
 				Info = DBE.GetString(1);
-                // it's defined in the local table if the first character is "<" which starts
-                // the schema definition string.
-                if ("<" == Info.Substring(0, 1))
+				// it's defined in the local table if the first character is "<" which starts
+				// the schema definition string.
+				if ("<" == Info.Substring(0, 1))
 				{
 					name = ParseEleName(Info);
 					if (name != null)
@@ -2426,7 +2392,7 @@ namespace RODBInterface
 			return retlist;
 		}
 
-        public override string RODB_GetSchemaPiece(string Recid, string table)
+		public override string RODB_GetSchemaPiece(string Recid, string table)
 		{
 			string strGetSchemaPiece;
 			string Info;
@@ -2659,21 +2625,7 @@ namespace RODBInterface
 										}
 									}
 									StatMsgWindow.StatusMessage = echild.GetAttribute("MenuTitle");
-									StringBuilder tinfo2Tmp = new StringBuilder(); // B2026-025 prep the info field data so it will be saved correctly.
 									str = "UPDATE " + echild.GetAttribute("Table") + " SET Info = '" + tinfo2 + "'";
-									char[] chrAry = tinfo2.ToCharArray();
-									foreach (int chr in chrAry)
-									{
-										if (chr > 166)
-										{
-											tinfo2Tmp.Append($"\\u{(int)chr}?");
-										}
-										else
-										{
-											tinfo2Tmp.Append((char)chr);
-										}
-									}
-									str = "UPDATE " + echild.GetAttribute("Table") + " SET Info = '" + tinfo2Tmp.ToString() + "'";
 									str = str + ", ModDateTime = '" + dt + "' WHERE RecID = '" + echild.GetAttribute("RecID") + "';";
 									DBE.Command(str);
 									DBE.Reader();
@@ -3083,28 +3035,7 @@ namespace RODBInterface
 			return GrpCnt;
 		}
 
-        //C2026-008 Re-Architect RO.FST to include RO Modification date/time
-        //Get the Modification Date / Time for the RO
-        public override string RODB_GetModDateTime(string Recid, string table)
-        {
-            using (System.Data.OleDb.OleDbConnection connection = new System.Data.OleDb.OleDbConnection(strDatabaseConnectionCommand))
-            {
-				connection.Open();
-                using (System.Data.OleDb.OleDbCommand command = connection.CreateCommand())
-                {
-					//Unfortunately Access wont let you paramaterize the table name
-                    command.CommandText = $"SELECT ModDateTime FROM {Regex.Replace(table, "[^a-zA-Z0-9]", "")} WHERE RecID = @Value";
-                    command.Parameters.Add(new System.Data.OleDb.OleDbParameter
-                    {
-                        OleDbType = System.Data.OleDb.OleDbType.VarChar,
-                        ParameterName = "@Value",
-                        Value = Recid
-                    });
-                    return command.ExecuteScalar().ToString();
-                }
-            }
-        }
-    }
+	}
 }
 
 

PROMS/ReferencedObjects/LibSource/RODBInterface/SqlRODB.cs

@@ -1803,9 +1803,9 @@ namespace RODBInterface
 							RecID = reader.GetString(0);
 							MyRecID = RecID;
 							Info = reader.GetString(1);
-                            // it's defined in the local table if the first character is "<" which starts
-                            // the schema definition string.
-                            if ("<" == Info.Substring(0, 1))
+							// it's defined in the local table if the first character is "<" which starts
+							// the schema definition string.
+							if ("<" == Info.Substring(0, 1))
 							{
 								name = ParseEleName(Info);
 								if (name != null)
@@ -1859,9 +1859,9 @@ namespace RODBInterface
 								RecID = reader.GetString(0);
 								MyRecID = RecID;
 								Info = reader.GetString(1);
-                                // it's defined in the local table if the first character is "<" which starts
-                                // the schema definition string.
-                                if ("<" == Info.Substring(0, 1))
+								// it's defined in the local table if the first character is "<" which starts
+								// the schema definition string.
+								if ("<" == Info.Substring(0, 1))
 								{
 									name = ParseEleName(Info);
 									if (name != null)
@@ -2653,36 +2653,8 @@ namespace RODBInterface
 			}
 			return GrpCnt;
 		}
-
-        //C2026-008 Re-Architect RO.FST to include RO Modification date/time
-        //Get the Modification Date / Time for the RO
-        public override string RODB_GetModDateTime(string Recid, string table)
-        {
-            using (SqlConnection connection = new SqlConnection(strDatabaseConnectionCommand))
-            {
-				connection.Open();
-                using (SqlCommand command = connection.CreateCommand())
-                {
-                    command.CommandText = $"SELECT ModDateTime FROM ROALL WHERE RecID = @Value AND ROTable = @table";
-                    command.Parameters.Add(new SqlParameter
-                    {
-                        SqlDbType = SqlDbType.VarChar,
-                        ParameterName = "@Value",
-                        Value = Recid
-                    });
-                    command.Parameters.Add(new SqlParameter
-                    {
-                        SqlDbType = SqlDbType.VarChar,
-                        ParameterName = "@table",
-                        Value = table
-                    });
-
-                    return command.ExecuteScalar().ToString();
-                }
-            }
-        }
-        #endregion
-        public static bool TestConnect(string constring)
+		#endregion
+		public static bool TestConnect(string constring)
 		{
 			bool success = false;
 			using (SqlConnection connection = new SqlConnection(constring))

PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs

@@ -96,7 +96,6 @@ using System.IO;
 using System.Windows.Forms;
 using ROFields;
 using VlnStatus;
-using System.Text.RegularExpressions;
 //using VlnProfiler; //don't forget to add VlnProfiler to the reference list
 
 namespace RODBInterface
@@ -518,8 +517,7 @@ namespace RODBInterface
 								strtmp.Append(" ");
 								cnt++;
 							}
-							text = Regex.Replace(text, @"\\u([0-9]{1,4})\?", m => int.TryParse(m?.Groups[1]?.Value, out int result) ? Convert.ToChar(result).ToString() : ""); //B2026-025 Unicode removed from RO menu titles in treeview.
-							if ((cnt + text.Length) > frmt2) // longer than the field length?								
+							if ((cnt + text.Length) > frmt2) // longer than the field length?
 								strtmp.Append(text.Substring(0,frmt2-cnt));
 							else
 								strtmp.Append(text);

PROMS/ReferencedObjects/LibSource/VlnStatus/StatusBarFrm.cs

@@ -19,6 +19,11 @@
  *********************************************************************************************/
 
 using System;
+using System.Drawing;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Forms;
+//using ROProfiler; //don't forget to add VlnProfiler to the reference list
 
 namespace VlnStatus
 {
@@ -30,6 +35,11 @@ namespace VlnStatus
 		private System.Windows.Forms.ProgressBar progressBar1;
 		private System.Windows.Forms.Label lblBar;
 		private System.Windows.Forms.Label StatMsg;
+//		private string strLblLast="";
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.Container components = null;
 
 		public StatusBarFrm()
 		{
@@ -51,6 +61,21 @@ namespace VlnStatus
 			Text = StatusBoxTitle;
 		}
 
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if(components != null)
+				{
+					components.Dispose();
+				}
+			}
+			base.Dispose( disposing );
+		}
+
 		#region Windows Form Designer generated code
 		/// <summary>
 		/// Required method for Designer support - do not modify
@@ -165,6 +190,14 @@ namespace VlnStatus
 		{
 			lblBar.Text = (Math.Round((decimal)(progressBar1.Value * 100) / progressBar1.Maximum)).ToString();
 			lblBar.Text += "% Complete";
+//			if( lblBar.Text != strLblLast)
+//			{
+//				Profiler.Start("UpdateLabel");
+				lblBar.Refresh();
+//				lblBar.Update();
+//				Profiler.End("UpdateLabel");
+//			}
+//			strLblLast = lblBar.Text;
 		}
 
 		public string StatusMessage
@@ -176,7 +209,10 @@ namespace VlnStatus
 			set
 			{
 				StatMsg.Text = value;
+//				Profiler.Start("StatusMessage");
 				StatMsg.Refresh();
+//				StatMsg.Update();
+//				Profiler.End("StatusMessage");
 			}
 		}
 

PROMS/ReferencedObjects/LibSource/VlnStatus/StatusMessageFrm.cs

@@ -17,6 +17,12 @@
  * Added overbounds check
  *********************************************************************************************/
 
+using System;
+using System.Drawing;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Forms;
+
 namespace VlnStatus
 {
 	/// <summary>
@@ -25,6 +31,10 @@ namespace VlnStatus
 	public class StatusMessageFrm : System.Windows.Forms.Form
 	{
 		private System.Windows.Forms.Label lblStatMsg;
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.Container components = null;
 
 		public StatusMessageFrm()
 		{
@@ -44,6 +54,21 @@ namespace VlnStatus
 			Text = StatTitle;
 		}
 
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if(components != null)
+				{
+					components.Dispose();
+				}
+			}
+			base.Dispose( disposing );
+		}
+
 		#region Windows Form Designer generated code
 		/// <summary>
 		/// Required method for Designer support - do not modify

PROMS/ReferencedObjects/LibSource/VlnStatus/VlnStatusBar.cs

@@ -33,7 +33,7 @@ namespace VlnStatus
 	/// </summary>
 	public class VlnStatusBar
 	{
-        readonly StatusBarFrm StatBar;
+		StatusBarFrm StatBar;
 		private int Cnt;
 
 		// Create a status window with the default title of "Status"
@@ -53,6 +53,8 @@ namespace VlnStatus
 		// Increament the the status bar by the passed in value.
 		public void PerformStep(int val)
 		{
+//			StatBar.Value = val;
+//			Cnt = val;
 			BarValue = val;
 			StatBar.PerformStep();
 		}
@@ -60,6 +62,7 @@ namespace VlnStatus
 		// Increament the the status bar by one
 		public void PerformStep()
 		{
+//			StatBar.Value = StatBar.Value + 1;
 			Cnt++;
 			BarValue = Cnt;
 			StatBar.PerformStep();

PROMS/ReferencedObjects/LibSource/VlnStatus/VlnStatusMessage.cs

@@ -13,6 +13,8 @@
  * Added overbounds check
  *********************************************************************************************/
 
+using System;
+
 namespace VlnStatus
 {
 	/// <summary>
@@ -26,7 +28,7 @@ namespace VlnStatus
 	/// </summary>
 	public class VlnStatusMessage
 	{
-        readonly StatusMessageFrm StatusMessageBox;
+		StatusMessageFrm StatusMessageBox;
 
 		// Create a status window with the default title of "Status"
 		public VlnStatusMessage()

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ZoomDialog.cs

@@ -39,7 +39,7 @@ namespace ctlXMLEditLib
 	{
 		private System.Windows.Forms.Button btnSave;
 		private System.Windows.Forms.Button btnCancel;
-		private ctlXMLEditLib.roRichTextBox tbZoom; // RO Editor add symbols C2022 - 003
+		private System.Windows.Forms.TextBox tbZoom;
 		/// <summary>
 		/// Required designer variable.
 		/// </summary>
@@ -88,7 +88,7 @@ namespace ctlXMLEditLib
 		/// </summary>
 		private void InitializeComponent()
 		{
-			this.tbZoom = new ctlXMLEditLib.roRichTextBox(); // RO Editor add symbols C2022 - 003
+			this.tbZoom = new System.Windows.Forms.TextBox();
 			this.btnSave = new System.Windows.Forms.Button();
 			this.btnCancel = new System.Windows.Forms.Button();
 			this.SuspendLayout();
@@ -99,7 +99,7 @@ namespace ctlXMLEditLib
 			this.tbZoom.Location = new System.Drawing.Point(24, 16);
 			this.tbZoom.Multiline = true;
 			this.tbZoom.Name = "tbZoom";
-			this.tbZoom.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical; // RO Editor add symbols C2022 - 003
+			this.tbZoom.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
 			this.tbZoom.Size = new System.Drawing.Size(576, 392);
 			this.tbZoom.TabIndex = 0;
 			// 
@@ -149,4 +149,3 @@ namespace ctlXMLEditLib
 		
 	}
 }
-

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs

@@ -200,11 +200,7 @@ using System.Xml.Schema;
 using System.Text;
 using RODBInterface;
 using Org.Mentalis.Files;
-using System.Windows;
-using System.Text.RegularExpressions;
-using System.Linq;
-using Volian.Base.Library;
-
+//using IniFileIO;
 
 
 
@@ -225,7 +221,6 @@ namespace ctlXMLEditLib
 	///	  
 	///    
 	/// </summary>
-
 	public class ctlXMLEdit : System.Windows.Forms.UserControl
 	{
 		/// <summary>
@@ -242,12 +237,12 @@ namespace ctlXMLEditLib
 		private bool dosaveflag;
 		private VlnXmlElement editelem;
 		private XmlDocument editdoc;
-		private roRichTextBox zoomtextbox;
+		private TextBox zoomtextbox;
 		// the following is used for handling images. Note that if we want to have more
 		// than one image defined in an ro, this should be become a list.
-		private roRichTextBox GraphicsFiletextbox;
-		private roRichTextBox GraphicsWdtextbox;
-		private roRichTextBox GraphicsHttextbox;
+		private TextBox GraphicsFiletextbox;
+		private TextBox GraphicsWdtextbox;
+		private TextBox GraphicsHttextbox;
 		private System.Windows.Forms.Button btnFindFile;
 		private string GraphicsText;
 		private ToolTip zmtooltip;
@@ -270,19 +265,6 @@ namespace ctlXMLEditLib
 		private GroupBox pcGrpBox = null;
 		/** end C2021-026 **/
 
-		public string _RO_IDEN;
-		public string RO_IDEN
-		{
-			get
-			{
-				return _RO_IDEN;
-			}
-			set
-			{
-				_RO_IDEN = value;
-			}
-		}
-
 		// use this struct to define attributes for the text box fields, storing
 		// the pattern, radio button association, required field flag, etc.
 		struct TextBoxAttrTag
@@ -329,19 +311,10 @@ namespace ctlXMLEditLib
 			public string GetParentHTId { get { return parenthtid; } }
 			public void SetParentHTId(string id) { this.parenthtid = id; }
 		}
-		private roRichTextBox _TextBoxFocus;  // RO Editor add symbols C2022 - 003
-		public roRichTextBox TextBoxFocus
-		{
-			get { return _TextBoxFocus; }
-			set
-			{
-				_TextBoxFocus = value;
-			}
-		}
+
 		public ctlXMLEdit(VlnXmlElement myelem, XmlSchema myschema, ArrayList reqfields, ArrayList fldsWithApplic, string [] pckids)
 		{
 			// This call is required by the Windows.Forms Form Designer.
-
 			InitializeComponent();
 			FieldsWithApplic = fldsWithApplic;
 			PCChildren = pckids; //C2021-026 list of Parent/Child children
@@ -386,12 +359,11 @@ namespace ctlXMLEditLib
 			// Set required fields based on list. (can add message later).
 			SetRequiredFields(reqfields);
 			dosaveflag=true;
-			RO_IDEN = myelem.GetAccPageIDTemplate();
 		}
 
 		// set the required fields tag on those fields which are included in the passed
 		// in required fields list.
-		private void DoSet(roRichTextBox hwnd, string msg) // RO Editor add symbols C2022 - 003
+		private void DoSet(TextBox hwnd, string msg)
 		{
 			if (hwnd == null) return;
 			if (hwnd.Tag != null)
@@ -406,7 +378,7 @@ namespace ctlXMLEditLib
 		private void SetRequiredFields(ArrayList reqfields)
 		{
 			Object o;
-			roRichTextBox hwnd;
+			TextBox hwnd;
 			string field, msg;
 			int indx;
 			foreach (string strfld in reqfields)
@@ -425,15 +397,15 @@ namespace ctlXMLEditLib
 					o = myHT[field+"a"];
 					if (o != null)   // set all combo types required, the checker
 					{
-						DoSet((roRichTextBox)o,msg);
-						DoSet((roRichTextBox)myHT[field+"b"],msg);
-						DoSet((roRichTextBox)myHT[field+"c"],msg);
-						DoSet((roRichTextBox)myHT[field+"d"],msg);
+						DoSet((TextBox)o,msg);
+						DoSet((TextBox)myHT[field+"b"],msg);
+						DoSet((TextBox)myHT[field+"c"],msg);
+						DoSet((TextBox)myHT[field+"d"],msg);
 					}
 				}
 				else if (o != null)
 				{
-					hwnd = (roRichTextBox) o;
+					hwnd = (TextBox) o;
 					if (hwnd.Tag != null)
 					{
 						TextBoxAttrTag tag = (TextBoxAttrTag) hwnd.Tag;
@@ -447,7 +419,7 @@ namespace ctlXMLEditLib
 		
 		// C2021-026 If this is a Parent/Child field that has no value saved in the database
 		//           then use the parent's value and display it as grey colored text.
-		private void GetDefaultParentValue(roRichTextBox tb, XmlNode node, string chldName)
+		private void GetDefaultParentValue(TextBox tb, XmlNode node, string chldName)
 		{
 			XmlNode parentNode = null;
 			// PCChildren contains a list strings reprenting the Children setup in the current Working Draft Parent/Child property
@@ -491,23 +463,21 @@ namespace ctlXMLEditLib
 		private void DisplayFieldContents(XmlNode node)
 		{
 			Object o;
-			roRichTextBox hwnd;
+			TextBox hwnd;
 			XmlNode nd;
 			// if we have an image, check it for validity, i.e. file exists, etc.??
 			foreach (string str in myHT.Keys)
 			{
 				o = myHT[str];
-				hwnd = (roRichTextBox) o;
+				hwnd = (TextBox) o;
 				nd = node.SelectSingleNode(str);
 				// if not found with just the string, search the tree.
 				if (nd==null)nd = node.SelectSingleNode("*/"+str);
 				if (nd == null || nd.InnerText.Length==0) // B2024-004 use Parent value if Child text length is zero
 					GetDefaultParentValue(hwnd, node, str); // C2021-026 Parent/Child Field has no value so use parent's value
 				else
-				{
-
-					hwnd.Text = Regex.Replace(nd.InnerText, @"\\u([0-9]{1,4})\?", m => Convert.ToChar(int.Parse(m.Groups[1].Value)).ToString());   // set the field's text from XML
-					Size size = hwnd.Size;
+				{	
+					hwnd.Text = nd.InnerText;   // set the field's text from XML
 
 					// check if this window has a button name as part of its tag. If
 					// so it's a combo type & the radio button/visibility may need to
@@ -576,7 +546,7 @@ namespace ctlXMLEditLib
 			// height/width data of the image.
 			if (GraphicsFiletextbox != null && GraphicsFiletextbox.Text != "") UpdateHtWd();
 		}
-		public roRichTextBox GetGraphicsFiletextbox()
+		public TextBox GetGraphicsFiletextbox()
 		{
 			return GraphicsFiletextbox;
 		}
@@ -615,13 +585,13 @@ namespace ctlXMLEditLib
 		{
 			dosaveflag=false;
 			mysavexml=false;
-			roRichTextBox hwnd;
+			TextBox hwnd;
 			// first, clear out all of the text boxes.
 
 			foreach (string str in myHT.Keys)
 			{
 				object o = myHT[str];
-				hwnd = (roRichTextBox) o;
+				hwnd = (TextBox) o;
 				hwnd.Text = "";
 				TextBoxAttrTag tag = (TextBoxAttrTag) hwnd.Tag;
 				RadioButton radio;
@@ -653,7 +623,7 @@ namespace ctlXMLEditLib
 		//          to the parent's value, then clear the child's textbox so that nothing is saved
 		//          to the database.  This allow us to know that a specific value was not set
 		//          for this Parent/Child child
-		private void RemovePCChildTextIfSameAsParent(XmlNode node, roRichTextBox tb, string chldName)
+		private void RemovePCChildTextIfSameAsParent(XmlNode node, TextBox tb, string chldName)
 		{
 			XmlNode parentNode = null;
 			// if this is a child node get the parent's value
@@ -690,35 +660,18 @@ namespace ctlXMLEditLib
 		// true if success, false if fail.
 		// Note that the Parent and Child XML node variables below are not coding for Parent/Child Applicabily Fields
 		public bool SaveData()
-		
 		{
 			if (mysavexml) 
 			{				
-				roRichTextBox hwnd;
+				TextBox hwnd;
 				TextBoxAttrTag tag;
 				string imgdate;
 
 				//go thru the hash table to get textboxes. Find the ones that have text.
-				foreach (string str in myHT.Keys)  // RO Editor add symbols C2022 - 003
+				foreach (string str in myHT.Keys)
 				{
 					object o = myHT[str];
-					hwnd = (roRichTextBox) o;
-
-					StringBuilder result1 = new StringBuilder();
-					char[] chrAry = hwnd.Text.ToCharArray();
-					foreach (int chr in chrAry)
-					{
-						if (chr > 166)
-						{
-							result1.Append($"\\u{(int)chr}?");
-						}
-						else
-						{
-							result1.Append((char)chr);
-						}
-					}
-					hwnd.Text = result1.ToString();
-
+					hwnd = (TextBox) o;
 					imgdate = null;
 					// if this is a required field and there is no text, put out an error
 					// message and get out of here.
@@ -835,7 +788,6 @@ namespace ctlXMLEditLib
 			return (false);
 		}
 
-
 		#region Component Designer generated code
 		/// <summary>
 		/// Required method for Designer support - do not modify 
@@ -906,7 +858,7 @@ namespace ctlXMLEditLib
 		//  'normalizedString') or a multiline text box(type is 'string'). Also, a radio 
 		//  button is passed in if this was called to handle an element within a combo type.
 		//  This button is saved for a given text box so that initialization of these combo types can occur.
-		private string DisplayXmlSchemaSimpleType(XmlSchemaSimpleType simpleType, roRichTextBox mytextbox, RadioButton radio, 
+		private string DisplayXmlSchemaSimpleType(XmlSchemaSimpleType simpleType, TextBox mytextbox, RadioButton radio, 
 			bool img, string imgname)
 		{
 			// set up for text box tag, which stores whether field is required and
@@ -936,17 +888,12 @@ namespace ctlXMLEditLib
 						if (getannot.IndexOf("Lines")>=0)
 						{
 							GraphicsHttextbox = mytextbox;
-							
-							Size size = GraphicsHttextbox.Size;
 							mytextbox.LostFocus += new System.EventHandler(this.GraphicsHt_lostfocus);
-
 						}
 						if (getannot.IndexOf("Character")>=0)
 						{
 							GraphicsWdtextbox = mytextbox;
-							
 							mytextbox.LostFocus += new System.EventHandler(this.GraphicsWd_lostfocus);
-							
 						}
 					}
 				}
@@ -957,17 +904,14 @@ namespace ctlXMLEditLib
 			{
 				// A Schema Type Restriction is used to define single or multi-line boxes.
 				XmlSchemaSimpleTypeRestriction myRestrictions = (XmlSchemaSimpleTypeRestriction) simpleType.Content;
-				if (myRestrictions.BaseTypeName.Name == "normalizedString")
-				{
+				if (myRestrictions.BaseTypeName.Name == "normalizedString") 
 					mytextbox.Multiline = false;
-					mytextbox.Size = new Size(300, 40);
-				}
 				else
 				{
 					mytextbox.Multiline = true;
-					mytextbox.AcceptsTab = true;
+					mytextbox.AcceptsReturn = true;
 					mytextbox.Height = (int) mytextbox.Font.GetHeight() * 4;
-					mytextbox.ScrollBars = RichTextBoxScrollBars.Vertical;
+					mytextbox.ScrollBars = ScrollBars.Vertical;
 					zmtooltip.SetToolTip(mytextbox, "Press Shift F2 To Zoom");
 				}
 
@@ -1048,8 +992,7 @@ namespace ctlXMLEditLib
 			radio.CheckedChanged += new System.EventHandler(this.radiocheckchg);
 			gbox.Controls.Add(radio);
 
-			roRichTextBox tb = new roRichTextBox();
-			Size size3 = tb.Size;
+			TextBox tb = new TextBox();
 			tb.Location = new Point(boxx+20, y+25);
 			if (!first) tb.Visible = false;
 			myHT.Add(element.Name,tb);
@@ -1058,7 +1001,7 @@ namespace ctlXMLEditLib
 			// the groupbox.
 			Controls.Add(tb);
 			tb.TextChanged += new System.EventHandler(this.textbox_change);
-			tb.GotFocus += new System.EventHandler(this.currentTextBox);
+			tb.GotFocus += new System.EventHandler(this.textbox_zoombtn);
 			tb.KeyDown += new KeyEventHandler(MyOnKeyDown);
 			gbox.Contains(tb);
 			// the following will set attributes on the text boxes such as maxlength, multiline, etc.
@@ -1201,9 +1144,8 @@ namespace ctlXMLEditLib
 			}
 			else
 			{
-				roRichTextBox mytextbox;
-				mytextbox = new roRichTextBox();
-				Size size3 = mytextbox.Size;
+				TextBox mytextbox;
+				mytextbox = new TextBox();
 				mytextbox.Location = new Point(screenx+indent, screeny);
 				string tFieldName = (pcChildIdx == 0) ? CvtUserFldToFld(element.Name) : CvtUserFldToFld(pcChildFldName);
 				mytextbox.Name = tFieldName;
@@ -1213,7 +1155,7 @@ namespace ctlXMLEditLib
 				screeny = screeny + 10;
 				mytextbox.TextChanged += new System.EventHandler(this.textbox_change);
 				mytextbox.Validating += new System.ComponentModel.CancelEventHandler(this.textbox_Validating);
-				mytextbox.GotFocus += new System.EventHandler(this.currentTextBox);
+				mytextbox.GotFocus += new System.EventHandler(this.textbox_zoombtn);
 				mytextbox.KeyDown += new KeyEventHandler(MyOnKeyDown);
 				if (pcChildIdx > 0)
 				{
@@ -1250,18 +1192,9 @@ namespace ctlXMLEditLib
 		// the following is needed to load the control.
 		private void ctlXMLEdit_Load(object sender, System.EventArgs e)
 		{
-
+		
 		}
-
-
-		public delegate void ctlXMLEditEvent(object sender, ctlXMLEditEventArgs args); // RO Editor add symbols C2022 - 003 for turning off symbols btn for RO ID field.
-		public event ctlXMLEditEvent EnableDisableSymbolsBtn;
-		private void OnEnableDisableSymbolsBtn(ctlXMLEditEventArgs args)
-		{
-			if (EnableDisableSymbolsBtn != null)
-				EnableDisableSymbolsBtn(this, args);
-		}
-
+		
 		// when data in a text box has changed, flag it (except for when this
 		// happens during loading of original data). This flag will be used
 		// later to know whether to save data.
@@ -1277,7 +1210,7 @@ namespace ctlXMLEditLib
 		//           When leaving the textbox
 		private void txtBox_Leave(object sender, EventArgs e)
 		{
-			roRichTextBox tb = sender as roRichTextBox;
+			TextBox tb = sender as TextBox;
 			string dfTxt = "";
 			try
 			{
@@ -1286,7 +1219,7 @@ namespace ctlXMLEditLib
 				{
 					object o = myHT[parentid];
 					if (o != null)
-						dfTxt = (o as roRichTextBox).Text; // set to use the parent's value (default)				
+						dfTxt = (o as TextBox).Text; // set to use the parent's value (default)				
 				}
 				else
                 {
@@ -1294,7 +1227,7 @@ namespace ctlXMLEditLib
 					string parName = pcGrpBox.Name.Substring(5);
 					object o = myHT[parName];
 					if (o != null)
-						dfTxt = (o as roRichTextBox).Text; // set to use the parent's value (default)
+						dfTxt = (o as TextBox).Text; // set to use the parent's value (default)
 				}
 			}
             catch 
@@ -1302,7 +1235,7 @@ namespace ctlXMLEditLib
 				string parName = pcGrpBox.Name.Substring(5);
 				object o = myHT[parName];
 				if (o != null)
-					dfTxt = (o as roRichTextBox).Text; // set to use the parent's value (default)
+					dfTxt = (o as TextBox).Text; // set to use the parent's value (default)
 			}
 
 			if (dosaveflag) mysavexml = true;
@@ -1318,7 +1251,7 @@ namespace ctlXMLEditLib
 		//           so clear the textbox so that user can enter the value for that child
 		private void txtBox_Enter(object sender, EventArgs e)
 		{
-			roRichTextBox tb = sender as roRichTextBox;
+			TextBox tb = sender as TextBox;
 			if (tb.ForeColor == SystemColors.GrayText) // currently no value set - using parent's value
 			{
 				tb.Text = "";
@@ -1331,7 +1264,7 @@ namespace ctlXMLEditLib
 		private void radiocheckchg(object sender, System.EventArgs e)
 		{
 			RadioButton btnsel = (RadioButton) sender;
-			roRichTextBox assocbox;
+			TextBox assocbox;
 			string btntext, str;
 
 			if(dosaveflag)mysavexml = true;
@@ -1344,7 +1277,7 @@ namespace ctlXMLEditLib
 			str = btnsel.Name.Replace(btntext,"");
 			object o = myHT[str];
 			if (o == null) return;
-			assocbox = (roRichTextBox) o;
+			assocbox = (TextBox) o;
 			// make the text box visible if checked, otherwise, invisible
 			assocbox.Visible = btnsel.Checked;
 			// C2021-026 show or hide the Parent/Child appicability group box
@@ -1366,7 +1299,7 @@ namespace ctlXMLEditLib
 								c.Visible = vsblState; // show or hide the lable inside the group box
 								object oo = myHT[c.Name];
 								if (oo != null)
-									(oo as roRichTextBox).Visible = vsblState; // show or hide the associated text box
+									(oo as TextBox).Visible = vsblState; // show or hide the associated text box
 							}
 					}
 				}
@@ -1458,7 +1391,7 @@ namespace ctlXMLEditLib
 
 		// The following can be used to validate the text, i.e. check the text against
 		// the pattern. this needs written yet (5/16/02)
-		private void MyValidatingCode(roRichTextBox tb)
+		private void MyValidatingCode(TextBox tb)
 		{
 			//get the text box's tag which contains a flag for whether this is required &
 			//if it has a pattern. If it has a pattern, validate the field against the pattern.
@@ -1487,33 +1420,20 @@ namespace ctlXMLEditLib
 		}
 
 		// save which box we're on, for zoom processing.
-		private void currentTextBox(object sender, System.EventArgs e)
+		private void textbox_zoombtn(object sender, System.EventArgs e)
 		{
-			roRichTextBox textbox = (roRichTextBox) sender;
+			TextBox textbox = (TextBox) sender;
 			if (textbox.Multiline == true || textbox == GraphicsFiletextbox) 
 				zoomtextbox = textbox;
 			else
 				zoomtextbox = null;
-
-			TextBoxFocus = textbox;
-
-			string RO_IDENDITY = RO_IDEN.Substring(1, RO_IDEN.Length - 2); // RO Editor add symbols C2022 - 003 for turning off symbols btn for RO ID.
-			if (textbox.Name == RO_IDENDITY)
-			{
-				OnEnableDisableSymbolsBtn(new ctlXMLEditEventArgs(DisplaySymBolBtn:false));
-			}
-			else
-			{
-				OnEnableDisableSymbolsBtn(new ctlXMLEditEventArgs(DisplaySymBolBtn:true));
-			}
-
 		}
 
 		private void textbox_Validating(object sender, System.ComponentModel.CancelEventArgs e)
 		{ 
 			try
 			{
-				MyValidatingCode((roRichTextBox) sender);
+				MyValidatingCode((TextBox) sender);
 			}
 
 			catch(Exception ex)
@@ -1539,18 +1459,11 @@ namespace ctlXMLEditLib
 				}
 				btnZoom_click(null, null);
 			}
-			if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text))
-			{
-				if (((kea.Modifiers & Keys.ControlKey) == Keys.ControlKey) && kea.KeyCode == Keys.V)
-				{
-					roRichTextBox o = (roRichTextBox)objSender;
-					o.rchtxtBox_KeyDown(objSender, RO_IDEN);
-				}
-			}
 		}
-
+		
 		public void btnZoom_click(object sender, System.EventArgs e)
 		{
+			//TextBox tb = (TextBox) sender;
 			TextBoxAttrTag tag;
 			bool doimage = false;
 			if (zoomtextbox.Tag != null)
@@ -1594,7 +1507,7 @@ namespace ctlXMLEditLib
 		// file local & keep width/height of file proportional.
 		private void GraphicText_lostfocus(object sender, System.EventArgs e)
 		{
-			roRichTextBox fnamebox = (roRichTextBox) sender;
+			TextBox fnamebox = (TextBox) sender;
 			if (fnamebox.Text != "" && fnamebox.Modified == true)
 			{
 				FileInfo ifi = new FileInfo(fnamebox.Text);
@@ -1803,7 +1716,7 @@ namespace ctlXMLEditLib
 		// if changed height, calculate associated width
 		private void GraphicsHt_lostfocus(object sender, System.EventArgs e)
 		{
-			roRichTextBox ht = (roRichTextBox) sender;
+			TextBox ht = (TextBox) sender;
 			if (ht.Modified == true)
 			{
 				try
@@ -1820,7 +1733,7 @@ namespace ctlXMLEditLib
 		// if changed width, calculate associated height
 		private void GraphicsWd_lostfocus(object sender, System.EventArgs e)
 		{
-			roRichTextBox wd = (roRichTextBox) sender;
+			TextBox wd = (TextBox) sender;
 			if (wd.Modified == true)
 			{
 				try
@@ -1975,7 +1888,7 @@ namespace ctlXMLEditLib
 	 * and overload a couple of it's functions in order to use it.
 	 * - called in CalculatePromsDate() above.
 	 */ 
-	public class ThisTimeZone : TimeZone
+		public class ThisTimeZone : TimeZone
 	{
 		private TimeZone curTZ;
 		public TimeSpan SpanTZ;
@@ -2016,31 +1929,5 @@ namespace ctlXMLEditLib
 			return curTZ.GetDaylightChanges(year);
 		}
 	}
-
-	public class ctlXMLEditEventArgs : EventArgs // RO Editor add symbols C2022 - 003 for turning off symbols btn for RO ID.
-	{
-		public ctlXMLEditEventArgs() {; }
-		public ctlXMLEditEventArgs(bool DisplaySymBolBtn)
-		{
-			_DisplaySymBolBtn = DisplaySymBolBtn;
-		}
-		private bool _DisplaySymBolBtn;
-
-		public bool DisplaySymBolBtn
-		{
-			get { return _DisplaySymBolBtn; }
-			set { _DisplaySymBolBtn = value; }
-		}
-	}
-
-	public enum E_FontStyle : byte
-	{
-		FS_NONE = 0,
-		FS_BOLD = 0x01,
-		FS_UNDERLINE = 0x02,
-		FS_ITALIC = 0x04,
-		FS_SUPERSCRIPT = 0x08,
-		FS_SUBSCRIPT = 0x10
-	}
 }
 

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEditLib.csproj

@@ -126,9 +126,6 @@
     <Reference Include="System.Xml">
       <Name>System.XML</Name>
     </Reference>
-    <Reference Include="Volian.Base.Library">
-      <HintPath>..\..\..\Volian.Base.Library\bin\Debug\Volian.Base.Library.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs">
@@ -140,12 +137,6 @@
     <Compile Include="ImageDialog.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="roRichTextBox.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="roRichTextBox.Designer.cs">
-      <DependentUpon>roRichTextBox.cs</DependentUpon>
-    </Compile>
     <Compile Include="ZoomDialog.cs">
       <SubType>Form</SubType>
     </Compile>

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/roRichTextBox.Designer.cs

@@ -1,40 +0,0 @@
-
-namespace ctlXMLEditLib
-{
-	partial class roRichTextBox
-	{
-		/// <summary> 
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary> 
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Component Designer generated code
-
-		/// <summary> 
-		/// Required method for Designer support - do not modify 
-		/// the contents of this method with the code editor.
-		/// </summary>
-		System.Windows.Forms.AutoScaleMode AutoScaleMode;
-		private void InitializeComponent()
-		{
-		
-		components = new System.ComponentModel.Container();
-		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-		}
-
-		#endregion
-	}
-}

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/roRichTextBox.cs

@@ -1,100 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using Volian.Base.Library;
-
-namespace ctlXMLEditLib
-{
-	public partial class roRichTextBox : RichTextBox  // C2022-003 Symbols in RO Editor.  Customized RichTextBox for RO Editor.
-	{
-		public roRichTextBox()
-		{
-			InitializeComponent();
-		}
-		private string _RtfPrefix;  // contains Font table and styles (bold/underline/italics) for rtb from step style
-		public string RtfPrefixForSymbols
-		{
-			get
-			{
-				//B2020-100 RHM Use SelectionFont rather than the font from the format file.
-				StringBuilder selectedRtfSB = new StringBuilder();
-				AddFontTable(selectedRtfSB, FormatFont, true);
-				_RtfPrefix = selectedRtfSB.ToString();
-				return _RtfPrefix + @"\f1\fs" + 10 * 2 + " ";
-			}
-		}
-		public void InsertSymbol( int symbcode)
-		{
-			int position = this.SelectionStart;
-			string sym = symbcode < 256 ? ((char)symbcode).ToString() : string.Format(@"\u{0}", symbcode);
-			this.SelectedRtf = RtfPrefixForSymbols + sym + @"}";
-			Select(position, -1);
-			Select(position + 1, 0);
-		}
-		public void rchtxtBox_KeyDown(object sender,string RO_IDEN) // C2022-003 code used to prevent a symbol from being inserted into RO ID.
-		{
-			bool symFlg = false;
-
-			roRichTextBox o = (roRichTextBox)sender;
-			if (o.Name == RO_IDEN)
-			{
-				if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text))
-				{
-					string clpBrd = Clipboard.GetText();
-					if (clpBrd.Any(c => c > 166))
-					{
-						MessageBox.Show("Symbols are not allowed in the field. Clipbroad: '" + clpBrd + "'");
-						Clipboard.Clear();
-					}
-				}
-			}
-		}
-		private static void AddFontTable(StringBuilder selectedRtfSB, Font myFont, bool isFixed)
-		{
-			StringBuilder sbbeg = new StringBuilder();
-			StringBuilder sbend = new StringBuilder();
-			if (myFont.Bold)
-			{
-				sbbeg.Append(@"\b");
-				sbend.Append(@"\b0");
-			}
-			if (myFont.Underline)
-			{
-				sbbeg.Append(@"\ul");
-				sbend.Insert(0, @"\ulnone");
-			}
-			if (myFont.Italic)
-			{
-				sbbeg.Append(@"\i");
-				sbend.Insert(0, @"\i0");
-			}
-				// RO Editor add symbols C2022-003
-			selectedRtfSB.Append(@"{\rtf1\ansi\ansicpg1252\deff0\deflang1033{\fonttbl{\f0\fnil\fcharset2 " + myFont.FontFamily.Name + @";}"); 
-				selectedRtfSB.Append(@"{\f1\fnil\fcharset0 FreeMono;}}{\colortbl ;\red255\green0\blue0;\red0\green0\blue255;}");  // FreeMono is now used for symbols display. 
-			selectedRtfSB.Append("\r\n");
-			selectedRtfSB.Append(@"\viewkind4\uc1\pard" + sbbeg.ToString() + @"\fs" + Convert.ToInt32(myFont.SizeInPoints * 2).ToString() + @" "); 
-		}
-		private Font _FormatFont;
-		public Font FormatFont
-		{
-			get
-			{
-				if (_FormatFont == null)
-				{
-					Font formatFont;
-					formatFont = Font;
-					_FormatFont = formatFont;
-				}
-				return _FormatFont;
-			}
-			set { _FormatFont = value; }
-		}
-	}
-}
-

PROMS/RoAccessToSql/GlobalSuppressions.cs

@@ -1,8 +0,0 @@
-// This file is used by Code Analysis to maintain SuppressMessage
-// attributes that are applied to this project.
-// Project-level suppressions either have no target or are given
-// a specific target and scoped to a namespace, type, member, etc.
-
-using System.Diagnostics.CodeAnalysis;
-
-[assembly: SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Not modifying Naming Styles")]

PROMS/RoAccessToSql/Program.cs

@@ -1,4 +1,7 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace RoAccessToSql

PROMS/RoAccessToSql/RoAccessToSql.cs

@@ -1,10 +1,16 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Data;
 using System.IO;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 using System.Data.SqlClient;
 using System.Data.OleDb;
+using Volian.Base.Library;
 
 [assembly: log4net.Config.XmlConfigurator(Watch = true)]
 
@@ -27,11 +33,25 @@ namespace RoAccessToSql
 	public partial class RoAccessToSql : Form
 	{
 		private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-
-        public string MSAccessPath { get; set; } = null;
-        public string SqlServerName { get; set; } = null;
-        public string SqlDatabaseName { get; set; } = null;
-        readonly bool _Initializing = false;
+		private string _MSAccessPath = null;
+		public string MSAccessPath
+		{
+			get { return _MSAccessPath; }
+			set { _MSAccessPath = value; }
+		}
+		private string _SqlServerName = null;
+		public string SqlServerName
+		{
+			get { return _SqlServerName; }
+			set { _SqlServerName = value; }
+		}
+		private string _SqlDatabaseName = null;
+		public string SqlDatabaseName
+		{
+			get { return _SqlDatabaseName; }
+			set { _SqlDatabaseName = value; }
+		}
+		bool _Initializing = false;
 
 		public RoAccessToSql(string[] args)
 		{
@@ -46,7 +66,7 @@ namespace RoAccessToSql
 				}
 				else if (parm.StartsWith("/sqldb="))
 				{
-					SqlDatabaseName = $"{parm.Substring(7)}_RO";
+					SqlDatabaseName = parm.Substring(7) + "_RO";
 				}
 				else if (parm.StartsWith("/server="))
 				{
@@ -72,7 +92,7 @@ namespace RoAccessToSql
 			if (UserInRoEditor()) this.Close();
 			tbSqlDbName.Text = SqlDatabaseName;
 			_TmpFileForConnectStr = Path.GetTempPath();
-			_TmpFileForConnectStr += @"\PromsConnect.txt";
+			_TmpFileForConnectStr = _TmpFileForConnectStr + @"\PromsConnect.txt";
 			File.Delete(_TmpFileForConnectStr);
 			_Initializing = false;
 		}
@@ -80,10 +100,10 @@ namespace RoAccessToSql
 		private bool UserInRoEditor()
 		{
 			FileInfo fiown = null;
-            FileStream fsown;
-            // The following code was taken from the roeditor. It uses the 'RoEditor.own' file to assure that
-            // no one is in the roeditor. This file is located in the microsoft access database directory.
-            try
+			FileStream fsown = null;
+			// The following code was taken from the roeditor. It uses the 'RoEditor.own' file to assure that
+			// no one is in the roeditor. This file is located in the microsoft access database directory.
+			try
 			{
 				string filename = MSAccessPath + @"\RoEditor.own";
 				fiown = new FileInfo(filename);
@@ -99,7 +119,7 @@ namespace RoAccessToSql
 					fsown = fiown.Open(FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
 					TextReader tr1 = new StreamReader(fsown);
 					string who1 = tr1.ReadToEnd();
-					MessageBox.Show($"{ex.Message}\r\n\r\n{who1}", "RO Editor In Use", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+					MessageBox.Show(ex.Message + "\r\n\r\n" + who1, "RO Editor In Use", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
 				}
 				fsown = fiown.Open(FileMode.OpenOrCreate, FileAccess.Read, FileShare.ReadWrite);
 				TextReader tr = new StreamReader(fsown);
@@ -122,8 +142,8 @@ namespace RoAccessToSql
 				tw.WriteLine("Current User:  {0}, Date and Time Started:  {1}", Environment.UserName.ToUpper(), DateTime.Now.ToString("MM/dd/yyyy @ hh:mm"));
 				tw.Flush();
 			}
-			catch (IOException)
-            {
+			catch (IOException ex)
+			{
 				fsown = fiown.Open(FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
 				TextReader tr = new StreamReader(fsown);
 				string who = tr.ReadToEnd();
@@ -134,20 +154,25 @@ namespace RoAccessToSql
 			}
 			return false;
 		}
-
-        public static string ErrorLogFileName { get; set; }
-        // make error log file name (uses same logic as proms error log)
-        static bool ChangeLogFileName(string AppenderName, string NewFilename)
+		static string _ErrorLogFileName;
+		public static string ErrorLogFileName
+		{
+			get { return _ErrorLogFileName; }
+			set { _ErrorLogFileName = value; }
+		}
+		// make error log file name (uses same logic as proms error log)
+		static bool ChangeLogFileName(string AppenderName, string NewFilename)
 		{
 			log4net.Repository.ILoggerRepository RootRep;
 			RootRep = log4net.LogManager.GetRepository();
 			foreach (log4net.Appender.IAppender iApp in RootRep.GetAppenders())
 			{
 				if (iApp.Name.CompareTo(AppenderName) == 0
-				&& iApp is log4net.Appender.FileAppender fApp)
-                {
+				&& iApp is log4net.Appender.FileAppender)
+				{
+					log4net.Appender.FileAppender fApp = (log4net.Appender.FileAppender)iApp;
 					string folderPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
-					fApp.File = $@"{folderPath}\VEPROMS\{($"{Volian.Base.Library.VlnSettings.GetCommand("prefix", "")}_").TrimStart("_".ToCharArray())}{NewFilename}";
+					fApp.File = folderPath + @"\VEPROMS\" + (Volian.Base.Library.VlnSettings.GetCommand("prefix", "") + "_").TrimStart("_".ToCharArray()) + NewFilename;
 					ErrorLogFileName = fApp.File;
 					fApp.ActivateOptions();
 					return true;
@@ -164,7 +189,7 @@ namespace RoAccessToSql
 				if (Directory.Exists(fbd.SelectedPath))
 					tbAccessPath.Text = fbd.SelectedPath;
 				else
-					MessageBox.Show($"Path doesn't exist {tbAccessPath.Text}");
+					MessageBox.Show("Path doesn't exist " + tbAccessPath.Text);
 			}
 		}
 		// Convert the data
@@ -187,7 +212,7 @@ namespace RoAccessToSql
 		{
 			DateTime dtSunday = DateTime.Now.AddDays(-((int)DateTime.Now.DayOfWeek));
 
-			ChangeLogFileName("LogFileAppender", $"{SqlDatabaseName} {dtSunday:yyyyMMdd} ErrorLog.txt");
+			ChangeLogFileName("LogFileAppender", SqlDatabaseName + " " + dtSunday.ToString("yyyyMMdd") + " ErrorLog.txt");
 			_MyLog.InfoFormat("\r\nSession Beginning\r\n<===={0}[SQL:{1:yyMM.ddHH}]====== User: {2}/{3} Started {4} ===============>{5}"
 				, Application.ProductVersion, RevDate, DateTime.Now, Environment.UserDomainName, Environment.UserName, DateTime.Now.ToString("dddd MMMM d, yyyy h:mm:ss tt"), "");
 		}
@@ -204,7 +229,7 @@ namespace RoAccessToSql
 					if (sqlConnection.State == ConnectionState.Open)
 					{
 						// now try to open access db:
-						string strDatabaseConnectionCommand = $"Provider=Microsoft.ACE.OLEDB.12.0;Password=\"\";User ID=Admin;Data Source={MSAccessPath}\\ROMaster.mdb;Mode=Share Deny None;Extended Properties=\"\";Jet OLEDB:System database=\"\";Jet OLEDB:Registry Path=\"\";Jet OLEDB:Database Password=\"\";Jet OLEDB:Engine Type=5;Jet OLEDB:Database Locking Mode=1;Jet OLEDB:Global Partial Bulk Ops=2;Jet OLEDB:Global Bulk Transactions=1;Jet OLEDB:New Database Password=\"\";Jet OLEDB:Create System Database=False;Jet OLEDB:Encrypt Database=False;Jet OLEDB:Don't Copy Locale on Compact=False;Jet OLEDB:Compact Without Replica Repair=False;Jet OLEDB:SFP=False";
+						string strDatabaseConnectionCommand = "Provider=Microsoft.ACE.OLEDB.12.0;Password=\"\";User ID=Admin;Data Source=" + MSAccessPath + "\\ROMaster.mdb;Mode=Share Deny None;Extended Properties=\"\";Jet OLEDB:System database=\"\";Jet OLEDB:Registry Path=\"\";Jet OLEDB:Database Password=\"\";Jet OLEDB:Engine Type=5;Jet OLEDB:Database Locking Mode=1;Jet OLEDB:Global Partial Bulk Ops=2;Jet OLEDB:Global Bulk Transactions=1;Jet OLEDB:New Database Password=\"\";Jet OLEDB:Create System Database=False;Jet OLEDB:Encrypt Database=False;Jet OLEDB:Don't Copy Locale on Compact=False;Jet OLEDB:Compact Without Replica Repair=False;Jet OLEDB:SFP=False";
 						using (OleDbConnection accessConnection = new OleDbConnection(strDatabaseConnectionCommand))
 						{
 							try
@@ -226,13 +251,13 @@ namespace RoAccessToSql
 					}
 					else
 					{
-						_MyLog.Error($"SQL Connection is not open. Check connection string: {tbSqlDbName.Text}");
-						MessageBox.Show($"Check connection string: {tbSqlDbName.Text}", "SQL Connection is not open.");
+						_MyLog.Error("SQL Connection is not open. Check connection string: " + tbSqlDbName.Text);
+						MessageBox.Show("Check connection string: " + tbSqlDbName.Text, "SQL Connection is not open.");
 					}
 				}
 				catch (SqlException ex) 
 				{
-					_MyLog.Error($"SQL Connection is not open. Check connection string: {tbSqlDbName.Text}");
+					_MyLog.Error("SQL Connection is not open. Check connection string: " + tbSqlDbName.Text);
 					MessageBox.Show(ex.Message, "Unknown error when migrating RO data from MS Access to SQL");
 				}
 			}
@@ -249,10 +274,11 @@ namespace RoAccessToSql
 			lastTimeDbs = ProgressBarUpdate(pBarDbs, null, 0, 1, 0, 0, lastTimeDbs, false);
 			lastTimeRos = ProgressBarUpdate(pBarROs, null, 0, maxCntRo, 0, 0, lastTimeRos, false);
 			lastTimeDbs = ProgressBarUpdate(pBarDbs, "ROMaster Table", 0, 5, 0, 1, lastTimeDbs, false);
-            OleDbCommand command = new OleDbCommand("select * from ROMaster", accessConnection);
-            OleDbDataReader reader = command.ExecuteReader();
-            // Do access's romaster table first so that the list of other tables to process is found.  While doing this, migrate this table's data.
-            int cntRo = 0;
+			OleDbDataReader reader = null;
+			OleDbCommand command = new OleDbCommand("select * from ROMaster", accessConnection);
+			reader = command.ExecuteReader();
+			// Do access's romaster table first so that the list of other tables to process is found.  While doing this, migrate this table's data.
+			int cntRo = 0;
 			int cntDb = 0;
 			int maxCntDb = 0;
 			while (reader.Read())				// reading from Access Database
@@ -277,12 +303,13 @@ namespace RoAccessToSql
 					maxCntDb++;
 				}
 			}
-			ProgressBarUpdate(pBarROs, "ROMaster", 0, maxCntRo, maxCntRo, 1, lastTimeRos, true);
+			lastTimeRos = ProgressBarUpdate(pBarROs, "ROMaster", 0, maxCntRo, maxCntRo, 1, lastTimeRos, true);
 			lastTimeDbs = ProgressBarUpdate(pBarDbs, null, 0, maxCntDb, 0, 0, lastTimeDbs, false);
 			reader.Close();
-
-            // now migrate all the tables that were found
-            foreach (string tableName in allTables)
+			reader = null;
+			
+			// now migrate all the tables that were found
+			foreach (string tableName in allTables)
 			{
 				lastTimeRos = DateTime.Now;
 				cntRo = 0;
@@ -291,7 +318,7 @@ namespace RoAccessToSql
 				lastTimeRos = ProgressBarUpdate(pBarROs, null, 0, maxCntRo, 0, 0, lastTimeRos, true);
 				lastTimeDbs = ProgressBarUpdate(pBarDbs, allTablesText[cntDb], 0, maxCntDb, cntDb, 1, lastTimeDbs, false);
 				command = null;
-				command = new OleDbCommand($"select * from {tableName}", accessConnection);
+				command = new OleDbCommand("select * from " + tableName, accessConnection);
 				reader = command.ExecuteReader();
 				while (reader.Read())			// read all of the records from the current access table
 				{
@@ -311,7 +338,7 @@ namespace RoAccessToSql
 				reader = null;
 				lastTimeRos = ProgressBarUpdate(pBarROs, tableName, 0, maxCntRo, maxCntRo, 1, lastTimeRos, false);
 			}
-			ProgressBarUpdate(pBarDbs, allTablesText[maxCntDb - 1], 0, maxCntDb, maxCntDb, 1, lastTimeDbs, false);
+			lastTimeDbs = ProgressBarUpdate(pBarDbs, allTablesText[maxCntDb - 1], 0, maxCntDb, maxCntDb, 1, lastTimeDbs, false);
 			pBarDbs.Text = "Referenced Object Tables Migration Completed";
 			pBarROs.Text = "Referenced Objects Migration Completed";
 			btnConvert.Enabled = false;
@@ -330,7 +357,7 @@ namespace RoAccessToSql
 				string dt = string.Format("{0:yyyyMMddHHmmss}", System.DateTime.Now);
 				string strInsert = "INSERT INTO ROMaster (RecID, RecType, ModDateTime, Info) ";
 				// note that '8' for rectype flags database converted:
-				strInsert = $"{strInsert} VALUES ('09999999', 8, '{dt}', '{_SqlConnectStr}');";
+				strInsert = strInsert + " VALUES ('09999999', 8, '" + dt + "', '" + _SqlConnectStr + "');";
 				OleDbCommand command = new OleDbCommand(strInsert, accessConnection);
 				reader = command.ExecuteReader();
 				if (reader.Read()) return;
@@ -340,7 +367,7 @@ namespace RoAccessToSql
 				MessageBox.Show(e.Message, "Error on insert to flag migration completed");
 			}
 		}
-		private readonly string _TmpFileForConnectStr = null;
+		private string _TmpFileForConnectStr = null;
 		private void WriteSqlPathToTempFile()
 		{
 			System.IO.File.WriteAllText(_TmpFileForConnectStr, _SqlConnectStr);
@@ -348,12 +375,13 @@ namespace RoAccessToSql
 		// the following is used to update the progress bars, it finds how many records are in a table.
 		private int GetRecordCountForTable(string tableName, OleDbConnection accessConnection)
 		{
-            int retcnt = 100;
+			OleDbDataReader reader = null;
+			int retcnt = 100;
 			try
 			{
-				OleDbCommand command = new OleDbCommand($"SELECT COUNT (RecID) as cnt FROM {tableName}", accessConnection);
-                OleDbDataReader reader = command.ExecuteReader();
-                if (reader.Read())
+				OleDbCommand command = new OleDbCommand("SELECT COUNT (RecID) as cnt FROM " + tableName, accessConnection);
+				reader = command.ExecuteReader();
+				if (reader.Read())
 				{
 					retcnt = reader.GetInt32(0);
 				}
@@ -365,8 +393,7 @@ namespace RoAccessToSql
 			}
 			return retcnt;
 		}
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "Keeping min for Debugging")]
-        DateTime ProgressBarUpdate(DevComponents.DotNetBar.Controls.ProgressBarX pbi, string msg, int min, int max, int progress, int flag, DateTime lastUpdateDisplay, bool doTimeCheck)
+		DateTime ProgressBarUpdate(DevComponents.DotNetBar.Controls.ProgressBarX pbi, string msg, int min, int max, int progress, int flag, DateTime lastUpdateDisplay, bool doTimeCheck)
 		{
 			if (flag == 0)		// setup
 				pbi.Maximum = max;
@@ -385,13 +412,11 @@ namespace RoAccessToSql
 		{
 			try
 			{
-                SqlCommand command = new SqlCommand
-                {
-                    Connection = sqlConnection,
-                    CommandType = CommandType.StoredProcedure,
-                    CommandText = "insertAllRectypes"
-                };
-                command.Parameters.AddWithValue("@RecType", RecType);
+				SqlCommand command = new SqlCommand();
+				command.Connection = sqlConnection;
+				command.CommandType = CommandType.StoredProcedure;
+				command.CommandText = "insertAllRectypes";
+				command.Parameters.AddWithValue("@RecType", RecType);
 				if (AccPageID == null || AccPageID == "")
 					command.Parameters.AddWithValue("@AccPageID", string.Empty);
 				else
@@ -403,8 +428,9 @@ namespace RoAccessToSql
 				command.Parameters.AddWithValue("@ModDateTime", ModDateTime);
 				using (SqlDataReader reader = command.ExecuteReader())
 				{
-                }
-                command = null;
+					bool success = true;
+				}
+				command = null;
 			}
 			catch (Exception ex)
 			{
@@ -412,15 +438,32 @@ namespace RoAccessToSql
 				_MyLog.Error(msg, ex);
 			}
 		}
-        private void btnExit_Click(object sender, EventArgs e) => this.Close();
-        // the user selected the button to test the sql connection string
-        private void btnTestConnect_Click(object sender, EventArgs e) => TestConnection(true);
-
-        public static DateTime RevDate { get; set; } = DateTime.MinValue;
-        public static string RevDescription { get; set; } = "Unknown";
-        // This is called to test the sql connection, either from the button when pressed by user, or from the convert button, before
-        // the conversion is done. See below for what is checked
-        private bool TestConnection(bool notifyUser)
+		private void btnExit_Click(object sender, EventArgs e)
+		{
+			this.Close();
+		}
+		// the user selected the button to test the sql connection string
+		private void btnTestConnect_Click(object sender, EventArgs e)
+		{
+			TestConnection(true);
+		}
+		// the RevDate & RevDescription are found in a stored procedure, vesp_GetSQLCodeRevision, in the sql database.  These get updated each
+		// time a revision is made to the sql database using ROFixes.sql script.
+		private static DateTime _RevDate = DateTime.MinValue;
+		public static DateTime RevDate
+		{
+			get { return _RevDate; }
+			set { _RevDate = value; }
+		}
+		private static string _RevDescription = "Unknown";
+		public static string RevDescription
+		{
+			get { return _RevDescription; }
+			set { _RevDescription = value; }
+		}
+		// This is called to test the sql connection, either from the button when pressed by user, or from the convert button, before
+		// the conversion is done. See below for what is checked
+		private bool TestConnection(bool notifyUser)
 		{
 			// The following conditions must be true in order to migrate the ro data to sql. Only the first condition can be
 			//  tested in this executable since the roall database is interfaced to by the roeditor & the program that migrates the data.
@@ -442,14 +485,12 @@ namespace RoAccessToSql
 						connection.Open();
 						if (connection.State == ConnectionState.Open)
 						{
-                            // now see if there is an roall table
-                            SqlCommand command = new SqlCommand
-                            {
-                                Connection = connection,
-                                CommandType = CommandType.Text,
-                                CommandText = "(SELECT count(*) FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[ROALL]') AND type in (N'U'))"
-                            };
-                            using (SqlDataReader reader = command.ExecuteReader())
+							// now see if there is an roall table
+							SqlCommand command = new SqlCommand();
+							command.Connection = connection;
+							command.CommandType = CommandType.Text;
+							command.CommandText = "(SELECT count(*) FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[ROALL]') AND type in (N'U'))";
+							using (SqlDataReader reader = command.ExecuteReader())
 							{
 								if (reader.Read())
 								{
@@ -468,13 +509,11 @@ namespace RoAccessToSql
 							{
 								// now see if there are stored procedures:
 								command = null;   // reset command
-                                command = new SqlCommand
-                                {
-                                    Connection = connection,
-                                    CommandType = CommandType.Text,
-                                    CommandText = "(SELECT count(*) FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[deleteByROTable]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)"
-                                };
-                                using (SqlDataReader reader = command.ExecuteReader())
+								command = new SqlCommand();
+								command.Connection = connection;
+								command.CommandType = CommandType.Text;
+								command.CommandText = "(SELECT count(*) FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[deleteByROTable]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)";
+								using (SqlDataReader reader = command.ExecuteReader())
 								{
 									if (reader.Read())
 									{
@@ -494,13 +533,11 @@ namespace RoAccessToSql
 							{
 								// now test that the roall table is empty:
 								command = null;   // reset command
-                                command = new SqlCommand
-                                {
-                                    Connection = connection,
-                                    CommandType = CommandType.Text,
-                                    CommandText = "SELECT count(*) FROM roall"
-                                };
-                                using (SqlDataReader reader = command.ExecuteReader())
+								command = new SqlCommand();
+								command.Connection = connection;
+								command.CommandType = CommandType.Text;
+								command.CommandText = "SELECT count(*) FROM roall";
+								using (SqlDataReader reader = command.ExecuteReader())
 								{
 									if (reader.Read())
 									{
@@ -520,18 +557,16 @@ namespace RoAccessToSql
 							{
 								// now test that the database version is ok
 								command = null;   // reset command
-                                command = new SqlCommand
-                                {
-                                    Connection = connection,
-                                    CommandType = CommandType.StoredProcedure,
-                                    CommandText = "vesp_GetSQLCodeRevision"
-                                };
-                                using (SqlDataReader reader = command.ExecuteReader())
+								command = new SqlCommand();
+								command.Connection = connection;
+								command.CommandType = CommandType.StoredProcedure;
+								command.CommandText = "vesp_GetSQLCodeRevision";
+								using (SqlDataReader reader = command.ExecuteReader())
 								{
 									if (reader.Read())
 									{
-										RevDate = reader.GetDateTime(0);
-										RevDescription = reader.GetString(1);
+										_RevDate = reader.GetDateTime(0);
+										_RevDescription = reader.GetString(1);
 										dbsuc = true;
 									}
 									else
@@ -547,13 +582,13 @@ namespace RoAccessToSql
 					}
 					catch (SqlException ex)
 					{
-						if (notifyUser) MessageBox.Show($"Connection failed: {ex}", "Connection Failed");
+						if (notifyUser) MessageBox.Show("Connection failed: " + ex, "Connection Failed");
 					}
 				}
 			}
 			catch (Exception ex)
 			{
-				if (notifyUser) MessageBox.Show($"Connection failed: {ex}", "Connection Failed");
+				if (notifyUser) MessageBox.Show("Connection failed: " + ex, "Connection Failed");
 			}
 
 			if (notifyUser && success) MessageBox.Show("You have been successfully connected to the database!", "Connection Succeeded");

PROMS/RoAccessToSql/RoAccessToSql.csproj

@@ -66,7 +66,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="RoAccessToSql.cs">
       <SubType>Form</SubType>
     </Compile>

PROMS/SQL/ClientSpecific/BNPP_CoverPageConsolidation.sql

@@ -1,147 +0,0 @@
- /*****************************************************************************
-   Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
-       Copyright 2026 - Volian Enterprises, Inc. All rights reserved.
-*****************************************************************************/
-
--- =============================================
--- Author:		Matthew Schill
--- Create date: 03/20/2026
--- Description:	Script to consolidate Cover Pages for Barakah
---  by Converting multi-unit procedures with Cover Pages
---  to use 1 Library Document Cover Page
--- =============================================
-
- select Contents.ContentID
- 	  , Contenttext = Contents.Text
-	  , Items.ItemID
- 	  , tblDocuments.DocID
- 	  , ParentContentID
- 	  , ParentItemID
- 	  , LibTitle = ISNULL(LibTitle,'')
- 	  , numLibCP
- 	  , numCP
- 	  ,BaseFlag = 0
- INTO #tmpUpdate
- from Contents 
- inner join Entries on Contents.ContentID = Entries.ContentID
- inner join tblDocuments on tblDocuments.DocID = Entries.DocID
- inner join Items on Items.ContentID = Contents.ContentID
- outer apply
- (select ParentContentID=ContentID, ParentItemID = PItm.ItemID
-  FROM dbo.vefn_ParentItems(Items.ItemID) PItm
-  where PItm.ItemID <> Items.ItemID
- ) parent
- outer apply
- (select numLibCP = Count(*)
-  FROM dbo.vefn_ChildItems(ParentItemID) PItm
-  INNER JOIN Contents on Contents.ContentID = PItm.ContentID
-  INNER JOIN Entries on Contents.ContentID = Entries.ContentID
-  INNER JOIN tblDocuments on tblDocuments.DocID = Entries.DocID
-  where PItm.ItemID <> ParentItemID
-  AND Contents.text like 'Cover Page%' and ISNULL(tblDocuments.LibTitle,'') <> ''
- ) childWithLibTitle
- outer apply
- (select numCP = Count(*)
-  FROM dbo.vefn_ChildItems(ParentItemID) PItm
-  INNER JOIN Contents on Contents.ContentID = PItm.ContentID
-  where PItm.ItemID <> ParentItemID
-  AND Contents.text like 'Cover Page%'
- ) child
- where Contents.text like 'Cover Page%'
- order by ParentContentID asc, CASE WHEN ISNULL(LibTitle,'') <> '' THEN 1 ELSE 2 END asc, Contents.Text asc
-
- UPDATE #tmpUpdate SET BaseFlag = 1 where LibTitle <> '' and numLibCP = 1
-
- UPDATE #tmpUpdate SET BaseFlag = CASE WHEN tU.LibTitle <> '' THEN 1 ELSE 2 END FROM #tmpUpdate tU
- where BaseFlag = 0 AND tU.ContentID IN
- (
- Select ContentID FROM
- (SELECT sub.ContentID,
-        row_number() OVER(PARTITION BY sub.ParentContentID ORDER BY CASE WHEN ISNULL(sub.LibTitle,'') <> '' THEN 1 ELSE 2 END asc, sub.Contenttext asc) as pos
-      FROM #tmpUpdate sub
-     ) x
- WHERE x.pos = 1
- )
-
- declare @Cont TABLE
- (
- 	ContentID int,
- 	ItemID int,
- 	xConfig xml
- )
- insert into @Cont
- SELECT tU.ContentID, ItemID, xConfig = CAST(tblContents.config AS xml) FROM 
- tblContents
- INNER JOIN 
- #tmpUpdate tU ON tU.ContentID = tblContents.ContentID
- where tU.BaseFlag > 0
-
- Update @Cont Set  xConfig.modify('delete //MasterSlave') From @Cont;
-
- 	Update tblContents SET Text = 'Cover Page', Config = CAST(xConfig AS varchar(max)), 
- 	   DTS = GETDATE(), UserID = 'CPVolian2026'
- 	FROM 
- 	@Cont CNT INNER JOIN 
- 	tblContents ON CNT.ContentID = tblContents.ContentID;
- 
-    --Update items PreviousIds
-	UPDATE tblItems Set PreviousID = IdToSwapTO.ItemID
-	FROM
-	tblItems
-	INNER JOIN
-    #tmpUpdate tU ON tblItems.PreviousID = tU.ItemID AND tU.BaseFlag = 0
- 	INNER JOIN #tmpUpdate IdToSwapTO ON IdToSwapTO.ParentContentID = tU.ParentContentID AND IdToSwapTO.BaseFlag IN (1,2) 
-
- 	UPDATE tblItems Set DeleteStatus = 1, DTS = GETDATE(), UserID = 'CPVolian2026'
- 	FROM
- 	#tmpUpdate tU INNER JOIN 
- 	tblItems ON tU.ContentID = tblItems.ContentID
- 	WHERE tU.BaseFlag = 0;
- 
- 	UPDATE tblContents Set DeleteStatus = 1, DTS = GETDATE(), UserID = 'CPVolian2026'
- 	FROM
- 	#tmpUpdate tU INNER JOIN 
- 	tblContents ON tU.ContentID = tblContents.ContentID
- 	WHERE tU.BaseFlag = 0;
-
- 	DELETE FROM
-	tblEntries
-	FROM
-	tblEntries
-	INNER JOIN 
- 	#tmpUpdate tU ON tU.ContentID = tblEntries.ContentID
- 	WHERE tU.BaseFlag in (0,2);
- 
- 	INSERT INTO [dbo].[tblEntries]
- 			   ([ContentID]
- 			   ,[DocID]
- 			   ,[DTS]
- 			   ,[UserID]
- 			   ,[DeleteStatus])
- 	SELECT
- 		DISTINCT tU.ContentID,
- 		766,  -- docid 766 "Cover Page 1"
- 		GETDATE(),
- 		'CPVolian2026',
- 		0
- 	FROM
- 	#tmpUpdate tU 
- 	INNER JOIN 
- 	@Cont CNT ON tU.ContentID = CNT.ContentID
- 	WHERE tU.BaseFlag = 2;
-
- drop table #tmpUpdate;
-
-IF (@@Error = 0) SELECT '[Barakah Cover Page Consolidation] Succeeded'
-ELSE SELECT '[Barakah Cover Page Consolidation] Error'
-go
-
-
-
-
-
-
-
-
-
-

PROMS/SQL/ClientSpecific/BNPP_CoverPageConsolidation_Test.sql

@@ -1,263 +0,0 @@
- 
--- =============================================
--- Author:		Matthew Schill
--- Create date: 03/20/2026
--- Description:	Script to consolidate Cover Pages for Barakah
---  by Converting multi-unit procedures with Cover Pages
---  to use 1 Library Document Cover Page
--- =============================================
-
- ----@isTest = 0 will change data
- ----@isTest = 1 for internal testing (no data will be changed)
-DECLARE  @isTest bit = 1;
-
- ----Per Cover Page, pull how many cover pages
- ----Each Cover Page's procedure has
- ----and how many of those are library documents
- select Contents.ContentID
- 	  , Contenttext = Contents.Text
-	  , Items.ItemID
- 	  , tblDocuments.DocID
- 	  , ParentContentID
- 	  , ParentItemID
- 	  , LibTitle = ISNULL(LibTitle,'')
- 	  , numLibCP
- 	  , numCP
- 	  ,BaseFlag = 0
- INTO #tmpUpdate
- from Contents 
- inner join Entries on Contents.ContentID = Entries.ContentID
- inner join tblDocuments on tblDocuments.DocID = Entries.DocID
- inner join Items on Items.ContentID = Contents.ContentID
- outer apply
- (select ParentContentID=ContentID, ParentItemID = PItm.ItemID
-  FROM dbo.vefn_ParentItems(Items.ItemID) PItm
-  where PItm.ItemID <> Items.ItemID
- ) parent
- outer apply
- (select numLibCP = Count(*)
-  FROM dbo.vefn_ChildItems(ParentItemID) PItm
-  INNER JOIN Contents on Contents.ContentID = PItm.ContentID
-  INNER JOIN Entries on Contents.ContentID = Entries.ContentID
-  INNER JOIN tblDocuments on tblDocuments.DocID = Entries.DocID
-  where PItm.ItemID <> ParentItemID
-  AND Contents.text like 'Cover Page%' and ISNULL(tblDocuments.LibTitle,'') <> ''
- ) childWithLibTitle
- outer apply
- (select numCP = Count(*)
-  FROM dbo.vefn_ChildItems(ParentItemID) PItm
-  INNER JOIN Contents on Contents.ContentID = PItm.ContentID
-  where PItm.ItemID <> ParentItemID
-  AND Contents.text like 'Cover Page%'
- ) child
- where Contents.text like 'Cover Page%'
- order by ParentContentID asc, CASE WHEN ISNULL(LibTitle,'') <> '' THEN 1 ELSE 2 END asc, Contents.Text asc
-
---BaseFlag
--- 0 = a Cover Page that will be deleted
--- 1 = is base item (Cover Page will get renamed and applicability set to all)
--- 2 = would be base item but not linked to Lib document (Cover Page will get renamed and applicability set to all + will need linked to library doc)
-
----- If only 1 Library Doc CP for the CP's procedure and this is it, then mark this CP as the one we will keep
- UPDATE #tmpUpdate SET BaseFlag = 1 where LibTitle <> '' and numLibCP = 1
-
----- If multiple Library Document CPs, pick the first one as the one we will keep (BaseFlag = 1)
----- If no Library Document CPs, pick the first one as the one we will repurpose (BaseFlag = 2)
- UPDATE #tmpUpdate SET BaseFlag = CASE WHEN tU.LibTitle <> '' THEN 1 ELSE 2 END FROM #tmpUpdate tU
- where BaseFlag = 0 AND tU.ContentID IN
- (
- Select ContentID FROM
- (SELECT sub.ContentID,
-        row_number() OVER(PARTITION BY sub.ParentContentID ORDER BY CASE WHEN ISNULL(sub.LibTitle,'') <> '' THEN 1 ELSE 2 END asc, sub.Contenttext asc) as pos
-      FROM #tmpUpdate sub
-     ) x
- WHERE x.pos = 1
- )
-
-----BEGIN TESTS--
- if(@isTest = 1)
-  BEGIN
-		select Count(*), 'Should be Zero - not exactly one BaseFlag set to non 0 for each Parent Item' FROM #tmpUpdate TU
-		OUTER APPLY
-		 (select numBaseFlagSet = SUM(CASE WHEN sub.BaseFlag > 0 THEN 1 ELSE 0 END)
-		  FROM #tmpUpdate sub
-		  where sub.ParentContentID = TU.ParentContentID
-		 ) sub
-		where numBaseFlagSet <> 1
-
-		select Count(*), 'Should be Zero - 0 Lib Docs, BaseFlag is 1' FROM #tmpUpdate TU
-		where numLibCP = 0 and BaseFlag = 1
-
-		select Count(*), 'Should be Zero - at least 1 Lib Docs, BaseFlag is 2' FROM #tmpUpdate TU
-		where numLibCP > 0 and BaseFlag = 2
-
-		select Count(*), 'Should be Zero - 1 Lib Docs, BaseFlag not 1 for that Lib doc' FROM #tmpUpdate TU
-		where numLibCP = 1 and LibTitle <> '' and BaseFlag <> 1
-
-		select Count(*), 'Should be Zero - 1 Lib Docs, BaseFlag not 0 for ones without Lib Doc' FROM #tmpUpdate TU
-		where numLibCP = 1 and LibTitle = '' and BaseFlag <> 0
-
-		select Count(*), 'Should be Zero - 1 CP, no Lib Docs, BaseFlag not 2' FROM #tmpUpdate TU
-		where numLibCP = 0 and numCP = 1 and BaseFlag <> 2
-
-		select Count(*), 'Should be Zero - more than 1 Lib Docs, BaseFlag is 1' FROM #tmpUpdate TU
-		where numLibCP = 0 and BaseFlag = 1
-
-		select Count(*), 'Should be Zero - not exactly one BaseFlag set to non 0 for each Parent Item' FROM #tmpUpdate TU
-		OUTER APPLY
-		 (select numBaseFlagSet = SUM(CASE WHEN sub.BaseFlag > 0 THEN 1 ELSE 0 END)
-		  FROM #tmpUpdate sub
-		  where sub.ParentContentID = TU.ParentContentID
-		 ) sub
-		where numBaseFlagSet <> 1
-
-		select Count(*), 'Should be Zero - 0 Lib Docs, BaseFlag is 1' FROM #tmpUpdate TU
-		where numLibCP = 0
-		and BaseFlag = 1
-
-		--all Parents should have exactly 1 Baseflag=1 or BaseFlage = 2
-		select 'Should be No Records where not a BaseFlag 1 or 2' 
-		select NumNotBaseFlag12 = Count(*) 
-		FROM #tmpUpdate TU
-		Group by ParentContentID 
-		HAVING SUM(CASE WHEN BaseFlag in (1,2) THEN 1 ELSE 0 END) <> 1
-
-		select 'Should be No Records where with both a BaseFlag 1 and 2' 
-		select NumBothBaseFlag12 = Count(*) 
-		FROM #tmpUpdate TU
-		Group by ParentContentID 
-		HAVING SUM(BaseFlag) > 2
-
-  END 
-  --END TESTS--
-
---BaseFlag
--- 0 = a Cover Page that will be deleted
--- 1 = is base item (Cover Page will get renamed and applicability set to all)
--- 2 = would be base item but not linked to Lib document (Cover Page will get renamed and applicability set to all + will need linked to library doc)
-
-----Update config for Coverpage 1 to remove <MasterSlave Applicability="1" />
-----from that config
-----cover page 1s
- declare @Cont TABLE
- (
- 	ContentID int,
- 	ItemID int,
- 	xConfig xml
- )
- insert into @Cont
- SELECT tU.ContentID, ItemID, xConfig = CAST(tblContents.config AS xml) FROM 
- tblContents
- INNER JOIN 
- #tmpUpdate tU ON tU.ContentID = tblContents.ContentID
- where tU.BaseFlag > 0
- 
- if(@isTest = 1)
- BEGIN
- 	select WRD='Have Masterslave in xconfig', NumwithMasterSlave = Count(*) FROM @Cont CNT
- 	INNER JOIN 
- 	tblContents ON CNT.ContentID = tblContents.ContentID
- 	where CAST(xConfig AS varchar(max)) like '%MasterSlave%'
- END
- 
- Update @Cont Set  xConfig.modify('delete //MasterSlave') From @Cont;
- 
- if(@isTest = 1)
-  BEGIN
- 	select WRD='None should have Masterslave Removed in xconfig', NumwithMasterSlave = Count(*) FROM @Cont CNT
- 	INNER JOIN 
- 	tblContents ON CNT.ContentID = tblContents.ContentID
- 	where CAST(xConfig AS varchar(max)) like '%MasterSlave%'
-
-	select 'Show Records and how the ids will be re-linked'
-
-	Select tblItems.ItemID, tblItems.ContentID, tblItems.PreviousID, tblContents.Text,
-	PreviousItemID = tU.ItemID, PreviousContentID = tU.ContentID, PreviousText = tUCont.Text,
-	RelinkToItemID = IdToSwapTO.ItemID, RelinkToContentID = IdToSwapTO.ContentID, RelinkToText = IdToSwapTOCont.Text
-	FROM
-	tblItems
-	INNER JOIN
-	tblContents on tblContents.ContentID = tblItems.ContentID
-	INNER JOIN
-    #tmpUpdate tU ON tblItems.PreviousID = tU.ItemID AND tU.BaseFlag = 0
-	INNER JOIN
-	tblContents tUCont on tUCont.ContentID = tU.ContentID
- 	LEFT OUTER JOIN #tmpUpdate IdToSwapTO ON IdToSwapTO.ParentContentID = tU.ParentContentID AND IdToSwapTO.BaseFlag IN (1,2) 
-	LEFT OUTER JOIN tblContents IdToSwapTOCont on IdToSwapTOCont.ContentID = IdToSwapTO.ContentID
-
-  END
- ELSE
- BEGIN
- 	--Update Config for Contents and set Text = 'Cover Page'
- 	Update tblContents SET Text = 'Cover Page', Config = CAST(xConfig AS varchar(max)), 
- 	   DTS = GETDATE(), UserID = 'CPVolian2026'
- 	FROM 
- 	@Cont CNT INNER JOIN 
- 	tblContents ON CNT.ContentID = tblContents.ContentID;
- 
-    --Update items PreviousIds
-	UPDATE tblItems Set PreviousID = IdToSwapTO.ItemID
-	FROM
-	tblItems
-	INNER JOIN
-    #tmpUpdate tU ON tblItems.PreviousID = tU.ItemID AND tU.BaseFlag = 0
- 	INNER JOIN #tmpUpdate IdToSwapTO ON IdToSwapTO.ParentContentID = tU.ParentContentID AND IdToSwapTO.BaseFlag IN (1,2) 
-
- 	--delete where BaseFlag = 0 ---Items,Content,Entries, --set DeleteStatus = 1
- 	--these are ones that will be replaced by a library document
- 	UPDATE tblItems Set DeleteStatus = 1, DTS = GETDATE(), UserID = 'CPVolian2026'
- 	FROM
- 	#tmpUpdate tU INNER JOIN 
- 	tblItems ON tU.ContentID = tblItems.ContentID
- 	WHERE tU.BaseFlag = 0;
- 
- 	UPDATE tblContents Set DeleteStatus = 1, DTS = GETDATE(), UserID = 'CPVolian2026'
- 	FROM
- 	#tmpUpdate tU INNER JOIN 
- 	tblContents ON tU.ContentID = tblContents.ContentID
- 	WHERE tU.BaseFlag = 0;
-
- --delete entries where Baseflag = 2
- --create new entries where Baseflag = 2
- 
- 	DELETE FROM
-	tblEntries
-	FROM
-	tblEntries
-	INNER JOIN 
- 	#tmpUpdate tU ON tU.ContentID = tblEntries.ContentID
- 	WHERE tU.BaseFlag in (0,2);
- 
- 	INSERT INTO [dbo].[tblEntries]
- 			   ([ContentID]
- 			   ,[DocID]
- 			   ,[DTS]
- 			   ,[UserID]
- 			   ,[DeleteStatus])
- 	SELECT
- 		DISTINCT tU.ContentID,
- 		766,  -- docid 766 "Cover Page 1"
- 		GETDATE(),
- 		'CPVolian2026',
- 		0
- 	FROM
- 	#tmpUpdate tU 
- 	INNER JOIN 
- 	@Cont CNT ON tU.ContentID = CNT.ContentID
- 	WHERE tU.BaseFlag = 2;
- 
- END;
-
- drop table #tmpUpdate;
-
-
-
-
-
-
-
-
-
-
-
-

PROMS/SQL/PROMStoCM.sql

@@ -1817,7 +1817,7 @@ ALTER trigger [dbo].[tr_Contents_Delete] on [dbo].[Contents] instead of delete a
 		select ii.ContentID,ii.Number,ii.Text,ii.Type,ii.FormatID,ii.Config,ii.DTS,ii.UserID,ii.DeleteStatus,ii.ActionDTS
 		from tblContents ii inner join deleted dd on dd.ContentID = ii.ContentID
 		where ii.DeleteStatus > 0
-		update ga set ga.contentauditid = (select ISNULL(max(auditid),0) from contentaudits where contentid = ga.contentid and deletestatus = ga.deletestatus)
+		update ga set ga.contentauditid = (select max(auditid) from contentaudits where contentid = ga.contentid and deletestatus = ga.deletestatus)
 		from gridaudits ga join deleted dd on ga.contentid = dd.contentid where ga.contentauditid = 0
 	end
 go

PROMS/TablePicker/TablePicker.cs

@@ -1,4 +1,7 @@
+using System;
 using System.Drawing;
+using System.Collections;
+using System.ComponentModel;
 using System.Windows.Forms;
 
 namespace Accentra.Controls
@@ -8,6 +11,11 @@ namespace Accentra.Controls
 	/// </summary>
 	public class TablePicker : System.Windows.Forms.Form
 	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.Container components = null;
+
 		public TablePicker()
 		{
 			// Activates double buffering
@@ -21,6 +29,21 @@ namespace Accentra.Controls
 			InitializeComponent();
 		}
 
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if(components != null)
+				{
+					components.Dispose();
+				}
+			}
+			base.Dispose( disposing );
+		}
+
 		#region Windows Form Designer generated code
 		/// <summary>
 		/// Required method for Designer support - do not modify
@@ -52,41 +75,82 @@ namespace Accentra.Controls
 		}
 		#endregion
 
-		private readonly Brush BlackBrush = System.Drawing.Brushes.Black;
-		private readonly Brush WhiteBrush = System.Drawing.Brushes.White;
+		private Pen BeigePen = new Pen(Color.Beige, 1);
+		private Brush BeigeBrush = System.Drawing.Brushes.Beige;
+		private Brush GrayBrush = System.Drawing.Brushes.Gray;
+		private Brush BlackBrush = System.Drawing.Brushes.Black;
+		private Brush WhiteBrush = System.Drawing.Brushes.White;
 
-		private readonly Brush Jbrush = System.Drawing.Brushes.LightBlue; 
+		private Brush Jbrush = System.Drawing.Brushes.LightBlue; 
+		//private Brush Jbrush = System.Drawing.Brushes.LightSteelBlue; 
+		//private Brush Jbrush = System.Drawing.Brushes.SteelBlue; 
+		//private Brush Jbrush = System.Drawing.Brushes.PowderBlue;
 
-		private readonly Pen BorderPen = new Pen(SystemColors.ControlDark);
-		private readonly Pen BluePen = new Pen(Color.SlateGray, 1);
+		private Pen BorderPen = new Pen(SystemColors.ControlDark);
+		private Pen BluePen = new Pen(Color.SlateGray, 1);
 
 		private string DispText = "Esc to Cancel";	// Display text
-		private readonly int DispHeight = 40;		// Display ("Table 1x1", "Cancel")
-		private readonly Font DispFont = new Font("Tahoma", 8.25F);
-		private readonly int SquareX = 20;			// Width of squares 
-		private readonly int SquareY = 20;			// Height of squares
+		private int DispHeight = 40;//20;		// Display ("Table 1x1", "Cancel")
+		private Font DispFont = new Font("Tahoma", 8.25F);
+		private int SquareX = 20;			// Width of squares 
+		private int SquareY = 20;			// Height of squares
 		private int SquareQX = 3;			// Number of visible squares (X)
 		private int SquareQY = 3;			// Number of visible squares (Y)
 		private int SelQX = 1;				// Number of selected squares (x)
 		private int SelQY = 1;				// Number of selected squares (y)
 
-        public int MaxRows { get; set; } = -1;
+		private bool bHiding = false;
+		private bool bCancel = true;	// Determines whether to Cancel
 
-        public int MaxCols { get; set; } = -1;
+		// Added my Volian 4/27/11
+		private int _MaxRows = -1;
 
-        /// <summary>
-        /// Returns the number of columns, or the horizontal / X count,
-        /// of the selection.
-        /// </summary>
-        public int SelectedColumns => SelQX;
+		public int MaxRows
+		{
+			get { return _MaxRows; }
+			set { _MaxRows = value; }
+		}
+		private int _MaxCols = -1;
 
-        /// <summary>
-        /// Returns the number of rows, or the vertical / Y count, 
-        /// of the selection.
-        /// </summary>
-        public int SelectedRows => SelQY;
+		public int MaxCols
+		{
+			get { return _MaxCols; }
+			set { _MaxCols = value; }
+		}
 
-        private void TablePicker_Paint(object sender, System.Windows.Forms.PaintEventArgs e) {
+		/// <summary>
+		/// Similar to <code><see cref="DialogResult"/> 
+		/// == <see cref="DialogResult.Cancel"/></code>,
+		/// but is used as a state value before the form
+		/// is hidden and cancellation is finalized.
+		/// </summary>
+		public bool Cancel {
+			get {
+				return bCancel;
+			}
+		}
+
+		/// <summary>
+		/// Returns the number of columns, or the horizontal / X count,
+		/// of the selection.
+		/// </summary>
+		public int SelectedColumns {
+			get {
+				return SelQX;
+			}
+		}
+
+		/// <summary>
+		/// Returns the number of rows, or the vertical / Y count, 
+		/// of the selection.
+		/// </summary>
+		public int SelectedRows {
+			get {
+				return SelQY;
+			}
+		}
+
+		private void TablePicker_Paint(object sender, System.Windows.Forms.PaintEventArgs e) {
 			Graphics g = e.Graphics;
 
 			// First, increment the number of visible squares if the 
@@ -98,8 +162,8 @@ namespace Accentra.Controls
 			if (SquareQX < 7) SquareQX = 7;
 			if (SquareQY < 5) SquareQY = 5;
 
-			if (MaxRows > 0 && SquareQY > MaxRows) SquareQY = MaxRows;
-			if (MaxCols > 0 && SquareQX > MaxCols) SquareQX = MaxCols;
+			if (_MaxRows > 0 && SquareQY > _MaxRows) SquareQY = _MaxRows;
+			if (_MaxCols > 0 && SquareQX > _MaxCols) SquareQX = _MaxCols;
 
 			// Second, expand the dimensions of this form according to the 
 			// number of visible squares.
@@ -113,7 +177,14 @@ namespace Accentra.Controls
 			// the text is left-justified, only the Y (vertical) position
 			// is calculated.
 			int dispY = ((SquareY - 1) * SquareQY) + SquareQY + 4;
-			DispText = $"{SelQY} Row{((SelQY > 1) ? "s" : "")}  {SelQX} Column{((SelQX > 1) ? "s" : "")}\nEsc to Cancel";
+			//if (this.Cancel) {
+			//    DispText = "Esc Key to Cancel";
+			//} else {
+			//    DispText = SelQX.ToString() + " by " + SelQY.ToString() + " Table";
+			//}
+			//DispText = SelQX.ToString() + " by " + SelQY.ToString() + " Table\nEsc Key to Cancel";
+			//DispText = SelQY.ToString() + " Row"+((SelQY>1)?"s by ":" by ") + SelQX.ToString() + " Column"+((SelQX>1)?"s\nEsc Key to Cancel":"\nEsc Key to Cancel");
+			DispText = SelQY.ToString() + " Row" + ((SelQY > 1) ? "s" : "") + "  " + SelQX.ToString() + " Column" + ((SelQX > 1) ? "s" : "")+ "\nEsc to Cancel";
 			g.DrawString(DispText, DispFont, BlackBrush, 3, dispY + 2); 
 
 			// Draw each of the squares and fill with the default color.
@@ -127,6 +198,7 @@ namespace Accentra.Controls
 			// Go back and paint the squares with selection colors.
 			for (int x=0; x<SelQX; x++) {
 				for (int y=0; y<SelQY; y++) {
+					//g.FillRectangle(BeigeBrush, (x*SquareX) + 3, (y*SquareY) + 3, SquareX - 2, SquareY - 2);
 					g.FillRectangle(Jbrush, (x * SquareX) + 3, (y * SquareY) + 3, SquareX - 2, SquareY - 2);
 					g.DrawRectangle(BluePen, (x * SquareX) + 3, (y * SquareY) + 3, SquareX - 2, SquareY - 2);
 				}
@@ -138,6 +210,11 @@ namespace Accentra.Controls
 		/// </summary>
 		private void TablePicker_Deactivate(object sender, System.EventArgs e) {
 
+			// bCancel = true 
+			// and DialogResult = DialogResult.Cancel 
+			// were previously already set in MouseLeave.
+
+			//this.Hide();
 		}
 
 		/// <summary>
@@ -165,24 +242,42 @@ namespace Accentra.Controls
 		/// escaped (canceling) state.
 		/// </summary>
 		private void TablePicker_MouseLeave(object sender, System.EventArgs e) {
+			//if (!bHiding) bCancel = true;
+			//this.DialogResult = DialogResult.Cancel;
+			//this.Invalidate();
 			if (this.DialogResult == DialogResult.None)
 				this.DialogResult = DialogResult.Cancel;
 		}
 
-        /// <summary>
-        /// Cancels the prior cancellation caused by MouseLeave.
-        /// </summary>
-        private void TablePicker_MouseEnter(object sender, System.EventArgs e) => this.Invalidate();
+		/// <summary>
+		/// Cancels the prior cancellation caused by MouseLeave.
+		/// </summary>
+		private void TablePicker_MouseEnter(object sender, System.EventArgs e) {
+			//bHiding = false;
+			//bCancel = false;
+			//this.DialogResult = DialogResult.OK;
+			this.Invalidate();
+		}
 
-        /// <summary>
-        /// Detects that the user made a selection by clicking.
-        /// </summary>
-        private void TablePicker_Click(object sender, System.EventArgs e) => this.DialogResult = DialogResult.OK;
+		/// <summary>
+		/// Detects that the user made a selection by clicking.
+		/// </summary>
+		private void TablePicker_Click(object sender, System.EventArgs e) {
+			//bHiding = true; // Not the same as Visible == false
+			//                // because bHiding suggests that the control
+			//                // is still "active" (not canceled).
+			//this.Hide();
+			this.DialogResult = DialogResult.OK;
+		}
 
-        private void TablePicker_KeyPress(object sender, KeyPressEventArgs e)
+		private void TablePicker_KeyPress(object sender, KeyPressEventArgs e)
 		{
 			if (e.KeyChar == (char)Keys.Escape)
 			{
+				//bHiding = true; // Not the same as Visible == false
+				//// because bHiding suggests that the control
+				//// is still "active" (not canceled).
+				//this.Hide();
 				this.DialogResult = DialogResult.Cancel;
 			}
 		}

PROMS/VEPROMS User Interface/AboutVEPROMS.cs

@@ -1,4 +1,7 @@
 using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
 using System.Windows.Forms;
 using System.Reflection;
 using Volian.Controls.Library;
@@ -21,7 +24,7 @@ namespace VEPROMS
 					string connectionString = Database.VEPROMS_Connection;
 					Match mServer = Regex.Match(connectionString, ".*Data Source=([^;]*).*");
 					_SQLServerName = (mServer.Success) ? mServer.Groups[1].Value : "unknown";
-					if (_SQLServerName.StartsWith(@".\")) _SQLServerName = $@"Local \ {_SQLServerName.Substring(2)}";
+					if (_SQLServerName.StartsWith(@".\")) _SQLServerName = @"Local \ " + _SQLServerName.Substring(2);
 				}
 				return _SQLServerName; 
 			}
@@ -34,7 +37,7 @@ namespace VEPROMS
 			{
 				if (_DatabaseName == null)
 				{
-					_DatabaseName = $"{Database.ActiveDatabase}[SQL:{Database.RevDate:yyMM.ddHH}]";
+					_DatabaseName = string.Format("{0}[SQL:{1:yyMM.ddHH}]", Database.ActiveDatabase, Database.RevDate);
 				}
 				return _DatabaseName; 
 			}
@@ -52,16 +55,26 @@ namespace VEPROMS
 			DateTime buildDateTime = new System.IO.FileInfo(Assembly.GetExecutingAssembly().Location).LastWriteTime;
 			// If the AssemblyConfiguration is "DEMO" then we are running a Demo version
 			string demoTxt = VlnSettings.DemoMode ? "(Demo)": VlnSettings.DebugMode ? "(Debug)" : "(Production)";
-			Text = $"About {AssemblyTitle} {demoTxt}";
-			labelProductName.Text = AssemblyProduct;
-			labelVersion.Text = $"Version {AssemblyVersion}";
-			labelVersionDateTime.Text = $"Build Date:  {buildDateTime}";
-			labelCopyright.Text = $"Copyright © {buildDateTime.Year}. All Rights Reserved.";
-			labelCompanyName.Text = AssemblyCompany;
-			labelCompanyName.Links[0].LinkData = "Volian Enterprises Inc.";
-			labelCompanyName.Links.Add(0,23,"www.volian.com");
-			labelServer.Text = $"SQL Server: {SQLServerName}"; // C2018-015 use static for this info.
-			labelDatabase.Text = $"Database: {DatabaseName}"; // C2018-015 use static for this info.
+			// C2018-015 made this information static so  we can use in meta files
+			//string connectionString = Database.VEPROMS_Connection;
+			//Match mServer = Regex.Match(connectionString,".*Data Source=([^;]*).*");
+			//string server = (mServer.Success)?mServer.Groups[1].Value:"unknown";
+			//if (server.StartsWith(@".\")) server = @"Local \ " + server.Substring(2);
+			//string databaseName = string.Format("{0}[SQL:{1:yyMM.ddHH}]", Database.ActiveDatabase, Database.RevDate);
+			this.Text = String.Format("About {0}", AssemblyTitle + " " + demoTxt);
+			this.labelProductName.Text = AssemblyProduct;
+			this.labelVersion.Text = String.Format("Version {0}", AssemblyVersion);
+			this.labelVersionDateTime.Text = String.Format("Build Date:  {0}", buildDateTime.ToString());
+			this.labelCopyright.Text = String.Format("Copyright © {0}. All Rights Reserved.", buildDateTime.Year.ToString());
+			this.labelCompanyName.Text = AssemblyCompany;
+//			this.textBoxDescription.Text = AssemblyDescription;
+			this.labelCompanyName.Links[0].LinkData = "Volian Enterprises Inc.";
+			this.labelCompanyName.Links.Add(0,23,"www.volian.com");
+			//this.labelServer.Text = string.Format("SQL Server: {0}", server);
+			this.labelServer.Text = string.Format("SQL Server: {0}", SQLServerName); // C2018-015 use static for this info.
+			//if (databaseName == null) databaseName = Regex.Replace(connectionString, "^.*Initial Catalog=([^;]*);.*$", "$1", RegexOptions.IgnoreCase);
+			//this.labelDatabase.Text = string.Format("Database: {0}", databaseName);
+			this.labelDatabase.Text = string.Format("Database: {0}", DatabaseName); // C2018-015 use static for this info.
 		}
 
 		#region Assembly Attribute Accessors
@@ -86,12 +99,24 @@ namespace VEPROMS
 			}
 		}
 
-        public string AssemblyVersion => Assembly.GetExecutingAssembly().GetName().Version.ToString();
+		public string AssemblyVersion
+		{
+			get
+			{
+				return Assembly.GetExecutingAssembly().GetName().Version.ToString();
+			}
+		}
 
-        // C2018-009 used to print the PROMS version number at the top of each PDF page
-        public static string PROMSVersion => Assembly.GetExecutingAssembly().GetName().Version.ToString();
+		// C2018-009 used to print the PROMS version number at the top of each PDF page
+		public static string PROMSVersion
+		{
+			get
+			{
+				return Assembly.GetExecutingAssembly().GetName().Version.ToString();
+			}
+		}
 
-        public string AssemblyDescription
+		public string AssemblyDescription
 		{
 			get
 			{
@@ -137,7 +162,7 @@ namespace VEPROMS
 		private void labelCompanyName_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
 		{
 			// Determine which link was clicked within the LinkLabel.
-			labelCompanyName.Links[0].Visited = true;
+			this.labelCompanyName.Links[0].Visited = true;
 
 			// Display the appropriate link based on the value of the 
 			// LinkData property of the Link object.
@@ -146,17 +171,18 @@ namespace VEPROMS
 			System.Diagnostics.Process.Start(target); // this should start the default web browser
 		}
 
-        private void logoPictureBox_Click(object sender, EventArgs e) => System.Diagnostics.Process.Start(labelCompanyName.Links[0].LinkData as string); // this should start the default web browser
-
-        private void btnViewEULA_Click(object sender, EventArgs e)
+		private void logoPictureBox_Click(object sender, EventArgs e)
 		{
-			string EulaFile = $@"\{VlnSettings.EULAfile}";
+			System.Diagnostics.Process.Start(labelCompanyName.Links[0].LinkData as string); // this should start the default web browser
+		}
+
+		private void btnViewEULA_Click(object sender, EventArgs e)
+		{
+			string EulaFile = string.Format(@"\{0}", VlnSettings.EULAfile);
 			string strEULA = System.Environment.CurrentDirectory + EulaFile;
-            frmViewTextFile ViewFile = new frmViewTextFile(strEULA, RichTextBoxStreamType.PlainText)
-            {
-                Text = "End-User License Agreement"
-            };
-            ViewFile.ShowDialog();
+			frmViewTextFile ViewFile = new frmViewTextFile(strEULA,RichTextBoxStreamType.PlainText);
+			ViewFile.Text = "End-User License Agreement";
+			ViewFile.ShowDialog();
 		}
 
 	}

PROMS/VEPROMS User Interface/BookMarks.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VEPROMS.CSLA.Library;
+
+namespace VEPROMS
+{
+	public class BookMarks
+	{
+		public string Name;
+		public VETreeNode Node;
+
+		public BookMarks()
+		{
+		}
+
+		public BookMarks(string n, VETreeNode o)
+		{
+			Name = n;
+			Node = o;
+		}
+
+		public BookMarks(VETreeNode o)
+		{
+			Name = o.Text;
+			Node = o;
+		}
+
+		public override string ToString()
+		{
+			return Name;
+		}
+	}
+}

PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs

@@ -1,6 +1,11 @@
 using System;
+using System.Collections.Generic;
+using System.ComponentModel;
 using System.Data;
+using System.Drawing;
 using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 using VEPROMS.CSLA.Library;
 
@@ -9,7 +14,10 @@ namespace VEPROMS
     // C2025-027 Annotation Type Filtering
     public partial class dlgAnnotationsSelect : Form
     {
-        public dlgAnnotationsSelect() => InitializeComponent();
+        public dlgAnnotationsSelect()
+        {
+            InitializeComponent();
+        }
 
         public dlgAnnotationsSelect(string userid)
         {
@@ -17,13 +25,30 @@ namespace VEPROMS
             UserID = userid;
         }
 
-        public int MyItemID { get; set; }
-        public string UserID { get; set; }
+        private int _MyItemID;
+        public int MyItemID
+        {
+            get { return _MyItemID; }
+            set { _MyItemID = value; }
+        }
 
-        private void btnSelect_Click(object sender, EventArgs e) => MoveSelectedItems(lstUnselected, lstSelected);
+        private string _UserID;
+        public string UserID
+        {
+            get { return _UserID; }
+            set { _UserID = value; }
+        }
+
+        private void btnSelect_Click(object sender, EventArgs e)
+        {
+            MoveSelectedItems(lstUnselected, lstSelected);
+        }
 
         // Move selected items to lstUnselected.
-        private void btnDeselect_Click(object sender, EventArgs e) => MoveSelectedItems(lstSelected, lstUnselected);
+        private void btnDeselect_Click(object sender, EventArgs e)
+        {
+            MoveSelectedItems(lstSelected, lstUnselected);
+        }
 
         // Move selected items from one ListBox to another.
         private void MoveSelectedItems(ListBox lstFrom, ListBox lstTo)
@@ -65,21 +90,39 @@ namespace VEPROMS
         }
 
         // Enable and disable buttons.
-        private void lst_SelectedIndexChanged(object sender, EventArgs e) => SetButtonsEditable();
+        private void lst_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            SetButtonsEditable();
+        }
         // Save selected list to DB.
-        private void btnUpdate_Click(object sender, EventArgs e) => saveChanges();
+        private void btnUpdate_Click(object sender, EventArgs e)
+        {
+            saveChanges();
+        }
         public class AnnotataionItem
         {
-            private readonly string _NameStr;
-            private readonly int _TypeID;
+            private string _NameStr;
+            private int _TypeID;
 
             public AnnotataionItem(string NameStr, int TypeID)
             {
-                _NameStr = NameStr;
-                _TypeID = TypeID;
+                this._NameStr = NameStr;
+                this._TypeID = TypeID;
+            }
+            public string NameStr
+            {
+                get
+                {
+                    return _NameStr;
+                }
+            }
+            public int TypeID
+            {
+                get
+                {
+                    return _TypeID;
+                }
             }
-            public string NameStr => _NameStr;
-            public int TypeID => _TypeID;
         }
 
         // Enable and disable buttons.
@@ -124,16 +167,16 @@ namespace VEPROMS
                 if (result == DialogResult.Yes)
                 {
                     saveChanges();
-                    Close();
+                    this.Close();
                 }
                 else
                 {
-                    Close();
+                    this.Close();
                 }
             }
             else
             {
-                Close();
+                this.Close();
             }
         }
 

PROMS/VEPROMS User Interface/DlgCloseTabsOrExit.cs

@@ -1,4 +1,12 @@
 using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
 
 namespace VEPROMS
 {
@@ -8,10 +16,19 @@ namespace VEPROMS
 	{
 		private bool _Cancel = true;
 
-        public bool Cancel => _Cancel;
+		public bool Cancel
+		{
+			get { return _Cancel; }
+		}
 
-        public bool ExitPROMS { get; set; }
-        public DlgCloseTabsOrExit(bool isMainWindow, bool hasChildWindows)
+		private bool _ExitPROMS;
+
+		public bool ExitPROMS
+		{
+			get { return _ExitPROMS; }
+			set { _ExitPROMS = value; }
+		}
+		public DlgCloseTabsOrExit(bool isMainWindow, bool hasChildWindows)
 		{
 			InitializeComponent();
 			if (!isMainWindow) 
@@ -29,22 +46,22 @@ namespace VEPROMS
 		private void BtnClsTab_Click(object sender, EventArgs e)
 		{
 			_Cancel = false;
-			ExitPROMS = false;
-			Hide();
+			_ExitPROMS = false;
+			this.Hide();
 		}
 
 		private void BtnExitPROMS_Click(object sender, EventArgs e)
 		{
 			_Cancel = false;
-			ExitPROMS = true;
-			Hide();
+			_ExitPROMS = true;
+			this.Hide();
 		}
 
 		private void btnCancel_Click(object sender, EventArgs e)
 		{
 			_Cancel = true;
-			ExitPROMS = false;
-			Hide();
+			_ExitPROMS = false;
+			this.Hide();
 		}
 	}
 }

PROMS/VEPROMS User Interface/DlgPrintProcedure.cs

@@ -1,21 +1,29 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
 using System.Drawing;
 using System.Text;
 using System.Windows.Forms;
 using System.IO;
 using VEPROMS.CSLA.Library;
 using Volian.Print.Library;
+//using Volian.Controls.Library;
 using Volian.Base.Library;
 using JR.Utils.GUI.Forms;
-using System.Linq;
 
 namespace VEPROMS
 {
 	public partial class DlgPrintProcedure : DevComponents.DotNetBar.Office2007Form
 	{
-        public bool SaveLinks => swtbtnPDFLinks.Value;
-        public int RemoveTrailingHardReturnsAndManualPageBreaks
+		public bool SaveLinks
+		{
+			get 
+			{ 
+				return swtbtnPDFLinks.Value;
+			}
+		}
+		public int RemoveTrailingHardReturnsAndManualPageBreaks
 		{
 			get 
 			{
@@ -28,19 +36,38 @@ namespace VEPROMS
 				return 3; 
 			}
 		}
-        // RHM20150506 Multiline ItemID TextBox
-        public string Prefix { get; set; } = "";
-        public bool OpenAfterCreate  // RHM20150506 Multiline ItemID TextBox
+		private string _Prefix = "";  // RHM20150506 Multiline ItemID TextBox
+		public string Prefix
+		{
+			get { return _Prefix; }
+			set { _Prefix = value; }
+		}
+		public bool OpenAfterCreate  // RHM20150506 Multiline ItemID TextBox
 		{
 			get { return cbxOpenAfterCreate2.Checked; }
 			set { cbxOpenAfterCreate2.Checked = value; }
 		}
+		private SessionInfo _MySessionInfo;
+		public SessionInfo MySessionInfo
+		{
+			get { return _MySessionInfo; }
+			set { _MySessionInfo = value; }
+		}
+		private bool _Automatic;
+		public bool Automatic
+		{
+			get { return _Automatic; }
+			set { _Automatic = value; }
+		}
+		private int _prtSectID = -1;
+		public int PrtSectID
+		{
+			get { return _prtSectID; }
+			set { _prtSectID = value; }
+		}
 
-        public SessionInfo MySessionInfo { get; set; }
-        public bool Automatic { get; set; }
-        public int PrtSectID { get; set; } = -1;
-
-        public bool OverwritePDF
+		private bool _OverwritePDF;
+		public bool OverwritePDF
 		{
 			get { return cbxOverwritePDF2.Checked; }
 			set { cbxOverwritePDF2.Checked = value; }
@@ -58,17 +85,18 @@ namespace VEPROMS
 				swtbtnPDFdtPrefixSuffix.Value = swtbtnPDFdtPrefixSuffix.Enabled = _AllowDateTimePrefixSuffix;
 			}
 		}
-		private readonly DateTime _PrefixSuffixDTS = DateTime.Now; // C2018-033 date/time used for the date/time PDF file prefix and suffix
+		private DateTime _PrefixSuffixDTS = DateTime.Now; // C2018-033 date/time used for the date/time PDF file prefix and suffix
 		private bool _DateTimePrefixSuffixPrintingAllProcedures = true; // C2018-033 to control adding the Date/Time Prefix/Suffix to PFD name when printing All procedures
 		private bool _IncludeWordSecTextInMetafile = true; // C2018-023 so that we can turn off including Word attachment text in metafile
 		private void RunAutomatic()
 		{
 			cbxDebugPagination.Checked = true;
 			cbxDebugText.Checked = true;
-			cbxMetaFile.Checked = true; // C2018-004 create meta file for baseline compares
+      cbxMetaFile.Checked = true; // C2018-004 create meta file for baseline compares
 			_IncludeWordSecTextInMetafile = true;
 			Application.DoEvents();
 			string[] parameters = System.Environment.CommandLine.Split(" ".ToCharArray());
+			bool ranAuto = false;
 			foreach (string parameter in parameters)
 			{
 				if (parameter.ToUpper() == "/NT")
@@ -83,11 +111,11 @@ namespace VEPROMS
 					_IncludeWordSecTextInMetafile = false; // C2018-023 turn off putting Word attachment text in the meta file for baseline compares
 			}
 			CreatePDFs();
-			Close();
+			this.Close();
 		}
-		private readonly DocVersionInfo _DocVersionInfo = null;
-		private readonly bool _AllProcedures;
-		private readonly DocVersionConfig _DocVersionConfig;
+		private DocVersionInfo _DocVersionInfo = null;
+		private bool _AllProcedures;
+		private DocVersionConfig _DocVersionConfig;
 		public string RevNum
 		{
 			get { return txbRevNum.Text; }
@@ -115,8 +143,11 @@ namespace VEPROMS
 					return RevNum + "/" + RevDate;
 			}
 		}
-        public string ProcNum => MyProcedure.DisplayNumber;
-        public string PDFPath
+		public string ProcNum
+		{
+			get { return MyProcedure.DisplayNumber; }
+		}
+		public string PDFPath
 		{
 			get {// B2018-069 Revert to Temporary for Baseline testing
 				if (PromsPrinter.BaselineTesting)
@@ -148,7 +179,7 @@ namespace VEPROMS
 		private bool _CreateButtonClicked = false; // B2020-062 control the toggle of date/time prefix/suffix on pdf file name
 		public DlgPrintProcedure(DocVersionInfo dvi, bool automatic)
 		{
-			Automatic = automatic;
+			_Automatic = automatic;
 			InitializeComponent();
 			_AllProcedures = true;
 			_DocVersionConfig = dvi.DocVersionConfig;
@@ -170,12 +201,14 @@ namespace VEPROMS
 			btnCreatePDF.Text = "Create PDFs";
 			HandleDocVersionSettings();
 			PrepForAllOrOne(false);
+			// don't open all PDFs if doing All Procedures
+			//cbxOpenAfterCreate2.Checked = dvi.DocVersionConfig.Print_AlwaysViewPDFAfterCreate;
 			// C2018-033 added the Prefix / Suffix switch to the expand Additional Settings check
 			expPrnSetting.Expanded = swtbtnBlankPgsForDuplex.Value || swtbtnChgBar.Value || swtbtnGeneratePlacekeeper.Value || swtbtnPDFLinks.Value || swtbtnPROMSVersion.Value || swtbtnWaterMark.Value || swtbtnPDFdtPrefixSuffix.Value;
 		}
 		public DlgPrintProcedure(DocVersionInfo dvi)
 		{
-			Automatic = false;
+			_Automatic = false;
 			InitializeComponent();
 			_AllProcedures = true;
 			_DocVersionConfig = dvi.DocVersionConfig;
@@ -216,12 +249,21 @@ namespace VEPROMS
 			// C2021-063 make the Generate Alarm Point List text checkbox visable in the format flag is set.
 			cbxAlmPtTxt.Visible = !oneProcedure && MyProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.ChkBoxToGeneratePointListText;
 		}
+		private string _UnitNumber;
+		public string UnitNumber
+		{
+			get { return _UnitNumber; }
+			set { _UnitNumber = value; }
+		}
+		private int _UnitIndex;
+		public int UnitIndex
+		{
+			get { return _UnitIndex; }
+			set { _UnitIndex = value; }
+		}
 
-        public string UnitNumber { get; set; }
-        public int UnitIndex { get; set; }
-
-        // C2018-012 - Code Cleanup - redesigned the Print Dialog to include a sliding panel and remplaced check boxes with ON/OFF switches
-        public DlgPrintProcedure(ProcedureInfo pi)
+		// C2018-012 - Code Cleanup - redesigned the Print Dialog to include a sliding panel and remplaced check boxes with ON/OFF switches
+		public DlgPrintProcedure(ProcedureInfo pi)
 		{
 			InitializeComponent();
 			_AllProcedures = false;
@@ -312,9 +354,31 @@ namespace VEPROMS
 				swtbtnWaterMark.Value = false; 
 			else
 				swtbtnWaterMark.Value = true; 
+			// Auto Duplexing on/off - Auto duplex was used only by Point Beach formats These buttons were removed from the dialog
+			//                         There was not print coding to support this format flag
 
+			//if ((_MyProcedure.ActiveParent as DocVersionInfo).ActiveFormat.PlantFormat.FormatData.PrintData.AllowDuplex)
+			//{
+			//	lblAutoDuplexing.Visible = true;
+			//	btnDuplxOff.Visible = true;
+			//	btnDuplxOn.Visible = true;
+			//	if (_DocVersionConfig.Print_DisableDuplex)
+			//		btnDuplxOff.PerformClick();
+			//	else
+			//		btnDuplxOn.PerformClick();
+			//}
+			//else
+			//{
+			//	lblAutoDuplexing.Visible = false;
+			//	btnDuplxOff.Visible = false;
+			//	btnDuplxOn.Visible = false;
+			//}
 			SetCompareVisibility();
-			cbxOrPgBrk.Visible = false; //per Harry
+
+			// default to using OriginalPageBreaks (16bit page breaks) if App.config is set
+			// to true:
+			//cbxOrPgBrk.Visible = VlnSettings.OriginalPageBreak && VlnSettings.DebugMode;
+      cbxOrPgBrk.Visible = false; //per Harry
 			cbxOrPgBrk.Checked = false;
 		}
 
@@ -352,7 +416,13 @@ namespace VEPROMS
 		private Timer _MyTimer;
 		public void SetupForProcedure() // RHM20150506 Multiline ItemID TextBox
 		{
-			if(_DocVersionInfo == null)Text = "Create PDF for " + ProcNum;
+			if(_DocVersionInfo == null)this.Text = "Create PDF for " + ProcNum;
+			// get list of previous pdf files
+			// if no previous pdf file, then get path from frmVersionProperties
+			// dlgSelectFile.InitialDirectory = pdf path from frmVersionProperties
+			//cbxPDF.Text = string.Format(@"{0}\{1}.pdf", _PDFPath, _ProcNum);
+			// General 2 settings
+			//txbPDFLocation.Text = _PDFPath;
 			BuildPDFFileName();
 			ProcedureConfig pc = _MyProcedure.MyConfig as ProcedureConfig;
 			// C2025-033 set which Child procedure is being printed used for PageStyle items
@@ -364,7 +434,7 @@ namespace VEPROMS
 			if (pc != null)
 			{
 				//C2021-062 use the save rev number for all procedures if set, or just use the rev number in the current procedure config
-				RevNum = _NewRevForAllProcs ?? pc.Print_Rev;
+				RevNum = (_NewRevForAllProcs == null) ? pc.Print_Rev : _NewRevForAllProcs;
 				RevDate = pc.Print_RevDate; //== null || pc.Print_RevDate=="" ? DateTime.Today : Convert.ToDateTime(pc.Print_RevDate);
 				ReviewDate = pc.Print_ReviewDate; // == null ? DateTime.Today : Convert.ToDateTime(pc.Print_ReviewDate);
 				 //Now check the format flags to determine if/how the Rev string should be parsed.
@@ -428,6 +498,11 @@ namespace VEPROMS
 			else
 				swtbtnWaterMark.Value = false; // set to None at folder level so set Watermark switch to the off position
 
+			//ppCmbxChgBarPos.DataSource = EnumDetail<PrintChangeBarLoc>.Details();
+			//ppCmbxChgBarPos.DisplayMember = "Description";
+			//ppCmbxChgBarPos.ValueMember = "EValue";
+			//ppCmbxChgBarPos.SelectedIndex = (int)MyProcedure.MyDocVersion.DocVersionConfig.Print_ChangeBarLoc;
+
 			ppCmbxChgBarTxtType.DataSource = EnumDetail<PrintChangeBarText>.Details();
 			ppCmbxChgBarTxtType.DisplayMember = "Description";
 			ppCmbxChgBarTxtType.ValueMember = "EValue";
@@ -440,7 +515,7 @@ namespace VEPROMS
 			bool usesRevDate = _MyProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.DoRevDate || _MyProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.RevDateWithForwardSlash;
 			if (_MyProcedure.Sections != null)
 			{
-				foreach (SectionInfo mysection in _MyProcedure.Sections.OfType<SectionInfo>())
+				foreach (SectionInfo mysection in _MyProcedure.Sections)
 					hasReviewDate |= mysection.ActiveFormat.PlantFormat.HasPageListToken("{REVIEWDATE}");
 			}
 			// Only the New HLP format and the MYA format use this
@@ -460,8 +535,9 @@ namespace VEPROMS
 			if (MyProcedure == null) return;
 			string PDFFilePrefix = _DocVersionConfig.Print_PDFFilePrefix;
 			string PDFFileSuffix = _DocVersionConfig.Print_PDFFileSuffix;
-            PDFDTPrefix dtPre = _DocVersionConfig.Print_PDFdtFilePrefix;
-            PDFDTSuffix dtSuf = _DocVersionConfig.Print_PDFdtFileSuffix;
+			string PDFFileName = "";
+			PDFDTPrefix dtPre = _DocVersionConfig.Print_PDFdtFilePrefix;
+			PDFDTSuffix dtSuf = _DocVersionConfig.Print_PDFdtFileSuffix;
 			if (dtPre != PDFDTPrefix.None) PDFFilePrefix = ""; // incase user entered prefix text but then selected a date/time (in working draft properties)
 			if (dtSuf != PDFDTSuffix.None) PDFFileSuffix = ""; // incase user entered suffix text but then selected a date/time (in working draft properties)
 			// B2020-062 control the toggle of date/time prefix/suffix on pdf file name
@@ -480,17 +556,19 @@ namespace VEPROMS
 				if (dtSuf != PDFDTSuffix.None)
 					PDFFileSuffix = "_" + (_PrefixSuffixDTS.ToString(dtSuf.ToString())).Replace("__", " ").Replace("_", "-");
 			}
-            string PDFFileName;
-            if (ProcNum == string.Empty)
-                PDFFileName = UnitNumber;
-            else
-                PDFFileName = string.Format("{0}", _MyProcedure.PDFNumber);
-
-            if ((PDFFileName ?? "") == "") PDFFileName = "NoProcNumber";
+			if (ProcNum == string.Empty)
+				//txbPDFName.Text = this.UnitNumber + ".pdf";
+				PDFFileName = this.UnitNumber;
+			else
+				//txbPDFName.Text = string.Format("{0}.pdf", _MyProcedure.PDFNumber);
+				PDFFileName = string.Format("{0}", _MyProcedure.PDFNumber);
+			//if (txbPDFName.Text.StartsWith("*"))
+			//    txbPDFName.Text = txbPDFName.Text.Replace("*", this.UnitNumber);
+			if ((PDFFileName ?? "") == "") PDFFileName = "NoProcNumber";
 			if (PDFFileName.StartsWith("*"))
-				PDFFileName = PDFFileName.Replace("*", UnitNumber);
+				PDFFileName = PDFFileName.Replace("*", this.UnitNumber);
 			if (PDFFileName.Contains("?")) PDFFileName = PDFFileName.Replace("?", "_");  // for wcn sys/BM-2xxA??, etc
-			txbPDFName.Text = $"{PDFFilePrefix}{PDFFileName}{PDFFileSuffix}.pdf";
+			txbPDFName.Text = PDFFilePrefix + PDFFileName + PDFFileSuffix + ".pdf";
 		}
 
 		// C2018-033 Enable/disable the switch to control whether to add Prefix and/or Suffix to PDF file name
@@ -507,9 +585,12 @@ namespace VEPROMS
 			swtbtnPDFdtPrefixSuffix.Enabled = hasPrefixSuffix;
 		}
 
-        private void btnCancel_Click(object sender, EventArgs e) => Close();
+		private void btnCancel_Click(object sender, EventArgs e)
+		{
+			this.Close();
+		}
 
-        private void swtbtnChgBar_ValueChanged(object sender, EventArgs e)
+		private void swtbtnChgBar_ValueChanged(object sender, EventArgs e)
 		{
 			// C2019-031 - disable the override change bar grouping when default change bar is set to format default or no change bar
 			cbxOvrrideDefChgBars.Checked = false; // uncheck the override change bar check box inside the grouping
@@ -633,7 +714,7 @@ namespace VEPROMS
 			StringBuilder sb = new StringBuilder();
 			if (MySessionInfo != null)
 			{
-				foreach (ProcedureInfo myProc in _DocVersionInfo.Procedures.OfType<ProcedureInfo>())
+				foreach (ProcedureInfo myProc in _DocVersionInfo.Procedures)
 				{
 					string message = string.Empty;
 					if (!MySessionInfo.CanCheckOutItem(myProc.ItemID, CheckOutType.Procedure, ref message))
@@ -661,14 +742,15 @@ namespace VEPROMS
 			pbPDFsStatus.Maximum = n;
 			pbPDFsStatus.Visible = true;
 			VlnSvgPageHelper.CountInApplProcs = 1;	// B2021-127: BNPPalr - Auto set of serial #, skip Front Matter as per PAL 11/1/21 (set to 1 not 0)
-			Text = string.Format("Processing {0}", _DocVersionInfo.MyFolder.Name);
-			foreach (ProcedureInfo myProc in _DocVersionInfo.Procedures.OfType<ProcedureInfo>())
+			this.Text = string.Format("Processing {0}", _DocVersionInfo.MyFolder.Name);
+			foreach (ProcedureInfo myProc in _DocVersionInfo.Procedures)
 			{
 				string locpdfname = null;		// get pdf file name for later merge code
 				MyProcedure = myProc;
-                // C2021-019: Override Watermark Text, 'waterMarkText' will have whatever watermark text should be printed
-                string waterMarkTextOverride = "";
-                if (MyProcedure.MyConfig is ProcedureConfig procConfig) waterMarkTextOverride = procConfig.GetValue("PSI", "WATERMARKOVERRIDE");
+				// C2021-019: Override Watermark Text, 'waterMarkText' will have whatever watermark text should be printed
+				ProcedureConfig procConfig = MyProcedure.MyConfig as ProcedureConfig;
+				string waterMarkTextOverride = "";
+				if (procConfig != null) waterMarkTextOverride = procConfig.GetValue("PSI", "WATERMARKOVERRIDE");
 				// C2020-002 paper size is now set in the format files - default is Letter
 				Volian.Print.Library.Rtf2Pdf.PaperSize = myProc.ActiveFormat.PlantFormat.FormatData.PDFPageSize.PaperSize;
 				if (myProc.Sections != null)
@@ -690,6 +772,13 @@ namespace VEPROMS
 							pbPDFsStatus.TextVisible = true;
 							pbPDFsStatus.Text = string.Format("Creating PDF for {0} ({1} of {2})", myProc.DisplayNumber, ++i, n);
 							pbPDFsStatus.Value = i;
+							//						this.Text = string.Format("Create PDF for {0} ({1} of {2})", myProc.DisplayNumber, ++i, n);
+
+							// B2021-102 we now get this information in frmPDFStatusForm()
+							//MyProcedure = ProcedureInfo.GetItemAndChildrenByUnit(MyProcedure.ItemID, 0, MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave);
+							// C2018-015 add the procedure tree path and the procedure number and title to the meta file
+							//if (BaselineMetaFile.IsOpen && i == 1) BaselineMetaFile.WriteLine("!! {0}", MyProcedure.SearchDVPath.Replace("\a", " | "));
+							//if (BaselineMetaFile.IsOpen) BaselineMetaFile.WriteLine("!! {0} | {1}", MyProcedure.DisplayNumber, MyProcedure.DisplayText);
 
 							string myPDFPath = GetMultiunitPDFPath();
 							_MergedPdfPath = myPDFPath;     // If Slave, need its subdirectory/unit path for merging
@@ -725,7 +814,14 @@ namespace VEPROMS
 							pbPDFsStatus.TextVisible = true;
 							pbPDFsStatus.Text = string.Format("Creating PDF for {0} ({1} of {2})", myProc.DisplayNumber, ++i, n);
 							pbPDFsStatus.Value = i;
-							
+							//							this.Text = string.Format("Create PDF for {0} ({1} of {2})", myProc.DisplayNumber, ++i, n);
+
+							// B2021-102 we now get this information in frmPDFStatusForm()
+							//MyProcedure = ProcedureInfo.GetItemAndChildrenByUnit(MyProcedure.ItemID, 0, MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave);
+							// C2018-015 add the procedure tree path and the procedure number and title to the meta file
+							//if (BaselineMetaFile.IsOpen && i == 1) BaselineMetaFile.WriteLine("!! {0}", MyProcedure.SearchDVPath.Replace("\a", " | "));
+							//if (BaselineMetaFile.IsOpen) BaselineMetaFile.WriteLine("!! {0} | {1}", MyProcedure.DisplayNumber, MyProcedure.DisplayText);
+
 							// RHM 20120925 Overlay the bottom of the dialog so that cancel button is covered.
 							// B2016-249 Output Procedure to folder associated with Parent Child
 							// B2021-102 put in the using for better memory management
@@ -754,9 +850,18 @@ namespace VEPROMS
 						pbPDFsStatus.TextVisible = true;
 						pbPDFsStatus.Text = string.Format("Creating PDF for {0} ({1} of {2})", myProc.DisplayNumber, ++i, n);
 						pbPDFsStatus.Value = i;
+						//						this.Text = string.Format("Create PDF for {0} ({1} of {2})", myProc.DisplayNumber, ++i, n);
 						// RHM 20120925 Overlay the bottom of the dialog so that cancel button is covered.
 						int profileDepth1 = ProfileTimer.Push(">>>> GetItemAndChildren");
-						
+						// B2021-102 we now get this information in frmPDFStatusForm()
+						//if (MyProcedure.ActiveFormat.PlantFormat.FormatData.TransData.UseTransitionModifier || MyProcedure.ActiveFormat.PlantFormat.FormatData.TransData.UseSpecificTransitionModifier)
+						//	MyProcedure = ProcedureInfo.GetItemAndChildrenByUnit(MyProcedure.ItemID, 0, MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave);
+						//else
+						//	MyProcedure = ProcedureInfo.GetItemAndChildren(MyProcedure.ItemID);
+						//// C2018-015 add the procedure tree path and the procedure number and title to the meta file
+						//if (BaselineMetaFile.IsOpen && i == 1) BaselineMetaFile.WriteLine("!! {0}", MyProcedure.SearchDVPath.Replace("\a", " | "));
+						//if (BaselineMetaFile.IsOpen) BaselineMetaFile.WriteLine("!! {0} | {1}", MyProcedure.DisplayNumber, MyProcedure.DisplayText);
+
 						ProfileTimer.Pop(profileDepth1);
 						// B2021-102 put in the using for better memory management
 						// B2016-249 Output Procedure to folder associated with Parent Child
@@ -829,12 +934,12 @@ namespace VEPROMS
 		private void CreateDebugFiles()
 		{
 			if (cbxDebugPagination.Checked)
-				Volian.Base.Library.DebugPagination.Open($"{PDFPath}\\DebugPagination.txt"); // RHM 20120925 Corrected spelling
+				Volian.Base.Library.DebugPagination.Open(PDFPath + "\\DebugPagination.txt"); // RHM 20120925 Corrected spelling
 			if (cbxDebugText.Checked)
-				Volian.Base.Library.DebugText.Open($"{PDFPath}\\DebugText.txt");
+				Volian.Base.Library.DebugText.Open(PDFPath + "\\DebugText.txt");
 			if (cbxMetaFile.Checked) // C2018-004 create meta file for baseline compares
 			{
-				Volian.Base.Library.BaselineMetaFile.Open($"{PDFPath}\\DebugMeta.txt");
+				Volian.Base.Library.BaselineMetaFile.Open(PDFPath + "\\DebugMeta.txt");
 				// C2018-015 add the PROMS Version, SQL Server, and Database to top of the meta file
 				Volian.Base.Library.BaselineMetaFile.WriteLine("!! Ver {0}  {1} {2}", AboutVEPROMS.PROMSVersion, AboutVEPROMS.SQLServerName, AboutVEPROMS.DatabaseName);
 				// C2018-023 set as to whether we are going to include the Word attment text in the baseline metafile
@@ -870,7 +975,7 @@ namespace VEPROMS
 			if (MyProcedure.MyDocVersion.MultiUnitCount > 1)
 			{
 				VlnSvgPageHelper.CountInApplProcs = 1;
-				foreach (ProcedureInfo pi in MyProcedure.MyDocVersion.Procedures.OfType<ProcedureInfo>())
+				foreach (ProcedureInfo pi in MyProcedure.MyDocVersion.Procedures)
 				{
 					if (pi.ItemID == MyProcedure.ItemID) break;
 					bool includeProc = pi.ApplInclude(SelectedSlave);
@@ -886,14 +991,24 @@ namespace VEPROMS
 			string waterMarkText = (swtbtnWaterMark.Value) ? cbxWaterMark.Text : "None" ; // B2018-124 use text of watermark form drop down list instead of enum value
 			string watermarkColor = "Blue"; // this is the default watermark color
 			frmPDFStatusForm.SetUnitWatermark(MyProcedure, ref waterMarkText, ref watermarkColor); //C2022-004 Unit Designator Watermark
-            string waterMarkTextOverride = "";
-            if (MyProcedure.MyConfig is ProcedureConfig procConfig) waterMarkTextOverride = procConfig.GetValue("PSI", "WATERMARKOVERRIDE");	// C2021-019: override watermark text
+			ProcedureConfig procConfig = MyProcedure.MyConfig as ProcedureConfig;
+			string waterMarkTextOverride = "";
+			if (procConfig != null) waterMarkTextOverride = procConfig.GetValue("PSI", "WATERMARKOVERRIDE");	// C2021-019: override watermark text
 			if (swtbtnWaterMark.Value && waterMarkTextOverride != null && waterMarkTextOverride != "") waterMarkText = waterMarkTextOverride;
 			// Determine change bar settings.  First get from config & then see if override from dialog. 
 			// Also check that format allows override.
 			ChangeBarDefinition cbd = DetermineChangeBarSettings();
 			int profileDepth2 = ProfileTimer.Push(">>>> CreatePdf.GetItemAndChildren");
 
+			// B2021-088 moved this if/else to frmPDFStatusForm() so that the Approval logic will have access to this logic
+			//if (MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave > 0 || MyProcedure.ActiveFormat.PlantFormat.FormatData.TransData.UseTransitionModifier || MyProcedure.ActiveFormat.PlantFormat.FormatData.TransData.UseSpecificTransitionModifier)
+			//	MyProcedure = ProcedureInfo.GetItemAndChildrenByUnit(MyProcedure.ItemID, 0, MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave);
+			//else
+			//	MyProcedure = ProcedureInfo.GetItemAndChildren(MyProcedure.ItemID);
+			// C2018-015 add the procedure tree path and the procedure number and title to the meta file
+			//if (BaselineMetaFile.IsOpen) BaselineMetaFile.WriteLine("!! {0}", MyProcedure.SearchDVPath.Replace("\a"," | "));
+			//if (BaselineMetaFile.IsOpen) BaselineMetaFile.WriteLine("!! {0} | {1}", MyProcedure.DisplayNumber, MyProcedure.DisplayText);
+
 			// B2022-088: Find Doc Ro button not working in Word Sections
 			// Initialize Print Cache 
 			MSWordToPDF.RoPrintCache = new Dictionary<string, ROFSTLookup.rochild>();
@@ -930,7 +1045,7 @@ namespace VEPROMS
 
 			MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
 			MyProcedure.SelectedChildToPrint = 0; // B2023-035 reset
-			Close();
+			this.Close();
 			ShowDebugFiles();
 			ProfileTimer.Pop(profileDepth);
 			ProfileTimer.ShowTimerTable();
@@ -1006,19 +1121,22 @@ namespace VEPROMS
 			DoCreatePDF();
 		}
 
-        public void QPCreatePDF() => DoCreatePDF();
+		public void QPCreatePDF()
+		{
+			DoCreatePDF();
+		}
 
-        private void DoCreatePDF()
+		private void DoCreatePDF()
 		{
 			if (_AllProcedures)
 			{
-				Cursor = Cursors.WaitCursor;
+				this.Cursor = Cursors.WaitCursor;
 				DateTime dtStart = DateTime.Now;
 				_MultiunitPdfLocation = cbxMultiunitPdfLocation.SelectedItem.ToString();
 				PromsPrinter.ClearTransPageNumProblems();
 				CreatePDFs();
 				PromsPrinter.ReportTransPageNumProblems();
-				Cursor = Cursors.Default;
+				this.Cursor = Cursors.Default;
 				if (_MergedPfd == null)
 				{
 					if (VlnSettings.DebugMode)
@@ -1031,7 +1149,7 @@ namespace VEPROMS
 					{
 						MessageBox.Show("Completed Successfully", "Print All Procedures", MessageBoxButtons.OK, MessageBoxIcon.Information);
 					}
-					Close();
+					this.Close();
 				}
 			}
 			else
@@ -1040,14 +1158,14 @@ namespace VEPROMS
 				// B2017-009 If the selected item is null don't add a folder
 				if (cbxMultiunitPdfLocation.SelectedItem != null)
 					_MultiunitPdfLocation = cbxMultiunitPdfLocation.SelectedItem.ToString();
-				Cursor = Cursors.WaitCursor;
+				this.Cursor = Cursors.WaitCursor;
 				_CreateButtonClicked = true; // B2020-062 control the toggle of date/time prefix/suffix on pdf file name
 				CreatePDF();
 				_CreateButtonClicked = false;
-				Cursor = Cursors.Default;
+				this.Cursor = Cursors.Default;
 			}
 		}
-		private readonly bool _Initializing = false;
+		private bool _Initializing = false;
 
 		private void btnPdfLocation_Click(object sender, EventArgs e)
 		{
@@ -1073,9 +1191,12 @@ namespace VEPROMS
 			ppTxbxChangeBarUserMsgOne.Enabled = enabled;
 			ppTxbxChangeBarUserMsgTwo.Enabled = enabled;
 		}
-        private void cbxOvrrideDefChgBars_CheckStateChanged(object sender, EventArgs e) => SetCustomControls(cbxOvrrideDefChgBars.Checked);
+		private void cbxOvrrideDefChgBars_CheckStateChanged(object sender, EventArgs e)
+		{
+			SetCustomControls(cbxOvrrideDefChgBars.Checked);
+		}
 
-        private void rbCustom_Click(object sender, EventArgs e)
+		private void rbCustom_Click(object sender, EventArgs e)
 		{
 			SetCustomControls(true);
 			// Make Custom controls visible
@@ -1097,22 +1218,24 @@ namespace VEPROMS
 		// B2024-058  Add validation for Revision Date field of the Print dialog
 		private bool validateDate(TextBox txtDate)
 		{
-            if (!(txtDate.Text == ""))
-            {
-                if (DateTime.TryParse(txtDate.Text, out _))
-                {
-                    return true;
-                }
-                else
-                {
-                    string txtDate2 = txtDate.Text;
-                    string message = String.Format("Date {0} in wrong format" + System.Environment.NewLine + "Correct the revision date.", txtDate2);
-                    string txtTitle = "Invalid Format";
-                    MessageBox.Show(message, txtTitle);
-                    return false;
-                }
-            }
-            return true;
+			DateTime dDate;
+			if (!(txtDate.Text == ""))
+			{
+
+				if (DateTime.TryParse(txtDate.Text, out dDate))
+				{
+					return true;
+				}
+				else
+				{
+					string txtDate2 = txtDate.Text;
+					string message = String.Format("Date {0} in wrong format" + System.Environment.NewLine + "Correct the revision date.", txtDate2);
+					string txtTitle = "Invalid Format";
+					MessageBox.Show(message, txtTitle);
+					return false;
+				}
+			}
+			return true;
 		}
 
 		private void txbRevDate_Enter(object sender, EventArgs e)
@@ -1120,6 +1243,8 @@ namespace VEPROMS
 			txbDate = txbRevDate;
 			grpDateSelector.Text = "Select Revision Date";
 			grpDateSelector.Visible = calDateSelector.Visible = true;
+			//C2021-007 position the calendar to the current RevDate or if no RevDate, position to today's date
+			DateTime dDate;
 			// B2024-058  Add validation for Revision Date field of the Print dialog
 			if (!validateDate(txbDate))
 			{
@@ -1134,16 +1259,17 @@ namespace VEPROMS
 		private void txbRevDate_Leave(object sender, EventArgs e)
 		{
 			if (_Initializing) return;
-			if (ActiveControl == calDateSelector)
+			if (this.ActiveControl == calDateSelector)
 			{
 				txbRevDate.Focus();  //B2018-059 keep the calendar open until a different field on the print dialog is selected
 				return;
 			}
 			txbDate = null;
 			grpDateSelector.Visible = calDateSelector.Visible = false;
-            // save the RevDate to the procedure's config.
-            if (!(MyProcedure.MyConfig is ProcedureConfig pc)) return;
-            pc.Print_RevDate = txbRevDate.Text;
+			// save the RevDate to the procedure's config.
+			ProcedureConfig pc = MyProcedure.MyConfig as ProcedureConfig;
+			if (pc == null) return;
+			pc.Print_RevDate = txbRevDate.Text;
 			using (Item itm = Item.Get(MyProcedure.ItemID))
 			{
 				itm.MyContent.Config = MyProcedure.MyConfig.ToString();
@@ -1157,9 +1283,10 @@ namespace VEPROMS
 			if (_Initializing) return;
 			txbDate = null;
 			grpDateSelector.Visible = calDateSelector.Visible = false;
-            // save the ReviewDate to the procedure's config.
-            if (!(MyProcedure.MyConfig is ProcedureConfig pc)) return;
-            pc.Print_ReviewDate = txbReviewDate.Text;
+			// save the ReviewDate to the procedure's config.
+			ProcedureConfig pc = MyProcedure.MyConfig as ProcedureConfig;
+			if (pc == null) return;
+			pc.Print_ReviewDate = txbReviewDate.Text;
 			using (Item itm = Item.Get(MyProcedure.ItemID))
 			{
 				itm.MyContent.Config = MyProcedure.MyConfig.ToString();
@@ -1199,9 +1326,10 @@ namespace VEPROMS
 		// C2021-062 used to save rev number information when all procedures are printed or merged
 		private void SaveRevNumToProcedureConfig(string newrevnum)
 		{
-            // save the RevNum to the procedure's config.
-            if (!(MyProcedure.MyConfig is ProcedureConfig pc)) return;
-            pc.Print_Rev = newrevnum;
+			// save the RevNum to the procedure's config.
+			ProcedureConfig pc = MyProcedure.MyConfig as ProcedureConfig;
+			if (pc == null) return;
+			pc.Print_Rev = newrevnum;
 			using (Item itm = Item.Get(MyProcedure.ItemID))
 			{
 				itm.MyContent.Config = MyProcedure.MyConfig.ToString();
@@ -1213,16 +1341,22 @@ namespace VEPROMS
 		{
 			if (expPrnSetting.Expanded)
 			{
-				Size = new Size(Size.Width + (expPrnSetting.Size.Width - expPrnSetting.TitlePanel.Size.Height), Size.Height);
+				this.Size = new Size(this.Size.Width + (expPrnSetting.Size.Width - expPrnSetting.TitlePanel.Size.Height), this.Size.Height);
 				// B2018-137 set the visability of Generate Placekeeper
 				swtbtnGeneratePlacekeeper.Visible = lblGeneratePlacekeeper.Visible = ((MyProcedure.ActiveFormat.PlantFormat.FormatData.PurchaseOptions & E_PurchaseOptions.AutoPlacekeeper) == E_PurchaseOptions.AutoPlacekeeper);
 			}
+			//else
+			//	this.Size = new Size(this.Size.Width-(expPrnSetting.Size.Width-expPrnSetting.TitlePanel.Size.Height), this.Size.Height);
+			//Refresh();
 		}
 
 		private void expPrnSetting_ExpandedChanging(object sender, DevComponents.DotNetBar.ExpandedChangeEventArgs e)
-		{
+	{
 				if (expPrnSetting.Expanded)
-					Size = new Size(Size.Width-(expPrnSetting.Size.Width-expPrnSetting.TitlePanel.Size.Height), Size.Height);
+				//this.Size = new Size(this.Size.Width+(expPrnSetting.Size.Width-expPrnSetting.TitlePanel.Size.Height), this.Size.Height);
+			//else
+				this.Size = new Size(this.Size.Width-(expPrnSetting.Size.Width-expPrnSetting.TitlePanel.Size.Height), this.Size.Height);
+			//Refresh();
 
 		}
 
@@ -1261,15 +1395,15 @@ namespace VEPROMS
 			DoCreatePDF();		// create indivitual pdfs
 			if (_MergedPdfPath != null && _MergedPdfPath != PDFPath) PDFPath = _MergedPfd.Folder = _MergedPdfPath;
 			// C2021-063 pass in whether to generate Alarm Point List text when a merge is done
-			if (!_MergedPfd.DoTheMerge(cbxAlmPtTxt.Checked)) return;		// merge them together.
+			if (!_MergedPfd.DoTheMerge(PromsPrinter.MergedLandscapePages,cbxAlmPtTxt.Checked)) return;		// merge them together.
 			// if the property to show the file after printing is set (on the version dialog), display it.  Otherwise do a dialog to let user know it's done
 			if (_DocVersionConfig.Print_MergedPdfsViewAfter)
 			{
 				if (_MergedPfd.MergedPdfs != null && _MergedPfd.MergedPdfs.Count > 0)
 				{
 					System.Diagnostics.Process sdp = System.Diagnostics.Process.Start(_MergedPfd.MergedFileName);
-                    // B2020-055 if the current .NET version does not recognize the program used to display the PDF, it will return a NULL (ex. Microsoft Edge)
-                    sdp?.WaitForInputIdle();
+					if (sdp != null) // B2020-055 if the current .NET version does not recognize the program used to display the PDF, it will return a NULL (ex. Microsoft Edge)
+						sdp.WaitForInputIdle();
 				}
 			}
 			else if (VlnSettings.DebugMode)
@@ -1282,7 +1416,7 @@ namespace VEPROMS
 			{
 				FlexibleMessageBox.Show("Completed Successfully", "Print All and Merge Procedures", MessageBoxButtons.OK, MessageBoxIcon.Information);
 			}
-			Close();
+			this.Close();
 		}
 
 		private void cbxAssignRevToAllMergedPrcs_CheckedChanged(object sender, EventArgs e)
@@ -1294,5 +1428,10 @@ namespace VEPROMS
 				_NewRevForAllProcs = null;
 		}
 
+
+		//private void cbxDebug_CheckedChanged(object sender, EventArgs e)
+		//{
+		//  cbxCmpPRMSpfd.Visible = cbxDebug.Checked;
+		//}
 	}
 }

PROMS/VEPROMS User Interface/GlobalSuppressions.cs

@@ -1,8 +0,0 @@
-// This file is used by Code Analysis to maintain SuppressMessage
-// attributes that are applied to this project.
-// Project-level suppressions either have no target or are given
-// a specific target and scoped to a namespace, type, member, etc.
-
-using System.Diagnostics.CodeAnalysis;
-
-[assembly: SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Not modifying Naming Styles")]

PROMS/VEPROMS User Interface/PROMSFixes.Sql

@@ -1643,11 +1643,7 @@ Begin
 		Select Cast(i.LastChanged as varbinary(8)) as 'ILastChanged',
 			i.ItemID as 'ItemID',
 			zi.VersionID as 'VersionID',
-			CASE WHEN c.[Type] % 20000 = 6 THEN REPLACE(zi.PPath,'Note','Caution')
-			     WHEN c.[Type] % 20000 = 7 THEN REPLACE(zi.PPath,'Caution','Note')
-			     ELSE zi.PPath 
-			    END
-			+
+			zi.PPath +
 			Case (c.[Type]/10000)
 				When 0 Then @Delim + @UnitPrefix + IsNull(c.Number,'') + @DelimNumber + IsNull(c.Text,'') -- Procedure
 				When 1 Then @Delim + IsNull(c.Number,'') + @DelimNumber + IsNull(c.Text,'') -- Section
@@ -5227,7 +5223,7 @@ CREATE PROCEDURE [dbo].[getRevisionByItemIDandRevisionNumberAndUnitID]
 WITH EXECUTE AS OWNER
 AS
 declare @RevisionID int
-set @RevisionID = (select top 1 revisionid from revisions rr cross apply rr.config.nodes('//Applicability') t1(r1) where itemid = @itemid and revisionnumber = @RevisionNumber and r1.value('@Index','int') = @UnitID order by revisionid desc)
+set @RevisionID = (select revisionid from revisions rr cross apply rr.config.nodes('//Applicability') t1(r1) where itemid = @itemid and revisionnumber = @RevisionNumber and r1.value('@Index','int') = @UnitID)
 	SELECT
 		[RevisionID],
 		[ItemID],
@@ -5547,12 +5543,6 @@ ELSE PRINT 'Function: ve_GetItemDerivedApplicability Error on Creation'
 GO
 
 -------
-
--- =============================================
--- Author:		Matthew Schill
--- Modify date: 07/14/2026
--- Description:	Reworked ve_GetParentItem for Performance improvement
--- =============================================
 /****** Object:  UserDefinedFunction [dbo].[vefn_GetParentItem]    Script Date: 03/28/2012 17:58:48 ******/
 IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[ve_GetParentItem]') AND OBJECTPROPERTY(id,N'IsScalarFunction') = 1)
     DROP FUNCTION [ve_GetParentItem];
@@ -5561,46 +5551,35 @@ GO
    Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
        Copyright 2012 - Volian Enterprises, Inc. All rights reserved.
 *****************************************************************************/
-CREATE OR ALTER FUNCTION [dbo].[ve_GetParentItem] (@ItemID int) RETURNS int
+CREATE FUNCTION [dbo].[ve_GetParentItem] (@ItemID int) RETURNS int
 WITH EXECUTE AS OWNER
 AS
 BEGIN
 DECLARE @ParentID int;
-WITH Itemz([ItemID]) as
+WITH Itemz([ItemID],[IsFound]) as
 (
-select ii.itemid from items ii WITH (NOLOCK) where ii.itemid = @ItemID
+select ii.itemid,0 from items ii where ii.itemid = @ItemID
 union all
-select ii.previousid from items ii WITH (NOLOCK)
+select ii.previousid,0 from items ii
 join itemz zz on ii.itemid = zz.itemid
 where ii.previousid is not null
+and zz.isfound = 0
+union all
+select ii.itemid,1
+from parts pp
+join itemz zz on pp.itemid = zz.itemid
+join items ii on ii.contentid = pp.contentid
 )
-select top 1 @ParentID = ii.itemid 
-from itemz
-inner join parts pp WITH (NOLOCK) on pp.itemid = itemz.itemid
-inner join items ii WITH (NOLOCK) on ii.contentid = pp.contentid
-OPTION (MAXRECURSION 10000)
-
+select top 1 @ParentID = itemid from itemz
+where isfound = 1 OPTION (MAXRECURSION 10000)
 RETURN @ParentID
 END
-
 GO
 
 IF (@@Error = 0) PRINT 'ScalerFunction [vefn_GetParentItem] Succeeded'
 ELSE PRINT 'ScalerFunction [vefn_GetParentItem] Error on Creation'
 go
 
-IF EXISTS (SELECT * FROM dbo.sysIndexes WHERE name like 'IX_PartsItemID')
-	DROP INDEX [IX_PartsItemID] ON [dbo].[tblParts];
-GO
-
-CREATE NONCLUSTERED INDEX IX_PartsItemID
-ON [dbo].[tblParts] ([ItemID] ASC)
-INCLUDE([ContentID],[DeleteStatus],[FromType]) WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-GO
-
-PRINT 'Added IX_PartsItemID Index.  Speeds up Getting Parent Items'
-GO
-
 /****** Object:  UserDefinedFunction [dbo].[vefn_CanTransitionBeCreated]    Script Date: 10/14/2012 02:03:30 ******/
 IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vefn_CanTransitionBeCreated]') AND OBJECTPROPERTY(id,N'IsScalarFunction') = 1)
 	DROP FUNCTION [vefn_CanTransitionBeCreated];
@@ -13557,7 +13536,35 @@ GO
 IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[deleteAllDocVersionPdfs]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
     DROP PROCEDURE [deleteAllDocVersionPdfs];
 GO
+	
+/*****************************************************************************
+   Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
+       Copyright 2017 - Volian Enterprises, Inc. All rights reserved.
+*****************************************************************************/
+CREATE PROCEDURE [dbo].[deleteAllDocVersionPdfs]
 
+(
+	@VersionID int
+)
+WITH EXECUTE AS OWNER
+AS
+BEGIN TRY -- Try Block
+	BEGIN TRANSACTION
+	DELETE [Pdfs]
+		WHERE [DocID] IN(select EE.DocID from vefn_GetVersionItems(cast(@VersionID as varchar(20))) VI
+		Join Entries EE ON EE.ContentID= VI.ContentID)
+	IF( @@TRANCOUNT > 0 ) COMMIT
+END TRY
+BEGIN CATCH -- Catch Block
+	IF( @@TRANCOUNT = 1 ) ROLLBACK -- Only rollback if top level
+ 	ELSE IF( @@TRANCOUNT > 1 ) COMMIT -- Otherwise commit.  Top level will rollback
+	EXEC vlnErrorHandler
+END CATCH
+GO
+-- Display the status of Proc creation
+IF (@@Error = 0) PRINT 'Procedure Creation: deleteAllDocVersionPdfs Succeeded'
+ELSE PRINT 'Procedure Creation: deleteAllDocVersionPdfs Error on Creation'
+GO
 /****** Object:  StoredProcedure [addFiguresByROFstIDandImageIDs] ******/
 IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[addFiguresByROFstIDandImageIDs]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
     DROP PROCEDURE [addFiguresByROFstIDandImageIDs];
@@ -17158,7 +17165,6 @@ GO
 			[roid] [varchar](50) NOT NULL,
 			[appid] [varchar](max) NULL,
 			[value] [varchar](max) NULL,
-            [moddatetime] [datetime] NULL,
 		 CONSTRAINT [PK_RofstChild] PRIMARY KEY CLUSTERED 
 		(
 			[RofstChildID] ASC
@@ -17293,23 +17299,6 @@ GO
 	End -- Rofst Tables
 	Go
 
-	-- =============================================
-	-- Author:		Matthew Schill
-	-- Create date: 03/30/2026
-	-- Description:	Store RO Modification date/time
-	-- =============================================
-
-	--- Add Column to store RO  Modification date/time if it does not already exist
-	IF NOT EXISTS(SELECT *
-			  FROM   INFORMATION_SCHEMA.COLUMNS
-			  WHERE  TABLE_NAME = 'RofstChild'
-					 AND COLUMN_NAME = 'moddatetime') 
-	ALTER TABLE RofstChild ADD moddatetime datetime NULL;
-	go
-	-- Display the status
-	IF (@@Error = 0) PRINT 'Altered table [RofstChild] Succeeded for moddatetime'
-	ELSE PRINT 'Altered table [RofstChild] Error on Alter for moddatetime'
-	go
 
 	/*
 	----------------------------------------------------------------------------------
@@ -19712,7 +19701,6 @@ GO
 		@roid VarChar(50),
 		@appid VarChar(Max) = null,
 		@value VarChar(Max) = null,
-		@ModDateTime DateTime = null,
 		@missingDefaultValue VarChar(Max) = null
 	)
 	With Execute as Owner
@@ -19730,8 +19718,8 @@ GO
 			Set @missingDefaultValue = '[TBD]';
 
 		-- Create Rofst Child/Group Record --> [Roid = (12) Digits]
-		Insert Into RofstChild (RofstID, ID, ParentID, dbiID, [type], title, roid, appid, moddatetime, [value])
-		Values (@RofstID, @ID, @ParentID, @dbiID, @type, @title, @roid, @appid, @ModDateTime, REPLACE(REPLACE(@value, '&123;', '{'), '&125;', '}'));
+		Insert Into RofstChild (RofstID, ID, ParentID, dbiID, [type], title, roid, appid, [value])
+		Values (@RofstID, @ID, @ParentID, @dbiID, @type, @title, @roid, @appid, REPLACE(REPLACE(@value, '&123;', '{'), '&125;', '}'));
 
 
 		-- Check for appid, if exists, then insert the default value for each return type if multi-value
@@ -24337,10 +24325,8 @@ BEGIN
 		   OR FromID in (Select ContentID from tblContents where deletestatus != 0 and ActionDTS < @dte)
 		  )
 	PRINT 'Deleting Items and Parts'
-	    alter table tblParts nocheck constraint FK_Parts_Items
 		delete from tblItems where deletestatus != 0 and DTS < @dte
 		delete from tblParts where deletestatus != 0 and ItemID Not IN (Select ItemID from Items) and DTS < @dte
-		alter table tblParts check constraint FK_Parts_Items
 	PRINT 'Purging Parts with deleted Contents'
 		DELETE from Child
 		 FROM tblParts AS Child
@@ -24365,9 +24351,7 @@ BEGIN
 		   ON Itms.ItemID = tblItems.ItemID AND Itms.deletestatus = tblItems.deletestatus
 	   alter table tblItems check constraint FK_Items_Items
 	PRINT 'Purging Contents'
-		alter table tblEntries nocheck constraint FK_Entries_Contents
 		delete from tblContents where deletestatus != 0 and ActionDTS < @dte 
-		alter table tblEntries check constraint FK_Entries_Contents
 	PRINT 'Phase 3' 
 		delete from AnnotationAudits where DTS < @dte
 		delete from ContentAudits where DTS < @dte
@@ -24545,496 +24529,6 @@ GO
 PRINT 'Added IX_tblROUsagesRODbIDDeleteStatusROID Index.  Speeds up RO queries'
 GO
 
-
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[GetCurrentApprovedRevisions]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-	DROP PROCEDURE [GetCurrentApprovedRevisions];
-
-GO
-
-/****** Object:  StoredProcedure [dbo].[GetCurrentApprovedRevisions]    Script Date: 02/05/2026 7:54:42 AM ******/
-
--- =============================================
--- Author:		Matthew Schill
--- Create date: 02/05/2026
--- Description:	Gets all current approved revisions
--- =============================================
-CREATE PROCEDURE [dbo].[GetCurrentApprovedRevisions]
-(
-	@ItemID AS bigint
-)
-AS
-BEGIN
-
-		select max(rr.revisionid) revisionid, UnitId, UnitVal.name UnitName, max(rr.DTS) DTS
-		from items ii
-		inner join revisions rr on ii.itemid = rr.itemid
-		inner join versions vv on rr.revisionid = vv.revisionid
-		inner join stages ss on vv.stageid = ss.stageid
-		outer apply 
-		(Select UnitId = r1.value('@Index','int') FROM rr.config.nodes('Config/Applicability') t1(r1)) App
-		left outer join
-		(select  r1.value('@index','int') indx
-		,r1.value('@Name','varchar') name
-		from (select *,cast(config as xml) xconfig from DocVersions 
-		where ItemID in(select itemID from vefn_AllSiblingItems(@ItemID))) SDV
-		cross apply
-		xconfig.nodes('Config/Slaves/Slave') t1(r1)) UnitVal ON UnitVal.indx = UnitId
-		where ss.isapproved = 1
-		and ii.itemid = @ItemID
-		group by UnitId, UnitVal.name
-
-	RETURN
-END
-
-IF (@@Error = 0) PRINT 'Procedure Creation: [GetCurrentApprovedRevisions] Succeeded'
-ELSE PRINT 'Procedure Creation: [GetCurrentApprovedRevisions] Error on Creation'
-GO
-
-
-/*
-==========================================================================================================
--- Begin: C2026-010 Add Audit Ability for ChangeBars
--- Author:		Matthew Schill
--- Create date: 02/17/2026
-==========================================================================================================
-*/
-	/*
-	----------------------------------------------------------------------------------
-	Tables:
-	----------------------------------------------------------------------------------
-	[ChangeBarAudits]
-
-	----------------------------------------------------------------------------------
-	Indexes:
-	----------------------------------------------------------------------------------
-	[IX_ChangeBarAudits_ItemID] on [dbo].[ChangeBarAudits]
-
-
-
-	*/
-
-
-	IF Not Exists(SELECT * FROM sys.objects Where name = 'ChangeBarAudits' AND type in (N'U'))
-	Begin
-
-		SET ANSI_NULLS ON
-		SET QUOTED_IDENTIFIER ON
-
-		/****** Create Table to hold Audit Information ******/
-		CREATE TABLE [dbo].[ChangeBarAudits](
-			[AuditID] [bigint] IDENTITY(1,1) NOT NULL,
-			[ItemID] [bigint] NOT NULL,
-			[Text] [nvarchar](max) NULL,
-			[DTS] [datetime] NOT NULL,
-			[UserID] [nvarchar](100) NOT NULL,
-			[UnitIndex] [int] NULL,
-		 CONSTRAINT [PK_ChangeBarAudits] PRIMARY KEY CLUSTERED 
-		(
-			[AuditID] ASC
-		)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-		) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
-
-		IF (@@Error = 0) PRINT 'Table Creation: [ChangeBarAudits] Succeeded'
-		ELSE PRINT 'Table Creation: [ChangeBarAudits] Error on Creation'
-
-		/****** Table was not previously created - so intially populate with info from Approvals ******/
-		INSERT into ChangeBarAudits([ItemID],[Text],[DTS],[UserID],[UnitIndex])
-		  select --rr.RevisionID,
-		  rr.ItemID,
-		  Text =  CASE WHEN r1.value('@Index','int') <> 0 AND UnitName IS NOT NULL THEN
-					   '(Unit ' + UnitName + ') '
-				  ELSE
-					   ''
-				  END +
-				  'Approved by (' + rr.UserID + ') on (' + 
-				  CAST(rr.DTS AS VARCHAR) + ')',
-		  rr.DTS,
-		  rr.UserID,
-		  UnitIndex =  r1.value('@Index','int')
-		 -- , UnitName
-			from revisions rr
-			inner join versions vv on rr.revisionid = vv.revisionid
-			inner join stages ss on vv.stageid = ss.stageid
-			outer apply rr.config.nodes('Config/Applicability') t1(r1)
-			outer apply
-			( Select r2.value('@Name','varchar') UnitName
-			  FROM
-				 (select DocVerSions.ItemID, cast(config as xml) xconfig from DocVersions
-					inner join 
-					  vefn_AllSiblingItems(rr.ItemID) Sib ON DocVerSions.ItemID = Sib.ItemID) SDV
-					cross apply
-					xconfig.nodes('Config/Slaves/Slave') t2(r2)
-				  WHERE r2.value('@index','varchar') = r1.value('@Index','int')
-			) UN
-			where ss.isapproved = 1
-			  order by rr.ItemID, rr.RevisionID desc
-
-		IF (@@Error = 0) PRINT '[ChangeBarAudits] Initial Population Succeeded'
-		ELSE PRINT '[ChangeBarAudits] Initial Population Error'
-		
-		/****** Create Index to get ChangeBar Audit Information for Item (ItemID = ProcedureID) ******/
-		CREATE NONCLUSTERED INDEX [IX_ChangeBarAudits_ItemID] ON [dbo].[ChangeBarAudits]
-		(
-			[ItemID] ASC
-		)
-		INCLUDE ([AuditID], [Text], [DTS], [UnitIndex])
-		WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-		
-		IF (@@Error = 0) PRINT 'Index Creation: [IX_ChangeBarAudits_ItemID] Succeeded'
-		ELSE PRINT 'Index Creation: [IX_ChangeBarAudits_ItemID] Error on Creation'
-
-	End	
-
-	-- =============================================
-	-- Description:	Gets ChangeBar Audit History by item
-	-- =============================================
-	IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[GetChangeBarAuditHistoryByItem]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-		DROP PROCEDURE [GetChangeBarAuditHistoryByItem];
-
-	GO
-
-	CREATE PROCEDURE [dbo].[GetChangeBarAuditHistoryByItem]
-	(
-		@ItemID AS bigint
-	)
-	AS
-	BEGIN
-		Select * FROM ChangeBarAudits where ItemID = @ItemID
-		order by DTS desc
-
-		RETURN
-	END
-
-	IF (@@Error = 0) PRINT 'Procedure Creation: [GetChangeBarAuditHistoryByItem] Succeeded'
-	ELSE PRINT 'Procedure Creation: [GetChangeBarAuditHistoryByItem] Error on Creation'
-	GO
-
-	-- =============================================
-	-- Description:	Adds ChangeBar Audit History
-	-- =============================================
-	IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[AddChangeBarAuditHistory]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-		DROP PROCEDURE [AddChangeBarAuditHistory];
-
-	GO
-
-	CREATE PROCEDURE [dbo].[AddChangeBarAuditHistory]
-	(
-		@ItemID AS bigint,
-		@Description As nvarchar(max),
-		@DTS AS Datetime,
-		@UserID As nvarchar(100),
-		@UnitIndex AS bigint = NULL
-	)
-	AS
-	BEGIN
-
-		INSERT into ChangeBarAudits([ItemID],[Text],[DTS],[UserID],[UnitIndex])
-		VALUES (@ItemID, @Description, @DTS, @UserID, @UnitIndex)
-
-		RETURN
-	END
-
-	IF (@@Error = 0) PRINT 'Procedure Creation: [AddChangeBarAuditHistory] Succeeded'
-	ELSE PRINT 'Procedure Creation: [AddChangeBarAuditHistory] Error on Creation'
-	GO
-
-/*
-==========================================================================================================
--- End: C2026-010 Add Audit Ability for ChangeBars
-==========================================================================================================
-*/
-
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[GetMissingDocsByUnit]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-	DROP PROCEDURE [GetMissingDocsByUnit];
-
-GO
-
--- =============================================
--- Author:		Matthew Schill
--- Create date: 02/27/2026
--- Description:	Get Missing Docs by Unit for Generating Pdf table
--- =============================================
-CREATE PROCEDURE [dbo].[GetMissingDocsByUnit]
-AS
-BEGIN
-
-	  select Docs.DocID, UnitID, SectionID = MIN(SectionID)
-	  FROM
-	  (SELECT DISTINCT [DocID]
-	  FROM [tblDocuments]) Docs
-	  INNER JOIN Entries on Docs.DocID = Entries.DocID
-	  INNER JOIN Contents on Entries.ContentID = Contents.ContentID
-	  inner join Items on Items.ContentID = Contents.ContentID
-	  outer apply
-		  (Select UnitID = ID FROM dbo.vefn_SplitInt([dbo].[ve_GetItemDerivedApplicability](Items.ItemID),',')) Unit
-	  outer apply
-		  (Select TOP 1 SectionID = ItemID FROM Contents SecC where SecC.ContentID = Contents.ContentID
-			AND (SecC.Type / 10000) = 1
-			AND dbo.vefn_GetVersionIDByItemID(ItemID) IS NOT NULL
-		  ) Section
-      left outer join Pdfs on Pdfs.DocID = Docs.DocID AND Pdfs.DebugStatus = CASE WHEN UNITID IS NULL THEN 0 ELSE UnitID * 10 END
-	  WHERE Pdfs.DocID IS NULL
-      AND SectionID IS NOT NULL
-	  Group by Docs.DocID, UnitID
-	  order by Docs.DocID, UnitID
-
-	RETURN
-END
-
-IF (@@Error = 0) PRINT 'Procedure Creation: [GetMissingDocsByUnit] Succeeded'
-ELSE PRINT 'Procedure Creation: [GetMissingDocsByUnit] Error on Creation'
-GO
-
-
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vefn_ROFST_changes]') AND OBJECTPROPERTY(id,N'IsTableFunction') = 1)
-    DROP FUNCTION [vefn_ROFST_changes];
-GO
-
-SET ANSI_NULLS ON
-GO
-SET QUOTED_IDENTIFIER ON
-GO
-	
-/*
-==========================================================================================================
- Author:		Matthew Schill
- Create Date:	03/31/2026
- Description:	Function for ROs that updated in latest RO FST Load
-==========================================================================================================
-*/
-CREATE FUNCTION [dbo].[vefn_ROFST_changes](@OrigFSTID int, @NewFSTid int, @VersionID int)
-RETURNS @ROIDs TABLE
-(
-[roid] varchar(50)
-)
-WITH EXECUTE AS OWNER
-AS
-BEGIN
-
-    insert into @ROIDs
-	  SELECT DISTINCT ISNULL(RofstChild.roid,previous.roid)
-	    FROM 
-			(SELECT * FROM RofstChild where RofstChild.RofstID = @NewFSTid) RofstChild
-			FULL OUTER JOIN 
-			(SELECT * FROM RofstChild previous where previous.RofstID = @OrigFSTID) previous
-			ON previous.dbiID = RofstChild.dbiID AND previous.ID = RofstChild.ID 
-	    where	
-	    ISNULL(previous.RofstID,'') != ISNULL(RofstChild.RofstID,'')
-		AND
-	    (
-		 (RofstChild.RofstID = @NewFSTid OR RofstChild.RofstID IS NULL)
-		  AND
-		 (previous.RofstID = @OrigFSTID OR previous.RofstID IS NULL)
-		)
-		AND
-		(previous.moddatetime IS NULL 
-        OR RofstChild.moddatetime IS NULL 
-		OR RofstChild.moddatetime != previous.moddatetime
-		OR RofstChild.title != previous.title
-		OR RofstChild.value != previous.value
-		)
-
-	RETURN
-END
-go
-
-IF (@@Error = 0) PRINT 'TableFunction [vefn_ROFST_changes] Succeeded'
-ELSE PRINT 'TableFunction [vefn_ROFST_changes] Error on Creation'
-go
-
-/****** Object:  StoredProcedure [deleteDocVersionPdfsWithNewROs] ******/
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[deleteDocVersionPdfsWithNewROs]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-    DROP PROCEDURE [deleteDocVersionPdfsWithNewROs];
-GO
-	
-/*
-==========================================================================================================
- Author:		Matthew Schill
- Create Date:	03/31/2026
- Description:	Delete all PDFs with ROs that will need re-resolved
-==========================================================================================================
-*/
-CREATE PROCEDURE [dbo].[deleteDocVersionPdfsWithNewROs]
-
-(
-	@VersionID int,
-    @OrigFSTid int,
-    @NewFSTid int
-)
-WITH EXECUTE AS OWNER
-AS
- BEGIN
-	DELETE [Pdfs]
-		WHERE [DocID] IN 
-            (
-               select EE.DocID from vefn_GetVersionItems(cast(@VersionID as varchar(20))) VI
-		       Join Entries EE ON EE.ContentID= VI.ContentID
-			   Join DRoUsages ON DRoUsages.DocID = EE.DocID
-               Join dbo.vefn_ROFST_changes(@OrigFSTID, @NewFSTid, @VersionID) ROFST_changes on LEFT(DRoUsages.ROID,12) = ROFST_changes.roid
-            )
-
-	RETURN
- END
-
-GO
-
--- Display the status of Proc creation
-IF (@@Error = 0) PRINT 'Procedure Creation: deleteDocVersionPdfsWithNewROs Succeeded'
-ELSE PRINT 'Procedure Creation: deleteDocVersionPdfsWithNewROs Error on Creation'
-GO
-
-
-/****** Object:  StoredProcedure [getItemsWithNewROs] ******/
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[getItemsWithNewROs]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-    DROP PROCEDURE [getItemsWithNewROs];
-GO
-
-/*
-==========================================================================================================
- Author:		Matthew Schill
- Create Date:	03/31/2026
- Description:	Get Items with New ROs that will need resolved
-==========================================================================================================
-*/
-CREATE PROCEDURE [dbo].[getItemsWithNewROs]
-
-(
-	@VersionID int,
-    @OrigFSTid int,
-    @NewFSTid int
-)
-WITH EXECUTE AS OWNER
-AS
- BEGIN
-	select DISTINCT tblItems.ItemID FROM
-	dbo.vefn_ROFST_changes(@OrigFSTID, @NewFSTid, @VersionID) ROFST_changes
-	INNER JOIN RoUsages ON LEFT(RoUsages.ROID,12) = ROFST_changes.roid
-	INNER JOIN tblItems ON RoUsages.ContentID = tblItems.ContentID
-	OUTER APPLY (Select VersionID =  dbo.vefn_GetVersionIDByItemID(tblItems.ItemID)) ver
-	INNER JOIN DocVersions DV ON DV.VersionID = ver.VersionID
-	INNER JOIN Associations ON Associations.VersionID = DV.VersionID
-	where ver.VersionID = @VersionID
-
-	RETURN
- END
-
-GO
-
--- Display the status of Proc creation
-IF (@@Error = 0) PRINT 'Procedure Creation: getItemsWithNewROs Succeeded'
-ELSE PRINT 'Procedure Creation: getItemsWithNewROs Error on Creation'
-GO
-
-/****** Object: StoredProcedure [dbo].[getRevisionByItemIDandRevisionNumber] ******/
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[getRevisionByItemIDandRevisionNumber]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-DROP PROCEDURE [dbo].[getRevisionByItemIDandRevisionNumber];
-GO
-
-/*****************************************************************************
-   Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
-       Copyright 2012 - Volian Enterprises, Inc. All rights reserved.
-*****************************************************************************/
-CREATE PROCEDURE [dbo].[getRevisionByItemIDandRevisionNumber]
-
-(
-	@ItemID int,
-	@RevisionNumber nvarchar(50)
-)
-WITH EXECUTE AS OWNER
-AS
-declare @RevisionID int
-set @RevisionID = (select top 1 revisionid from revisions where itemid = @itemid and revisionnumber = @RevisionNumber order by revisionid desc)
-	SELECT
-		[RevisionID],
-		[ItemID],
-		[TypeID],
-		[RevisionNumber],
-		[RevisionDate],
-		[Notes],
-		[Config],
-		[DTS],
-		[UserID],
-		[LastChanged],
-		(SELECT COUNT(*) FROM [Checks] WHERE [Checks].[RevisionID]=[Revisions].[RevisionID]) [CheckCount],
-		(SELECT COUNT(*) FROM [Versions] WHERE [Versions].[RevisionID]=[Revisions].[RevisionID]) [VersionCount]
-	FROM [Revisions]
-	WHERE [RevisionID]=@RevisionID
-
-	SELECT
-		[Checks].[CheckID],
-		[Checks].[RevisionID],
-		[Checks].[StageID],
-		[Checks].[ConsistencyChecks],
-		[Checks].[DTS],
-		[Checks].[UserID],
-		[Checks].[LastChanged],
-		[Stages].[Name] [Stage_Name],
-		[Stages].[Description] [Stage_Description],
-		[Stages].[IsApproved] [Stage_IsApproved],
-		[Stages].[DTS] [Stage_DTS],
-		[Stages].[UserID] [Stage_UserID]
-	FROM [Checks]
-		JOIN [Stages]  ON
-			[Stages].[StageID]=[Checks].[StageID]
-	WHERE
-		[Checks].[RevisionID]=@RevisionID
-
-
-	SELECT
-		[Versions].[VersionID],
-		[Versions].[RevisionID],
-		[Versions].[StageID],
-		[Versions].[DTS],
-		[Versions].[UserID],
-		[Versions].[LastChanged],
-		[Versions].[PDF],
-		[Versions].[SummaryPDF],
-		[Stages].[Name] [Stage_Name],
-		[Stages].[Description] [Stage_Description],
-		[Stages].[IsApproved] [Stage_IsApproved],
-		[Stages].[DTS] [Stage_DTS],
-		[Stages].[UserID] [Stage_UserID]
-	FROM [Versions]
-		JOIN [Stages]  ON
-			[Stages].[StageID]=[Versions].[StageID]
-	WHERE
-		[Versions].[RevisionID]=@RevisionID
-
-	RETURN
-
--- Display the status of Proc creation
-IF (@@Error = 0) PRINT 'Procedure Creation: getRevisionByItemIDandRevisionNumber Succeeded'
-ELSE PRINT 'Procedure Creation: getRevisionByItemIDandRevisionNumber Error on Creation'
-GO
-
-/*
-==========================================================================================================
- Author:		Matthew Schill
- Create Date:	06/29/2026
- Description:	Added an ISNULL check when setting GridAudits.contentauditid.
-    Was Causing Deletion of some Grids to fail.
-==========================================================================================================
-*/
-/****** Object:  Trigger [tr_Contents_Delete] ******/
-ALTER trigger [dbo].[tr_Contents_Delete] on [dbo].[Contents] instead of delete as 
-	begin
-		update ii set DeleteStatus = (select max(DeleteID) from DeleteLog where SPID = @@spid), ActionDTS = getdate(),
-		UserID = (select top 1 UserID from DeleteLog where SPID = @@spid order by deleteid desc)
-		from tblContents ii inner join deleted dd on dd.ContentID = ii.ContentID
-		insert into ContentAudits(ContentID,Number,Text,Type,FormatID,Config,DTS,UserID,DeleteStatus,ActionDTS)
-		select ii.ContentID,ii.Number,ii.Text,ii.Type,ii.FormatID,ii.Config,ii.DTS,ii.UserID,ii.DeleteStatus,ii.ActionDTS
-		from tblContents ii inner join deleted dd on dd.ContentID = ii.ContentID
-		where ii.DeleteStatus > 0
-		update ga set ga.contentauditid = (select ISNULL(max(auditid),0) from contentaudits where contentid = ga.contentid and deletestatus = ga.deletestatus)
-		from gridaudits ga join deleted dd on ga.contentid = dd.contentid where ga.contentauditid = 0
-	end
-go
-
--- Display the status of Trigger alter
-IF (@@Error = 0) PRINT 'Trigger Alteration: tr_Contents_Delete Succeeded'
-ELSE PRINT 'Trigger Alteration: tr_Contents_Delete Error on Creation'
-GO
-
 /*
   ---------------------------------------------------------------------------
   |                       ADD New Code Before this Block                    |
@@ -25068,8 +24562,8 @@ BEGIN TRY -- Try Block
 	DECLARE @RevDate varchar(255)
 	DECLARE @RevDescription varchar(255)
 
-	set @RevDate = '07/16/2026 8:30 AM'
-	set @RevDescription = 'Reworked ve_GetParentItem for Performance improvement'
+	set @RevDate = '01/19/2026 5:00 PM'
+	set @RevDescription = 'Sync tree list Sort order between in RO Editor and PROMS'
 
 	Select  cast(@RevDate as datetime) RevDate, @RevDescription  RevDescription
 	PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription

PROMS/VEPROMS User Interface/Program.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using System.Windows.Forms;
+using Volian.Base.Library;
 
 namespace VEPROMS
 {

PROMS/VEPROMS User Interface/ShortcutLists.cs

@@ -1,5 +1,12 @@
 using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.IO;
 using System.Windows.Forms;
+using DevComponents.DotNetBar;
 
 namespace VEPROMS
 {

PROMS/VEPROMS User Interface/VEPROMS_UI.csproj

@@ -154,6 +154,7 @@
     <Compile Include="AboutVEPROMS.Designer.cs">
       <DependentUpon>AboutVEPROMS.cs</DependentUpon>
     </Compile>
+    <Compile Include="BookMarks.cs" />
     <Compile Include="dlgAnnotationsSelect.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -348,7 +349,6 @@
     <Compile Include="frmVersionsProperties.Designer.cs">
       <DependentUpon>frmVersionsProperties.cs</DependentUpon>
     </Compile>
-    <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Program.cs" />
     <EmbeddedResource Include="AboutVEPROMS.resx">
       <SubType>Designer</SubType>

PROMS/VEPROMS User Interface/VlnWeb.cs

@@ -1,3 +1,9 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
 using System.Windows.Forms;
 
 namespace VEPROMS

PROMS/VEPROMS User Interface/dlgCheckOpenTabs.cs

@@ -1,4 +1,11 @@
 using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace VEPROMS
@@ -14,8 +21,8 @@ namespace VEPROMS
 
         private void btnTabs_Click(object sender, EventArgs e)
         {
-            Remember = cbRemember.Checked;
-            Close();
+            Remember = this.cbRemember.Checked;
+            this.Close();
         }
     }
 }

PROMS/VEPROMS User Interface/dlgCheckedOutProcedure.cs

@@ -1,4 +1,8 @@
 using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
 using System.Text;
 using System.Windows.Forms;
 using VEPROMS.CSLA.Library;
@@ -19,22 +23,36 @@ namespace VEPROMS
 			_MySessionInfo = SessionInfo.Get(_MyOwnerInfo.SessionID);
 			_MyUserInfo = ui;
 		}
-		private readonly ProcedureInfo _MyProcedureInfo;
-        public ProcedureInfo MyProcedureInfo => _MyProcedureInfo;
-        private readonly SectionInfo _MySectionInfo;
-        public SectionInfo MySectionInfo => _MySectionInfo;
-        private readonly OwnerInfo _MyOwnerInfo;
-        public OwnerInfo MyOwnerInfo => _MyOwnerInfo;
-        private readonly SessionInfo _MySessionInfo;
-        public SessionInfo MySessionInfo => _MySessionInfo;
-        private readonly UserInfo _MyUserInfo;
-        public UserInfo MyUserInfo => _MyUserInfo;
-        
+		private ProcedureInfo _MyProcedureInfo;
+		public ProcedureInfo MyProcedureInfo
+		{
+			get { return _MyProcedureInfo; }
+		}
+		private SectionInfo _MySectionInfo;
+		public SectionInfo MySectionInfo
+		{
+			get { return _MySectionInfo; }
+		}
+		private OwnerInfo _MyOwnerInfo;
+		public OwnerInfo MyOwnerInfo
+		{
+			get { return _MyOwnerInfo; }
+		}
+		private SessionInfo _MySessionInfo;
+		public SessionInfo MySessionInfo
+		{
+			get { return _MySessionInfo; }
+		}
+		private UserInfo _MyUserInfo;
+		public UserInfo MyUserInfo
+		{
+			get { return _MyUserInfo; }
+		}
+		StringBuilder sb = new StringBuilder();
 
 		private void dlgCheckedOutProcedure_Load(object sender, EventArgs e)
 		{
-            StringBuilder sb = new StringBuilder();
-            if (MyProcedureInfo != null)
+			if (MyProcedureInfo != null)
 				sb.AppendLine(string.Format("The procedure {0} - {1}", MyProcedureInfo.DisplayNumber, MyProcedureInfo.DisplayText));
 			else
 				sb.AppendLine(string.Format("The document {0}", MySectionInfo.DisplayText));
@@ -56,8 +74,7 @@ namespace VEPROMS
 
 		private void btnForce_Click(object sender, EventArgs e)
 		{
-            StringBuilder sb = new StringBuilder();
-            MySessionInfo.CheckInItem(MyOwnerInfo.OwnerID);
+			MySessionInfo.CheckInItem(MyOwnerInfo.OwnerID);
 			sb.AppendLine();
 			sb.AppendLine("Forced Check In has been completed");
 			lblInfo.Text = sb.ToString();