Development

good for testing phase

PROMS/SQL/ClientSpecific/BNPP_CoverPageConsolidation.sql

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

PROMS/SQL/ClientSpecific/BNPP_CoverPageConsolidation_Test.sql

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

PROMS/VEPROMS User Interface/PROMSFixes.Sql

@@ -24753,7 +24753,7 @@ BEGIN
 	  select Docs.DocID, UnitID, SectionID = MIN(SectionID)
 	  FROM
 	  (SELECT DISTINCT [DocID]
-	  FROM [VEPROMS_Barakah].[dbo].[tblDocuments]) Docs
+	  FROM [tblDocuments]) Docs
 	  INNER JOIN Entries on Docs.DocID = Entries.DocID
 	  INNER JOIN Contents on Entries.ContentID = Contents.ContentID
 	  inner join Items on Items.ContentID = Contents.ContentID

PROMS/VEPROMS User Interface/dlgExportImport.cs

@@ -947,14 +947,16 @@ namespace VEPROMS
 						pi = AddProcedure(xd.DocumentElement, dvi, pi);
 						GC.Collect(); // need to cleanup memory after importing each procedure due to use of Regular Expressions in processing RO and Transition links
 					}
-					DirectoryInfo di = new DirectoryInfo(PEIPath);
-					DirectoryInfo[] dis = di.GetDirectories();
-					for (int d = 0; d < dis.Length; d++)
-						dis[d].Delete(true);
 					lblImportStatus.Text = "Updating Transitions";
 					AddTransitions();
 					FixFloatingFoldouts();
 					SaveTransitionAndItemContentIDs();
+					// B2026-034 remove the folders created from un-ziping the import set file - this was done prior to updating transitions
+					//           so if there was an issue deleting these temporay folders and files, the actual importing will be completed
+					DirectoryInfo di = new DirectoryInfo(PEIPath);
+					DirectoryInfo[] dis = di.GetDirectories();
+					for (int d = 0; d < dis.Length; d++)
+						dis[d].Delete(true);
 					return true;
 				}
 			}

PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs

@@ -1317,11 +1317,12 @@
             this.swRegenWordAttmts.Name = "swRegenWordAttmts";
             this.swRegenWordAttmts.Size = new System.Drawing.Size(91, 22);
             this.swRegenWordAttmts.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.superTooltip1.SetSuperTooltip(this.swRegenWordAttmts, new DevComponents.DotNetBar.SuperTooltipInfo("Generate Word Attachments", "", resources.GetString("swRegenWordAttmts.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 200)));
+            this.superTooltip1.SetSuperTooltip(this.swRegenWordAttmts, new DevComponents.DotNetBar.SuperTooltipInfo("Generate Word Attachments", "", resources.GetString("swRegenWordAttmts.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 250)));
             this.swRegenWordAttmts.SwitchClickTogglesValue = true;
             this.swRegenWordAttmts.TabIndex = 34;
             this.swRegenWordAttmts.Value = true;
             this.swRegenWordAttmts.ValueObject = "Y";
+            this.swRegenWordAttmts.ValueChanged += new System.EventHandler(this.swCk_ValueChanged);
             // 
             // labelX1
             // 
@@ -1334,7 +1335,7 @@
             this.labelX1.Location = new System.Drawing.Point(107, 150);
             this.labelX1.Name = "labelX1";
             this.labelX1.Size = new System.Drawing.Size(186, 22);
-            this.superTooltip1.SetSuperTooltip(this.labelX1, new DevComponents.DotNetBar.SuperTooltipInfo("Generate Word Attachments", "", resources.GetString("labelX1.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 200)));
+            this.superTooltip1.SetSuperTooltip(this.labelX1, new DevComponents.DotNetBar.SuperTooltipInfo("Generate Word Attachments", "", resources.GetString("labelX1.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 250)));
             this.labelX1.TabIndex = 33;
             this.labelX1.Text = "Generate Missing Word Attachments";
             // 

PROMS/VEPROMS User Interface/frmBatchRefresh.resx

@@ -121,15 +121,15 @@
     <value>17, 17</value>
   </metadata>
   <data name="swRegenWordAttmts.SuperTooltip" xml:space="preserve">
-    <value>When Word attachments are modified and saved, PROMS will create a PDF of the attachment contents and save it in the database.  When this is done, all the of the RO references are resolved as well as pagination of the attachment.  This speeds up the overall printing of the procedure in that PROMS simply inserts the attachment contents. Certain actions like loading a new RO.FST require that these PDFs be regenerated which is normally done at print time.
+    <value>When Word attachments are modified and saved, PROMS will create a PDF of the attachment contents and save it in the database.  When this is done, all of the RO references are resolved as well as pagination of the attachment.  This speeds up the overall printing of the procedure in that PROMS simply inserts the attachment contents. Certain actions like loading a new RO.FST require that these PDFs be regenerated which is normally done at print time.
 
-This function will generate (and save) any missing saved attachment PDFS stored in the database (not the PDFs of the entire procedure that you had previous printed).  This will cause printing to be faster when you print after this as the PDFs will be pre-genrated in those cases (and thus not require regeneration unless changes were made to the Word Sections or ROs after running this).
+This function will generate (and save) any missing saved attachment PDFs stored in the database (not the PDFs of the entire procedure that you had previous printed).  This will cause printing to be faster when you print after this as the PDFs will be pre-genrated in those cases (and thus not require regeneration unless changes were made to the Word Sections or ROs after running this).
 </value>
   </data>
   <data name="labelX1.SuperTooltip" xml:space="preserve">
-    <value>When Word attachments are modified and saved, PROMS will create a PDF of the attachment contents and save it in the database.  When this is done, all the of the RO references are resolved as well as pagination of the attachment.  This speeds up the overall printing of the procedure in that PROMS simply inserts the attachment contents. Certain actions like loading a new RO.FST require that these PDFs be regenerated which is normally done at print time.
+    <value>When Word attachments are modified and saved, PROMS will create a PDF of the attachment contents and save it in the database.  When this is done, all of the RO references are resolved as well as pagination of the attachment.  This speeds up the overall printing of the procedure in that PROMS simply inserts the attachment contents. Certain actions like loading a new RO.FST require that these PDFs be regenerated which is normally done at print time.
 
-This function will generate (and save) any missing saved attachment PDFS stored in the database (not the PDFs of the entire procedure that you had previous printed).  This will cause printing to be faster when you print after this as the PDFs will be pre-genrated in those cases (and thus not require regeneration unless changes were made to the Word Sections or ROs after running this).
+This function will generate (and save) any missing saved attachment PDFs stored in the database (not the PDFs of the entire procedure that you had previous printed).  This will cause printing to be faster when you print after this as the PDFs will be pre-genrated in those cases (and thus not require regeneration unless changes were made to the Word Sections or ROs after running this).
 </value>
   </data>
   <data name="swRefreshTblsForSrch.SuperTooltip" xml:space="preserve">
@@ -183,7 +183,7 @@ RO paths, ROFST versions, and the contents of RO figures are stored in the datab
 Be sure  a current backup exists prior to running this function!!</value>
   </data>
   <data name="swRefreshWordAttmts.SuperTooltip" xml:space="preserve">
-    <value>When Word attachments are modified and saved, PROMS will create a PDF of the attachment contents and save it in the database.  When this is done, all the of the RO references are resolved as well as pagination of the attachment.  This speeds up the overall printing of the procedure in that PROMS simply inserts the attachment contents.
+    <value>When Word attachments are modified and saved, PROMS will create a PDF of the attachment contents and save it in the database.  When this is done, all of the RO references are resolved as well as pagination of the attachment.  This speeds up the overall printing of the procedure in that PROMS simply inserts the attachment contents.
 
 This function will remove all of the saved attachment PDFS stored in the database (not the PDFs of the entire procedure that you had previous printed).  This will force PROMS to regenerate (and save) the word attachment PDFs the next time the procedure is printed.
 </value>
@@ -202,9 +202,9 @@ RO paths, ROFST versions, and the contents of RO figures are stored in the datab
 Be sure  a current backup exists prior to running this function!!</value>
   </data>
   <data name="labelX5.SuperTooltip" xml:space="preserve">
-    <value>When Word attachments are modified and saved, PROMS will create a PDF of the attachment contents and save it in the database.  When this is done, all the of the RO references are resolved as well as pagination of the attachment.  This speeds up the overall printing of the procedure in that PROMS simply inserts the attachment contents.
+    <value>When Word attachments are modified and saved, PROMS will create a PDF of the attachment contents and save it in the database.  When this is done, all of the RO references are resolved as well as pagination of the attachment.  This speeds up the overall printing of the procedure in that PROMS simply inserts the attachment contents.
 
-This function will remove all of the saved attachment PDFS stored in the database (not the PDFs of the entire procedure that you had previous printed).  This will force PROMS to regenerate (and save) the word attachment PDFs the next time the procedure is printed.
+This function will remove all of the saved attachment PDFs stored in the database (not the PDFs of the entire procedure that you had previous printed).  This will force PROMS to regenerate (and save) the word attachment PDFs the next time the procedure is printed.
 </value>
   </data>
   <data name="labelX9.SuperTooltip" xml:space="preserve">

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

@@ -49,7 +49,7 @@ namespace Volian.Controls.Library
 			this.btnApplicabilitychg.Size = new System.Drawing.Size(80, 22);
 			this.btnApplicabilitychg.Margin = new System.Windows.Forms.Padding(2);
 			this.btnApplicabilitychg.RightToLeft = System.Windows.Forms.RightToLeft.No;
-			this.superTooltip1.SetSuperTooltip(this.btnApplicabilitychg, new DevComponents.DotNetBar.SuperTooltipInfo("Change applicability settings - All At Level", "", "When clicked, all steps at the level of the current step will have their applicability settings changed.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+			this.superTooltip1.SetSuperTooltip(this.btnApplicabilitychg, new DevComponents.DotNetBar.SuperTooltipInfo("Change applicability settings - All At Level", "", "When clicked, all steps at the level of the current step will have their applicability settings changed. Note that for two column procedures, the left column and right column are handled separately.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
 			this.btnApplicabilitychg.TabIndex = 0;
 			this.btnApplicabilitychg.Text = "Set All at Level";
 			this.btnApplicabilitychg.ColorTable = DevComponents.DotNetBar.eButtonColor.BlueOrb;

PROMS/Volian.Controls.Library/DisplayRO.cs

@@ -1164,12 +1164,21 @@ namespace Volian.Controls.Library
 			tbROValue.Text = null;
 			lbROId.Text = string.Empty;
 
-			// Disable all buttons by default
-			btnGoToRO.Enabled = false;
+			// Disable all buttons by default			
 			btnSaveRO.Enabled = false;
 			btnCancelRO.Enabled = false;
 			btnPreviewRO.Enabled = false;
-		}
+
+            //B2026-030 GoTo sometimes requires being pressed twice
+            if (MyUserInfo != null && MyDvi != null && selectedChld.value != null)
+            {
+                btnGoToRO.Enabled = UserInfo.CanEditROs(MyUserInfo, MyDvi);  // Writers and Reviewers cannot edit ROs (run the RO Editor)
+            }
+			else
+			{
+                btnGoToRO.Enabled = false;
+            }
+        }
 
 		#endregion
 	}

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

@@ -94,15 +94,6 @@ 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.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel();
-			this.btnTranCvtSelToTxt = new System.Windows.Forms.Button();
-			this.lblIncTran = new System.Windows.Forms.Label();
-			this.btnTranCvtAllToTxt = new System.Windows.Forms.Button();
-			this.lblSrchIncTran = new System.Windows.Forms.Label();
-			this.groupBox1 = new System.Windows.Forms.GroupBox();
-			this.rbFromEditor = new System.Windows.Forms.RadioButton();
-			this.rbFromTree = new System.Windows.Forms.RadioButton();
-			this.tabIncTrans = new DevComponents.DotNetBar.TabItem(this.components);
 			this.contextMenuBar1 = new DevComponents.DotNetBar.ContextMenuBar();
 			this.btnCMIFindText = new DevComponents.DotNetBar.ButtonItem();
 			this.btnCMEdit = new DevComponents.DotNetBar.ButtonItem();
@@ -121,6 +112,15 @@ namespace Volian.Controls.Library
 			this.btnAND = new DevComponents.DotNetBar.ButtonItem();
 			this.btnOR = new DevComponents.DotNetBar.ButtonItem();
 			this.btnNOT = new DevComponents.DotNetBar.ButtonItem();
+			this.tabIncTrans = 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();
+			this.btnTranCvtAllToTxt = new System.Windows.Forms.Button();
+			this.lblSrchIncTran = new System.Windows.Forms.Label();
+			this.groupBox1 = new System.Windows.Forms.GroupBox();
+			this.rbFromEditor = new System.Windows.Forms.RadioButton();
+			this.rbFromTree = new System.Windows.Forms.RadioButton();
 			this.advTreeProcSets = new DevComponents.AdvTree.AdvTree();
 			this.elementStyle1 = new DevComponents.DotNetBar.ElementStyle();
 			this.node1 = new DevComponents.AdvTree.Node();
@@ -168,9 +168,9 @@ namespace Volian.Controls.Library
 			this.tabControlPanel3.SuspendLayout();
 			this.gpSrchAnnoText.SuspendLayout();
 			this.panel4.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.contextMenuBar1)).BeginInit();
 			this.tabControlPanel1.SuspendLayout();
 			this.groupBox1.SuspendLayout();
-			((System.ComponentModel.ISupportInitialize)(this.contextMenuBar1)).BeginInit();
 			((System.ComponentModel.ISupportInitialize)(this.advTreeProcSets)).BeginInit();
 			((System.ComponentModel.ISupportInitialize)(this.advTreeStepTypes)).BeginInit();
 			this.grpPanSearchResults.SuspendLayout();
@@ -197,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(317, 147);
 			this.tabSearchTypes.Style = DevComponents.DotNetBar.eTabStripStyle.Office2007Document;
 			this.tabSearchTypes.TabIndex = 0;
 			this.tabSearchTypes.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox;
@@ -221,7 +221,7 @@ namespace Volian.Controls.Library
 			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.Size = new System.Drawing.Size(317, 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;
@@ -245,7 +245,7 @@ namespace Volian.Controls.Library
 			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.Size = new System.Drawing.Size(293, 91);
 			// 
 			// 
 			// 
@@ -286,7 +286,7 @@ namespace Volian.Controls.Library
 			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.Size = new System.Drawing.Size(287, 23);
 			this.panel1.TabIndex = 5;
 			// 
 			// cbxTextSearchText
@@ -298,10 +298,10 @@ namespace Volian.Controls.Library
 			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.Location = new System.Drawing.Point(36, 0);
 			this.cbxTextSearchText.Margin = new System.Windows.Forms.Padding(2);
 			this.cbxTextSearchText.Name = "cbxTextSearchText";
-			this.cbxTextSearchText.Size = new System.Drawing.Size(217, 22);
+			this.cbxTextSearchText.Size = new System.Drawing.Size(251, 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)));
@@ -319,7 +319,7 @@ namespace Volian.Controls.Library
 			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.label1.Size = new System.Drawing.Size(36, 21);
 			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:";
@@ -336,7 +336,7 @@ namespace Volian.Controls.Library
 			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.Size = new System.Drawing.Size(287, 65);
 			this.panel3.TabIndex = 6;
 			// 
 			// cbxByWord
@@ -468,7 +468,7 @@ namespace Volian.Controls.Library
 			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.cbxSrchTypeUsage.Size = new System.Drawing.Size(315, 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";
@@ -495,7 +495,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(317, 113);
 			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;
@@ -533,7 +533,7 @@ namespace Volian.Controls.Library
 			this.pnlTranCategory.Margin = new System.Windows.Forms.Padding(2);
 			this.pnlTranCategory.Name = "pnlTranCategory";
 			this.pnlTranCategory.Padding = new System.Windows.Forms.Padding(1);
-			this.pnlTranCategory.Size = new System.Drawing.Size(275, 21);
+			this.pnlTranCategory.Size = new System.Drawing.Size(315, 21);
 			this.pnlTranCategory.TabIndex = 2;
 			// 
 			// cbxTranCategory
@@ -542,7 +542,7 @@ namespace Volian.Controls.Library
 			this.cbxTranCategory.Location = new System.Drawing.Point(57, 1);
 			this.cbxTranCategory.Margin = new System.Windows.Forms.Padding(2);
 			this.cbxTranCategory.Name = "cbxTranCategory";
-			this.cbxTranCategory.Size = new System.Drawing.Size(215, 21);
+			this.cbxTranCategory.Size = new System.Drawing.Size(255, 21);
 			this.cbxTranCategory.TabIndex = 1;
 			this.cbxTranCategory.WatermarkText = "Select Category of Transitions";
 			// 
@@ -567,7 +567,7 @@ namespace Volian.Controls.Library
 			this.pnlTranFormat.Margin = new System.Windows.Forms.Padding(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.Size = new System.Drawing.Size(315, 21);
 			this.pnlTranFormat.TabIndex = 1;
 			// 
 			// cbxTranFormat
@@ -576,7 +576,7 @@ namespace Volian.Controls.Library
 			this.cbxTranFormat.Location = new System.Drawing.Point(57, 1);
 			this.cbxTranFormat.Margin = new System.Windows.Forms.Padding(2);
 			this.cbxTranFormat.Name = "cbxTranFormat";
-			this.cbxTranFormat.Size = new System.Drawing.Size(215, 21);
+			this.cbxTranFormat.Size = new System.Drawing.Size(255, 21);
 			this.cbxTranFormat.TabIndex = 1;
 			this.cbxTranFormat.WatermarkText = "Select Style of Transitions";
 			// 
@@ -601,7 +601,7 @@ namespace Volian.Controls.Library
 			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.Size = new System.Drawing.Size(315, 21);
 			this.pnlTranVersion.TabIndex = 0;
 			// 
 			// cbxTranVersion
@@ -610,7 +610,7 @@ namespace Volian.Controls.Library
 			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.Size = new System.Drawing.Size(260, 21);
 			this.cbxTranVersion.TabIndex = 1;
 			this.cbxTranVersion.WatermarkText = "Select Format for Transitions";
 			// 
@@ -643,7 +643,7 @@ 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(317, 113);
 			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;
@@ -666,7 +666,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(315, 91);
 			// 
 			// 
 			// 
@@ -767,7 +767,7 @@ namespace Volian.Controls.Library
 			this.cmboTreeROs.Margin = new System.Windows.Forms.Padding(2);
 			this.cmboTreeROs.Name = "cmboTreeROs";
 			this.cmboTreeROs.RightToLeft = System.Windows.Forms.RightToLeft.No;
-			this.cmboTreeROs.Size = new System.Drawing.Size(275, 20);
+			this.cmboTreeROs.Size = new System.Drawing.Size(315, 20);
 			this.superTooltip1.SetSuperTooltip(this.cmboTreeROs, new DevComponents.DotNetBar.SuperTooltipInfo("Select the RO to Search", "", "Select the Referenced Object to search for.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
 			this.cmboTreeROs.TabIndex = 1;
 			this.cmboTreeROs.ThemeAware = true;
@@ -791,7 +791,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(317, 113);
 			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;
@@ -814,7 +814,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(315, 89);
 			// 
 			// 
 			// 
@@ -858,7 +858,7 @@ namespace Volian.Controls.Library
 			this.panel4.Location = new System.Drawing.Point(0, 0);
 			this.panel4.Margin = new System.Windows.Forms.Padding(2);
 			this.panel4.Name = "panel4";
-			this.panel4.Size = new System.Drawing.Size(269, 62);
+			this.panel4.Size = new System.Drawing.Size(309, 62);
 			this.panel4.TabIndex = 9;
 			// 
 			// cbxRnoOnlyAnnot
@@ -905,7 +905,7 @@ namespace Volian.Controls.Library
 			this.cbxCaseSensitiveAnnoText.Margin = new System.Windows.Forms.Padding(2);
 			this.cbxCaseSensitiveAnnoText.Name = "cbxCaseSensitiveAnnoText";
 			this.cbxCaseSensitiveAnnoText.RightToLeft = System.Windows.Forms.RightToLeft.No;
-			this.cbxCaseSensitiveAnnoText.Size = new System.Drawing.Size(92, 15);
+			this.cbxCaseSensitiveAnnoText.Size = new System.Drawing.Size(109, 17);
 			this.superTooltip1.SetSuperTooltip(this.cbxCaseSensitiveAnnoText, new DevComponents.DotNetBar.SuperTooltipInfo("Case Sensitive", "", "When this box is checked, Search will find only exact mactches of the search text" +
             " you had entered.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100)));
 			this.cbxCaseSensitiveAnnoText.TabIndex = 5;
@@ -920,11 +920,11 @@ namespace Volian.Controls.Library
 			this.cbxTextSearchAnnotation.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
 			this.cbxTextSearchAnnotation.FormattingEnabled = true;
 			this.cbxTextSearchAnnotation.ItemHeight = 16;
-			this.cbxTextSearchAnnotation.Location = new System.Drawing.Point(30, 0);
+			this.cbxTextSearchAnnotation.Location = new System.Drawing.Point(36, 0);
 			this.cbxTextSearchAnnotation.Margin = new System.Windows.Forms.Padding(2);
 			this.cbxTextSearchAnnotation.Name = "cbxTextSearchAnnotation";
 			this.cbxTextSearchAnnotation.RightToLeft = System.Windows.Forms.RightToLeft.No;
-			this.cbxTextSearchAnnotation.Size = new System.Drawing.Size(239, 22);
+			this.cbxTextSearchAnnotation.Size = new System.Drawing.Size(273, 22);
 			this.superTooltip1.SetSuperTooltip(this.cbxTextSearchAnnotation, new DevComponents.DotNetBar.SuperTooltipInfo("Search For Annotaion Text", "", "Enter Annotation text to search for or select from the dropdown list.\r\n\r\nLeave Bl" +
             "ank to search for occurences of the selected annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 140)));
 			this.cbxTextSearchAnnotation.TabIndex = 6;
@@ -943,7 +943,7 @@ namespace Volian.Controls.Library
 			this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
 			this.label2.Name = "label2";
 			this.label2.Padding = new System.Windows.Forms.Padding(0, 5, 0, 0);
-			this.label2.Size = new System.Drawing.Size(30, 18);
+			this.label2.Size = new System.Drawing.Size(36, 21);
 			this.label2.TabIndex = 7;
 			this.label2.Text = "Find:";
 			// 
@@ -960,7 +960,7 @@ namespace Volian.Controls.Library
 			this.cbxAnnoTypes.Margin = new System.Windows.Forms.Padding(2);
 			this.cbxAnnoTypes.Name = "cbxAnnoTypes";
 			this.cbxAnnoTypes.RightToLeft = System.Windows.Forms.RightToLeft.No;
-			this.cbxAnnoTypes.Size = new System.Drawing.Size(275, 22);
+			this.cbxAnnoTypes.Size = new System.Drawing.Size(315, 22);
 			this.superTooltip1.SetSuperTooltip(this.cbxAnnoTypes, new DevComponents.DotNetBar.SuperTooltipInfo("Select Annotation Type", "", "Select the type of annotation to search for.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(192, 61)));
 			this.cbxAnnoTypes.TabIndex = 0;
 			this.cbxAnnoTypes.WatermarkText = "Select AnnotationType to Search";
@@ -974,118 +974,6 @@ namespace Volian.Controls.Library
 			this.tabAnnotationSearch.Text = "Annotations";
 			this.tabAnnotationSearch.Click += new System.EventHandler(this.tabAnnotationSearch_Click);
 			// 
-			// tabControlPanel1
-			// 
-			this.tabControlPanel1.Controls.Add(this.btnTranCvtSelToTxt);
-			this.tabControlPanel1.Controls.Add(this.lblIncTran);
-			this.tabControlPanel1.Controls.Add(this.btnTranCvtAllToTxt);
-			this.tabControlPanel1.Controls.Add(this.lblSrchIncTran);
-			this.tabControlPanel1.Controls.Add(this.groupBox1);
-			this.tabControlPanel1.DisabledBackColor = System.Drawing.Color.Empty;
-			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.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;
-			this.tabControlPanel1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
-			this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
-            | DevComponents.DotNetBar.eBorderSide.Bottom)));
-			this.tabControlPanel1.Style.GradientAngle = 90;
-			this.tabControlPanel1.TabIndex = 17;
-			this.tabControlPanel1.TabItem = this.tabIncTrans;
-			this.tabControlPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(( System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-			this.tabControlPanel1.RightToLeft = System.Windows.Forms.RightToLeft.No;
-			// 
-			// btnTranCvtSelToTxt
-			// 
-			this.btnTranCvtSelToTxt.Enabled = false;
-			this.btnTranCvtSelToTxt.Location = new System.Drawing.Point(121, 63);
-			this.btnTranCvtSelToTxt.Name = "btnTranCvtSelToTxt";
-			this.btnTranCvtSelToTxt.Size = new System.Drawing.Size(145, 22);
-			this.superTooltip1.SetSuperTooltip(this.btnTranCvtSelToTxt, new DevComponents.DotNetBar.SuperTooltipInfo("Convert Selected Incoming Transitions To Text", "", "Converts selected transitions in the results list to text unless the user does no" +
-            "t have permission to change text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 90)));
-			this.btnTranCvtSelToTxt.TabIndex = 3;
-			this.btnTranCvtSelToTxt.Text = "Convert Selected To Text";
-			this.btnTranCvtSelToTxt.UseVisualStyleBackColor = true;
-			this.btnTranCvtSelToTxt.Click += new System.EventHandler(this.btnTranCvtSelToTxt_Click);
-			// 
-			// lblIncTran
-			// 
-			this.lblIncTran.AutoSize = true;
-			this.lblIncTran.Location = new System.Drawing.Point(4, 9);
-			this.lblIncTran.Name = "lblIncTran";
-			this.lblIncTran.Size = new System.Drawing.Size(23, 13);
-			this.lblIncTran.TabIndex = 2;
-			this.lblIncTran.Text = "To:";
-			// 
-			// btnTranCvtAllToTxt
-			// 
-			this.btnTranCvtAllToTxt.Enabled = false;
-			this.btnTranCvtAllToTxt.Location = new System.Drawing.Point(6, 63);
-			this.btnTranCvtAllToTxt.Name = "btnTranCvtAllToTxt";
-			this.btnTranCvtAllToTxt.Size = new System.Drawing.Size(109, 22);
-			this.superTooltip1.SetSuperTooltip(this.btnTranCvtAllToTxt, new DevComponents.DotNetBar.SuperTooltipInfo("Convert All Incoming Transitions To Text", "", "Converts all of the transitions in the results list to text unless the user does " +
-            "not have permission to change text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 90)));
-			this.btnTranCvtAllToTxt.TabIndex = 1;
-			this.btnTranCvtAllToTxt.Text = "Convert All To Text";
-			this.btnTranCvtAllToTxt.UseVisualStyleBackColor = true;
-			this.btnTranCvtAllToTxt.Click += new System.EventHandler(this.btnTranCvtAllToTxt_Click);
-			// 
-			// lblSrchIncTran
-			// 
-			this.lblSrchIncTran.BackColor = System.Drawing.Color.Transparent;
-			this.lblSrchIncTran.Location = new System.Drawing.Point(34, 9);
-			this.lblSrchIncTran.Name = "lblSrchIncTran";
-			this.lblSrchIncTran.Size = new System.Drawing.Size(239, 40);
-			this.superTooltip1.SetSuperTooltip(this.lblSrchIncTran, new DevComponents.DotNetBar.SuperTooltipInfo("Incoming Transitions", "", "This is the step, section, or procedure for which incoming transitions to it are " +
-            "shown in the list.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 80)));
-			this.lblSrchIncTran.TabIndex = 1;
-			// 
-			// groupBox1
-			// 
-			this.groupBox1.BackColor = System.Drawing.Color.Transparent;
-			this.groupBox1.Controls.Add(this.rbFromEditor);
-			this.groupBox1.Controls.Add(this.rbFromTree);
-			this.groupBox1.Location = new System.Drawing.Point(147, 4);
-			this.groupBox1.Name = "groupBox1";
-			this.groupBox1.Size = new System.Drawing.Size(130, 57);
-			this.groupBox1.TabIndex = 0;
-			this.groupBox1.TabStop = false;
-			this.groupBox1.Text = "Search Selection";
-			this.groupBox1.Visible = false;
-			// 
-			// rbFromEditor
-			// 
-			this.rbFromEditor.AutoSize = true;
-			this.rbFromEditor.Location = new System.Drawing.Point(22, 34);
-			this.rbFromEditor.Name = "rbFromEditor";
-			this.rbFromEditor.Size = new System.Drawing.Size(78, 17);
-			this.rbFromEditor.TabIndex = 1;
-			this.rbFromEditor.TabStop = true;
-			this.rbFromEditor.Text = "From Editor";
-			this.rbFromEditor.UseVisualStyleBackColor = true;
-			// 
-			// rbFromTree
-			// 
-			this.rbFromTree.AutoSize = true;
-			this.rbFromTree.Location = new System.Drawing.Point(22, 16);
-			this.rbFromTree.Name = "rbFromTree";
-			this.rbFromTree.Size = new System.Drawing.Size(73, 17);
-			this.rbFromTree.TabIndex = 0;
-			this.rbFromTree.TabStop = true;
-			this.rbFromTree.Text = "From Tree";
-			this.rbFromTree.UseVisualStyleBackColor = true;
-			// 
-			// tabIncTrans
-			// 
-			this.tabIncTrans.AttachedControl = this.tabControlPanel1;
-			this.tabIncTrans.Name = "tabIncTrans";
-			this.superTooltip1.SetSuperTooltip(this.tabIncTrans, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Incoming Transitions", "", "Finds the Incoming Transitions that point to the current item and convert the tra" +
-            "nsition(s) to text if desired and if have permissions.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 120)));
-			this.tabIncTrans.Text = "Incoming\nTransitions";
-			// 
 			// contextMenuBar1
 			// 
 			this.contextMenuBar1.DockSide = DevComponents.DotNetBar.eDockSide.Top;
@@ -1096,7 +984,7 @@ namespace Volian.Controls.Library
 			this.contextMenuBar1.Location = new System.Drawing.Point(225, -3);
 			this.contextMenuBar1.Margin = new System.Windows.Forms.Padding(2);
 			this.contextMenuBar1.Name = "contextMenuBar1";
-			this.contextMenuBar1.Size = new System.Drawing.Size(56, 25);
+			this.contextMenuBar1.Size = new System.Drawing.Size(56, 29);
 			this.contextMenuBar1.Stretch = true;
 			this.contextMenuBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003;
 			this.contextMenuBar1.TabIndex = 6;
@@ -1248,6 +1136,119 @@ namespace Volian.Controls.Library
 			this.btnNOT.Text = "NOT";
 			this.btnNOT.Click += new System.EventHandler(this.btnNOT_Click);
 			// 
+			// tabIncTrans
+			// 
+			this.tabIncTrans.AttachedControl = this.tabControlPanel1;
+			this.tabIncTrans.Name = "tabIncTrans";
+			this.superTooltip1.SetSuperTooltip(this.tabIncTrans, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Incoming Transitions", "", "Finds the Incoming Transitions that point to the current item and convert the tra" +
+            "nsition(s) to text if desired and if have permissions.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 120)));
+			this.tabIncTrans.Text = "Incoming\nTransitions";
+			// 
+			// tabControlPanel1
+			// 
+			this.tabControlPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.tabControlPanel1.Controls.Add(this.btnTranCvtSelToTxt);
+			this.tabControlPanel1.Controls.Add(this.lblIncTran);
+			this.tabControlPanel1.Controls.Add(this.btnTranCvtAllToTxt);
+			this.tabControlPanel1.Controls.Add(this.lblSrchIncTran);
+			this.tabControlPanel1.Controls.Add(this.groupBox1);
+			this.tabControlPanel1.DisabledBackColor = System.Drawing.Color.Empty;
+			this.tabControlPanel1.Location = new System.Drawing.Point(0, 34);
+			this.tabControlPanel1.Name = "tabControlPanel1";
+			this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1);
+			this.tabControlPanel1.RightToLeft = System.Windows.Forms.RightToLeft.No;
+			this.tabControlPanel1.Size = new System.Drawing.Size(317, 113);
+			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;
+			this.tabControlPanel1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
+			this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
+            | DevComponents.DotNetBar.eBorderSide.Bottom)));
+			this.tabControlPanel1.Style.GradientAngle = 90;
+			this.tabControlPanel1.TabIndex = 17;
+			this.tabControlPanel1.TabItem = this.tabIncTrans;
+			// 
+			// btnTranCvtSelToTxt
+			// 
+			this.btnTranCvtSelToTxt.Enabled = false;
+			this.btnTranCvtSelToTxt.Location = new System.Drawing.Point(121, 63);
+			this.btnTranCvtSelToTxt.Name = "btnTranCvtSelToTxt";
+			this.btnTranCvtSelToTxt.Size = new System.Drawing.Size(145, 22);
+			this.superTooltip1.SetSuperTooltip(this.btnTranCvtSelToTxt, new DevComponents.DotNetBar.SuperTooltipInfo("Convert Selected Incoming Transitions To Text", "", "Converts selected transitions in the results list to text unless the user does no" +
+            "t have permission to change text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 90)));
+			this.btnTranCvtSelToTxt.TabIndex = 3;
+			this.btnTranCvtSelToTxt.Text = "Convert Selected To Text";
+			this.btnTranCvtSelToTxt.UseVisualStyleBackColor = true;
+			this.btnTranCvtSelToTxt.Click += new System.EventHandler(this.btnTranCvtSelToTxt_Click);
+			// 
+			// lblIncTran
+			// 
+			this.lblIncTran.AutoSize = true;
+			this.lblIncTran.Location = new System.Drawing.Point(4, 9);
+			this.lblIncTran.Name = "lblIncTran";
+			this.lblIncTran.Size = new System.Drawing.Size(24, 15);
+			this.lblIncTran.TabIndex = 2;
+			this.lblIncTran.Text = "To:";
+			// 
+			// btnTranCvtAllToTxt
+			// 
+			this.btnTranCvtAllToTxt.Enabled = false;
+			this.btnTranCvtAllToTxt.Location = new System.Drawing.Point(6, 63);
+			this.btnTranCvtAllToTxt.Name = "btnTranCvtAllToTxt";
+			this.btnTranCvtAllToTxt.Size = new System.Drawing.Size(109, 22);
+			this.superTooltip1.SetSuperTooltip(this.btnTranCvtAllToTxt, new DevComponents.DotNetBar.SuperTooltipInfo("Convert All Incoming Transitions To Text", "", "Converts all of the transitions in the results list to text unless the user does " +
+            "not have permission to change text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 90)));
+			this.btnTranCvtAllToTxt.TabIndex = 1;
+			this.btnTranCvtAllToTxt.Text = "Convert All To Text";
+			this.btnTranCvtAllToTxt.UseVisualStyleBackColor = true;
+			this.btnTranCvtAllToTxt.Click += new System.EventHandler(this.btnTranCvtAllToTxt_Click);
+			// 
+			// lblSrchIncTran
+			// 
+			this.lblSrchIncTran.BackColor = System.Drawing.Color.Transparent;
+			this.lblSrchIncTran.Location = new System.Drawing.Point(34, 9);
+			this.lblSrchIncTran.Name = "lblSrchIncTran";
+			this.lblSrchIncTran.Size = new System.Drawing.Size(239, 40);
+			this.superTooltip1.SetSuperTooltip(this.lblSrchIncTran, new DevComponents.DotNetBar.SuperTooltipInfo("Incoming Transitions", "", "This is the step, section, or procedure for which incoming transitions to it are " +
+            "shown in the list.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 80)));
+			this.lblSrchIncTran.TabIndex = 1;
+			// 
+			// groupBox1
+			// 
+			this.groupBox1.BackColor = System.Drawing.Color.Transparent;
+			this.groupBox1.Controls.Add(this.rbFromEditor);
+			this.groupBox1.Controls.Add(this.rbFromTree);
+			this.groupBox1.Location = new System.Drawing.Point(147, 4);
+			this.groupBox1.Name = "groupBox1";
+			this.groupBox1.Size = new System.Drawing.Size(130, 57);
+			this.groupBox1.TabIndex = 0;
+			this.groupBox1.TabStop = false;
+			this.groupBox1.Text = "Search Selection";
+			this.groupBox1.Visible = false;
+			// 
+			// rbFromEditor
+			// 
+			this.rbFromEditor.AutoSize = true;
+			this.rbFromEditor.Location = new System.Drawing.Point(22, 34);
+			this.rbFromEditor.Name = "rbFromEditor";
+			this.rbFromEditor.Size = new System.Drawing.Size(92, 19);
+			this.rbFromEditor.TabIndex = 1;
+			this.rbFromEditor.TabStop = true;
+			this.rbFromEditor.Text = "From Editor";
+			this.rbFromEditor.UseVisualStyleBackColor = true;
+			// 
+			// rbFromTree
+			// 
+			this.rbFromTree.AutoSize = true;
+			this.rbFromTree.Location = new System.Drawing.Point(22, 16);
+			this.rbFromTree.Name = "rbFromTree";
+			this.rbFromTree.Size = new System.Drawing.Size(85, 19);
+			this.rbFromTree.TabIndex = 0;
+			this.rbFromTree.TabStop = true;
+			this.rbFromTree.Text = "From Tree";
+			this.rbFromTree.UseVisualStyleBackColor = true;
+			// 
 			// advTreeProcSets
 			// 
 			this.advTreeProcSets.AccessibleRole = System.Windows.Forms.AccessibleRole.Outline;
@@ -1273,7 +1274,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(317, 103);
 			this.advTreeProcSets.Styles.Add(this.elementStyle1);
 			this.advTreeProcSets.TabIndex = 0;
 			this.advTreeProcSets.Text = "advTree1";
@@ -1322,7 +1323,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(317, 110);
 			this.advTreeStepTypes.Styles.Add(this.elementStyle2);
 			this.advTreeStepTypes.TabIndex = 0;
 			this.advTreeStepTypes.Text = "advTree1";
@@ -1355,7 +1356,7 @@ namespace Volian.Controls.Library
 			this.grpPanSearchResults.Location = new System.Drawing.Point(0, 461);
 			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(317, 215);
 			// 
 			// 
 			// 
@@ -1394,7 +1395,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(311, 194);
 			this.lbSrchResults.TabIndex = 0;
 			this.lbSrchResults.SelectedIndexChanged += new System.EventHandler(this.lbSrchResults_SelectedValueChanged);
 			this.lbSrchResults.MouseMove += new System.Windows.Forms.MouseEventHandler(this.lbSrchResults_MouseMove);
@@ -1406,7 +1407,6 @@ namespace Volian.Controls.Library
 			// 
 			this.lbSrchResultsIncTrans.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.lbSrchResultsIncTrans.CheckBoxesVisible = true;
-			this.lbSrchResultsIncTrans.CheckStateMember = null;
 			this.lbSrchResultsIncTrans.ContainerControlProcessDialogKey = true;
 			this.lbSrchResultsIncTrans.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.lbSrchResultsIncTrans.DragDropSupport = true;
@@ -1415,7 +1415,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(311, 194);
 			this.lbSrchResultsIncTrans.TabIndex = 0;
 			this.lbSrchResultsIncTrans.SelectedIndexChanged += new System.EventHandler(this.lbSrchResults_SelectedValueChanged);
 			this.lbSrchResultsIncTrans.ItemClick += new System.EventHandler(this.lbSrchResultsIncTrans_ItemClicked);
@@ -1438,7 +1438,7 @@ namespace Volian.Controls.Library
 			this.panSearchButtons.Location = new System.Drawing.Point(0, 402);
 			this.panSearchButtons.Margin = new System.Windows.Forms.Padding(2);
 			this.panSearchButtons.Name = "panSearchButtons";
-			this.panSearchButtons.Size = new System.Drawing.Size(277, 59);
+			this.panSearchButtons.Size = new System.Drawing.Size(317, 59);
 			this.panSearchButtons.Style.Alignment = System.Drawing.StringAlignment.Center;
 			this.panSearchButtons.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
 			this.panSearchButtons.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
@@ -1457,7 +1457,7 @@ namespace Volian.Controls.Library
 			this.btnClearSearchResults.ColorTable = DevComponents.DotNetBar.eButtonColor.Office2007WithBackground;
 			this.btnClearSearchResults.Enabled = false;
 			this.btnClearSearchResults.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.btnClearSearchResults.Location = new System.Drawing.Point(237, 3);
+			this.btnClearSearchResults.Location = new System.Drawing.Point(277, 3);
 			this.btnClearSearchResults.Margin = new System.Windows.Forms.Padding(2);
 			this.btnClearSearchResults.Name = "btnClearSearchResults";
 			this.btnClearSearchResults.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1531,7 +1531,7 @@ namespace Volian.Controls.Library
 			this.labelX1.Margin = new System.Windows.Forms.Padding(2);
 			this.labelX1.Name = "labelX1";
 			this.labelX1.RightToLeft = System.Windows.Forms.RightToLeft.No;
-			this.labelX1.Size = new System.Drawing.Size(66, 14);
+			this.labelX1.Size = new System.Drawing.Size(82, 17);
 			this.superTooltip1.SetSuperTooltip(this.labelX1, new DevComponents.DotNetBar.SuperTooltipInfo("Results Style", "", "The Search Results list can be formatted in one of four styles: Document Path, St" +
             "ep Path, Annotation Text and Document Text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
 			this.labelX1.TabIndex = 9;
@@ -1588,7 +1588,7 @@ namespace Volian.Controls.Library
 			this.cbSorted.Margin = new System.Windows.Forms.Padding(2);
 			this.cbSorted.Name = "cbSorted";
 			this.cbSorted.RightToLeft = System.Windows.Forms.RightToLeft.No;
-			this.cbSorted.Size = new System.Drawing.Size(42, 15);
+			this.cbSorted.Size = new System.Drawing.Size(46, 17);
 			this.superTooltip1.SetSuperTooltip(this.cbSorted, new DevComponents.DotNetBar.SuperTooltipInfo("Sort Results", "", "Sorts results that are output into the Search Results list shown below.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
 			this.cbSorted.TabIndex = 7;
 			this.cbSorted.Text = "Sort";
@@ -1651,7 +1651,7 @@ namespace Volian.Controls.Library
 			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(317, 124);
 			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;
@@ -1686,7 +1686,7 @@ namespace Volian.Controls.Library
 			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(317, 131);
 			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;
@@ -1733,15 +1733,10 @@ namespace Volian.Controls.Library
 			this.Controls.Add(this.xpSetToSearch);
 			this.Controls.Add(this.tabSearchTypes);
 			this.Controls.Add(this.tabControlPanel1);
-			//B2025-056 Click on Incoming Transitions
-			// This needs to be part of overall control
-			// since if it is part of tabSearchTypes,
-			// then when that is disabled, buttons on
-			// this will be also
 			this.Margin = new System.Windows.Forms.Padding(2);
 			this.Name = "DisplaySearch";
 			this.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
-			this.Size = new System.Drawing.Size(277, 676);
+			this.Size = new System.Drawing.Size(317, 676);
 			((System.ComponentModel.ISupportInitialize)(this.tabSearchTypes)).EndInit();
 			this.tabSearchTypes.ResumeLayout(false);
 			this.tabControlPanel4.ResumeLayout(false);
@@ -1760,11 +1755,11 @@ namespace Volian.Controls.Library
 			this.gpSrchAnnoText.ResumeLayout(false);
 			this.panel4.ResumeLayout(false);
 			this.panel4.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)(this.contextMenuBar1)).EndInit();
 			this.tabControlPanel1.ResumeLayout(false);
 			this.tabControlPanel1.PerformLayout();
 			this.groupBox1.ResumeLayout(false);
 			this.groupBox1.PerformLayout();
-			((System.ComponentModel.ISupportInitialize)(this.contextMenuBar1)).EndInit();
 			((System.ComponentModel.ISupportInitialize)(this.advTreeProcSets)).EndInit();
 			((System.ComponentModel.ISupportInitialize)(this.advTreeStepTypes)).EndInit();
 			this.grpPanSearchResults.ResumeLayout(false);

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

@@ -215,7 +215,8 @@ namespace Volian.Controls.Library
             this.groupPanelCheckoff.CanvasColor = System.Drawing.SystemColors.Control;
             this.groupPanelCheckoff.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
             this.groupPanelCheckoff.Controls.Add(this.cmbCheckoff);
-            this.groupPanelCheckoff.DisabledBackColor = System.Drawing.Color.Empty;
+			this.groupPanelCheckoff.Controls.Add(this.cbInitialLine);
+			this.groupPanelCheckoff.DisabledBackColor = System.Drawing.Color.Empty;
             this.groupPanelCheckoff.Dock = System.Windows.Forms.DockStyle.Top;
             this.groupPanelCheckoff.Location = new System.Drawing.Point(0, 231);
             this.groupPanelCheckoff.Margin = new System.Windows.Forms.Padding(2);
@@ -265,8 +266,7 @@ namespace Volian.Controls.Library
             this.cbInitialLine.Margin = new System.Windows.Forms.Padding(2);
             this.cbInitialLine.Name = "cbInitialLine";
             this.cbInitialLine.Size = new System.Drawing.Size(112, 15);
-            this.superTooltipTags.SetSuperTooltip(this.cbInitialLine, new DevComponents.DotNetBar.SuperTooltipInfo("Manual Page Break", "", "When set, starts this step at the top of a page.\r\n\r\nkeyboard command: <Ctrl><Ente" +
-            "r>", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+            this.superTooltipTags.SetSuperTooltip(this.cbInitialLine, new DevComponents.DotNetBar.SuperTooltipInfo("Disable Initial Line", "", "When set, The initial line will be removed from this step.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
             this.cbInitialLine.TabIndex = 1;
             this.cbInitialLine.Text = "Disable Initial Line";
             this.cbInitialLine.Visible = false;
@@ -276,7 +276,6 @@ namespace Volian.Controls.Library
             // 
             this.groupPanelcmbShwRplWds.CanvasColor = System.Drawing.SystemColors.Control;
             this.groupPanelcmbShwRplWds.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-            this.groupPanelcmbShwRplWds.Controls.Add(this.cbInitialLine);
             this.groupPanelcmbShwRplWds.Controls.Add(this.cmbShwRplWds);
             this.groupPanelcmbShwRplWds.DisabledBackColor = System.Drawing.Color.Empty;
             this.groupPanelcmbShwRplWds.Dock = System.Windows.Forms.DockStyle.Top;
@@ -880,3 +879,4 @@ namespace Volian.Controls.Library
         private System.Windows.Forms.Button btnSaveChangeID;
     }
 }
+

PROMS/XYPlots/XYPlots.cs

@@ -491,10 +491,12 @@ namespace XYPlots
 			// remove an extra spaces between ><
 			//Buff = Regex.Replace(Buff, @"[ ]+<", "<");
 			Buff = Buff.Replace(">\r ", ">\r\n ");
+			Buff = Buff.Replace(">\n ", ">\r\n ");  // C2022-003 if RO has symbols
 			Buff = Regex.Replace(Buff, @"[ ]+<", "<");
 			// some data only had carriage return, replace these with cr/nl so that following code
 			// will work
 			Buff = Buff.Replace(">\r<", ">\r\n<");
+			Buff = Buff.Replace(">\n<", ">\r\n<");  // C2022-003 if RO has symbols
 			Buff = Buff.Replace("><", ">\r\n<");
 			// some data had cr/cr/nl, change to cr/nl
 			Buff = Buff.Replace("\r\r\n", "\r\n");
@@ -520,6 +522,7 @@ namespace XYPlots
 				Buff = Buff.Substring(0, Buff.Length - 2) + "  \r\n\0x00"; // needs to end with null
 			else if (Buff.EndsWith(">")) // doesn't end with return chars...
 				Buff = Buff.Substring(0, Buff.Length - 1) + " \r\n\0x00"; // needs to end with null
+			Buff = Regex.Replace(Buff, @"\\u([0-9]{1,4})\?", m => int.TryParse(m?.Groups[1]?.Value, out int result) ? Convert.ToChar(result).ToString() : ""); // C2022-003 RO Symbols. Convert unicode to character.
 			Buff = Regex.Replace(Buff, @"([0-9])\r\n([0-9])", "$1 $2");
 		}
 		private void CloseGraph()