Merge remote-tracking branch 'origin/Development' into C2022-003-Change-Textboxes-to-RTF-3

good for testing

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

@@ -101,7 +101,6 @@ namespace ROEditor
 		private System.Windows.Forms.TextBox tbVariableTxtWid;
 		private System.Windows.Forms.TextBox tbTableWid;
 		private System.Windows.Forms.TextBox tbXYPlotWid;
-
 		private System.Windows.Forms.Button btnOK;
 		private System.Windows.Forms.Button btnCancel;
 		/// <summary>
@@ -224,7 +223,6 @@ namespace ROEditor
 			this.tbTableWid = new System.Windows.Forms.TextBox();
 			this.tbVariableTxtWid = new System.Windows.Forms.TextBox();
 			this.tbSingleTxtWid = new System.Windows.Forms.TextBox();
-
 			this.lblW4 = new System.Windows.Forms.Label();
 			this.lblW3 = new System.Windows.Forms.Label();
 			this.lblW2 = new System.Windows.Forms.Label();
@@ -607,3 +605,4 @@ namespace ROEditor
 		}
 	}
 }
+

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

@@ -445,3 +445,4 @@ namespace ROEditor
 		#endregion
 	}
 }
+

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

@@ -455,3 +455,4 @@ namespace ROEditor
 		#endregion
 	}
 }
+

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

@@ -440,3 +440,4 @@ namespace ROEditor
 		}
 	}
 }
+

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

@@ -1627,3 +1627,4 @@ namespace ROEditor
 		#endregion
 	}
 }
+

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

@@ -313,7 +313,6 @@ namespace ROEditor
 	/// Summary description for Form1.
 	/// </summary>
 	///
-
 	public class Form1 : System.Windows.Forms.Form
 	{
 		private ctlXMLEditLib.ctlXMLEdit ctlXMLEdit2;
@@ -344,7 +343,6 @@ namespace ROEditor
 		private System.Windows.Forms.MenuItem menuROProperties;
 		private System.Windows.Forms.MenuItem menuROExit;
 		private System.Windows.Forms.MenuItem menuItem1;
-
 		private XmlDocument myroXmlDoc;
 		private VlnXmlElement newone;
 		private TreeNode TreeNewparent;
@@ -357,7 +355,7 @@ namespace ROEditor
 		private roRichTextBox _CurrentTextBox; // currently selected TextBox field
 		public static string[] PCChildren; //C2021-026 list of Parent/Child Children
 
-	public roRichTextBox CurrentTextBox
+		public roRichTextBox CurrentTextBox
 		{
 			get { return _CurrentTextBox; }
 			set { _CurrentTextBox = value; }
@@ -474,7 +472,7 @@ namespace ROEditor
 			}
 			myroXmlDoc = myrodb.RODB_GetRoot();
 			rootXml = (VlnXmlElement)myroXmlDoc.FirstChild;
-			rootNode = new TreeNode("Referenced Objects", ROGROUPIMAGE, ROGROUPIMAGE);
+			rootNode = new TreeNode("Referenced Objects",ROGROUPIMAGE,ROGROUPIMAGE);
 			rootNode.Tag = rootXml;
 			roTreeView.Nodes.Add(rootNode);
 			roTreeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.roTreeView_AfterSelect);
@@ -491,7 +489,7 @@ namespace ROEditor
 			while (group != null)
 			{
 				// Add the top groups to tree control as a node.
-				TreeNode grnode = new TreeNode(CvtFldToUserFld(group.InnerText), ROGROUPIMAGE, ROGROUPIMAGE);
+				TreeNode grnode = new TreeNode(CvtFldToUserFld(group.InnerText),ROGROUPIMAGE,ROGROUPIMAGE);
 				grnode.Tag = group;
 				rootNode.Nodes.Add(grnode);
 				string haskids = group.GetAttribute("HasChild");
@@ -516,11 +514,11 @@ namespace ROEditor
 			// edit it through the ctlXmledit.
 			// from the input tbl string, get a table name.
 			ArrayList levelRecids = new ArrayList();
-			int itbl = System.Convert.ToInt32(specificro.Substring(0, 4), 16);
+			int itbl = System.Convert.ToInt32(specificro.Substring(0,4),16);
-			string stbl = System.Convert.ToString(itbl, 10);
+			string stbl = System.Convert.ToString(itbl,10);
-			string pstbl = stbl.PadLeft(6, '0');
+			string pstbl = stbl.PadLeft(6,'0');
 			string tbname = "RO" + pstbl;
-			string recid = specificro.Substring(4, 8);
+			string recid = specificro.Substring(4,8);
 
 			// read in this element from the table.
 			VlnXmlElement spro;
@@ -561,20 +559,20 @@ namespace ROEditor
 			string attrspro;
 			TreeNode trnd = rootNode.FirstNode;
 			VlnXmlElement ele;
-			for (int i = levelRecids.Count - 1; i >= 0; i--)
+			for (int i = levelRecids.Count-1;i>=0;i--)
 			{
-				ele = (VlnXmlElement)trnd.Tag;
+				ele = (VlnXmlElement) trnd.Tag;
-				attrele = ele.GetAttribute((i == levelRecids.Count - 1) ? "Table" : "RecID");
+				attrele = ele.GetAttribute((i==levelRecids.Count-1)?"Table":"RecID");
-				if (i == levelRecids.Count - 1)
+				if (i == levelRecids.Count-1)
 					attrspro = spro.GetAttribute("Table");
 				else
-					attrspro = (string)levelRecids[i];
+					attrspro = (string) levelRecids[i];
 				while (attrele != attrspro)
 				{
 					// get next one.
 					trnd = trnd.NextNode;
 					ele = (VlnXmlElement)trnd.Tag;
-					attrele = ele.GetAttribute((i == levelRecids.Count - 1) ? "Table" : "RecID");
+					attrele = ele.GetAttribute((i==levelRecids.Count - 1)?"Table":"RecID");
 				}
 				if (trnd == null) 
 				{
@@ -590,12 +588,12 @@ namespace ROEditor
 				MessageBox.Show("Error editting RO");
 				return;
 			}
-			ele = (VlnXmlElement)trnd.Tag;
+			ele = (VlnXmlElement) trnd.Tag;
 			attrele = ele.GetAttribute("RecID");
 			while (attrele != spro.GetAttribute("RecID"))
 			{
 				trnd = trnd.NextNode;
-				ele = (VlnXmlElement)trnd.Tag;
+				ele = (VlnXmlElement) trnd.Tag;
 				attrele = ele.GetAttribute("RecID");
 			}
 			if (trnd == null) 
@@ -606,7 +604,7 @@ namespace ROEditor
 			roTreeView.SelectedNode = trnd;
 		}
 
-		protected void roTreeView_AfterSelect(object sender,
+		protected void roTreeView_AfterSelect (object sender, 
 			System.Windows.Forms.TreeViewEventArgs e)
 		{
 			TreeNode PreviousNode = LastSelectedNode;
@@ -632,7 +630,7 @@ namespace ROEditor
 				}
 
 				// if selected to make new, but didn't add any data, remove it.
-				if (newone != null)
+				if (newone!=null)
 				{
 					XmlNode parent = newone.ParentNode;
 					parent.RemoveChild(newone);
@@ -647,7 +645,7 @@ namespace ROEditor
 				roTreeView.ContextMenu.MenuItems[6].Enabled = rbtnSave.Enabled;
 
 				// Should the properties menu item be available?
-				VlnXmlElement curelem = (VlnXmlElement)CurrentNode.Tag;
+				VlnXmlElement curelem = (VlnXmlElement) CurrentNode.Tag;
 				if (curelem.Name == "vlnGroup")
 					menuROProperties.Enabled = true;
 				else
@@ -757,12 +755,12 @@ namespace ROEditor
 				return fldname;
 			// a digit cannot start an xml fieldname, prepend a "__" to it.
 			string tmp0;
-			if (char.IsDigit(fldname, 0))
+			if (char.IsDigit(fldname,0))
 				tmp0 = "__" + fldname;
 			else
 				tmp0 = fldname;
 			// an xml fieldname cannot have a space, change it to a "__"
-			string tmpstr = tmp0.Replace(" ", "__");
+			string tmpstr = tmp0.Replace(" ","__");
 			int len = tmpstr.Length;
 			int cnt = 0;
 
@@ -795,12 +793,12 @@ namespace ROEditor
 			string tmpstr0;
 			if (fldname.Length < 2) return fldname;
 			// an xml element name cannot begin with a digit. we had prepended a "__"
-			if (fldname.Substring(0, 2) == "__" && char.IsDigit(fldname, 2))
+			if (fldname.Substring(0,2) == "__" && char.IsDigit(fldname,2))
-				tmpstr0 = fldname.Substring(2, fldname.Length - 2);
+				tmpstr0 = fldname.Substring(2,fldname.Length-2);
 			else
 				tmpstr0 = fldname;
 			// an xml element name cannot have a space, we converted to a "__"
-			string tmpstr = tmpstr0.Replace("__", " ");
+			string tmpstr = tmpstr0.Replace("__"," ");
 			int len = tmpstr.Length;
 			int cur = 0;
 
@@ -810,24 +808,24 @@ namespace ROEditor
 
 			string outstr = "";
 			int decval, indx;
-			if (tmpstr.Length < 6)
+			if (tmpstr.Length <6)
 				indx = -1;
 			else
-				indx = tmpstr.IndexOf(OKpunch, cur);
+				indx=tmpstr.IndexOf(OKpunch, cur);
 			string asc_spchar;
-			while (indx >= 0)
+			while (indx>=0)
 			{
-				outstr += tmpstr.Substring(cur, indx - cur);
+				outstr += tmpstr.Substring(cur,indx-cur);
-				asc_spchar = tmpstr.Substring(indx + 3, 3);
+				asc_spchar = tmpstr.Substring(indx+3,3);
-				decval = System.Convert.ToInt16(asc_spchar, 10);
+				decval = System.Convert.ToInt16(asc_spchar,10);
 				outstr += System.Convert.ToChar(decval).ToString();
-				cur = indx + 6;
+				cur = indx+6;
-				if (cur + 6 > len)
+				if (cur+6 > len)
 					indx = -1;
 				else
 					indx = tmpstr.IndexOf(OKpunch, cur);
 			}
-			if (cur < len) outstr += tmpstr.Substring(cur, len - cur);
+			if (cur<len) outstr += tmpstr.Substring(cur,len-cur);
 
 			return outstr;
 		}
@@ -850,7 +848,7 @@ namespace ROEditor
 			{
 				// Get the tree node at the current mouse position and set it
 				// to be the the currently selected node (i.e. selecti that node)
-				TreeNode CurrentNode = roTreeView.GetNodeAt(e.X, e.Y);
+				TreeNode CurrentNode = roTreeView.GetNodeAt(e.X,e.Y);
 				if (CurrentNode != null)
 				{
 					roTreeView.SelectedNode = CurrentNode; // select this node
@@ -884,7 +882,7 @@ namespace ROEditor
 					menuROSave.Enabled = rbtnSave.Enabled;
 
 					// Should the properties menu item be available?
-					VlnXmlElement curelem = (VlnXmlElement)CurrentNode.Tag;
+					VlnXmlElement curelem = (VlnXmlElement) CurrentNode.Tag;
 					if (curelem.Name == "vlnGroup")
 						roTreeView.ContextMenu.MenuItems[7].Enabled = true;
 					else
@@ -916,7 +914,7 @@ namespace ROEditor
 		{
 			bool rtnval = false;
 			TreeNode CurrentNode = roTreeView.SelectedNode;
-			VlnXmlElement curelem = (VlnXmlElement)CurrentNode.Tag;
+			VlnXmlElement curelem = (VlnXmlElement) CurrentNode.Tag;
 			if (curelem.Name != "RO_Root")
 			{
 				if (curelem.Name == "vlnGroup")
@@ -947,7 +945,7 @@ namespace ROEditor
 						DialogResult dr = MessageBox.Show("Do you want to save your changes?", "Warning:", MessageBoxButtons.YesNoCancel);
 						if (dr == DialogResult.Yes)
 						{
-							TreeNode tr = null;
+							TreeNode tr=null;
 							bool ok = SaveRO(ref tr);   // savero needs a tree node
 							if (ok == false) return -1;
 						}
@@ -982,19 +980,19 @@ namespace ROEditor
 			{
 				roListView.Dispose();
 				this.panel1.Controls.Remove(roListView);
-				roListView = null;
+				roListView=null;
 			}
 		}
 
 		private void CreateCtlXmlEdit2(VlnXmlElement curelem, XmlSchema myschema, ArrayList reqfields, ArrayList fieldsWithApplic)
 		{
-			ctlXMLEdit2 = new ctlXMLEditLib.ctlXMLEdit(curelem, myschema, reqfields, fieldsWithApplic, PCChildren); // C2021-026 pass in P/C enabled information
+			ctlXMLEdit2 = new ctlXMLEditLib.ctlXMLEdit(curelem,myschema,reqfields,fieldsWithApplic,PCChildren); // C2021-026 pass in P/C enabled information
 			ctlXMLEdit2.AutoScroll = true;
 			ctlXMLEdit2.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0)));
 			ctlXMLEdit2.Name = "ctlXMLEdit2";
-			ctlXMLEdit2.Size = new System.Drawing.Size(ctlXMLEdit2.GetMaxWidth(), ctlXMLEdit2.GetMaxLength());
+			ctlXMLEdit2.Size = new System.Drawing.Size(ctlXMLEdit2.GetMaxWidth(),ctlXMLEdit2.GetMaxLength());
 			this.panel2.Visible = true;
-			this.panel2.Size = new System.Drawing.Size(ctlXMLEdit2.GetMaxWidth() + 20, ctlXMLEdit2.GetMaxLength() + 10);
+			this.panel2.Size =  new System.Drawing.Size(ctlXMLEdit2.GetMaxWidth()+20,ctlXMLEdit2.GetMaxLength()+10);
 			this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
 			ctlXMLEdit2.TabIndex = 4;
 			ctlXMLEdit2.Tag = "";
@@ -1011,7 +1009,7 @@ namespace ROEditor
 				TmpInfo = (Control)ctlEnumerator.Current;
 				if (TmpInfo is GroupBox)
 				{
-					System.Collections.IEnumerator ctlGroup = TmpInfo.Controls.GetEnumerator(); ;
+					System.Collections.IEnumerator ctlGroup = TmpInfo.Controls.GetEnumerator();;
 					while (ctlGroup.MoveNext())
 					{
 						Control tmpradio = (Control)ctlGroup.Current;
@@ -1053,7 +1051,7 @@ namespace ROEditor
 		private void EditRO(VlnXmlElement curelem)
 		{
 			ArrayList fieldsWithApplic = null;
-			newone = null;
+			newone=null;
 			// can't edit fields for top or top group nodes (top node not editable,
 			// and top group node data change at properties level).
 			if (curelem.Name == "RO_Root" || curelem.ParentNode.Name == "RO_Root") return;
@@ -1072,7 +1070,7 @@ namespace ROEditor
 				fieldsWithApplic = GetApplcFieldListForElement(curelem);
 
 				myschema = myrodb.RODB_GetSchema(curelem);
-				if (myschema == null)
+				if (myschema==null)
 				{
 					MessageBox.Show("RO Definition does not exist, check RO Definition under Properties for the Group that contains this RO.");
 					return;
@@ -1084,7 +1082,7 @@ namespace ROEditor
 				VlnXmlElement sch = curelem;
 				if (curelem.ParentNode.Name != "RO_Root") sch = (VlnXmlElement)sch.ParentNode;
 				myschema = myrodb.RODB_GetGroupSchema(sch);
-				if (myschema == null)
+				if (myschema==null)
 				{
 					MessageBox.Show("Subgroup Definition does not exist, check Subgroup Definition under Properties for the Group that contains this Subgroup.");
 					return;
@@ -1092,20 +1090,20 @@ namespace ROEditor
 			}
 
 			ArrayList reqfields = curelem.GetRequiredFields();
-			CreateCtlXmlEdit2(curelem, myschema, reqfields, fieldsWithApplic); // C2021-026 pass in P/C enabled fields
+			CreateCtlXmlEdit2(curelem,myschema, reqfields, fieldsWithApplic); // C2021-026 pass in P/C enabled fields
 			this.panel2.Controls.Add(ctlXMLEdit2);
-			rbtnSave.Enabled = false; // set initial states of buttons on edit RO Editor add symbols C2025 - 003
+			rbtnSave.Enabled=false; // set initial states of buttons on edit RO Editor add symbols C2025 - 003
-			rbtnRestore.Enabled = false;
+			rbtnRestore.Enabled=false;
-			rbtnCancel.Enabled = true;
+			rbtnCancel.Enabled=true;
-			rbtnSaveAs.Enabled = false;
+			rbtnSaveAs.Enabled=false;
-			rbtnDuplicate.Enabled = true;
+			rbtnDuplicate.Enabled=true;
 			rbtnZoom.Enabled = false;
 			rbtnSymbols.Enabled = true; 
 			ctlXMLEdit2.Focus();
 		}
-		protected void roTreeView_OnDoubleClick(object sender, System.EventArgs e)
+		protected void roTreeView_OnDoubleClick(object sender,System.EventArgs e)
 		{
-			VlnXmlElement curelem = (VlnXmlElement)roTreeView.SelectedNode.Tag;
+			VlnXmlElement curelem = (VlnXmlElement) roTreeView.SelectedNode.Tag;
 			EditRO(curelem);
 		}
 
@@ -1165,7 +1163,7 @@ namespace ROEditor
 
 				object dataobj = System.Windows.Forms.Clipboard.GetDataObject();
 				if (dataobj != null)
-					this.menuEditPaste.Enabled = true;
+					this.menuEditPaste.Enabled=true;
 			}
 			else if (sender is RadioButton)
 			{
@@ -1205,9 +1203,9 @@ namespace ROEditor
 			rbtnSave.Enabled = true;
 			rbtnRestore.Enabled = true;
 			if (newone == null)
-			{ rbtnSaveAs.Enabled = true; }
+				{ rbtnSaveAs.Enabled = true; }
 			else
-			{ rbtnSaveAs.Enabled = false; }
+				{ rbtnSaveAs.Enabled = false; }
 			rbtnCancel.Enabled = true;
 
 			menuROSave.Enabled = rbtnSave.Enabled;
@@ -1224,36 +1222,36 @@ namespace ROEditor
 			string kidsloaded;
 			haskids = elem.GetAttribute("HasChild");
 			kidsloaded = elem.GetAttribute("ChildLoaded");
-			if (haskids == "True" && kidsloaded == "False")
+			if (haskids == "True" && kidsloaded == "False" )
 			{
 				// if there's a dummy tree node (used to have tree control expansion for
 				// items not yet loaded, delete child in tree control)
-				XmlNode tmpnode = (XmlNode)elem;
+				XmlNode tmpnode = (XmlNode) elem;
 				XmlNode chldnode;
 				VlnXmlElement echild;
 				if (enode.FirstNode.Text == "VLN_DUMMY_FOR_TREE") enode.FirstNode.Remove();
 				Cursor.Current = Cursors.WaitCursor;
-				myrodb.RODB_GetChildData(elem, true);
+				myrodb.RODB_GetChildData(elem,true);
 				chldnode = tmpnode.FirstChild;
 				while (chldnode != null)
 				{
 					if (chldnode is VlnXmlElement)
 					{
-						echild = (VlnXmlElement)chldnode;
+						echild = (VlnXmlElement) chldnode;
 						TreeNode chldnd;
 						if (echild.Name == "vlnGroup") 
 						{
-							chldnd = new TreeNode(echild.GetAttribute("MenuTitle"), ROGROUPIMAGE, ROGROUPIMAGE);
+							chldnd = new TreeNode(echild.GetAttribute("MenuTitle"),ROGROUPIMAGE,ROGROUPIMAGE); 
 							chldnd.Tag = echild;
 							enode.Nodes.Add(chldnd);
 							// add a 'dummy' node to tree if there are any children
-							string haskids1 = "False";
+							string haskids1="False";
-							string kidsloaded1 = "False";
+							string kidsloaded1="False";
-							if (echild.HasAttribute("HasChild") == true)
+							if (echild.HasAttribute("HasChild")==true)
 								haskids1 = echild.GetAttribute("HasChild");
-							if (echild.HasAttribute("ChildLoaded") == true)
+							if (echild.HasAttribute("ChildLoaded")==true)
 								kidsloaded1 = echild.GetAttribute("ChildLoaded");
-							if (haskids1 == "True" && kidsloaded1 == "False")
+							if (haskids1 == "True" && kidsloaded1=="False")
 							{
 								TreeNode subch = new TreeNode("VLN_DUMMY_FOR_TREE");
 								chldnd.Nodes.Add(subch);
@@ -1266,9 +1264,9 @@ namespace ROEditor
 							// include these in the tree.
 							int levelcnt = chldnode.ChildNodes.Count;
 							string TheMenuTitle = echild.GetAttribute("MenuTitle");
-							if (levelcnt >= 1 && !TheMenuTitle.Equals(""))
+							if (levelcnt>=1 && !TheMenuTitle.Equals(""))
 							{
-								chldnd = new TreeNode(TheMenuTitle, ROIMAGE, ROIMAGE);
+								chldnd = new TreeNode(TheMenuTitle,ROIMAGE,ROIMAGE);
 								chldnd.Tag = echild;
 								chldnd.Name = echild.GetAttribute("RecID");
 								enode.Nodes.Add(chldnd);
@@ -1290,16 +1288,16 @@ namespace ROEditor
 		/// <summary>
 		/// Clean up any resources being used.
 		/// </summary>
-		protected override void Dispose(bool disposing)
+		protected override void Dispose( bool disposing )
 		{
-			if (disposing)
+			if ( disposing )
 			{
 				if (components != null) 
 				{
 					components.Dispose();
 				}
 			}
-			base.Dispose(disposing);
+			base.Dispose( disposing );
 		}
 
 		#region Windows Form Designer generated code
@@ -1811,11 +1809,6 @@ namespace ROEditor
 			this.lblDuplicateRO.Text = "Working With Duplicate RO";
 			this.lblDuplicateRO.Visible = false;
 			//
-
-
-	
-
-
 			// 
 			// Form1
 			// 
@@ -2052,8 +2045,8 @@ namespace ROEditor
 		static void Main(string[] args) 
 		{
 			bool StartupROEditor = true;
-			FileStream fsown = null;
+			FileStream fsown=null;
-			FileInfo fiown = null;
+			FileInfo fiown=null;
 			String specificro = null;
 			string ConnectionPath = "";
 			// Let's open the database & set up for the tree structure...
@@ -2091,25 +2084,25 @@ namespace ROEditor
 			if (args.Length > 3)
 				if (args[3].ToUpper().StartsWith("PC="))
 					PCChildren = args[3].Substring(3).Split(','); //C2021-026 list of Parent/Child Children
-				else if (args[3].ToUpper().Contains("DATA SOURCE")) SqlConnectionStr = args[3];
+			else if (args[3].ToUpper().Contains("DATA SOURCE")) SqlConnectionStr = args[3];
 				else specificro = args[3];
 			RODB.PCChildList = PCChildren; //C2021-026 pass the Parent/Child info to the RODB class
 			try
 			{
 				// Convert the RO data if needed
-				if (!CheckForDataConversion(ConnectionPath))
+					if (!CheckForDataConversion(ConnectionPath))
-					ConnectionPath = null; // force exit
+						ConnectionPath = null; // force exit
 			}
 			catch (Exception e)
 			{
 				MessageBox.Show(e.Message, "Error on check for data conversion");
-				//	Application.Exit();
+			//	Application.Exit();
 			}
 			// Process the given RO Path
 			if (ConnectionPath == null)
 			{
 				// no RO directory
-				MessageBox.Show("Could not locate a Referenced Objects (RO) directory.\n\nIt should be inside your VExxx directory or at the same level as your VExxx directory.", "RO Editor");
+				MessageBox.Show("Could not locate a Referenced Objects (RO) directory.\n\nIt should be inside your VExxx directory or at the same level as your VExxx directory.","RO Editor");
 				StartupROEditor = false;
 			}
 			else if (ConnectionPath.Equals(""))
@@ -2130,7 +2123,7 @@ namespace ROEditor
 				}
 			}
 
-			if (StartupROEditor)
+			if  (StartupROEditor)
 			{
 				// The ROEditor.OWN file assures that only one individual at a time can edit the RO database.  
 				// The file is opened and kept open while the user is editing the database.  The contents of the
@@ -2138,14 +2131,13 @@ namespace ROEditor
 				try 
 				{
 					fiown = new FileInfo("RoEditor.own");
-					try
+					try {
-					{
 						// Try to delete the owner file.  If another process has the file open, this delete will fail.
 						// If the file is closed, it will be deleted, and the user will be placed in the editor.  The users
 						// name and the time when this session began will be placed in the owner file.
 						fiown.Delete();
 					}
-					catch (Exception ex)
+					catch(Exception ex)
 					{
 						fsown = fiown.Open(FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
 						TextReader tr1 = new StreamReader(fsown);
@@ -2164,12 +2156,12 @@ namespace ROEditor
 				}
 				catch (Exception e)
 				{
-					MessageBox.Show(e.Message, "fileinfo");
+					MessageBox.Show(e.Message,"fileinfo");
 				}
 				// Open the file just specified. Open it so that no-one else can use it
 				try
 				{
-					fsown = fiown.Open(FileMode.Create, FileAccess.ReadWrite, FileShare.Read);
+					fsown = fiown.Open( FileMode.Create, FileAccess.ReadWrite, FileShare.Read );
 					TextWriter tw = new StreamWriter(fsown);
 					tw.WriteLine("Current User:  {0}, Date and Time Started:  {1}", Environment.UserName.ToUpper(), DateTime.Now.ToString("MM/dd/yyyy @ hh:mm"));
 					tw.Flush();
@@ -2183,17 +2175,6 @@ namespace ROEditor
 					if (who.Contains(Environment.UserName.ToUpper()))
 					{
 						BringWindowToFront();
-
-						//Process[] p = Process.GetProcessesByName("ROEditor");
-						//Process cp = Process.GetCurrentProcess();
-						//for (int i = 0; i < p.Length; i++)
-						//{
-						//  if (p[i].SessionId != cp.SessionId)
-						//  {
-						//    SetForegroundWindow(p[i].MainWindowHandle);
-						//    break;
-						//  }
-						//}
 					}
 					else
 						MessageBox.Show(who, "Another user is executing the RoEditor");
@@ -2204,13 +2185,13 @@ namespace ROEditor
 				if (!File.Exists("ROMaster.mdb") && !UsingSQLServer(Directory.GetCurrentDirectory()))
 				{
 					DialogResult AnswerYN;
-					string msgstr = "The RO directory (" + Directory.GetCurrentDirectory() + ") is empty.\n\n Create an empty RO database?";
+					string msgstr = "The RO directory (" + Directory.GetCurrentDirectory() +") is empty.\n\n Create an empty RO database?";
-					AnswerYN = MessageBox.Show(msgstr, "RO Editor", MessageBoxButtons.YesNo);
+					AnswerYN = MessageBox.Show(msgstr,"RO Editor",MessageBoxButtons.YesNo);
 					if (AnswerYN == DialogResult.Yes)
 					{
 						string SourceRODatabase = Application.StartupPath + "\\ROMaster.mdb";
 						string DestRODatabase = Directory.GetCurrentDirectory() + "\\ROMaster.mdb";
-						File.Copy(SourceRODatabase, DestRODatabase);
+						File.Copy(SourceRODatabase,DestRODatabase);
 					}
 					else
 						StartupROEditor = false;
@@ -2219,7 +2200,7 @@ namespace ROEditor
 
 			if (StartupROEditor)
 			{
-				Application.Run(new Form1(ConnectionPath, specificro));
+				Application.Run(new Form1(ConnectionPath,specificro));
 
 				if (fsown != null)
 				{
@@ -2324,12 +2305,11 @@ namespace ROEditor
 
 				testParadoxFile += "ROMASTER.DB"; // Paradox file
 				testAccessFile += "ROMaster.mdb"; // Access file
-				//				if (File.Exists(testParadoxFile))
 				if (File.Exists(testParadoxFile) && !(File.Exists(testAccessFile) || UsingSQLServer(ROdir)))
 				{
 					// Display a message to the user that the data needs converted
 					DialogResult AnswerYN;
-					AnswerYN = MessageBox.Show("The RO data needs to be converted for the New RO Editor.\n\n Proceed with the data conversion?", "RO Editor", MessageBoxButtons.YesNo);
+					AnswerYN = MessageBox.Show("The RO data needs to be converted for the New RO Editor.\n\n Proceed with the data conversion?","RO Editor",MessageBoxButtons.YesNo);
 					if (AnswerYN == DialogResult.Yes)
 					{
 						// Convert old RO Data
@@ -2344,7 +2324,7 @@ namespace ROEditor
 						// create a process & wait until it exits.
 						Process myProcess = new Process();
 						myProcess.StartInfo.FileName = ConversionExePath;
-						myProcess.StartInfo.Arguments = argstr;
+						myProcess.StartInfo.Arguments=argstr;
 
 						myProcess.Start();
 						myProcess.WaitForExit();
@@ -2381,7 +2361,7 @@ namespace ROEditor
 			int cnt = nd.Nodes.Count;
 			bool add_dummykid = false;
 			if (cnt > 0) add_dummykid = true;
-			for (int i = 0; i < cnt; i++)
+			for (int i=0; i<cnt; i++)
 				nd.Nodes[0].Remove();
 			// if haskids & kids loaded, delete them and add a VLN_DUMMY_FOR_TREE in the
 			// tree control if there isn't one. This will sink up tree with xml tree in 
@@ -2390,7 +2370,7 @@ namespace ROEditor
 			string haskids, kidsloaded;
 			haskids = curelem.GetAttribute("HasChild");
 			kidsloaded = curelem.GetAttribute("ChildLoaded");
-			if (haskids == "True" && kidsloaded == "True")
+			if (haskids == "True" && kidsloaded == "True" )
 			{
 				VlnXmlElement kid, delkid;
 				XmlNode ndkid;
@@ -2400,7 +2380,7 @@ namespace ROEditor
 					delkid = null;
 					if (ndkid is VlnXmlElement)
 					{
-						kid = (VlnXmlElement)ndkid;
+						kid = (VlnXmlElement) ndkid;
 						if (kid.HasAttribute("RecID")) delkid = kid;
 					}
 					ndkid = ndkid.NextSibling;
@@ -2419,13 +2399,13 @@ namespace ROEditor
 		private void menuROProperties_Click(object sender, System.EventArgs e)
 		{
 			roListView_ClearListDisplay();
-			bool didcleanup = false;  // flags whether we needed to remove elements from trees
+			bool didcleanup=false;  // flags whether we needed to remove elements from trees
 			// to match xml data to tree.
 			VlnXmlElement curelem = (VlnXmlElement)roTreeView.SelectedNode.Tag;
 			LoadKids(roTreeView.SelectedNode);
 			if (curelem.Name == "vlnGroup") 
 			{
-				GroupDefFrm grdef = new GroupDefFrm(curelem, myrodb, roTreeView.SelectedNode.Text, -1);
+				GroupDefFrm grdef = new GroupDefFrm(curelem,myrodb,roTreeView.SelectedNode.Text,-1);
 				grdef.ShowDialog();
 
 				// if the group text was modified, update the tree. If it was a subgroup,
@@ -2457,7 +2437,7 @@ namespace ROEditor
 							}
 						}
 					}
-					topele = (VlnXmlElement)topele.NextSibling;
+					topele = (VlnXmlElement) topele.NextSibling;
 				}
 				// if a fieldname changed, we may even have to check the 'top' group nodes
 
@@ -2472,7 +2452,7 @@ namespace ROEditor
 		 */
 		private void menuNewGroup_Click(object sender, System.EventArgs e)
 		{
-			VlnXmlElement curelem = (VlnXmlElement)roTreeView.SelectedNode.Tag;
+			VlnXmlElement curelem = (VlnXmlElement) roTreeView.SelectedNode.Tag;
 			// if this is being added from the top, do a new table and main group.
 			// otherwise, handle like a new ro.
 			if (curelem.Name == "RO_Root")
@@ -2487,7 +2467,7 @@ namespace ROEditor
 					if (topele.HasAttribute("TreeNotData"))
 					{
 						topele.RemoveAttribute("TreeNotData");
-						TreeNode topnd = new TreeNode(topele.GetAttribute("MenuTitle"), ROGROUPIMAGE, ROGROUPIMAGE);
+						TreeNode topnd = new TreeNode(topele.GetAttribute("MenuTitle"),ROGROUPIMAGE,ROGROUPIMAGE);
 						topnd.Tag = topele;
 						roTreeView.SelectedNode.Nodes.Add(topnd);
 						roTreeView.Refresh();
@@ -2504,7 +2484,7 @@ namespace ROEditor
 				MessageBox.Show("Subgroup Definition does not exist, check Subgroup Definition under Properties for the Group that contains this Subgroup.");
 				return;
 			}
-			VlnXmlElement nelem = (VlnXmlElement)curelem.OwnerDocument.CreateElement("vlnGroup");
+			VlnXmlElement nelem = (VlnXmlElement) curelem.OwnerDocument.CreateElement("vlnGroup");
 			if (curelem.Name != "vlnGroup") // selected new group off ro, add to parent
 			{
 				curelem.ParentNode.AppendChild((XmlNode)nelem);
@@ -2513,7 +2493,7 @@ namespace ROEditor
 			else
 			{	
 				curelem.AppendChild(nelem);
-				TreeNewparent = roTreeView.SelectedNode;
+				TreeNewparent=roTreeView.SelectedNode;
 			}
 			newone = nelem;
 
@@ -2521,7 +2501,7 @@ namespace ROEditor
 			int retval = roTreeView_ClearEditDisplay(false);
 			if (retval == -1) return;
 			roListView_ClearListDisplay();
-			CreateCtlXmlEdit2(nelem, myschema, reqfields, null);
+			CreateCtlXmlEdit2(nelem,myschema,reqfields, null);
 	
 			ctlXMLEdit2.Focus();
 			rbtnSave.Enabled = false; // initial disable the save button	
@@ -2537,7 +2517,7 @@ namespace ROEditor
 		private void menuNewRefObj_Click(object sender, System.EventArgs e)
 		{
 			int retval = roTreeView_ClearEditDisplay(false);
-			ArrayList InUseApplcList = null;
+			ArrayList InUseApplcList=null;
 			if (retval == -1) return;
 			roListView_ClearListDisplay();
 			VlnXmlElement curelem = (VlnXmlElement)roTreeView.SelectedNode.Tag;
@@ -2546,24 +2526,24 @@ namespace ROEditor
 			// make a dummy parent which is the 'group' level so that it can be
 			// associated with a schema.
 			XmlNode parent = curelem.ParentNode;
-			VlnXmlElement nmele = curelem;
+			VlnXmlElement nmele=curelem;
 			while (parent.Name != "RO_Root")
 			{
-				nmele = (VlnXmlElement)parent;
+				nmele = (VlnXmlElement) parent;
-				parent = (VlnXmlElement)parent.ParentNode;
+				parent = (VlnXmlElement) parent.ParentNode;
 			}
 
 			// get the name for the new element...
 			int indx = nmele.InnerXml.IndexOf("<");
 			string nm = null;
-			if (indx < 0)  // not found, just use innerxml
+			if (indx<0)  // not found, just use innerxml
 				nm = nmele.InnerText;
 			else
-				nm = nmele.InnerXml.Substring(0, indx);
+				nm = nmele.InnerXml.Substring(0,indx);
-			VlnXmlElement nelem = (VlnXmlElement)curelem.OwnerDocument.CreateElement(CvtUserFldToFld(nm));
+			VlnXmlElement nelem = (VlnXmlElement) curelem.OwnerDocument.CreateElement(CvtUserFldToFld(nm));
 			if (curelem.Name != "vlnGroup") // selected new ro off ro, add to parent
 			{
-				curelem.ParentNode.AppendChild((XmlNode)nelem);
+				curelem.ParentNode.AppendChild((XmlNode) nelem);
 				TreeNewparent = roTreeView.SelectedNode.Parent;
 				InUseApplcList = GetApplcFieldListForElement(curelem); //C2021-026 get list of fields with P/C enabled
 			}
@@ -2575,7 +2555,7 @@ namespace ROEditor
 			newone = nelem;
 			ArrayList reqfields = nelem.GetRequiredFields();
 
-			CreateCtlXmlEdit2(nelem, myschema, reqfields, InUseApplcList);
+			CreateCtlXmlEdit2(nelem,myschema,reqfields, InUseApplcList);
 			ctlXMLEdit2.Focus();
 
 			rbtnSave.Enabled = false; // initial disable the save button
@@ -2672,16 +2652,16 @@ namespace ROEditor
 				{
 					topele.RemoveAttribute("TreeNotData");
 					int cnt = rootNode.GetNodeCount(false);
-					for (int i = 0; i < cnt; i++)
+					for(int i=0;i<cnt;i++)
 					{
 						TreeNode nd = rootNode.Nodes[i];
 						if (nd.Tag == topele)
 						{
-							CleanUpTree(topele, nd);
+							CleanUpTree(topele,nd);
 						}
 					}
 				}
-				topele = (VlnXmlElement)topele.NextSibling;
+				topele = (VlnXmlElement) topele.NextSibling;
 			}
 			// if a fieldname changed, we may even have to check the 'top' group nodes
 
@@ -2705,7 +2685,7 @@ namespace ROEditor
 		 */
 		private void menuROEdit_Click(object sender, System.EventArgs e)
 		{
-			roTreeView_OnDoubleClick(sender, e);
+			roTreeView_OnDoubleClick (sender, e);
 		}
 
 
@@ -2812,25 +2792,25 @@ namespace ROEditor
 				// check for duplicates on accessory page id, if it changed.
 				string acctmpl = myro.GetAccPageIDTemplate();
 				string newacc = myro.GetAccPageIDString(acctmpl);
-				if (newacc == null) return false;
+				if (newacc==null)return false;
 				if (newone != null)  // if this is new, set the table for accpageid check
 				{
-					XmlNode nd = (XmlNode)myro.ParentNode;
+					XmlNode nd = (XmlNode) myro.ParentNode;
-					VlnXmlElement end = (VlnXmlElement)nd;
+					VlnXmlElement end = (VlnXmlElement) nd;
 					string tb = end.GetAttribute("Table");
-					myro.SetAttribute("Table", tb);
+					myro.SetAttribute("Table",tb);
 				}
 				string t1 = newacc.Trim();
 				string t2 = myro.GetAttribute("AccPageID");
 				string t3 = t2.Trim();
 				if (t1 != t3)
 				{
-					if (myrodb.IsDuplicateAccPageID(myro, newacc) == true)
+					if (myrodb.IsDuplicateAccPageID(myro,newacc)== true)
 					{
-						MessageBox.Show("The fields used for the \"Accessory Pages Access\" values must be unique. The fields used in these values can be found under \"Properties\" of an RO Group. Cannot save.", "Problem saving data");
+						MessageBox.Show("The fields used for the \"Accessory Pages Access\" values must be unique. The fields used in these values can be found under \"Properties\" of an RO Group. Cannot save.","Problem saving data");
 						return false;
 					}
-					  myro.SetAttribute("AccPageID", myro.GetAccPageIDString(acctmpl));
+					myro.SetAttribute("AccPageID", myro.GetAccPageIDString(acctmpl));
 				}
 			}
 			else
@@ -2854,8 +2834,8 @@ namespace ROEditor
 				success = myrodb.RODB_InsertRO(myro);
 				if (success == true)
 				{
-					int img = (myro.Name == "vlnGroup") ? ROGROUPIMAGE : ROIMAGE;
+					int img = (myro.Name=="vlnGroup")?ROGROUPIMAGE:ROIMAGE;
-					newt = new TreeNode(mnutitle, img, img);
+					newt = new TreeNode(mnutitle,img,img);
 					newt.Tag = myro;
 					newt.Name = myro.GetAttribute("RecID");
 					newt.Text = Regex.Replace(newt.Text, @"\\u([0-9]{1,4})\?", m => Convert.ToChar(int.Parse(m.Groups[1].Value)).ToString()); // RO Editor add symbols C2022 - 003 
@@ -2864,9 +2844,9 @@ namespace ROEditor
 			}
 			else
 			{
-				newt = null;
+				newt=null;
 				success = myrodb.RODB_WriteRO((VlnXmlElement)roTreeView.SelectedNode.Tag);
-				if (success == true && mnutitle != "") roTreeView.SelectedNode.Text = mnutitle; //B2021-077 make sure mnutitle has text or it will clear the node's title in the tree
+				if (success==true && mnutitle != "") roTreeView.SelectedNode.Text = mnutitle; //B2021-077 make sure mnutitle has text or it will clear the node's title in the tree
 			}
 			newone = null;
 			return true;
@@ -2908,8 +2888,8 @@ namespace ROEditor
 		{
 			bool dup;
 			bool success;
-			VlnXmlElement newro = (VlnXmlElement)roTreeView.SelectedNode.Tag;
+			VlnXmlElement newro = (VlnXmlElement) roTreeView.SelectedNode.Tag;
-			VlnXmlElement origro = (VlnXmlElement)newro.Clone();
+			VlnXmlElement origro = (VlnXmlElement) newro.Clone();
 			string savedInnerXML = newro.InnerXml;
 			XmlNode parent = newro.ParentNode;
 			success = ctlXMLEdit2.SaveData();
@@ -2935,7 +2915,7 @@ namespace ROEditor
 				// ros (which is what we have hear for saveas or duplicate)
 				newro.RemoveAttribute("RecID");
 				dup = myrodb.IsDuplicateAccPageID(newro, newacc);
-				newro.SetAttribute("RecID", savrec);
+				newro.SetAttribute("RecID",savrec);
 				if (dup == true)
 				{
 					MessageBox.Show("The fields used for the \"Accessory Pages Access\" values must be unique. The fields used in these values can be found under \"Properties\" of an RO Group. Cannot save.", "Problem saving data");
@@ -2948,19 +2928,19 @@ namespace ROEditor
 			else
 				mnutmp = newro.GetMenuValueTemplate("GroupMenuItem");
 			string mnutitle = newro.GetMenuString(mnutmp, false);
-			parent.AppendChild((XmlNode)origro);  // need this for duplicate check.
+			parent.AppendChild((XmlNode) origro);  // need this for duplicate check.
 			dup = newro.IsDuplicateMenuTitle(mnutitle);
-			if (dup == true)
+			if (dup==true)
 			{
-				MessageBox.Show("The fields used for the \"Menu\" values must be unique. The fields used in these values can be found under \"Properties\" of an RO Group. Cannot save.", "Problem saving data");
+				MessageBox.Show("The fields used for the \"Menu\" values must be unique. The fields used in these values can be found under \"Properties\" of an RO Group. Cannot save.","Problem saving data");
 				parent.RemoveChild(origro);
 				rbtnRestore.Enabled = false;
 				ctlXMLEdit2.SetNotSaved();
 				ctlXMLEdit2.RestoreInnerXml(savedInnerXML);  //B2017-089 - restore the inner xml so orignial does not get new changes
 				return;
 			}
-			if (acctmpl != null) newro.SetAttribute("AccPageID", newro.GetAccPageIDString(acctmpl));
+			if (acctmpl!=null)newro.SetAttribute("AccPageID", newro.GetAccPageIDString(acctmpl));
-			newro.SetAttribute("MenuTitle", mnutitle);
+			newro.SetAttribute("MenuTitle",mnutitle);
 			newro.RemoveAttribute("RecID");  // get a new one.
 
 			success = myrodb.RODB_InsertRO(newro);
@@ -2998,7 +2978,7 @@ namespace ROEditor
 			rbtnDuplicate.Enabled = false;
 		}
 
-		protected void tbar_ZoomClick(object sender, System.EventArgs e)
+		protected void tbar_ZoomClick(object sender,  System.EventArgs e)
 		{
 			ctlXMLEdit2.btnZoom_click(sender, e);
 
@@ -3039,7 +3019,7 @@ namespace ROEditor
 					break;
 				}
 			}
-			if (ele.Name != "vlnGroup" && attop == false)
+			if (ele.Name != "vlnGroup" && attop==false)
 				EditRO(ele);
 		}
 
@@ -3047,7 +3027,7 @@ namespace ROEditor
 		private void DisplayGroupElements(VlnXmlElement selele)
 		{
 			ROField rof;
-			string nm, tmp = null;
+			string nm, tmp=null;
 			roListView.Clear();
 			bool AllGroups = true;
 			ArrayList InUseList = null;
@@ -3061,9 +3041,9 @@ namespace ROEditor
 			// Put out fields and their associated data.
 			if (InUseList != null) 
 			{
-				for (int i = 0; i < InUseList.Count; i++)
+				for (int i=0;i< InUseList.Count; i++)
 				{
-					rof = (ROField)InUseList[i];
+					rof = (ROField) InUseList[i];
 					if (rof.GetFieldname != null)
 					{
 						uint ftype = rof.GetFieldType;
@@ -3081,7 +3061,7 @@ namespace ROEditor
 			{
 				if (curnd is VlnXmlElement)
 				{
-					VlnXmlElement curele = (VlnXmlElement)curnd;
+					VlnXmlElement curele = (VlnXmlElement) curnd;
 					if (curele.Name == "vlnGroup")
 					{
 						if (selele.Name == "RO_Root")
@@ -3096,14 +3076,14 @@ namespace ROEditor
 					{
 						int levelcnt = curele.ChildNodes.Count;
 						string TheMenuTitle = curele.GetAttribute("MenuTitle");
-						if ((levelcnt > 1) || (levelcnt == 1 && !TheMenuTitle.Equals("")))
+						if ((levelcnt > 1) || (levelcnt==1 && !TheMenuTitle.Equals("")))
 						{
 							AllGroups = false;
-							ListViewItem item = null;
+							ListViewItem item=null;
 							bool first = true;
 							for (int i = 0; i < InUseList.Count; i++)
 							{
-								rof = (ROField)InUseList[i];
+								rof = (ROField) InUseList[i];
 								if (rof.GetFieldname != null)
 								{
 									uint ftype = rof.GetFieldType;
@@ -3145,16 +3125,16 @@ namespace ROEditor
 			if (AllGroups == true)
 			{
 				roListView.Columns.Clear();
-				roListView.Columns.Add("Group", 250, HorizontalAlignment.Left);
+				roListView.Columns.Add("Group",250,HorizontalAlignment.Left);
 			}
 
-			roListView.Visible = true;
+			roListView.Visible=true;
 		}
 
 		private void updateRoListView(TreeNode node)
 		{
 			VlnXmlElement selele;
-			selele = (VlnXmlElement)node.Tag;
+			selele = (VlnXmlElement) node.Tag;
 			if (selele.Name != "vlnGroup" && selele.Name != "RO_Root")
 			{
 				// if we already have a list view, and we're still under the same parent,
@@ -3163,7 +3143,7 @@ namespace ROEditor
 				if (roListView != null && roListView.Items.Count > 0)
 				{
 					curele = (VlnXmlElement)roListView.Items[0].Tag;
-					if (selele.ParentNode != curele.ParentNode) roListView_ClearListDisplay();
+					if (selele.ParentNode != curele.ParentNode)roListView_ClearListDisplay();
 				}
 				return;
 			}
@@ -3196,7 +3176,7 @@ namespace ROEditor
 		void roListView_Column_Header_OnClick(object sender, ColumnClickEventArgs e)
 		{
 			int indx = e.Column;
-			MyListViewComparer LVCompare = (MyListViewComparer)roListView.ListViewItemSorter;
+			MyListViewComparer LVCompare = (MyListViewComparer) roListView.ListViewItemSorter;
 			LVCompare.SetColumnToSortBy(indx);
 			roListView.Sort();
 		}

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

@@ -884,3 +884,4 @@ namespace ROEditor
 
 	}
 }
+

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ZoomDialog.cs

@@ -149,3 +149,4 @@ namespace ctlXMLEditLib
 		
 	}
 }
+

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs

@@ -497,7 +497,7 @@ namespace ctlXMLEditLib
 			foreach (string str in myHT.Keys)
 			{
 				o = myHT[str];
-				hwnd = (roRichTextBox)o;
+				hwnd = (roRichTextBox) o;
 				nd = node.SelectSingleNode(str);
 				// if not found with just the string, search the tree.
 				if (nd==null)nd = node.SelectSingleNode("*/"+str);
@@ -966,7 +966,7 @@ namespace ctlXMLEditLib
 				{
 					mytextbox.Multiline = true;
 					mytextbox.AcceptsTab = true;
-					mytextbox.Height = (int)mytextbox.Font.GetHeight() * 4;
+					mytextbox.Height = (int) mytextbox.Font.GetHeight() * 4;
 					mytextbox.ScrollBars = RichTextBoxScrollBars.Vertical;
 					zmtooltip.SetToolTip(mytextbox, "Press Shift F2 To Zoom");
 				}

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/roRichTextBox.cs

@@ -97,3 +97,4 @@ namespace ctlXMLEditLib
 		}
 	}
 }
+

PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs

@@ -68,6 +68,8 @@ namespace VEPROMS
 			this.btnNext = new System.Windows.Forms.Button();
 			this.cmbFont = new System.Windows.Forms.ComboBox();
 			this.lblDummy = new System.Windows.Forms.Label();
+			this.btnFilter = new DevComponents.DotNetBar.ButtonItem();
+			this.txtFilter = new DevComponents.DotNetBar.TextBoxItem();
 			this.labelItem10 = new DevComponents.DotNetBar.LabelItem();
 			this.bottomProgBar = new DevComponents.DotNetBar.ProgressBarItem();
 			this.labelItem9 = new DevComponents.DotNetBar.LabelItem();
@@ -75,8 +77,6 @@ namespace VEPROMS
 			this.lblEditView = new DevComponents.DotNetBar.LabelItem();
 			this.labelItem11 = new DevComponents.DotNetBar.LabelItem();
 			this.btnItemInfo = new DevComponents.DotNetBar.ButtonItem();
-			this.btnFilter = new DevComponents.DotNetBar.ButtonItem();
-			this.txtFilter = new DevComponents.DotNetBar.TextBoxItem();
 			this.lblItemID = new DevComponents.DotNetBar.LabelItem();
 			this.lblResolution = new DevComponents.DotNetBar.LabelItem();
 			this.btnEditItem = new DevComponents.DotNetBar.ButtonItem();
@@ -527,22 +527,22 @@ namespace VEPROMS
 			this.bottomBar.Font = new System.Drawing.Font("Segoe UI", 9F);
 			this.bottomBar.IsMaximized = false;
 			this.bottomBar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-			this.btnFilter,
+            this.btnFilter,
-			this.txtFilter,
+            this.txtFilter,
-			this.labelItem10,
+            this.labelItem10,
             this.bottomProgBar,
             this.labelItem9,
-			this.lblPreEditView,
+            this.lblPreEditView,
-			this.lblEditView,
+            this.lblEditView,
-			this.labelItem11,
+            this.labelItem11,
-			this.btnItemInfo,
+            this.btnItemInfo,
-			this.lblItemID,
+            this.lblItemID,
-			this.lblResolution,
+            this.lblResolution,
-			this.btnEditItem,
+            this.btnEditItem,
-			this.lblUser,
+            this.lblUser,
-			this.lblLastChange,
+            this.lblLastChange,
-			this.btnStepRTF,
+            this.btnStepRTF,
-			this.btnFixMSWord});
+            this.btnFixMSWord});
 			this.bottomBar.Location = new System.Drawing.Point(5, 573);
 			this.bottomBar.Name = "bottomBar";
 			this.bottomBar.Size = new System.Drawing.Size(1185, 25);
@@ -552,21 +552,6 @@ namespace VEPROMS
 			this.bottomBar.TabStop = false;
 			this.bottomBar.Text = "bar1";
 			// 
-			// btnFilter
-			// 
-			this.btnFilter.Name = "btnFilter";
-			this.btnFilter.Text = "Tree View Search:";
-			this.btnFilter.Click += SubmitFilter;
-			// 
-			// txtFilter
-			// 
-			this.txtFilter.TextBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
-			this.txtFilter.Name = "txtFilter";
-			this.txtFilter.TextBoxWidth = 120;
-			this.txtFilter.TextBox.TabIndex = 0;
-			this.txtFilter.TextBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.FilterEnterKey);
-			this.superTooltip1.SetSuperTooltip(this.txtFilter, new DevComponents.DotNetBar.SuperTooltipInfo("Filter", "", "This will filter the Procedure Tree in PROMS to Procedures containing entered words in the Procedure Number or Title. Press enter or the Tree View Search button to submit.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			// 
 			// txtSearch
 			// 
 			this.txtSearch.Dock = System.Windows.Forms.DockStyle.Right;
@@ -638,6 +623,20 @@ namespace VEPROMS
 			this.lblDummy.TabIndex = 5;
 			this.lblDummy.Visible = false;
 			// 
+			// btnFilter
+			// 
+			this.btnFilter.Name = "btnFilter";
+			this.btnFilter.Text = "Tree View Search:";
+			// 
+			// txtFilter
+			// 
+			this.txtFilter.Name = "txtFilter";
+			this.superTooltip1.SetSuperTooltip(this.txtFilter, new DevComponents.DotNetBar.SuperTooltipInfo("Filter", "", "This will filter the Procedure Tree in PROMS to Procedures containing entered wor" +
+            "ds in the Procedure Number or Title. Press enter or the Tree View Search button " +
+            "to submit.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+			this.txtFilter.TextBoxWidth = 120;
+			this.txtFilter.WatermarkColor = System.Drawing.SystemColors.GrayText;
+			// 
 			// labelItem10
 			// 
 			this.labelItem10.BorderSide = DevComponents.DotNetBar.eBorderSide.Left;
@@ -662,17 +661,18 @@ namespace VEPROMS
 			this.labelItem9.BorderType = DevComponents.DotNetBar.eBorderType.Bump;
 			this.labelItem9.Name = "labelItem9";
 			// 
+			// lblPreEditView
+			// 
+			this.lblPreEditView.BorderSide = DevComponents.DotNetBar.eBorderSide.Left;
+			this.lblPreEditView.BorderType = DevComponents.DotNetBar.eBorderType.Bump;
+			this.lblPreEditView.Name = "lblPreEditView";
+			// 
 			// lblEditView
 			// 
 			this.lblEditView.BackColor = System.Drawing.Color.Transparent;
 			this.lblEditView.ForeColor = System.Drawing.SystemColors.MenuText;
 			this.lblEditView.Name = "lblEditView";
 			this.lblEditView.Text = "Edit";
-			// lblEditView
-			// 
-			this.lblPreEditView.BorderSide = DevComponents.DotNetBar.eBorderSide.Left;
-			this.lblPreEditView.BorderType = DevComponents.DotNetBar.eBorderType.Bump;
-			this.lblPreEditView.Name = "lblPreEditView";
 			// 
 			// labelItem11
 			// 
@@ -1153,6 +1153,7 @@ namespace VEPROMS
 			// 
 			this.displayRO.CurROLink = null;
 			this.displayRO.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.displayRO.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
 			this.displayRO.Location = new System.Drawing.Point(1, 1);
 			this.displayRO.Margin = new System.Windows.Forms.Padding(4);
 			this.displayRO.MyDvi = null;
@@ -1170,6 +1171,7 @@ namespace VEPROMS
 			this.tc.ChgId = null;
 			this.tc.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.tc.ForeColor = System.Drawing.SystemColors.ControlText;
+			this.tc.IsInEditorialMode = false;
 			this.tc.LastSelectedDisplayTabItem = null;
 			this.tc.Location = new System.Drawing.Point(334, 57);
 			this.tc.Margin = new System.Windows.Forms.Padding(4);

PROMS/VEPROMS User Interface/frmVEPROMS.resx

@@ -121,7 +121,7 @@
   <data name="btnHelp.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr7AAAK+wHLnx2QAAACG0lE
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr6AAAK+gEZ2P90AAACG0lE
         QVQ4T6WQX0sUURiH/Qj7EeYjSEEXXe1ll4dS2MsNutgLjaWLkCAahGBJqo2QXBJ3siKNNefG2ixzojQl
         wiGzNpXdUazUHfXUWPin9olzJt22hSAa+DGHl/d53vecBqDhf1JXUBmbDrg5vErqVon2nlk6c/MMPf/A
         n311gtfFLfpH18kOr+CVd/i8uYsMdvDK21zsL5DKugy/WKwR1cB3nQ38rxUcF8w+EKkw6uy4kuJGhXOd
@@ -137,7 +137,7 @@
   <data name="btnHelpManual.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJuAAASbgHMBsReAAACP0lE
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJtAAASbQFhv+UzAAACP0lE
         QVQ4T53R30tTYRzHcf+F/oD+g7rrpovAkKg/wMsogqAk6SIoFLsQDTIEox/+xKIf/kymmB4zTe2o2War
         6XTT6aZb/tyZTuec03Oec95xznAgW130wAeeA8/39XwOTw6QY+Zxu59sqehY4tF7r7V/0u7j+Pxx0hvz
         gLk0Aw41SKgGsUOD6IHBVly3gAc9yr8BTYekBvtHBrGkwXbCIBLX2Yjp5LUkreQ+D55ATgBJFeKHBrvm
@@ -153,7 +153,7 @@
   <data name="btnHelpVWeb.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr7AAAK+wHLnx2QAAADAklE
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr6AAAK+gEZ2P90AAADAklE
         QVQ4T32R3U9ScRjH+wNaW62rml7UevGtVasMa71pqSVNKaLMMsVAFOpYqVNBUqRieTA8iGhBcawMp4Wo
         neoiJ6P1ptOmsZqKK5g6zbWmvTjTbzsUN1JdfJ+b7+/5PM/z/S0AsIAVRTNBFM0QFM0wFeaWMU3N/TEV
         ZWXkZB2Rq74R5H83X/5mDkUztvLWJlBdVlS6aqEbKMGZ9kSkVZCQFlfZMvJIzvxmH+DPZFtRmxaX3xfg
@@ -173,21 +173,21 @@
   <data name="btnShowErrFld.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
-        EwAACxMBAJqcGAAAADRJREFUOE9jYKAUfGoS/I8Nf2wU6EBXixWgayTZEHRN6JigIf+X6f2nBI8aMGoA
+        EgAACxIB0t1+/AAAADRJREFUOE9jYKAUfGoS/I8Nf2wU6EBXixWgayTZEHRN6JigIf+X6f2nBI8aMGoA
         dQwYcAAA71z+QkP4emIAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="btnShowPrtFld.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
-        EwAACxMBAJqcGAAAADRJREFUOE9jYKAUfGoS/I8Nf2wU6EBXixWgayTZEHRN6JigIf+X6f2nBI8aMGoA
+        EgAACxIB0t1+/AAAADRJREFUOE9jYKAUfGoS/I8Nf2wU6EBXixWgayTZEHRN6JigIf+X6f2nBI8aMGoA
         dQwYcAAA71z+QkP4emIAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="btnHelpAbout.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJuAAASbgHMBsReAAAChUlE
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJtAAASbQFhv+UzAAAChUlE
         QVQ4T6WR+0uTURzG3/+i/yAICiGCCIPIH8pUUgzJlAx0Ts0bmF3MsiAm4SU1b2nZzBSzzBCZuhItFaXE
         UPAyTabpanNz6nx1c+5dn3i30E1/7AvPl3Oec54P5yIAwv/ogJFRoyf39SIPms3cqjejKJ3leuEQOSVa
         9u/1A6RWzpClnqe4w8jgnJ1Zo5MFs4TeaOfz6CIF6kEuZdYTf++NH8jTlKWTZL3Q0zK8giQv/6v1LYm1
@@ -231,7 +231,7 @@
   <data name="btnNew.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJrAAASawHhvKGoAAAD+UlE
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJqAAASagEz+0NMAAAD+UlE
         QVRYR82W224TVxiF/7teBfUJ+gp9ij5ABeGQEEI4BWLS3nJRCamq+gx9h9Ko6kVVUVGkCNFwSqhJQsiB
         BBOMndge23Gc+DSrWvsw3h7b20YgtVtaN9bo/9Zae2/PiPyv1sl7gZy6Dxmdh4w+gJx+CDmzADn7GHLu
         KWRsETL2HDKehJxfhkysQibWIBfWIZMbkMktyMVtyNQOZCoVyKXdyTjCv07dx7MMPlq/rAK3fq9hJJGG
@@ -255,7 +255,7 @@
   <data name="btnOpen.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJrAAASawHhvKGoAAADNklE
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJqAAASagEz+0NMAAADNklE
         QVRYR+3Xf2jUZQDH8YcIS5xWWEQqZzl7zAruj8LAsg233e2HmtiPQaNkTTZo1BzcL7ernSNU5tCQG8w5
         ue6mKCLFza7oNvo2HG6RunJof9hxiuISS0FlW6a947nDOZ8ZG+OR/MMPvP79fj7c3fd7z1eI+7kX4sqV
         dleurHMrebd4FEeadzSnrPOlvaFfa1Jx5Uprb0M58bB/rEhaxx34nPKSfq1JRQ34rW8X/wzHuHG5dcJ8
@@ -275,7 +275,7 @@
   <data name="btnPrepare.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJrAAASawHhvKGoAAAJsUlE
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJqAAASagEz+0NMAAAJsUlE
         QVRYR8WWd1SUZxaHiS1K78UCiCVqElGImk3UaESQOlSxUVajWaMI9rXECULUKCJdQWWsQRgRCwiigtgr
         xhpjDBgbKmVAqibx2fO9o0Y07tn4z95z7pw5c2a++8zvPu83o6Hxhopyay9LlJkqtvnplG710WWjtz7r
         PQ1J9jBSJbqbKOLczGxf/czfLeDVlzQ09o1rY7t37LvnFzjakOptyA5/TZQjtUnz1WGTtx6pngYSBAlu
@@ -323,7 +323,7 @@
   <data name="btnOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJrAAASawHhvKGoAAAC6UlE
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJqAAASagEz+0NMAAAC6UlE
         QVQ4T33O7U9TZxjH8fsPMEaT6RujJosmSzTBRN+gTl74wsVoss2HBmGg0Q20sCrq1BW8MT67acyALIFN
         iaPaTRQfgDYIgYSh4ji0XSelUE8NJxJAOUiFQmg536X0OLIs2S/5JfeL6/rclxCJbGtKE9tbpNjZJoWl
         XYp0RYoMnxSZz6XI6pYiOyTF7rAUe/psM/NmAPO1vUV6B+H/Wu0HS9UUCw4NXf8vsLNNht+Cfwh8g/DX
@@ -345,7 +345,7 @@
   <data name="btnExit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJrAAASawHhvKGoAAACZUlE
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJqAAASagEz+0NMAAACZUlE
         QVQ4T6WTXUySYRTHuXzely9BJBQEP5AiUZoWNgzLPmxJad3oKi/Ki3LdeMlFW3YR0uzbrdpa9qW1Sgtb
         ThNHUJRlH7OLmuQwymqrUbG2dGW1f3se0gF20ebZzrtn59n5ved/znkEAARz8dhHIBA4OKJzcOTIPp74
         pt0p5HzNQs7njIvt5shZB0eW05wZgIMj0iaeRNvEBOckHC7KxbiWkYqbOhV6slTozlTiijIFF6Q8u2/m
@@ -362,7 +362,7 @@
   <data name="btnAnnoDetailsPushPin.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJuAAASbgHMBsReAAACQElE
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJtAAASbQFhv+UzAAACQElE
         QVQ4T2P4//8/AyUYQ4AQzsvLYyTagIaGBqnCwkIBdHGCBrS2tGg3NjYuaWpqmjN58uSCxsbGDpB4V1cX
         d1JSkiqI3d3dLYhiQEdXL9hpra2tkqWlpSt37Njx/+bNm2++fv36e8mSJf+Li4sNIiMjA+rq6npPnz5d
         19TUtLOoqIiPob2zm7+mrkmrpa2LvatngkRldXXovPnzP/z+/fs/COzavfv/zVu3/jc2NS1oaWk5df78
@@ -378,7 +378,7 @@
   <data name="btnAnnoDetailsPushPin.PressedImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJuAAASbgHMBsReAAACfUlE
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJtAAASbQFhv+UzAAACfUlE
         QVQ4T2P4//8/AwxXVFSwFxUVJUyaNGn3tm3b/q1cufL/hAkTPoSGhh5UUVFJ09fX50RWD8IoHBBes2bN
         zJcvX/78/////y9fvvw/c+bM/7a2tv8GBgY7NTU1DR0dHZlxGjB9+nTWpUuXZr58+fLNhw8f/l+5cuX/
         6tWr/5eXV/x3dnberKurq6+lqYnbgPz8fN64uLjQqVOnnly7du2flpaW/7m5ef99ff1empqaVRubGPOh

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

@@ -0,0 +1,89 @@
+namespace Volian.Controls.Library
+{
+    partial class CustomMessageBox
+    {
+        /// <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 Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.btn1 = new System.Windows.Forms.Button();
+            this.btn2 = new System.Windows.Forms.Button();
+            this.lblMessage = new System.Windows.Forms.Label();
+            this.SuspendLayout();
+            // 
+            // btn1
+            // 
+            this.btn1.AutoSize = true;
+            this.btn1.Location = new System.Drawing.Point(12, 99);
+            this.btn1.Name = "btn1";
+            this.btn1.Size = new System.Drawing.Size(75, 23);
+            this.btn1.TabIndex = 0;
+            this.btn1.UseVisualStyleBackColor = true;
+            this.btn1.Click += new System.EventHandler(this.Btn1_Click);
+            // 
+            // btn2
+            // 
+            this.btn2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btn2.AutoSize = true;
+            this.btn2.Location = new System.Drawing.Point(322, 99);
+            this.btn2.Name = "btn2";
+            this.btn2.Size = new System.Drawing.Size(75, 23);
+            this.btn2.TabIndex = 1;
+            this.btn2.UseVisualStyleBackColor = true;
+            this.btn2.Click += new System.EventHandler(this.Btn2_Click);
+            // 
+            // lblMessage
+            // 
+            this.lblMessage.AutoSize = true;
+            this.lblMessage.Location = new System.Drawing.Point(33, 41);
+            this.lblMessage.Name = "lblMessage";
+            this.lblMessage.Size = new System.Drawing.Size(0, 13);
+            this.lblMessage.TabIndex = 2;
+            this.lblMessage.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // CustomMessageBox
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoSize = true;
+            this.ClientSize = new System.Drawing.Size(419, 130);
+            this.Controls.Add(this.lblMessage);
+            this.Controls.Add(this.btn2);
+            this.Controls.Add(this.btn1);
+            this.Name = "CustomMessageBox";
+            this.ShowIcon = false;
+            this.Text = "CustomMessageBox";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button btn1;
+        private System.Windows.Forms.Button btn2;
+        private System.Windows.Forms.Label lblMessage;
+    }
+}

PROMS/Volian.Controls.Library/CustomMessageBox.cs

@@ -0,0 +1,58 @@
+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 Volian.Controls.Library
+{
+    public partial class CustomMessageBox : Form
+    {
+        //Custome Message Box Class to allow renaming of buttons
+        // originally devleoped for use with 
+        // C2025-062 When Search clicked - Load the Incoming transitions for the Active Procedure
+        // in order to allow the user to decide if they wanted to search on the selected step or the selected procedure
+        public CustomMessageBox(string message, string title, string button1Text = "OK", string button2Text = "")
+        {
+            InitializeComponent();
+            this.Text = title;
+            lblMessage.Text = message;
+            btn1.Text = button1Text;
+
+            if (!string.IsNullOrEmpty(button2Text))
+            {
+                btn2.Text = button2Text;
+                btn2.Visible = true;
+            }
+            else
+            {
+                btn2.Visible = false;
+            }
+        }
+
+        private void Btn1_Click(object sender, EventArgs e)
+        {
+            DialogResult = DialogResult.Yes;
+            Close();
+        }
+
+        private void Btn2_Click(object sender, EventArgs e)
+        {
+            DialogResult = DialogResult.No;
+            Close();
+        }
+
+        //static method for calling custommessagebox directly
+        public static DialogResult Show(string message, string title, string button1Text = "OK", string button2Text = "")
+        {
+            using (var messageBox = new CustomMessageBox(message, title, button1Text, button2Text))
+            {
+                return messageBox.ShowDialog();
+            }
+        }
+    }
+}

PROMS/Volian.Controls.Library/CustomMessageBox.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

PROMS/Volian.Controls.Library/DisplaySearch.cs

@@ -414,6 +414,15 @@ namespace Volian.Controls.Library
 			lbSrchResults.Visible = true;
 			lbSrchResultsIncTrans.Visible = false;
 			cbxRnoOnly.Visible = true;
+
+			// C2025-062 When Search clicked - Load the Incoming transitions for the Active Procedure
+			//don't allow changing the Style for Incoming Transitions
+			//but allow them to change it if there are search results and it is another tab
+			if (_SearchResults != null && _SearchResults.Count > 0)
+			{
+				cmbResultsStyle.Enabled = true;
+			}
+
 			if (e.NewTab == tabIncTrans)        // C2020-033: Incoming transitions
 			{
 				xpSetToSearch.Enabled = false;
@@ -422,7 +431,7 @@ namespace Volian.Controls.Library
 				lbSrchResultsIncTrans.Visible = true;
 				lbSrchResultsIncTrans.CheckBoxesVisible = true;
 				lbSrchResultsIncTrans.AutoScroll = true;
-				btnSearch.Enabled = false; // C2021 - 002: disable search button - no functionality for Incoming Transitions
+				cmbResultsStyle.Enabled = false;
 				cbxRnoOnly.Visible = false;
 			}
 			else if (e.NewTab == tabROSearch)
@@ -648,7 +657,6 @@ namespace Volian.Controls.Library
 			}
 			btnTranCvtAllToTxt.Enabled = IncTransCvtAllToTextPerm();
 			btnTranCvtSelToTxt.Enabled = false;
-			btnSearch.Enabled = false;  // C2021 - 002: disable search button - no functionality for Incoming Transitions
 		}
 
 		public bool IncTranCvtPerm()
@@ -1765,7 +1773,8 @@ namespace Volian.Controls.Library
 				btnClearSearchResults.Enabled = true;
 				btnCopySearchResults.Enabled = true;
 				btnSaveSearchResults.Enabled = true;
-				cmbResultsStyle.Enabled = true;
+				if (tabSearchTypes.SelectedTab != tabIncTrans) 
+					cmbResultsStyle.Enabled = true;
 			}
 			else
 			{
@@ -2188,21 +2197,39 @@ namespace Volian.Controls.Library
 											   // C2019-001: Search in RNO steps only
 					if (cbxRnoOnlyTrans.Checked) GetInRNOResults();
 				}
-				else if (tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[4])
+				else if (tabSearchTypes.SelectedTab == tabIncTrans)
 				{
-					// C2020-033: Incoming Transitions: Make an iteminfolist from the list returned from
+					// C2025-062 When Search clicked - Load the Incoming transitions for the Active Procedure
-					//	GetExternalTransitionsToChildren (also gets transitions to the item itself)
+
-					// B2021-010: Use IncomingTranGetMergedTranList to get a complete list of incoming transitions (transitions to procedure
+					if (_TabControl?.MyEditItem?.MyItemInfo?.MyProcedure != null)
-					//	were only included if there were NO transitions to items within procedure)
-					ReportTitle = string.Format("Search For Incoming Transitions to {0}: ", SearchIncTransII.Path);
-					SearchResults = IncomingTranGetMergedTranList();
-					cmbResultsStyleIndex = 1;  //display step locations in results
-					if (SearchResults == null || SearchResults.Count == 0)
 					{
-						FlexibleMessageBox.Show("No Matches Found.", "Search");
+
+                        if (_TabControl?.MyEditItem?.MyItemInfo?.MyProcedure.ItemID == _TabControl?.MyEditItem?.MyItemInfo?.ItemID)
+                        {
+                            _ = _TabControl.OnSearchIncTrans(this, new vlnTreeItemInfoEventArgs(_TabControl?.MyEditItem?.MyItemInfo?.MyProcedure));
+                        }
+                        else
+                        {
+							//if on a step, check if the user wants to load incoming transitions for that step or the entire procedure
+							switch (CustomMessageBox.Show("Would you like to load incoming transitions for this procedure or this step?", "Load Incoming Transitions", "This Procedure", "This Step"))
+							{
+                                case DialogResult.Yes:
+                                    _ = _TabControl.OnSearchIncTrans(this, new vlnTreeItemInfoEventArgs(_TabControl?.MyEditItem?.MyItemInfo?.MyProcedure));
+                                    break;
+                                case DialogResult.No:
+                                    _ = _TabControl.OnSearchIncTrans(this, new vlnTreeItemInfoEventArgs(_TabControl?.MyEditItem?.MyItemInfo));
+                                    break;
+                                default:   //Cancel was pressed
+                                    break;
+                            }
+                        }
+					}
+					else
+					{
+						FlexibleMessageBox.Show("Please open a procedure before selecting this option to load incoming transitions for that procedure.", "Search");
 					}
 				}
-				if (SearchResults != null)
+				if (SearchResults != null && tabSearchTypes.SelectedTab != tabIncTrans)
 				{
 					AddMessageForEmptyAnnotations();
 					if (cmbResultsStyleIndex == 3 && cmbResultsStyle.Items.Count == 3) cmbResultsStyleIndex--;
@@ -2303,7 +2330,18 @@ namespace Volian.Controls.Library
 			cmbResultsStyle.Items.Add(comboItem2);
 			if (hasAnnot) cmbResultsStyle.Items.Add(comboItem3);
 			cmbResultsStyle.Items.Add(comboItem4);
-		}
+
+			// C2025-062 When Search clicked - Load the Incoming transitions for the Active Procedure
+			if (tabSearchTypes.SelectedTab == tabIncTrans)
+            {
+				cmbResultsStyle.SelectedIndex = -1;
+				cmbResultsStyle.Enabled = false;
+			}				
+			else
+            {
+                cmbResultsStyle.Enabled = true;
+            }
+        }
 
 		private void cbxTextSearchText_Leave(object sender, EventArgs e)
 		{

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

@@ -154,6 +154,12 @@
     <Compile Include="ConvertTable.cs">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="CustomMessageBox.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="CustomMessageBox.Designer.cs">
+      <DependentUpon>CustomMessageBox.cs</DependentUpon>
+    </Compile>
     <Compile Include="DisplayApplicability.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -454,6 +460,9 @@
       <DependentUpon>AnnotationSearch.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="CustomMessageBox.resx">
+      <DependentUpon>CustomMessageBox.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DisplayBookMarks.resx">
       <DependentUpon>DisplayBookMarks.cs</DependentUpon>
       <SubType>Designer</SubType>