C2024-041-Disable-UCF-(User-Control-of-Format)-options

PROMS/DropDownPanel/Controls/DropDownPanel.cs

@@ -28,9 +28,7 @@ namespace AT.STO.UI.Win
 
 			_dropDownHelper = new DropDownWindowHelper();
 
-			_dropDownHelper.DropDownClosed -= new DropDownClosedEventHandler(DropDownHelper_DropDownClosed);
 			_dropDownHelper.DropDownClosed += new DropDownClosedEventHandler(DropDownHelper_DropDownClosed);
-			_dropDownHelper.DropDownCancel -= new DropDownCancelEventHandler(DropDownHelper_DropDownCancel);
 			_dropDownHelper.DropDownCancel += new DropDownCancelEventHandler(DropDownHelper_DropDownCancel);
 			
 			combo.DisplayMember = "Text";
@@ -84,9 +82,7 @@ namespace AT.STO.UI.Win
 				DropDownForm dropDown = new DropDownForm(_dropDownControl);
 				
 				
-				dropDown.FinishEditing -= new DropDownValueChangedEventHandler(DropDown_FinishEditing);
 				dropDown.FinishEditing += new DropDownValueChangedEventHandler(DropDown_FinishEditing);
-				dropDown.ValueChanged -= new DropDownValueChangedEventHandler(DropDown_ValueChanged);
 				dropDown.ValueChanged += new DropDownValueChangedEventHandler(DropDown_ValueChanged);
 				
 				combo.DroppedDown = false;

PROMS/DropDownPanel/Forms/DropDownForm.cs

@@ -49,9 +49,7 @@ namespace AT.STO.UI.Win
 		{
 			base.OnShown(e);
 			
-			_control.FinishEditing -= new DropDownValueChangedEventHandler(Ctrl_FinishEditing);
 			_control.FinishEditing += new DropDownValueChangedEventHandler(Ctrl_FinishEditing);
-			_control.ValueChanged -= new DropDownValueChangedEventHandler(Ctrl_ValueChanged);
 			_control.ValueChanged += new DropDownValueChangedEventHandler(Ctrl_ValueChanged);
 		}
 	#endregion

PROMS/DropDownPanel/Helper/DropDownWindowHelper.cs

@@ -39,7 +39,6 @@ namespace AT.STO.UI.Win
 		public DropDownWindowHelper()
 		{
 			_filter = new DropDownMessageFilter(this);
-			_filter.DropDownCancel -= new DropDownCancelEventHandler(Popup_Cancel);
 			_filter.DropDownCancel += new DropDownCancelEventHandler(Popup_Cancel);
 		}
 	#endregion

PROMS/Formats/Formats.csproj

@@ -92,10 +92,6 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="epall\EPFormatTST1.xml" />
-    <Content Include="epall\EPFormatTST2.xml" />
-    <Content Include="epall\EPFormatTST3.xml" />
-    <Content Include="epall\EPFormatTST4.xml" />
     <Content Include="fmtall\AEPall.xml">
       <SubType>Designer</SubType>
     </Content>
@@ -180,7 +176,6 @@
     <Content Include="fmtall\CPL_03all.xml" />
     <Content Include="fmtall\CPSAMGDataall.xml" />
     <Content Include="fmtall\CPSAMGDEVall.xml" />
-    <Content Include="fmtall\EPTST1all.xml" />
     <Content Include="fmtall\CWEall.xml" />
     <Content Include="fmtall\CWEDEVall.xml" />
     <Content Include="fmtall\CWERall.xml" />
@@ -192,7 +187,6 @@
     <Content Include="fmtall\EFSGBCKall.xml" />
     <Content Include="fmtall\ELFDEVall.xml" />
     <Content Include="fmtall\ENall.xml" />
-    <Content Include="fmtall\EPTST2all.xml" />
     <Content Include="fmtall\ESFDEVall.xml" />
     <Content Include="fmtall\EXCLNall.xml" />
     <Content Include="fmtall\EXCLN_00all.xml" />
@@ -288,10 +282,6 @@
     <Content Include="fmtall\NSPWGall.xml" />
     <Content Include="fmtall\NSP_00all.xml" />
     <Content Include="fmtall\OHLPall.xml" />
-    <Content Include="fmtall\PROMSDemo1all.xml" />
-    <Content Include="fmtall\PROMSDemo2all.xml" />
-    <Content Include="fmtall\PROMSDemoALRall.xml" />
-    <Content Include="fmtall\PROMSDemoBCKall.xml" />
     <Content Include="fmtall\PROMSMan1all.xml" />
     <Content Include="fmtall\PROMSMan2all.xml" />
     <Content Include="fmtall\RGEall.xml" />
@@ -509,10 +499,6 @@
     <Content Include="genmacall\nspsam.svg" />
     <Content Include="genmacall\nspsamdev.svg" />
     <Content Include="genmacall\ohlp.svg" />
-    <Content Include="genmacall\PROMSDemo1.svg" />
-    <Content Include="genmacall\PROMSDemo2.svg" />
-    <Content Include="genmacall\PROMSDemoALR.svg" />
-    <Content Include="genmacall\PROMSDemoBCK.svg" />
     <Content Include="genmacall\PROMSMan1.svg" />
     <Content Include="genmacall\PROMSMan2.svg" />
     <Content Include="genmacall\rge.svg" />

PROMS/Formats/frmFormatCopy.Designer.cs

@@ -35,7 +35,6 @@ namespace Formats
 			this.buttonX2 = new DevComponents.DotNetBar.ButtonX();
 			this.labelX2 = new DevComponents.DotNetBar.LabelX();
 			this.LstBxExcludeFiles = new DevComponents.DotNetBar.ListBoxAdv();
-			this.cbIncludeDemoFormats = new DevComponents.DotNetBar.Controls.CheckBoxX();
 			this.SuspendLayout();
 			// 
 			// txbxPROMSFormatsPath
@@ -132,26 +131,11 @@ namespace Formats
 			this.LstBxExcludeFiles.TabIndex = 6;
 			this.LstBxExcludeFiles.Text = "listBoxAdv1";
 			// 
-			// cbIncludeDemoFormats
-			// 
-			// 
-			// 
-			// 
-			this.cbIncludeDemoFormats.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.cbIncludeDemoFormats.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.cbIncludeDemoFormats.Location = new System.Drawing.Point(43, 156);
-			this.cbIncludeDemoFormats.Name = "cbIncludeDemoFormats";
-			this.cbIncludeDemoFormats.Size = new System.Drawing.Size(160, 23);
-			this.cbIncludeDemoFormats.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2010;
-			this.cbIncludeDemoFormats.TabIndex = 7;
-			this.cbIncludeDemoFormats.Text = "Include Demo Formats";
-			// 
 			// frmFormatCopy
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.ClientSize = new System.Drawing.Size(496, 191);
-			this.Controls.Add(this.cbIncludeDemoFormats);
 			this.Controls.Add(this.LstBxExcludeFiles);
 			this.Controls.Add(this.labelX2);
 			this.Controls.Add(this.buttonX2);
@@ -174,7 +158,6 @@ namespace Formats
 		private DevComponents.DotNetBar.ButtonX buttonX2;
 		private DevComponents.DotNetBar.LabelX labelX2;
 		private DevComponents.DotNetBar.ListBoxAdv LstBxExcludeFiles;
-		private DevComponents.DotNetBar.Controls.CheckBoxX cbIncludeDemoFormats;
 	}
 }
 

PROMS/Formats/frmFormatCopy.cs

@@ -96,17 +96,13 @@ namespace Formats
 			if (!txbxPROMSFormatsPath.Text.EndsWith(@"\")) txbxPROMSFormatsPath.Text += @"\";
 		}
 
-		// Added a PROMSDemo to the list of excluded format files
+		public string[] excludeThese = { "WPS", "WPB", "VCBEPP" };
-		public string[] excludeThese = { "WPS", "WPB", "VCBEPP", "PROMSDemo" };
+
-		
-		// Added logic to support in inclusion of the PROMSDemo formats if the checkbox on the
-		// dialog is check
 		private bool ExcludeFromCopy(string fn)
 		{
 			// don't copy formats whos file name starts with..
 			foreach (string excludeThis in excludeThese)
-				if (fn.ToUpper().StartsWith(excludeThis) 
+				if (fn.ToUpper().StartsWith(excludeThis)) return true;
-					&& !(cbIncludeDemoFormats.Checked && fn.ToUpper().StartsWith("PROMSDEMO"))) return true;
 			return false;
 		}
 
@@ -165,5 +161,5 @@ namespace Formats
 			Application.Exit();
 		}
 
-	}
+}
 }

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs

@@ -276,10 +276,8 @@ namespace ctlXMLEditLib
 			bool imagechild;	//whether this field is a subchild of an image
 			string imagename;	//if subchild of image, name of image parent (for save)
 			string imagedate;   //if this was filename, save the date/time stamp
-			string name;        //name of element
-			string parenthtid;  //name of parent element in hashtable for PC items
 			public TextBoxAttrTag(bool reqd, string ptn, RadioButton rd, bool img, 
-				string imgname, string imgdate, string elemname) 
+				string imgname, string imgdate) 
 			{
 				this.req_msg = null;
 				this.required = reqd;
@@ -288,12 +286,6 @@ namespace ctlXMLEditLib
 				this.imagechild = img;
 				this.imagename = imgname;
 				this.imagedate = imgdate;
-				this.name = elemname;
-
-				if (name.Contains("_PCCHILD"))
-					this.parenthtid = name.Substring(0, name.IndexOf("_PCCHILD"));
-				else
-					this.parenthtid = null;
 			}
 			public void SetPattern(string pattern) {this.pattern = pattern;}
 			public void SetRequired(bool req) {this.required = req;}
@@ -306,10 +298,6 @@ namespace ctlXMLEditLib
 			public string GetImageName { get {return imagename;}}
 			public string GetImageDate { get {return imagedate;}}
 			public void SetImageDate(string imgdate) {this.imagedate = imgdate;}
-			public string GetName { get { return name; } }
-			public void SetName(string elemname) { this.name = elemname; }
-			public string GetParentHTId { get { return parenthtid; } }
-			public void SetParentHTId(string id) { this.parenthtid = id; }
 		}
 
 		public ctlXMLEdit(VlnXmlElement myelem, XmlSchema myschema, ArrayList reqfields, ArrayList fldsWithApplic, string [] pckids)
@@ -940,7 +928,7 @@ namespace ctlXMLEditLib
 			// initialization.
 			if (mytextbox.Tag == null)
 			{
-				TextBoxAttrTag tag = new TextBoxAttrTag(false, pattern, radio, img, (img?imgname:null), null, mytextbox.Name);
+				TextBoxAttrTag tag = new TextBoxAttrTag(false, pattern, radio, img, (img?imgname:null), null);
 				mytextbox.Tag = (object) tag;
 			}
 			return getannot;
@@ -1148,7 +1136,6 @@ namespace ctlXMLEditLib
 				mytextbox = new TextBox();
 				mytextbox.Location = new Point(screenx+indent, screeny);
 				string tFieldName = (pcChildIdx == 0) ? CvtUserFldToFld(element.Name) : CvtUserFldToFld(pcChildFldName);
-				mytextbox.Name = tFieldName;
 				myHT.Add(tFieldName, mytextbox);
 				tabindx++;
 				Controls.Add(mytextbox);
@@ -1205,39 +1192,14 @@ namespace ctlXMLEditLib
 		// C2021-026 Event handler for Parent/Child child textbox
 		//           if the textbox text is same as parent, then or nothing is entered in the textbox
 		//           then use the parent value and set the text color to gray
-		// B2025-028 RO Editor - Parent Child Applicability - Default Values
-		//           Were always setting to the Group parent value instead of individual parent values
-		//           When leaving the textbox
 		private void txtBox_Leave(object sender, EventArgs e)
 		{
 			TextBox tb = sender as TextBox;
 			string dfTxt = "";
-			try
+			string parName = pcGrpBox.Name.Substring(5);
-			{
+			object o = myHT[parName];
-				string parentid = ((TextBoxAttrTag)tb.Tag).GetParentHTId;
+			if (o != null)
-				if (!string.IsNullOrEmpty(parentid))
+				dfTxt = (o as TextBox).Text; // set to use the parent's value (default)
-				{
-					object o = myHT[parentid];
-					if (o != null)
-						dfTxt = (o as TextBox).Text; // set to use the parent's value (default)				
-				}
-				else
-                {
-
-					string parName = pcGrpBox.Name.Substring(5);
-					object o = myHT[parName];
-					if (o != null)
-						dfTxt = (o as TextBox).Text; // set to use the parent's value (default)
-				}
-			}
-            catch 
-			{
-				string parName = pcGrpBox.Name.Substring(5);
-				object o = myHT[parName];
-				if (o != null)
-					dfTxt = (o as TextBox).Text; // set to use the parent's value (default)
-			}
-
 			if (dosaveflag) mysavexml = true;
 			if (tb.Text.Length == 0 || tb.Text == dfTxt)
 			{

PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs

@@ -1,203 +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 VEPROMS.CSLA.Library;
-
-namespace VEPROMS
-{
-    // C2025-027 Annotation Type Filtering
-    public partial class dlgAnnotationsSelect : Form
-    {
-        public dlgAnnotationsSelect()
-        {
-            InitializeComponent();
-        }
-
-        public dlgAnnotationsSelect(string userid)
-        {
-            InitializeComponent();
-            UserID = userid;
-        }
-
-        private int _MyItemID;
-        public int MyItemID
-        {
-            get { return _MyItemID; }
-            set { _MyItemID = value; }
-        }
-
-        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);
-        }
-
-        // Move selected items from one ListBox to another.
-        private void MoveSelectedItems(ListBox lstFrom, ListBox lstTo)
-        {
-            while (lstFrom.SelectedItems.Count > 0)
-            {
-                lstSelected.DisplayMember = "NameStr";
-                lstSelected.ValueMember = "TypeID";
-
-                AnnotataionItem item = (AnnotataionItem)lstFrom.SelectedItems[0];
-                lstTo.Items.Add(new AnnotataionItem(item.NameStr, item.TypeID));
-                lstFrom.Items.Remove(item);
-            }
-            SetButtonsEditable();
-            btnUpdate.Enabled = true;
-        }
-
-        // Move all items to lstSelected.
-        private void btnSelectAll_Click(object sender, EventArgs e)
-        {
-            MoveAllItems(lstUnselected, lstSelected);
-            btnUpdate.Enabled = true;
-        }
-
-        // Move all items to lstUnselected.
-        private void btnDeselectAll_Click(object sender, EventArgs e)
-        {
-            MoveAllItems(lstSelected, lstUnselected);
-            btnUpdate.Enabled = true;
-        }
-
-        // Move all items from one ListBox to another.
-        private void MoveAllItems(ListBox lstFrom, ListBox lstTo)
-        {
-            lstTo.Items.AddRange(lstFrom.Items);
-            lstFrom.Items.Clear();
-            SetButtonsEditable();
-            btnUpdate.Enabled = true;
-        }
-
-        // Enable and disable buttons.
-        private void lst_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            SetButtonsEditable();
-        }
-        // Save selected list to DB.
-        private void btnUpdate_Click(object sender, EventArgs e)
-        {
-            saveChanges();
-        }
-        public class AnnotataionItem
-        {
-            private string _NameStr;
-            private int _TypeID;
-
-            public AnnotataionItem(string NameStr, int TypeID)
-            {
-                this._NameStr = NameStr;
-                this._TypeID = TypeID;
-            }
-            public string NameStr
-            {
-                get
-                {
-                    return _NameStr;
-                }
-            }
-            public int TypeID
-            {
-                get
-                {
-                    return _TypeID;
-                }
-            }
-        }
-
-        // Enable and disable buttons.
-        private void SetButtonsEditable()
-        {
-            btnSelect.Enabled = (lstUnselected.SelectedItems.Count > 0);
-            btnSelectAll.Enabled = (lstUnselected.Items.Count > 0);
-            btnDeselect.Enabled = (lstSelected.SelectedItems.Count > 0);
-            btnDeselectAll.Enabled = (lstSelected.Items.Count > 0);
-        }
-
-        private void DlgAnnotationsSelect_Load(object sender, EventArgs e)
-        {
-            lstUnselected.DisplayMember = "NameStr";
-            lstUnselected.ValueMember = "TypeID";
-            SetButtonsEditable();
-            DataTable AnnoType = AnnotationstypeSelections.GetAnnoTypes(UserID);
-            foreach (DataRow dr in AnnoType.Rows)
-            {
-                lstUnselected.Items.Add(new AnnotataionItem(dr["Name"].ToString(), (int)dr["TypeID"]));
-            }
-
-            lstSelected.DisplayMember = "NameStr";
-            lstSelected.ValueMember = "TypeID";
-            DataTable lstSelectedTbl = VEPROMS.CSLA.Library.AnnotationstypeSelections.Retrieve(UserID);
-
-            foreach (DataRow lstSelectedRow in lstSelectedTbl.Rows)
-            {
-                lstSelected.Items.Add(new AnnotataionItem(lstSelectedRow["Name"].ToString(), (int)lstSelectedRow["TypeID"]));
-            }
-            btnUpdate.Enabled = false;
-        }
-
-        private void btnCancel_Click_1(object sender, EventArgs e)
-        {
-            if (btnUpdate.Enabled == true)
-            {
-                string message = "Changes have not yet been saved.  Do you want to save the changes prior to closing?";
-                string title = "Save Annotation Selections";
-                MessageBoxButtons buttons = MessageBoxButtons.YesNo;
-                DialogResult result = MessageBox.Show(message, title, buttons);
-                if (result == DialogResult.Yes)
-                {
-                    saveChanges();
-                    this.Close();
-                }
-                else
-                {
-                    this.Close();
-                }
-            }
-            else
-            {
-                this.Close();
-            }
-        }
-
-        private DataTable coverToTable()
-        {
-            DataTable dt = new DataTable();
-            dt.Columns.Add("TypeID", typeof(Int32));
-
-
-            foreach (AnnotataionItem item in lstSelected.Items.OfType<AnnotataionItem>())
-            {
-                dt.Rows.Add(item.TypeID);
-            }
-            return dt;
-        }
-        private void saveChanges()
-        {
-            DataTable dt2 = coverToTable();
-            VEPROMS.CSLA.Library.AnnotationstypeSelections.Update(dt2, UserID);
-            btnUpdate.Enabled = false;
-        }
-    }
-}
-

PROMS/VEPROMS User Interface/DlgAnnotationsSelect.resx

@@ -1,120 +0,0 @@
-<?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/VEPROMS User Interface/DlgPrintProcedure.cs

@@ -393,7 +393,6 @@ namespace VEPROMS
 		{
 			SetupForProcedure();
 			_MyTimer = new Timer();
-			_MyTimer.Tick -= new EventHandler(_MyTimer_Tick);
 			_MyTimer.Tick += new EventHandler(_MyTimer_Tick);
 			_MyTimer.Interval = 100;
 			_MyTimer.Enabled = true;
@@ -419,12 +418,7 @@ namespace VEPROMS
 			//txbPDFLocation.Text = _PDFPath;
 			BuildPDFFileName();
 			ProcedureConfig pc = _MyProcedure.MyConfig as ProcedureConfig;
-			// C2025-033 set which Child procedure is being printed used for PageStyle items
+			if(SelectedSlave > 0) pc.SelectedSlave = SelectedSlave;
-			VlnSvgPageHelper.PrintingChild = SelectedSlave;
-			if (SelectedSlave > 0)
-			{
-				pc.SelectedSlave = SelectedSlave;
-			}
 			if (pc != null)
 			{
 				//C2021-062 use the save rev number for all procedures if set, or just use the rev number in the current procedure config

PROMS/VEPROMS User Interface/PROMSFixes.Sql

@@ -1,3 +1,5 @@
+
+
 Set NoCount On;
 
 If (db_name() in('master','model','msdn','tempdb'))
@@ -1490,15 +1492,14 @@ GO
 				@SearchString		Search string criteria
 				@SearchStringx		Alternate search string criteria
 				@StepTypeList		Comma delimited list of of step types used to filter search results (pass '' or null to include all step type sections)
-				@ProcSectSrch		Flag used to indicate if Procedure and Section titles should appear in the global search results. 0 = include 1 = remove
 				
  Examples:		select Text from vefn_SiblingAndChildrenItemsNewByWord('194','','%[^a-z]red[^a-z]%', '%[^a-z]red[^a-z]%','');
 				select Text from vefn_SiblingAndChildrenItemsNewByWord('194','','%[^a-zA-Z]step 25[^0-9a-zA-Z.vbpi:\\-]%','%[^a-zA-Z]step 25[^0-9a-zA-Z.vbpi:\\-]%','');
 ==========================================================================================================
  */
-CREATE Function [dbo].[vefn_SiblingAndChildrenItemsNewByWord](@DocVersionList VarChar(Max), @UnitPrefix VarChar(Max), @SearchString VarChar(Max),
+Create Function [dbo].[vefn_SiblingAndChildrenItemsNewByWord](@DocVersionList VarChar(Max), @UnitPrefix VarChar(Max), @SearchString VarChar(Max),
 															  @SearchStringx VarChar(Max), @StepTypeList VarChar(Max), 
-															  @includeLinks int, @includeRtfFormatting int , @includeSpecialCharacters int, @ProcSectSrch Int)
+															  @includeLinks int, @includeRtfFormatting int , @includeSpecialCharacters int)
 Returns @SiblingAndChildren Table
 (
 	ILastChanged VarBinary(8),
@@ -1582,7 +1583,7 @@ Begin
 				Cast(0 as VarBinary(8)) as 'PLastChanged'
 		From Items i with (NoLock) 
 			join Contents c with (NoLock) on c.ContentID = i.ContentID
-			join dbo.vefn_DocVersionSplit(@DocVersionList) dv on i.ItemID = dv.ItemID 
+			join dbo.vefn_DocVersionSplit(@DocVersionList) dv on i.ItemID = dv.ItemID
 			
 		Union All
 
@@ -1673,8 +1674,8 @@ Begin
 		From zItems zi
 			join Items i with (NoLock) on i.PreviousID = zi.ItemID
 			join Contents c with (NoLock) on c.ContentID = i.ContentID
-	) 
+
-	
+	)
 	Insert Into @SiblingAndChildren
 	Select zi.ILastChanged,
 		zi.ItemID,
@@ -1712,12 +1713,7 @@ Begin
 			like @SearchStringx Or Replace(d.DocAscii, nChar(176), '\''B0') like @SearchStringx)
 		And (IsNull(@StepTypeList,'') = '' or (dbo.vefn_AllSections(zi.CType) in (Select ID from dbo.vefn_SplitInt(@StepTypeList,','))))
 	Option (Recompile, MaxRecursion 10000);
-
+		
-			if @ProcSectSrch = 1
-			begin
-				delete from @SiblingAndChildren where ctype/10000 IN (0,1)
-			end
-
 	Return;
 End
 Go
@@ -15702,7 +15698,6 @@ GO
 				@UnitPrefix					Specified Unit Prefix if any
 				@ByWordPrefix				Word Prefix for the specified search string criteria
 				@ByWordSuffix				Word Suffix for the specified search string criteria
-				@ProcSectSrch		Flag used to indicate if Procedure and Section titles should appear in the global search results. 0 = include 1 = remove
 				
 				
  Examples:		exec vesp_SearchItemAndChildrenNewByWord  '194','','red',0,0,0,0,'','[^a-z]','[^a-z]';
@@ -15715,7 +15710,7 @@ GO
 				exec vesp_SearchItemAndChildrenNewByWord  '194','','25',0,0,0,0,'','','';
 ==========================================================================================================
  */
-CREATE Procedure [dbo].[vesp_SearchItemAndChildrenNewByWord] (@DocVersionList VarChar(Max), @StepTypeList VarChar(Max), @SearchString VarChar(Max), @CaseSensitive Int, @ProcSectSrch int,
+Create Procedure [dbo].[vesp_SearchItemAndChildrenNewByWord] (@DocVersionList VarChar(Max), @StepTypeList VarChar(Max), @SearchString VarChar(Max), @CaseSensitive Int, 
 															  @IncludeLinks Int, @IncludeRtfFormatting Int, @IncludeSpecialCharacters Int, @UnitPrefix VarChar(Max),
 															  @ByWordPrefix VarChar(64), @ByWordSuffix VarChar(64))
 With Execute As Owner
@@ -15785,7 +15780,7 @@ Begin
 						(Select Count(1) From RoUsages ru with (NoLock) Where ru.ContentID = z.ContentID) as 'RoUsageCount',
 						(Select Count(1) From Transitions t with (NoLock) Where t.FromID = z.ContentID) as 'TransitionCount',
 						(Select Count(1) From ZContents zc with (NoLock) Where zc.ContentID = z.ContentID) as 'ZContentCount'
-					From dbo.vefn_SiblingAndChildrenItemsNewByWord(@DocVersionList, @UnitPrefix, @SearchString, @SearchStringx, @StepTypeList, @includeLinks, @includeRtfFormatting, @includeSpecialCharacters, @ProcSectSrch) z
+					From dbo.vefn_SiblingAndChildrenItemsNewByWord(@DocVersionList, @UnitPrefix, @SearchString, @SearchStringx, @StepTypeList, @includeLinks, @includeRtfFormatting, @includeSpecialCharacters) z
 					Order By z.DvPath Asc
 					Option (Recompile);
 
@@ -15833,7 +15828,7 @@ Begin
 						(Select Count(1) From RoUsages ru with (NoLock) Where ru.ContentID = z.ContentID) as 'RoUsageCount',
 						(Select Count(1) From Transitions t with (NoLock) Where t.FromID = z.ContentID) as 'TransitionCount',
 						(Select Count(1) From ZContents zc with (NoLock) Where zc.ContentID = z.ContentID) as 'ZContentCount'
-					From dbo.vefn_SiblingAndChildrenItemsNewByWord(@DocVersionList, @UnitPrefix, @SearchString, @SearchStringx, @StepTypeList, @includeLinks, @includeRtfFormatting, @includeSpecialCharacters, @ProcSectSrch) z
+					From dbo.vefn_SiblingAndChildrenItemsNewByWord(@DocVersionList, @UnitPrefix, @SearchString, @SearchStringx, @StepTypeList, @includeLinks, @includeRtfFormatting, @includeSpecialCharacters) z
 					Where (@TextPrefix + z.Text + @TextSuffix Collate SQL_Latin1_General_CP1_CS_AS like @SearchString  
 							or @TextPrefix + z.Text + @TextSuffix Collate SQL_Latin1_General_CP1_CS_AS like @SearchStringx 
 							or Replace(z.DocAscii,nChar(176),'\''B0') Collate SQL_Latin1_General_CP1_CS_AS like @SearchString
@@ -15892,7 +15887,7 @@ Begin
 						(Select Count(1) From RoUsages ru with (NoLock) Where ru.ContentID = z.ContentID) as 'RoUsageCount',
 						(Select Count(1) From Transitions t with (NoLock) Where t.FromID = z.ContentID) as 'TransitionCount',
 						(Select Count(1) From ZContents zc with (NoLock) Where zc.ContentID = z.ContentID) as 'ZContentCount'
-					From dbo.vefn_SiblingAndChildrenItemsNewByWord(@DocVersionList, @UnitPrefix, @SearchString, @SearchStringx, @StepTypeList, @includeLinks, @includeRtfFormatting, @includeSpecialCharacters, @ProcSectSrch) z
+					From dbo.vefn_SiblingAndChildrenItemsNewByWord(@DocVersionList, @UnitPrefix, @SearchString, @SearchStringx, @StepTypeList, @includeLinks, @includeRtfFormatting, @includeSpecialCharacters) z
 					Where (dbo.vefn_RemoveExtraText(@TextPrefix + z.Text + @TextSuffix, @IncludeLinks, @IncludeRtfFormatting, @IncludeSpecialCharacters) Collate SQL_Latin1_General_CP1_CI_AS like @SearchString
 						   Or dbo.vefn_RemoveExtraText(@TextPrefix + z.Text + @TextSuffix, @IncludeLinks, @IncludeRtfFormatting, @IncludeSpecialCharacters) Collate SQL_Latin1_General_CP1_CI_AS like @SearchStringx
 						   Or Replace(z.DocAscii, nChar(176), '\''B0') Collate SQL_Latin1_General_CP1_CI_AS like @SearchString
@@ -15946,7 +15941,7 @@ Begin
 						(Select Count(1) From RoUsages ru with (NoLock) Where ru.ContentID = z.ContentID) as 'RoUsageCount',
 						(Select Count(1) From Transitions t with (NoLock) Where t.FromID = z.ContentID) as 'TransitionCount',
 						(Select Count(1) From ZContents zc with (NoLock) Where zc.ContentID = z.ContentID) as 'ZContentCount'
-					From dbo.vefn_SiblingAndChildrenItemsNewByWord(@DocVersionList, @UnitPrefix, @SearchString, @SearchStringx, @StepTypeList, @includeLinks, @includeRtfFormatting, @includeSpecialCharacters, @ProcSectSrch) z
+					From dbo.vefn_SiblingAndChildrenItemsNewByWord(@DocVersionList, @UnitPrefix, @SearchString, @SearchStringx, @StepTypeList, @includeLinks, @includeRtfFormatting, @includeSpecialCharacters) z
 					Where (dbo.vefn_RemoveExtraText(Replace(@TextPrefix + z.Text + @TextSuffix,'\''b0', '\''B0'), @IncludeLinks, @IncludeRtfFormatting, @IncludeSpecialCharacters) Collate SQL_Latin1_General_CP1_CS_AS like  Replace(@SearchString,'\''b0', '\''B0')
 						Or dbo.vefn_RemoveExtraText(Replace(@TextPrefix + z.Text + @TextSuffix,'\''b0', '\''B0'), @IncludeLinks, @IncludeRtfFormatting, @IncludeSpecialCharacters) Collate SQL_Latin1_General_CP1_CS_AS like  Replace(@SearchStringx,'\''b0', '\''B0')
 						Or Replace(z.DocAscii,nChar(176),'\''B0') Collate SQL_Latin1_General_CP1_CS_AS like @SearchString
@@ -23809,491 +23804,6 @@ IF (@@Error = 0) PRINT 'Running vesp_UpdateUserSettings Succeeded'
 ELSE PRINT 'Running vesp_UpdateUserSettings Failed to Execute'
 GO
 
--- =============================================
--- Author:		Matthew Schill
--- Create date: 5/19/2025
--- Description:	Allow option to not prompt user with MS Word messages
---   when generating Summaries
--- =============================================
---- MSWordSummaryPrompt = ahouls user be prompted with message?
---    default = yes (true)
-IF NOT EXISTS(SELECT *
-          FROM   INFORMATION_SCHEMA.COLUMNS
-          WHERE  TABLE_NAME = 'Users'
-                 AND COLUMN_NAME = 'MSWordSummaryPrompt') 
-ALTER TABLE Users ADD MSWordSummaryPrompt bit NOT NULL DEFAULT(1);
-go
--- Display the status
-IF (@@Error = 0) PRINT 'Altered table [Users] Succeeded for MSWordSummaryPrompt'
-ELSE PRINT 'Altered table [Users] Error on Alter for MSWordSummaryPrompt'
-go
-
-
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_UpdateUserSettingMSWordSummaryPrompt]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-	DROP PROCEDURE [vesp_UpdateUserSettingMSWordSummaryPrompt];
-GO
-
-SET ANSI_NULLS ON
-GO
-SET QUOTED_IDENTIFIER ON
-GO
--- =============================================
--- Author:		Matthew Schill
--- Create date: 5/19/2025
--- Description:	Allow option to not prompt user with MS Word messages
---   when generating Summaries
--- =============================================
-CREATE PROCEDURE [dbo].[vesp_UpdateUserSettingMSWordSummaryPrompt]
-
-(
-	@UID varchar(100),
-	@Prompt bit = null
-)
-WITH EXECUTE AS OWNER
-AS
-   UPDATE Users SET 
-     MSWordSummaryPrompt = ISNULL(@Prompt, MSWordSummaryPrompt)
-	WHERE UserID =@UID
-
-	RETURN
-GO
-
-IF (@@Error = 0) PRINT 'Running vesp_UpdateUserSettingMSWordSummaryPrompt Succeeded'
-ELSE PRINT 'Running vesp_UpdateUserSettingMSWordSummaryPrompt Failed to Execute'
-GO
-
----  begin changes for:
----C2025-023 - Electronic Procedures - Modifications to PROMS
---- The following IsEPAnnotationType column was added for EP Annotations.
---- IsEPAnnotationType = Is for EPs
-IF NOT EXISTS(SELECT *
-          FROM   INFORMATION_SCHEMA.COLUMNS
-          WHERE  TABLE_NAME = 'AnnotationTypes'
-                 AND COLUMN_NAME = 'IsEPAnnotationType') 
-ALTER TABLE AnnotationTypes ADD IsEPAnnotationType bit NOT NULL DEFAULT(0);
-go
--- Display the status
-IF (@@Error = 0) PRINT 'Altered table [AnnotationTypes] Succeeded for IsEPAnnotationType'
-ELSE PRINT 'Altered table [AnnotationTypes] Error on Alter for IsEPAnnotationType'
-go
-
-
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[getAnnotationType]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-	DROP PROCEDURE [getAnnotationType];
-GO
-
-SET ANSI_NULLS ON
-GO
-SET QUOTED_IDENTIFIER ON
-GO
--- =============================================
--- Author:		Matthew Schill
--- Create date: 3/21/2025
--- Description:	Add EP to AnnotationTypes
--- =============================================
-CREATE PROCEDURE [dbo].[getAnnotationType]
-(
-	@TypeID int
-)
-WITH EXECUTE AS OWNER
-AS
-	SELECT
-		[TypeID],
-		[Name],
-		[Config],
-		[DTS],
-		[UserID],
-		[LastChanged],
-		(SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[TypeID]=[AnnotationTypes].[TypeID]) [AnnotationCount],
-		[IsEPAnnotationType]
-	FROM [AnnotationTypes]
-	WHERE [TypeID]=@TypeID
-
-	SELECT
-		[Annotations].[AnnotationID],
-		[Annotations].[ItemID],
-		[Annotations].[TypeID],
-		[Annotations].[RtfText],
-		[Annotations].[SearchText],
-		[Annotations].[Config],
-		[Annotations].[DTS],
-		[Annotations].[UserID],
-		[Annotations].[LastChanged],
-		[Items].[PreviousID] [Item_PreviousID],
-		[Items].[ContentID] [Item_ContentID],
-		[Items].[DTS] [Item_DTS],
-		[Items].[UserID] [Item_UserID]
-	FROM [Annotations]
-		JOIN [Items]  ON
-			[Items].[ItemID]=[Annotations].[ItemID]
-	WHERE
-		[Annotations].[TypeID]=@TypeID
-
-	RETURN
-GO
-
-IF (@@Error = 0) PRINT 'Running getAnnotationType Succeeded'
-ELSE PRINT 'Running getAnnotationType Failed to Execute'
-GO
-
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[getAnnotationTypeByName]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-	DROP PROCEDURE [getAnnotationTypeByName];
-GO
-
-SET ANSI_NULLS ON
-GO
-SET QUOTED_IDENTIFIER ON
-GO
--- =============================================
--- Author:		Matthew Schill
--- Create date: 3/21/2025
--- Description:	Add EP to AnnotationTypes
--- =============================================
-CREATE PROCEDURE [dbo].[getAnnotationTypeByName]
-(
-	@Name nvarchar(100)
-)
-WITH EXECUTE AS OWNER
-AS
-	SELECT
-		[TypeID],
-		[Name],
-		[Config],
-		[DTS],
-		[UserID],
-		[LastChanged],
-		(SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[TypeID]=[AnnotationTypes].[TypeID]) [AnnotationCount],
-		[IsEPAnnotationType]
-	FROM [AnnotationTypes]
-	WHERE [Name]=@Name
-	RETURN
-GO
-
-IF (@@Error = 0) PRINT 'Running getAnnotationTypeByName Succeeded'
-ELSE PRINT 'Running getAnnotationTypeByName Failed to Execute'
-GO
-
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[getAnnotationTypes]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-	DROP PROCEDURE [getAnnotationTypes];
-GO
-
-SET ANSI_NULLS ON
-GO
-SET QUOTED_IDENTIFIER ON
-GO
--- =============================================
--- Author:		Matthew Schill
--- Create date: 3/21/2025
--- Description:	Add EP to AnnotationTypes
--- =============================================
-CREATE PROCEDURE [dbo].[getAnnotationTypes]
-WITH EXECUTE AS OWNER
-AS
-	SELECT
-		[TypeID],
-		[Name],
-		[Config],
-		[DTS],
-		[UserID],
-		[LastChanged],
-		(SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[TypeID]=[AnnotationTypes].[TypeID]) [AnnotationCount],
-		[IsEPAnnotationType]
-	FROM [AnnotationTypes]
-	RETURN
-
-GO
-
-IF (@@Error = 0) PRINT 'Running getAnnotationTypes Succeeded'
-ELSE PRINT 'Running getAnnotationTypes Failed to Execute'
-GO
-
-IF Not Exists(SELECT * FROM sys.objects Where name = 'EPFormats' AND type in (N'U'))
-Begin -- Rofst Tables
-
-	SET ANSI_NULLS ON
-	SET QUOTED_IDENTIFIER ON
-
-	CREATE TABLE [dbo].[EPFormats](
-		[FormatID] [int] IDENTITY(1,1) NOT NULL,
-		[Name] [nvarchar](100) NOT NULL,
-		[Data] [xml] NULL,
-		[Created] [datetime] NOT NULL DEFAULT (getdate()),
-		[CreatedBy] [nvarchar](100) NOT NULL DEFAULT (upper(suser_sname())),
-		[Updated] [datetime] NOT NULL DEFAULT (getdate()),
-		[UpdatedBy] [nvarchar](100) NOT NULL DEFAULT (upper(suser_sname()))
-	 CONSTRAINT [PK_EPFormats] PRIMARY KEY CLUSTERED 
-	(
-		[FormatID] 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: [EPFormats] Succeeded'
-	ELSE PRINT 'Table Creation: [EPFormats] Error on Creation'
-
-End
-Go
-
-
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_UpdateEPFormat]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-	DROP PROCEDURE [vesp_UpdateEPFormat];
-GO
-
-SET ANSI_NULLS ON
-GO
-SET QUOTED_IDENTIFIER ON
-GO
--- =============================================
--- Author:		Matthew Schill
--- Create date: 3/26/2025
--- Description:	Update / Insert EP Format
--- =============================================
-CREATE PROCEDURE [dbo].[vesp_UpdateEPFormat]
-(
-	@name nvarchar(100),
-	@data nvarchar(max),
-	@userID nvarchar(15)
-)
-WITH EXECUTE AS OWNER
-AS
-
-IF EXISTS(Select 1 FROM EPFormats where Name = @name )
- BEGIN
-	UpDate EPFormats
-	 SET Name = @name,
-		 Data = @data,
-		 Updated = getdate(),
-		 UpdatedBy = upper(@userID)
-	 WHERE Name = @name
- END
-ELSE
- BEGIN
-   INSERT INTO EPFormats (Name, Data, CreatedBy, UpdatedBy)
-    values (@name, @data, 'Migration', 'Migration')
-
- END
-
-GO
-
--- C2025-027 Annotation Type Filtering
-/****** Object:  Table [dbo].[AnnotationTypeSelections]    Script Date: 7/10/2025 2:38:23 PM ******/
-SET ANSI_NULLS ON
-GO
-
-SET QUOTED_IDENTIFIER ON
-GO
-
--- =============================================
--- Author:		Paul Larsen
--- Create date: 07/10/2025
--- Description:	Store user Annotation selections for annotation filter.
--- =============================================
-IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[AnnotationTypeSelections]') AND type in (N'U'))
-BEGIN
-
-	CREATE TABLE [dbo].[AnnotationTypeSelections](
-		[ASTypeID] [int] IDENTITY(1,1) NOT NULL,
-		[TypeID] [int] NULL,
-		[UserID] [varchar](50) NULL,
-		[LastChanged] [datetime] NULL,
-		CONSTRAINT [PK_AnnotationTypeSelections] PRIMARY KEY CLUSTERED 
-		([ASTypeID] ASC)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-			) ON [PRIMARY]
-END
-
-IF OBJECT_ID('DF_AnnotationTypeSelections_LastChanged', 'D') IS NULL
-	ALTER TABLE AnnotationTypeSelections ADD CONSTRAINT [DF_AnnotationTypeSelections_LastChanged]  DEFAULT (getdate()) for [LastChanged];
-GO
-
-IF EXISTS (SELECT *  FROM sys.indexes  WHERE name='idx_AnnotationTypeSelections_UserIDTypeID' 
-AND object_id = OBJECT_ID('[dbo].[AnnotationTypeSelections]'))
-begin
-DROP INDEX [idx_AnnotationTypeSelections_UserIDTypeID] ON [dbo].[AnnotationTypeSelections];
-end
-
-CREATE UNIQUE INDEX [idx_AnnotationTypeSelections_UserIDTypeID] ON [dbo].[AnnotationTypeSelections]
-(
-[UserID] ASC,
-[TypeID] ASC
-)
-INCLUDE (ASTypeID)
-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
-
--- C2025-027 Annotation Type Filtering
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[getAnnotationSelectListTypes]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-	DROP PROCEDURE [getAnnotationSelectListTypes];
-GO
-
--- =============================================
--- Author:		Paul Larsen
--- Create date: 7/10/2025
--- Description:	Retrieve Annotation Types not added to Annotation type filtering by user.
--- =============================================
-CREATE PROCEDURE [dbo].[getAnnotationSelectListTypes]
-(
-	@UserID varchar(50)
-)
-WITH EXECUTE AS OWNER
-AS
-	SELECT
-		AT.[TypeID],
-		AT.[Name],
-		AT.[Config],
-		AT.[DTS],
-		AT.[UserID],
-		AT.[LastChanged],
-		(SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[TypeID]= AT.[TypeID]) [AnnotationCount],
-		AT.[IsEPAnnotationType]
-	FROM [AnnotationTypes] AT
-	LEFT OUTER JOIN AnnotationTypeSelections ATS 
-	ON ATS.TypeID = AT.TypeID AND ATS.UserID = @UserID	    
-	WHERE ATS.ASTypeID IS NULL
-GO
-
--- C2025-027 Annotation Type Filtering
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[getAnnotationstypeSelections]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-	DROP PROCEDURE [getAnnotationstypeSelections];
-GO
-
-SET ANSI_NULLS ON
-GO
-SET QUOTED_IDENTIFIER ON
-GO
--- =============================================
--- Author:		Paul Larsen
--- Create date: 07/10/2025
--- Description:	Retrieve Current Annotation Types 
--- =============================================
-
-CREATE PROC [dbo].[getAnnotationstypeSelections]
-(
-	@UsrID varchar(50)
-)
-AS
-	BEGIN
-		SELECT [ASTypeID]
-			  ,ATS.[TypeID]
-			  ,ATS.[UserID]
-			  ,AT.[Name]
-			  ,AT.[Config]
-			  ,ATS.[LastChanged]
-			  ,AT.[UserID]
-			  ,AT.[IsEPAnnotationType]
-		FROM [dbo].[AnnotationTypeSelections] ATS
-		INNER JOIN AnnotationTypes AT ON AT.TypeID = ATS.TypeID
-		WHERE ATS.UserID = @UsrID
-	END
-
-GO
-
--- C2025-027 Annotation Type Filtering
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[getAnnotationstypeFiltered]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-	DROP PROCEDURE [getAnnotationstypeFiltered];
-GO
-
--- =============================================
--- Author:		Paul Larsen
--- Create date: 07/10/2025
--- Description:	Retrieve Current Annotation Types 
--- =============================================
-
-CREATE PROC [dbo].[getAnnotationstypeFiltered]
-(
-	@UsrID varchar(50)
-)
-AS
-BEGIN
-	IF((SELECT count(TypeID) FROM AnnotationTypeSelections WHERE UserID = @UsrID) > 0)
-	BEGIN
-		SELECT [ASTypeID]
-			  ,ATS.[TypeID]
-			  ,ATS.[UserID]
-			  ,AT.[Name]
-			  ,AT.[Config]
-			  ,ATS.[LastChanged]
-			  ,AT.[UserID]
-			  ,AT.[IsEPAnnotationType]
-		FROM [dbo].[AnnotationTypeSelections] ATS
-		INNER JOIN AnnotationTypes AT ON AT.TypeID = ATS.TypeID
-		WHERE ATS.UserID = @UsrID
-	END
-	ELSE
-	BEGIN
-		SELECT
-			[TypeID],
-			[Name],
-			[Config],
-			[DTS],
-			[UserID],
-			[LastChanged],
-			(SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[TypeID]=[AnnotationTypes].[TypeID]) [AnnotationCount],
-			[IsEPAnnotationType]
-		FROM [AnnotationTypes]
-	END
-END
-
-GO
-
--- C2025-027 Annotation Type Filtering
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[UpdateAnnotationstypeSelections]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-	DROP PROCEDURE [UpdateAnnotationstypeSelections];
-
--- Need to drop UpdateAnnotationstypeSelections SP first so script can drop and recreate the TableValAnnotTypeSelections table type 
-
-IF EXISTS( SELECT * FROM INFORMATION_SCHEMA.DOMAINS WHERE Domain_Name = 'TableValAnnotTypeSelections' )
-    DROP TYPE [dbo].[TableValAnnotTypeSelections]
-
-CREATE TYPE [dbo].[TableValAnnotTypeSelections] AS TABLE(
-	[TypeID] [int] NOT NULL
-							
-)
-GO
-
-/****** Object:  StoredProcedure [dbo].[UpdateAnnotationstypeSelections]    Script Date: 7/21/2025 8:51:42 PM ******/
-
--- =============================================
--- Author:		Paul Larsen
--- Create date: 07/21/2025
--- Description:	Manage user choice annotation types
--- =============================================
-CREATE PROC [dbo].[UpdateAnnotationstypeSelections]
-(
-	@TempTable AS dbo.TableValAnnotTypeSelections READONLY,
-	@UserID [varchar](50) NULL
-)
-AS
-BEGIN
-																	 
-															
-
-	DELETE FROM AnnotationTypeSelections where UserID = @UserID
-	AND
-	TypeID not in
-	(Select TypeID From @TempTable tmp)
-
-	--this would insert all the ones that are in the uploaded table and not already in AnnotationTypeSelections
-	Insert INTO AnnotationTypeSelections (TypeID, UserID)
-	Select tmp.TypeID, @UserID
-	FROM
-	@TempTable tmp
-	LEFT OUTER JOIN
-	AnnotationTypeSelections ATS on ATS.TypeID = tmp.TypeID
-	AND ATS.UserID = @UserID
-	where
-	ATS.ASTypeID IS NULL
-
-END
-GO
-
-IF (@@Error = 0) PRINT 'Running vesp_UpdateEPFormat Succeeded'
-ELSE PRINT 'Running vesp_UpdateEPFormat Failed to Execute'
-GO
-UPDATE Formats SET ApplicablePlant = 1000 WHERE [Name] LIKE 'EPTST%';
-Go
----  end changes for:
----C2025-023 - Electronic Procedures - Modifications to PROMS
-
-
 /*
   ---------------------------------------------------------------------------
   |                       ADD New Code Before this Block                    |
@@ -24327,8 +23837,8 @@ BEGIN TRY -- Try Block
 	DECLARE @RevDate varchar(255)
 	DECLARE @RevDescription varchar(255)
 
-	set @RevDate = '07/31/2025 10:30 AM'
+	set @RevDate = '2/19/2025 11:24'
-	set @RevDescription = 'SQL Optimization'
+	set @RevDescription = 'Added support for legacy ROs with brackets in Unit Values'
 
 	Select  cast(@RevDate as datetime) RevDate, @RevDescription  RevDescription
 	PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription

PROMS/VEPROMS User Interface/VEPROMS_UI.csproj

@@ -103,7 +103,7 @@
     <Reference Include="C1.Win.C1Command.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=e808566f358766d8" />
     <Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL" />
     <Reference Include="C1.Win.C1Input.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=7e7ff60f0c214f9a, processorArchitecture=MSIL" />
-    <Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
+    <Reference Include="Csla, Version=3.8.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\CSLA20cs_DLL_Net_4.8.1_Build\Csla.dll</HintPath>
     </Reference>
@@ -152,17 +152,6 @@
       <DependentUpon>AboutVEPROMS.cs</DependentUpon>
     </Compile>
     <Compile Include="BookMarks.cs" />
-    <Compile Include="dlgAnnotationsSelect.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="dlgAnnotationsSelect.Designer.cs">
-      <DependentUpon>dlgAnnotationsSelect.cs</DependentUpon>
-    </Compile>
-    <Compile Include="dlgAnnotationsSelect.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>dlgAnnotationsSelect.resx</DependentUpon>
-    </Compile>
     <Compile Include="dlgApproveProcedure.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -175,12 +164,6 @@
     <Compile Include="dlgCheckedOutProcedure.designer.cs">
       <DependentUpon>dlgCheckedOutProcedure.cs</DependentUpon>
     </Compile>
-    <Compile Include="dlgMSWordMessage.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="dlgMSWordMessage.Designer.cs">
-      <DependentUpon>dlgMSWordMessage.cs</DependentUpon>
-    </Compile>
     <Compile Include="dlgCheckOpenTabs.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -348,13 +331,6 @@
       <SubType>Designer</SubType>
       <DependentUpon>AboutVEPROMS.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="dlgAnnotationsSelect.resx">
-      <DependentUpon>dlgAnnotationsSelect.cs</DependentUpon>
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Include="dlgMSWordMessage.resx">
-      <DependentUpon>dlgMSWordMessage.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="dlgCheckOpenTabs.resx">
       <DependentUpon>dlgCheckOpenTabs.cs</DependentUpon>
     </EmbeddedResource>

PROMS/VEPROMS User Interface/dlgAnnotationsSelect.Designer.cs

@@ -1,229 +0,0 @@
-
-namespace VEPROMS
-{
-	partial class dlgAnnotationsSelect
-	{
-		/// <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.lstUnselected = new System.Windows.Forms.ListBox();
-			this.lstSelected = new System.Windows.Forms.ListBox();
-			this.btnSelect = new System.Windows.Forms.Button();
-			this.btnSelectAll = new System.Windows.Forms.Button();
-			this.btnDeselectAll = new System.Windows.Forms.Button();
-			this.btnDeselect = new System.Windows.Forms.Button();
-			this.btnUpdate = new System.Windows.Forms.Button();
-			this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-			this.btnCancel = new System.Windows.Forms.Button();
-			this.lblMessage = new System.Windows.Forms.Label();
-			this.lblAvailableTypes = new System.Windows.Forms.Label();
-			this.lblSelected = new System.Windows.Forms.Label();
-			this.tableLayoutPanel1.SuspendLayout();
-			this.SuspendLayout();
-			// 
-			// lstUnselected
-			// 
-			this.lstUnselected.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.lstUnselected.FormattingEnabled = true;
-			this.lstUnselected.IntegralHeight = false;
-			this.lstUnselected.ItemHeight = 16;
-			this.lstUnselected.Location = new System.Drawing.Point(3, 3);
-			this.lstUnselected.Name = "lstUnselected";
-			this.tableLayoutPanel1.SetRowSpan(this.lstUnselected, 4);
-			this.lstUnselected.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;
-			this.lstUnselected.Size = new System.Drawing.Size(287, 347);
-			this.lstUnselected.TabIndex = 0;
-			this.lstUnselected.SelectedIndexChanged += new System.EventHandler(this.lst_SelectedIndexChanged);
-			// 
-			// lstSelected
-			// 
-			this.lstSelected.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.lstSelected.FormattingEnabled = true;
-			this.lstSelected.IntegralHeight = false;
-			this.lstSelected.ItemHeight = 16;
-			this.lstSelected.Location = new System.Drawing.Point(334, 3);
-			this.lstSelected.Name = "lstSelected";
-			this.tableLayoutPanel1.SetRowSpan(this.lstSelected, 4);
-			this.lstSelected.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;
-			this.lstSelected.Size = new System.Drawing.Size(288, 347);
-			this.lstSelected.TabIndex = 1;
-			this.lstSelected.SelectedIndexChanged += new System.EventHandler(this.lst_SelectedIndexChanged);
-			// 
-			// btnSelect
-			// 
-			this.btnSelect.Anchor = System.Windows.Forms.AnchorStyles.None;
-			this.btnSelect.Location = new System.Drawing.Point(298, 32);
-			this.btnSelect.Name = "btnSelect";
-			this.btnSelect.Size = new System.Drawing.Size(28, 23);
-			this.btnSelect.TabIndex = 2;
-			this.btnSelect.Text = ">";
-			this.btnSelect.UseVisualStyleBackColor = true;
-			this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click);
-			// 
-			// btnSelectAll
-			// 
-			this.btnSelectAll.Anchor = System.Windows.Forms.AnchorStyles.None;
-			this.btnSelectAll.Location = new System.Drawing.Point(296, 120);
-			this.btnSelectAll.Name = "btnSelectAll";
-			this.btnSelectAll.Size = new System.Drawing.Size(32, 23);
-			this.btnSelectAll.TabIndex = 3;
-			this.btnSelectAll.Text = ">>";
-			this.btnSelectAll.UseVisualStyleBackColor = true;
-			this.btnSelectAll.Click += new System.EventHandler(this.btnSelectAll_Click);
-			// 
-			// btnDeselectAll
-			// 
-			this.btnDeselectAll.Anchor = System.Windows.Forms.AnchorStyles.None;
-			this.btnDeselectAll.Location = new System.Drawing.Point(297, 207);
-			this.btnDeselectAll.Name = "btnDeselectAll";
-			this.btnDeselectAll.Size = new System.Drawing.Size(30, 26);
-			this.btnDeselectAll.TabIndex = 5;
-			this.btnDeselectAll.Text = "<<";
-			this.btnDeselectAll.UseVisualStyleBackColor = true;
-			this.btnDeselectAll.Click += new System.EventHandler(this.btnDeselectAll_Click);
-			// 
-			// btnDeselect
-			// 
-			this.btnDeselect.Anchor = System.Windows.Forms.AnchorStyles.None;
-			this.btnDeselect.Location = new System.Drawing.Point(298, 297);
-			this.btnDeselect.Name = "btnDeselect";
-			this.btnDeselect.Size = new System.Drawing.Size(28, 23);
-			this.btnDeselect.TabIndex = 4;
-			this.btnDeselect.Text = "<";
-			this.btnDeselect.UseVisualStyleBackColor = true;
-			this.btnDeselect.Click += new System.EventHandler(this.btnDeselect_Click);
-			// 
-			// btnUpdate
-			// 
-			this.btnUpdate.Anchor = System.Windows.Forms.AnchorStyles.None;
-			this.btnUpdate.Location = new System.Drawing.Point(536, 422);
-			this.btnUpdate.Name = "btnUpdate";
-			this.btnUpdate.Size = new System.Drawing.Size(100, 35);
-			this.btnUpdate.TabIndex = 8;
-			this.btnUpdate.Text = "Save";
-			this.btnUpdate.UseVisualStyleBackColor = true;
-			this.btnUpdate.Click += new System.EventHandler(this.btnUpdate_Click);
-			// 
-			// tableLayoutPanel1
-			// 
-			this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.tableLayoutPanel1.ColumnCount = 3;
-			this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-			this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 38F));
-			this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-			this.tableLayoutPanel1.Controls.Add(this.lstUnselected, 0, 0);
-			this.tableLayoutPanel1.Controls.Add(this.lstSelected, 2, 0);
-			this.tableLayoutPanel1.Controls.Add(this.btnDeselect, 1, 3);
-			this.tableLayoutPanel1.Controls.Add(this.btnDeselectAll, 1, 2);
-			this.tableLayoutPanel1.Controls.Add(this.btnSelect, 1, 0);
-			this.tableLayoutPanel1.Controls.Add(this.btnSelectAll, 1, 1);
-			this.tableLayoutPanel1.Location = new System.Drawing.Point(12, 62);
-			this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-			this.tableLayoutPanel1.RowCount = 4;
-			this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
-			this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
-			this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
-			this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
-			this.tableLayoutPanel1.Size = new System.Drawing.Size(625, 353);
-			this.tableLayoutPanel1.TabIndex = 6;
-			// 
-			// btnCancel
-			// 
-			this.btnCancel.Location = new System.Drawing.Point(411, 422);
-			this.btnCancel.Name = "btnCancel";
-			this.btnCancel.Size = new System.Drawing.Size(100, 35);
-			this.btnCancel.TabIndex = 9;
-			this.btnCancel.Text = "Close";
-			this.btnCancel.UseVisualStyleBackColor = true;
-			this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click_1);
-			// 
-			// lblMessage
-			// 
-			this.lblMessage.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.lblMessage.Location = new System.Drawing.Point(43, 12);
-			this.lblMessage.Name = "lblMessage";
-			this.lblMessage.Size = new System.Drawing.Size(317, 16);
-			this.lblMessage.TabIndex = 10;
-			this.lblMessage.Text = "Updates will appear when PROMS is restarted.";
-			// 
-			// lblAvailableTypes
-			// 
-			this.lblAvailableTypes.AutoSize = true;
-			this.lblAvailableTypes.Location = new System.Drawing.Point(12, 43);
-			this.lblAvailableTypes.Name = "lblAvailableTypes";
-			this.lblAvailableTypes.Size = new System.Drawing.Size(110, 16);
-			this.lblAvailableTypes.TabIndex = 11;
-			this.lblAvailableTypes.Text = "Types Available ";
-			// 
-			// lblSelected
-			// 
-			this.lblSelected.AutoSize = true;
-			this.lblSelected.Location = new System.Drawing.Point(343, 43);
-			this.lblSelected.Name = "lblSelected";
-			this.lblSelected.Size = new System.Drawing.Size(104, 16);
-			this.lblSelected.TabIndex = 12;
-			this.lblSelected.Text = "Types Selected";
-			// 
-			// dlgAnnotationsSelect
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(653, 466);
-			this.Controls.Add(this.lblSelected);
-			this.Controls.Add(this.lblAvailableTypes);
-			this.Controls.Add(this.btnCancel);
-			this.Controls.Add(this.tableLayoutPanel1);
-			this.Controls.Add(this.btnUpdate);
-			this.Controls.Add(this.lblMessage);
-			this.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.Name = "dlgAnnotationsSelect";
-			this.Text = "Filter Annotation Types";
-			this.Load += new System.EventHandler(this.DlgAnnotationsSelect_Load);
-			this.tableLayoutPanel1.ResumeLayout(false);
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-		private System.Windows.Forms.ListBox lstUnselected;
-		private System.Windows.Forms.ListBox lstSelected;
-		private System.Windows.Forms.Button btnSelect;
-		private System.Windows.Forms.Button btnSelectAll;
-		private System.Windows.Forms.Button btnDeselectAll;
-		private System.Windows.Forms.Button btnDeselect;
-		private System.Windows.Forms.Button btnUpdate;
-
-		private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
-		private System.Windows.Forms.Button btnCancel;
-		private System.Windows.Forms.Label lblMessage;
-		private System.Windows.Forms.Label lblAvailableTypes;
-		private System.Windows.Forms.Label lblSelected;
-	}
-}

PROMS/VEPROMS User Interface/dlgApproveProcedure.cs

@@ -65,13 +65,11 @@ namespace VEPROMS
 			MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing
 			_MyApproval = new ApprovalInfo(myFrmVEPROMS);// Save frmVEPROMS for Import to shutoff SessionPing
 			ApplicabilityIndex = myDocVersion.DocVersionConfig.SelectedSlave;
-			this.ConsistencyPrintRequest -= new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
 			this.ConsistencyPrintRequest += new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
 			_MyDocVersion = myDocVersion;
 			_MyDocVersion.ResetProcedures();    // B2021-035: Pasted, modified number and deleted procedures not refreshed so missing from list
 			InitializeComponent();
 			FlexGridAddEvents();
-			_MyApproval.StatusUpdated -= new ApprovalStatusChangeEvent(_MyApproval_StatusUpdated);
 			_MyApproval.StatusUpdated += new ApprovalStatusChangeEvent(_MyApproval_StatusUpdated);
 			SetupComboBoxes();
 			foreach (ProcedureInfo pi in myDocVersion.Procedures)
@@ -103,7 +101,6 @@ namespace VEPROMS
 			//fgProcs.SetupEditor += new C1.Win.C1FlexGrid.RowColEventHandler(fgProcs_SetupEditor);
 			//fgProcs.StartEdit += new C1.Win.C1FlexGrid.RowColEventHandler(fgProcs_StartEdit);
 			//fgProcs.ValidateEdit += new C1.Win.C1FlexGrid.ValidateEditEventHandler(fgProcs_ValidateEdit);
-			fgProcs.ComboCloseUp -= new C1.Win.C1FlexGrid.RowColEventHandler(fgProcs_ComboCloseUp);
 			fgProcs.ComboCloseUp += new C1.Win.C1FlexGrid.RowColEventHandler(fgProcs_ComboCloseUp);
 			//fgProcs.MouseDown += new MouseEventHandler(fgProcs_MouseDown);
 			//fgProcs.MouseUp += new MouseEventHandler(fgProcs_MouseUp); 
@@ -278,7 +275,6 @@ namespace VEPROMS
 		{
 			MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing
 			_MyApproval = new ApprovalInfo(myFrmVEPROMS);// Save frmVEPROMS for Import to shutoff SessionPing
-			this.ConsistencyPrintRequest -= new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
 			this.ConsistencyPrintRequest += new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
 			_MyDocVersion = myDocVersion;
 			_MyDocVersion.ResetProcedures();    // B2021-035: Pasted, modified number and deleted procedures not refreshed so missing from list
@@ -299,7 +295,6 @@ namespace VEPROMS
 		{
 			MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing
 			_MyApproval = new ApprovalInfo(myFrmVEPROMS);// Save frmVEPROMS for Import to shutoff SessionPing
-			this.ConsistencyPrintRequest -= new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
 			this.ConsistencyPrintRequest += new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
 			_MyDocVersion = myProcedure.MyDocVersion;
 			_MyDocVersion.ResetProcedures();    // B2021-035: Pasted, modified number and deleted procedures not refreshed so missing from list
@@ -455,7 +450,6 @@ namespace VEPROMS
 			int checkedCount = clbMore.CheckedItems.Count;
 			string oldLabel = lblMore.Text;
 			pbMore.Visible = true;
-			ItemInfoList.ConsistencyCheckUpdated -= new ItemInfoListCCEvent(ItemInfoList_ConsistencyCheckUpdated);
 			ItemInfoList.ConsistencyCheckUpdated += new ItemInfoListCCEvent(ItemInfoList_ConsistencyCheckUpdated);
 			List<ProcedureInfo> myProcs = new List<ProcedureInfo>();
 			// B2018-136 use the list of procedures that have checkboxes and are checked (right panel) instead of the list to be approved (left panel)

PROMS/VEPROMS User Interface/dlgMSWordMessage.Designer.cs

@@ -1,100 +0,0 @@
-
-namespace VEPROMS
-{
-    partial class dlgMSWordMessage
-    {
-        /// <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.labelX1 = new DevComponents.DotNetBar.LabelX();
-            this.cbRemember = new DevComponents.DotNetBar.Controls.CheckBoxX();
-            this.btnOpenTabs = new DevComponents.DotNetBar.ButtonX();
-            this.SuspendLayout();
-            // 
-            // labelX1
-            // 
-            // 
-            // 
-            // 
-            this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelX1.Location = new System.Drawing.Point(20, 12);
-            this.labelX1.Name = "labelX1";
-            this.labelX1.Size = new System.Drawing.Size(520, 78);
-            this.labelX1.TabIndex = 0;
-            this.labelX1.Text = "The _______________ will be opened in MS Word.\r\n\r\nYou can make modifications and " +
-    "copy it into a PROMS Word section.";
-            this.labelX1.WordWrap = true;
-            // 
-            // cbRemember
-            // 
-            // 
-            // 
-            // 
-            this.cbRemember.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.cbRemember.Location = new System.Drawing.Point(12, 96);
-            this.cbRemember.Name = "cbRemember";
-            this.cbRemember.Size = new System.Drawing.Size(566, 55);
-            this.cbRemember.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.cbRemember.TabIndex = 1;
-            this.cbRemember.Text = "Check this box to not be prompted in the future when generating summaries that wi" +
-    "ll be opened in MS Word. \r\n\nNote that these settings can be adjusted at any time" +
-    " from the OPTIONS menu for PROMS.";
-            // 
-            // btnOpenTabs
-            // 
-            this.btnOpenTabs.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-            this.btnOpenTabs.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-            this.btnOpenTabs.DialogResult = System.Windows.Forms.DialogResult.Yes;
-            this.btnOpenTabs.Location = new System.Drawing.Point(490, 126);
-            this.btnOpenTabs.Name = "btnOpenTabs";
-            this.btnOpenTabs.Size = new System.Drawing.Size(64, 25);
-            this.btnOpenTabs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.btnOpenTabs.TabIndex = 2;
-            this.btnOpenTabs.Text = "OK";
-            this.btnOpenTabs.Click += new System.EventHandler(this.btnTabs_Click);
-            // 
-            // dlgMSWordMessage
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(567, 163);
-            this.ControlBox = false;
-            this.Controls.Add(this.btnOpenTabs);
-            this.Controls.Add(this.cbRemember);
-            this.Controls.Add(this.labelX1);
-            this.Name = "dlgMSWordMessage";
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private DevComponents.DotNetBar.LabelX labelX1;
-        private DevComponents.DotNetBar.Controls.CheckBoxX cbRemember;
-        private DevComponents.DotNetBar.ButtonX btnOpenTabs;
-    }
-}

PROMS/VEPROMS User Interface/dlgMSWordMessage.cs

@@ -1,45 +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 VEPROMS.CSLA.Library;
-using Volian.Base.Library;
-
-namespace VEPROMS
-{
-    public partial class dlgMSWordMessage : Form
-    {
-        //C2025-013 - Allow not continuously generate message that opening Summaries in MS Word
-        //typeofitem will be: Continuous Action/Time Critical Action
-        public dlgMSWordMessage(string typeofitem)
-        {
-            InitializeComponent();
-            Text = $"{typeofitem} Summary";
-            labelX1.Text = $"The {typeofitem} Summary will be opened in MS Word.\n\nYou can make modifications and copy it into a PROMS Word section.";
-        }
-
-        public bool ShouldDisplay()
-        {
-            UserSettings usersettings = new UserSettings(VlnSettings.UserID);
-            return usersettings.UserSetting_MSWord_Summary_Prompt;
-        }
-
-        private void btnTabs_Click(object sender, EventArgs e)
-        {
-            //if checkbox was checked in form, then update User Settings in database
-            if (cbRemember.Checked)
-            {
-                UserSettings usersettings = new UserSettings(VlnSettings.UserID);
-                usersettings.SetUserSetting_MSWord_Summary_Prompt(false);
-            }
-
-            this.Close();
-        }
-
-    }
-}

PROMS/VEPROMS User Interface/dlgMSWordMessage.resx

@@ -1,120 +0,0 @@
-<?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/VEPROMS User Interface/dlgManageSecurity.cs

@@ -40,7 +40,6 @@ namespace VEPROMS
 				rb.Parent = pnlGroups;
 				rb.Dock = DockStyle.Top;
 				rb.Tag = gi;
-				rb.CheckedChanged -= new EventHandler(rb_CheckedChanged);
 				rb.CheckedChanged += new EventHandler(rb_CheckedChanged);
 				pnlGroups.Controls.Add(rb);
 				rb.BringToFront();

PROMS/VEPROMS User Interface/frmPDFStatusForm.cs

@@ -254,7 +254,6 @@ namespace VEPROMS
 			if (CancelStop) btnCancel.Visible = true;
 			Application.DoEvents();
 
-			MyPromsPrinter.StatusChanged -= new PromsPrinterStatusEvent(pp_StatusChanged);
 			MyPromsPrinter.StatusChanged += new PromsPrinterStatusEvent(pp_StatusChanged);
 			MyPromsPrinter.DocReplace = DocReplace;  // used when approve generates an export with unlinked ROs and Transitions
 
@@ -396,11 +395,8 @@ namespace VEPROMS
 				// this will display the generated Continuous Action Summary in MS Word (starting a new instance of MS Word outside of PROMS)
 				if (MyPromsPrinter.MyContActSummary != null)
 				{
-                    //C2025-013 - Allow not continuously generate message that opening Summaries in MS Word
+					string instructions = "The Continuous Action Summary will be opened in MS Word.\n\nYou can make modifications and copy it into a PROMS Word section.";
-                    using (dlgMSWordMessage msg = new dlgMSWordMessage("Continuous Action"))
+					MessageBox.Show(instructions, "Continuous Action Summary");
-                    {
-						if (msg.ShouldDisplay()) msg.ShowDialog();
-					}
 
 					// The ContActSummaryDelay is a switch that can be added to the PROMS.exe shortcut
 					// ex: VEPROMS.EXE /ContActSummaryDelay=2.5 will delay it 2 1/2 seconds
@@ -414,11 +410,8 @@ namespace VEPROMS
 				// F2022-024 this will display the generated Time Critical Action Summary in MS Word (starting a new instance of MS Word outside of PROMS)
 				if (MyPromsPrinter.MyTimeCriticalActSummary != null)
 				{
-					//C2025-013 - Allow not continuously generate message that opening Summaries in MS Word
+					string instructions = "The Time Critical Action Summary will be opened in MS Word.\n\nYou can make modifications and copy it into a PROMS Word section.";
-					using (dlgMSWordMessage msg = new dlgMSWordMessage("Time Critical Action"))
+					MessageBox.Show(instructions, "Time Critical Action Summary");
-					{
-						if (msg.ShouldDisplay()) msg.ShowDialog();
-					}
 
 					// The ContActSummaryDelay is a switch that can be added to the PROMS.exe shortcut
 					// ex: VEPROMS.EXE /ContActSummaryDelay=2.5 will delay it 2 1/2 seconds

PROMS/VEPROMS User Interface/frmSysOptions.cs

@@ -100,9 +100,7 @@ namespace VEPROMS
 			cbOTRemember.Checked = _usersettings.UserSetting_OpenTabs_Remember;
 			cbOTAutoOpen.Enabled = cbOTAutoOpen.Visible = cbOTRemember.Checked;
 			cbOTAutoOpen.Checked = _usersettings.UserSetting_OpenTabs_AutoOpen || !cbOTRemember.Checked;
-
+			
-			//C2025-013 - Allow not continuously generate message that opening Summaries in MS Word
-			cbMSWordPrompt.Checked = _usersettings.UserSetting_MSWord_Summary_Prompt;
 		}
 		private void cbEnhancedDocumentSync_CheckedChanged(object sender, System.EventArgs e)
 		{
@@ -174,9 +172,6 @@ namespace VEPROMS
             }
             _usersettings.SetUserSettings(cbOTRemember.Checked, OTAuto);
 
-			//C2025-013 - Allow not continuously generate message that opening Summaries in MS Word
-			_usersettings.SetUserSetting_MSWord_Summary_Prompt(cbMSWordPrompt.Checked);
-
 			this.DialogResult = DialogResult.OK;
 			this.Close();
 		}
@@ -365,11 +360,5 @@ namespace VEPROMS
 			Properties.Settings.Default.cbShwRplWrdsColor = cbShwRplWrdsColor.Checked; // update setting value
 			Properties.Settings.Default.Save(); // save settings
 		}
-
+    }
-		private void cbShwAnnoFilter_Click(object sender, EventArgs e)
-		{
-			frmVEPROMS.tv_SelectAnnotations();
-		}
-
-	}
 }

PROMS/VEPROMS User Interface/frmSysOptions.resx

@@ -125,7 +125,7 @@
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
         JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJxAAAScQHz3HqOAAAAKklE
-        QVQ4T2P4//8/AyUYQjAwgAiSMYoB6CYTwqMGjBowXA0gB8MNoAQDALEslYfhkv70AAAAAElFTkSuQmCC
+        QVQ4T2P4//8/RRhCAClyMIoBIJoUPGrAqAEgPBwNIAfDDSAf/2cAALEslYfUgx+eAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs

@@ -47,13 +47,13 @@ namespace VEPROMS
 			this.btnOpen = new DevComponents.DotNetBar.ButtonItem();
 			this.btnPrepare = new DevComponents.DotNetBar.ButtonItem();
 			this.btnAdmin = new DevComponents.DotNetBar.ButtonItem();
+			this.btnUpdateFormats = new DevComponents.DotNetBar.ButtonItem();
 			this.icRecentDocs = new DevComponents.DotNetBar.ItemContainer();
 			this.labelItem8 = new DevComponents.DotNetBar.LabelItem();
 			this.itemContainer5 = new DevComponents.DotNetBar.ItemContainer();
 			this.btnOptions = new DevComponents.DotNetBar.ButtonItem();
 			this.btnExit = new DevComponents.DotNetBar.ButtonItem();
 			this.qatCustomizeItem1 = new DevComponents.DotNetBar.QatCustomizeItem();
-			this.btnUpdateFormats = new DevComponents.DotNetBar.ButtonItem();
 			this.galleryGroup1 = new DevComponents.DotNetBar.GalleryGroup();
 			this.galleryGroup2 = new DevComponents.DotNetBar.GalleryGroup();
 			this.galleryGroup3 = new DevComponents.DotNetBar.GalleryGroup();
@@ -208,13 +208,13 @@ namespace VEPROMS
 			this.btnHelp.KeyTips = "?";
 			this.btnHelp.Name = "btnHelp";
 			this.btnHelp.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-            this.btnHelpManual,
+			this.btnHelpManual,
-            this.btnShortCuts,
+			this.btnShortCuts,
-            this.btnHelpVWeb,
+			this.btnHelpVWeb,
-            this.btnSendErrorLog,
+			this.btnSendErrorLog,
-            this.btnShowErrFld,
+			this.btnShowErrFld,
-            this.btnShowPrtFld,
+			this.btnShowPrtFld,
-            this.btnHelpAbout});
+			this.btnHelpAbout});
 			this.btnHelp.Text = "Help";
 			// 
 			// btnHelpManual
@@ -249,19 +249,23 @@ namespace VEPROMS
 			this.btnSendErrorLog.Click += new System.EventHandler(this.btnSendErrorLog_Click);
 			// 
 			// btnShowErrFld
-			// 
+			//
+			//this.btnShowErrFld.Image = global::VEPROMS.Properties.Resources.GoToParentFolderHS;
 			this.btnShowErrFld.Image = ((System.Drawing.Image)(resources.GetObject("btnShowErrFld.Image")));
 			this.btnShowErrFld.Name = "btnShowErrFld";
 			this.btnShowErrFld.Text = "Open Log Folder";
 			this.btnShowErrFld.Click += new System.EventHandler(this.btnShowErrFld_Click);
 			// 
 			// btnShowPrtFld
-			// 
+			//
+			//this.btnShowPrtFld.Image = global::VEPROMS.Properties.Resources.GoToParentFolderHS;
 			this.btnShowPrtFld.Image = ((System.Drawing.Image)(resources.GetObject("btnShowPrtFld.Image")));
 			this.btnShowPrtFld.Name = "btnShowPrtFld";
 			this.btnShowPrtFld.Text = "Open Default Print Folder";
 			this.btnShowPrtFld.Click += new System.EventHandler(this.btnShowPrtFld_Click);
 			// 
+			// 
+			// 
 			// btnHelpAbout
 			// 
 			this.btnHelpAbout.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
@@ -299,10 +303,6 @@ namespace VEPROMS
 			this.itemContainer1.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
             this.itemContainer2,
             this.itemContainer5});
-			// 
-			// 
-			// 
-			this.itemContainer1.TitleMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			// 
 			// 
 			// 
@@ -320,10 +320,6 @@ namespace VEPROMS
 			this.itemContainer2.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
             this.itemContainer3,
             this.icRecentDocs});
-			// 
-			// 
-			// 
-			this.itemContainer2.TitleMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			// 
 			// 
 			// 
@@ -344,10 +340,6 @@ namespace VEPROMS
             this.btnOpen,
             this.btnPrepare,
             this.btnAdmin});
-			// 
-			// 
-			// 
-			this.itemContainer3.TitleMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			// 
 			// 
 			// 
@@ -371,6 +363,7 @@ namespace VEPROMS
 			this.btnOpen.SubItemsExpandWidth = 24;
 			this.btnOpen.Text = "&Open...";
 			this.btnOpen.Click += new System.EventHandler(this.btnOpen_Click);
+
 			// 
 			// btnPrepare
 			// 
@@ -389,8 +382,16 @@ namespace VEPROMS
 			this.btnAdmin.CanCustomize = false;
 			this.btnAdmin.Image = global::VEPROMS.Properties.Resources.Admin;
 			this.btnAdmin.Name = "btnAdmin";
+			//this.btnAdmin.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+			//this.btnUpdateFormats});
 			this.btnAdmin.Text = "A&dministration";
 			// 
+			// btnUpdateFormats
+			// 
+			this.btnUpdateFormats.Name = "btnUpdateFormats";
+			this.btnUpdateFormats.Text = "Update Formats";
+			this.btnUpdateFormats.Click += new System.EventHandler(this.btnUpdateFormat_Click);
+			// 
 			// icRecentDocs
 			// 
 			// 
@@ -403,10 +404,6 @@ namespace VEPROMS
 			this.icRecentDocs.Name = "icRecentDocs";
 			this.icRecentDocs.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
             this.labelItem8});
-			// 
-			// 
-			// 
-			this.icRecentDocs.TitleMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			// 
 			// 
 			// 
@@ -435,10 +432,6 @@ namespace VEPROMS
 			this.itemContainer5.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
             this.btnOptions,
             this.btnExit});
-			// 
-			// 
-			// 
-			this.itemContainer5.TitleMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			// 
 			// 
 			// 
@@ -451,7 +444,6 @@ namespace VEPROMS
 			this.btnOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnOptions.Image")));
 			this.btnOptions.Name = "btnOptions";
 			this.btnOptions.SubItemsExpandWidth = 24;
-			this.superTooltip1.SetSuperTooltip(this.btnOptions, new DevComponents.DotNetBar.SuperTooltipInfo("Options", "", "Set User-Based PROMS Editing Preferences", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
 			this.btnOptions.Text = "Opt&ions";
 			this.btnOptions.Click += new System.EventHandler(this.btnOptions_Click);
 			// 
@@ -462,7 +454,6 @@ namespace VEPROMS
 			this.btnExit.Image = ((System.Drawing.Image)(resources.GetObject("btnExit.Image")));
 			this.btnExit.Name = "btnExit";
 			this.btnExit.SubItemsExpandWidth = 24;
-			this.superTooltip1.SetSuperTooltip(this.btnExit, new DevComponents.DotNetBar.SuperTooltipInfo("Exit", "", "Close and Exit PROMS", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
 			this.btnExit.Text = "E&xit";
 			this.btnExit.Click += new System.EventHandler(this.btnExit_Click);
 			// 
@@ -470,12 +461,6 @@ namespace VEPROMS
 			// 
 			this.qatCustomizeItem1.Name = "qatCustomizeItem1";
 			// 
-			// btnUpdateFormats
-			// 
-			this.btnUpdateFormats.Name = "btnUpdateFormats";
-			this.btnUpdateFormats.Text = "Update Formats";
-			this.btnUpdateFormats.Click += new System.EventHandler(this.btnUpdateFormat_Click);
-			// 
 			// galleryGroup1
 			// 
 			this.galleryGroup1.Name = "galleryGroup1";
@@ -550,7 +535,7 @@ namespace VEPROMS
 			// 
 			this.txtSearch.Dock = System.Windows.Forms.DockStyle.Right;
 			this.txtSearch.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
-			this.txtSearch.Location = new System.Drawing.Point(810, 0);
+			this.txtSearch.Location = new System.Drawing.Point(820, 0);
 			this.txtSearch.Multiline = true;
 			this.txtSearch.Name = "txtSearch";
 			this.txtSearch.Size = new System.Drawing.Size(100, 25);
@@ -559,7 +544,7 @@ namespace VEPROMS
 			// btnPrevious
 			// 
 			this.btnPrevious.Dock = System.Windows.Forms.DockStyle.Right;
-			this.btnPrevious.Location = new System.Drawing.Point(910, 0);
+			this.btnPrevious.Location = new System.Drawing.Point(920, 0);
 			this.btnPrevious.Name = "btnPrevious";
 			this.btnPrevious.Size = new System.Drawing.Size(23, 25);
 			this.btnPrevious.TabIndex = 1;
@@ -569,7 +554,7 @@ namespace VEPROMS
 			// btnPrint1
 			// 
 			this.btnPrint1.Dock = System.Windows.Forms.DockStyle.Right;
-			this.btnPrint1.Location = new System.Drawing.Point(933, 0);
+			this.btnPrint1.Location = new System.Drawing.Point(943, 0);
 			this.btnPrint1.Name = "btnPrint1";
 			this.btnPrint1.Size = new System.Drawing.Size(23, 25);
 			this.btnPrint1.TabIndex = 2;
@@ -581,7 +566,7 @@ namespace VEPROMS
 			this.cbScrunch.Checked = true;
 			this.cbScrunch.CheckState = System.Windows.Forms.CheckState.Checked;
 			this.cbScrunch.Dock = System.Windows.Forms.DockStyle.Right;
-			this.cbScrunch.Location = new System.Drawing.Point(956, 0);
+			this.cbScrunch.Location = new System.Drawing.Point(966, 0);
 			this.cbScrunch.Name = "cbScrunch";
 			this.cbScrunch.Size = new System.Drawing.Size(24, 25);
 			this.cbScrunch.TabIndex = 3;
@@ -590,7 +575,7 @@ namespace VEPROMS
 			// btnNext
 			// 
 			this.btnNext.Dock = System.Windows.Forms.DockStyle.Right;
-			this.btnNext.Location = new System.Drawing.Point(980, 0);
+			this.btnNext.Location = new System.Drawing.Point(990, 0);
 			this.btnNext.Name = "btnNext";
 			this.btnNext.Size = new System.Drawing.Size(23, 25);
 			this.btnNext.TabIndex = 4;
@@ -601,7 +586,7 @@ namespace VEPROMS
 			// 
 			this.cmbFont.Dock = System.Windows.Forms.DockStyle.Right;
 			this.cmbFont.FormattingEnabled = true;
-			this.cmbFont.Location = new System.Drawing.Point(1003, 0);
+			this.cmbFont.Location = new System.Drawing.Point(1013, 0);
 			this.cmbFont.Name = "cmbFont";
 			this.cmbFont.Size = new System.Drawing.Size(172, 23);
 			this.cmbFont.TabIndex = 0;
@@ -611,10 +596,9 @@ namespace VEPROMS
 			// 
 			this.lblDummy.Dock = System.Windows.Forms.DockStyle.Right;
 			this.lblDummy.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
-			this.lblDummy.Location = new System.Drawing.Point(1175, 0);
+			this.lblDummy.Location = new System.Drawing.Point(1013, 0);
 			this.lblDummy.Name = "lblDummy";
 			this.lblDummy.Size = new System.Drawing.Size(10, 25);
-			this.lblDummy.TabIndex = 5;
 			this.lblDummy.Visible = false;
 			// 
 			// labelItem10
@@ -721,7 +705,7 @@ namespace VEPROMS
 			this.epAnnotations.Dock = System.Windows.Forms.DockStyle.Bottom;
 			this.epAnnotations.Enabled = false;
 			this.epAnnotations.Expanded = false;
-			this.epAnnotations.ExpandedBounds = new System.Drawing.Rectangle(5, 371, 1185, 202);
+			this.epAnnotations.ExpandedBounds = new System.Drawing.Rectangle(4, 544, 1187, 202);
 			this.epAnnotations.ExpandOnTitleClick = true;
 			this.epAnnotations.Location = new System.Drawing.Point(5, 547);
 			this.epAnnotations.Name = "epAnnotations";
@@ -750,9 +734,8 @@ namespace VEPROMS
 			// ctrlAnnotationDetails
 			// 
 			this.ctrlAnnotationDetails.AnnotationDirty = false;
-			this.ctrlAnnotationDetails.AnnotationRTFText = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\nouicompat\\deflang1033{\\fonttbl{\\f0\\fnil\\fcharset0 " +
+			this.ctrlAnnotationDetails.AnnotationRTFText = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang1033{\\fonttbl{\\f0\\fnil\\fcharset0 Microsoft S" +
-    "Microsoft Sans Serif;}}\r\n{\\*\\generator Riched20 10.0.26100}\\viewkind4\\uc1 \r\n\\par" +
+    "ans Serif;}}\r\n\\viewkind4\\uc1\\pard\\f0\\fs20\\par\r\n}\r\n";
-    "d\\f0\\fs20\\par\r\n}\r\n";
 			this.ctrlAnnotationDetails.Annotations = null;
 			this.ctrlAnnotationDetails.AnnotationText = "";
 			this.ctrlAnnotationDetails.ClientProcess = null;
@@ -761,7 +744,7 @@ namespace VEPROMS
 			this.ctrlAnnotationDetails.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.ctrlAnnotationDetails.Enabled = false;
 			this.ctrlAnnotationDetails.Location = new System.Drawing.Point(0, 26);
-			this.ctrlAnnotationDetails.Margin = new System.Windows.Forms.Padding(2);
+			this.ctrlAnnotationDetails.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
 			this.ctrlAnnotationDetails.MyUserInfo = null;
 			this.ctrlAnnotationDetails.Name = "ctrlAnnotationDetails";
 			this.ctrlAnnotationDetails.ProcItem = null;
@@ -823,7 +806,6 @@ namespace VEPROMS
 			// tv
 			// 
 			this.tv.AllowDrop = true;
-			this.tv.DelProcReason = null;
 			this.tv.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.tv.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
 			this.tv.HideSelection = false;
@@ -944,7 +926,7 @@ namespace VEPROMS
 			this.displayTags.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.displayTags.IsVisible = false;
 			this.displayTags.Location = new System.Drawing.Point(0, 0);
-			this.displayTags.Margin = new System.Windows.Forms.Padding(2);
+			this.displayTags.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
 			this.displayTags.MinimumSize = new System.Drawing.Size(100, 630);
 			this.displayTags.MyEditItem = null;
 			this.displayTags.Name = "displayTags";
@@ -1129,8 +1111,8 @@ namespace VEPROMS
 			this.displayRO.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.displayRO.Location = new System.Drawing.Point(1, 1);
 			this.displayRO.Margin = new System.Windows.Forms.Padding(4);
-			this.displayRO.MyDvi = null;
 			this.displayRO.MyROFST = null;
+			//this.displayRO.MyROFSTLookup = null;
 			this.displayRO.MyRTB = null;
 			this.displayRO.Name = "displayRO";
 			this.displayRO.ProgressBar = null;
@@ -1144,7 +1126,6 @@ namespace VEPROMS
 			this.tc.ChgId = null;
 			this.tc.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.tc.ForeColor = System.Drawing.SystemColors.ControlText;
-			this.tc.LastSelectedDisplayTabItem = null;
 			this.tc.Location = new System.Drawing.Point(334, 57);
 			this.tc.Margin = new System.Windows.Forms.Padding(4);
 			this.tc.MyAnnotationDetails = null;
@@ -1392,7 +1373,6 @@ namespace VEPROMS
 			// displaySearch1
 			// 
 			this.displaySearch1.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.displaySearch1.LastSearchWasAnnotations = false;
 			this.displaySearch1.LoadingList = false;
 			this.displaySearch1.Location = new System.Drawing.Point(1, 1);
 			this.displaySearch1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
@@ -1402,7 +1382,6 @@ namespace VEPROMS
 			this.displaySearch1.ProgressBar = null;
 			this.displaySearch1.ReportTitle = null;
 			this.displaySearch1.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
-			this.displaySearch1.SearchIncTransII = null;
 			this.displaySearch1.SearchResults = null;
 			this.displaySearch1.SearchString = null;
 			this.displaySearch1.Size = new System.Drawing.Size(314, 462);

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -533,7 +533,6 @@ namespace VEPROMS
 
 			tv.PrintProcedure += new vlnTreeViewEvent(tv_PrintProcedure);
 			tv.PrintSection += new vlnTreeViewEvent(tv_PrintSection);
-			tv.QPrintSection += new vlnTreeViewEvent(tv_QPrintSection);
 			tv.QPrintProcedure += new vlnTreeViewEvent(tv_QPrintProcedure);
 			tv.PrintAllProcedures += new vlnTreeViewEvent(tv_PrintAllProcedures);
 			tv.ApproveProcedure += new vlnTreeViewEvent(tv_ApproveProcedure);
@@ -543,6 +542,7 @@ namespace VEPROMS
 			tv.RefreshCheckedOutProcedures += new vlnTreeViewEvent(tv_RefreshCheckedOutProcedures);
 			tv.ProcedureCheckedOutTo += new vlnTreeViewEvent(tv_ProcedureCheckedOutTo);
 			tv.ViewPDF += new vlnTreeViewPdfEvent(tv_ViewPDF);
+
 			displayApplicability.ApplicabilityViewModeChanged += new DisplayApplicability.DisplayApplicabilityEvent(displayApplicability_ApplicabilityViewModeChanged);
 			
 			tv.ExportImportProcedureSets += new vlnTreeViewEvent(tv_ExportImportProcedureSets);
@@ -1213,19 +1213,7 @@ namespace VEPROMS
 
 		}
 
-		//Print Section
+		void tv_PrintSection(object sender, vlnTreeEventArgs args)  // Quick Print right click menu on Procedure name.
-		//C2025-028 Add a Quick Print Section option
-	
-		void tv_PrintSection(object sender, vlnTreeEventArgs args)
-		{
-			PrintSection(sender, args, false);
-		}
-		void tv_QPrintSection(object sender, vlnTreeEventArgs args)
-		{
-			PrintSection(sender, args, true);
-		}
-
-		void PrintSection(object sender, vlnTreeEventArgs args, bool quickprint)  
 		{
 			try
 			{
@@ -1237,9 +1225,7 @@ namespace VEPROMS
 
 				tc.SaveCurrentEditItem(si2.MyProcedure);
 
-				//B2025-032 Fix Section not Printing Applicability Properly
 				si2.MyDocVersion.DocVersionConfig.SelectedSlave = args.UnitIndex;
-				si2.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = args.UnitIndex;
 
 				using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(si2.MyProcedure))
 				{
@@ -1247,14 +1233,8 @@ namespace VEPROMS
 					prnDlg.SelectedSlave = args.UnitIndex;
 					prnDlg.MySessionInfo = MySessionInfo;
 					prnDlg.SetupForProcedure();  // Setup filename
+					prnDlg.ShowDialog(this);  // Create Print report
 
-					if (quickprint)
-						prnDlg.QPCreatePDF();  // Create Print report
-					else
-						prnDlg.ShowDialog(this);  // Create Print report
-
-					//B2025-032 Fix Section not Printing Applicability Properly
-					si2.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
 					si2.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
 				}
 			}
@@ -1295,11 +1275,7 @@ namespace VEPROMS
 
 			pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
 		}
-		public static void tv_SelectAnnotations()
+
-		{
-			dlgAnnotationsSelect sannoDlg = new dlgAnnotationsSelect(VlnSettings.UserID);
-			sannoDlg.ShowDialog(); // RHM 20120925 - Center dialog over PROMS window
-		}
 		void tv_CreateTimeCriticalActionSummary(object sender, vlnTreeEventArgs args)
 		{
 			DialogResult dr = System.Windows.Forms.DialogResult.Yes;
@@ -2142,25 +2118,6 @@ namespace VEPROMS
 			InitializeSecurity();
 			UpdateUser();
 
-			//btnSecurity = new ButtonItem("btnSecurity", "Security");    // C2019-002: move security & format items into submenus
-			//btnFormats = new ButtonItem("btnFormats", "Formats");
-			//btnAdmin.SubItems.Add(btnSecurity);
-			//btnAdmin.SubItems.Add(btnFormats);
-			//btnUserControlOfFormats = new ButtonItem("btnUserControlOfFormats", "User Control of Formats");
-			//btnFormats.SubItems.Add(btnUpdateFormats);
-			//btnFormats.SubItems.Add(btnUserControlOfFormats);
-			//btnUserControlOfFormats.Click += new EventHandler(btnUserControlOfFormats_Click);
-			//btnUserControlOfFormatsExport = new ButtonItem("btnUserControlOfFormatsExport", "Export User Control of Formats");
-			//btnFormats.SubItems.Add(btnUserControlOfFormatsExport);
-			//btnUserControlOfFormatsExport.Click += new EventHandler(btnUserControlOfFormatsExport_Click);
-			//btnUserControlOfFormatsImport = new ButtonItem("btnUserControlOfFormatsImport", "Import User Control of Formats");
-			//btnFormats.SubItems.Add(btnUserControlOfFormatsImport);
-			//btnUserControlOfFormatsImport.Click += new EventHandler(btnUserControlOfFormatsImport_Click);
-			//btnManageSecurity = new ButtonItem("btnManageSecurity", "Manage Security");
-			//btnSecurity.SubItems.Add(btnManageSecurity);
-			//btnManageSecurity.Click += new EventHandler(btnManageSecurity_Click);
-
-
 			btnSecurity = new ButtonItem("btnSecurity", "Security");    // C2019-002: move security & format items into submenus
 			btnFormats = new ButtonItem("btnFormats", "Formats");
 			btnAdmin.SubItems.Add(btnSecurity);
@@ -2180,7 +2137,6 @@ namespace VEPROMS
 			btnSecurity.SubItems.Add(btnManageSecurity);
 			btnManageSecurity.Click += new EventHandler(btnManageSecurity_Click);
 
-
 			//added by jcb: menu item to reset security requires password to implement
 			btnResetSecurity = new ButtonItem("btnResetSecurity", "Reset Security");
 			btnSecurity.SubItems.Add(btnResetSecurity);
@@ -2191,13 +2147,13 @@ namespace VEPROMS
 			btnAdministrativeTools.Click += new EventHandler(btnAdministrativeTools_Click);
 			btnAdmin.SubItems.Add(btnAdministrativeTools);
 
-			// C2025-031 added tool tip messages
+			this.superTooltip1.SetSuperTooltip(btnExit, new SuperTooltipInfo("Exit", null, null, null, null, eTooltipColor.Gray));
-			this.superTooltip1.SetSuperTooltip(btnManageSecurity, new SuperTooltipInfo("Manage Security", "", "Add, Modify, and Delete PROMS User Access", null, null, eTooltipColor.Gray));
+			this.superTooltip1.SetSuperTooltip(btnOptions, new SuperTooltipInfo("Options", null, null, null, null, eTooltipColor.Gray));
-			// remove commented out line below when User Control of Formats code is deleted
+			this.superTooltip1.SetSuperTooltip(btnManageSecurity, new SuperTooltipInfo("Manage Security", null, null, null, null, eTooltipColor.Gray));
-			//this.superTooltip1.SetSuperTooltip(btnUserControlOfFormats, new SuperTooltipInfo("User Control Of Formats", null, null, null, null, eTooltipColor.Gray));
+			this.superTooltip1.SetSuperTooltip(btnUserControlOfFormats, new SuperTooltipInfo("User Control Of Formats", null, null, null, null, eTooltipColor.Gray));
-			this.superTooltip1.SetSuperTooltip(btnResetSecurity, new SuperTooltipInfo("Reset Security", "", "WARNING this will \nREMOVE ALL PROMS USERS and Reset to the\nOriginal Volian Defaults", null, null, eTooltipColor.Gray));
+			this.superTooltip1.SetSuperTooltip(btnResetSecurity, new SuperTooltipInfo("Reset Security", null, null, null, null, eTooltipColor.Gray));
-			this.superTooltip1.SetSuperTooltip(btnAdministrativeTools, new SuperTooltipInfo("Administrative Tools", "", "Open the PROMS Adminstration Tools Window", null, null, eTooltipColor.Gray));
+			this.superTooltip1.SetSuperTooltip(btnAdministrativeTools, new SuperTooltipInfo("Administrative Tools", null, null, null, null, eTooltipColor.Gray));
-			this.superTooltip1.SetSuperTooltip(btnUpdateFormats, new SuperTooltipInfo("Update Formats", "", "Install New Formats \n or Re-Install Formats", null, null, eTooltipColor.Gray));
+			this.superTooltip1.SetSuperTooltip(btnUpdateFormats, new SuperTooltipInfo("Update Formats", null, null, null, null, eTooltipColor.Gray));
 			
 			try
 			{
@@ -2220,9 +2176,6 @@ namespace VEPROMS
 			}
 
 			ctrlAnnotationDetails.MyUserInfo = MyUserInfo;
-			// re-set to old RTF initialization to older RFT string
-			ctrlAnnotationDetails.AnnotationRTFText= "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang1033{\\fonttbl{\\f0\\fnil\\fcharset0 Microsoft Sans Serif;}}\r\n\\viewkind4\\uc1\\pard\\f0\\fs20\\par\r\n}\r\n";
-
 			DisplayRO.MyUserInfo = MyUserInfo; // set the user's security information in the properties RO panel
 			StepTabRibbon.MyUserInfo = MyUserInfo; // set the user's security information in the ribbon
 			DisplayTransition.MyUserInfo = MyUserInfo; // set the user's security information in the Transition panel
@@ -3604,13 +3557,9 @@ namespace VEPROMS
 			if (tn == null)
 				return;
 			_ExpandingTree = true;
-			tn.LoadingChildrenDone -= new VETreeNodeEvent(tn_LoadingChildrenDone);
 			tn.LoadingChildrenDone += new VETreeNodeEvent(tn_LoadingChildrenDone);
-			tn.LoadingChildrenMax -= new VETreeNodeEvent(tn_LoadingChildrenMax);
 			tn.LoadingChildrenMax += new VETreeNodeEvent(tn_LoadingChildrenMax);
-			tn.LoadingChildrenValue -= new VETreeNodeEvent(tn_LoadingChildrenValue);
 			tn.LoadingChildrenValue += new VETreeNodeEvent(tn_LoadingChildrenValue);
-			tn.LoadingChildrenSQL -= new VETreeNodeEvent(tn_LoadingChildrenSQL);
 			tn.LoadingChildrenSQL += new VETreeNodeEvent(tn_LoadingChildrenSQL);
 			tn.LoadChildren(true);
 		}
@@ -4331,11 +4280,7 @@ namespace VEPROMS
 				_LastStepRTB.EditModeChanged -= new StepRTBEvent(_LastStepRTB_EditModeChanged);
 
 			_LastStepRTB = args != null && args.MyEditItem != null ? args.MyEditItem.MyStepRTB : null;
-			if (_LastStepRTB != null)
+			if (_LastStepRTB != null) _LastStepRTB.EditModeChanged += new StepRTBEvent(_LastStepRTB_EditModeChanged);
-			{
-				_LastStepRTB.EditModeChanged -= new StepRTBEvent(_LastStepRTB_EditModeChanged);
-				_LastStepRTB.EditModeChanged += new StepRTBEvent(_LastStepRTB_EditModeChanged);
-			}
 			lblEditView.Text = "    ";
 
 			if (args == null)
@@ -4470,7 +4415,6 @@ namespace VEPROMS
 					displayHistory.MyEditItem = args.MyEditItem;
 
 					lblEditView.Text = args.MyEditItem.MyStepPanel.VwMode == E_ViewMode.Edit ? "Edit" : "View";
-					_CurrentItem.Deleted -= new ItemInfoEvent(_CurrentItem_Deleted);
 					_CurrentItem.Deleted += new ItemInfoEvent(_CurrentItem_Deleted);
 					dlgFindReplace.MyEditItem = args.MyEditItem;
 					SpellChecker.MyEditItem = args.MyEditItem;

PROMS/VEPROMS User Interface/frmVEPROMS.resx

@@ -121,85 +121,83 @@
   <data name="btnHelp.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr7AAAK+wHLnx2QAAACG0lE
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr7AAAK+wHLnx2QAAACK0lE
-        QVQ4T6WQX0sUURiH/Qj7EeYjSEEXXe1ll4dS2MsNutgLjaWLkCAahGBJqo2QXBJ3siKNNefG2ixzojQl
+        QVQ4T6VSTWsTURTtT8hPmJ9QFFy4ytLloA1kGcFFFyrBhQRBHApCMKgRKRosnbEqNpLa2dSO0doRbbWI
-        wiGzNpXdUazUHfXUWPin9olzJt22hSAa+DGHl/d53vecBqDhf1JXUBmbDrg5vErqVon2nlk6c/MMPf/A
+        dLBWYxsm0xI1babp06nSD83x3nnW2KYb8cHh3XfvPed+zHQA+C/s6ZyYCXCruIz07Qp6+ufQWyhj5PlH
-        n311gtfFLfpH18kOr+CVd/i8uYsMdvDK21zsL5DKugy/WKwR1cB3nQ38rxUcF8w+EKkw6uy4kuJGhXOd
+        CrXn7ni8cdeRH29ALy7Bq2/iy9oWRLBJ9gYu5ktI6w6KLxYpdQ8BJt+zV+F/a8J2AG0QUNMSbNuOgLva
-        4ww9nd+X7AvU5LVvFSwHom1g5UFuqT7wJCS7VE1S2qhwquNxrWDszSb3p9b1ZAWrZvXZExBPh38li7ZJ
+        xLneSYw8LRNllwBXXvnehGED0RRgWIBY5zzAE0DyOvsEKiRyKvOY3S2BibdreDDdCCszmZP5mC+BRFbe
-        7AlJNv+WTP9LLdGC24/KfJTf9arRZLh22obGJBgJSTIttVCYknjKZbYYcPzMQFXQcWdRP5gwQ6gxEcZI
+        LBZNCbIFdOsdcvlXnCIF7jyq45P4EbYaTcq2sybQSbbSLZDMUgt0VE0gkXYw5wY4emaIXVIgc3cxXJiq
-        qA2knu4UJIZwMGIOy37AoearVcH5G0VksKvXD0GJEZeIVDjZdqQGI8LGiNksl79wQFyuCjL3Siz42yS7
+        SVJnt4RCSBCZq9slAUW1ocRt1PwAB2JXWwLnb7q07a2wfUmk5ISgTmRl06Y3ESOqSbeJWv0r9qmXOSQF
-        QtCIeTrpvlAQES4REQpEm0NhfommVqsqeDD+ibzr6wdSYCSmABdheph9XggfsXWsvMdAfoYL10eqAv0O
+        cvcrWPA3aHZJVOJeiOygFIioDkEKqCkbpXIVXScMDkmB0cnPsBw/XBATI3EmODSSR3uhN5MPmSEMy8OQ
-        vdPM+T9I7wHC0We9wS/YtFzer/oca8lquEYwMrlEe2aS4npFTxGmq++tos6qNre0RnOrRU9uol6gr/Ks
+        NYsLN8ZaAozMwAzm/Z9U9TeBwDafbbJmOPiw7OPIcZ3dIe+PwNhUFT25KbgN+heoiqo54dwMttk3X11B
-        xOlLo1gP3zE1s8CKH7BcDvSd1dpNLVmyv8F1gr10515x4uwgh2PXOHj0Cs0ne+noflID/lXwL/kJt3EF
+        jFrvL9B33S3AGH1WwelL4zAevsf07AKWaNu1ehDOzG13UWX9LzJjh8A2+gqvcezsMA7Gr2H/4SuInRxA
-        thF+kyUAAAAASUVORK5CYII=
+        pu8Jhdpz2xz/BnT8ArdxBbaHHpuKAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="btnHelpManual.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        oDyCDBwIQJWXUTqQUdiXsV2WVMGtSU4ZaSwQJKBGcOWQ4JqMnaqMPMGbJQmtYzU1LY8yNN5AUOOBMm0t
-        rfsGX6ci2OQV7L4YTg9WPvQkKCxqTyMngD2zcsJgzK1wNr+VUxca0rlcKOEMHDC7Lhhw7GcHthM6StxI
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
 </value>
   </data>
   <data name="btnHelpVWeb.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
-        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
+        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
-        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
+        1QudDtdNp05jNRVXOHFe5ppmOdNvP2i8kXrxfXbOnud8zvN8z9kAwC2FzuJDik/KUq5pmZbWvJgWKwwW
-        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
+        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
-        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
+        onfJjlSDANLP2UgyhoEmluMqT2K6wCn06sQF4Ofp1GC9PQzVeC4ss1Z8WBjCp58zqJ8wIVFZjBDlJxyT
-        W2xTX8SB1HzibwAmRXsHokc8lLiScf0DCbOnFFSPGaK6e8iomsARzRBCag9iryCHCQCwgWVSbvCMQqQ+
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        5/lmD2BxlVxs2hs17hfK8q81fuxbI/fzPwD71DL6Rr6ja2AGWwLpRGyG1F+kbB7v6nciIIy96AaQc5mt
-        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
+        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
-        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
+        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
-        SUVORK5CYII=
+        rkJggg==
 </value>
   </data>
   <data name="btnShowErrFld.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
+      iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAANUlEQVR4nGNgoBR8ahL8jw1/bBTooMiAT8Qa8gmPAUQZ8n+Z3n9KMMOoAf9Hw0CPCmEw4AAA71z+QhwwNhoAAAAASUVORK5CYII=
-        EwAACxMBAJqcGAAAADRJREFUOE9jYKAUfGoS/I8Nf2wU6EBXixWgayTZEHRN6JigIf+X6f2nBI8aMGoA
+    </value>
-        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
+      iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAANUlEQVR4nGNgoBR8ahL8jw1/bBTooMiAT8Qa8gmPAUQZ8n+Z3n9KMMOoAf9Hw0CPCmEw4AAA71z+QhwwNhoAAAAASUVORK5CYII=
-        EwAACxMBAJqcGAAAADRJREFUOE9jYKAUfGoS/I8Nf2wU6EBXixWgayTZEHRN6JigIf+X6f2nBI8aMGoA
+    </value>
-        dQwYcAAA71z+QkP4emIAAAAASUVORK5CYII=
-</value>
   </data>
+  
   <data name="btnHelpAbout.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        LFlWPZ7bLeHYsmFY0BOV+Uy2BCH2fjfFjSO43X/8AGNzZk7H9hCcpMG0ZvN4LklCtK2g000TmVbtBWQU
+        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
-        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
+        BbN5DmmFTRQRUqwaxMPGIXFosZr96UZ8mh4pUh0YjhWZl2HAetcwaDDirLSOIkJUmlEoqnTQG+dF047G
-        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
+        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
-        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
+        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
-        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
+        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
-        QmCC
+        llg/yF+gIjK+CZq8XgAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="office2007StartButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -231,167 +229,213 @@
   <data name="btnNew.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
-        QVRYR82W224TVxiF/7teBfUJ+gp9ij5ABeGQEEI4BWLS3nJRCamq+gx9h9Ko6kVVUVGkCNFwSqhJQsiB
+        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
-        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
+        wSRgYifkfPhX1xrPNuPf9jgIIbGl78b+tdfaa2b+f+ztqg8v1+2j32AfXyG/wz75A/bpVdhnf8P2Xoft
-        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
+        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
-        XE5/gInReazs46M1lwS++gn47o86Rm5mIVeyQ5oYfYDNAEovc8CLPWB5Tw9d3de/UWs54FVea91oo9DW
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        Xvf2AAAAAElFTkSuQmCC
+        /wHzStEFcdgTgAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="btnOpen.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
-        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
+        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
-        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
+        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
-        dleurHMrebd4FEeadzSnrPOlvaFfa1Jx5Uprb0M58bB/rEhaxx34nPKSfq1JRQ34rW8X/wzHuHG5dcJ8
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
+        SPIX+0MAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="btnPrint.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
 </value>
   </data>
   <data name="btnPrepare.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
-        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
+        QVRYR8WXd1SUZxaHjW0V6SJFkaLYjShjW3tBEBgYqlgQWFvWCoplsY2UgFEEqQrCjGJBGBFREEQFsXfX
-        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
+        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
-        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
+        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
-        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
+        DgY+yqd9VbUAKPZto1Xo3UYu81THetseSJumiZyZHXBkekccmtYJlAb2uikgdjrpYbOdMVZa9/5qiBYA
-        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
+        Cc760qwZakj31ECsyAAEgwKvdqBEkD2jIzI9OymT0Eak0AhrKaXV1hZYZd3LVHmJv1UqAEF2ZqbRToaQ
-        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
+        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
-        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
+        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
-        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
+        XJPUhUOAhGWuSJVjVEoFYLeTuljqpI49ok7Y4tANwU59Eedlic2Opoh1NkQKgbBOdu3MwQ5RUqcome/t
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        O8rZtH6xU0fOxIyluiiKR2c2UHdlFw03DtF48wSNt89QdjKdDTIt4UqiuzERLtas9Hufpe5WxMksBMh6
+        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
-        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
+        URo53Qrvs1ZAfjKEUohFzY19fBUsifqSsygt2AHyhbsSJTTgsr4t2IaSw0EoCHFD6pIJiPfsgWiXbohx
-        +Ssp2RFOfoQPm6YOIdHfhlivDsR5tSfey4IVMksSAvuSHzOF1DCfF2t4DSBtpG7PDV85cD8zjMqc+agO
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        Z59WWv3HdMqK8B0NBlEmW4b3hxgIJXLYj9qfwJYiwn0wXsiWo/zYGhI2FNXnYwhCyn1grrCV1P14gg+u
-        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
+        vXuYy1x9MQH3ZVuw22e8iM1qAUDD/ajlPVa1xdj56hB7DMaZSF88S1+BFxn+KDtEfXQ93hbGIG2dN67v
-        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
+        WMATqsgJhPxUKE+i+nIiT6Pm5j7q/VzgD1eSOWBVcSQKE4Kwy2sM//RUAaDBUoMFrWGTr4f5r7pi/uMu
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        NHhHyOEnaYCrfwbmuroilFzZF+CA/SudkL7OE5LlrpAEB2DFliuYvVUOw2+lDEJOzf+ibgLwM/heH2Yn
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        Cg2lXmCEYaQFOpPsaKG3hH4hTxg47w8+D3+KY6T6otK3kgZ4R8G8tD8BLt4D9+/AZYl68FD5Uz6Z+zv2
+        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
-        kx+LL/MawH8tTblVC90lvOdTS+/gBj6a8phPZv/O4IVPGfrNUxwWq4dIUHkX1QCph5+KoYPm/8HHM38T
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        rkJggg==
 </value>
   </data>
   <data name="btnOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        QVQ4T33O7U9TZxjH8fsPMEaT6RujJosmSzTBRN+gTl74wsVoss2HBmGg0Q20sCrq1BW8MT67acyALIFN
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        zFtxRM6obRZIV+ToJATunMZ7cA5/HpmHr2Augbtn0EbhVQS6Bwxqnhm4fAZtYRC57+QskOGT0Riorkv0
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
 </value>
   </data>
-  <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>240, 17</value>
-  </metadata>
   <data name="btnExit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
-        QVQ4T6WTXUySYRTHuXzely9BJBQEP5AiUZoWNgzLPmxJad3oKi/Ki3LdeMlFW3YR0uzbrdpa9qW1Sgtb
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        +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
-        78XKEnzz9rNEWv73Mydj5/AYwjV2PFlaiD69Gi5xkgQ6e49Bi5GG7Sxh4rYHkS3V+LR1I76eOMxi71sP
+        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
-        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
+        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
-        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
+        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
-        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
+        j+nfDUm/ANUSPxfO1ir7AAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="btnAnnoDetailsPushPin.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJuAAASbgHMBsReAAACRElE
-        QVQ4T2P4//8/AyUYQ4AQzsvLYyTagIaGBqnCwkIBdHGCBrS2tGg3NjYuaWpqmjN58uSCxsbGDpB4V1cX
+        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
-        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
+        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
-        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
+        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
-        +S8g8WPHjv0vLCwsZqitrw9fvXb9rC1bty9va+86WtfQuGzFypX/X7x48f/z589gA0DgydOn/6dPn/7/
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        ukAgDFIH14ANW9rYOTo6uxggi+np6hKflInBWAVJwVgFicf/GQBsVJtsi1QmDgAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="btnAnnoDetailsPushPin.PressedImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        sWLFz+vXr/8/ePDQ/xkzZv7Pyc397+bu8cvYxGyRsam5JFYvwHBjQ4N0eXl5aUt72/YpU6c+6Onp/e/q
+        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
-        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
+        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
-        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
+        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
-        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
+        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
+        gg==
 </value>
   </data>
+  <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>240, 17</value>
+  </metadata>
   <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>651, 17</value>
   </metadata>

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

@@ -1,45 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.ComponentModel;
-
-namespace VEPROMS.CSLA.Library
-{
-	//C2025-023 - Electronic Procedures - Modifications to PROMS
-	//new class to handle access of tblAnnotations.Config
-	[Serializable]
-	[TypeConverter(typeof(ExpandableObjectConverter))]
-	public class AnnotationConfig : ConfigDynamicTypeDescriptor, INotifyPropertyChanged
-	{
-		private XMLProperties _Xp;
-		private XMLProperties Xp
-		{
-			get { return _Xp; }
-		}
-		public AnnotationConfig(string xml)
-		{
-			if (xml == string.Empty) xml = "<Config/>";
-			_Xp = new XMLProperties(xml);
-		}
-
-		public AnnotationConfig()
-		{
-			_Xp = new XMLProperties();
-		}
-		public override string ToString()
-		{
-			string s = _Xp.ToString();
-			if (s == "<Config/>" || s == "<Config></Config>") return string.Empty;
-			return s;
-		}
-		public string GetValue(string group, string item)
-		{
-			return _Xp[group, item];
-		}
-		public void SetValue(string group, string item, string newvalue)
-		{
-			_Xp[group, item] = newvalue;
-		}
-
-	}
-}

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

@@ -19,7 +19,6 @@ using System.Xml;
 using System.Drawing;
 using System.ComponentModel;
 using System.Collections.Generic;
-using Volian.Base.Library;
 
 namespace VEPROMS.CSLA.Library
 {
@@ -227,34 +226,6 @@ namespace VEPROMS.CSLA.Library
 				//}
 			}
 			OnFormatLoaded(null, new FormatEventArgs("Formats Updated"));
-
-			//C2025-023 - Electronic Procedures - Modifications to PROMS
-			//Begin section for processing Electronic Procedure (EP) Format Files
-			// now loop through all EP format files
-			string epPath = fmtPath.Replace("\\fmtall", "\\epall");
-			DirectoryInfo diEP = new DirectoryInfo(epPath);
-			if (diEP.Exists)
-			{
-				FileInfo[] fisEP = diEP.GetFiles("*.xml");
-				OnFormatLoaded(null, new FormatEventArgs(fisEP.Length.ToString() + " EP Formats to Load"));
-				foreach (FileInfo fi in fisEP)
-				{
-					string fmtname = Path.GetFileNameWithoutExtension(fi.Name);
-					try
-					{
-						AddEPFormatToDB(fmtname, DateTime.Now, VlnSettings.UserID, epPath);
-					}
-					catch (Exception ex)
-					{
-						Console.WriteLine("{0} - {1}", ex.GetType().Name, ex.Message);
-					}
-				}
-				OnFormatLoaded(null, new FormatEventArgs("EP Formats Updated"));
-
-				// update all in-use annotation types that have Electronic Procedures
-				EPFormatFile.UpdateAllInUseEPAnnotationTypes();
-			}
-
 		}
 
 		private static Dictionary<string, int> _LookupFormats;
@@ -367,54 +338,8 @@ namespace VEPROMS.CSLA.Library
 			}
 			return rec;
 		}
-
-		//C2025-023 - Electronic Procedures - Modifications to PROMS
-		//Procedure to load the EP format fiels into the DB
-		private static void AddEPFormatToDB(string formatname, DateTime Dts, string Userid, string epPath)
-		{
-			string fmtdata = null;
-			FileInfo fmtfi = null;
-			XmlDocument xd = null;
-
-			OnFormatLoaded(null, new FormatEventArgs("Loading Format " + formatname));
-
-			string path = Path.Combine(epPath, formatname + ".xml");
-			if (File.Exists(path))
-			{
-				try
-				{
-					using (StreamReader srf = new StreamReader(path))
-                    {
-						fmtfi = new FileInfo(path);
-						xd = new XmlDocument();
-						xd.XmlResolver = null;
-						xd.Load(srf);
-						fmtdata = xd.OuterXml;
-					}
-				}
-				catch (Exception ex)
-				{
-					OnFormatLoaded(null, new FormatEventArgs("Error Loading Format " + formatname));
-					_MyLog.ErrorFormat($"AddEPFormatToDB('{path}')");
-					return;
-				}
-			}
-
-			if (string.IsNullOrEmpty(Userid)) Userid = "Migration";
-
-			try
-			{
-				EPFormatFile.UpdateEPFormat(formatname, fmtdata, Userid);
-			}
-			catch (Exception ex)
-			{
-				_MyLog.ErrorFormat($"AddFormatToDB-make format('{path}')");
-			}
-
-		}
 	}
-
+	public partial class FormatInfo : IFormatOrFormatInfo
-public partial class FormatInfo : IFormatOrFormatInfo
 	{
 		//transition report stuff
 		private static Dictionary<int, string> _TransitionTypes;

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

@@ -449,9 +449,10 @@ namespace VEPROMS.CSLA.Library
 		{
 			StringBuilder sret = new StringBuilder();
 			ItemInfo pitem = this;
+
 			while (!pitem.IsSection && !pitem.IsHigh)
             {
-				using (StepInfo stpinfo = StepInfo.Get(pitem.ItemID))
+                using (StepInfo stpinfo = StepInfo.Get(pitem.ItemID))
                 {
                     string thisTab = stpinfo.MyTab.CleanText;
 
@@ -2111,56 +2112,6 @@ namespace VEPROMS.CSLA.Library
 			return (sd.Type == type);
 		}
 
-		// C2025-023 - Electronic Procedures - Modifications to PROMS
-		//return EPFields that match this step type or a parent step type
-		public EPFields GetValidEPFields(int AnnTypeID)
-		{
-			EPFields filtered = new EPFields();
-
-			if (ActiveFormat.PlantFormat.EPFormatFiles.Count == 0) return filtered;
-			if ((int)MyContent.Type < 20000) return filtered;
-			EPFields unfiltered = ActiveFormat.PlantFormat.EPFormatFiles.Find(x => x.AnnotationTypeID == AnnTypeID)?.FieldList;
-			if (unfiltered == null) return filtered;
-
-			//Build list of step type and step type of it's parents
-			List<string> steptypelist = new List<string>();
-			int stepType = ((int)MyContent.Type) % 10000;
-			StepDataList sdlist = ActiveFormat.PlantFormat.FormatData.StepDataList;
-			if (stepType > sdlist.MaxIndex)
-			{
-				Console.WriteLine("Error getting type - contentid = {0}", MyContent.ContentID);
-				return filtered;
-			}
-			StepData sd = sdlist[stepType];
-			while (sd.Index != 0)
-			{
-				steptypelist.Add(sd.Type);
-				sd = sdlist[sd.ParentType];
-			}
-
-			//if unfiltered list contains All as a step type, include it
-			foreach (EPField EP in unfiltered)
-			{
-				//if unfiltered list contains All as a step type, include it
-				if (EP.IsValidForStepType("All"))
-					filtered.Add(EP);
-
-				//check for intersections between unfiltered list and step type list
-				List<string> tmpEP = EP.validforsteptypes();
-				if (tmpEP.Any(steptypelist.Contains))
-					filtered.Add(EP);
-			}
-
-			return filtered;
-		}
-
-		// C2025-023 - Electronic Procedures - Modifications to PROMS
-		//return true if any EP Format files attached to the item's 
-		public bool HasEPformat(int AnnTypeID)
-		{
-			return GetValidEPFields(AnnTypeID).Count > 0;
-		}
-
 		// determine if the the current step should automatically be placed on the Continuous Action Summary
 		// Note, this logic only checks the format setting of the step.  We will check the value of the Tag's Check Box later on.
 		public bool IncludeOnContActSum
@@ -4704,50 +4655,43 @@ namespace VEPROMS.CSLA.Library
 			int localPrintLevel = PrintLevel;
 			StepSectionData sd = ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData;
 			bool doMeta = false;
-			if (sd.StepSectionLayoutData.TieTabToLevel) // C2025-036 reduce un-needed processing
+			if (sd.StepSectionLayoutData.TieTabToLevel && ActiveFormat.PlantFormat.FormatData.SectData.UseMetaSections)
 			{
-				if (ActiveFormat.PlantFormat.FormatData.SectData.UseMetaSections)
+				if (sd.StepSectionLayoutData.ShowSectionTitles
-				{
+				&& !MyDocStyle.CancelSectTitle
-					if (sd.StepSectionLayoutData.ShowSectionTitles
+				&& !(MyDocStyle.SpecialStepsFoldout && MyDocStyle.UseColSByLevel))
-					&& !MyDocStyle.CancelSectTitle
+					localPrintLevel = PrintLevel + (((ActiveFormat.PlantFormat.FormatData.Express && IsSequential)) ? 0 : CurrentSectionLevel());
-					&& !(MyDocStyle.SpecialStepsFoldout && MyDocStyle.UseColSByLevel))
+				if (!ActiveFormat.PlantFormat.FormatData.Express) doMeta = true;
-						localPrintLevel = PrintLevel + (((ActiveFormat.PlantFormat.FormatData.Express && IsSequential)) ? 0 : CurrentSectionLevel());
-					if (!ActiveFormat.PlantFormat.FormatData.Express) doMeta = true;
-				}
-				if (ActiveFormat.PlantFormat.FormatData.SectData.CountSubSectionsForLevel && (SectionLevel() > 1))
-					localPrintLevel += 1;
 			}
-
+			if (sd.StepSectionLayoutData.TieTabToLevel && ActiveFormat.PlantFormat.FormatData.SectData.CountSubSectionsForLevel)
+				if (SectionLevel() > 1)
+					localPrintLevel += 1;
 			SeqTabFmtList seqtabs = ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.SeqTabFmtList;
-
 			// Start with basic cases of alpha/numeric/seq:
 			// If we have metasections AND...
 			// If the seqtabs for this given level does not get a section number, use the seqtab rather than
 			// the ident of the step:
 			bool useSubStepTabs = false;
-			if (doMeta) // C2025-036 reduce un-needed processing
+			if (doMeta && IsHigh
-			{
+				&& !seqtabs[(localPrintLevel < 0 ? 0 : localPrintLevel) % seqtabs.MaxIndex].TabToken.Contains("{numericWpar}")
-				if (IsHigh
+				&& tbformat.Contains("{")) useSubStepTabs = true;
-					&& !seqtabs[(localPrintLevel < 0 ? 0 : localPrintLevel) % seqtabs.MaxIndex].TabToken.Contains("{numericWpar}")
-					&& tbformat.Contains("{")) useSubStepTabs = true;
 
-				// Check to be sure the parent tab should be included...  If this sequential is within a note
+			// Check to be sure the parent tab should be included...  If this sequential is within a note
-				// or caution or equipment list, don't use parent tab AND always start the numbering as a numeric
+			// or caution or equipment list, don't use parent tab AND always start the numbering as a numeric
-				if (IsSequential && (InNote() || InCaution() ||
+			if (doMeta && IsSequential && (InNote() || InCaution() ||
-					(MyParent.IsEquipmentList && !MyParent.FormatStepData.TabData.IdentPrint.Contains("{seq}"))))
+				(MyParent.IsEquipmentList && !MyParent.FormatStepData.TabData.IdentPrint.Contains("{seq}"))))
+			{
+				// if immediate parent is note, caution or equip, use numeric, otherwise use alpha.
+				localPrintLevel = 0;
+				int lv = 0;
+				ItemInfo ii = MyParent;
+				while (!ii.IsCaution && !ii.IsNote && !ii.IsEquipmentList)
 				{
-					// if immediate parent is note, caution or equip, use numeric, otherwise use alpha.
+					lv++;
-					localPrintLevel = 0;
+					ii = ii.MyParent;
-					int lv = 0;
-					ItemInfo ii = MyParent;
-					while (!ii.IsCaution && !ii.IsNote && !ii.IsEquipmentList)
-					{
-						lv++;
-						ii = ii.MyParent;
-					}
-					lv = lv % 2;
-					tbformat = (lv == 0) ? "{numeric}." : "{alpha}.";
 				}
+				lv = lv % 2;
+				tbformat = (lv == 0) ? "{numeric}." : "{alpha}.";
 			}
 			bool trimTabStart = false;
 			bool dontTrimParentTabBeforeAppending = false; // B2019-011 for Barakah Alarm format
@@ -4813,7 +4757,7 @@ namespace VEPROMS.CSLA.Library
 				PrintLevel = 0;
 
 			// If token includes 'Wpar', the parent tab prefix's the tab.
-			if (localPrintLevel > 0 && tbformat.Contains("Wpar}"))  // C2025-036 reduce un-needed processing
+			if (localPrintLevel > 0 && (tbformat.IndexOf("{numericWpar}") > -1 || tbformat.IndexOf("{alphaWpar}") > -1 || tbformat.IndexOf("{ALPHAWpar}") > -1))
 			{
 				string parentTab = null;
 				ItemInfo myparent = ActiveParent as ItemInfo;
@@ -4928,21 +4872,18 @@ namespace VEPROMS.CSLA.Library
 			}
 			string alpha = useLinked?LinkedTab.Trim():AlphabeticalNumbering(ordinal);
 			if (trimSeqValue) alpha = alpha.Trim(); // F2024-043 trim white around SEQ tab value (for sub-steps)
-			if (tbformat.ToUpper().Contains("{ALPHA")) // C2025-036 reduce un-needed processing
+			// B2017-211 Roman High Level steps should be followed by Uppercase alpha substeps - This is being limited to Calvert SAMG Format
-			{
+			if (_ActiveFormat.Name =="BGESAM1" &&MyParent != null && MyParent.IsHigh && MyParent.IsStep && MyParent.FormatStepData.TabData.IdentEdit.Contains("ROMAN"))
-				// B2017-211 Roman High Level steps should be followed by Uppercase alpha substeps - This is being limited to Calvert SAMG Format
+				tbformat = tbformat.Replace("{alpha}", alpha);
-				if (_ActiveFormat.Name == "BGESAM1" && MyParent != null && MyParent.IsHigh && MyParent.IsStep && MyParent.FormatStepData.TabData.IdentEdit.Contains("ROMAN"))
+			else
-					tbformat = tbformat.Replace("{alpha}", alpha);
+				tbformat = tbformat.Replace("{alpha}", alpha.ToLower());
-				else
+			tbformat = tbformat.Replace("{alphaWpar}", alpha.ToLower());
-					tbformat = tbformat.Replace("{alpha}", alpha.ToLower());
+			if (ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert && tbformat.Contains("{ALPHA}") && alpha.Length > 1)
-				tbformat = tbformat.Replace("{alphaWpar}", alpha.ToLower());
+				tbformat = tbformat.Replace("{ALPHA}. ", alpha + ".");   // if double chars, remove one of the space for BGE
-				if (ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert && tbformat.Contains("{ALPHA}") && alpha.Length > 1)
+			else
-					tbformat = tbformat.Replace("{ALPHA}. ", alpha + ".");   // if double chars, remove one of the space for BGE
+				tbformat = tbformat.Replace("{ALPHA}", alpha);
-				else
-					tbformat = tbformat.Replace("{ALPHA}", alpha);
 
-				tbformat = tbformat.Replace("{ALPHAWpar}", alpha);
+			tbformat = tbformat.Replace("{ALPHAWpar}", alpha);
-			}
 			if (tbformat.ToUpper().Contains("ROMAN"))
 			{
 				string roman = RomanNumbering(ordinal);
@@ -4950,18 +4891,15 @@ namespace VEPROMS.CSLA.Library
 				tbformat = tbformat.Replace("{ROMAN}", roman);
 				tbformat = tbformat.Substring(0, tbformat.Length - ((roman.Length - 1) > 0 ? (roman.Length - 1) : 0));
 			}
-			if (tbformat.Contains("{numeric}")) // C2025-036 reduce un-needed processing
+			if (tbformat.Contains("{numeric}") && ((MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_AddDotZeroStdHLS) == E_DocStructStyle.DSS_AddDotZeroStdHLS) && MyContent.Type == 20002)
 			{
-				if (((MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_AddDotZeroStdHLS) == E_DocStructStyle.DSS_AddDotZeroStdHLS) && MyContent.Type == 20002)
+				tbformat = tbformat.Replace("{numeric}", ordinal.ToString().PadLeft(2) + ".0");
-				{
+				tbformat = tbformat.Substring(0, tbformat.Length - 2);
-					tbformat = tbformat.Replace("{numeric}", ordinal.ToString().PadLeft(2) + ".0");
+			}
-					tbformat = tbformat.Substring(0, tbformat.Length - 2);
+			if (tbformat.Contains("{numeric}") && (this.FormatStepData.AppendDotZero)) // F2018-022 Added step type flag to append a ".0" to the end of the high level step - put in for Westinghouse single column format (wst1)
-				}
+			{
-				if (this.FormatStepData.AppendDotZero) // F2018-022 Added step type flag to append a ".0" to the end of the high level step - put in for Westinghouse single column format (wst1)
+				string numtxt = ordinal.ToString().PadLeft(2) + ".0";
-				{
+				tbformat = tbformat.Replace("{numeric}.", numtxt).Replace("{numeric}", numtxt);
-					string numtxt = ordinal.ToString().PadLeft(2) + ".0";
-					tbformat = tbformat.Replace("{numeric}.", numtxt).Replace("{numeric}", numtxt);
-				}
 			}
 			// if this is a wolf creek background, if the tbformat ends with a '.' don't add a space,
 			// otherwise add a space.
@@ -6159,10 +6097,9 @@ namespace VEPROMS.CSLA.Library
 		}
 		private bool IsLowestLevelStep
 		{
-			//F2025-015 added check for IsInCautionOrNote for sub-step inside Notes and Cautions
 			get
 			{
-				return (!(IsCaution || IsNote || IsInCautionOrNote || IsTable || IsFigure || Steps != null || MyParent.IsCaution || MyParent.IsNote));
+				return (!(IsCaution || IsNote || IsTable || IsFigure || Steps != null || MyParent.IsCaution || MyParent.IsNote));
 			}
 		}
 		private bool RNOsHighHasCheckOff()
@@ -7005,11 +6942,11 @@ namespace VEPROMS.CSLA.Library
 		#endregion // EnhancedGetMissingEnh
 		#endregion // EnhancedSupport
 		#region Text Search
-		public static ItemInfoList GetListFromTextSearch(string docVersionList, string stepTypeList, string searchString, int caseSensitive, int ProcSectSrch, ItemSearchIncludeLinks includeLinks, bool includeRtfFormatting, bool includeSpecialCharacters, string unitPrefix, string byWordPrefix, string byWordSuffix)
+		public static ItemInfoList GetListFromTextSearch(string docVersionList, string stepTypeList, string searchString, int caseSensitive, ItemSearchIncludeLinks includeLinks, bool includeRtfFormatting, bool includeSpecialCharacters, string unitPrefix, string byWordPrefix, string byWordSuffix)
 		{
 			try
 			{
-				using (ItemInfoList tmp = DataPortal.Fetch<ItemInfoList>(new ItemListSearchCriteria(docVersionList, stepTypeList, searchString, caseSensitive, ProcSectSrch, includeLinks, includeRtfFormatting, includeSpecialCharacters, unitPrefix, byWordPrefix, byWordSuffix)))
+				using (ItemInfoList tmp = DataPortal.Fetch<ItemInfoList>(new ItemListSearchCriteria(docVersionList, stepTypeList, searchString, caseSensitive, includeLinks, includeRtfFormatting, includeSpecialCharacters, unitPrefix, byWordPrefix, byWordSuffix)))
                 {
 					tmp.SourceOfList = "Search";
 					ItemInfo.AddList(tmp);
@@ -7048,13 +6985,6 @@ namespace VEPROMS.CSLA.Library
 			{
 				get { return _CaseSensitive; }
 				set { _CaseSensitive = value; }
-			}
-				// B2022-031 - added a ProcSectSrch to filter out procedure and section titles from global search results.
-			private int _ProcSectSrch;
-			public int ProcSectSrch
-			{
-				get { return _ProcSectSrch; }
-				set { _ProcSectSrch = value; }
 			}
 			private ItemSearchIncludeLinks _IncludeLinks;
 			public ItemSearchIncludeLinks IncludeLinks
@@ -7098,14 +7028,13 @@ namespace VEPROMS.CSLA.Library
 				set { _ByWordSuffix = value; }
 			}
 			public ItemListSearchCriteria(string docVersionList, string stepTypeList, string searchString,
-				int caseSensitive, int ProcSectSrch, ItemSearchIncludeLinks includeLinks, bool includeRtfFormatting, bool includeSpecialCharacters, 
+				int caseSensitive, ItemSearchIncludeLinks includeLinks, bool includeRtfFormatting, bool includeSpecialCharacters, 
 				string unitPrefix, string byWordPrefix, string byWordSuffix)
 			{
 				_DocVersionList = docVersionList;
 				_StepTypeList = stepTypeList;
 				_SearchString = searchString;
 				_CaseSensitive = caseSensitive;
-				_ProcSectSrch = ProcSectSrch;
 				_IncludeLinks = includeLinks;
 				_IncludeRtfFormatting = includeRtfFormatting;
 				_IncludeSpecialCharacters = includeSpecialCharacters;
@@ -7129,7 +7058,6 @@ namespace VEPROMS.CSLA.Library
 						cm.Parameters.AddWithValue("@StepTypeList", criteria.StepTypeList);
 						cm.Parameters.AddWithValue("@SearchString", criteria.SearchString);
 						cm.Parameters.AddWithValue("@CaseSensitive", criteria.CaseSensitive);
-						cm.Parameters.AddWithValue("@ProcSectSrch", criteria.ProcSectSrch);
 						cm.Parameters.AddWithValue("@IncludeLinks", (int)criteria.IncludeLinks);
 						cm.Parameters.AddWithValue("@IncludeRtfFormatting", criteria.IncludeRtfFormatting ? 1 : 0);
 						cm.Parameters.AddWithValue("@IncludeSpecialCharacters", criteria.IncludeSpecialCharacters ? 1 : 0);
@@ -8325,7 +8253,6 @@ namespace VEPROMS.CSLA.Library
 				if (_ProcedureConfig == null)
 				{
 					_ProcedureConfig = new ProcedureConfig(this);
-					this.MyContent.Changed -= new ContentInfoEvent(MyContent_Changed);
 					this.MyContent.Changed += new ContentInfoEvent(MyContent_Changed);
 				}
 				return _ProcedureConfig;
@@ -8335,7 +8262,6 @@ namespace VEPROMS.CSLA.Library
 
 		void MyContent_Changed(object sender)
 		{
-			this.MyContent.Changed -= new ContentInfoEvent(MyContent_Changed);
 			this.MyContent.Changed += new ContentInfoEvent(MyContent_Changed);
 		}
 		#endregion

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

@@ -547,17 +547,6 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _AdjSectTitleLoc, "@AdjSectTitleLoc");
 			}
 		}
-
-		// this will add additional spacing between the Section Numbers and Titles
-		private LazyLoad<float?> _SectTitleOffsetOverride;
-		public float? SectTitleOffsetOverride
-		{
-			get
-			{
-				return LazyLoad(ref _SectTitleOffsetOverride, "@SectTitleOffsetOverride");
-			}
-		}
-
 		#endregion AdjSectTitleLoc
 
 		#region ShowAlarmPointWindowInfo
@@ -664,21 +653,6 @@ namespace VEPROMS.CSLA.Library
 			}
 		}
 		#endregion
-
-		#region AltMultiUnitWording
-		[Category("Miscellaneous")]
-		[Description("Alternate Wording for Printing when MultiUnit")]
-
-		// this will utilize Alternate Wording for Printing when MultiUnit and PrintCommonForZeroUnit is set
-		private LazyLoad<string> _AltMultiUnitWording;
-		public string AltMultiUnitWording
-		{
-			get
-			{
-				return LazyLoad(ref _AltMultiUnitWording, "@AltMultiUnitWording");
-			}
-		}
-		#endregion IncludeInTOC
 		public override string ToString()
 		{
 			return String.Format("{0:D2} - {1}", Index, Name);

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

@@ -1,412 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.ComponentModel;
-using System.Xml;
-using System.Linq;
-using System.Data.SqlClient;
-using System.Data;
-using Csla.Data;
-using static VEPROMS.CSLA.Library.ROFSTLookup;
-
-namespace VEPROMS.CSLA.Library
-{
-	//C2025-023 - Electronic Procedures - Modifications to PROMS
-	// class to handle storage and access of EPFormatFile and EPFormatFile details
-	#region EPFormatFiles
-	[TypeConverter(typeof(vlnListConverter<EPFormatFiles, EPFormatFile>))]
-	public class EPFormatFiles : vlnFormatList<EPFormatFile>
-	{
-		public EPFormatFiles(XmlNodeList xmlNodeList) : base(xmlNodeList) { }
-	}
-	#endregion
-	#region EPFormatFile
-	public class EPFormatFile : vlnFormatItem
-	{
-		#region Constructor
-		public EPFormatFile(XmlNode xmlNode) : base(xmlNode) { }
-		public EPFormatFile() : base() { }
-		#endregion
-		#region Business Fields
-		// Name of the EP Viewer Format File
-		private LazyLoad<string> _Name;
-		[DisplayName("Name")]
-		[Description("EP Viewer File Name")]
-		public string Name
-		{
-			get
-			{
-				return LazyLoad(ref _Name, "@Name");
-			}
-		}
-		// Name of the EP Viewer Format File
-		private LazyLoad<string> _Description;
-		[DisplayName("Description")]
-		[Description("EP Viewer Description")]
-		public string Description
-		{
-			get
-			{
-				return LazyLoad(ref _Description, "@Description");
-			}
-		}
-		// Id of Annotation Type Associated with this file
-		private LazyLoad<int?> _AnnotationTypeID;
-		[DisplayName("AnnotationTypeID")]
-		[Description("Id of Annotation Type Associated with this file")]
-		public int? AnnotationTypeID
-		{
-			get
-			{
-				return LazyLoad(ref _AnnotationTypeID, "@AnnotationTypeID");
-			}
-		}
-		// returns a list of fields that are defined in the EP format's structure
-		private EPFields _FieldList;
-		public EPFields FieldList
-		{
-			get
-			{
-				XmlDocument xd = GetEPFormatData(Name);
-				return _FieldList == null ? _FieldList = new EPFields(xd.SelectNodes("/EPFormat/EPField")) : _FieldList;
-			}
-		}
-		#endregion
-		#region Business Methods
-		// update all in-use annotation types that have Electronic Procedures
-		public static void UpdateAllInUseEPAnnotationTypes()
-		{
-			foreach (int formatid in GetAllInUseFormats())
-			{
-				PlantFormat frmt = FormatInfo.Get(formatid).PlantFormat;
-				foreach (EPFormatFile EP in frmt.EPFormatFiles)
-                {
-					UpdateAnnotationTypeAsEP((int) EP.AnnotationTypeID);
-				}			
-			}
-		}
-		#endregion
-		#region Data Access
-		// static - Load EP Format details - save to db (insert/update)
-		public static void UpdateEPFormat(string name, string data, string userID)
-		{
-			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-			{
-				using (SqlCommand cm = cn.CreateCommand())
-				{
-					cm.CommandType = CommandType.StoredProcedure;
-					cm.CommandText = "vesp_UpdateEPFormat";
-					cm.Parameters.AddWithValue("@name", name);
-					cm.Parameters.AddWithValue("@data", data);
-					cm.Parameters.AddWithValue("@userID", userID);
-					cm.CommandTimeout = Database.DefaultTimeout;
-					cm.ExecuteNonQuery();
-				}
-			}
-		}
-
-		// load data for getting fieldlist for this EPFormat
-		public static XmlDocument GetEPFormatData(string name)
-		{
-			name = name.Replace(".xml", "");
-
-			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-			{
-				using (SqlCommand cm = cn.CreateCommand())
-				{
-					cm.CommandType = CommandType.Text;
-					cm.CommandText = "Select Data FROM EPFormats where Name = @Name";
-					cm.Parameters.AddWithValue("@Name", name);
-					cm.CommandTimeout = Database.DefaultTimeout;
-					using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
-					{
-						if (dr.Read())
-						{
-							XmlDocument xd = new XmlDocument();
-							xd.XmlResolver = null;
-							xd.LoadXml(dr.GetString("Data"));
-							return xd;
-						}
-					}
-				}
-			}
-
-			return null;
-		}
-
-		// Get all in-use formats
-		public static List<int> GetAllInUseFormats()
-		{
-			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-			{
-				using (SqlCommand cm = cn.CreateCommand())
-				{
-					cm.CommandType = CommandType.Text;
-					cm.CommandText = @"SELECT Distinct Formats.[FormatID]
-										FROM 
-										(
-											 SELECT FormatID FROM Contents
-											 UNION 
-											 SELECT FormatID FROM DocVersions
-											 UNION 
-											 SELECT FormatID FROM Folders										
-										) inuse
-										inner join Formats
-										on inuse.FormatID = Formats.FormatID";
-					cm.CommandTimeout = Database.DefaultTimeout;
-
-					using (DataTable dt = new DataTable())
-					{
-						using (SqlDataAdapter da = new SqlDataAdapter(cm))
-						{
-							da.Fill(dt);
-							return dt.AsEnumerable().Select(x => x.Field<int>("FormatID")).ToList();
-						}
-					}
-
-				}
-			}
-		}
-
-		// update an annotation type as an Electronic Procedure Annotation Type
-		public static void UpdateAnnotationTypeAsEP(int typeID)
-		{
-			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-			{
-				using (SqlCommand cm = cn.CreateCommand())
-				{
-					cm.CommandType = CommandType.Text;
-					cm.CommandText = @"Update AnnotationTypes
-										SET IsEPAnnotationType = 1
-									    WHERE TypeID = @typeID";
-					cm.Parameters.AddWithValue("@typeID", typeID);
-					cm.CommandTimeout = Database.DefaultTimeout;
-					cm.ExecuteNonQuery();
-				}
-			}
-		}
-
-		// Returns true if there are any EP Annotation Types
-		public static bool IsEPAnnotationType()
-		{
-			try
-			{
-				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-				{
-					using (SqlCommand cm = cn.CreateCommand())
-					{
-						cm.CommandType = CommandType.Text;
-						cm.CommandText = @"SELECT RESULT = CASE WHEN 
-						EXISTS(SELECT 1 FROM AnnotationTypes where IsEPAnnotationType = 1) 
-						THEN 1 ELSE 0 END";
-						cm.CommandTimeout = Database.DefaultTimeout;
-						using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
-						{
-							if (dr.Read() && dr.GetInt32("RESULT") == 1)
-								return true;
-						}
-					}
-				}
-			}
-			catch
-			{
-				// EP Support has not yet been added for this DB
-				// IsEPAnnotationType does not exist
-				// need to run PROMS Fixes
-				// until then will ignore EP code
-				// instead of crashing for a field not found
-			}
-
-			return false;
-		}
-		#endregion
-	}
-
-	public class EPFields : vlnFormatList<EPField>
-	{
-        public EPFields()
-        {
-        }
-
-        public EPFields(XmlNodeList xmlNodeList) : base(xmlNodeList) { }
-	}
-	// EP field class
-	public class EPField : vlnFormatItem
-	{
-		public EPField(XmlNode xmlNode) : base(xmlNode) { }
-		public EPField() : base() { }
-		private LazyLoad<string> _name;
-		public string name
-		{
-			get
-			{
-				return LazyLoad(ref _name, "@name");
-			}
-		}
-		private LazyLoad<string> _type;
-		public string type
-		{
-			get
-			{
-				return LazyLoad(ref _type, "@type");
-			}
-		}
-		private LazyLoad<string> _label;
-		public string label
-		{
-			get
-			{
-				string tmp = LazyLoad(ref _label, "@label");
-
-				if (string.IsNullOrEmpty(tmp))
-					return LazyLoad(ref _name, "@name");
-				else
-					return tmp;
-			}
-		}
-		private LazyLoad<string> _text;
-		public string text
-		{
-			get
-			{
-				return LazyLoad(ref _text, "@text");
-			}
-		}
-		//roid of group item that individual sub-items will be the choices for the list/combobox for ROSINGLE and ROMULTI
-		private LazyLoad<string> _rosource;
-		public string rosource
-		{
-			get
-			{
-				return LazyLoad(ref _rosource, "@rosource");
-			}
-		}
-		//the columns in the RO that will be included in the exports
-		private LazyLoad<string> _returncols;
-		public List<string> returncols()
-		{
-			try
-			{
-				string tmp = LazyLoad(ref _returncols, "@returncols");
-
-				if (string.IsNullOrEmpty(tmp))
-					return new List<string>();
-				else
-					return tmp.Split(',').Select(p => p.Trim()).ToList();
-			}
-			catch
-			{
-				throw new ArgumentException($"Error in returncols for EP file: {((EPFormatFile)MyParentFormat).Name}.xml, field: {name}");
-			}
-		}
-
-		//number of lines for a multi-line text box to span
-		private LazyLoad<int?> _numlines;
-		public int numlines
-		{
-			get
-			{
-				int? tmp = LazyLoad(ref _numlines, "@numlines");
-
-				if (tmp == null)
-					return 1;
-
-				return (int) tmp;
-			}
-		}
-		//step types that the EPForma Item is valid for (as a list of types)
-		private LazyLoad<string> _validforsteptypes;
-        public List<string> validforsteptypes()
-		{
-			try
-			{
-				string tmp = LazyLoad(ref _validforsteptypes, "@validforsteptypes");
-				return tmp.Split(',').Select(p => p.Trim()).ToList();
-			}
-			catch
-			{
-				throw new ArgumentException($"Error in validforsteptypes for EP file: {((EPFormatFile) MyParentFormat).Name}.xml, field: {name}");
-			}
-		}
-		public bool IsValidForStepType(string StepType)
-		{
-			List<string> tmp = validforsteptypes();
-			return tmp.Contains(StepType);
-		}
-
-		//return a list of items based on the ROsource specified in the EPFormat File
-		//will return all RO items under the Group that's roid = the rosource
-		public List<ROListItem> getROList(AnnotationInfo currAnn, bool includeblank)
-		{
-			if (string.IsNullOrEmpty(rosource))
-				return new List<ROListItem>();
-
-			try
-			{
-				DocVersionInfo MyDocVersion = currAnn.MyItem.MyDocVersion;
-				ROFSTLookup lookup = MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MyDocVersion);
-
-				string roid = FormatRoidKey(rosource, false);
-				rochild[] children = lookup.GetRoChildrenByRoid(roid);
-
-				List<ROListItem> mylist = children.Select(x => new ROListItem(x.title, x.roid.Substring(0, 12))).ToList();
-				if (includeblank)
-					mylist.Insert(0, new ROListItem("", ""));
-
-				return mylist;
-			}
-			catch (Exception Ex)
-			{
-				throw new ArgumentException($"Error in rosource for EP file: {((EPFormatFile)MyParentFormat).Name}.xml, field: {name}");
-			}
-		}
-
-
-		//return a list of values for the specified ROID
-		//given the EP items return columns
-		//will return all RO items under the Group that's roid = the rosource
-		public List<string> getROValuesList(AnnotationInfo currAnn, string roid)
-		{
-			if (string.IsNullOrEmpty(roid))
-				return new List<string>();
-
-			List<string> values = new List<string>();
-			DocVersionInfo MyDocVersion = currAnn.MyItem.MyDocVersion;
-			ROFSTLookup lookup = MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MyDocVersion);
-			rochild ro = lookup.GetRoChild(roid);
-
-			List<string> rtncols = returncols();
-
-			if (rtncols.Count == 0)
-			{
-				values.Add(ro.value);
-			}
-			else 
-			{
-				foreach (string rcol in rtncols)
-				{
-					rochild ro_indiv = Array.Find(ro.children, x => x.appid.EndsWith($".{rcol}"));
-					if (ro_indiv.value != null) values.Add(ro_indiv.value);
-				}
-			}
-
-			return values;
-
-		}
-	}
-	#endregion
-	//C2025-023 - Electronic Procedures - Modifications to PROMS
-	// class to handle return of RO Lists
-	#region EPFormatFiles
-	public class ROListItem
-	{
-		public string Text { get; private set; }
-		public string Value { get; private set; }
-		public ROListItem(string _text, string _value)
-		{
-			Text = _text; Value = _value;
-		}
-	}
-	#endregion
-}
-

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

@@ -244,16 +244,6 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _TrimEnding, "@TrimEnding");
 			}
 		}
-		// C2025-033 to specify to print pagestyle item for a specific Child procedure
-		private LazyLoad<int?> _ChildNum;
-		public int? ChildNum
-		{
-			get
-			{
-				return (LazyLoad(ref _ChildNum, "@ChildNum"));
-			}
-		}
-
 		#endregion
 		#region Override ToString
 		public override string ToString()

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

@@ -192,18 +192,6 @@ namespace VEPROMS.CSLA.Library
             }
             return (retlist);
         }
-
-		//C2025-023 - Electronic Procedures - Modifications to PROMS
-		// EPFormatFiles contains which Electronic Procedure Format files apply to this main format file.
-		private EPFormatFiles _EPFormatFiles;
-		public EPFormatFiles EPFormatFiles
-		{
-			get
-			{
-				if (_EPFormatFiles == null) _EPFormatFiles = new EPFormatFiles(XmlDoc.SelectNodes("/PlantFormat/EPFormatFiles/EPFormatFile"));
-				return _EPFormatFiles;
-			}
-		}
 	}
 	#endregion
 	#region VE_Font

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

@@ -57,8 +57,6 @@ namespace VEPROMS.CSLA.Library
 				XmlNode xn = xmlNode.SelectSingleNode(path);
 				if (xmlNode.Name == "Box") return xn;   // if box, don't do inheritance.
 				if (xmlNode.Name == "DocStyle") return xn;
-				//C2025-023 - Electronic Procedures - Modifications to PROMS
-				if (xmlNode.Name == "EPField") return xn;   // if Electronic Procedure Field, don't do inheritance.
 				if (xmlNode.Name == "StructureStyle")
 				{
 					Volian.Base.Library.DebugText.WriteLine("vlnFormatDocument:LookupSingleNode:StructureStyle - shouldn't get to this line of code.\r\nPath = {0}", path);

PROMS/VEPROMS.CSLA.Library/Generated/AnnotationType.cs

@@ -18,8 +18,6 @@ using System.IO;
 using System.ComponentModel;
 using System.Collections.Generic;
 using Csla.Validation;
-using System.Linq;
-
 namespace VEPROMS.CSLA.Library
 {
 	/// <summary>
@@ -209,27 +207,6 @@ namespace VEPROMS.CSLA.Library
 				}
 			}
 		}
-
-		//C2025-023 - Electronic Procedures - Modifications to PROMS
-		// Is Annotation Type an EP Annotation?
-		private bool _IsEPAnnotationType = false;
-		public bool IsEPAnnotationType
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				return _IsEPAnnotationType;
-			}
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			set
-			{
-				if (_IsEPAnnotationType != value)
-				{
-					_IsEPAnnotationType = value;
-					PropertyHasChanged();
-				}
-			}
-		}
 		private byte[] _LastChanged = new byte[8];//timestamp
 		private int _AnnotationTypeAnnotationCount = 0;
 		/// <summary>
@@ -735,8 +712,6 @@ namespace VEPROMS.CSLA.Library
 				_UserID = dr.GetString("UserID");
 				dr.GetBytes("LastChanged", 0, _LastChanged, 0, 8);
 				_AnnotationTypeAnnotationCount = dr.GetInt32("AnnotationCount");
-				if (dr.GetSchemaTable().Rows.OfType<DataRow>().Any(row => row["ColumnName"].ToString() == "IsEPAnnotationType"))
-					_IsEPAnnotationType = (bool)dr.GetValue("IsEPAnnotationType");
 				MarkOld();
 			}
 			catch (Exception ex)

PROMS/VEPROMS.CSLA.Library/Generated/AnnotationTypeInfo.cs

@@ -17,8 +17,6 @@ using System.Configuration;
 using System.IO;
 using System.ComponentModel;
 using System.Collections.Generic;
-using System.Linq;
-
 namespace VEPROMS.CSLA.Library
 {
 	public delegate void AnnotationTypeInfoEvent(object sender);
@@ -137,19 +135,6 @@ namespace VEPROMS.CSLA.Library
 				return _UserID;
 			}
 		}
-
-		//C2025-023 - Electronic Procedures - Modifications to PROMS
-		// Is Annotation Type an EP Annotation?
-		private bool _IsEPAnnotationType = false;
-		public bool IsEPAnnotationType
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				return _IsEPAnnotationType;
-			}
-		}
-
 		private int _AnnotationTypeAnnotationCount = 0;
 		/// <summary>
 		/// Count of AnnotationTypeAnnotations for this AnnotationType
@@ -327,8 +312,6 @@ namespace VEPROMS.CSLA.Library
 				_DTS = dr.GetDateTime("DTS");
 				_UserID = dr.GetString("UserID");
 				_AnnotationTypeAnnotationCount = dr.GetInt32("AnnotationCount");
-				if (dr.GetSchemaTable().Rows.OfType<DataRow>().Any(row => row["ColumnName"].ToString() == "IsEPAnnotationType"))
-					_IsEPAnnotationType = (bool)dr.GetValue("IsEPAnnotationType");
 			}
 			catch (Exception ex)
 			{

PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs

@@ -1,175 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Data;
-using System.Data.SqlClient;
-using System.Text.RegularExpressions;
-using Csla;
-using Csla.Data;
-using System.Configuration;
-using System.IO;
-using System.ComponentModel;
-
-
-//namespace VEPROMS.CSLA.Library;
-
-// C2025-027 this new file is used to support (data retrival) for selecting Annotation types to display on the Annotation screen.  This is related to Annotation type filtering through V->Options.
-
-namespace VEPROMS.CSLA.Library
-{
-	public class AnnotationstypeSelections
-	{
-		public static DataTable Get(string UserID)
-		{
-			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-			{
-				using (SqlCommand cm = cn.CreateCommand())
-				{
-					try
-					{
-						cm.CommandType = CommandType.StoredProcedure;
-						cm.CommandText = "getAnnotationstypeFiltered";
-						cm.CommandTimeout = Database.DefaultTimeout;
-						cm.Parameters.AddWithValue("@UsrID", UserID);
-						SqlDataAdapter da = new SqlDataAdapter(cm);
-						SqlDataReader reader = cm.ExecuteReader();
-						DataTable dt = new DataTable();
-						dt.Load(reader);
-						// if the user has not created a annotation sub-set list saved to AnnotationTypeSelections table.
-						if (dt.Rows.Count < 1)
-						{
-							DataRow row;
-							int rowflg = 0;
-							foreach (AnnotationTypeInfo annosel in DataPortal.Fetch<AnnotationTypeInfoList>())
-							{
-								// C2025-027 need to use a datatable instead of AnnotationTypeInfoList so the global search Annotations will not be effected by the Annotation select list selections
-								if (rowflg == 0)
-								{
-									row = dt.NewRow();
-									dt.Rows.Add(row);
-									rowflg = 1;
-								}
-								else
-								{
-									row = dt.NewRow();
-									row["TypeID"] = annosel.TypeID;
-									row["Name"] = annosel.Name;
-									row["Config"] = annosel.Config;
-									row["DTS"] = annosel.DTS;
-									row["UserID"] = annosel.UserID;
-									row["IsEPAnnotationType"] = annosel.IsEPAnnotationType;
-									dt.Rows.Add(row);
-								}
-
-
-							};
-						}
-						return dt;
-
-					}
-					catch (Exception ex)
-					{
-						//B2025-004
-						//if it fails loading previously open tabs, simply treat it as if no tabs were open
-						//instead of crashing
-						return new DataTable();
-					}
-
-				}
-			}
-		}
-		public static DataTable Retrieve(string UserID)
-		{
-			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-			{
-				using (SqlCommand cm = cn.CreateCommand())
-				{
-					try
-					{
-						cm.CommandType = CommandType.StoredProcedure;
-						cm.CommandText = "getAnnotationstypeSelections";
-						cm.CommandTimeout = Database.DefaultTimeout;
-						cm.Parameters.AddWithValue("@UsrID", UserID);
-						SqlDataAdapter da = new SqlDataAdapter(cm);
-						SqlDataReader reader = cm.ExecuteReader();
-						DataTable dt = new DataTable();
-						dt.Load(reader);
-
-						return dt;
-
-					}
-					catch (Exception ex)
-					{
-						//B2025-004
-						//if it fails loading previously open tabs, simply treat it as if no tabs were open
-						//instead of crashing
-						return new DataTable();
-					}
-
-				}
-			}
-		}
-		public static DataTable GetAnnoTypes(string UserID)
-		{
-			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-			{
-				using (SqlCommand cm = cn.CreateCommand())
-				{
-					try
-					{
-						cm.CommandType = CommandType.StoredProcedure;
-						cm.CommandText = "getAnnotationSelectListTypes";
-						cm.CommandTimeout = Database.DefaultTimeout;
-						SqlDataAdapter da = new SqlDataAdapter(cm);
-						cm.Parameters.AddWithValue("@UserID", UserID);
-						SqlDataReader reader = cm.ExecuteReader();
-						DataTable dt = new DataTable();
-						dt.Load(reader);
-
-						return dt;
-
-					}
-					catch (Exception ex)
-					{
-						//B2025-004
-						//if it fails loading previously open tabs, simply treat it as if no tabs were open
-						//instead of crashing
-						return new DataTable();
-					}
-
-				}
-			}
-		}
-
-		public static void Update(DataTable dt, string UserID)
-		{
-			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-			{
-				using (SqlCommand cm = cn.CreateCommand())
-				{
-					try
-					{
-						cm.CommandType = CommandType.StoredProcedure;
-						cm.CommandText = "UpdateAnnotationstypeSelections";
-						cm.CommandTimeout = Database.DefaultTimeout;
-
-						//Pass table Valued parameter to Store Procedure
-						SqlParameter sqlParam = cm.Parameters.AddWithValue("@TempTable", dt);
-						sqlParam.SqlDbType = SqlDbType.Structured;
-						cm.Parameters.AddWithValue("@UserID", UserID);
-						cm.ExecuteNonQuery();
-					}
-					catch (Exception ex)
-					{
-						throw new DbCslaException("Error in UpdateAnnotationstypeSelections: update failed", ex);
-					}
-				}
-			}
-		}
-
-	}
-}
-

PROMS/VEPROMS.CSLA.Library/Minimal/UserSettings.cs

@@ -16,7 +16,6 @@ namespace VEPROMS.CSLA.Library
 		#region Public Properties
 		public bool UserSetting_OpenTabs_Remember { get; protected set; } = false;
 		public bool UserSetting_OpenTabs_AutoOpen { get; protected set; } = true;
-		public bool UserSetting_MSWord_Summary_Prompt { get; protected set; } = true;
 		#endregion
 
 
@@ -32,7 +31,7 @@ namespace VEPROMS.CSLA.Library
 					using (SqlCommand cm = cn.CreateCommand())
 					{
 						cm.CommandType = CommandType.Text;
-						cm.CommandText = "Select RememberOpenTabs, AutoOpenTabs, MSWordSummaryPrompt FROM Users where UserID = @UID";
+						cm.CommandText = "Select RememberOpenTabs, AutoOpenTabs FROM Users where UserID = @UID";
 						cm.Parameters.AddWithValue("@UID", _userid);
 						cm.CommandTimeout = Database.DefaultTimeout;
 						using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
@@ -41,7 +40,6 @@ namespace VEPROMS.CSLA.Library
 							{
 								UserSetting_OpenTabs_Remember = (bool) dr.GetValue("RememberOpenTabs");
 								UserSetting_OpenTabs_AutoOpen = (bool) dr.GetValue("AutoOpenTabs");
-								UserSetting_MSWord_Summary_Prompt = (bool) dr.GetValue("MSWordSummaryPrompt");
 							}
 						}
 					}
@@ -86,33 +84,6 @@ namespace VEPROMS.CSLA.Library
 				throw new DbCslaException("UserSettings_SetUserSettings", ex);
 			}
 
-		}
-
-		public void SetUserSetting_MSWord_Summary_Prompt(bool prompt)
-		{
-			try
-			{
-				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-				{
-					using (SqlCommand cm = cn.CreateCommand())
-					{
-						cm.CommandType = CommandType.StoredProcedure;
-						cm.CommandText = "vesp_UpdateUserSettingMSWordSummaryPrompt";
-						cm.Parameters.AddWithValue("@UID", _userid);
-						UserSetting_MSWord_Summary_Prompt = prompt;
-						cm.Parameters.AddWithValue("@Prompt", prompt);
-						cm.CommandTimeout = Database.DefaultTimeout;
-
-						cm.ExecuteNonQuery();
-					}
-				}
-			}
-			catch (Exception ex)
-			{
-				Database.LogException("UserSettings_SetUserSettings", ex);
-				throw new DbCslaException("UserSettings_SetUserSettings", ex);
-			}
-
 		}
 		#endregion
 	}

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

@@ -386,19 +386,12 @@ namespace VEPROMS.CSLA.Library
 			ItemInfo myItemInfo = o as ItemInfo;
 			if (myItemInfo != null)
 			{
-				myItemInfo.Deleted -= new ItemInfoEvent(myItemInfo_Deleted);
 				myItemInfo.Deleted += new ItemInfoEvent(myItemInfo_Deleted);
-				myItemInfo.ChildrenDeleted -= new ItemInfoEvent(myItemInfo_ChildrenDeleted);
 				myItemInfo.ChildrenDeleted += new ItemInfoEvent(myItemInfo_ChildrenDeleted);
-				myItemInfo.MyContent.Changed -= new ContentInfoEvent(NodeText_Changed);
 				myItemInfo.MyContent.Changed += new ContentInfoEvent(NodeText_Changed);
-				myItemInfo.OrdinalChanged -= new ItemInfoEvent(NodeText_Changed);
 				myItemInfo.OrdinalChanged += new ItemInfoEvent(NodeText_Changed);
-				myItemInfo.NewSiblingAfter -= new ItemInfoInsertEvent(myItemInfo_NewSiblingAfter);
 				myItemInfo.NewSiblingAfter += new ItemInfoInsertEvent(myItemInfo_NewSiblingAfter);
-				myItemInfo.NewSiblingBefore -= new ItemInfoInsertEvent(myItemInfo_NewSiblingBefore);
 				myItemInfo.NewSiblingBefore += new ItemInfoInsertEvent(myItemInfo_NewSiblingBefore);
-				myItemInfo.NewChild -= new ItemInfoInsertEvent(myItemInfo_NewChild);
 				myItemInfo.NewChild += new ItemInfoInsertEvent(myItemInfo_NewChild);
 			}
 		}
@@ -436,19 +429,12 @@ namespace VEPROMS.CSLA.Library
 			ItemInfo myItemInfo = o as ItemInfo;
 			if (myItemInfo != null)
 			{
-				myItemInfo.Deleted -= new ItemInfoEvent(myItemInfo_Deleted);
 				myItemInfo.Deleted += new ItemInfoEvent(myItemInfo_Deleted);
-				myItemInfo.ChildrenDeleted -= new ItemInfoEvent(myItemInfo_ChildrenDeleted);
 				myItemInfo.ChildrenDeleted += new ItemInfoEvent(myItemInfo_ChildrenDeleted);
-				myItemInfo.MyContent.Changed -= new ContentInfoEvent(NodeText_Changed);
 				myItemInfo.MyContent.Changed += new ContentInfoEvent(NodeText_Changed);
-				myItemInfo.OrdinalChanged -= new ItemInfoEvent(NodeText_Changed);
 				myItemInfo.OrdinalChanged += new ItemInfoEvent(NodeText_Changed);
-				myItemInfo.NewSiblingAfter -= new ItemInfoInsertEvent(myItemInfo_NewSiblingAfter);
 				myItemInfo.NewSiblingAfter += new ItemInfoInsertEvent(myItemInfo_NewSiblingAfter);
-				myItemInfo.NewSiblingBefore -= new ItemInfoInsertEvent(myItemInfo_NewSiblingBefore);
 				myItemInfo.NewSiblingBefore += new ItemInfoInsertEvent(myItemInfo_NewSiblingBefore);
-				myItemInfo.NewChild -= new ItemInfoInsertEvent(myItemInfo_NewChild);
 				myItemInfo.NewChild += new ItemInfoInsertEvent(myItemInfo_NewChild);
 			}
 		}

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

@@ -83,7 +83,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
+    <Reference Include="Csla, Version=3.8.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\CSLA20cs_DLL_Net_4.8.1_Build\Csla.dll</HintPath>
     </Reference>
@@ -98,7 +98,6 @@
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Design" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
@@ -108,7 +107,6 @@
     <Compile Include="..\VEPROMS User Interface\Properties\Settings.Designer.cs">
       <Link>Properties\Settings.Designer.cs</Link>
     </Compile>
-    <Compile Include="Config\AnnotationConfig.cs" />
     <Compile Include="Config\AnnotationTypeConfig.cs" />
     <Compile Include="Config\AssocConfig.cs" />
     <Compile Include="Config\ColorConfig.cs" />
@@ -166,13 +164,10 @@
     <Compile Include="Format\Comparator.cs" />
     <Compile Include="Format\DocStyles.cs" />
     <Compile Include="Format\ENums.cs" />
-    <Compile Include="Format\EPFormatFile.cs" />
     <Compile Include="Format\PageStyles.cs" />
     <Compile Include="Format\PlantFormat.cs" />
     <Compile Include="Format\vlnFormat.cs" />
-    <Compile Include="frmRofstLoadStatus.cs">
+    <Compile Include="frmRofstLoadStatus.cs" />
-      <SubType>Form</SubType>
-    </Compile>
     <Compile Include="frmRofstLoadStatus.designer.cs">
       <DependentUpon>frmRofstLoadStatus.cs</DependentUpon>
     </Compile>
@@ -387,7 +382,6 @@
     <Compile Include="Generated\ZContentInfo.cs" />
     <Compile Include="Generated\ZTransition.cs" />
     <Compile Include="Generated\ZTransitionInfo.cs" />
-    <Compile Include="Minimal\AnnotationstypeSections.cs" />
     <Compile Include="Minimal\UserSettings.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="VEObjects\VEDrillDown.cs" />

PROMS/VEPROMS/VEPROMS.sln

@@ -38,9 +38,6 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Baseline", "..\Baseline\Baseline.csproj", "{8B29E0DE-B6C9-4041-8817-319FDE3123C4}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RoAccessToSql", "..\RoAccessToSql\RoAccessToSql.csproj", "{1EC96BDA-01E7-4153-A95D-6A4A36FA278E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AEEE9FD1-6892-45E2-A67E-418C06D46FF9} = {AEEE9FD1-6892-45E2-A67E-418C06D46FF9}
-	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

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

@@ -28,341 +28,326 @@ namespace Volian.Controls.Library
 		/// </summary>
 		private void InitializeComponent()
 		{
-            this.components = new System.ComponentModel.Container();
+			this.components = new System.ComponentModel.Container();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip();
+			this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip();
-            this.rtxbComment = new System.Windows.Forms.RichTextBox();
+			this.rtxbComment = new System.Windows.Forms.RichTextBox();
-            this.btnSaveAnnotation = new DevComponents.DotNetBar.ButtonX();
+			this.btnSaveAnnotation = new DevComponents.DotNetBar.ButtonX();
-            this.btnCancelAnnoation = new DevComponents.DotNetBar.ButtonX();
+			this.btnCancelAnnoation = new DevComponents.DotNetBar.ButtonX();
-            this.cbGridAnnoType = new DevComponents.DotNetBar.Controls.ComboBoxEx();
+			this.cbGridAnnoType = new DevComponents.DotNetBar.Controls.ComboBoxEx();
-            this.btnRemoveAnnotation = new DevComponents.DotNetBar.ButtonX();
+			this.btnRemoveAnnotation = new DevComponents.DotNetBar.ButtonX();
-            this.btnAddAnnotation = new DevComponents.DotNetBar.ButtonX();
+			this.btnAddAnnotation = new DevComponents.DotNetBar.ButtonX();
-            this.btnEPAnnotation = new DevComponents.DotNetBar.ButtonX();
+			this.pannelAnnoEdit = new DevComponents.DotNetBar.PanelEx();
-            this.pannelAnnoEdit = new DevComponents.DotNetBar.PanelEx();
+			this.labelX1 = new DevComponents.DotNetBar.LabelX();
-            this.labelX1 = new DevComponents.DotNetBar.LabelX();
+			this.panelAnnoEditBtns = new DevComponents.DotNetBar.PanelEx();
-            this.panelAnnoEditBtns = new DevComponents.DotNetBar.PanelEx();
+			this.expandableSplitter4 = new DevComponents.DotNetBar.ExpandableSplitter();
-            this.expandableSplitter4 = new DevComponents.DotNetBar.ExpandableSplitter();
+			this.pannelAnnoGrid = new DevComponents.DotNetBar.PanelEx();
-            this.pannelAnnoGrid = new DevComponents.DotNetBar.PanelEx();
+			this.dgAnnotations = new DevComponents.DotNetBar.Controls.DataGridViewX();
-            this.dgAnnotations = new DevComponents.DotNetBar.Controls.DataGridViewX();
+			this.myAnnotationTypeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.myAnnotationTypeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dTSDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dTSDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.userIDDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.userIDDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.searchTextDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.searchTextDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.itemAnnotationsBindingSource = new System.Windows.Forms.BindingSource(this.components);
-            this.itemAnnotationsBindingSource = new System.Windows.Forms.BindingSource(this.components);
+			this.pannelAnnoEdit.SuspendLayout();
-            this.pannelAnnoEdit.SuspendLayout();
+			this.panelAnnoEditBtns.SuspendLayout();
-            this.panelAnnoEditBtns.SuspendLayout();
+			this.pannelAnnoGrid.SuspendLayout();
-            this.pannelAnnoGrid.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.dgAnnotations)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dgAnnotations)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.itemAnnotationsBindingSource)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.itemAnnotationsBindingSource)).BeginInit();
+			this.SuspendLayout();
-            this.SuspendLayout();
+			// 
-            // 
+			// superTooltip1
-            // superTooltip1
+			// 
-            // 
+			this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray);
-            this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray);
+			this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
-            this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
+			// 
-            // 
+			// rtxbComment
-            // rtxbComment
+			// 
-            // 
+			this.rtxbComment.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            this.rtxbComment.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.rtxbComment.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
+			this.rtxbComment.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
-            this.rtxbComment.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.rtxbComment.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.rtxbComment.Location = new System.Drawing.Point(65, 27);
+			this.rtxbComment.Location = new System.Drawing.Point(87, 33);
-            this.rtxbComment.Margin = new System.Windows.Forms.Padding(2);
+			this.rtxbComment.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.rtxbComment.Name = "rtxbComment";
+			this.rtxbComment.Name = "rtxbComment";
-            this.rtxbComment.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical;
+			this.rtxbComment.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical;
-            this.rtxbComment.Size = new System.Drawing.Size(368, 237);
+			this.rtxbComment.Size = new System.Drawing.Size(489, 291);
-            this.superTooltip1.SetSuperTooltip(this.rtxbComment, new DevComponents.DotNetBar.SuperTooltipInfo("Annotation", "", "Enter the annotation information here.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+			this.superTooltip1.SetSuperTooltip(this.rtxbComment, new DevComponents.DotNetBar.SuperTooltipInfo("Annotation", "", "Enter the annotation information here.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-            this.rtxbComment.TabIndex = 1;
+			this.rtxbComment.TabIndex = 1;
-            this.rtxbComment.Text = "";
+			this.rtxbComment.Text = "";
-            this.rtxbComment.TextChanged += new System.EventHandler(this.rtxbComment_TextChanged);
+			this.rtxbComment.TextChanged += new System.EventHandler(this.rtxbComment_TextChanged);
-            // 
+			// 
-            // btnSaveAnnotation
+			// btnSaveAnnotation
-            // 
+			// 
-            this.btnSaveAnnotation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+			this.btnSaveAnnotation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-            this.btnSaveAnnotation.Enabled = false;
+			this.btnSaveAnnotation.Enabled = false;
-            this.btnSaveAnnotation.Location = new System.Drawing.Point(368, 3);
+			this.btnSaveAnnotation.Location = new System.Drawing.Point(491, 4);
-            this.btnSaveAnnotation.Margin = new System.Windows.Forms.Padding(2);
+			this.btnSaveAnnotation.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.btnSaveAnnotation.Name = "btnSaveAnnotation";
+			this.btnSaveAnnotation.Name = "btnSaveAnnotation";
-            this.btnSaveAnnotation.Size = new System.Drawing.Size(53, 20);
+			this.btnSaveAnnotation.Size = new System.Drawing.Size(71, 25);
-            this.superTooltip1.SetSuperTooltip(this.btnSaveAnnotation, new DevComponents.DotNetBar.SuperTooltipInfo("Save Changes", "", "This will save the new annotation or changes made to an existing annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+			this.superTooltip1.SetSuperTooltip(this.btnSaveAnnotation, new DevComponents.DotNetBar.SuperTooltipInfo("Save Changes", "", "This will save the new annotation or changes made to an existing annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-            this.btnSaveAnnotation.TabIndex = 9;
+			this.btnSaveAnnotation.TabIndex = 9;
-            this.btnSaveAnnotation.Text = "Save";
+			this.btnSaveAnnotation.Text = "Save";
-            this.btnSaveAnnotation.Click += new System.EventHandler(this.btnSaveAnnotation_Click);
+			this.btnSaveAnnotation.Click += new System.EventHandler(this.btnSaveAnnotation_Click);
-            // 
+			// 
-            // btnCancelAnnoation
+			// btnCancelAnnoation
-            // 
+			// 
-            this.btnCancelAnnoation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+			this.btnCancelAnnoation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-            this.btnCancelAnnoation.Enabled = false;
+			this.btnCancelAnnoation.Enabled = false;
-            this.btnCancelAnnoation.Location = new System.Drawing.Point(301, 3);
+			this.btnCancelAnnoation.Location = new System.Drawing.Point(401, 4);
-            this.btnCancelAnnoation.Margin = new System.Windows.Forms.Padding(2);
+			this.btnCancelAnnoation.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.btnCancelAnnoation.Name = "btnCancelAnnoation";
+			this.btnCancelAnnoation.Name = "btnCancelAnnoation";
-            this.btnCancelAnnoation.Size = new System.Drawing.Size(52, 20);
+			this.btnCancelAnnoation.Size = new System.Drawing.Size(69, 25);
-            this.superTooltip1.SetSuperTooltip(this.btnCancelAnnoation, new DevComponents.DotNetBar.SuperTooltipInfo("Cancel", "", "This will cancel the changes made to the annotation text and type selection", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(145, 100)));
+			this.superTooltip1.SetSuperTooltip(this.btnCancelAnnoation, new DevComponents.DotNetBar.SuperTooltipInfo("Cancel", "", "This will cancel the changes made to the annotation text and type selection", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(145, 100)));
-            this.btnCancelAnnoation.TabIndex = 8;
+			this.btnCancelAnnoation.TabIndex = 8;
-            this.btnCancelAnnoation.Text = "Cancel";
+			this.btnCancelAnnoation.Text = "Cancel";
-            this.btnCancelAnnoation.Click += new System.EventHandler(this.btnCancelAnnoation_Click);
+			this.btnCancelAnnoation.Click += new System.EventHandler(this.btnCancelAnnoation_Click);
-            // 
+			// 
-            // cbGridAnnoType
+			// cbGridAnnoType
-            // 
+			// 
-            this.cbGridAnnoType.DisplayMember = "Text";
+			this.cbGridAnnoType.DisplayMember = "Text";
-            this.cbGridAnnoType.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+			this.cbGridAnnoType.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
-            this.cbGridAnnoType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.cbGridAnnoType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cbGridAnnoType.FlatStyle = System.Windows.Forms.FlatStyle.Standard;
+			this.cbGridAnnoType.FlatStyle = System.Windows.Forms.FlatStyle.Standard;
-            this.cbGridAnnoType.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.cbGridAnnoType.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.cbGridAnnoType.ForeColor = System.Drawing.SystemColors.WindowText;
+			this.cbGridAnnoType.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.cbGridAnnoType.ItemHeight = 17;
+			this.cbGridAnnoType.ItemHeight = 17;
-            this.cbGridAnnoType.Location = new System.Drawing.Point(100, 3);
+			this.cbGridAnnoType.Location = new System.Drawing.Point(133, 4);
-            this.cbGridAnnoType.Margin = new System.Windows.Forms.Padding(2);
+			this.cbGridAnnoType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.cbGridAnnoType.Name = "cbGridAnnoType";
+			this.cbGridAnnoType.Name = "cbGridAnnoType";
-            this.cbGridAnnoType.PreventEnterBeep = true;
+			this.cbGridAnnoType.PreventEnterBeep = true;
-            this.cbGridAnnoType.Size = new System.Drawing.Size(184, 23);
+			this.cbGridAnnoType.Size = new System.Drawing.Size(244, 23);
-            this.superTooltip1.SetSuperTooltip(this.cbGridAnnoType, new DevComponents.DotNetBar.SuperTooltipInfo("Select Annotation Type", "", "This drop down list contains the possible annotation types.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+			this.superTooltip1.SetSuperTooltip(this.cbGridAnnoType, new DevComponents.DotNetBar.SuperTooltipInfo("Select Annotation Type", "", "This drop down list contains the possible annotation types.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-            this.cbGridAnnoType.TabIndex = 7;
+			this.cbGridAnnoType.TabIndex = 7;
-            this.cbGridAnnoType.WatermarkBehavior = DevComponents.DotNetBar.eWatermarkBehavior.HideNonEmpty;
+			this.cbGridAnnoType.WatermarkBehavior = DevComponents.DotNetBar.eWatermarkBehavior.HideNonEmpty;
-            this.cbGridAnnoType.WatermarkText = "Select Annotation Type";
+			this.cbGridAnnoType.WatermarkText = "Select Annotation Type";
-            this.cbGridAnnoType.SelectedValueChanged += new System.EventHandler(this.cbGridAnnoType_SelectedValueChanged);
+			this.cbGridAnnoType.SelectedValueChanged += new System.EventHandler(this.cbGridAnnoType_SelectedValueChanged);
-            // 
+			// 
-            // btnRemoveAnnotation
+			// btnRemoveAnnotation
-            // 
+			// 
-            this.btnRemoveAnnotation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+			this.btnRemoveAnnotation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-            this.btnRemoveAnnotation.Location = new System.Drawing.Point(4, 28);
+			this.btnRemoveAnnotation.Location = new System.Drawing.Point(5, 34);
-            this.btnRemoveAnnotation.Margin = new System.Windows.Forms.Padding(2);
+			this.btnRemoveAnnotation.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.btnRemoveAnnotation.Name = "btnRemoveAnnotation";
+			this.btnRemoveAnnotation.Name = "btnRemoveAnnotation";
-            this.btnRemoveAnnotation.Size = new System.Drawing.Size(53, 20);
+			this.btnRemoveAnnotation.Size = new System.Drawing.Size(71, 25);
-            this.superTooltip1.SetSuperTooltip(this.btnRemoveAnnotation, new DevComponents.DotNetBar.SuperTooltipInfo("Remove Annotation", "", "This will remove the currently selected annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+			this.superTooltip1.SetSuperTooltip(this.btnRemoveAnnotation, new DevComponents.DotNetBar.SuperTooltipInfo("Remove Annotation", "", "This will remove the currently selected annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-            this.btnRemoveAnnotation.TabIndex = 4;
+			this.btnRemoveAnnotation.TabIndex = 4;
-            this.btnRemoveAnnotation.Text = "Remove";
+			this.btnRemoveAnnotation.Text = "Remove";
-            this.btnRemoveAnnotation.Click += new System.EventHandler(this.btnRemoveAnnotation_Click);
+			this.btnRemoveAnnotation.Click += new System.EventHandler(this.btnRemoveAnnotation_Click);
-            // 
+			// 
-            // btnAddAnnotation
+			// btnAddAnnotation
-            // 
+			// 
-            this.btnAddAnnotation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+			this.btnAddAnnotation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-            this.btnAddAnnotation.Location = new System.Drawing.Point(4, 3);
+			this.btnAddAnnotation.Location = new System.Drawing.Point(5, 4);
-            this.btnAddAnnotation.Margin = new System.Windows.Forms.Padding(2);
+			this.btnAddAnnotation.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.btnAddAnnotation.Name = "btnAddAnnotation";
+			this.btnAddAnnotation.Name = "btnAddAnnotation";
-            this.btnAddAnnotation.Size = new System.Drawing.Size(53, 20);
+			this.btnAddAnnotation.Size = new System.Drawing.Size(71, 25);
-            this.superTooltip1.SetSuperTooltip(this.btnAddAnnotation, new DevComponents.DotNetBar.SuperTooltipInfo("Add New Annotation", "", "This button will create a new annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+			this.superTooltip1.SetSuperTooltip(this.btnAddAnnotation, new DevComponents.DotNetBar.SuperTooltipInfo("Add New Annotation", "", "This button will create a new annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-            this.btnAddAnnotation.TabIndex = 3;
+			this.btnAddAnnotation.TabIndex = 3;
-            this.btnAddAnnotation.Text = "Add";
+			this.btnAddAnnotation.Text = "Add";
-            this.btnAddAnnotation.Click += new System.EventHandler(this.btnAddAnnotation_Click);
+			this.btnAddAnnotation.Click += new System.EventHandler(this.btnAddAnnotation_Click);
-            // 
+			// 
-            // btnEPAnnotation
+			// pannelAnnoEdit
-            // 
+			// 
-            this.btnEPAnnotation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+			this.pannelAnnoEdit.CanvasColor = System.Drawing.SystemColors.Control;
-            this.btnEPAnnotation.Location = new System.Drawing.Point(4, 52);
+			this.pannelAnnoEdit.Controls.Add(this.rtxbComment);
-            this.btnEPAnnotation.Margin = new System.Windows.Forms.Padding(2);
+			this.pannelAnnoEdit.Controls.Add(this.btnSaveAnnotation);
-            this.btnEPAnnotation.Name = "btnEPAnnotation";
+			this.pannelAnnoEdit.Controls.Add(this.btnCancelAnnoation);
-            this.btnEPAnnotation.Size = new System.Drawing.Size(53, 20);
+			this.pannelAnnoEdit.Controls.Add(this.labelX1);
-            this.superTooltip1.SetSuperTooltip(this.btnEPAnnotation, new DevComponents.DotNetBar.SuperTooltipInfo("Open Annotation", "", "This will open Electronic Procedure Details for this Annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+			this.pannelAnnoEdit.Controls.Add(this.cbGridAnnoType);
-            this.btnEPAnnotation.TabIndex = 5;
+			this.pannelAnnoEdit.Controls.Add(this.panelAnnoEditBtns);
-            this.btnEPAnnotation.Text = "Open";
+			this.pannelAnnoEdit.DisabledBackColor = System.Drawing.Color.Empty;
-            this.btnEPAnnotation.Visible = false;
+			this.pannelAnnoEdit.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnEPAnnotation.Click += new System.EventHandler(this.btnEPAnnotation_Click);
+			this.pannelAnnoEdit.Location = new System.Drawing.Point(548, 0);
-            // 
+			this.pannelAnnoEdit.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            // pannelAnnoEdit
+			this.pannelAnnoEdit.Name = "pannelAnnoEdit";
-            // 
+			this.pannelAnnoEdit.Size = new System.Drawing.Size(576, 325);
-            this.pannelAnnoEdit.CanvasColor = System.Drawing.SystemColors.Control;
+			this.pannelAnnoEdit.Style.Alignment = System.Drawing.StringAlignment.Center;
-            this.pannelAnnoEdit.Controls.Add(this.rtxbComment);
+			this.pannelAnnoEdit.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-            this.pannelAnnoEdit.Controls.Add(this.btnSaveAnnotation);
+			this.pannelAnnoEdit.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-            this.pannelAnnoEdit.Controls.Add(this.btnCancelAnnoation);
+			this.pannelAnnoEdit.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
-            this.pannelAnnoEdit.Controls.Add(this.labelX1);
+			this.pannelAnnoEdit.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-            this.pannelAnnoEdit.Controls.Add(this.cbGridAnnoType);
+			this.pannelAnnoEdit.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-            this.pannelAnnoEdit.Controls.Add(this.panelAnnoEditBtns);
+			this.pannelAnnoEdit.Style.GradientAngle = 90;
-            this.pannelAnnoEdit.DisabledBackColor = System.Drawing.Color.Empty;
+			this.pannelAnnoEdit.TabIndex = 16;
-            this.pannelAnnoEdit.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.pannelAnnoEdit.Text = "panelEx2";
-            this.pannelAnnoEdit.Location = new System.Drawing.Point(411, 0);
+			this.pannelAnnoEdit.ThemeAware = true;
-            this.pannelAnnoEdit.Margin = new System.Windows.Forms.Padding(2);
+			// 
-            this.pannelAnnoEdit.Name = "pannelAnnoEdit";
+			// labelX1
-            this.pannelAnnoEdit.Size = new System.Drawing.Size(432, 264);
+			// 
-            this.pannelAnnoEdit.Style.Alignment = System.Drawing.StringAlignment.Center;
+			this.labelX1.AutoSize = true;
-            this.pannelAnnoEdit.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+			// 
-            this.pannelAnnoEdit.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+			// 
-            this.pannelAnnoEdit.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+			// 
-            this.pannelAnnoEdit.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+			this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.pannelAnnoEdit.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+			this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.pannelAnnoEdit.Style.GradientAngle = 90;
+			this.labelX1.Location = new System.Drawing.Point(93, 7);
-            this.pannelAnnoEdit.TabIndex = 16;
+			this.labelX1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.pannelAnnoEdit.Text = "panelEx2";
+			this.labelX1.Name = "labelX1";
-            this.pannelAnnoEdit.ThemeAware = true;
+			this.labelX1.Size = new System.Drawing.Size(35, 17);
-            // 
+			this.labelX1.TabIndex = 10;
-            // labelX1
+			this.labelX1.Text = "Type:";
-            // 
+			// 
-            this.labelX1.AutoSize = true;
+			// panelAnnoEditBtns
-            // 
+			// 
-            // 
+			this.panelAnnoEditBtns.CanvasColor = System.Drawing.SystemColors.Control;
-            // 
+			this.panelAnnoEditBtns.Controls.Add(this.btnRemoveAnnotation);
-            this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.panelAnnoEditBtns.Controls.Add(this.btnAddAnnotation);
-            this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.panelAnnoEditBtns.DisabledBackColor = System.Drawing.Color.Empty;
-            this.labelX1.Location = new System.Drawing.Point(70, 6);
+			this.panelAnnoEditBtns.Dock = System.Windows.Forms.DockStyle.Left;
-            this.labelX1.Margin = new System.Windows.Forms.Padding(2);
+			this.panelAnnoEditBtns.Location = new System.Drawing.Point(0, 0);
-            this.labelX1.Name = "labelX1";
+			this.panelAnnoEditBtns.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.labelX1.Size = new System.Drawing.Size(29, 14);
+			this.panelAnnoEditBtns.Name = "panelAnnoEditBtns";
-            this.labelX1.TabIndex = 10;
+			this.panelAnnoEditBtns.Size = new System.Drawing.Size(87, 325);
-            this.labelX1.Text = "Type:";
+			this.panelAnnoEditBtns.Style.Alignment = System.Drawing.StringAlignment.Center;
-            // 
+			this.panelAnnoEditBtns.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-            // panelAnnoEditBtns
+			this.panelAnnoEditBtns.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-            // 
+			this.panelAnnoEditBtns.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-            this.panelAnnoEditBtns.CanvasColor = System.Drawing.SystemColors.Control;
+			this.panelAnnoEditBtns.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-            this.panelAnnoEditBtns.Controls.Add(this.btnEPAnnotation);
+			this.panelAnnoEditBtns.Style.GradientAngle = 90;
-            this.panelAnnoEditBtns.Controls.Add(this.btnRemoveAnnotation);
+			this.panelAnnoEditBtns.TabIndex = 11;
-            this.panelAnnoEditBtns.Controls.Add(this.btnAddAnnotation);
+			this.panelAnnoEditBtns.ThemeAware = true;
-            this.panelAnnoEditBtns.DisabledBackColor = System.Drawing.Color.Empty;
+			// 
-            this.panelAnnoEditBtns.Dock = System.Windows.Forms.DockStyle.Left;
+			// expandableSplitter4
-            this.panelAnnoEditBtns.Location = new System.Drawing.Point(0, 0);
+			// 
-            this.panelAnnoEditBtns.Margin = new System.Windows.Forms.Padding(2);
+			this.expandableSplitter4.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207)))));
-            this.panelAnnoEditBtns.Name = "panelAnnoEditBtns";
+			this.expandableSplitter4.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-            this.panelAnnoEditBtns.Size = new System.Drawing.Size(65, 264);
+			this.expandableSplitter4.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-            this.panelAnnoEditBtns.Style.Alignment = System.Drawing.StringAlignment.Center;
+			this.expandableSplitter4.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207)))));
-            this.panelAnnoEditBtns.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+			this.expandableSplitter4.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-            this.panelAnnoEditBtns.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+			this.expandableSplitter4.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.panelAnnoEditBtns.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+			this.expandableSplitter4.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
-            this.panelAnnoEditBtns.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+			this.expandableSplitter4.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.panelAnnoEditBtns.Style.GradientAngle = 90;
+			this.expandableSplitter4.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
-            this.panelAnnoEditBtns.TabIndex = 11;
+			this.expandableSplitter4.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255)))));
-            this.panelAnnoEditBtns.ThemeAware = true;
+			this.expandableSplitter4.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
-            // 
+			this.expandableSplitter4.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(151)))), ((int)(((byte)(61)))));
-            // expandableSplitter4
+			this.expandableSplitter4.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(184)))), ((int)(((byte)(94)))));
-            // 
+			this.expandableSplitter4.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2;
-            this.expandableSplitter4.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207)))));
+			this.expandableSplitter4.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground;
-            this.expandableSplitter4.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+			this.expandableSplitter4.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207)))));
-            this.expandableSplitter4.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+			this.expandableSplitter4.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-            this.expandableSplitter4.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207)))));
+			this.expandableSplitter4.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.expandableSplitter4.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+			this.expandableSplitter4.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
-            this.expandableSplitter4.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+			this.expandableSplitter4.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207)))));
-            this.expandableSplitter4.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+			this.expandableSplitter4.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-            this.expandableSplitter4.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+			this.expandableSplitter4.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255)))));
-            this.expandableSplitter4.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+			this.expandableSplitter4.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
-            this.expandableSplitter4.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255)))));
+			this.expandableSplitter4.Location = new System.Drawing.Point(545, 0);
-            this.expandableSplitter4.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
+			this.expandableSplitter4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.expandableSplitter4.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(151)))), ((int)(((byte)(61)))));
+			this.expandableSplitter4.Name = "expandableSplitter4";
-            this.expandableSplitter4.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(184)))), ((int)(((byte)(94)))));
+			this.expandableSplitter4.Size = new System.Drawing.Size(3, 325);
-            this.expandableSplitter4.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2;
+			this.expandableSplitter4.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007;
-            this.expandableSplitter4.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground;
+			this.expandableSplitter4.TabIndex = 15;
-            this.expandableSplitter4.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207)))));
+			this.expandableSplitter4.TabStop = false;
-            this.expandableSplitter4.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+			// 
-            this.expandableSplitter4.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+			// pannelAnnoGrid
-            this.expandableSplitter4.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+			// 
-            this.expandableSplitter4.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207)))));
+			this.pannelAnnoGrid.CanvasColor = System.Drawing.SystemColors.Control;
-            this.expandableSplitter4.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+			this.pannelAnnoGrid.Controls.Add(this.dgAnnotations);
-            this.expandableSplitter4.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255)))));
+			this.pannelAnnoGrid.DisabledBackColor = System.Drawing.Color.Empty;
-            this.expandableSplitter4.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
+			this.pannelAnnoGrid.Dock = System.Windows.Forms.DockStyle.Left;
-            this.expandableSplitter4.Location = new System.Drawing.Point(409, 0);
+			this.pannelAnnoGrid.Location = new System.Drawing.Point(0, 0);
-            this.expandableSplitter4.Margin = new System.Windows.Forms.Padding(2);
+			this.pannelAnnoGrid.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.expandableSplitter4.Name = "expandableSplitter4";
+			this.pannelAnnoGrid.Name = "pannelAnnoGrid";
-            this.expandableSplitter4.Size = new System.Drawing.Size(2, 264);
+			this.pannelAnnoGrid.Size = new System.Drawing.Size(545, 325);
-            this.expandableSplitter4.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007;
+			this.pannelAnnoGrid.Style.Alignment = System.Drawing.StringAlignment.Center;
-            this.expandableSplitter4.TabIndex = 15;
+			this.pannelAnnoGrid.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-            this.expandableSplitter4.TabStop = false;
+			this.pannelAnnoGrid.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-            // 
+			this.pannelAnnoGrid.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
-            // pannelAnnoGrid
+			this.pannelAnnoGrid.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-            // 
+			this.pannelAnnoGrid.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-            this.pannelAnnoGrid.CanvasColor = System.Drawing.SystemColors.Control;
+			this.pannelAnnoGrid.Style.GradientAngle = 90;
-            this.pannelAnnoGrid.Controls.Add(this.dgAnnotations);
+			this.pannelAnnoGrid.TabIndex = 14;
-            this.pannelAnnoGrid.DisabledBackColor = System.Drawing.Color.Empty;
+			this.pannelAnnoGrid.Text = "panelEx2";
-            this.pannelAnnoGrid.Dock = System.Windows.Forms.DockStyle.Left;
+			this.pannelAnnoGrid.ThemeAware = true;
-            this.pannelAnnoGrid.Location = new System.Drawing.Point(0, 0);
+			// 
-            this.pannelAnnoGrid.Margin = new System.Windows.Forms.Padding(2);
+			// dgAnnotations
-            this.pannelAnnoGrid.Name = "pannelAnnoGrid";
+			// 
-            this.pannelAnnoGrid.Size = new System.Drawing.Size(409, 264);
+			this.dgAnnotations.AutoGenerateColumns = false;
-            this.pannelAnnoGrid.Style.Alignment = System.Drawing.StringAlignment.Center;
+			this.dgAnnotations.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells;
-            this.pannelAnnoGrid.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+			this.dgAnnotations.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            this.pannelAnnoGrid.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+			this.dgAnnotations.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.pannelAnnoGrid.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+			this.dgAnnotations.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.pannelAnnoGrid.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-            this.pannelAnnoGrid.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-            this.pannelAnnoGrid.Style.GradientAngle = 90;
-            this.pannelAnnoGrid.TabIndex = 14;
-            this.pannelAnnoGrid.Text = "panelEx2";
-            this.pannelAnnoGrid.ThemeAware = true;
-            // 
-            // dgAnnotations
-            // 
-            this.dgAnnotations.AutoGenerateColumns = false;
-            this.dgAnnotations.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells;
-            this.dgAnnotations.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            this.dgAnnotations.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dgAnnotations.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.myAnnotationTypeDataGridViewTextBoxColumn,
             this.dTSDataGridViewTextBoxColumn,
             this.userIDDataGridViewTextBoxColumn,
             this.searchTextDataGridViewTextBoxColumn});
-            this.dgAnnotations.DataSource = this.itemAnnotationsBindingSource;
+			this.dgAnnotations.DataSource = this.itemAnnotationsBindingSource;
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+			dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window;
+			dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText;
+			dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+			dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText;
+			dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+			dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgAnnotations.DefaultCellStyle = dataGridViewCellStyle1;
+			this.dgAnnotations.DefaultCellStyle = dataGridViewCellStyle2;
-            this.dgAnnotations.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.dgAnnotations.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.dgAnnotations.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229)))));
+			this.dgAnnotations.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229)))));
-            this.dgAnnotations.HighlightSelectedColumnHeaders = false;
+			this.dgAnnotations.HighlightSelectedColumnHeaders = false;
-            this.dgAnnotations.Location = new System.Drawing.Point(0, 0);
+			this.dgAnnotations.Location = new System.Drawing.Point(0, 0);
-            this.dgAnnotations.Margin = new System.Windows.Forms.Padding(2);
+			this.dgAnnotations.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.dgAnnotations.MultiSelect = false;
+			this.dgAnnotations.MultiSelect = false;
-            this.dgAnnotations.Name = "dgAnnotations";
+			this.dgAnnotations.Name = "dgAnnotations";
-            this.dgAnnotations.RowHeadersVisible = false;
+			this.dgAnnotations.RowHeadersVisible = false;
-            this.dgAnnotations.RowTemplate.Height = 24;
+			this.dgAnnotations.RowTemplate.Height = 24;
-            this.dgAnnotations.RowTemplate.ReadOnly = true;
+			this.dgAnnotations.RowTemplate.ReadOnly = true;
-            this.dgAnnotations.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+			this.dgAnnotations.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgAnnotations.SelectAllSignVisible = false;
+			this.dgAnnotations.SelectAllSignVisible = false;
-            this.dgAnnotations.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+			this.dgAnnotations.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgAnnotations.Size = new System.Drawing.Size(409, 264);
+			this.dgAnnotations.Size = new System.Drawing.Size(545, 325);
-            this.dgAnnotations.TabIndex = 1;
+			this.dgAnnotations.TabIndex = 1;
-            this.dgAnnotations.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgAnnotations_CellClick);
+			this.dgAnnotations.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgAnnotations_CellClick);
-            // 
+			// 
-            // myAnnotationTypeDataGridViewTextBoxColumn
+			// myAnnotationTypeDataGridViewTextBoxColumn
-            // 
+			// 
-            this.myAnnotationTypeDataGridViewTextBoxColumn.DataPropertyName = "MyAnnotationType";
+			this.myAnnotationTypeDataGridViewTextBoxColumn.DataPropertyName = "MyAnnotationType";
-            this.myAnnotationTypeDataGridViewTextBoxColumn.HeaderText = "Type";
+			this.myAnnotationTypeDataGridViewTextBoxColumn.HeaderText = "Type";
-            this.myAnnotationTypeDataGridViewTextBoxColumn.Name = "myAnnotationTypeDataGridViewTextBoxColumn";
+			this.myAnnotationTypeDataGridViewTextBoxColumn.Name = "myAnnotationTypeDataGridViewTextBoxColumn";
-            this.myAnnotationTypeDataGridViewTextBoxColumn.Width = 56;
+			this.myAnnotationTypeDataGridViewTextBoxColumn.Width = 69;
-            // 
+			// 
-            // dTSDataGridViewTextBoxColumn
+			// dTSDataGridViewTextBoxColumn
-            // 
+			// 
-            this.dTSDataGridViewTextBoxColumn.DataPropertyName = "DTS";
+			this.dTSDataGridViewTextBoxColumn.DataPropertyName = "DTS";
-            this.dTSDataGridViewTextBoxColumn.HeaderText = "Date";
+			this.dTSDataGridViewTextBoxColumn.HeaderText = "Date";
-            this.dTSDataGridViewTextBoxColumn.Name = "dTSDataGridViewTextBoxColumn";
+			this.dTSDataGridViewTextBoxColumn.Name = "dTSDataGridViewTextBoxColumn";
-            this.dTSDataGridViewTextBoxColumn.Width = 55;
+			this.dTSDataGridViewTextBoxColumn.Width = 67;
-            // 
+			// 
-            // userIDDataGridViewTextBoxColumn
+			// userIDDataGridViewTextBoxColumn
-            // 
+			// 
-            this.userIDDataGridViewTextBoxColumn.DataPropertyName = "UserID";
+			this.userIDDataGridViewTextBoxColumn.DataPropertyName = "UserID";
-            this.userIDDataGridViewTextBoxColumn.HeaderText = "User";
+			this.userIDDataGridViewTextBoxColumn.HeaderText = "User";
-            this.userIDDataGridViewTextBoxColumn.Name = "userIDDataGridViewTextBoxColumn";
+			this.userIDDataGridViewTextBoxColumn.Name = "userIDDataGridViewTextBoxColumn";
-            this.userIDDataGridViewTextBoxColumn.Width = 54;
+			this.userIDDataGridViewTextBoxColumn.Width = 67;
-            // 
+			// 
-            // searchTextDataGridViewTextBoxColumn
+			// searchTextDataGridViewTextBoxColumn
-            // 
+			// 
-            this.searchTextDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+			this.searchTextDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.searchTextDataGridViewTextBoxColumn.DataPropertyName = "SearchText";
+			this.searchTextDataGridViewTextBoxColumn.DataPropertyName = "SearchText";
-            this.searchTextDataGridViewTextBoxColumn.HeaderText = "Description";
+			this.searchTextDataGridViewTextBoxColumn.HeaderText = "Description";
-            this.searchTextDataGridViewTextBoxColumn.Name = "searchTextDataGridViewTextBoxColumn";
+			this.searchTextDataGridViewTextBoxColumn.Name = "searchTextDataGridViewTextBoxColumn";
-            // 
+			// 
-            // itemAnnotationsBindingSource
+			// itemAnnotationsBindingSource
-            // 
+			// 
-            this.itemAnnotationsBindingSource.DataSource = typeof(VEPROMS.CSLA.Library.ItemAnnotation);
+			this.itemAnnotationsBindingSource.DataSource = typeof(VEPROMS.CSLA.Library.ItemAnnotation);
-            // 
+			// 
-            // AnnotationDetails
+			// AnnotationDetails
-            // 
+			// 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.pannelAnnoEdit);
+			this.Controls.Add(this.pannelAnnoEdit);
-            this.Controls.Add(this.expandableSplitter4);
+			this.Controls.Add(this.expandableSplitter4);
-            this.Controls.Add(this.pannelAnnoGrid);
+			this.Controls.Add(this.pannelAnnoGrid);
-            this.Margin = new System.Windows.Forms.Padding(2);
+			this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.Name = "AnnotationDetails";
+			this.Name = "AnnotationDetails";
-            this.Size = new System.Drawing.Size(843, 264);
+			this.Size = new System.Drawing.Size(1124, 325);
-            this.pannelAnnoEdit.ResumeLayout(false);
+			this.pannelAnnoEdit.ResumeLayout(false);
-            this.pannelAnnoEdit.PerformLayout();
+			this.pannelAnnoEdit.PerformLayout();
-            this.panelAnnoEditBtns.ResumeLayout(false);
+			this.panelAnnoEditBtns.ResumeLayout(false);
-            this.pannelAnnoGrid.ResumeLayout(false);
+			this.pannelAnnoGrid.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.dgAnnotations)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.dgAnnotations)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.itemAnnotationsBindingSource)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.itemAnnotationsBindingSource)).EndInit();
-            this.ResumeLayout(false);
+			this.ResumeLayout(false);
 
 		}
 
@@ -386,6 +371,5 @@ namespace Volian.Controls.Library
         private System.Windows.Forms.DataGridViewTextBoxColumn dTSDataGridViewTextBoxColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn userIDDataGridViewTextBoxColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn searchTextDataGridViewTextBoxColumn;
-        private DevComponents.DotNetBar.ButtonX btnEPAnnotation;
+	}
-    }
 }

PROMS/Volian.Controls.Library/AnnotationDetails.cs

@@ -119,8 +119,8 @@ namespace Volian.Controls.Library
 					if (CurrentItem.MyDocVersion != null)
 						if (CurrentItem.MyDocVersion.DocVersionAssociationCount > 0)
 							_ROPath = CurrentItem.MyDocVersion.DocVersionAssociations[0].MyROFst.MyRODb.FolderPath;
-
+					ProcItem = CurrentItem.MyProcedure;
-		}
+				}
 				public AnnotationInfo FirstExeAnnotation(ItemInfo ii) 
 				{
 					if (ii == null) return null;
@@ -329,22 +329,14 @@ namespace Volian.Controls.Library
 				AnnotationDirty = true;
 		}
 
-		//C2025-023 - Electronic Procedures - Modifications to PROMS
+        private void dgAnnotations_CellClick(object sender, DataGridViewCellEventArgs e)
-		// Only show Open button if it is an EPAnnotationType
-		private void dgAnnotations_CellClick(object sender, DataGridViewCellEventArgs e)
         {
-			btnEPAnnotation.Visible = false;
+            if (!_LoadingGrid) // Only set the Current Annotation when not loading the grid
-
-			if (!_LoadingGrid) // Only set the Current Annotation when not loading the grid
             {
-				if ((_Annotations != null) && (dgAnnotations.Rows.Count > 0))
+                if ((_Annotations != null) && (dgAnnotations.Rows.Count > 0))
-				{
+                    CurrentAnnotation = _Annotations[dgAnnotations.CurrentRow.Index];
-					CurrentAnnotation = _Annotations[dgAnnotations.CurrentRow.Index];
+                else
-					if (CurrentAnnotation.MyAnnotationType.IsEPAnnotationType && CurrentItem.HasEPformat(CurrentAnnotation.MyAnnotationType.TypeID))
+                    CurrentAnnotation = null;
-						btnEPAnnotation.Visible = true;
-				}
-				else
-					CurrentAnnotation = null;
             }
         }
 
@@ -364,11 +356,7 @@ namespace Volian.Controls.Library
 
 			cbGridAnnoType.DisplayMember = "Name";
 			cbGridAnnoType.ValueMember = "TypeId";
-
+			cbGridAnnoType.DataSource = AnnotationTypeInfoList.Get().Clone();
-			//C2025 - 027 Annotation Type Filtering
-			cbGridAnnoType.WatermarkText = "Select Annotation Type";
-			cbGridAnnoType.DataSource = VEPROMS.CSLA.Library.AnnotationstypeSelections.Get(MyUserInfo.UserID);
-
 			// If there are no annotatons, then selected index is -1 (not defined), otherwise select the first.
 			// This was done so that it could be saved if there was text entered but user moves to another steprtb without selecting save button
 			// so that annotation gets saved.
@@ -612,7 +600,6 @@ namespace Volian.Controls.Library
 		public void UpdateAnnotationGrid(ItemInfo currentitem)
 		{
 			CurrentItem = currentitem;
-			btnEPAnnotation.Visible = false;
 			UpdateAnnotationGrid();
 		}
 
@@ -715,12 +702,5 @@ namespace Volian.Controls.Library
 		}
 		#endregion
 
-		//C2025-023 - Electronic Procedures - Modifications to PROMS
+	}
-		// Open new Dynamic Form if open button selected
-		private void btnEPAnnotation_Click(object sender, EventArgs e)
-        {
-			frmEPAnnotationDetails EPfrm = new frmEPAnnotationDetails(CurrentAnnotation);
-			DialogResult dr = EPfrm.ShowDialog(this);
-		}
-    }
 }

PROMS/Volian.Controls.Library/AnnotationSearch.cs

@@ -69,7 +69,6 @@ namespace Volian.Controls.Library
 			_AnnotationDetails = annotationDetails;
 			cbAnnoType.DisplayMember = "Name";
 			cbAnnoType.DataSource = AnnotationTypeInfoList.Get();
-            lbResults.MouseMove -= new MouseEventHandler(lbResults_MouseMove);
             lbResults.MouseMove += new MouseEventHandler(lbResults_MouseMove);
 			_TabControl = tc;
 		}

PROMS/Volian.Controls.Library/DisplayApplicability.cs

@@ -354,10 +354,7 @@ namespace Volian.Controls.Library
 		private void WireCheckboxes()
 		{
 			foreach (CheckBox cb in MyCheckBoxes.Values)
-			{
-				cb.CheckedChanged -= new EventHandler(cb_CheckedChanged);
 				cb.CheckedChanged += new EventHandler(cb_CheckedChanged);
-			}
 		}
 		private void UnwireCheckboxes(bool reset)
 		{

PROMS/Volian.Controls.Library/DisplayHistory.cs

@@ -897,7 +897,11 @@ namespace Volian.Controls.Library
 					// B2023-072: Don't crash if annotation type was deleted for the restore annotation
 					if (ai == null)
 					{
-						FlexibleMessageBox.Show(this, "Annotation Type was deleted, cannot restore Annotation Type\r\nCopy text from window in Change Details and paste into new annotation to restore the text.", "Annotation Type Deleted", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+						AnnotationTypeInfo ati = AnnotationTypeInfo.Get(aai.TypeID);
+						if (ati == null)
+						{
+							FlexibleMessageBox.Show(this, "Annotation Type was deleted, cannot restore Annotation Type\r\nCopy text from window in Change Details and paste into new annotation to restore the text.", "Annotation Type Deleted", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+						}
 						return;
 					}
 					OnAnnotationRestored(ai, ai.MyItem);

PROMS/Volian.Controls.Library/DisplayRO.cs

@@ -211,9 +211,7 @@ namespace Volian.Controls.Library
 					}
 					_myRTB = value;
 
-					MyRTB.LinkChanged -= new StepRTBLinkEvent(MyRTB_LinkChanged);
 					MyRTB.LinkChanged += new StepRTBLinkEvent(MyRTB_LinkChanged);
-					MyRTB.SelectionChanged -= new EventHandler(MyRTB_SelectionChanged);
 					MyRTB.SelectionChanged += new EventHandler(MyRTB_SelectionChanged);
 
 					if (string.IsNullOrEmpty(MyRTB.MyLinkText))

PROMS/Volian.Controls.Library/DisplayReports.cs

@@ -161,11 +161,8 @@ namespace Volian.Controls.Library
 
 			if (_MyROFSTLookup == null) return;
 
-			advTreeRO.BeforeExpand -= new AdvTreeNodeCancelEventHandler(advTreeRO_BeforeExpand);
 			advTreeRO.BeforeExpand += new AdvTreeNodeCancelEventHandler(advTreeRO_BeforeExpand);
-			advTreeRO.AfterExpand -= new AdvTreeNodeEventHandler(advTreeRO_AfterExpandorCollapse);
 			advTreeRO.AfterExpand += new AdvTreeNodeEventHandler(advTreeRO_AfterExpandorCollapse);
-			advTreeRO.AfterCollapse -= new AdvTreeNodeEventHandler(advTreeRO_AfterExpandorCollapse);
 			advTreeRO.AfterCollapse += new AdvTreeNodeEventHandler(advTreeRO_AfterExpandorCollapse);
 
 			topnode = new DevComponents.AdvTree.Node();
@@ -253,7 +250,6 @@ namespace Volian.Controls.Library
 				topnode.Tag = fi;
 			}
 
-			advTreeProcSets.BeforeExpand -= new DevComponents.AdvTree.AdvTreeNodeCancelEventHandler(advTreeProcSets_BeforeExpand);
 			advTreeProcSets.BeforeExpand += new DevComponents.AdvTree.AdvTreeNodeCancelEventHandler(advTreeProcSets_BeforeExpand);
 
 			// position to the procedure set in the tree if we have a procedure open

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

@@ -50,21 +50,6 @@ namespace Volian.Controls.Library
 			this.components = new System.ComponentModel.Container();
 			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DisplaySearch));
 			this.tabSearchTypes = new DevComponents.DotNetBar.TabControl();
-			this.tabControlPanel4 = new DevComponents.DotNetBar.TabControlPanel();
-			this.gpSrchText = new DevComponents.DotNetBar.Controls.GroupPanel();
-			this.panel1 = new System.Windows.Forms.Panel();
-			this.cbxTextSearchText = new DevComponents.DotNetBar.Controls.ComboBoxEx();
-			this.label1 = new System.Windows.Forms.Label();
-			this.panel3 = new System.Windows.Forms.Panel();
-			this.cbxByWord = new DevComponents.DotNetBar.Controls.CheckBoxX();
-			this.cbxBooleanTxtSrch = new DevComponents.DotNetBar.Controls.CheckBoxX();
-			this.cbxIncROTextSrch = new DevComponents.DotNetBar.Controls.CheckBoxX();
-			this.cbxProcSectSrch = new DevComponents.DotNetBar.Controls.CheckBoxX();
-			this.cbxCaseSensitive = new DevComponents.DotNetBar.Controls.CheckBoxX();
-			this.cbxRnoOnly = new DevComponents.DotNetBar.Controls.CheckBoxX();
-			this.rbtnSrchTxt = new DevComponents.DotNetBar.Controls.CheckBoxX();
-			this.cbxSrchTypeUsage = new DevComponents.DotNetBar.Controls.CheckBoxX();
-			this.tabStepTypeSearch = new DevComponents.DotNetBar.TabItem(this.components);
 			this.tabControlPanel5 = new DevComponents.DotNetBar.TabControlPanel();
 			this.cbxRnoOnlyTrans = new DevComponents.DotNetBar.Controls.CheckBoxX();
 			this.pnlTranCategory = new System.Windows.Forms.Panel();
@@ -94,6 +79,20 @@ namespace Volian.Controls.Library
 			this.label2 = new System.Windows.Forms.Label();
 			this.cbxAnnoTypes = new DevComponents.DotNetBar.Controls.ComboBoxEx();
 			this.tabAnnotationSearch = new DevComponents.DotNetBar.TabItem(this.components);
+			this.tabControlPanel4 = new DevComponents.DotNetBar.TabControlPanel();
+			this.gpSrchText = new DevComponents.DotNetBar.Controls.GroupPanel();
+			this.panel1 = new System.Windows.Forms.Panel();
+			this.cbxTextSearchText = new DevComponents.DotNetBar.Controls.ComboBoxEx();
+			this.label1 = new System.Windows.Forms.Label();
+			this.panel3 = new System.Windows.Forms.Panel();
+			this.cbxByWord = new DevComponents.DotNetBar.Controls.CheckBoxX();
+			this.cbxBooleanTxtSrch = new DevComponents.DotNetBar.Controls.CheckBoxX();
+			this.cbxIncROTextSrch = new DevComponents.DotNetBar.Controls.CheckBoxX();
+			this.cbxCaseSensitive = new DevComponents.DotNetBar.Controls.CheckBoxX();
+			this.cbxRnoOnly = new DevComponents.DotNetBar.Controls.CheckBoxX();
+			this.rbtnSrchTxt = new DevComponents.DotNetBar.Controls.CheckBoxX();
+			this.cbxSrchTypeUsage = new DevComponents.DotNetBar.Controls.CheckBoxX();
+			this.tabStepTypeSearch = new DevComponents.DotNetBar.TabItem(this.components);
 			this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel();
 			this.btnTranCvtSelToTxt = new System.Windows.Forms.Button();
 			this.lblIncTran = new System.Windows.Forms.Label();
@@ -155,10 +154,6 @@ namespace Volian.Controls.Library
 			this.checkedListBox1 = new System.Windows.Forms.CheckedListBox();
 			((System.ComponentModel.ISupportInitialize)(this.tabSearchTypes)).BeginInit();
 			this.tabSearchTypes.SuspendLayout();
-			this.tabControlPanel4.SuspendLayout();
-			this.gpSrchText.SuspendLayout();
-			this.panel1.SuspendLayout();
-			this.panel3.SuspendLayout();
 			this.tabControlPanel5.SuspendLayout();
 			this.pnlTranCategory.SuspendLayout();
 			this.pnlTranFormat.SuspendLayout();
@@ -168,6 +163,10 @@ namespace Volian.Controls.Library
 			this.tabControlPanel3.SuspendLayout();
 			this.gpSrchAnnoText.SuspendLayout();
 			this.panel4.SuspendLayout();
+			this.tabControlPanel4.SuspendLayout();
+			this.gpSrchText.SuspendLayout();
+			this.panel1.SuspendLayout();
+			this.panel3.SuspendLayout();
 			this.tabControlPanel1.SuspendLayout();
 			this.groupBox1.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.contextMenuBar1)).BeginInit();
@@ -198,7 +197,7 @@ namespace Volian.Controls.Library
 			this.tabSearchTypes.SelectedTabFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold);
 			this.tabSearchTypes.SelectedTabIndex = 0;
 			this.tabSearchTypes.ShowFocusRectangle = false;
-			this.tabSearchTypes.Size = new System.Drawing.Size(277, 147);
+			this.tabSearchTypes.Size = new System.Drawing.Size(277, 124);
 			this.tabSearchTypes.Style = DevComponents.DotNetBar.eTabStripStyle.Office2007Document;
 			this.tabSearchTypes.TabIndex = 0;
 			this.tabSearchTypes.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox;
@@ -210,280 +209,6 @@ namespace Volian.Controls.Library
 			this.tabSearchTypes.Text = "tabControl1";
 			this.tabSearchTypes.ThemeAware = true;
 			// 
-			// tabControlPanel4
-			// 
-			this.tabControlPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-			this.tabControlPanel4.Controls.Add(this.gpSrchText);
-			this.tabControlPanel4.Controls.Add(this.rbtnSrchTxt);
-			this.tabControlPanel4.Controls.Add(this.cbxSrchTypeUsage);
-			this.tabControlPanel4.DisabledBackColor = System.Drawing.Color.Empty;
-			this.tabControlPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.tabControlPanel4.Location = new System.Drawing.Point(0, 34);
-			this.tabControlPanel4.Margin = new System.Windows.Forms.Padding(2);
-			this.tabControlPanel4.Name = "tabControlPanel4";
-			this.tabControlPanel4.Padding = new System.Windows.Forms.Padding(1);
-			this.tabControlPanel4.Size = new System.Drawing.Size(277, 113);
-			this.tabControlPanel4.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
-			this.tabControlPanel4.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
-			this.tabControlPanel4.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
-			this.tabControlPanel4.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
-			this.tabControlPanel4.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
-            | DevComponents.DotNetBar.eBorderSide.Bottom)));
-			this.tabControlPanel4.Style.GradientAngle = 90;
-			this.superTooltip1.SetSuperTooltip(this.tabControlPanel4, new DevComponents.DotNetBar.SuperTooltipInfo("Text Search", "", "Enter the text you want to search, or select from the drop down list.\r\n\r\nLeave bl" +
-            "ank to search for the usage of the selected types in \"Filter By Types\".", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(175, 140)));
-			this.tabControlPanel4.TabIndex = 4;
-			this.tabControlPanel4.TabItem = this.tabStepTypeSearch;
-			// 
-			// gpSrchText
-			// 
-			this.gpSrchText.CanvasColor = System.Drawing.SystemColors.Control;
-			this.gpSrchText.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-			this.gpSrchText.Controls.Add(this.panel1);
-			this.gpSrchText.Controls.Add(this.panel3);
-			this.gpSrchText.DisabledBackColor = System.Drawing.Color.Empty;
-			this.gpSrchText.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.gpSrchText.Location = new System.Drawing.Point(23, 1);
-			this.gpSrchText.Margin = new System.Windows.Forms.Padding(2);
-			this.gpSrchText.Name = "gpSrchText";
-			this.gpSrchText.Size = new System.Drawing.Size(253, 91);
-			// 
-			// 
-			// 
-			this.gpSrchText.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-			this.gpSrchText.Style.BackColorGradientAngle = 90;
-			this.gpSrchText.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-			this.gpSrchText.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.gpSrchText.Style.BorderBottomWidth = 1;
-			this.gpSrchText.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-			this.gpSrchText.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.gpSrchText.Style.BorderLeftWidth = 1;
-			this.gpSrchText.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.gpSrchText.Style.BorderRightWidth = 1;
-			this.gpSrchText.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.gpSrchText.Style.BorderTopWidth = 1;
-			this.gpSrchText.Style.CornerDiameter = 4;
-			this.gpSrchText.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
-			this.gpSrchText.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
-			this.gpSrchText.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-			this.gpSrchText.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
-			// 
-			// 
-			// 
-			this.gpSrchText.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			// 
-			// 
-			// 
-			this.gpSrchText.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.gpSrchText.TabIndex = 5;
-			this.gpSrchText.EnabledChanged += new System.EventHandler(this.gpSrchText_EnabledChanged);
-			// 
-			// panel1
-			// 
-			this.panel1.BackColor = System.Drawing.Color.Transparent;
-			this.panel1.Controls.Add(this.cbxTextSearchText);
-			this.panel1.Controls.Add(this.label1);
-			this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
-			this.panel1.Location = new System.Drawing.Point(0, -3);
-			this.panel1.Margin = new System.Windows.Forms.Padding(2);
-			this.panel1.Name = "panel1";
-			this.panel1.Size = new System.Drawing.Size(247, 23);
-			this.panel1.TabIndex = 5;
-			// 
-			// cbxTextSearchText
-			// 
-			this.contextMenuBar1.SetContextMenuEx(this.cbxTextSearchText, this.btnCMIFindText);
-			this.cbxTextSearchText.DisplayMember = "Text";
-			this.cbxTextSearchText.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.cbxTextSearchText.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
-			this.cbxTextSearchText.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.cbxTextSearchText.FormattingEnabled = true;
-			this.cbxTextSearchText.ItemHeight = 16;
-			this.cbxTextSearchText.Location = new System.Drawing.Point(30, 0);
-			this.cbxTextSearchText.Margin = new System.Windows.Forms.Padding(2);
-			this.cbxTextSearchText.Name = "cbxTextSearchText";
-			this.cbxTextSearchText.Size = new System.Drawing.Size(217, 22);
-			this.superTooltip1.SetSuperTooltip(this.cbxTextSearchText, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Text", "", resources.GetString("cbxTextSearchText.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.cbxTextSearchText.TabIndex = 2;
-			this.cbxTextSearchText.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.cbxTextSearchText.WatermarkText = "Enter Search Text Here";
-			this.cbxTextSearchText.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.ProcessEnterKey);
-			this.cbxTextSearchText.Leave += new System.EventHandler(this.cbxTextSearchText_Leave);
-			// 
-			// label1
-			// 
-			this.label1.AutoSize = true;
-			this.label1.BackColor = System.Drawing.Color.Transparent;
-			this.label1.Dock = System.Windows.Forms.DockStyle.Left;
-			this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.label1.Location = new System.Drawing.Point(0, 0);
-			this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-			this.label1.Name = "label1";
-			this.label1.Padding = new System.Windows.Forms.Padding(0, 5, 0, 0);
-			this.label1.Size = new System.Drawing.Size(30, 18);
-			this.superTooltip1.SetSuperTooltip(this.label1, new DevComponents.DotNetBar.SuperTooltipInfo("Search For Text", "", resources.GetString("label1.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.label1.TabIndex = 4;
-			this.label1.Text = "Find:";
-			// 
-			// panel3
-			// 
-			this.panel3.BackColor = System.Drawing.Color.Transparent;
-			this.panel3.Controls.Add(this.cbxByWord);
-			this.panel3.Controls.Add(this.cbxBooleanTxtSrch);
-			this.panel3.Controls.Add(this.cbxIncROTextSrch);
-			this.panel3.Controls.Add(this.cbxProcSectSrch);
-			this.panel3.Controls.Add(this.cbxCaseSensitive);
-			this.panel3.Controls.Add(this.cbxRnoOnly);
-			this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom;
-			this.panel3.Location = new System.Drawing.Point(0, 20);
-			this.panel3.Name = "panel3";
-			this.panel3.Size = new System.Drawing.Size(247, 65);
-			this.panel3.TabIndex = 6;
-			// 
-			// cbxByWord
-			// 
-			this.cbxByWord.BackColor = System.Drawing.Color.Transparent;
-			// 
-			// 
-			// 
-			this.cbxByWord.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.cbxByWord.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.cbxByWord.Location = new System.Drawing.Point(106, 6);
-			this.cbxByWord.Margin = new System.Windows.Forms.Padding(2);
-			this.cbxByWord.Name = "cbxByWord";
-			this.cbxByWord.Size = new System.Drawing.Size(56, 15);
-			this.superTooltip1.SetSuperTooltip(this.cbxByWord, new DevComponents.DotNetBar.SuperTooltipInfo("By Word", "", "When this box is checked, Search will find only matches of the search text as a w" +
-            "ord not as part of a word.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100)));
-			this.cbxByWord.TabIndex = 7;
-			this.cbxByWord.Text = "By Word";
-			// 
-			// cbxBooleanTxtSrch
-			// 
-			// 
-			// 
-			// 
-			this.cbxBooleanTxtSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.cbxBooleanTxtSrch.Location = new System.Drawing.Point(160, 23);
-			this.cbxBooleanTxtSrch.Name = "cbxBooleanTxtSrch";
-			this.cbxBooleanTxtSrch.Size = new System.Drawing.Size(86, 15);
-			this.superTooltip1.SetSuperTooltip(this.cbxBooleanTxtSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Boolean Search", "", resources.GetString("cbxBooleanTxtSrch.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.cbxBooleanTxtSrch.TabIndex = 6;
-			this.cbxBooleanTxtSrch.Text = "Boolean Search";
-			this.cbxBooleanTxtSrch.Visible = false;
-			this.cbxBooleanTxtSrch.CheckedChanged += new System.EventHandler(this.cbxBooleanTxtSrch_CheckedChanged);
-			// 
-			// cbxIncROTextSrch
-			// 
-			// 
-			// 
-			// 
-			this.cbxIncROTextSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.cbxIncROTextSrch.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.cbxIncROTextSrch.Location = new System.Drawing.Point(9, 23);
-			this.cbxIncROTextSrch.Name = "cbxIncROTextSrch";
-			this.cbxIncROTextSrch.Size = new System.Drawing.Size(169, 12);
-			this.superTooltip1.SetSuperTooltip(this.cbxIncROTextSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Search RO and Transition Text", "", "When this box is checked, Search will include matches found in RO and Transition " +
-            "text as well as regular text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.cbxIncROTextSrch.TabIndex = 5;
-			this.cbxIncROTextSrch.Text = "Search RO and Transition Text";
-			// 
-			// cbxProcSectSrch
-			// 
-			// 
-			// 
-			// 
-			this.cbxProcSectSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.cbxProcSectSrch.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.cbxProcSectSrch.Location = new System.Drawing.Point(9, 40);
-			this.cbxProcSectSrch.Name = "cbxProcSectSrch";
-			this.cbxProcSectSrch.Size = new System.Drawing.Size(180, 18);
-			this.superTooltip1.SetSuperTooltip(this.cbxProcSectSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Search RO and Transition Text", "", "When this box is checked, Search will include matches found in RO and Transition " +
-            "text as well as regular text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.cbxProcSectSrch.TabIndex = 5;
-			this.cbxProcSectSrch.Text = "Ignore Procedure and Section Titles";
-			// 
-			// cbxCaseSensitive
-			// 
-			this.cbxCaseSensitive.BackColor = System.Drawing.Color.Transparent;
-			// 
-			// 
-			// 
-			this.cbxCaseSensitive.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.cbxCaseSensitive.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.cbxCaseSensitive.Location = new System.Drawing.Point(9, 6);
-			this.cbxCaseSensitive.Margin = new System.Windows.Forms.Padding(2);
-			this.cbxCaseSensitive.Name = "cbxCaseSensitive";
-			this.cbxCaseSensitive.Size = new System.Drawing.Size(104, 15);
-			this.superTooltip1.SetSuperTooltip(this.cbxCaseSensitive, new DevComponents.DotNetBar.SuperTooltipInfo("Case Sensitive", "", "When this box is checked, Search will find only exact matches of the search text " +
-            "you had entered.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100)));
-			this.cbxCaseSensitive.TabIndex = 3;
-			this.cbxCaseSensitive.Text = "Case Sensitive";
-			// 
-			// cbxRnoOnly
-			// 
-			this.cbxRnoOnly.BackColor = System.Drawing.Color.Transparent;
-			// 
-			// 
-			// 
-			this.cbxRnoOnly.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.cbxRnoOnly.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.cbxRnoOnly.Location = new System.Drawing.Point(172, 6);
-			this.cbxRnoOnly.Margin = new System.Windows.Forms.Padding(2);
-			this.cbxRnoOnly.Name = "cbxRnoOnly";
-			this.cbxRnoOnly.Size = new System.Drawing.Size(71, 15);
-			this.superTooltip1.SetSuperTooltip(this.cbxRnoOnly, new DevComponents.DotNetBar.SuperTooltipInfo("RNO Only", "", "When this box is checked, Search will find only the matches that are in RNO steps" +
-            ".", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100)));
-			this.cbxRnoOnly.TabIndex = 7;
-			this.cbxRnoOnly.Text = "RNO Only";
-			// 
-			// rbtnSrchTxt
-			// 
-			this.rbtnSrchTxt.BackColor = System.Drawing.Color.Transparent;
-			// 
-			// 
-			// 
-			this.rbtnSrchTxt.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.rbtnSrchTxt.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
-			this.rbtnSrchTxt.Checked = true;
-			this.rbtnSrchTxt.CheckState = System.Windows.Forms.CheckState.Checked;
-			this.rbtnSrchTxt.CheckValue = "Y";
-			this.rbtnSrchTxt.Dock = System.Windows.Forms.DockStyle.Left;
-			this.rbtnSrchTxt.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.rbtnSrchTxt.Location = new System.Drawing.Point(1, 1);
-			this.rbtnSrchTxt.Margin = new System.Windows.Forms.Padding(2);
-			this.rbtnSrchTxt.Name = "rbtnSrchTxt";
-			this.rbtnSrchTxt.Size = new System.Drawing.Size(22, 91);
-			this.rbtnSrchTxt.TabIndex = 6;
-			this.rbtnSrchTxt.CheckedChanged += new System.EventHandler(this.rbtnSrchTxt_CheckedChanged);
-			// 
-			// cbxSrchTypeUsage
-			// 
-			this.cbxSrchTypeUsage.BackColor = System.Drawing.Color.Transparent;
-			// 
-			// 
-			// 
-			this.cbxSrchTypeUsage.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.cbxSrchTypeUsage.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
-			this.cbxSrchTypeUsage.Dock = System.Windows.Forms.DockStyle.Bottom;
-			this.cbxSrchTypeUsage.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.cbxSrchTypeUsage.Location = new System.Drawing.Point(1, 92);
-			this.cbxSrchTypeUsage.Margin = new System.Windows.Forms.Padding(2);
-			this.cbxSrchTypeUsage.Name = "cbxSrchTypeUsage";
-			this.cbxSrchTypeUsage.Size = new System.Drawing.Size(275, 20);
-			this.superTooltip1.SetSuperTooltip(this.cbxSrchTypeUsage, new DevComponents.DotNetBar.SuperTooltipInfo("Find Selected Step Elements", "", "This option will have Search show you where the selected Step Elements are used.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.cbxSrchTypeUsage.TabIndex = 4;
-			this.cbxSrchTypeUsage.Text = "   Find Selected Step Elements";
-			this.cbxSrchTypeUsage.CheckedChanged += new System.EventHandler(this.cbxSrchTypeUsage_CheckedChanged);
-			// 
-			// tabStepTypeSearch
-			// 
-			this.tabStepTypeSearch.AttachedControl = this.tabControlPanel4;
-			this.tabStepTypeSearch.Name = "tabStepTypeSearch";
-			this.superTooltip1.SetSuperTooltip(this.tabStepTypeSearch, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Text", "", "Allows you to search for entered text in selected procedure sets and within selec" +
-            "ted procedure text types.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 110)));
-			this.tabStepTypeSearch.Text = "Text";
-			this.tabStepTypeSearch.Click += new System.EventHandler(this.tabStepTypeSearch_Click);
-			// 
 			// tabControlPanel5
 			// 
 			this.tabControlPanel5.Controls.Add(this.cbxRnoOnlyTrans);
@@ -496,7 +221,7 @@ namespace Volian.Controls.Library
 			this.tabControlPanel5.Margin = new System.Windows.Forms.Padding(2);
 			this.tabControlPanel5.Name = "tabControlPanel5";
 			this.tabControlPanel5.Padding = new System.Windows.Forms.Padding(1);
-			this.tabControlPanel5.Size = new System.Drawing.Size(277, 113);
+			this.tabControlPanel5.Size = new System.Drawing.Size(277, 90);
 			this.tabControlPanel5.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
 			this.tabControlPanel5.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
 			this.tabControlPanel5.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
@@ -644,7 +369,168 @@ namespace Volian.Controls.Library
 			this.tabControlPanel2.Margin = new System.Windows.Forms.Padding(2);
 			this.tabControlPanel2.Name = "tabControlPanel2";
 			this.tabControlPanel2.Padding = new System.Windows.Forms.Padding(1);
-			this.tabControlPanel2.Size = new System.Drawing.Size(277, 113);
+			this.tabControlPanel2.Size = new System.Drawing.Size(277, 90);
+			this.tabControlPanel2.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
+			this.tabControlPanel2.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
+			this.tabControlPanel2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+			this.tabControlPanel2.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
+			this.tabControlPanel2.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
+            | DevComponents.DotNetBar.eBorderSide.Bottom)));
+			this.tabControlPanel2.Style.GradientAngle = 90;
+			this.tabControlPanel2.TabIndex = 2;
+			this.tabControlPanel2.TabItem = this.tabROSearch;
+			// 
+			// pnlTranCategory
+			// 
+			this.gpFindROs.CanvasColor = System.Drawing.SystemColors.Control;
+			this.gpFindROs.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+			this.gpFindROs.Controls.Add(this.cbxRnoOnlyRO);
+			this.gpFindROs.Controls.Add(this.lblSrchRoMsg);
+			this.gpFindROs.Controls.Add(this.cbxFndUnLnkROVals);
+			this.gpFindROs.DisabledBackColor = System.Drawing.Color.Empty;
+			this.gpFindROs.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.gpFindROs.Location = new System.Drawing.Point(1, 21);
+			this.gpFindROs.Margin = new System.Windows.Forms.Padding(2);
+			this.gpFindROs.Name = "gpFindROs";
+			this.gpFindROs.Size = new System.Drawing.Size(275, 68);
+			// 
+			// cbxTranCategory
+			// 
+			this.cbxTranCategory.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.cbxTranCategory.Location = new System.Drawing.Point(57, 1);
+			this.cbxTranCategory.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+			this.cbxTranCategory.Name = "cbxTranCategory";
+			this.cbxTranCategory.Size = new System.Drawing.Size(215, 21);
+			this.cbxTranCategory.TabIndex = 1;
+			this.cbxTranCategory.WatermarkText = "Select Category of Transitions";
+			// 
+			// lblTranCategory
+			// 
+			this.lblTranCategory.Dock = System.Windows.Forms.DockStyle.Left;
+			this.lblTranCategory.Location = new System.Drawing.Point(1, 1);
+			this.lblTranCategory.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+			this.lblTranCategory.Name = "lblTranCategory";
+			this.lblTranCategory.Size = new System.Drawing.Size(56, 17);
+			this.lblTranCategory.TabIndex = 0;
+			this.lblTranCategory.Text = "Category";
+			this.lblTranCategory.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			// 
+			// pnlTranFormat
+			// 
+			this.pnlTranFormat.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+			this.pnlTranFormat.Controls.Add(this.cbxTranFormat);
+			this.pnlTranFormat.Controls.Add(this.lblTranFormat);
+			this.pnlTranFormat.Dock = System.Windows.Forms.DockStyle.Top;
+			this.pnlTranFormat.Location = new System.Drawing.Point(1, 22);
+			this.pnlTranFormat.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+			this.pnlTranFormat.Name = "pnlTranFormat";
+			this.pnlTranFormat.Padding = new System.Windows.Forms.Padding(1);
+			this.pnlTranFormat.Size = new System.Drawing.Size(275, 21);
+			this.pnlTranFormat.TabIndex = 1;
+			// 
+			// cbxTranFormat
+			// 
+			this.cbxTranFormat.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.cbxTranFormat.Location = new System.Drawing.Point(57, 1);
+			this.cbxTranFormat.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+			this.cbxTranFormat.Name = "cbxTranFormat";
+			this.cbxTranFormat.Size = new System.Drawing.Size(215, 21);
+			this.cbxTranFormat.TabIndex = 1;
+			this.cbxTranFormat.WatermarkText = "Select Style of Transitions";
+			// 
+			// lblTranFormat
+			// 
+			// cbxRnoOnlyRO
+			// 
+			this.cbxRnoOnlyRO.BackColor = System.Drawing.Color.Transparent;
+			// 
+			// 
+			// 
+			this.cbxRnoOnlyRO.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.cbxRnoOnlyRO.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.cbxRnoOnlyRO.Location = new System.Drawing.Point(186, 4);
+			this.cbxRnoOnlyRO.Margin = new System.Windows.Forms.Padding(2);
+			this.cbxRnoOnlyRO.Name = "cbxRnoOnlyRO";
+			this.cbxRnoOnlyRO.Size = new System.Drawing.Size(71, 15);
+			this.superTooltip1.SetSuperTooltip(this.cbxRnoOnlyRO, new DevComponents.DotNetBar.SuperTooltipInfo("RNO Only", "", "When this box is checked, Search will find only the matches that are in RNO steps" +
+            ".", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100)));
+			this.cbxRnoOnlyRO.TabIndex = 8;
+			this.cbxRnoOnlyRO.Text = "RNO Only";
+			// 
+			// lblSrchRoMsg
+			// 
+			this.lblSrchRoMsg.BackColor = System.Drawing.Color.Transparent;
+			// 
+			// 
+			// 
+			this.lblSrchRoMsg.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.lblSrchRoMsg.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.lblSrchRoMsg.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+			this.lblSrchRoMsg.Location = new System.Drawing.Point(7, 23);
+			this.lblSrchRoMsg.Margin = new System.Windows.Forms.Padding(2);
+			this.lblSrchRoMsg.Name = "lblSrchRoMsg";
+			this.lblSrchRoMsg.Size = new System.Drawing.Size(262, 40);
+			this.lblSrchRoMsg.TabIndex = 3;
+			this.lblSrchRoMsg.Text = "This folder(s) ROs are incompatible with the currently selected folder(s).  This " +
+    "may be due to the RO values needing to be updated.";
+			this.lblSrchRoMsg.Visible = false;
+			this.lblSrchRoMsg.WordWrap = true;
+			// 
+			// cbxFndUnLnkROVals
+			// 
+			// pnlTranVersion
+			// 
+			this.pnlTranVersion.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+			this.pnlTranVersion.Controls.Add(this.cbxTranVersion);
+			this.pnlTranVersion.Controls.Add(this.lblTranVersion);
+			this.pnlTranVersion.Dock = System.Windows.Forms.DockStyle.Top;
+			this.pnlTranVersion.Location = new System.Drawing.Point(1, 1);
+			this.pnlTranVersion.Margin = new System.Windows.Forms.Padding(2);
+			this.pnlTranVersion.Name = "pnlTranVersion";
+			this.pnlTranVersion.Padding = new System.Windows.Forms.Padding(1);
+			this.pnlTranVersion.Size = new System.Drawing.Size(275, 21);
+			this.pnlTranVersion.TabIndex = 0;
+			// 
+			// cbxTranVersion
+			// 
+			this.cbxTranVersion.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.cbxTranVersion.Location = new System.Drawing.Point(52, 1);
+			this.cbxTranVersion.Margin = new System.Windows.Forms.Padding(2);
+			this.cbxTranVersion.Name = "cbxTranVersion";
+			this.cbxTranVersion.Size = new System.Drawing.Size(220, 21);
+			this.cbxTranVersion.TabIndex = 1;
+			this.cbxTranVersion.WatermarkText = "Select Format for Transitions";
+			// 
+			// lblTranVersion
+			// 
+			this.lblTranVersion.Dock = System.Windows.Forms.DockStyle.Left;
+			this.lblTranVersion.Location = new System.Drawing.Point(1, 1);
+			this.lblTranVersion.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+			this.lblTranVersion.Name = "lblTranVersion";
+			this.lblTranVersion.Size = new System.Drawing.Size(51, 17);
+			this.lblTranVersion.TabIndex = 0;
+			this.lblTranVersion.Text = "Formats";
+			this.lblTranVersion.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			// 
+			// tabTranSearch
+			// 
+			this.tabTranSearch.AttachedControl = this.tabControlPanel5;
+			this.tabTranSearch.Name = "tabTranSearch";
+			this.superTooltip1.SetSuperTooltip(this.tabTranSearch, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Transition From", "", "Allows you to search for transitions of the selected type that point from selecte" +
+            "d procedure set(s).", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 110)));
+			this.tabTranSearch.Text = "Transitions";
+			// 
+			// tabControlPanel2
+			// 
+			this.tabControlPanel2.Controls.Add(this.gpFindROs);
+			this.tabControlPanel2.Controls.Add(this.cmboTreeROs);
+			this.tabControlPanel2.DisabledBackColor = System.Drawing.Color.Empty;
+			this.tabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.tabControlPanel2.Location = new System.Drawing.Point(0, 34);
+			this.tabControlPanel2.Margin = new System.Windows.Forms.Padding(2);
+			this.tabControlPanel2.Name = "tabControlPanel2";
+			this.tabControlPanel2.Padding = new System.Windows.Forms.Padding(1);
+			this.tabControlPanel2.Size = new System.Drawing.Size(277, 90);
 			this.tabControlPanel2.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
 			this.tabControlPanel2.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
 			this.tabControlPanel2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
@@ -667,7 +553,7 @@ namespace Volian.Controls.Library
 			this.gpFindROs.Location = new System.Drawing.Point(1, 21);
 			this.gpFindROs.Margin = new System.Windows.Forms.Padding(2);
 			this.gpFindROs.Name = "gpFindROs";
-			this.gpFindROs.Size = new System.Drawing.Size(275, 91);
+			this.gpFindROs.Size = new System.Drawing.Size(275, 68);
 			// 
 			// 
 			// 
@@ -792,7 +678,7 @@ namespace Volian.Controls.Library
 			this.tabControlPanel3.Margin = new System.Windows.Forms.Padding(2);
 			this.tabControlPanel3.Name = "tabControlPanel3";
 			this.tabControlPanel3.Padding = new System.Windows.Forms.Padding(1);
-			this.tabControlPanel3.Size = new System.Drawing.Size(277, 113);
+			this.tabControlPanel3.Size = new System.Drawing.Size(277, 90);
 			this.tabControlPanel3.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
 			this.tabControlPanel3.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
 			this.tabControlPanel3.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
@@ -815,7 +701,7 @@ namespace Volian.Controls.Library
 			this.gpSrchAnnoText.Location = new System.Drawing.Point(1, 23);
 			this.gpSrchAnnoText.Margin = new System.Windows.Forms.Padding(2);
 			this.gpSrchAnnoText.Name = "gpSrchAnnoText";
-			this.gpSrchAnnoText.Size = new System.Drawing.Size(275, 89);
+			this.gpSrchAnnoText.Size = new System.Drawing.Size(275, 66);
 			// 
 			// 
 			// 
@@ -975,6 +861,261 @@ namespace Volian.Controls.Library
 			this.tabAnnotationSearch.Text = "Annotations";
 			this.tabAnnotationSearch.Click += new System.EventHandler(this.tabAnnotationSearch_Click);
 			// 
+			// tabControlPanel4
+			// 
+			this.tabControlPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+			this.tabControlPanel4.Controls.Add(this.gpSrchText);
+			this.tabControlPanel4.Controls.Add(this.rbtnSrchTxt);
+			this.tabControlPanel4.Controls.Add(this.cbxSrchTypeUsage);
+			this.tabControlPanel4.DisabledBackColor = System.Drawing.Color.Empty;
+			this.tabControlPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.tabControlPanel4.Location = new System.Drawing.Point(0, 34);
+			this.tabControlPanel4.Margin = new System.Windows.Forms.Padding(2);
+			this.tabControlPanel4.Name = "tabControlPanel4";
+			this.tabControlPanel4.Padding = new System.Windows.Forms.Padding(1);
+			this.tabControlPanel4.Size = new System.Drawing.Size(277, 90);
+			this.tabControlPanel4.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
+			this.tabControlPanel4.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
+			this.tabControlPanel4.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+			this.tabControlPanel4.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
+			this.tabControlPanel4.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
+            | DevComponents.DotNetBar.eBorderSide.Bottom)));
+			this.tabControlPanel4.Style.GradientAngle = 90;
+			this.superTooltip1.SetSuperTooltip(this.tabControlPanel4, new DevComponents.DotNetBar.SuperTooltipInfo("Text Search", "", "Enter the text you want to search, or select from the drop down list.\r\n\r\nLeave bl" +
+            "ank to search for the usage of the selected types in \"Filter By Types\".", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(175, 140)));
+			this.tabControlPanel4.TabIndex = 4;
+			this.tabControlPanel4.TabItem = this.tabStepTypeSearch;
+			// 
+			// gpSrchText
+			// 
+			this.gpSrchText.CanvasColor = System.Drawing.SystemColors.Control;
+			this.gpSrchText.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+			this.gpSrchText.Controls.Add(this.panel1);
+			this.gpSrchText.Controls.Add(this.panel3);
+			this.gpSrchText.DisabledBackColor = System.Drawing.Color.Empty;
+			this.gpSrchText.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.gpSrchText.Location = new System.Drawing.Point(23, 1);
+			this.gpSrchText.Margin = new System.Windows.Forms.Padding(2);
+			this.gpSrchText.Name = "gpSrchText";
+			this.gpSrchText.Size = new System.Drawing.Size(253, 70);
+			// 
+			// 
+			// 
+			this.gpSrchText.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+			this.gpSrchText.Style.BackColorGradientAngle = 90;
+			this.gpSrchText.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+			this.gpSrchText.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+			this.gpSrchText.Style.BorderBottomWidth = 1;
+			this.gpSrchText.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+			this.gpSrchText.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
+			this.gpSrchText.Style.BorderLeftWidth = 1;
+			this.gpSrchText.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+			this.gpSrchText.Style.BorderRightWidth = 1;
+			this.gpSrchText.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+			this.gpSrchText.Style.BorderTopWidth = 1;
+			this.gpSrchText.Style.CornerDiameter = 4;
+			this.gpSrchText.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+			this.gpSrchText.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+			this.gpSrchText.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+			this.gpSrchText.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+			// 
+			// 
+			// 
+			this.gpSrchText.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			// 
+			// 
+			// 
+			this.gpSrchText.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.gpSrchText.TabIndex = 5;
+			this.gpSrchText.EnabledChanged += new System.EventHandler(this.gpSrchText_EnabledChanged);
+			// 
+			// panel1
+			// 
+			this.panel1.BackColor = System.Drawing.Color.Transparent;
+			this.panel1.Controls.Add(this.cbxTextSearchText);
+			this.panel1.Controls.Add(this.label1);
+			this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
+			this.panel1.Location = new System.Drawing.Point(0, -3);
+			this.panel1.Margin = new System.Windows.Forms.Padding(2);
+			this.panel1.Name = "panel1";
+			this.panel1.Size = new System.Drawing.Size(247, 23);
+			this.panel1.TabIndex = 5;
+			// 
+			// cbxTextSearchText
+			// 
+			this.contextMenuBar1.SetContextMenuEx(this.cbxTextSearchText, this.btnCMIFindText);
+			this.cbxTextSearchText.DisplayMember = "Text";
+			this.cbxTextSearchText.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.cbxTextSearchText.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+			this.cbxTextSearchText.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.cbxTextSearchText.FormattingEnabled = true;
+			this.cbxTextSearchText.ItemHeight = 16;
+			this.cbxTextSearchText.Location = new System.Drawing.Point(30, 0);
+			this.cbxTextSearchText.Margin = new System.Windows.Forms.Padding(2);
+			this.cbxTextSearchText.Name = "cbxTextSearchText";
+			this.cbxTextSearchText.Size = new System.Drawing.Size(217, 22);
+			this.superTooltip1.SetSuperTooltip(this.cbxTextSearchText, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Text", "", resources.GetString("cbxTextSearchText.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+			this.cbxTextSearchText.TabIndex = 2;
+			this.cbxTextSearchText.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.cbxTextSearchText.WatermarkText = "Enter Search Text Here";
+			this.cbxTextSearchText.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.ProcessEnterKey);
+			this.cbxTextSearchText.Leave += new System.EventHandler(this.cbxTextSearchText_Leave);
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.BackColor = System.Drawing.Color.Transparent;
+			this.label1.Dock = System.Windows.Forms.DockStyle.Left;
+			this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.label1.Location = new System.Drawing.Point(0, 0);
+			this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+			this.label1.Name = "label1";
+			this.label1.Padding = new System.Windows.Forms.Padding(0, 5, 0, 0);
+			this.label1.Size = new System.Drawing.Size(30, 18);
+			this.superTooltip1.SetSuperTooltip(this.label1, new DevComponents.DotNetBar.SuperTooltipInfo("Search For Text", "", resources.GetString("label1.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+			this.label1.TabIndex = 4;
+			this.label1.Text = "Find:";
+			// 
+			// panel3
+			// 
+			this.panel3.BackColor = System.Drawing.Color.Transparent;
+			this.panel3.Controls.Add(this.cbxByWord);
+			this.panel3.Controls.Add(this.cbxBooleanTxtSrch);
+			this.panel3.Controls.Add(this.cbxIncROTextSrch);
+			this.panel3.Controls.Add(this.cbxCaseSensitive);
+			this.panel3.Controls.Add(this.cbxRnoOnly);
+			this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom;
+			this.panel3.Location = new System.Drawing.Point(0, 20);
+			this.panel3.Name = "panel3";
+			this.panel3.Size = new System.Drawing.Size(247, 44);
+			this.panel3.TabIndex = 6;
+			// 
+			// cbxByWord
+			// 
+			this.cbxByWord.BackColor = System.Drawing.Color.Transparent;
+			// 
+			// 
+			// 
+			this.cbxByWord.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.cbxByWord.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.cbxByWord.Location = new System.Drawing.Point(106, 6);
+			this.cbxByWord.Margin = new System.Windows.Forms.Padding(2);
+			this.cbxByWord.Name = "cbxByWord";
+			this.cbxByWord.Size = new System.Drawing.Size(56, 15);
+			this.superTooltip1.SetSuperTooltip(this.cbxByWord, new DevComponents.DotNetBar.SuperTooltipInfo("By Word", "", "When this box is checked, Search will find only matches of the search text as a w" +
+            "ord not as part of a word.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100)));
+			this.cbxByWord.TabIndex = 7;
+			this.cbxByWord.Text = "By Word";
+			// 
+			// cbxBooleanTxtSrch
+			// 
+			// 
+			// 
+			// 
+			this.cbxBooleanTxtSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.cbxBooleanTxtSrch.Location = new System.Drawing.Point(160, 23);
+			this.cbxBooleanTxtSrch.Name = "cbxBooleanTxtSrch";
+			this.cbxBooleanTxtSrch.Size = new System.Drawing.Size(86, 15);
+			this.superTooltip1.SetSuperTooltip(this.cbxBooleanTxtSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Boolean Search", "", resources.GetString("cbxBooleanTxtSrch.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+			this.cbxBooleanTxtSrch.TabIndex = 6;
+			this.cbxBooleanTxtSrch.Text = "Boolean Search";
+			this.cbxBooleanTxtSrch.Visible = false;
+			this.cbxBooleanTxtSrch.CheckedChanged += new System.EventHandler(this.cbxBooleanTxtSrch_CheckedChanged);
+			// 
+			// cbxIncROTextSrch
+			// 
+			// 
+			// 
+			// 
+			this.cbxIncROTextSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.cbxIncROTextSrch.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.cbxIncROTextSrch.Location = new System.Drawing.Point(9, 23);
+			this.cbxIncROTextSrch.Name = "cbxIncROTextSrch";
+			this.cbxIncROTextSrch.Size = new System.Drawing.Size(169, 12);
+			this.superTooltip1.SetSuperTooltip(this.cbxIncROTextSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Search RO and Transition Text", "", "When this box is checked, Search will include matches found in RO and Transition " +
+            "text as well as regular text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+			this.cbxIncROTextSrch.TabIndex = 5;
+			this.cbxIncROTextSrch.Text = "Search RO and Transition Text";
+			// 
+			// cbxCaseSensitive
+			// 
+			this.cbxCaseSensitive.BackColor = System.Drawing.Color.Transparent;
+			// 
+			// 
+			// 
+			this.cbxCaseSensitive.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.cbxCaseSensitive.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.cbxCaseSensitive.Location = new System.Drawing.Point(9, 6);
+			this.cbxCaseSensitive.Margin = new System.Windows.Forms.Padding(2);
+			this.cbxCaseSensitive.Name = "cbxCaseSensitive";
+			this.cbxCaseSensitive.Size = new System.Drawing.Size(104, 15);
+			this.superTooltip1.SetSuperTooltip(this.cbxCaseSensitive, new DevComponents.DotNetBar.SuperTooltipInfo("Case Sensitive", "", "When this box is checked, Search will find only exact matches of the search text " +
+            "you had entered.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100)));
+			this.cbxCaseSensitive.TabIndex = 3;
+			this.cbxCaseSensitive.Text = "Case Sensitive";
+			// 
+			// cbxRnoOnly
+			// 
+			this.cbxRnoOnly.BackColor = System.Drawing.Color.Transparent;
+			// 
+			// 
+			// 
+			this.cbxRnoOnly.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.cbxRnoOnly.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.cbxRnoOnly.Location = new System.Drawing.Point(172, 6);
+			this.cbxRnoOnly.Margin = new System.Windows.Forms.Padding(2);
+			this.cbxRnoOnly.Name = "cbxRnoOnly";
+			this.cbxRnoOnly.Size = new System.Drawing.Size(71, 15);
+			this.superTooltip1.SetSuperTooltip(this.cbxRnoOnly, new DevComponents.DotNetBar.SuperTooltipInfo("RNO Only", "", "When this box is checked, Search will find only the matches that are in RNO steps" +
+            ".", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100)));
+			this.cbxRnoOnly.TabIndex = 7;
+			this.cbxRnoOnly.Text = "RNO Only";
+			// 
+			// rbtnSrchTxt
+			// 
+			this.rbtnSrchTxt.BackColor = System.Drawing.Color.Transparent;
+			// 
+			// 
+			// 
+			this.rbtnSrchTxt.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.rbtnSrchTxt.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
+			this.rbtnSrchTxt.Checked = true;
+			this.rbtnSrchTxt.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.rbtnSrchTxt.CheckValue = "Y";
+			this.rbtnSrchTxt.Dock = System.Windows.Forms.DockStyle.Left;
+			this.rbtnSrchTxt.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.rbtnSrchTxt.Location = new System.Drawing.Point(1, 1);
+			this.rbtnSrchTxt.Margin = new System.Windows.Forms.Padding(2);
+			this.rbtnSrchTxt.Name = "rbtnSrchTxt";
+			this.rbtnSrchTxt.Size = new System.Drawing.Size(22, 70);
+			this.rbtnSrchTxt.TabIndex = 6;
+			this.rbtnSrchTxt.CheckedChanged += new System.EventHandler(this.rbtnSrchTxt_CheckedChanged);
+			// 
+			// cbxSrchTypeUsage
+			// 
+			this.cbxSrchTypeUsage.BackColor = System.Drawing.Color.Transparent;
+			this.cbxSrchTypeUsage.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.cbxSrchTypeUsage.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
+			this.cbxSrchTypeUsage.Dock = System.Windows.Forms.DockStyle.Bottom;
+			this.cbxSrchTypeUsage.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.cbxSrchTypeUsage.Location = new System.Drawing.Point(1, 71);
+			this.cbxSrchTypeUsage.Margin = new System.Windows.Forms.Padding(2);
+			this.cbxSrchTypeUsage.Name = "cbxSrchTypeUsage";
+			this.cbxSrchTypeUsage.Size = new System.Drawing.Size(275, 18);
+			this.superTooltip1.SetSuperTooltip(this.cbxSrchTypeUsage, new DevComponents.DotNetBar.SuperTooltipInfo("Find Selected Step Elements", "", "This option will have Search show you where the selected Step Elements are used.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+			this.cbxSrchTypeUsage.TabIndex = 4;
+			this.cbxSrchTypeUsage.Text = "   Find Selected Step Elements";
+			this.cbxSrchTypeUsage.CheckedChanged += new System.EventHandler(this.cbxSrchTypeUsage_CheckedChanged);
+			// 
+			// tabStepTypeSearch
+			// 
+			this.tabStepTypeSearch.AttachedControl = this.tabControlPanel4;
+			this.tabStepTypeSearch.Name = "tabStepTypeSearch";
+			this.superTooltip1.SetSuperTooltip(this.tabStepTypeSearch, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Text", "", "Allows you to search for entered text in selected procedure sets and within selec" +
+            "ted procedure text types.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 110)));
+			this.tabStepTypeSearch.Text = "Text";
+			this.tabStepTypeSearch.Click += new System.EventHandler(this.tabStepTypeSearch_Click);
+			// 
 			// tabControlPanel1
 			// 
 			this.tabControlPanel1.Controls.Add(this.btnTranCvtSelToTxt);
@@ -987,7 +1128,7 @@ namespace Volian.Controls.Library
 			this.tabControlPanel1.Location = new System.Drawing.Point(0, 34);
 			this.tabControlPanel1.Name = "tabControlPanel1";
 			this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1);
-			this.tabControlPanel1.Size = new System.Drawing.Size(277, 113);
+			this.tabControlPanel1.Size = new System.Drawing.Size(277, 90);
 			this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
 			this.tabControlPanel1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
 			this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
@@ -1273,7 +1414,7 @@ namespace Volian.Controls.Library
 			this.advTreeProcSets.NodeStyleSelected = this.elementStyle1;
 			this.advTreeProcSets.PathSeparator = ";";
 			this.advTreeProcSets.RightToLeft = System.Windows.Forms.RightToLeft.No;
-			this.advTreeProcSets.Size = new System.Drawing.Size(277, 103);
+			this.advTreeProcSets.Size = new System.Drawing.Size(277, 107);
 			this.advTreeProcSets.Styles.Add(this.elementStyle1);
 			this.advTreeProcSets.TabIndex = 0;
 			this.advTreeProcSets.Text = "advTree1";
@@ -1322,7 +1463,7 @@ namespace Volian.Controls.Library
 			this.advTreeStepTypes.PathSeparator = ";";
 			this.advTreeStepTypes.RightToLeft = System.Windows.Forms.RightToLeft.No;
 			this.advTreeStepTypes.SelectionPerCell = true;
-			this.advTreeStepTypes.Size = new System.Drawing.Size(277, 110);
+			this.advTreeStepTypes.Size = new System.Drawing.Size(277, 125);
 			this.advTreeStepTypes.Styles.Add(this.elementStyle2);
 			this.advTreeStepTypes.TabIndex = 0;
 			this.advTreeStepTypes.Text = "advTree1";
@@ -1352,10 +1493,10 @@ namespace Volian.Controls.Library
 			this.grpPanSearchResults.Controls.Add(this.lbSrchResultsIncTrans);
 			this.grpPanSearchResults.DisabledBackColor = System.Drawing.Color.Empty;
 			this.grpPanSearchResults.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.grpPanSearchResults.Location = new System.Drawing.Point(0, 461);
+			this.grpPanSearchResults.Location = new System.Drawing.Point(0, 457);
 			this.grpPanSearchResults.Margin = new System.Windows.Forms.Padding(2);
 			this.grpPanSearchResults.Name = "grpPanSearchResults";
-			this.grpPanSearchResults.Size = new System.Drawing.Size(277, 215);
+			this.grpPanSearchResults.Size = new System.Drawing.Size(277, 219);
 			// 
 			// 
 			// 
@@ -1394,7 +1535,7 @@ namespace Volian.Controls.Library
 			this.lbSrchResults.Margin = new System.Windows.Forms.Padding(2);
 			this.lbSrchResults.Name = "lbSrchResults";
 			this.lbSrchResults.RightToLeft = System.Windows.Forms.RightToLeft.No;
-			this.lbSrchResults.Size = new System.Drawing.Size(271, 194);
+			this.lbSrchResults.Size = new System.Drawing.Size(271, 198);
 			this.lbSrchResults.TabIndex = 0;
 			this.lbSrchResults.SelectedIndexChanged += new System.EventHandler(this.lbSrchResults_SelectedValueChanged);
 			this.lbSrchResults.MouseMove += new System.Windows.Forms.MouseEventHandler(this.lbSrchResults_MouseMove);
@@ -1415,7 +1556,7 @@ namespace Volian.Controls.Library
 			this.lbSrchResultsIncTrans.Margin = new System.Windows.Forms.Padding(2);
 			this.lbSrchResultsIncTrans.Name = "lbSrchResultsIncTrans";
 			this.lbSrchResultsIncTrans.RightToLeft = System.Windows.Forms.RightToLeft.No;
-			this.lbSrchResultsIncTrans.Size = new System.Drawing.Size(271, 194);
+			this.lbSrchResultsIncTrans.Size = new System.Drawing.Size(271, 198);
 			this.lbSrchResultsIncTrans.TabIndex = 0;
 			this.lbSrchResultsIncTrans.SelectedIndexChanged += new System.EventHandler(this.lbSrchResults_SelectedValueChanged);
 			this.lbSrchResultsIncTrans.ItemClick += new System.EventHandler(this.lbSrchResultsIncTrans_ItemClicked);
@@ -1435,7 +1576,7 @@ namespace Volian.Controls.Library
 			this.panSearchButtons.Controls.Add(this.btnPrnSrchRslts);
 			this.panSearchButtons.DisabledBackColor = System.Drawing.Color.Empty;
 			this.panSearchButtons.Dock = System.Windows.Forms.DockStyle.Top;
-			this.panSearchButtons.Location = new System.Drawing.Point(0, 402);
+			this.panSearchButtons.Location = new System.Drawing.Point(0, 398);
 			this.panSearchButtons.Margin = new System.Windows.Forms.Padding(2);
 			this.panSearchButtons.Name = "panSearchButtons";
 			this.panSearchButtons.Size = new System.Drawing.Size(277, 59);
@@ -1647,11 +1788,11 @@ namespace Volian.Controls.Library
 			this.xpSetToSearch.DisabledBackColor = System.Drawing.Color.Empty;
 			this.xpSetToSearch.Dock = System.Windows.Forms.DockStyle.Top;
 			this.xpSetToSearch.ExpandOnTitleClick = true;
-			this.xpSetToSearch.Location = new System.Drawing.Point(0, 147);
+			this.xpSetToSearch.Location = new System.Drawing.Point(0, 124);
 			this.xpSetToSearch.Margin = new System.Windows.Forms.Padding(2);
 			this.xpSetToSearch.Name = "xpSetToSearch";
 			this.xpSetToSearch.RightToLeft = System.Windows.Forms.RightToLeft.No;
-			this.xpSetToSearch.Size = new System.Drawing.Size(277, 124);
+			this.xpSetToSearch.Size = new System.Drawing.Size(277, 128);
 			this.xpSetToSearch.Style.Alignment = System.Drawing.StringAlignment.Center;
 			this.xpSetToSearch.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
 			this.xpSetToSearch.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
@@ -1682,11 +1823,11 @@ namespace Volian.Controls.Library
 			this.xpStepTypes.DisabledBackColor = System.Drawing.Color.Empty;
 			this.xpStepTypes.Dock = System.Windows.Forms.DockStyle.Top;
 			this.xpStepTypes.ExpandOnTitleClick = true;
-			this.xpStepTypes.Location = new System.Drawing.Point(0, 271);
+			this.xpStepTypes.Location = new System.Drawing.Point(0, 252);
 			this.xpStepTypes.Margin = new System.Windows.Forms.Padding(2);
 			this.xpStepTypes.Name = "xpStepTypes";
 			this.xpStepTypes.RightToLeft = System.Windows.Forms.RightToLeft.No;
-			this.xpStepTypes.Size = new System.Drawing.Size(277, 131);
+			this.xpStepTypes.Size = new System.Drawing.Size(277, 146);
 			this.xpStepTypes.Style.Alignment = System.Drawing.StringAlignment.Center;
 			this.xpStepTypes.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
 			this.xpStepTypes.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
@@ -1720,7 +1861,7 @@ namespace Volian.Controls.Library
 			this.checkedListBox1.FormattingEnabled = true;
 			this.checkedListBox1.Location = new System.Drawing.Point(110, 46);
 			this.checkedListBox1.Name = "checkedListBox1";
-			this.checkedListBox1.Size = new System.Drawing.Size(120, 79);
+			this.checkedListBox1.Size = new System.Drawing.Size(120, 89);
 			this.checkedListBox1.TabIndex = 1;
 			// 
 			// DisplaySearch
@@ -1738,11 +1879,6 @@ namespace Volian.Controls.Library
 			this.Size = new System.Drawing.Size(277, 676);
 			((System.ComponentModel.ISupportInitialize)(this.tabSearchTypes)).EndInit();
 			this.tabSearchTypes.ResumeLayout(false);
-			this.tabControlPanel4.ResumeLayout(false);
-			this.gpSrchText.ResumeLayout(false);
-			this.panel1.ResumeLayout(false);
-			this.panel1.PerformLayout();
-			this.panel3.ResumeLayout(false);
 			this.tabControlPanel5.ResumeLayout(false);
 			this.pnlTranCategory.ResumeLayout(false);
 			this.pnlTranFormat.ResumeLayout(false);
@@ -1754,6 +1890,11 @@ namespace Volian.Controls.Library
 			this.gpSrchAnnoText.ResumeLayout(false);
 			this.panel4.ResumeLayout(false);
 			this.panel4.PerformLayout();
+			this.tabControlPanel4.ResumeLayout(false);
+			this.gpSrchText.ResumeLayout(false);
+			this.panel1.ResumeLayout(false);
+			this.panel1.PerformLayout();
+			this.panel3.ResumeLayout(false);
 			this.tabControlPanel1.ResumeLayout(false);
 			this.tabControlPanel1.PerformLayout();
 			this.groupBox1.ResumeLayout(false);
@@ -1822,7 +1963,6 @@ namespace Volian.Controls.Library
 		private System.Windows.Forms.Label label2;
 		private System.Windows.Forms.Panel panel1;
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbxIncROTextSrch;
-		private DevComponents.DotNetBar.Controls.CheckBoxX cbxProcSectSrch;
 		private System.Windows.Forms.Panel panel3;
 		private System.Windows.Forms.Panel panel4;
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbxFndUnLnkROVals;

PROMS/Volian.Controls.Library/DisplaySearch.cs

@@ -468,9 +468,7 @@ namespace Volian.Controls.Library
 							lastLastFormatID = fv.FormatID;
 						}
 					}
-					cbxTranVersion.SelectedIndexChanged -= new EventHandler(cbxTranVersion_SelectedIndexChanged);
 					cbxTranVersion.SelectedIndexChanged += new EventHandler(cbxTranVersion_SelectedIndexChanged);
-					cbxTranFormat.SelectedIndexChanged -= new EventHandler(cbxTranFormat_SelectedIndexChanged);
 					cbxTranFormat.SelectedIndexChanged += new EventHandler(cbxTranFormat_SelectedIndexChanged);
 				}
 				this.Cursor = Cursors.Default;
@@ -894,7 +892,6 @@ namespace Volian.Controls.Library
 				topnode.DataKey = fi.FolderID;
 			}
 
-			advTreeProcSets.BeforeExpand -= new DevComponents.AdvTree.AdvTreeNodeCancelEventHandler(advTreeProcSets_BeforeExpand);
 			advTreeProcSets.BeforeExpand += new DevComponents.AdvTree.AdvTreeNodeCancelEventHandler(advTreeProcSets_BeforeExpand);
 
 			// position to the procedure set in the tree if we have a procedure open
@@ -989,7 +986,6 @@ namespace Volian.Controls.Library
 				annoTypes.Add(new AnnotationTypeSearch(ati.Name, ati.TypeID.ToString()));
 			cbxAnnoTypes.DisplayMember = "Name";
 			cbxAnnoTypes.DataSource = annoTypes;
-			lbSrchResults.MouseMove -= new MouseEventHandler(lbSrchResults_MouseMove);
 			lbSrchResults.MouseMove += new MouseEventHandler(lbSrchResults_MouseMove);
 			_TabControl = tc;
 		}
@@ -2061,8 +2057,7 @@ namespace Volian.Controls.Library
 							ReportTitle = "Step Element Report"; //"Proms - Search by Type: " + typstr;
 							TypesSelected = "Filtered By:  " + typstr;
 							SearchString = null;
-								// B2022-031 - added a cbxProcSectSrch to filter out procedure and section titles from global search results.
+							SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, string.Empty, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, ItemSearchIncludeLinks.Value, includeRTFformat, includeSpecialChars, unitPrefix, string.Empty, string.Empty);
-							SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, string.Empty, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, ItemSearchIncludeLinks.Value, includeRTFformat, includeSpecialChars, unitPrefix, string.Empty, string.Empty);
 							cmbResultsStyleIndex = 1;  //display step locations in results
 						}
 					}
@@ -2108,8 +2103,7 @@ namespace Volian.Controls.Library
 						SearchString = TextSearchString;
 						//TypesSelected = (typstr != null) ? "Searched Step Types: " + typstr : "Searched All Step Types";
 						//TypesSelected = "Searched Step Types: " + ((typstr != null) ? typstr : "All Step Types");
-							// B2022-031 - added a cbxProcSectSrch to filter out procedure and section titles from global search results.
+						SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, TextSearchString /*.Replace(@"\",@"\u9586?")*/, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxIncROTextSrch.Checked ? ItemSearchIncludeLinks.Value : ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, byWordPrefix, byWordSuffix);
-						SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, TextSearchString /*.Replace(@"\",@"\u9586?")*/, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, cbxIncROTextSrch.Checked ? ItemSearchIncludeLinks.Value : ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, byWordPrefix, byWordSuffix);
 
 						cmbResultsStyleIndex = 3;  // display step text in results
 												   //}
@@ -2151,8 +2145,7 @@ namespace Volian.Controls.Library
 
 					if (cbxFndUnLnkROVals.Enabled && cbxFndUnLnkROVals.Checked)
 					{
-						// B2022-031 - added a cbxProcSectSrch to filter out procedure and section titles from global search results.
+						SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, ROSearchList, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, string.Empty, string.Empty);
-						SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, ROSearchList, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, string.Empty, string.Empty);
 						cmbResultsStyleIndex = 3;  // display step text in results
 					}
 					else

PROMS/Volian.Controls.Library/DisplaySearch.resx

@@ -145,7 +145,4 @@ Boolean searches are case insensitive and the search finds RO data as text or wi
   <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>305, 17</value>
   </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>25</value>
-  </metadata>
 </root>

PROMS/Volian.Controls.Library/DisplayTabControl.cs

@@ -10,7 +10,6 @@ using Volian.Controls.Library;
 using DevComponents.DotNetBar;
 using JR.Utils.GUI.Forms;
 using Volian.Base.Library;
-using Microsoft.Win32;
 
 namespace Volian.Controls.Library
 {
@@ -378,10 +377,7 @@ namespace Volian.Controls.Library
 				{
 					_MyStepRTB = _MyEditItem.MyStepRTB;
 					if (_MyStepRTB != null)
-					{
-						_MyStepRTB.Disposed -= new EventHandler(_MyStepRTB_Disposed);
 						_MyStepRTB.Disposed += new EventHandler(_MyStepRTB_Disposed);
-					}
 				}
 				else
 					_MyStepRTB = null;
@@ -472,7 +468,6 @@ namespace Volian.Controls.Library
 				myBar.DockTabControl.CloseButtonPosition = DevComponents.DotNetBar.eTabCloseButtonPosition.Right;
 				myBar.DockTabControl.Width = ClientRectangle.Width;
 			}
-			myBar.DockTabClosing -= new DockTabClosingEventHandler(myBar_DockTabClosing);
 			myBar.DockTabClosing += new DockTabClosingEventHandler(myBar_DockTabClosing);
 			if (!myBar.Visible)
 				myBar.Visible = true;
@@ -663,35 +658,11 @@ namespace Volian.Controls.Library
 			}
 			else // Otherwise open it in the Word editor
 			{
-				// B2025-034 Check to make sure that EDWord is installed in PROMS.  If not return NULL.
+				Document.ConvertWordSectionToDOCX(myItemInfo); // B2023-093 Convert a Word section to the DOCX Word format if needed before opening it for edit
-				object EDOfficeViewerX = GetValue<object>(@"HKEY_CLASSES_ROOT\EDOfficeViewerX.Connect\CLSID\", @"", null);
+				return OpenDSOTabPage(myItemInfo);
-
-				object EDWordCtrl = GetValue<object>(@"HKEY_CLASSES_ROOT\EDWORD.EDWordCtrl.1\CLSID\", @"", null);
-
-				if (EDOfficeViewerX == null || EDWordCtrl == null)
-				{
-
-					MessageBox.Show("Edraw needs to be installed or reinstalled on this device. " + Environment.NewLine + "" + Environment.NewLine +
-						"Please contact your IT Administrator to install and register Edraw that was provided with the PROMS Installation media.  If additional support is needed, please contact Volian.", "Error in Word section",
-						MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
-					return null;
-				}
-				else
-					{
-					Document.ConvertWordSectionToDOCX(myItemInfo); // B2023-093 Convert a Word section to the DOCX Word format if needed before opening it for edit
-					return OpenDSOTabPage(myItemInfo);
-				}
 			}
-
 		}
-		public T GetValue<T>(string registryKeyPath, string value, T defaultValue = default(T))
-		{
-			T retVal = default(T);
 
-			retVal = (T)Registry.GetValue(registryKeyPath, value, defaultValue);
-
-			return retVal;
-		}
 		public bool PasteRTBItem(ItemInfo myItemInfo, int copyStartID, ItemInfo.EAddpingPart pasteType, int type)
 		{
 			CleanUpClosedItems();

PROMS/Volian.Controls.Library/DisplayTags.cs

@@ -97,6 +97,21 @@ namespace Volian.Controls.Library
 			set { if (Visible != value) Visible = value; }
 		}
 
+		/// <summary>
+		/// Expose text properties for height and widht to handle selecting RO Image Types.
+		/// </summary>
+		public string TbFSwd
+		{
+			get	{return tbFSWd.Text;}
+			set { tbFSWd.Text = value; tbFSWd.Refresh(); } //  trBarFS.Value = Convert.ToInt32(value);
+		}
+
+		public string TbFSht
+		{
+			get { return tbFSHt.Text; }
+			set { tbFSHt.Text = value; tbFSHt.Refresh(); _origFigureSizeRatio = float.Parse(value) / float.Parse(tbFSWd.Text); }
+		}
+
 		#endregion
 		#region Constructor
 		public DisplayTags()
@@ -157,18 +172,6 @@ namespace Volian.Controls.Library
 			tbFSWd.SelectionLength = 0;
 			tbFSWd.SelectionStart = tbFSWd.TextLength; // position to the end of the Width text box
 		}
-		/// <summary>
-		/// Update text properties for height and width for new RO Image Types.
-		/// </summary>
-		public void SetNewImageHeightAndWidth(int height, int width)
-		{
-			tbFSHt.Text = height.ToString();
-			tbFSWd.Text = width.ToString();
-			tbFSWd.Refresh();
-			tbFSHt.Refresh();
-			_origFigureSizeWidth = width;
-			_origFigureSizeRatio = (float)height / (float)width;
-		}
 		public void ToggleChangeBar() // for use with shortcut keystoke <ALT><F2>
 		{
 			if (rbChgBarOff.Checked)

PROMS/Volian.Controls.Library/DisplayTransition.cs

@@ -524,56 +524,7 @@ namespace Volian.Controls.Library
 			ItemInfo secitm = (ItemInfo)cbTranSects.SelectedItem;
 			bool hasMetaSubs = secitm.IsSection && secitm.Sections != null && secitm.Sections.Count > 0;
 			bool editSteps = !hasMetaSubs || (secitm.MyConfig is SectionConfig && (secitm.MyConfig as SectionConfig).SubSection_Edit == "Y");
-			if (!editSteps)
+			if (!editSteps) return;
-			{
-				if (secitm.Sections != null)
-				{
-					// if the transition to point is a section or procedure, just return
-					if (startitm.MyContent.Type < 20000) return;
-					groupPanelTranstionSteps.Style.BackColor = Color.Cornsilk;
-					// For the tree view, use parent, unless already at HLS.  If at HLS, use this level.
-					//ItemInfo selitm2 = startitm.MyHLS;
-					ItemInfo selSubSec = secitm.Sections[0];
-
-						// The commented out code below is for displaying the steps from the first sub-section B2025-035
-					//ItemInfo subSelStep = selSubSec.Steps[0];
-					//E_TransUI etm2 = (E_TransUI)_CurItemFrom.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList[listBoxTranFmt.SelectedIndex].TransUI;
-					//if (subSelStep.IsInRNO)
-					//	startitm = subSelStep.FirstSibling;   // if in RNO tree, start out with HLS
-					//else
-					//	startitm = subSelStep != null ? subSelStep.FirstSibling : startitm.FirstSibling;
-
-						// B2025-035
-					ItemInfo subSelStep = secitm.Sections[0];
-					E_TransUI etm2 = (E_TransUI)_CurItemFrom.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList[listBoxTranFmt.SelectedIndex].TransUI;
-					if (subSelStep.IsInRNO)
-						startitm = subSelStep.FirstSibling;   // if in RNO tree, start out with HLS
-					else
-						startitm = subSelStep != null ? subSelStep.FirstSibling : startitm.FirstSibling;
-
-						// B2025-035
-					bool setsel2 = false;
-					while (startitm != null)
-					{
-						VETreeNode tvn = new VETreeNode(startitm, false);
-						tvn.Tag = startitm;
-						int active = this.tvTran.Nodes.Add(tvn);
-						if (subSelStep != null && startitm.ItemID == subSelStep.ItemID)
-						{
-							tvTran.SelectedNode = tvTran.Nodes[active];
-							setsel2 = true;
-						}
-						startitm = startitm.GetNext();
-					}
-					if (!setsel2) tvTran.SelectedNode = tvTran.Nodes[0];
-					tvTran.BeforeExpand -= new TreeViewCancelEventHandler(tvTran_BeforeExpand);
-					tvTran.BeforeExpand += new TreeViewCancelEventHandler(tvTran_BeforeExpand);
-					// bug fix. TreeView needs the next two lines to properly display the bottom node. jsj 01/08/2010
-					tvTran.ItemHeight++;
-					tvTran.ItemHeight--;
-				}
-				return;
-			}
 			
 			// if the transition to point is a section or procedure, just return
 			if (startitm.MyContent.Type < 20000) return;
@@ -600,7 +551,6 @@ namespace Volian.Controls.Library
 				startitm = startitm.GetNext();
 			}
 			if (!setsel) tvTran.SelectedNode = tvTran.Nodes[0];
-			tvTran.BeforeExpand -= new TreeViewCancelEventHandler(tvTran_BeforeExpand);
 			tvTran.BeforeExpand += new TreeViewCancelEventHandler(tvTran_BeforeExpand);
 			// bug fix. TreeView needs the next two lines to properly display the bottom node. jsj 01/08/2010
 			tvTran.ItemHeight++;
@@ -984,13 +934,7 @@ namespace Volian.Controls.Library
 			//	a different section was selected, if step section, update step list, otherwise, empty
 			//	it & disable.
 			ItemInfo secitm = (ItemInfo)cbTranSects.SelectedItem;
-
+			if (!secitm.IsStepSection)
-			//if (secitm.IsStepSection)
-			//{
-			//	cbTranSects.SelectedItem.Sections[0];
-
-			//}
-				if (!secitm.IsStepSection)
 			{
 				tvTran.Nodes.Clear();
 				tvTran.Enabled = false;

PROMS/Volian.Controls.Library/EditItem.cs

@@ -214,14 +214,10 @@ namespace Volian.Controls.Library
 					UserCheckOffChar = (char)co.UIMark;
 				}
 				// Deal with changes in content data
-				value.MyContent.Changed -= new ContentInfoEvent(MyContent_Changed);
 				value.MyContent.Changed += new ContentInfoEvent(MyContent_Changed);
-				value.MyProcedure.MyContent.Changed -= new ContentInfoEvent(MyContent_Changed);
 				value.MyProcedure.MyContent.Changed += new ContentInfoEvent(MyContent_Changed);
 				// Deal with change in item data
-				value.Changed -= new ItemInfoEvent(value_Changed);
 				value.Changed += new ItemInfoEvent(value_Changed);
-				value.OrdinalChanged -= new ItemInfoEvent(value_OrdinalChanged);
 				value.OrdinalChanged += new ItemInfoEvent(value_OrdinalChanged);
 				// do something like this to draw circle around step numbers - note got NULL reference error on NSP data
 				//if (value.FormatStepData != null && value.FormatStepData.TabData.IdentPrint.Contains("C0")) Circle = true;
@@ -762,7 +758,7 @@ namespace Volian.Controls.Library
 		// clear tabs, clears then all so that next 'get' will calculate new.
 		public void SetAllTabs()
 		{
-				RefreshTab();
+			RefreshTab();
 
 			if (_MyAfterEditItems != null) _MyAfterEditItems[0].SetAllTabs();	// B2020-043: used to loop through all, but then recursion would redo.
 			if (_MyNextEditItem != null) _MyNextEditItem.SetAllTabs();
@@ -1164,7 +1160,7 @@ namespace Volian.Controls.Library
 		{
 			if (myItemInfoList != null)
 				foreach (ItemInfo item in myItemInfoList)
-					AddChildBefore(item, expand); 
+					AddChildBefore(item, expand);
 		}
 		public EditItem AddChildBefore(ItemInfoList myItemInfoList, EditItem nextEditItem)
 		{
@@ -3998,16 +3994,11 @@ namespace Volian.Controls.Library
 			// TODO: Adjust top based upon format
 			// TODO: Remove Label and just output ident on the paint event
 			TabLeft = 20;
-			if (!itemInfo.IsStep)  // C2025-036 reduce un-needed processing - this will prevent duplicat calls that generate step tabs when loading a procedure
+			SetupHeader(itemInfo);
-				SetupHeader(itemInfo);
 			SetupAlarmTableView(itemInfo); // C2021-018 display alarm point table information in the step editor (if the format flag is set)
-			this.Paint -= new PaintEventHandler(EditItem_Paint);
 			this.Paint += new PaintEventHandler(EditItem_Paint);
-			this.BackColorChanged -= new EventHandler(EditItem_BackColorChanged);
 			this.BackColorChanged += new EventHandler(EditItem_BackColorChanged);
-			this.Move -= new EventHandler(EditItem_Move);
 			this.Move += new EventHandler(EditItem_Move);
-			this.Resize -= new EventHandler(EditItem_Resize);
 			this.Resize += new EventHandler(EditItem_Resize);
 			if (itemInfo != null)
 			{
@@ -4058,7 +4049,6 @@ namespace Volian.Controls.Library
 					SeqLevel = myParentEditItem.SeqLevel + ((myChildRelation == ChildRelation.After || myChildRelation == ChildRelation.Before) && itemInfo.IsSequential ? 1 : 0);
 				//// TIMING: DisplayItem.TimeIt("CSLARTB seqLevel");
 				MyItemInfo = itemInfo;
-				MyItemInfo.MyConfig.PropertyChanged -= new PropertyChangedEventHandler(MyConfig_PropertyChanged);
 				MyItemInfo.MyConfig.PropertyChanged += new PropertyChangedEventHandler(MyConfig_PropertyChanged);
 			}
 			//// TIMING: DisplayItem.TimeIt("CSLARTB MyItem");

PROMS/Volian.Controls.Library/ImageItem.cs

@@ -340,8 +340,9 @@ namespace Volian.Controls.Library
 			this.Height = MyPictureBox.Height + 10;
 			if (_displayTags != null)
 			{
-				// Set the Height and Width on the step properties page for the new image
+				_displayTags._origFigureSizeWidth = wd;
-				_displayTags.SetNewImageHeightAndWidth(ht, wd);
+				_displayTags.TbFSwd = wd.ToString();
+				_displayTags.TbFSht = ht.ToString();
 			}
 		}
 

PROMS/Volian.Controls.Library/ListBoxMulti.cs

@@ -1,52 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace Volian.Controls.Library
-{
-    //Class to handle bug in Windows WinForms ListBox
-    // that autoselects first item when no items are selected 
-    public partial class ListBoxMulti : ListBox
-    {
-        public ListBoxMulti()
-        {
-            Visible = true;
-            SelectionMode = SelectionMode.MultiSimple;
-
-            SelectedIndexChanged += lb_SelectedIndexChanged;
-
-            Disposed += ListBoxMulti_Disposed;
-        }
-
-        //singleselectedindex
-        // will help to fix bug in Winforms ListBox
-        // that autoselects first item when no items are selected
-        // -1 = multi or set to this after 1st initialization
-        // if this = 0 and only 1 item selected,
-        // that means item was autoselected, so clear all items.
-        public int singleselectedindex { get; set; }
-        private void lb_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            ListBoxMulti tmp = (ListBoxMulti)sender;
-
-            if (tmp.SelectedItems.Count == 1 && tmp.singleselectedindex == 0)
-            {
-                tmp.ClearSelected();
-            }
-            else if (tmp.SelectedItems.Count == 1)
-                tmp.singleselectedindex = tmp.SelectedIndex;
-            else
-                tmp.singleselectedindex = -1;
-
-        }
-
-        //remove event when get rid of object
-        private void ListBoxMulti_Disposed(object sender, EventArgs e)
-        {
-            SelectedIndexChanged -= lb_SelectedIndexChanged;
-        }
-    }
-}

PROMS/Volian.Controls.Library/StepRTB.cs

@@ -1284,7 +1284,7 @@ namespace Volian.Controls.Library
 			}
 			selectedRtfSB.Append(@"{\rtf1\ansi\ansicpg1252\deff0\deflang1033{\fonttbl{\f0\fnil\fcharset2 " + myFont.FontFamily.Name + @";}"); //}\f0\fs" + this.Font.SizeInPoints * 2 + @" " + myDisplayTextElement.Text + @"}}";
             if (!isFixed)
-                selectedRtfSB.Append(@"{\f1\fnil\fcharset0 " + Volian.Base.Library.vlnFont.ProportionalSymbolFont + @";}}{\colortbl ;\red255\green0\blue0;\red0\green0\blue255;}");  // C2017-036 get best available proportional font for symbols - B2025-039 add Blue for Colored Replace Words
+                selectedRtfSB.Append(@"{\f1\fnil\fcharset0 " + Volian.Base.Library.vlnFont.ProportionalSymbolFont + @";}}{\colortbl ;\red255\green0\blue0;}");  // C2017-036 get best available proportional font for symbols
             else
 				selectedRtfSB.Append(@"{\f1\fnil\fcharset0 FreeMono;}}{\colortbl ;\red255\green0\blue0;\red0\green0\blue255;}");  // FreeMono is now used for the edit screen only.  VESymbFix and Consolas are used for printing
 			selectedRtfSB.Append("\r\n");

PROMS/Volian.Controls.Library/StepTabRibbon.cs

@@ -3588,9 +3588,7 @@ namespace Volian.Controls.Library
 			if (tmp.MyDisplayTabControl.MyCopyStep != null &&
 				tmp.MyDisplayTabControl.MyCopyStep.ItemID == MyEditItem.MyItemInfo.ItemID)
 			{
-				//B2025-031 - Improve wording for if attempting to delete copied section	
+				if (FlexibleMessageBox.Show("Are you sure?\n\nIf you delete this step you will not able to paste it.\nYou should paste it before you delete it.", "Attempting to delete copied step.", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) return;
-				string stype = MyEditItem.MyItemInfo.IsSection ? "section" : "step";
-				if (FlexibleMessageBox.Show($"Are you sure?\n\nIf you delete this {stype} you will not able to paste it.\nYou should paste it before you delete it.", $"Attempting to delete copied {stype}.", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) return;
 				clearCopyStep = true;
 			}
 

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

@@ -1,149 +0,0 @@
-
-namespace Volian.Controls.Library
-{
-    partial class TablePropertiesControl
-    {
-        /// <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>
-        private void InitializeComponent()
-        {
-            this.lbl_Rows = new System.Windows.Forms.Label();
-            this.lbl_Cols = new System.Windows.Forms.Label();
-            this.NumRows = new System.Windows.Forms.NumericUpDown();
-            this.NumCols = new System.Windows.Forms.NumericUpDown();
-            this.dataview = new System.Windows.Forms.DataGridView();
-            this.lbltitle = new System.Windows.Forms.Label();
-            ((System.ComponentModel.ISupportInitialize)(this.NumRows)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.NumCols)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dataview)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // lbl_Rows
-            // 
-            this.lbl_Rows.AutoSize = true;
-            this.lbl_Rows.Location = new System.Drawing.Point(0, 34);
-            this.lbl_Rows.Name = "lbl_Rows";
-            this.lbl_Rows.Size = new System.Drawing.Size(89, 13);
-            this.lbl_Rows.TabIndex = 0;
-            this.lbl_Rows.Text = "Number of Rows:";
-            // 
-            // lbl_Cols
-            // 
-            this.lbl_Cols.AutoSize = true;
-            this.lbl_Cols.Location = new System.Drawing.Point(0, 56);
-            this.lbl_Cols.Name = "lbl_Cols";
-            this.lbl_Cols.Size = new System.Drawing.Size(102, 13);
-            this.lbl_Cols.TabIndex = 1;
-            this.lbl_Cols.Text = "Number of Columns:";
-            // 
-            // NumRows
-            // 
-            this.NumRows.Location = new System.Drawing.Point(114, 32);
-            this.NumRows.Minimum = new decimal(new int[] {
-            1,
-            0,
-            0,
-            0});
-            this.NumRows.Name = "NumRows";
-            this.NumRows.Size = new System.Drawing.Size(47, 20);
-            this.NumRows.TabIndex = 3;
-            this.NumRows.Value = new decimal(new int[] {
-            1,
-            0,
-            0,
-            0});
-            this.NumRows.ValueChanged += new System.EventHandler(this.NumRows_ValueChanged);
-            // 
-            // NumCols
-            // 
-            this.NumCols.Location = new System.Drawing.Point(114, 54);
-            this.NumCols.Minimum = new decimal(new int[] {
-            1,
-            0,
-            0,
-            0});
-            this.NumCols.Name = "NumCols";
-            this.NumCols.Size = new System.Drawing.Size(47, 20);
-            this.NumCols.TabIndex = 4;
-            this.NumCols.Value = new decimal(new int[] {
-            1,
-            0,
-            0,
-            0});
-            this.NumCols.ValueChanged += new System.EventHandler(this.NumCols_ValueChanged);
-            // 
-            // dataview
-            // 
-            this.dataview.AllowUserToAddRows = false;
-            this.dataview.AllowUserToDeleteRows = false;
-            this.dataview.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.dataview.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataview.ColumnHeadersVisible = false;
-            this.dataview.Location = new System.Drawing.Point(3, 73);
-            this.dataview.Name = "dataview";
-            this.dataview.Size = new System.Drawing.Size(316, 150);
-            this.dataview.TabIndex = 5;
-            this.dataview.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataview_CellEndEdit);
-            // 
-            // lbltitle
-            // 
-            this.lbltitle.AutoSize = true;
-            this.lbltitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lbltitle.Location = new System.Drawing.Point(3, 4);
-            this.lbltitle.Name = "lbltitle";
-            this.lbltitle.Size = new System.Drawing.Size(0, 17);
-            this.lbltitle.TabIndex = 6;
-            // 
-            // TablePropertiesControl
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.lbltitle);
-            this.Controls.Add(this.dataview);
-            this.Controls.Add(this.NumCols);
-            this.Controls.Add(this.NumRows);
-            this.Controls.Add(this.lbl_Cols);
-            this.Controls.Add(this.lbl_Rows);
-            this.Name = "TablePropertiesControl";
-            this.Size = new System.Drawing.Size(319, 252);
-            ((System.ComponentModel.ISupportInitialize)(this.NumRows)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.NumCols)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dataview)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Label lbl_Rows;
-        private System.Windows.Forms.Label lbl_Cols;
-        private System.Windows.Forms.NumericUpDown NumRows;
-        private System.Windows.Forms.NumericUpDown NumCols;
-        private System.Windows.Forms.DataGridView dataview;
-        private System.Windows.Forms.Label lbltitle;
-    }
-}

PROMS/Volian.Controls.Library/TablePropertiesControl.cs

@@ -1,240 +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.Text.RegularExpressions;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace Volian.Controls.Library
-{
-    //C2025-023 Electronic Procedures
-    //Control for designating which cells in a table require EP input 
-    public partial class TablePropertiesControl : UserControl
-    {
-        //defines the type of possible inputs from an EP viewer
-        public enum EPinputtype
-        {
-            none,
-            textbox,
-            checkbox
-        };
-
-        private DataTable values;
-        private BindingSource bindingSource = null;
-        private int totalrows = 1;
-        private int totalcols = 1;
-        public readonly string epname;
-        private bool IsInitializing;
-
-        //initialization / data will be in the format:
-        // totalnumrows,totalnumcols;(row,col):value|(row,col):value...
-        public TablePropertiesControl(string name, string title, string initialvalues)
-        {
-            InitializeComponent();
-
-            IsInitializing = true;
-
-            epname = name;
-            lbltitle.Text = title;
-            initializevalues(initialvalues);
-            bindingSource = new BindingSource(values, "");
-            dataview.DataSource = bindingSource;
-            dataview.AutoGenerateColumns = false;
-
-            Load += new EventHandler(FormLoad_setDefaults);
-        }
-
-        //initialization / data will be in the format:
-        // totalnumrows,totalnumcols;(row,col):value|(row,col):value...
-        private void initializevalues(string initialvalues)
-        {
-            values = new DataTable("values");
-
-            if (!string.IsNullOrEmpty(initialvalues))
-            {
-                string[] grp = initialvalues.Split(';');
-                string[] total = grp[0].Split(',');
-                initializedt(int.Parse(total[0]), int.Parse(total[1]));
-
-                string[] ivs = grp[1].Split('|');
-                //pair will be of format:
-                //(row,col):value
-                foreach (string pair in ivs)
-                {
-                    Match m = Regex.Match(pair, @"\(([\d]),([\d])\):([\w]+)");
-                    if (m.Success)
-                    {
-                        int row = int.Parse(m.Groups[1].Value);
-                        int col = int.Parse(m.Groups[2].Value);
-                        string v = m.Groups[3].Value;
-                        values.Rows[row][col] = v;
-                    }
-
-                }
-
-                values.AcceptChanges();
-            }
-            else
-            {
-                initializedt(1, 1);
-            }
-        }
-
-        //initialize the blank datatable
-        private void initializedt(int numrows, int numcols)
-        {
-            totalrows = numrows;
-            totalcols = numcols;
-
-            for (int c = 0; c < totalcols; c++)
-            {
-                values.Columns.Add(new DataColumn($"Column{c}") { DefaultValue = "none" });
-            }
-
-            for (int rw = 0; rw < totalrows; rw++)
-            {
-                values.Rows.Add();
-            }
-
-        }
-
-        void FormLoad_setDefaults(object sender, EventArgs e)
-        {
-            BindingSource bindingSourceDropDown = new BindingSource();
-            bindingSourceDropDown.DataSource = Enum.GetNames(typeof(EPinputtype));
-
-            //in order to achieve a dropdown of possible values need
-            //to remove the auto-inserted columns
-            //that were auto-generated of type type text
-            //when values was bound to the datagrid
-            for (int c = 0; c < totalcols; c++)
-            {
-                dataview.Columns.RemoveAt(c);
-                var cName = new DataGridViewComboBoxColumn();
-                cName.DataSource = bindingSourceDropDown;
-                cName.DefaultCellStyle.NullValue = "none";
-                dataview.Columns.Insert(c, cName);
-            }
-
-            NumRows.Value = totalrows;
-            NumCols.Value = totalcols;
-            IsInitializing = false;
-            setDataViewtoValues();
-
-        }
-
-        //set the display cells to match the values in the datatable for initialization
-        //and resize of the dataviewgrid
-        void setDataViewtoValues()
-        {
-            if (!IsInitializing)
-            {
-                for (int c = 0; c < totalcols; c++)
-                {
-                    for (int rw = 0; rw < totalrows; rw++)
-                    {
-                        dataview.Rows[rw].Cells[c].Value = values.Rows[rw][c];
-                    }
-                }
-            }
-        }
-
-        //Get storage string for storing table values in db
-        // data will be returned in the format:
-        // totalnumrows,totalnumcols;(row,col):value|(row,col):value...
-        public string GetStorageValue()
-        {
-            //force any in progress editing to commit.
-            ((BindingSource)dataview.DataSource).EndEdit();
-
-            StringBuilder bldr = new StringBuilder();
-            bldr.Append($"{totalrows},{totalcols}");
-            List<string> points = new List<string>();
-            for (int rw = 0; rw < values.Rows.Count; rw++)
-            {
-                for (int col = 0; col < values.Columns.Count; col++)
-                {
-                    if ((string) values.Rows[rw][col] != "none")
-                        points.Add($"({rw},{col}):{values.Rows[rw][col]}");
-                }
-            }
-
-
-            if (points.Count > 0)
-            {
-                bldr.Append(";");
-                bldr.Append(string.Join("|", points));
-            }
-
-            return bldr.ToString();
-        }
-
-        private void NumRows_ValueChanged(object sender, EventArgs e)
-        {
-            int endNumRows = (int)NumRows.Value;
-            int curNumRows = totalrows;
-
-            //remove rows till equal
-            while (curNumRows > endNumRows)
-            {
-                values.Rows.RemoveAt(curNumRows - 1);
-                curNumRows--;
-            }
-            //add rows till equal
-            while (curNumRows < endNumRows)
-            {
-                values.Rows.Add();
-                curNumRows++;
-            }
-
-            totalrows = endNumRows;
-            setDataViewtoValues();
-        }
-
-        private void NumCols_ValueChanged(object sender, EventArgs e)
-        {
-            int endNumCols = (int)NumCols.Value;
-            int curNumCols = totalcols;
-
-            BindingSource bindingSourceDropDown = new BindingSource();
-            bindingSourceDropDown.DataSource = Enum.GetNames(typeof(EPinputtype));
-
-            //remove cols till equal
-            while (curNumCols > endNumCols)
-            {
-                values.Columns.RemoveAt(curNumCols - 1);
-                dataview.Columns.RemoveAt(curNumCols - 1);
-                curNumCols--;
-            }
-            //add cols till equal
-            while (curNumCols < endNumCols)
-            {
-                values.Columns.Add(new DataColumn($"Column{curNumCols + 1}") { DefaultValue = "none"});
-                if (dataview.Columns.Count > curNumCols) dataview.Columns.RemoveAt(curNumCols);
-                var cName = new DataGridViewComboBoxColumn();
-                cName.DataSource = bindingSourceDropDown;
-                cName.DefaultCellStyle.NullValue = "none";
-                dataview.Columns.Add(cName);
-
-                curNumCols++;
-            }
-
-            totalcols = endNumCols;
-            setDataViewtoValues();
-        }
-
-        //set the datatable value to match the changed datagridview value
-        //for some reason despite being bound, does not automatically update 
-        // (it may be that datatable as a bindingsource does not implement INotifyProperty
-        //  and thus needs manually set like this)
-        private void dataview_CellEndEdit(object sender, DataGridViewCellEventArgs e)
-        {
-            values.Rows[e.RowIndex][e.ColumnIndex] = (string) dataview.Rows[e.RowIndex].Cells[e.ColumnIndex].Value;
-        }
-    }
-
-}