From 314356de36e7956a671586026e5ccb32ad72a8f5 Mon Sep 17 00:00:00 2001
From: John Jenko <jjenko@volian.com>
Date: Wed, 23 Aug 2023 14:14:13 -0400
Subject: [PATCH 1/2] F2023-131 change font of generic EOP format to Arial

---
 PROMS/Formats/fmtall/BASEall.xml | Bin 101194 -> 101204 bytes
 PROMS/Formats/fmtall/GENall.xml  | Bin 38704 -> 39670 bytes
 PROMS/Formats/genmacall/gen.svg  | Bin 4804 -> 4672 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/PROMS/Formats/fmtall/BASEall.xml b/PROMS/Formats/fmtall/BASEall.xml
index c0a54ec6679f4e32fe81435991f079531712a3f3..544050467953d5b7d1c021e96bb46d9012093cb6 100644
GIT binary patch
delta 31
ncmX>#jqS=bwhdW~>`n}c48;to(`}0x#hdFGx7RT;p6LVttD6d8

delta 23
fcmcaIjqTJlwhdW~)4hrrMVdPpw|6iyp6LVta&ZX#

diff --git a/PROMS/Formats/fmtall/GENall.xml b/PROMS/Formats/fmtall/GENall.xml
index c66757f5d8e1e86ab496cb0a401c7d7fe1e7e08c..92e8e74ec6d295ed7da1e9ba363ab03c9a51c691 100644
GIT binary patch
delta 3026
zcmdn6j_KQ0rU@&UjTnq4uD;E#zyOAmA4bcvJ2Dh8WHKa9R*Vs4G@Sg9$C48&%V0Cv
zP+EBMJjQp9FcA=K!w}4n%8<-Z0@RhykjLQ1P|A?YkOUMf0?Gye#flkh8I%|dfLMXS
z3n*L6P%`;-tt>yXDL^)M+v|~4*)ZtivCWQwmw^l76DW!9HV>ey5*bqPyAABx0H8h2
zKy`VOf7bF7=Td9@E=9H*!=;laGO1(OvY+X_H-<{M{~&%V0Q#p0h)aOsT*QD|HLmcL
zpS(by!x`D-Fg7f#iLn8wcJe_c*~zn1_$D7<V%dC%`49(&cd#ZdbXA)bdHI=yVQxU8
zv8N6U?dSOuna~BXXl=~Vp1i=vXY&`KMQj+##iKQCof#Y%LK#9BJQ@6fDH`SuPzv@0
zr=L7vh=Wo!R&|s6qeUlIMe~T_l9e>XDg!hRXADjjw3eRiB_W03+VlL9+%We6>B)^&
z#+$vQjxkQwh?cPR13Ev1!4>WSh(b(nU{weA1}<4iQS35|f})cTNOo;rBO`_xx{Q_!
zCvOl|n7l8LYjS`J%jOx%4H_7pA}Xy+X0&wP{KKb?ivsOo5lzhGC%4Jx`As*kiMc{d
zk^`2cDDiYL)pT+|LIQDa$I#i3NQ_QUGM`YVHCdrTZt{Yp93t#O=<r}RWw4kW7_U!~
zE|tj%m1<<^l$*?!7DI$xhSiUWP*qqnee<*oJ4Pau8fIN4LRDfmF{%*3HxvRqs(`uy
z{;G(Bm;fKm3E0{?$VrE|h(Qm>z`~_OBxH156N@4z&+Ai}tW$f3EZwG?Z`9pmLMfoI
zmfk2T{G09)XBoPx&D)!gv!ED7jAauiznLgE`CpU7<PBmhlll54Y%c1uAl=O<#%$*6
U+d`ocV3%y0WJ0Mie$yTS07GPQeE<Le

delta 2598
zcmeyim1)B|rU@&U4H=9kuD;F6$-v2AGuhEfc(M%ByGh&}lM|#lCUdm#P4;8un_Qs4
zHF<#~%j6=~7n5s}cqTVEaBQw%Kg2P)&WdBQfIQFScLf5<0SrY9sSL#oB@CGi=|GkO
zgDXQ0kX-_1hcF~E<V@bkD9UIsc_Xvs<b-s#$qh<8ljTHoHZuv{V4S>0kY{p^ITx8m
zE#P9C{K3&@^8sN2CS+HMIy2-mlmcCr33Npf&`o|ox_t7-RAEM=$&FdslOIhLfxBaZ
z*djKdUnM60bL5$9pv?w!kHq9W#iGrJ<c={S3vSL+>|g_1W1y5X`GJke<a06#li!7L
zZN8w<qA~e{GS}n)2Xegv2^EXY8bNhjlcOZ4VN_LY6Ejr;*kJRq#4Ah`xyovCOlks!
zCe)>&m_S4%i%p)8VKlj~FbCOYBK5@p^N9K6iPiFx9kK<;&~GvML8cl-W;E1UO#YP>
zhHN*<+0AA$UrruHCdf?YD|gx)lWWIFkujqQfb>MvP}fIMm{TG0H}jQyjYd4QSSPaN
zphnIg@Q4TH`o(IEl*K)$?2z01qUj#fWF|WyvMPCw$tF|#CO>HNnam+CLb3_+lP8!9
zZ9dR`goS(uY&Mx1!MHi2&w?^ftYJ1`u$auqFS_}|#2rkN0~$FdbJ>yCS^$L!+_=df
SCQjMhGtGobuA3|{>lpwH!{+D!

diff --git a/PROMS/Formats/genmacall/gen.svg b/PROMS/Formats/genmacall/gen.svg
index 051987de53efdb4070ecad3f7cce8c2a5208b08a..cc0f8d6708dd0629cbf24fe20ba1170fa855cf96 100644
GIT binary patch
delta 108
zcmX@2dO&5u3T7h)<Bh9rS=b#JiWo8(5+^4L$WE4Ftw7<QU@b%DZ!Th!;6xHooqUNu
Q2Z?_WiLJUhOE8KN0AoQNQ~&?~

delta 238
zcmX@0azu5)3T8tFqm8R=StNZJQW;8sFqNT*L4m=YAs@)jV8~=hp8SzzGG1B5$?I4P
z@T=JD!6wA18~`*rm7y4Da3(`Kkfp%j%8&zOgDh2G2w_NM$eEnTKaogvs*~je<`AQH
J^Fe`nMgXQmHmCpq


From 7312330448227973ae0fa73ec61ba7cb52d50cd7 Mon Sep 17 00:00:00 2001
From: Kathy Ruffing <kruffing@volian.com>
Date: Thu, 24 Aug 2023 06:46:20 -0400
Subject: [PATCH 2/2] =?UTF-8?q?B2023-089:=20Search=20results=20=E2=80=93?=
 =?UTF-8?q?=20reselection=20of=20search=20results=20step=20that=20was=20de?=
 =?UTF-8?q?leted=20causes=20unexpected=20results=20when=20redisplayed=20in?=
 =?UTF-8?q?=20editor.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PROMS/Volian.Controls.Library/DisplaySearch.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs
index 5d360a15..9f0d5402 100644
--- a/PROMS/Volian.Controls.Library/DisplaySearch.cs
+++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs
@@ -1833,7 +1833,10 @@ namespace Volian.Controls.Library
 					if (_ItemInfo != null)
 					{
 						_OpenDocFromSearch = true;
-						DisplayTabItem dti = _TabControl.OpenItem(_ItemInfo); // open the corresponding procedure text
+						// B2023-089: selecting a deleted item from search results shows deleted step in the editor when the StepTabItem for 
+						//	the deleted item was displayed but is not the active StepTabItem.  Use its procedure if it was deleted
+						ItemInfo openItem = _ItemInfo.IsDeleted ? ItemInfo.Get(_ItemInfo.MyProcedure == null ? _ItemInfo.ItemID : _ItemInfo.MyProcedure.ItemID) : _ItemInfo;
+						DisplayTabItem dti = _TabControl.OpenItem(openItem); // open the corresponding procedure text
 						if (dti != null)
 						{
 							if (dti.MyDSOTabPanel != null)