PROMS/Formats/frmFormatCopy.Designer.cs

@@ -33,8 +33,6 @@ namespace Formats
 			this.btnCopyFormats = new DevComponents.DotNetBar.ButtonX();
 			this.btnBrowse = new DevComponents.DotNetBar.ButtonX();
 			this.buttonX2 = new DevComponents.DotNetBar.ButtonX();
-			this.labelX2 = new DevComponents.DotNetBar.LabelX();
-			this.LstBxExcludeFiles = new DevComponents.DotNetBar.ListBoxAdv();
 			this.SuspendLayout();
 			// 
 			// txbxPROMSFormatsPath
@@ -66,7 +64,7 @@ namespace Formats
 			// 
 			this.btnCopyFormats.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
 			this.btnCopyFormats.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnCopyFormats.Location = new System.Drawing.Point(232, 156);
+			this.btnCopyFormats.Location = new System.Drawing.Point(152, 68);
 			this.btnCopyFormats.Name = "btnCopyFormats";
 			this.btnCopyFormats.Size = new System.Drawing.Size(84, 27);
 			this.btnCopyFormats.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -90,7 +88,7 @@ namespace Formats
 			// 
 			this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
 			this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.buttonX2.Location = new System.Drawing.Point(409, 156);
+			this.buttonX2.Location = new System.Drawing.Point(329, 68);
 			this.buttonX2.Name = "buttonX2";
 			this.buttonX2.Size = new System.Drawing.Size(75, 23);
 			this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -98,52 +96,17 @@ namespace Formats
 			this.buttonX2.Text = "Exit";
 			this.buttonX2.Click += new System.EventHandler(this.buttonX2_Click);
 			// 
-			// labelX2
+			// Form1
-			// 
-			// 
-			// 
-			// 
-			this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.labelX2.Location = new System.Drawing.Point(12, 41);
-			this.labelX2.Name = "labelX2";
-			this.labelX2.Size = new System.Drawing.Size(200, 23);
-			this.labelX2.TabIndex = 5;
-			this.labelX2.Text = "Excluding Format Files that Start with:";
-			// 
-			// LstBxExcludeFiles
-			// 
-			this.LstBxExcludeFiles.AutoScroll = true;
-			// 
-			// 
-			// 
-			this.LstBxExcludeFiles.BackgroundStyle.Class = "ListBoxAdv";
-			this.LstBxExcludeFiles.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.LstBxExcludeFiles.CausesValidation = false;
-			this.LstBxExcludeFiles.CheckStateMember = null;
-			this.LstBxExcludeFiles.ContainerControlProcessDialogKey = true;
-			this.LstBxExcludeFiles.DragDropSupport = true;
-			this.LstBxExcludeFiles.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.LstBxExcludeFiles.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
-			this.LstBxExcludeFiles.Location = new System.Drawing.Point(57, 70);
-			this.LstBxExcludeFiles.Name = "LstBxExcludeFiles";
-			this.LstBxExcludeFiles.ShowToolTips = false;
-			this.LstBxExcludeFiles.Size = new System.Drawing.Size(134, 76);
-			this.LstBxExcludeFiles.TabIndex = 6;
-			this.LstBxExcludeFiles.Text = "listBoxAdv1";
-			// 
-			// 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.ClientSize = new System.Drawing.Size(496, 107);
-			this.Controls.Add(this.LstBxExcludeFiles);
-			this.Controls.Add(this.labelX2);
 			this.Controls.Add(this.buttonX2);
 			this.Controls.Add(this.btnBrowse);
 			this.Controls.Add(this.btnCopyFormats);
 			this.Controls.Add(this.labelX1);
 			this.Controls.Add(this.txbxPROMSFormatsPath);
-			this.Name = "frmFormatCopy";
+			this.Name = "Form1";
 			this.Text = "Form1";
 			this.ResumeLayout(false);
 
@@ -156,8 +119,6 @@ namespace Formats
 		private DevComponents.DotNetBar.ButtonX btnCopyFormats;
 		private DevComponents.DotNetBar.ButtonX btnBrowse;
 		private DevComponents.DotNetBar.ButtonX buttonX2;
-		private DevComponents.DotNetBar.LabelX labelX2;
-		private DevComponents.DotNetBar.ListBoxAdv LstBxExcludeFiles;
 	}
 }
 

PROMS/Formats/frmFormatCopy.cs

@@ -14,11 +14,7 @@ namespace Formats
 		public frmFormatCopy()
 		{
 			InitializeComponent();
-			foreach (string excludeThis in excludeThese)
+			SetDefaults();
-			{
-				LstBxExcludeFiles.Items.Add(excludeThis);
-			}
-				SetDefaults();
 		}
 
 		private void SetDefaults()
@@ -96,11 +92,10 @@ namespace Formats
 			if (!txbxPROMSFormatsPath.Text.EndsWith(@"\")) txbxPROMSFormatsPath.Text += @"\";
 		}
 
-		public string[] excludeThese = { "WPS", "WPB", "VCBEPP" };
-
 		private bool ExcludeFromCopy(string fn)
 		{
 			// don't copy formats whos file name starts with..
+			string[] excludeThese = { "WPS", "WEP", "WPB", "VCBEPP" };
 			foreach (string excludeThis in excludeThese)
 				if (fn.ToUpper().StartsWith(excludeThis)) return true;
 			return false;

PROMS/Formats/frmFormatCopy.resx

@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>

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

@@ -1584,7 +1584,7 @@ namespace ROEditor
 					if (i + 1 < InUseList.Count) inuserecs = inuserecs + " ";
 				}
 			}
-			if ((inuserecs ?? "") != (origFieldsInUse ?? ""))
+			if (inuserecs != origFieldsInUse)
 				return true;
 
 
@@ -1599,7 +1599,7 @@ namespace ROEditor
 					if (i + 1 < InUseApplcList.Count) applicfieldrecs = applicfieldrecs + " ";
 				}
 			}
-			if ((applicfieldrecs ?? "") != (origApplicFields ?? ""))
+			if (applicfieldrecs != origApplicFields)
 				return true;
 
 			//nothing has changed

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

@@ -264,11 +264,9 @@ namespace ROEditor
 				File.Delete(FstNew); // remove ROFST.NEW
 				if (OrphanedRecords.Length > 0)
 				{
-					using (StreamWriter sw = new StreamWriter(Path.Combine(FstDir, @"Orphaned RO Records.txt"), false))
+					StreamWriter sw = new StreamWriter(VlnSettings.TemporaryFolder + @"\Orphaned RO Records.txt");
-					{
+					sw.Write(OrphanedRecords.ToString());
-						sw.Write(OrphanedRecords.ToString());
+					sw.Close();
-						sw.Close();
-					}
 					MessageBox.Show("The file Orphaned RO Records.txt has been created", "Warning - Orphan RO Record");
 				}
 

PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs

@@ -834,7 +834,7 @@ namespace RODBInterface
 					ValueType |= FldType;
 					if (PCApplicability)
 						text = GetPCReturnValues(theDb, pcChildern, elm, PCApplicability, inusename, text); // C2021-026 Get P/C Children return values
-					strbld.Append(text.Replace("{", "&123;").Replace("}", "&125;"));
+					strbld.Append(text);
 				}
 				else
 				{

PROMS/VEPROMS User Interface/PROMSFixes.Sql

@@ -1492,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),
@@ -1584,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
 
@@ -1675,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,
@@ -1714,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
@@ -15704,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]';
@@ -15717,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
@@ -15787,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);
 
@@ -15835,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
@@ -15894,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
@@ -15948,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
@@ -19798,11 +19791,9 @@ GO
 	*****************************************************************************/
 	/*
 	==========================================================================================================
+		Author:			Jake Ropar
 		Create Date:	06/23/2022
 		Description:	Inserts New Rofst Child Record / Default Values
-		Modified:		02/19/2025
-		Modification 
-		Description:    Added support for ROs with brackets in Unit Values
 	==========================================================================================================
 	*/
 	Create Procedure [dbo].[vesp_RofstChildInsert]
@@ -19815,26 +19806,19 @@ GO
 		@title VarChar(Max),
 		@roid VarChar(50),
 		@appid VarChar(Max) = null,
-		@value VarChar(Max) = null,
+		@value VarChar(Max) = null
-		@missingDefaultValue VarChar(Max) = null
 	)
 	With Execute as Owner
 	As
 	Begin
 
-		Declare @BaseAccPageID VarChar(Max) = null;
+		Declare @AccPageID VarChar(Max) = null;
 		Declare @DefaultValues VarChar(Max);
 
-		Declare @RoidExt VarChar(Max);
-		Declare @AccPageExt VarChar(Max);
 
-		-- Default missing value if Null (Null values not allowed for the [value] field in the RofstDefaultValue table
+		-- Create Rofst Child/Group Record
-		if (DataLength(IsNull(@missingDefaultValue, '')) <= 0)
-			Set @missingDefaultValue = '[TBD]';
-
-		-- Create Rofst Child/Group Record --> [Roid = (12) Digits]
 		Insert Into RofstChild (RofstID, ID, ParentID, dbiID, [type], title, roid, appid, [value])
-		Values (@RofstID, @ID, @ParentID, @dbiID, @type, @title, @roid, @appid, REPLACE(REPLACE(@value, '&123;', '{'), '&125;', '}'));
+		Values (@RofstID, @ID, @ParentID, @dbiID, @type, @title, @roid, @appid, @value);
 
 
 		-- Check for appid, if exists, then insert the default value for each return type if multi-value
@@ -19842,58 +19826,37 @@ GO
 		Begin
 
 			-- Get Accessory Page ID
-			Select @BaseAccPageID = dbo.vefn_RofstDataCleanUnitInfoTags(Concat(d.dbiAP, '-', @appid), 1)
+			Select @AccPageID = Concat(d.dbiAP, '-', @appid) 
 			From RofstDatabase d with (NoLock) 
 			Where d.RofstID = @RofstID And d.dbiID = @dbiID;
 	
-			Select @DefaultValues = dbo.vefn_RofstDataReplaceVars(@value);
+			-- Insert Rofst Default Value (Parent RoChild) [roid = 12]
+			Insert Into RofstDefaultValue (RofstID, roid, [value], AccPageID) 
+			Values (@RofstID, @roid, Replace(@title, '\u160?', ' '), @AccPageID);
 
-			If (PatIndex('%=%', @DefaultValues) > 0)
+			-- Insert Rofst Default Value(s) (Children RoChild) [roid = 16] (Do Not Insert Duplicates)
-				Begin
+			Select @DefaultValues = Replace(dbo.vefn_RofstDataReplaceVars(@value), '{', ''); 
-				
-					-- Insert Rofst Default Values (Multi-Values) --> [Roid = (16) Digits]
-					Select @DefaultValues = Replace(@DefaultValues, '{', ''); 
 
-					With ChildrenValues as 
+			With ChildrenValues as 
-					(
+			(
-						Select x.ListPosition as 'OffsetIndex', 
+				Select (x.ListPosition + 40)  as 'OffsetIndex', 
-							Case When (PatIndex('%=%', x.ListValue) > 0) Then Right(x.ListValue, Len(x.ListValue)-PatIndex('%=%', x.ListValue)) Else x.ListValue End as 'DefaultValue'
+					Case When (PatIndex('%=%', x.ListValue) > 0) Then Right(x.ListValue, Len(x.ListValue)-PatIndex('%=%', x.ListValue)) Else x.ListValue End as 'DefaultValue'
-						From [dbo].[vefn_ParseStringListToTable](@DefaultValues, '}') x
+				From [dbo].[vefn_ParseStringListToTable](@DefaultValues, '}') x
-						Where Len(x.ListValue) > 0
+				Where Len(x.ListValue) > 0
-					)
+			)
-					Insert Into RofstDefaultValue (RofstID, roid, [value], AccPageID) 
+			Insert Into RofstDefaultValue (RofstID, roid, [value], AccPageID) 
-					Select @RofstID as 'RofstID',
+			Select @RofstID as 'RofstID',
-						Concat(@roid, re.RoidExt) as 'roid',
+				Concat(@roid, Cast(Format(Min(OffsetIndex), 'D4') as VarChar(4)))  as 'roid',
-						Case When (DataLength(cv.DefaultValue) > 0) Then 
+				DefaultValue as 'value',
-						      REPLACE(REPLACE(REPLACE(dbo.vefn_RofstDataCleanUnitInfoTags(cv.DefaultValue, 0), '&123;', '{'), '&125;}', '}'), '&125;', '}')
+				null as 'AccPageID'
-						      Else @missingDefaultValue End as 'value',
+			From ChildrenValues
-						Concat(@BaseAccPageID, '.', re.AccPageExt) as 'AccPageID'
+			Group By DefaultValue
-					From ChildrenValues cv
+			Order By Min(OffsetIndex) Asc
-						inner join vwRofstData_RofstExtensions re on re.Offset = cv.OffsetIndex
-					Order By cv.OffsetIndex Asc
-
-				End
-			Else
-				Begin
-
-					-- Insert Rofst Default Value (Single Value) --> [Roid = (16) Digits]
-					Insert Into RofstDefaultValue (RofstID, roid, [value], AccPageID) 
-					Select @RofstID as 'RofstID',
-						Concat(@roid, re.RoidExt) as 'roid',
-						Case When (DataLength(@DefaultValues) > 0) Then 
-						      REPLACE(REPLACE(REPLACE(dbo.vefn_RofstDataCleanUnitInfoTags(@DefaultValues, 0), '&123;', '{'), '&125;}', '}'), '&125;', '}')
-						      Else @missingDefaultValue End as 'value',
-						Concat(@BaseAccPageID, '.', re.AccPageExt) as 'AccPageID'
-					From vwRofstData_RofstExtensions re 
-					Where re.Offset = 1;
-
-				End
 
 		End -- (Len(@appid) > 0)
 
 
 		Return;
-
 	End
 	Go
 
@@ -20485,6 +20448,98 @@ GO
 	ELSE PRINT 'Procedure Creation: [vesp_RofstDataGetExtensions] Error on Creation'
 	GO
 
+	
+	
+
+	/****** Object:  StoredProcedure [dbo].[vesp_RofstChildInsert]    ***********************/
+	If Exists(SELECT * FROM sys.objects Where name = 'vesp_RofstChildInsert' AND type in (N'P'))
+	DROP PROCEDURE [dbo].[vesp_RofstChildInsert]
+	GO
+
+	SET ANSI_NULLS ON
+	GO
+	SET QUOTED_IDENTIFIER ON
+	GO
+
+	/*****************************************************************************
+	   Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
+		   Copyright 2020 - Volian Enterprises, Inc. All rights reserved.
+	*****************************************************************************/
+	/*
+	==========================================================================================================
+	 Author:		Jake Ropar
+	 Create Date:	03/24/2022
+	 Description:	
+	==========================================================================================================
+	 */
+	Create Procedure [dbo].[vesp_RofstChildInsert]
+	(
+		@RofstID Int,
+		@ID Int,
+		@ParentID Int,
+		@dbiID Int,
+		@type Int,
+		@title VarChar(Max),
+		@roid VarChar(50),
+		@appid VarChar(Max) = null,
+		@value VarChar(Max) = null
+	)
+	With Execute as Owner
+	As
+	Begin
+
+		Declare @BaseAccPageID VarChar(Max) = null;
+		Declare @DefaultValues VarChar(Max);
+
+
+		-- Create Rofst Child/Group Record --> [Roid = (12) Digits]
+		Insert Into RofstChild (RofstID, ID, ParentID, dbiID, [type], title, roid, appid, [value])
+		Values (@RofstID, @ID, @ParentID, @dbiID, @type, @title, @roid, @appid, @value);
+
+
+		-- Check for appid, if exists, then insert the default value for each return type if multi-value
+		If (Len(@appid) > 0)
+		Begin
+
+			-- Get Accessory Page ID
+			Select @BaseAccPageID = dbo.vefn_RofstDataCleanUnitInfoTags(Concat(d.dbiAP, '-', @appid), 1)
+			From RofstDatabase d with (NoLock) 
+			Where d.RofstID = @RofstID And d.dbiID = @dbiID;
+	
+			-- Insert Rofst Default Value(s) (Children RoChild) --> [Roid = (16) Digits]
+			Select @DefaultValues = Replace(dbo.vefn_RofstDataReplaceVars(@value), '{', ''); 
+
+			With ChildrenValues as 
+			(
+				Select x.ListPosition as 'OffsetIndex', 
+					Case When (PatIndex('%=%', x.ListValue) > 0) Then Right(x.ListValue, Len(x.ListValue)-PatIndex('%=%', x.ListValue)) Else x.ListValue End as 'DefaultValue'
+				From [dbo].[vefn_ParseStringListToTable](@DefaultValues, '}') x
+				Where Len(x.ListValue) > 0
+			)
+			Insert Into RofstDefaultValue (RofstID, roid, [value], AccPageID) 
+			Select @RofstID as 'RofstID',
+				Concat(@roid, re.RoidExt) as 'roid',
+				Case When (Len(RTrim(LTrim(cv.DefaultValue))) > 0 ) Then dbo.vefn_RofstDataCleanUnitInfoTags(cv.DefaultValue, 0) Else '[TBD]' End as 'value',
+				Concat(@BaseAccPageID, '.', re.AccPageExt) as 'AccPageID'
+			From ChildrenValues cv
+				inner join vwRofstData_RofstExtensions re on re.Offset = cv.OffsetIndex
+			Order By cv.OffsetIndex Asc
+		
+
+		End -- (Len(@appid) > 0)
+
+
+		Return;
+
+	End
+	Go
+
+	IF (@@Error = 0) PRINT 'Procedure Creation: [vesp_RofstChildInsert] Succeeded'
+	ELSE PRINT 'Procedure Creation: [vesp_RofstChildInsert] Error on Creation'
+	GO
+
+	
+
 	/****** Object:  StoredProcedure [dbo].[vesp_RofstDataSearch]    ***********************/
 	If Exists(SELECT * FROM sys.objects Where name = 'vesp_RofstDataSearch' AND type in (N'P'))
 	DROP PROCEDURE [dbo].[vesp_RofstDataSearch]
@@ -21184,6 +21239,121 @@ GO
 ==========================================================================================================
 */
 
+
+IF EXISTS (Select * From dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[vesp_RofstChildInsert]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
+    DROP Procedure [dbo].[vesp_RofstChildInsert];
+GO
+
+SET ANSI_NULLS ON
+GO
+
+SET QUOTED_IDENTIFIER ON
+GO
+
+
+/*****************************************************************************
+   Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
+       Copyright 2020 - Volian Enterprises, Inc. All rights reserved.
+*****************************************************************************/
+/*
+==========================================================================================================
+ Author:		Jake Ropar
+ Create Date:	03/24/2022
+ Description:	Inserts the RO Child object and associated return values
+==========================================================================================================
+ */
+Create Procedure [dbo].[vesp_RofstChildInsert]
+(
+	@RofstID Int,
+	@ID Int,
+	@ParentID Int,
+	@dbiID Int,
+	@type Int,
+	@title VarChar(Max),
+	@roid VarChar(50),
+	@appid VarChar(Max) = null,
+	@value VarChar(Max) = null
+)
+With Execute as Owner
+As
+Begin
+
+	Declare @BaseAccPageID VarChar(Max) = null;
+	Declare @DefaultValues VarChar(Max);
+
+	Declare @RoidExt VarChar(Max);
+	Declare @AccPageExt VarChar(Max);
+
+
+	-- Create Rofst Child/Group Record --> [Roid = (12) Digits]
+	Insert Into RofstChild (RofstID, ID, ParentID, dbiID, [type], title, roid, appid, [value])
+	Values (@RofstID, @ID, @ParentID, @dbiID, @type, @title, @roid, @appid, @value);
+
+
+	-- Check for appid, if exists, then insert the default value for each return type if multi-value
+	If (Len(@appid) > 0)
+	Begin
+
+		-- Get Accessory Page ID
+		Select @BaseAccPageID = dbo.vefn_RofstDataCleanUnitInfoTags(Concat(d.dbiAP, '-', @appid), 1)
+		From RofstDatabase d with (NoLock) 
+		Where d.RofstID = @RofstID And d.dbiID = @dbiID;
+	
+		Select @DefaultValues = dbo.vefn_RofstDataReplaceVars(@value);
+	
+		If (PatIndex('%=%', @DefaultValues) > 0)
+			Begin
+				
+				-- Insert Rofst Default Values (Multi-Values) --> [Roid = (16) Digits]
+				Select @DefaultValues = Replace(@DefaultValues, '{', ''); 
+
+				With ChildrenValues as 
+				(
+					Select x.ListPosition as 'OffsetIndex', 
+						Case When (PatIndex('%=%', x.ListValue) > 0) Then Right(x.ListValue, Len(x.ListValue)-PatIndex('%=%', x.ListValue)) Else x.ListValue End as 'DefaultValue'
+					From [dbo].[vefn_ParseStringListToTable](@DefaultValues, '}') x
+					Where Len(x.ListValue) > 0
+				)
+				Insert Into RofstDefaultValue (RofstID, roid, [value], AccPageID) 
+				Select @RofstID as 'RofstID',
+					Concat(@roid, re.RoidExt) as 'roid',
+					Case When (Len(RTrim(LTrim(cv.DefaultValue))) > 0 ) Then dbo.vefn_RofstDataCleanUnitInfoTags(cv.DefaultValue, 0) Else '[TBD]' End as 'value',
+					Concat(@BaseAccPageID, '.', re.AccPageExt) as 'AccPageID'
+				From ChildrenValues cv
+					inner join vwRofstData_RofstExtensions re on re.Offset = cv.OffsetIndex
+				Order By cv.OffsetIndex Asc
+
+			End
+		Else
+			Begin
+
+				-- Insert Rofst Default Value (Single Value) --> [Roid = (16) Digits]
+				Insert Into RofstDefaultValue (RofstID, roid, [value], AccPageID) 
+				Select @RofstID as 'RofstID',
+					Concat(@roid, re.RoidExt) as 'roid',
+					Case When (Len(RTrim(LTrim(@DefaultValues))) > 0 ) Then dbo.vefn_RofstDataCleanUnitInfoTags(@DefaultValues, 0) Else '[TBD]' End as 'value',
+					Concat(@BaseAccPageID, '.', re.AccPageExt) as 'AccPageID'
+				From vwRofstData_RofstExtensions re 
+				Where re.Offset = 1;
+
+			End
+
+	End -- (Len(@appid) > 0)
+
+
+	Return;
+
+End
+Go
+
+IF (@@Error = 0) PRINT 'Procedure Creation: [vesp_RofstChildInsert] Succeeded'
+ELSE PRINT 'Procedure Creation: [vesp_RofstChildInsert] Error on Creation'
+GO
+	
+
+
+
+
 If Exists(SELECT * FROM sys.objects Where name = 'vefn_RofstDataReplaceVars' AND type in (N'FN'))
 DROP FUNCTION [dbo].[vefn_RofstDataReplaceVars]
 GO
@@ -21462,6 +21632,124 @@ GO
 	ELSE PRINT 'Function Creation: [vefn_RofstDataCleanUnitInfoTags] Error on Creation'
 	GO
 
+
+
+	If Exists(SELECT * FROM sys.objects Where name = 'vesp_RofstChildInsert' AND type in (N'P'))
+	DROP PROCEDURE [dbo].[vesp_RofstChildInsert]
+	GO
+
+	SET ANSI_NULLS ON
+	GO
+	SET QUOTED_IDENTIFIER ON
+	GO
+	
+	/*****************************************************************************
+	   Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
+		   Copyright 2020 - Volian Enterprises, Inc. All rights reserved.
+	*****************************************************************************/
+	/*
+	==========================================================================================================
+	 Author:		Jake Ropar
+	 Create Date:	03/24/2022
+	 Description:	Inserts the RO Child object and associated return values
+	==========================================================================================================
+	 */
+	Create Procedure [dbo].[vesp_RofstChildInsert]
+	(
+		@RofstID Int,
+		@ID Int,
+		@ParentID Int,
+		@dbiID Int,
+		@type Int,
+		@title VarChar(Max),
+		@roid VarChar(50),
+		@appid VarChar(Max) = null,
+		@value VarChar(Max) = null,
+		@missingDefaultValue VarChar(Max) = null
+	)
+	With Execute as Owner
+	As
+	Begin
+
+		Declare @BaseAccPageID VarChar(Max) = null;
+		Declare @DefaultValues VarChar(Max);
+
+		Declare @RoidExt VarChar(Max);
+		Declare @AccPageExt VarChar(Max);
+
+		-- Default missing value if Null (Null values not allowed for the [value] field in the RofstDefaultValue table
+		if (DataLength(IsNull(@missingDefaultValue, '')) <= 0)
+			Set @missingDefaultValue = '[TBD]';
+
+		-- Create Rofst Child/Group Record --> [Roid = (12) Digits]
+		Insert Into RofstChild (RofstID, ID, ParentID, dbiID, [type], title, roid, appid, [value])
+		Values (@RofstID, @ID, @ParentID, @dbiID, @type, @title, @roid, @appid, @value);
+
+
+		-- Check for appid, if exists, then insert the default value for each return type if multi-value
+		If (Len(@appid) > 0)
+		Begin
+
+			-- Get Accessory Page ID
+			Select @BaseAccPageID = dbo.vefn_RofstDataCleanUnitInfoTags(Concat(d.dbiAP, '-', @appid), 1)
+			From RofstDatabase d with (NoLock) 
+			Where d.RofstID = @RofstID And d.dbiID = @dbiID;
+	
+			Select @DefaultValues = dbo.vefn_RofstDataReplaceVars(@value);
+
+			If (PatIndex('%=%', @DefaultValues) > 0)
+				Begin
+				
+					-- Insert Rofst Default Values (Multi-Values) --> [Roid = (16) Digits]
+					Select @DefaultValues = Replace(@DefaultValues, '{', ''); 
+
+					With ChildrenValues as 
+					(
+						Select x.ListPosition as 'OffsetIndex', 
+							Case When (PatIndex('%=%', x.ListValue) > 0) Then Right(x.ListValue, Len(x.ListValue)-PatIndex('%=%', x.ListValue)) Else x.ListValue End as 'DefaultValue'
+						From [dbo].[vefn_ParseStringListToTable](@DefaultValues, '}') x
+						Where Len(x.ListValue) > 0
+					)
+					Insert Into RofstDefaultValue (RofstID, roid, [value], AccPageID) 
+					Select @RofstID as 'RofstID',
+						Concat(@roid, re.RoidExt) as 'roid',
+						Case When (DataLength(cv.DefaultValue) > 0) Then dbo.vefn_RofstDataCleanUnitInfoTags(cv.DefaultValue, 0) Else @missingDefaultValue End as 'value',
+						Concat(@BaseAccPageID, '.', re.AccPageExt) as 'AccPageID'
+					From ChildrenValues cv
+						inner join vwRofstData_RofstExtensions re on re.Offset = cv.OffsetIndex
+					Order By cv.OffsetIndex Asc
+
+				End
+			Else
+				Begin
+
+					-- Insert Rofst Default Value (Single Value) --> [Roid = (16) Digits]
+					Insert Into RofstDefaultValue (RofstID, roid, [value], AccPageID) 
+					Select @RofstID as 'RofstID',
+						Concat(@roid, re.RoidExt) as 'roid',
+						Case When (DataLength(@DefaultValues) > 0) Then dbo.vefn_RofstDataCleanUnitInfoTags(@DefaultValues, 0) Else @missingDefaultValue End as 'value',
+						Concat(@BaseAccPageID, '.', re.AccPageExt) as 'AccPageID'
+					From vwRofstData_RofstExtensions re 
+					Where re.Offset = 1;
+
+				End
+
+		End -- (Len(@appid) > 0)
+
+
+		Return;
+
+	End
+	Go
+
+	
+
+	IF (@@Error = 0) PRINT 'Procedure Creation: [vesp_RofstChildInsert] Succeeded'
+	ELSE PRINT 'Procedure Creation: [vesp_RofstChildInsert] Error on Creation'
+	GO
+
+
+
 /*
 ==========================================================================================================
  End: B2022-124: [JPR] Blank RO Values (All Spaces) printing as ?
@@ -23844,8 +24132,8 @@ BEGIN TRY -- Try Block
 	DECLARE @RevDate varchar(255)
 	DECLARE @RevDescription varchar(255)
 
-	set @RevDate = '4/03/2025 6:14 PM'
+	set @RevDate = '10/28/2024 11:24'
-	set @RevDescription = 'B2022-031 Add filtering for Proc and Section name from Global Search'
+	set @RevDescription = 'Add the ability for PROMS to remember the procedure tabs that were open when you closed PROMS'
 
 	Select  cast(@RevDate as datetime) RevDate, @RevDescription  RevDescription
 	PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription

PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs

@@ -42,7 +42,7 @@ namespace VEPROMS
             this.btnGeneral = new DevComponents.DotNetBar.ButtonX();
             this.tcSysOpts = new DevComponents.DotNetBar.TabControl();
             this.tabControlPanel3 = new DevComponents.DotNetBar.TabControlPanel();
-            //this.grPanUCFImpOpt = new DevComponents.DotNetBar.Controls.GroupPanel(); // C2024-041 remove from  Options panel in V button.
+            this.grPanUCFImpOpt = new DevComponents.DotNetBar.Controls.GroupPanel();
             this.cbUCFLForSetOnly = new DevComponents.DotNetBar.Controls.CheckBoxX();
             this.cbUCFLUseAll = new DevComponents.DotNetBar.Controls.CheckBoxX();
             this.cbUCFLOnlyImport = new DevComponents.DotNetBar.Controls.CheckBoxX();
@@ -86,7 +86,7 @@ namespace VEPROMS
             ((System.ComponentModel.ISupportInitialize)(this.tcSysOpts)).BeginInit();
             this.tcSysOpts.SuspendLayout();
             this.tabControlPanel3.SuspendLayout();
-            //this.grPanUCFImpOpt.SuspendLayout(); // C2024-041 remove from  Options panel in V button.
+            this.grPanUCFImpOpt.SuspendLayout();
             this.gpVisioPath.SuspendLayout();
             this.gpSeparateWindows.SuspendLayout();
             this.gpEnhancedDocs.SuspendLayout();
@@ -305,7 +305,7 @@ namespace VEPROMS
             // 
             this.tabControlPanel3.Controls.Add(this.gpOpenTabs);
             this.tabControlPanel3.Controls.Add(this.gpShwRplWords);
-            //this.tabControlPanel3.Controls.Add(this.grPanUCFImpOpt); // C2024-041 remove from  Options panel in V button.
+            this.tabControlPanel3.Controls.Add(this.grPanUCFImpOpt);
             this.tabControlPanel3.Controls.Add(this.gpVisioPath);
             this.tabControlPanel3.Controls.Add(this.gpSeparateWindows);
             this.tabControlPanel3.Controls.Add(this.gpEnhancedDocs);
@@ -334,50 +334,48 @@ namespace VEPROMS
             // 
             // grPanUCFImpOpt
             // 
-            // C2024-041 remove from  Options panel in V button.
+            this.grPanUCFImpOpt.CanvasColor = System.Drawing.SystemColors.Control;
-            /*this.grPanUCFImpOpt.CanvasColor = System.Drawing.SystemColors.Control; 
+            this.grPanUCFImpOpt.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-                this.grPanUCFImpOpt.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; // C2024-041 remove from  Options panel in V button.
+            this.grPanUCFImpOpt.Controls.Add(this.cbUCFLForSetOnly);
-                this.grPanUCFImpOpt.Controls.Add(this.cbUCFLForSetOnly); // C2024-041 remove from  Options panel in V button.
+            this.grPanUCFImpOpt.Controls.Add(this.cbUCFLUseAll);
-                this.grPanUCFImpOpt.Controls.Add(this.cbUCFLUseAll); // C2024-041 remove from  Options panel in V button.
+            this.grPanUCFImpOpt.Controls.Add(this.cbUCFLOnlyImport);
-                this.grPanUCFImpOpt.Controls.Add(this.cbUCFLOnlyImport);
+            this.grPanUCFImpOpt.Controls.Add(this.cbUCFLNotUsed);
-                this.grPanUCFImpOpt.Controls.Add(this.cbUCFLNotUsed);
+            this.grPanUCFImpOpt.Controls.Add(this.cbUCFIgnore);
-                this.grPanUCFImpOpt.Controls.Add(this.cbUCFIgnore);
+            this.grPanUCFImpOpt.DisabledBackColor = System.Drawing.Color.Empty;
-                this.grPanUCFImpOpt.DisabledBackColor = System.Drawing.Color.Empty;
+            this.grPanUCFImpOpt.Location = new System.Drawing.Point(313, 12);
-                this.grPanUCFImpOpt.Location = new System.Drawing.Point(313, 12);
+            this.grPanUCFImpOpt.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
-                this.grPanUCFImpOpt.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.grPanUCFImpOpt.Name = "grPanUCFImpOpt";
-                this.grPanUCFImpOpt.Name = "grPanUCFImpOpt";
+            this.grPanUCFImpOpt.Size = new System.Drawing.Size(146, 138);
-                this.grPanUCFImpOpt.Size = new System.Drawing.Size(146, 138);
             // 
             // 
             // 
-                this.grPanUCFImpOpt.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+            this.grPanUCFImpOpt.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-                this.grPanUCFImpOpt.Style.BackColorGradientAngle = 90;
+            this.grPanUCFImpOpt.Style.BackColorGradientAngle = 90;
-                this.grPanUCFImpOpt.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+            this.grPanUCFImpOpt.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-                this.grPanUCFImpOpt.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.grPanUCFImpOpt.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
-                this.grPanUCFImpOpt.Style.BorderBottomWidth = 1;
+            this.grPanUCFImpOpt.Style.BorderBottomWidth = 1;
-                this.grPanUCFImpOpt.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.grPanUCFImpOpt.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-                this.grPanUCFImpOpt.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.grPanUCFImpOpt.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
-                this.grPanUCFImpOpt.Style.BorderLeftWidth = 1;
+            this.grPanUCFImpOpt.Style.BorderLeftWidth = 1;
-                this.grPanUCFImpOpt.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.grPanUCFImpOpt.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
-                this.grPanUCFImpOpt.Style.BorderRightWidth = 1;
+            this.grPanUCFImpOpt.Style.BorderRightWidth = 1;
-                this.grPanUCFImpOpt.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.grPanUCFImpOpt.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
-                this.grPanUCFImpOpt.Style.BorderTopWidth = 1;
+            this.grPanUCFImpOpt.Style.BorderTopWidth = 1;
-                this.grPanUCFImpOpt.Style.CornerDiameter = 4;
+            this.grPanUCFImpOpt.Style.CornerDiameter = 4;
-                this.grPanUCFImpOpt.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+            this.grPanUCFImpOpt.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
-                this.grPanUCFImpOpt.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+            this.grPanUCFImpOpt.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
-                this.grPanUCFImpOpt.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.grPanUCFImpOpt.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-                this.grPanUCFImpOpt.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+            this.grPanUCFImpOpt.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
             // 
             // 
             // 
-                this.grPanUCFImpOpt.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.grPanUCFImpOpt.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             // 
             // 
             // 
-                this.grPanUCFImpOpt.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.grPanUCFImpOpt.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-                this.grPanUCFImpOpt.TabIndex = 12;
+            this.grPanUCFImpOpt.TabIndex = 12;
-                this.grPanUCFImpOpt.Text = "UCF Import Options"; 
+            this.grPanUCFImpOpt.Text = "UCF Import Options";
-            */ // C2024-041 remove from  Options panel in V button.
             // 
             // cbUCFLForSetOnly
             // 
@@ -1265,7 +1263,7 @@ namespace VEPROMS
             ((System.ComponentModel.ISupportInitialize)(this.tcSysOpts)).EndInit();
             this.tcSysOpts.ResumeLayout(false);
             this.tabControlPanel3.ResumeLayout(false);
-            //this.grPanUCFImpOpt.ResumeLayout(false); // C2024-041 remove from  Options panel in V button.
+            this.grPanUCFImpOpt.ResumeLayout(false);
             this.gpVisioPath.ResumeLayout(false);
             this.gpSeparateWindows.ResumeLayout(false);
             this.gpEnhancedDocs.ResumeLayout(false);
@@ -1325,8 +1323,8 @@ namespace VEPROMS
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbSeparateWindows;
 		private DevComponents.DotNetBar.Controls.GroupPanel gpVisioPath;
 		private DevComponents.DotNetBar.Controls.TextBoxX txbxVisioPath;
-        //private DevComponents.DotNetBar.Controls.GroupPanel grPanUCFImpOpt;  // C2024-041 remove from  Options panel in V button.
+		private DevComponents.DotNetBar.Controls.GroupPanel grPanUCFImpOpt;
-        private DevComponents.DotNetBar.Controls.CheckBoxX cbUCFLForSetOnly;
+		private DevComponents.DotNetBar.Controls.CheckBoxX cbUCFLForSetOnly;
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbUCFLUseAll;
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbUCFLOnlyImport;
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbUCFLNotUsed;

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -2118,45 +2118,24 @@ 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);
-			// btnAdmin.SubItems.Add(btnFormats); // C2024 - 041 remove from Admin(V button) menu
+			btnAdmin.SubItems.Add(btnFormats);
-			btnAdmin.SubItems.Add(btnUpdateFormats); // C2024 - 041 remove from Admin(V button) menu
 			btnUserControlOfFormats = new ButtonItem("btnUserControlOfFormats", "User Control of Formats");
-			//btnFormats.SubItems.Add(btnUpdateFormats);
+			btnFormats.SubItems.Add(btnUpdateFormats);
-			//btnFormats.SubItems.Add(btnUserControlOfFormats);  // C2024-041 remove from Admin (V button) menu
+			btnFormats.SubItems.Add(btnUserControlOfFormats);
 			btnUserControlOfFormats.Click += new EventHandler(btnUserControlOfFormats_Click);
 			btnUserControlOfFormatsExport = new ButtonItem("btnUserControlOfFormatsExport", "Export User Control of Formats");
-			//btnFormats.SubItems.Add(btnUserControlOfFormatsExport); // C2024-041 remove from Admin (V button) menu
+			btnFormats.SubItems.Add(btnUserControlOfFormatsExport);
 			btnUserControlOfFormatsExport.Click += new EventHandler(btnUserControlOfFormatsExport_Click);
 			btnUserControlOfFormatsImport = new ButtonItem("btnUserControlOfFormatsImport", "Import User Control of Formats");
-			//btnFormats.SubItems.Add(btnUserControlOfFormatsImport); // C2024-041 remove from Admin (V button) menu
+			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);
 
-
 			//added by jcb: menu item to reset security requires password to implement
 			btnResetSecurity = new ButtonItem("btnResetSecurity", "Reset Security");
 			btnSecurity.SubItems.Add(btnResetSecurity);

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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
+        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
-        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
+        KlsrMj4F87CzOXgTJfijUPN6sor2DhshBoI9pTJt9YQ4HD83jiPNQ/WcaWfgT+8j8kvEB1/FWLBTlcCV
-        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
+        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
-        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
+        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
-        dBGICBYUs3JquKg2dfO5qza6JncY9WuMLKp0f4tlAg+r7cxvCquye03wa0WQV9BrARVti8h+lWGfxuC8
+        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
-        StfYbiZQ/HSU2Q3B9GpqeDIkaJbDvPwYQppO8GVB5fOcRp9Ho0POAtyvGMS1KnD+FjiCGhNLGhdvpxpU
+        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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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
+        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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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
-        24WslzGQmc5DcvMhhFVvcKrciy1UHVbe2ocdvOyxAACb9lnTDJKLldhticKeFh6O6khk6b1I1w5DoO7H
+        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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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
-        QSh0TYhKyhlJEF7U/stbGs79nQErgUzDjUtVWDhJhCcsOt0THCmwLI3g+pL+n/cLizaROFBwAHwAAAAA
+        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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/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+      iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAANUlEQVR4nGNgoBR8ahL8jw1/bBTooMiAT8Qa8gmPAUQZ8n+Z3n9KMMOoAf9Hw0CPCmEw4AAA71z+QhwwNhoAAAAASUVORK5CYII=
-        YQUAAAAJcEhZcwAACxMAAAsTAQCanBgAAAA0SURBVDhPY2CgFHxqEvyPDX9sFOhAV4sVoGsk2RB0TeiY
+    </value>
-        oCH/l+n9pwSPGjBqAHUMGHAAAO9c/kJD+HpiAAAAAElFTkSuQmCC
-</value>
   </data>
+
   <data name="btnShowPrtFld.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+      iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAANUlEQVR4nGNgoBR8ahL8jw1/bBTooMiAT8Qa8gmPAUQZ8n+Z3n9KMMOoAf9Hw0CPCmEw4AAA71z+QhwwNhoAAAAASUVORK5CYII=
-        YQUAAAAJcEhZcwAACxMAAAsTAQCanBgAAAA0SURBVDhPY2CgFHxqEvyPDX9sFOhAV4sVoGsk2RB0TeiY
+    </value>
-        oCH/l+n9pwSPGjBqAHUMGHAAAO9c/kJD+HpiAAAAAElFTkSuQmCC
-</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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
+        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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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
-        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,162 +229,208 @@
   <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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
-        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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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
-        3FKIL2+HysTtu3WMzOYgV3NDmDj9EG/LUCLoWRpYeg/8kwFeZLUZZWQfeJUz4DywmQe2ClqvA+DOkxBf
+        vUQTgzXY0doOTHDN/1tEQEI3qsDwE+A2Y70z1zQTjJB7/D8Ik0kyRWHxgObPXSvwXuWliW9/2cQ7p+dh
-        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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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
-        uTJz5DOwhmYLShw6CM7ULthCS0ZlqgYcNfRMSmaOPQYurKMVQolD1TXrAbeV26oV3IHaE0+xfu69nSsz
+        6lTYRRcii4LTrzJ672sDaxkD/KptFwioaThmXcQ9co86iCeivuOF4tfae18bWM8Y4CfVH1RTP+PacF0n
-        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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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
+        wHbGwGFegWJpwtbOj2vfNn0SfU9xCgvtfq+8gSO8/sSSSEf8mj4a6BZ9WdzPfruBImeAV6BYZQNd4+8x
-        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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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
-        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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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
+        aA+okHhQJU1Aw+NHC1zGYMdx1GRaoUi7HHfi/GFqeTQr1JXoRgrxeLmAsSERH1v9UZm6EBlnVtOHrgN4
-        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
+        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
-        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
+        jvTt64GBEOA9mQQyZJqDBJ8JLyXt7ZLxWQSqilyQE7UKd2+cpAKVwAcq0kVGgbTft8RFnwn7Am2p0vPH
-        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
+        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
-        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
+        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
-        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
+        sWZpXNdJJdke0Gm2oa02mPbvcFoEZBJMcexK0CkZyGPNCt29hgq4gY5SDPafpfF7AlVkEkySrx3LsOWx
-        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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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
+        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
-        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
+        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
-        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
+        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
-        psS6mgW9+vm/U68BFAW31CsIbKlS+muz0MmGtJG6ZI9py85R7dg+Uottfjps9lFDrPEwZplzR2Y5dH9r
+        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
-        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
+        Cc760qwZakj31ECsyAAEgwKvdqBEkD2jIzI9OymT0Eak0AhrKaXV1hZYZd3LVHmJv1UqAEF2ZqbRToaQ
-        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
+        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
-        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
+        5EqsUH+8ckSLUgFIddHw2euqDplHRyQ662G7kxESaZjETReUDOKVHUfJMFAGIXXTofMMEWJngizuCiWk
-        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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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
+        6YpYFyNsFZkgznsICrYvhsTfrXkNLQBIpn67F1njTaY/KnLXQn46nK/iw/VU1Nw5hNoHx/DuvASxU7UQ
-        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
+        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
-        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
+        jOWUAkEcX08QYag6F43qy0l8JVUXkxAvpHvbVpvL+iRtFT5QSnWP8jkAE7ax7C535eO7R3R8gMbXt9Hw
-        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
+        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
-        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
+        vZOpWNMzgiBXGl+StK9ucaCGn2k4ra/2QQ5Kj23F/nmTxWzWnwKsntxHK8TFqvTR3mV4J1uC95nLUJ69
-        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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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
+        WMATqsgJhPxUKE+i+nIiT6Pm5j7q/VzgD1eSOWBVcSQKE4Kwy2sM//RUAaDBUoMFrWGTr4f5r7pi/uMu
-        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
+        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
-        SJ3iyJ0MKZVQKrP/TdW+P12pkcQ9EiugVIXfUZW/mKrzO1n3hVPh85kvAIyCNOSmk1ow7LAlfr90ZtxN
+        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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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
-        v1q6uNXQaWgVut0OSACFbwNg+4720vOalvkY297G4h8VdBpSibWjChuXarq61wiwrh41zEtowMa5Gqvh
+        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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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
-        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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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
-        zFtxRM6obRZIV+ToJATunMZ7cA5/HpmHr2Augbtn0EbhVQS6Bwxqnhm4fAZtYRC57+QskOGT0Riorkv0
+        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
-        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
+        K+9jun/6BP8PC6ku1liR7ZzmMyG12IcxDpGzave7qOBxirK3XFhDa0M5XTX59BYuY/CXePp+jqW99hxV
-        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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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
+        JNPD/xWM+AqpObmOnrtbZcZS6E+ntSiGtF3J7CvxcKwiwHHh1b+CKUuQNiOwZWSyMulHHpR9QWh0L7w9
-        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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="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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
-        CSgkHtB4SkxwXsKhSyVHvyETAbMBQ0vy8chiwmCxEb78HAbskIsYZA9H3PGAJhrsVMngNWYjfMiFYNVq
+        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
-        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
+        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
-        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
+        0jQVbhaY8aS8BB+bGlnAj1cSxm/72X7M34sQyeZBaQG6stPhlgvxAI8hFf1FM/C8wo53aysxduIIC6Tr
-        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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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
+        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
-        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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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
 </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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
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJuAAASbgHMBsReAAACg0lE
-        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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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
-        /Pjx/7Rp0/6npqb+9g8MfGTr4NhoZWsnitOA2tpau23btl28cvUq2P/37t37P2fOnP/t7R3/W9va/7t5
+        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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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
+        gg==
 </value>
   </data>
   <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

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

@@ -194,23 +194,6 @@ namespace VEPROMS.CSLA.Library
 
 	public partial class AnnotationAuditInfoList
 	{
-
-		/// <summary>
-		/// C2024- 038 - Summary of Changes report generation enhancements
-		/// Constructor - takes a Generic list of AnnotationAuditInfo
-		/// and creates a AnnotationAuditInfoList
-		/// </summary>
-		public AnnotationAuditInfoList(List<AnnotationAuditInfo> lst)
-		{
-			IsReadOnly = false;
-			if (lst != null)
-			{
-				foreach (AnnotationAuditInfo itm in lst)
-					this.Add(itm);
-			}
-			IsReadOnly = true;
-		}
-
 		/// <summary>
 		/// Return a list of all AnnotationAuditInfo by ItemID.
 		/// </summary>
@@ -504,23 +487,6 @@ namespace VEPROMS.CSLA.Library
 
 	public partial class ContentAuditInfoList
 	{
-
-		/// <summary>
-		/// C2024- 038 - Summary of Changes report generation enhancements
-		/// Constructor - takes a Generic list of ContentAuditInfo
-		/// and creates a ContentAuditInfoList
-		/// </summary>
-		public ContentAuditInfoList(List<ContentAuditInfo> lst)
-		{
-			IsReadOnly = false;
-			if (lst != null)
-			{
-				foreach (ContentAuditInfo itm in lst)
-					this.Add(itm);
-			}
-			IsReadOnly = true;
-		}
-
 		/// <summary>
 		/// Return a list of all ContentAuditInfo by ContentID.
 		/// </summary>

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

@@ -19,7 +19,6 @@ using System.Drawing;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Text.RegularExpressions;
-using System.Linq;
 
 namespace VEPROMS.CSLA.Library
 {
@@ -144,8 +143,6 @@ namespace VEPROMS.CSLA.Library
 		}
 		#endregion
 		#region SortingChildren
-		private static bool IsInManualOrderNullFix = false;
-
 		[NonSerialized]
 		public Csla.SortedBindingList<FolderInfo> _SortedChildFolders;
 		public Csla.SortedBindingList<FolderInfo> SortedChildFolders
@@ -154,29 +151,6 @@ namespace VEPROMS.CSLA.Library
 			{
 				if (ChildFolders != null)
 				{
-					//B2025-018 Issues with folder order in tree view
-					// if any ChildFolders with a missing Manual Order
-					// set them to the end of the list
-					// use IsInManualOrderNullFix - so, if setting ChildFolders Currently, 
-					// do not try to set them (thus creating an infinite loop)
-					if (!IsInManualOrderNullFix && ChildFolders.Any(x => x.ManualOrder == null))
-					{
-						IsInManualOrderNullFix = true;
-						foreach (FolderInfo fi in ChildFolders.Where(x => x.ManualOrder == null))
-						{
-							using (FolderInfo parfolderinfo = FolderInfo.Get(fi.ParentID))
-							{
-								using (Folder fldr = fi.Get())
-								{
-									fldr.ManualOrder = parfolderinfo.NewManualOrder(9999);
-									fldr.Save();
-								}
-							}
-						}
-						RefreshChildFolders();
-						IsInManualOrderNullFix = false;
-					}
-
 					if (_SortedChildFolders == null)
 					{
 						_SortedChildFolders = new SortedBindingList<FolderInfo>(ChildFolders);
@@ -192,10 +166,6 @@ namespace VEPROMS.CSLA.Library
 				return _SortedChildFolders;
 			}
 		}
-
-		//B2025-018 Issues with folder order in tree view
-		//Note: this should be called from the parent item
-		//As you want to put this into the sorted order of the parent item
 		public double? NewManualOrder(int index)
 		{
 			double? retval = 1;
@@ -204,27 +174,13 @@ namespace VEPROMS.CSLA.Library
 			else if (index == 0)
 			{
 				if (retval >= SortedChildFolders[index].ManualOrder) // If one is too big, then divide first value in half
-					retval = SortedChildFolders[index].ManualOrder / 2.0;
+					retval = SortedChildFolders[index].ManualOrder / 2;
 			}
 			else if (SortedChildFolders.Count > index)
 			{
-				//B2025-018 Issues with folder order in tree view
+				retval += SortedChildFolders[index - 1].ManualOrder; // Just go to the next whole number
-				//filter to just items with the same parent
+				if (retval >= SortedChildFolders[index].ManualOrder)
-				//want new order to be halfway between the previous item
+					retval = (SortedChildFolders[index - 1].ManualOrder + SortedChildFolders[index].ManualOrder) / 2;
-				//and the next ManualOrder
-				var tmp = SortedChildFolders.Where(x => x.ParentID == FolderID);
-				var lbound = SortedChildFolders[index - 1].ManualOrder;
-				var ubound = tmp.OrderBy(y => y.ManualOrder).FirstOrDefault(x => x.ManualOrder > lbound)?.ManualOrder;
-				if (ubound != null)
-				{
-					retval = ((ubound - lbound) / 2.0) + lbound;
-				}
-				else
-				{
-					//in this case, item before is highest for that parent
-					//so just make this 1 more
-					retval = lbound + 1;
-				}
 			}
 			else
 			{

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

@@ -805,21 +805,7 @@ namespace VEPROMS.CSLA.Library
 							}
  						}
 					}
-					// B2025-020 Null Reference fix. Added check for valid index into the TransitionTypeList
+
-					if (!forceConvertToText)
-					{
-						if (traninfo.TranType >= itemInfo.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList.Count)
-						{
-							forceConvertToText = true;
-							TranFixCount++;
-							itemInfo.MyContent.FixTransitionText(traninfo, itemInfo, "Reason for Change: Transition type is not available");
-							using (Content content = Content.Get(itemInfo.MyContent.ContentID)) 
-							{
-								content.FixTransitionText(traninfo, true);
-								content.Save();
-							}
-						}
-					}
 					if (!forceConvertToText)
 					{
 						if (itemInfo.MyProcedure.ItemID != traninfo.MyItemToID.MyProcedure.ItemID)  //different proc
@@ -6942,11 +6928,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);
@@ -6985,13 +6971,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
@@ -7035,14 +7014,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;
@@ -7066,7 +7044,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);

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/Generated/Folder.cs

@@ -769,15 +769,6 @@ namespace VEPROMS.CSLA.Library
             tmp.MyParent = myParent;
             tmp.Name = name;
             tmp.ShortName = shortName;
-
-            //B2025-018 Issues with folder order in tree view
-            //if no manual order is set, add it at the end
-            if (myParent != null)
-            {
-                using (FolderInfo parfolderinfo = FolderInfo.Get(myParent.FolderID))
-                    tmp.ManualOrder = parfolderinfo.NewManualOrder(9999);
-            }
-
             return tmp;
         }
         public static Folder New(Folder myParent, Connection myConnection, string name, string title, string shortName, Format myFormat, double? manualOrder, string config, DateTime dts, string usrID)
@@ -793,15 +784,6 @@ namespace VEPROMS.CSLA.Library
             tmp.Config = config;
             tmp.DTS = dts;
             tmp.UsrID = usrID;
-
-            //B2025-018 Issues with folder order in tree view
-            //if no manual order is set, add it at the end
-            if (myParent != null && manualOrder == null)
-            {
-                using (FolderInfo parfolderinfo = FolderInfo.Get(myParent.FolderID))
-                    tmp.ManualOrder = parfolderinfo.NewManualOrder(9999);
-            }
-
             return tmp;
         }
         public static Folder MakeFolder(Folder myParent, Connection myConnection, string name, string title, string shortName, Format myFormat, double? manualOrder, string config, DateTime dts, string usrID)
@@ -831,15 +813,6 @@ namespace VEPROMS.CSLA.Library
             tmp.MyFormat = myFormat;
             tmp.ManualOrder = manualOrder;
             tmp.Config = config;
-
-            //B2025-018 Issues with folder order in tree view
-            //if no manual order is set, add it at the end
-            if (myParent != null && manualOrder == null)
-            {
-                using (FolderInfo parfolderinfo = FolderInfo.Get(myParent.FolderID))
-                    tmp.ManualOrder = parfolderinfo.NewManualOrder(9999);
-            }
-
             return tmp;
         }
         public static Folder MakeFolder(Folder myParent, Connection myConnection, string name, string title, string shortName, Format myFormat, double? manualOrder, string config)

PROMS/Volian.Controls.Library/DisplayHistory.cs

@@ -10,7 +10,6 @@ using System.IO;
 using System.Text.RegularExpressions;
 using JR.Utils.GUI.Forms;
 using Volian.Base.Library;
-using System.Linq;
 
 namespace Volian.Controls.Library
 {
@@ -164,7 +163,7 @@ namespace Volian.Controls.Library
 						else
 						{
 							DateTime revDate;
-							if (!DateTime.TryParse(cfg.Print_RevDate, out revDate)) revDate = MyProcedureInfo.ChangeBarDate;    // DateTime.Now;
+							if (!DateTime.TryParse(cfg.Print_RevDate, out revDate)) revDate = MyProcedureInfo.ChangeBarDate;	// DateTime.Now;
 							SetRevDate(revDate);
 							//SetRevDate(DateTime.Parse(cfg.Print_RevDate));
 						}
@@ -264,7 +263,7 @@ namespace Volian.Controls.Library
 					{
 						AnnotationTypeInfo ati = AnnotationTypeInfo.Get(aai.TypeID);
 						// B2023-066: Crash when trying to access a deleted annotation type (added the ati==null check)
-						tn = annotationDeleted.Nodes.Add(ati == null ? "Deleted Annotation Type" : ati.Name);
+						tn = annotationDeleted.Nodes.Add(ati==null?"Deleted Annotation Type":ati.Name);
 					}
 					TreeNode cn = tn.Nodes.Add(aai.ListString());
 					cn.Tag = aai;
@@ -518,7 +517,7 @@ namespace Volian.Controls.Library
 					if (delC.Type >= 0 && delC.Type < 1000)
 					{
 						int indx = delC.Config.IndexOf("DelProcReason");
-						if (indx >= 0 && delC.Config.Length > indx + 15)        // 15 accounts for 'DelProcReason = "'
+						if (indx >= 0 && delC.Config.Length > indx+15)		// 15 accounts for 'DelProcReason = "'
 						{
 							string reason = delC.Config.Substring(indx + 15);
 							if (reason != null && reason.Length > 0)
@@ -530,7 +529,7 @@ namespace Volian.Controls.Library
 						}
 					}
 				}
-				TreeNode tnn = deletedItems.Nodes.Add(iai.ToString() + "; Reason: " + strR);
+				TreeNode tnn = deletedItems.Nodes.Add(iai.ToString()+"; Reason: " + strR);
 				tnn.Tag = iai;
 				#endregion
 			}
@@ -559,7 +558,7 @@ namespace Volian.Controls.Library
 			if (MyProcedureInfo == null)
 			{
 				this.ParentForm.Cursor = Cursors.Default;
-				btnViewSummaryReport.Enabled = btnViewChronologyReport.Enabled = cbSumExcludeAnn.Enabled = DT_SumAsOf.Enabled = lbChanges.Items.Count > 0;
+				btnViewSummaryReport.Enabled = btnViewChronologyReport.Enabled = lbChanges.Items.Count > 0;
 				return;
 			}
 			ContentAuditInfoList cail2;
@@ -587,7 +586,7 @@ namespace Volian.Controls.Library
 				// B2020-156: When procedure title is changed, it does not print in Summary/Chronolgy of changes.
 				//		Need to only check the date (not the date/time) for some procedures, the original item was listed 
 				//		in the list box and should not be because some MyRevDate's did not have time included.
-				if (CompareDateOrDateTime(cai.DTS, MyRevDate) || cai.ActionWhen > MyRevDate)
+				if (CompareDateOrDateTime(cai.DTS,MyRevDate) || cai.ActionWhen > MyRevDate)
 				{
 					string itemTitle = FixPath(cai.Path);
 					lbChanges.Items.Add(cai);
@@ -615,7 +614,7 @@ namespace Volian.Controls.Library
 			}
 			//Console.WriteLine("WalkProcedure fini:  {0} seconds", TimeSpan.FromTicks(DateTime.Now.Ticks - start.Ticks).TotalSeconds);
 			this.ParentForm.Cursor = Cursors.Default;
-			btnViewSummaryReport.Enabled = btnViewChronologyReport.Enabled = cbSumExcludeAnn.Enabled = DT_SumAsOf.Enabled = lbChanges.Items.Count > 0;
+			btnViewSummaryReport.Enabled = btnViewChronologyReport.Enabled = lbChanges.Items.Count > 0;
 			RefreshRequired = false;
 			return;
 		}
@@ -649,73 +648,9 @@ namespace Volian.Controls.Library
 			//_AnnotationList = AnnotationAuditInfoList.GetChronology(0, 0, MyProcedureInfo.ChangeBarDate);
 			//added setting selected slave in order for reports to replace unit number,etc jcb 20101010
 			MyItemInfo.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = ApplDisplayMode;
-
+			//			OnSummaryPrintRequest(new DisplayHistoryReportEventArgs(Volian.Base.Library.VlnSettings.TemporaryFolder + @"\MySummary.pdf", MyItemInfo.MyProcedure, _SummaryAuditList, _AnnotationList));
-			var dhr = new DisplayHistoryReportEventArgs(string.Format(@"{0}\{1} Summary of Changes.pdf", Volian.Base.Library.VlnSettings.TemporaryFolder, MyItemInfo.MyProcedure.PDFNumber), MyItemInfo.MyProcedure, null, null);
+			OnSummaryPrintRequest(new DisplayHistoryReportEventArgs(string.Format(@"{0}\{1} Summary of Changes.pdf", Volian.Base.Library.VlnSettings.TemporaryFolder, MyItemInfo.MyProcedure.PDFNumber), MyItemInfo.MyProcedure, _SummaryAuditList, _AnnotationList));
-
+			//}
-			//C2024- 038 - Summary of Changes report generation enhancements
-			//check if need to modify
-			// _SummaryAuditList
-			if (DT_SumAsOf.Checked)
-				dhr.AuditList = FilterSummaryByDate(_SummaryAuditList, DT_SumAsOf.Value);
-			else
-				dhr.AuditList = _SummaryAuditList;
-
-			//C2024- 038 - Summary of Changes report generation enhancements
-			// if Exclude Annotations Checked
-			// send an empty list instead of 
-			//_AnnotationList
-			if (cbSumExcludeAnn.Checked)
-				dhr.AnnotationList = new AnnotationAuditInfoList(null);
-			else if (DT_SumAsOf.Checked)
-				dhr.AnnotationList = FilterSummaryByDate_Annotations(_AnnotationList, DT_SumAsOf.Value);
-			else
-			{ dhr.AnnotationList = _AnnotationList; }
-
-			OnSummaryPrintRequest(dhr);
-		}
-
-		//C2024- 038 - Summary of Changes report generation enhancements
-		//modify _SummaryAuditList
-		//to limit to a specific date
-		private ContentAuditInfoList FilterSummaryByDate(ContentAuditInfoList summaryAuditList, DateTime value)
-		{
-			List<ContentAuditInfo> slst = summaryAuditList.Clone().ToList();
-
-			//Grab the first change to each item before the date and set that to the AsOf date
-			foreach (ContentAuditInfo firstbeforedate in slst.GroupBy(x => x.ItemID).Select(x => x.OrderByDescending(y => y.DTS).FirstOrDefault(d => d.DTS < value)))
-			{
-				if (firstbeforedate != null && firstbeforedate.ActionWhat != "Deleted")
-				{
-					firstbeforedate.ActionWhat = $"As Of: {value.ToShortDateString()}";
-				}
-			}
-			//remove all items before the date we are checking against
-			//note that for deleted - sometimes the DTS is not correct and
-			//need to use the ActionWhen
-			slst.RemoveAll(x => x.DTS < value && !x.ActionWhat.StartsWith("As Of:") && (x.ActionWhat != "Deleted" || (x.ActionWhen < x.DTS ? x.DTS : x.ActionWhen) < value));
-
-            //remove all items where first text matches the last text
-            //unless it was added after the date we are checking against
-            //or the last item is a deletion that occurred after 
-			//the date we are checking against
-            var itms = slst.Select(x => x.ItemID).Distinct().ToList();
-				foreach (int itmID in itms)
-				{
-					ContentAuditInfo first = slst.Where(i => i.ItemID == itmID).OrderBy(y => y.DTS).FirstOrDefault();
-					ContentAuditInfo last = slst.Where(i => i.ItemID == itmID).OrderByDescending(y => y.DTS).FirstOrDefault();
-					if (first != null && last != null && first.DTS < value && (last.ActionWhat != "Deleted" || (last.ActionWhen < last.DTS ? last.DTS : last.ActionWhen) < value) && ItemInfo.ConvertToDisplayText(first.Text) == ItemInfo.ConvertToDisplayText(last.Text))
-						slst.RemoveAll(x => x.ItemID == itmID);
-				}
-
-			return new ContentAuditInfoList(slst);
-		}
-
-		//C2024- 038 - Summary of Changes report generation enhancements
-		//modify _SummaryAuditList
-		//to limit to a specific date
-		private AnnotationAuditInfoList FilterSummaryByDate_Annotations(AnnotationAuditInfoList annotationAuditList, DateTime value)
-		{
-			return new AnnotationAuditInfoList(annotationAuditList.Where(x => x.DTS >= value).ToList());
 		}
 		private void btnRefresh_Click(object sender, EventArgs e)
 		{
@@ -1125,7 +1060,7 @@ namespace Volian.Controls.Library
 			set { _AuditList = value; }
 		}
 		private AnnotationAuditInfoList _AnnotationList;
-        public AnnotationAuditInfoList AnnotationList
+		public AnnotationAuditInfoList AnnotationList
 		{
 			get { return _AnnotationList; }
 			set { _AnnotationList = value; }

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

@@ -2057,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
 						}
 					}
@@ -2104,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
 												   //}
@@ -2147,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/Volian.Controls.Library.csproj

@@ -443,9 +443,6 @@
       <DependentUpon>DisplayBookMarks.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="DisplayHistory.resx">
-      <DependentUpon>DisplayHistory.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="DisplayLibDocs.resx">
       <DependentUpon>DisplayLibDocs.cs</DependentUpon>
       <SubType>Designer</SubType>

PROMS/Volian.Controls.Library/vlnTreeView.cs

@@ -983,22 +983,19 @@ namespace Volian.Controls.Library
 									SectionInfo si2 = (tn as VETreeNode).VEObject as SectionInfo;
 									if (si2.MyDocVersion.MultiUnitCount > 1)
 									{
-										if (!si2.IsSubsection)
+										MenuItem mps = new MenuItem("Print Section");
+										int k = 0;
+										foreach (string s in si2.MyDocVersion.UnitNames)
 										{
-											MenuItem mps = new MenuItem("Print Section");
+											k++;
-											int k = 0;
+											MenuItem mp = mps.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
-											foreach (string s in si2.MyDocVersion.UnitNames)
+											mp.Tag = k;
-											{
-												k++;
-												MenuItem mp = mps.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
-												mp.Tag = k;
-											}
-											cm.MenuItems.Add(mps);
 										}
+										cm.MenuItems.Add(mps);
 									}
 									else
 									{
-										if(!si2.IsSubsection) cm.MenuItems.Add("Print Section", new EventHandler(mi_Click));
+										cm.MenuItems.Add("Print Section", new EventHandler(mi_Click));
 									}
 								}
 							}
@@ -2815,27 +2812,23 @@ namespace Volian.Controls.Library
 						int f2 = -1;
 						string uniquename = _LastFolderInfo.MyParent.UniqueChildName("New Folder");
 						int myindex = SelectedNode.Index + ((newtype == MenuSelections.FolderAfter) ? 1 : 0);
-						//B2025-018 Issues with folder order in tree view
+						FolderInfo parfolderinfo = FolderInfo.Get(parentfolder.FolderID);
-						//since before/after folder is at same level as current folder
+						double? myorder = parfolderinfo.NewManualOrder(myindex); 
-						//so need to use the parents order to determine where to place it
+						using (Folder folder = Folder.MakeFolder(parentfolder.MyParent, parentfolder.MyConnection, uniquename, string.Empty, "Short Name", null, myorder, string.Empty, DateTime.Now, VlnSettings.UserID))
-						using (FolderInfo parfolderinfo = FolderInfo.Get(parentfolder.MyParent.FolderID))
+						{
-						{ double? myorder = parfolderinfo.NewManualOrder(myindex);
+							ShowBrokenRules(folder.BrokenRulesCollection);
-							using (Folder folder = Folder.MakeFolder(parentfolder.MyParent, parentfolder.MyConnection, uniquename, string.Empty, "Short Name", null, myorder, string.Empty, DateTime.Now, VlnSettings.UserID))
+							SetLastValues(FolderInfo.Get(folder.FolderID));
+							if (OnNodeOpenProperty(this, new vlnTreePropertyEventArgs(uniquename, folder.FolderConfig)) == DialogResult.OK)
 							{
-								ShowBrokenRules(folder.BrokenRulesCollection);
+								folder.Save();
-								SetLastValues(FolderInfo.Get(folder.FolderID));
+								tn = new VETreeNode((IVEDrillDownReadOnly)_LastFolderInfo);
-								if (OnNodeOpenProperty(this, new vlnTreePropertyEventArgs(uniquename, folder.FolderConfig)) == DialogResult.OK)
+								if (newtype == MenuSelections.FolderBefore) SelectedNode.Parent.Nodes.Insert(SelectedNode.Index, tn);
-								{
+								if (newtype == MenuSelections.FolderAfter) SelectedNode.Parent.Nodes.Insert(SelectedNode.Index + 1, tn);
-									folder.Save();
-									tn = new VETreeNode((IVEDrillDownReadOnly)_LastFolderInfo);
-									if (newtype == MenuSelections.FolderBefore) SelectedNode.Parent.Nodes.Insert(SelectedNode.Index, tn);
-									if (newtype == MenuSelections.FolderAfter) SelectedNode.Parent.Nodes.Insert(SelectedNode.Index + 1, tn);
-								}
-								else
-									f2 = folder.FolderID;
 							}
-							if (f2 != -1) Folder.Delete(f2);
+							else
+								f2 = folder.FolderID;
 						}
+						if (f2 != -1) Folder.Delete(f2);
 					}
 				}
 			}

PROMS/Volian.Print.Library/PDFChronologyReport.cs

@@ -1090,7 +1090,7 @@ namespace Volian.Print.Library
 										firstCAI = null;
 										lastCAI = null;
 									}
-									else if (firstCAI.ActionWhat == lastCAI.ActionWhat || firstCAI.ActionWhat.StartsWith("As Of:"))
+									else if (firstCAI.ActionWhat == lastCAI.ActionWhat)
 									{
 										auditList1.Add(firstCAI);
 										auditList1.Add(lastCAI);
@@ -1153,7 +1153,7 @@ namespace Volian.Print.Library
 						firstCAI = null;
 						lastCAI = null;
 					}
-					else if (firstCAI.ActionWhat == lastCAI.ActionWhat || firstCAI.ActionWhat.StartsWith("As Of:"))
+					else if (firstCAI.ActionWhat == lastCAI.ActionWhat)
 					{
 						auditList1.Add(firstCAI);
 						auditList1.Add(lastCAI);

PROMS/Volian.Print.Library/VlnSvgPageHelper.cs

@@ -1761,16 +1761,6 @@ i = 0;
 				case "[HEADER4]":
 				case "{HEADER5}":
 				case "[HEADER5]":
-				case "{HEADER6}":
-				case "[HEADER6]":
-				case "{HEADER7}":
-				case "[HEADER7]":
-				case "{HEADER8}":
-				case "[HEADER8]":
-				case "{HEADER9}":
-				case "[HEADER9]":
-				case "{HEADER10}":
-				case "[HEADER10]":
 				case "{BOX1}":
 				case "[BOX1]":
 				case "{BOX2}":
@@ -2109,12 +2099,7 @@ i = 0;
 				case "[UNITNUMBER]":
 					string unbr = MySection.MyDocVersion.DocVersionConfig.Unit_Number;
 					if (MySection.ActiveFormat.PlantFormat.FormatData.PrintData.PrintCommonForZeroUnit && unbr == "0")
-					{ 
+						plstr = "COMMON"; // for Comanche Peak, replace "Unit 0" with "COMMON"
-						if (String.IsNullOrEmpty(MySection.MyDocStyle.AltMultiUnitWording))
-							plstr = "COMMON"; // for Comanche Peak, replace "Unit 0" with "COMMON"
-						else
-							plstr = MySection.MyDocStyle.AltMultiUnitWording; // for Comanche Peak Abnormal, replace "Unit 0" with "UNIT 1 AND 2"
-					}
 					else
 						plstr = plstr.Replace(token, unbr);
 					break;

PROMS/Volian.Print.Library/vlnParagraph.cs

@@ -647,10 +647,8 @@ namespace Volian.Print.Library
 				}
 				if (MyItemInfo.IsHigh)
 				{
-					// C2025-014 change the zoom setting on the bookmark of a step from FITBH to FITV so that instead of zooming in
-					//           on the step it will zoom to the page level ( like it does when you select a bookmark on a section.
 					MyPageHelper.PageBookmarks.Add(MyItemInfo, (MyItemInfo.MyTab == null) ? "" : MyItemInfo.MyTab.CleanText + " " + MyItemInfo.DisplayText,
-						new PdfDestination(PdfDestination.FITV, yLocation + YVeryTop - YTopMost + SixLinesPerInch));
+						new PdfDestination(PdfDestination.FITBH, yLocation + YVeryTop - YTopMost + SixLinesPerInch));
 				}
 			}
 			if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.WolfcreekCKLFormat)
@@ -6199,12 +6197,6 @@ namespace Volian.Print.Library
 							XOffset += (float)formatInfo.PlantFormat.FormatData.SectData.MetaSectionList[level].SecTitlePositionAdj;
 							XOffset -= xMetaAdj;
 						}
-
-						if (itemInfo.MyDocStyle.SectTitleOffsetOverride != null)
-                        {
-							XOffset += (float)itemInfo.MyDocStyle.SectTitleOffsetOverride;
-						}
-
 					}
 				}
 				else if (formatInfo.PlantFormat.FormatData.SectData.SectionHeader.Just == "PSCenter")