PROMS/Formats/Formats.csproj

@@ -126,7 +126,6 @@
     <Content Include="fmtall\BVPSAOPall.xml" />
     <Content Include="fmtall\BVPSAtchall.xml" />
     <Content Include="fmtall\BVPSBCKall.xml" />
-    <Content Include="fmtall\BVPSFlexDEVall.xml" />
     <Content Include="fmtall\BVPSDEVall.xml" />
     <Content Include="fmtall\BVPSNIBCKall.xml" />
     <Content Include="fmtall\BVPSSAMGall.xml" />
@@ -302,7 +301,6 @@
     <Content Include="fmtall\SHESAMall.xml" />
     <Content Include="fmtall\SHESSDall.xml" />
     <Content Include="fmtall\SHESSD_00all.xml" />
-    <Content Include="fmtall\VEGPBckall.xml" />
     <Content Include="fmtall\VEGP1all.xml" />
     <Content Include="fmtall\VEGP2all.xml" />
     <Content Include="fmtall\VEGPAlrall.xml" />
@@ -378,7 +376,7 @@
     <Content Include="fmtall\wst1all.xml" />
     <Content Include="fmtall\wst2all.xml" />
     <Content Include="fmtall\wstalrall.xml" />
-    <Content Include="fmtall\VEGPBckStpsall.xml" />
+    <Content Include="fmtall\VEGPBckall.xml" />
     <Content Include="fmtall\wstbckall.xml" />
     <Content Include="fmtall\wstcklall.xml" />
     <Content Include="fmtall\wstdcsall.xml" />
@@ -406,7 +404,6 @@
     <Content Include="genmacall\BVPSAOP.svg" />
     <Content Include="genmacall\BVPSAtch.svg" />
     <Content Include="genmacall\BVPSbck.svg" />
-    <Content Include="genmacall\BVPSFlexdev.svg" />
     <Content Include="genmacall\BVPSdev.svg" />
     <Content Include="genmacall\BVPSNIBCK.svg" />
     <Content Include="genmacall\BVPSSAMG.svg" />
@@ -515,7 +512,6 @@
     <Content Include="genmacall\shesam.svg" />
     <Content Include="genmacall\shessd.svg" />
     <Content Include="genmacall\VEGPBck.svg" />
-    <Content Include="genmacall\VEGPBckStps.svg" />
     <Content Include="genmacall\VEGP1.svg" />
     <Content Include="genmacall\VEGP2.svg" />
     <Content Include="genmacall\VEGPAlr.svg" />

PROMS/VEPROMS User Interface/DlgPrintProcedure.cs

@@ -1091,11 +1091,6 @@ namespace VEPROMS
 			DoCreatePDF();
 		}
 
-		public void QPCreatePDF()
-		{
-			DoCreatePDF();
-		}
-
 		private void DoCreatePDF()
 		{
 			if (_AllProcedures)

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -44,7 +44,7 @@ namespace VEPROMS
 		public FindReplace dlgFindReplace = null;
 		public VlnSpellCheck SpellChecker = null;
 		private Int64 _LastContentChange;
-
+		
 		public Int64 LastContentChange
 		{
 			get { return _LastContentChange; }
@@ -87,8 +87,6 @@ namespace VEPROMS
 					// multiple events because the print dialog will be displayed for each time the event was added.
 					_SelectedStepTabPanel.MyStepTabRibbon.PrintRequest -= new StepTabRibbonEvent(MyStepTabRibbon_PrintRequest);
 					_SelectedStepTabPanel.MyStepTabRibbon.PrintRequest += new StepTabRibbonEvent(MyStepTabRibbon_PrintRequest);
-					_SelectedStepTabPanel.MyStepTabRibbon.QPrintRequest -= new StepTabRibbonEvent(MyStepTabRibbon_QPrintRequest);
-					_SelectedStepTabPanel.MyStepTabRibbon.QPrintRequest += new StepTabRibbonEvent(MyStepTabRibbon_QPrintRequest);
 					_SelectedStepTabPanel.MyStepTabRibbon.ProgressBar = bottomProgBar;
 					_SelectedStepTabPanel.MyStepTabRibbon.ContActionSummaryRequest -= MyStepTabRibbon_ContActionSummaryRequest;
 					_SelectedStepTabPanel.MyStepTabRibbon.ContActionSummaryRequest += MyStepTabRibbon_ContActionSummaryRequest;
@@ -514,7 +512,6 @@ namespace VEPROMS
 			ItemInfo.ItemDeleted += new ItemInfoEvent(RefreshDisplayHistory);
 
 			tv.PrintProcedure += new vlnTreeViewEvent(tv_PrintProcedure);
-			tv.QPrintProcedure += new vlnTreeViewEvent(tv_QPrintProcedure);
 			tv.PrintAllProcedures += new vlnTreeViewEvent(tv_PrintAllProcedures);
 			tv.ApproveProcedure += new vlnTreeViewEvent(tv_ApproveProcedure);
 			tv.ApproveAllProcedures += new vlnTreeViewEvent(tv_ApproveAllProcedures);
@@ -1154,41 +1151,7 @@ namespace VEPROMS
 
 			pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
 		}
-
-		void tv_QPrintProcedure(object sender, vlnTreeEventArgs args)  // Quick Print right click menu on Procedure name.
-		{
-			try
-			{
-				ProcedureInfo pi = (args.Node as VETreeNode).VEObject as ProcedureInfo;
-				if (pi == null) return;
-
-				tc.SaveCurrentEditItem(pi);
-
-				pi.MyDocVersion.DocVersionConfig.SelectedSlave = args.UnitIndex;
-
-				using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi))
-				{
-					prnDlg.SelectedSlave = args.UnitIndex;
-					prnDlg.MySessionInfo = MySessionInfo;
-					prnDlg.SetupForProcedure();  // Setup filename
-					prnDlg.QPCreatePDF();  // Create Print report
-
-					pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
-				}
-			}
-            catch(Exception ex)
-            {
-				StringBuilder sb = new StringBuilder();
-
-				sb.AppendLine("Could not create PDF Print");
-				sb.AppendLine();
-				MessageBox.Show(sb.ToString(), "Error when creating PDF Print", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-
-				_MyLog.Warn("Failed to create PDF print", ex);
-			}
-
-		}
-
+		
 		void tv_CreateContinuousActionSummary(object sender, vlnTreeEventArgs args)
 		{
 			DialogResult dr = System.Windows.Forms.DialogResult.Yes;
@@ -1409,75 +1372,14 @@ namespace VEPROMS
 
 			//added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
 			pi.MyDocVersion.DocVersionConfig.SelectedSlave = pi.ProcedureConfig.SelectedSlave;
-			try
-			{
-				using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi))
-				{
-					prnDlg.SelectedSlave = pi.ProcedureConfig.SelectedSlave == 0 ? -1 : pi.ProcedureConfig.SelectedSlave; //added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
-					prnDlg.MySessionInfo = MySessionInfo;
-					prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window
-
-					//added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
-					pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
-				}
-			}
-			catch (Exception ex)
-			{
-				StringBuilder sb = new StringBuilder();
-
-				sb.AppendLine("Could not create PDF Print");
-				sb.AppendLine();
-				MessageBox.Show(sb.ToString(), "Error when creating PDF Print", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-
-				_MyLog.Warn("Failed to create PDF print", ex);
-			}
-		}
-
-		void MyStepTabRibbon_QPrintRequest(object sender, StepTabRibbonEventArgs args)
-		{
-			// Fix for B2013-173:
-			// if the user did the print by using the shortcut keys 'Ctrl-P' the arguments sent in
-			// is the first opened procedure rather than the active procedure.  So check for this
-			// and if they are not the same, use the CurrentItem from the main frmVEPROMS.
-			ProcedureInfo piThis = null;
-			if (_CurrentItem != null) piThis = _CurrentItem.MyProcedure;
-
-			ProcedureInfo pi = args.Proc as ProcedureInfo;
-			if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis;
-
-			// Check if Procedure Info is null
-			if (pi == null) return;
-
+			
+			DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi);
+			prnDlg.SelectedSlave = pi.ProcedureConfig.SelectedSlave == 0 ? -1 : pi.ProcedureConfig.SelectedSlave; //added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
+			prnDlg.MySessionInfo = MySessionInfo;
+			prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window
 
 			//added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
-			pi.MyDocVersion.DocVersionConfig.SelectedSlave = pi.ProcedureConfig.SelectedSlave;
-
-
-			try
-			{
-				using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi))
-				{
-					prnDlg.SelectedSlave = pi.ProcedureConfig.SelectedSlave == 0 ? -1 : pi.ProcedureConfig.SelectedSlave; //added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
-					prnDlg.MySessionInfo = MySessionInfo;
-					prnDlg.SetupForProcedure();  // Setup filename
-												 //prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window
-					prnDlg.QPCreatePDF();  // Create Print report
-
-					//added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
-					pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
-				}
-			}
-			catch (Exception ex)
-			{
-				StringBuilder sb = new StringBuilder();
-
-				sb.AppendLine("Could not create PDF Print");
-				sb.AppendLine();
-				MessageBox.Show(sb.ToString(), "Error when creating PDF Print", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-
-				_MyLog.Warn("Failed to create PDF print", ex);
-			}
-
+			pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
 		}
 
 		void displaySearch1_PrintRequest(object sender, DisplaySearchEventArgs args)

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

@@ -1533,13 +1533,9 @@ namespace VEPROMS.CSLA.Library
 
 			return myGrp;
 		}
-		// B2024-001:  Loading of Ros was getting called over and over when ROs are in tables.  Added
-		//	a flag to only process once until completed, 'currentlyLoading'.
-		static bool currentlyLoading = false;
+
 		private void Load(int rofstID)
 		{
-			if (currentlyLoading) return;		// B2024-001:  don't load if in process of loading
-			currentlyLoading = true;
 			_dicRoCounts = new Dictionary<int, int>();
 
 			DateTime dtStart = DateTime.Now;
@@ -1635,7 +1631,6 @@ namespace VEPROMS.CSLA.Library
 				}
 				catch { }
 			}
-			currentlyLoading = false;       // B2024-001:  done loading
 		}
 
 		private void LoadChild(int rofstID, int dbiID, ROFSTLookup.rochild child)

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

@@ -711,11 +711,6 @@ namespace VEPROMS.CSLA.Library
 								else
 									newvalue = newvalue.Replace(@"\u9586?", m.Groups[1].Value + @"\u9586?" + m.Groups[3].Value);
 							}
-							// B2022-134: crash when updating an RO that contains '<' or '>' when RO is used in a table cell.  These
-							//	are xml special characters, the grid is stored as xml, so these characters need translated so that
-							//  storing them as xml in the database won't crash.  They get translated back when used in Proms.
-							if (newvalue.Contains("<")) newvalue = newvalue.Replace("<", "&lt;");
-							if (newvalue.Contains(">")) newvalue = newvalue.Replace(">", "&gt;");
 							if (gg != newvalue)
 							{
 								retval = gg;

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

@@ -4104,7 +4104,7 @@ namespace VEPROMS.CSLA.Library
 					ItemInfo srcItem = ItemInfo.Get(eds[0].ItemID);
 					if (srcItem == null) return null;
 
-					if (srcItem.IsHigh || srcItem.IsSection || srcItem.IsProcedure) return srcItem.Ordinal; 
+					if (srcItem.IsHigh) return srcItem.Ordinal; 
 					// B2018-118: the LinkedOrdinal count must take into account cautions versus notes types:
 					ItemInfo hls = srcItem.MyHLS;
 					bool enIsCaution = this.IsCaution;
@@ -4223,14 +4223,6 @@ namespace VEPROMS.CSLA.Library
 				((IsHigh && FormatStepData.PageBreakOnStep) || (IsRNOPart && MyHLS.FormatStepData.PageBreakOnStep)))
 				tbformate = IsRNOPart ? MyHLS.FormatStepData.TabData.RNOIdentEdit : FormatStepData.TabData.IdentEdit;
 
-			//F2023-112 Vogtle Units 3 and 4 Backgrounds
-			//          added code to get the tbformate (this is used for the tab displayed in the step editor) for Cautions and Notes background steps
-			//          like we do for the high level steps (see the  if statement above)
-			//          all plants using enhanced backgrounds will benefit from this and is adjustable in the format files
-			if (((ActiveFormat.PlantFormat.FormatData.PurchaseOptions.Value & E_PurchaseOptions.EnhancedBackgrounds) == E_PurchaseOptions.EnhancedBackgrounds) &&
-				((IsCaution || IsNote) && FormatStepData.PageBreakOnStep))
-				tbformate = IsRNOPart ? FormatStepData.TabData.RNOIdentEdit : FormatStepData.TabData.IdentEdit;
-
 			if (ActiveFormat.Name.ToUpper() == "WCNCKL" || ActiveFormat.Name.ToUpper() == "WSTCKL")
 			{
 				if (!IsNote && !IsCaution) tbformat = FormatStepData.TabData.IdentEdit;
@@ -4245,23 +4237,15 @@ namespace VEPROMS.CSLA.Library
 				{
 					string tb = (LinkedOrdinal==null)? "NA" : LinkedOrdinal.ToString();
 					tbformat = tbformat.Replace("{LNK C/N Num}", tb);
-					if (tbformate != null) tbformate = tbformate.Replace("{LNK C/N Num}", tb);
 					if ((ActiveParent as ItemInfo).FormatStepData.TabData.IdentEdit.Contains("{Section Prefix}") && LinkedTabHasSectionPrefix) // B2019-126 Check the HLS of the source document (ex. EOP step) to see if it includes the section number prefix in its tab
-					{
-						tbformat = tbformat.Replace("{Section Prefix}", ""); // B2018-141  remove duplicate section number
-						if (tbformate != null) tbformate = tbformate.Replace("{Section Prefix}", "");  // F2023-112 replace in editor tab
-					}
+						tbformat = tbformat.Replace("{Section Prefix}",""); // B2018-141  remove duplicate section number
 					if ((ActiveParent as ItemInfo).LinkedTab != null)
-					{
-						tbformat = tbformat.Replace("{LNK Step Num}", (ActiveParent as ItemInfo).LinkedTab.Trim(" .".ToCharArray()));
-						if (tbformate != null) tbformate = tbformate.Replace("{LNK Step Num}", (ActiveParent as ItemInfo).LinkedTab.Trim(" .".ToCharArray()));  // F2023-112 replace in editor tab
-					}
+					tbformat = tbformat.Replace("{LNK Step Num}", (ActiveParent as ItemInfo).LinkedTab.Trim(" .".ToCharArray())); //(ActiveParent as ItemInfo).Ordinal.ToString());
 					tbformat = tbformat.TrimStart(" ".ToCharArray());
-					if (tbformate != null) tbformate = tbformate.TrimStart(" ".ToCharArray());  // F2023-112 replace in editor tab
 				}
 				if (tbformat.Contains("{LNK Step Num}"))
 					tbformat = tbformat.Replace("{LNK Step Num}", LinkedTab==null?"NA":LinkedTab.Trim(" .".ToCharArray()).PadLeft(2));//Ordinal.ToString().PadLeft(2));
-				if (tbformate != null && tbformate.Contains("{LNK Step Num}"))  // F2023-112 replace in editor tab
+				if (tbformate != null && tbformate.Contains("{LNK Step Num}"))
 					tbformate = tbformate.Replace("{LNK Step Num}", LinkedTab == null ? "NA" : LinkedTab.Trim(" .".ToCharArray()).PadLeft(2));//Ordinal.ToString());
 				if (tbformate != null && tbformate.Contains("{!Clock}"))
 				{
@@ -4988,8 +4972,7 @@ namespace VEPROMS.CSLA.Library
 				// Otherwise, just return the section tab.
 				// Before checking for anything, if the DisplayNumber starts with 'ATTACHMENT ', don't use that in the Section
 				// prefix for the tabstring.
-				// F2023-112 - added flag to use entire section number in the step tab - Vogtle 3&4 Background format (VEGPBckStp)
-				string attNum =  (ActiveSection.DisplayNumber.ToUpper().StartsWith("ATTACHMENT ") && !FormatStepData.TabData.UseEntireSectionNum) ? ActiveSection.DisplayNumber.Substring(11) : ActiveSection.DisplayNumber;
+				string attNum = ActiveSection.DisplayNumber.ToUpper().StartsWith("ATTACHMENT ") ? ActiveSection.DisplayNumber.Substring(11) : ActiveSection.DisplayNumber;
 				Match m = Regex.Match(attNum, @"[a-zA-Z]");  // for alpha, use non-touched displaynumber
 				int indx = -1;
 				if (m.Success)

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

@@ -171,8 +171,7 @@ namespace VEPROMS.CSLA.Library
 		DSS_PageListAddSectCont = 0x400000000,   // for this section, add the top continue message when doing the ATTACHTITLECONT pagelist token (Calvert/Landscape word docs)
 		DSS_WordContentLandscaped = 0x800000000,	// for this section, the word content is landscaped.
 		DSS_ChklstEditSize = 0x100000000,	// Westinghouse checklist - edit window size 
-		DSS_SameXOffSubsections = 0x2000000000, // print subsections at same offset as section & preceeding subsections,start HLS xoff at section text (not number)
-		DSS_PageListBkgndStpContMsg = 0x4000000000, // Background Step Number printed via Pagelist with "{CM:(Cont)}" which will print "(cont)" next to step number if it's continued to the next page - (VEGPBckStp) F2023-112
+		DSS_SameXOffSubsections = 0x2000000000,	// print subsections at same offset as section & preceeding subsections,start HLS xoff at section text (not number)
 	};
 	public enum E_DocStyleUse : uint
 	{

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

@@ -202,15 +202,6 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _TextColor, "@TextColor");
 			}
 		}
-		// F2023-112 Vogtle Units 3 & Backgrounds - trim the ending "-B" from the procedure number (used in title box of page header)
-		private LazyLoad<string> _TrimEnding;
-		public string TrimEnding
-		{
-			get
-			{
-				return LazyLoad(ref _TrimEnding, "@TrimEnding");
-			}
-		}
 		#endregion
 		#region Override ToString
 		public override string ToString()

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

@@ -1458,14 +1458,6 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _NoBlankLastNoteCautionWarn, "@NoBlankLastNoteCautionWarn");
 			}
 		}
-		private LazyLoad<bool> _NoteCautionCenterOneAllTypes;      // F2023-126: Vogtle Alarms - center single line caution/note if more than one type exist off step
-		public bool NoteCautionCenterOneAllTypes
-		{
-			get
-			{
-				return LazyLoad(ref _NoteCautionCenterOneAllTypes, "@NoteCautionCenterOneAllTypes");
-			}
-		}
 		private LazyLoad<bool> _ChkBoxToGeneratePointListText;      // C2021-063 Barakah Alarm: check box to generate Alarm Point List Text
 		public bool ChkBoxToGeneratePointListText
 		{
@@ -3190,14 +3182,6 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _WolfcreekCKLBackgndFormat, "@WolfcreekCKLBackgndFormat");
 			}
 		}
-		private LazyLoad<bool> _Vogtle3and4BackgroundFormat;
-		public bool Vogtle3and4BackgroundFormat
-		{
-			get
-			{
-				return LazyLoad(ref _Vogtle3and4BackgroundFormat, "@Vogtle3and4BackgroundFormat");
-			}
-		}
 		private LazyLoad<bool> _FortranFormatNumbers;
 		public bool FortranFormatNumbers
 		{
@@ -6627,14 +6611,6 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _NoTrim, "TabData/@NoTrim");
 			}
 		}
-		private LazyLoad<bool> _UseEntireSectionNum;
-		public bool UseEntireSectionNum
-		{
-			get
-			{
-				return LazyLoad(ref _UseEntireSectionNum, "TabData/@UseEntireSectionNum");
-			}
-		}
 
 	}
 	#endregion

PROMS/Volian.Controls.Library/StepTabRibbon.cs

@@ -1029,23 +1029,10 @@ namespace Volian.Controls.Library
 		//		OpenEnhancedDocument(this, args);
 		//}
 		public event StepTabRibbonEvent PrintRequest;
-		public event StepTabRibbonEvent QPrintRequest;
-		private void OnPrintRequest(StepTabRibbonEventArgs args, int prttyp = 0)
+		private void OnPrintRequest(StepTabRibbonEventArgs args)
 		{
-			if (PrintRequest != null) {
-				if (prttyp == 0)
-				{
-					PrintRequest(this, args);
-				}
-			}
-
-			if (QPrintRequest != null)
-			{
-				if (prttyp == 1)
-				{
-					QPrintRequest(this, args);
-				}
-			}
+			if (PrintRequest != null)
+				PrintRequest(this, args);
 		}
 		public event StepTabRibbonEvent ContActionSummaryRequest;
 		private void OnContActionSummaryRequest(StepTabRibbonEventArgs args)
@@ -1960,7 +1947,7 @@ namespace Volian.Controls.Library
 				rtabChgId.Visible = MyItemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.ChangeBarData.ChangeIds;
 		}
 
-		#region submenu for printing child procedures
+#region submenu for printing child procedures
 		// C2020-013 add unit (child) submenu to create PDF and create CAS buttons
 		private void miMultiUnit_Click(object sender, EventArgs e)
 		{
@@ -1969,16 +1956,12 @@ namespace Volian.Controls.Library
 			DevComponents.DotNetBar.ButtonItem mip = mi.Parent as DevComponents.DotNetBar.ButtonItem;
 			int selectedChild = (int)mi.Tag;
 			if (selectedChild == 0) return; // unit (child) not selected
-
 			MyItemInfo.MyProcedure.ProcedureConfig.SelectedSlave = (int) mi.Tag;
 			switch (mip.Text)
 			{
 				case "Create":
 					btnPdfCreate_Click(sender, e);
 					break;
-				case "Quick\r\nPrint":
-					btnPdfQuickCreate_Click(sender, e);
-					break;
 				case "Cont. Act\r\nSummary":
 					btnCASCreate_Click(sender, e);
 					break;
@@ -1990,9 +1973,6 @@ namespace Volian.Controls.Library
 			btnPdfCreate.SubItems.Clear();
 			btnPdfCreate.Tag = null;
 			btnPdfCreate.Click -= new System.EventHandler(btnPdfCreate_Click);
-			btnPdfQuickCreate.SubItems.Clear();
-			btnPdfQuickCreate.Tag = null;
-			btnPdfQuickCreate.Click -= new System.EventHandler(btnPdfQuickCreate_Click);
 			btnCASCreate.SubItems.Clear();
 			btnCASCreate.Tag = null;
 			btnCASCreate.Click -= new System.EventHandler(btnCASCreate_Click);
@@ -2010,16 +1990,12 @@ namespace Volian.Controls.Library
 				btnPdfCreate.SubItems.Add(btn);
 				btn = MakeSubMenuButton(s, k, miMultiUnit_Click);
 				btn.Enabled = procAppl;
-				btnPdfQuickCreate.SubItems.Add(btn);
-				btn = MakeSubMenuButton(s, k, miMultiUnit_Click);
-				btn.Enabled = procAppl;
 				btnReviewCreatePDF.SubItems.Add(btn);
 				btn = MakeSubMenuButton(s, k, miMultiUnit_Click);
 				btn.Enabled = procAppl;
 				btnCASCreate.SubItems.Add(btn);
 			}
 			btnPdfCreate.AutoExpandOnClick = true;
-			btnPdfQuickCreate.AutoExpandOnClick = true;
 			btnReviewCreatePDF.AutoExpandOnClick = true;
 			btnCASCreate.AutoExpandOnClick = true;
 		}
@@ -4110,14 +4086,7 @@ namespace Volian.Controls.Library
 		{
 			if (MyItemInfo == null) return;   // if creating a pdf before rtb exists, return;
 			if (MyEditItem != null) MyEditItem.SaveCurrentAndContents();
-			OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure), 0);
-		}
-
-		private void btnPdfQuickCreate_Click(object sender, EventArgs e)
-		{
-			if (MyItemInfo == null) return;   // if creating a pdf before rtb exists, return;
-			if (MyEditItem != null) MyEditItem.SaveCurrentAndContents();
-			OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure), 1);
+			OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure));
 		}
 
 		private void btnCASCreate_Click(object sender, EventArgs e)

PROMS/Volian.Controls.Library/StepTabRibbon.resx

@@ -165,50 +165,6 @@
   <metadata name="superTooltipRibbon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <data name="btnPdfQuickCreate.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        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
-</value>
-  </data>
   <data name="btnDelelete.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6

PROMS/Volian.Controls.Library/vlnTreeView.cs

@@ -501,11 +501,6 @@ namespace Volian.Controls.Library
 		{
 			if (PrintProcedure != null) PrintProcedure(sender, args);
 		}
-		public event vlnTreeViewEvent QPrintProcedure;
-		private void OnQPrintProcedure(object sender, vlnTreeEventArgs args)
-		{
-			if (QPrintProcedure != null) QPrintProcedure(sender, args);
-		}
 		public event vlnTreeViewEvent PrintAllProcedures;
 		private void OnPrintAllProcedures(object sender, vlnTreeEventArgs args)
 		{
@@ -836,7 +831,6 @@ namespace Volian.Controls.Library
 								MenuItem micas = new MenuItem("Create Continuous Action Summary");
 								MenuItem mitcas = new MenuItem("Create Time Critical Action Summary"); //F2022-024 added menu option
 								MenuItem mip = new MenuItem("Print");
-								MenuItem miqp = new MenuItem("Quick Print");
 								MenuItem mia = new MenuItem("Approve");
 								int k = 0;
 								foreach (string s in pri.MyDocVersion.UnitNames)
@@ -847,9 +841,6 @@ namespace Volian.Controls.Library
 									MenuItem mp = mip.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
 									mp.Enabled = procAppl;
 									mp.Tag = k;
-									MenuItem mqp = miqp.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
-									mqp.Enabled = procAppl;
-									mqp.Tag = k;
 									MenuItem ma = mia.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
 									ma.Enabled = procAppl;
 									ma.Tag = k;
@@ -862,8 +853,7 @@ namespace Volian.Controls.Library
 								}
 								cm.MenuItems.Add(micas);
 								cm.MenuItems.Add(mitcas);
-								cm.MenuItems.Add(mip); 
-								cm.MenuItems.Add(miqp);
+								cm.MenuItems.Add(mip);
 								AddShowChangeBarsAfterMenuItem(cm.MenuItems, pri);
 								cm.MenuItems.Add(mia);
 								AddApprovedRevisionsMultiUnit(cm.MenuItems, pri);
@@ -873,8 +863,6 @@ namespace Volian.Controls.Library
 								cm.MenuItems.Add("Create Continuous Action Summary", new EventHandler(mi_Click));
 								cm.MenuItems.Add("Create Time Critical Action Summary", new EventHandler(mi_Click));
 								cm.MenuItems.Add("Print", new EventHandler(mi_Click));
-								cm.MenuItems.Add("Quick Print", new EventHandler(mi_Click));
-								//MenuItem miqp = new MenuItem("Print");
 								AddShowChangeBarsAfterMenuItem(cm.MenuItems, pri);
 								cm.MenuItems.Add("Approve", new EventHandler(mi_Click));
 								//_MyLog.WarnFormat("Context Menu 1 before - {0}", GC.GetTotalMemory(true));
@@ -889,24 +877,19 @@ namespace Volian.Controls.Library
 							if (pri.MyDocVersion.MultiUnitCount > 1)
 							{
 								MenuItem mip = new MenuItem("Print");
-								MenuItem miqp = new MenuItem("Quick Print");
 								int k = 0;
 								foreach (string s in pri.MyDocVersion.UnitNames)
 								{
 									k++;
 									MenuItem mp = mip.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
 									mp.Tag = k;
-									MenuItem mqp = miqp.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
-									mqp.Tag = k;
 								}
 								cm.MenuItems.Add(mip);
-								cm.MenuItems.Add(miqp);
 								AddApprovedRevisionsMultiUnit(cm.MenuItems, pri);
 							}
 							else
 							{
 								cm.MenuItems.Add("Print", new EventHandler(mi_Click));
-								cm.MenuItems.Add("Quick Print", new EventHandler(mi_Click));
 								AddApprovedRevisions(cm.MenuItems, pri);
 							}
 						}
@@ -1744,9 +1727,6 @@ namespace Volian.Controls.Library
 				case "Print":
 					OnPrintProcedure(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag));
 					break;
-				case "Quick Print":
-					OnQPrintProcedure(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag));
-					break;
 				case "Print All Procedures for":
 					OnPrintAllProcedures(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0,mi.Text,(int)mi.Tag));
 					break;
@@ -1987,9 +1967,6 @@ namespace Volian.Controls.Library
 				case "Print":
 					OnPrintProcedure(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));
 					break;
-				case "Quick Print":
-					OnQPrintProcedure(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));
-					break;
 				case "Print All Procedures":
 					OnPrintAllProcedures(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));
 					break;

PROMS/Volian.Print.Library/Pagination.cs

@@ -569,22 +569,9 @@ namespace Volian.Print.Library
 					KeepStepsOnPage = false;
 				}
 			}
-			if (KeepStepsOnPage && ySizeIncludingFirst > (yWithinMargins - ySizeBtmCtnMess1 - ySizeBtmEndMess1))
-			{
-			// B2023-116: Vogtle alarm pagination - sub-steps are separating from their HLS even if there is room for some (not all).
-			// See comment above for setting of 'alarmPageKeepHighWithSubs'.
-				if (alarmPageKeepHighWithSubs)
-				{
-				// F2024-006: Vogtle Alarms pagination - compare the size of the step and its first sub-step with what we think we  have left on the
-				// page. if not enough room with a continue message then set KeepStepsOnPage to start this step on its own page.
-				// This solved an issue where the last line of step text was printing on top of the bottom continue message
-					float myFirstPieceSize = GetFirstPieceSize(true);
-					if (myFirstPieceSize > yWithinMargins)
-						KeepStepsOnPage = false;
-				}
-				else
-					KeepStepsOnPage = false;
-			}
+			// B2023-116: Vogtle alarm pagination - sub-steps are separating from their HLS even if there is room for some (not all).  See comment above for setting of 
+			//	'alarmPageKeepHighWithSubs'.
+			if (KeepStepsOnPage && !alarmPageKeepHighWithSubs && ySizeIncludingFirst > (yWithinMargins - ySizeBtmCtnMess1 - ySizeBtmEndMess1)) KeepStepsOnPage = false;
 			if (!KeepWithHeader && !KeepStepsOnPage && mySize - SixLinesPerInch + yEndMsg - tableSpaceAvailable <= yPageSizeNextPage)	// if the entire step can fit on one page, do a page break
 			{
 				// Don't want extra line before step

PROMS/Volian.Print.Library/VlnSvgPageHelper.cs

@@ -1934,6 +1934,8 @@ i = 0;
 							else
 								eopnum = section.MyProcedure.DisplayNumber;// B2021-066: found and fixed during proc pc/pc work
 						}
+						
+
 					}
 					// B2022-066 the "{PREDELIMEOPNUM}" token was not being processed because there was a space after the "{"
 					if (token.Equals("{PREDELIMEOPNUM}"))
@@ -1945,10 +1947,6 @@ i = 0;
 						if (idx < eopnum.Length)
 							eopnum = eopnum.Substring(0, idx);
 					}
-
-					if (pageItem.TrimEnding != null)
-						eopnum = eopnum.TrimEnd(pageItem.TrimEnding.ToCharArray());
-
 					plstr = plstr.Replace(token, eopnum);
 					//svgGroup.Add(PageItemToSvgText(pageItem, pageItem.Token.Replace(token, eopnum)));
 					//svgGroup.Add(PageItemToSvgText(pageItem, pageItem.Token.Replace(token, section.MyProcedure.MyContent.Number)));

PROMS/Volian.Print.Library/vlnParagraph.cs

@@ -1046,9 +1046,8 @@ namespace Volian.Print.Library
 
 			// Calvert Alarms have a special case,  center text if the next/previous is not the same type of caution or note.  
 			// Calvert Alarms have a note1 that is a warning. if a regular note preceeded it, this regular note was not centered.
-			// F2023-126: Vogtle Alarms - center single line caution/note if more than one type exist off step, added the check for NoteCautionCenterOneAllTypes
 			bool doAlign = false;
-			if ((MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert || MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.NoteCautionCenterOneAllTypes) && (MyItemInfo.IsCaution || MyItemInfo.IsNote || MyItemInfo.IsNote1))
+			if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert && (MyItemInfo.IsCaution || MyItemInfo.IsNote || MyItemInfo.IsNote1))
 			{
 				bool diffAsPrev = MyItemInfo.MyPrevious == null || (MyItemInfo.MyPrevious != null && MyItemInfo.MyContent.Type != MyItemInfo.MyPrevious.MyContent.Type);
 				bool diffAsNext = MyItemInfo.NextItem == null || (MyItemInfo.NextItem != null && MyItemInfo.MyContent.Type != MyItemInfo.NextItem.MyContent.Type);
@@ -1913,11 +1912,7 @@ namespace Volian.Print.Library
 					float bcm_yLocation = TableBottom == -1 ? yLocation: Math.Min(TableBottom,yLocation);
 					DoBottomContinueMsg(cb, yBottomMargin, bcm_yLocation, docstyle, doThreeContinues);
 					MyPromsPrinter.NewPage();
-					// C2018-003 fixed use of getting the active section
-					// F2023-112 Vogtle Units 3 & 4 background document format DSS_PageListBkgndStpContMsg to print continue message next to step number
-					if (MyItemInfo.IsStep && (MyItemInfo.ActiveSection != null && 
-						((MyItemInfo.ActiveSection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_PageListSpBckgrnd) == E_DocStructStyle.DSS_PageListSpBckgrnd) ||
-						((MyItemInfo.ActiveSection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_PageListBkgndStpContMsg) == E_DocStructStyle.DSS_PageListBkgndStpContMsg))) 
+					if (MyItemInfo.IsStep && (MyItemInfo.ActiveSection != null && ((MyItemInfo.ActiveSection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_PageListSpBckgrnd) == E_DocStructStyle.DSS_PageListSpBckgrnd))) // C2018-003 fixed use of getting the active section
 					{
 						// check if parent (can be HLS, Caution or Note) has the UseOldTemplate.  If so,
 						// flag that a continue message should be printed as part of a pagelist header (if pagelist
@@ -2828,35 +2823,25 @@ namespace Volian.Print.Library
 						ItemInfo parentStep = MyItemInfo.MyHLS; // get the high level step
 						myMsg = string.Format(myMsg, parentStep.CombinedTab, parentStep.DisplayTextKeepSpecialChars);
 				}
-				// B2023-115 Top continue message for Vogtle Alarms: 1st version done on 12/6/23.  Changes to logic as per request
-				//	from engineering done on 12/12/23.  See comment below for logic for 12/12/23 (history of this file has previous
-				//	logic)
-				if ((docstyle.Continue.Top.HLS ?? 0) == 4)
+				if ((docstyle.Continue.Top.HLS ?? 0) == 4)  // B2023-115 Top continue message for Vogtle Alarms
 				{
 					// Vogtle Alarms: Their alarms are set up differently than standard procedures - the HLS in Vogtle
-					//	alarms is a section in other procedures.  The top continue message is shown when a break occurs:
-					//	•	A continued message will appear on the top of the page ONLY if the pagination occurs anywhere
-					//		within the first level substep.  If, for example, the page break occurs between substep 3 and substep
-					//		4 as in example 2, no continued message will appear on the top of the page.
-					//	•	If a continued message is needed, the continued message will include the first level substep number
-					//		if it is a sequential substep, such as “5.  (continued)”.  If it is NOT a sequential substep, then only
-					//		the word “(continued)” will appear.
-					//	•	If a page break occurs between high level steps, such as before “Causes:”, then no continued message is needed.
-					bool doMessage = true;
-					if (MyItemInfo.IsHigh) doMessage = false;				// at high, don't do message
-					if (MyItemInfo.MyParent.IsHigh) doMessage = false;		// at first level, don't do message
-					// Caution/Note on first level, don't do message
-					if ((MyItemInfo.IsCaution || MyItemInfo.IsNote) && MyItemInfo.MyParent.MyParent.IsHigh) doMessage = false;
+					//	alarms is a section in other procedures.  The top continue message is shown when a break occurs between 
+					//	first level sub-steps '(continued)' with no step number as part of message' within the first level sub-step
+					//	only if it is sequential (which is like a HLS in standard procedures) and the continue message
+					//	has the first level sub-step's tab.  There should be NO continue message if the break occurs at the HLS.
+					ItemInfo cur = MyItemInfo;
+					if (!(cur.IsCaution || cur.IsNote || cur.IsHigh))
+						while (!cur.MyParent.IsHigh) cur = cur.MyParent;	// get to the first level substep to get its tab
 					myMsg = docstyle.Continue.Top.Message;
-					if (doMessage)
+					// if within first level sequential, add on the sequential's number:
+					if (!cur.IsHigh && cur.IsSequential && MyItemInfo.MyParent.MyParent.IsHigh)
 					{
-						// Get to highest level below HLS
-						ItemInfo cur = MyItemInfo;
-						while (!cur.MyParent.IsHigh) cur = cur.MyParent;
-						// if sequential, add on step number, otherwise just put out message:
-						myMsg = !cur.IsSequential ? myMsg : cur.CombinedTab + ". " + myMsg;
+						ItemInfo parentStep = MyItemInfo.MyParent;
+						myMsg = MyItemInfo.IsHigh ? myMsg : parentStep.CombinedTab + ". " + myMsg;
 					}
-					else // if not doing message, clear it & set yPageStart back to what it was before handling message		
+					// don't put a message out for HLS, note that the page start is decremented above so need to add that amount back on
+					if (MyItemInfo.IsHigh)		
 					{
 						myMsg = "";
 						yPageStart += 2 * SixLinesPerInch;
@@ -3314,11 +3299,9 @@ namespace Volian.Print.Library
 		/// This gets the height of the step with it's Caution's, Notes and potentially any First Substeps
 		/// </summary>
 		/// <returns></returns>
-		// F2024-006: Vogtle Alarms pagination - added 'includeFirstSub' to get that size of the first substep with the parent step
-		//            to help determine pagination
-		private float GetFirstPieceSize(bool includeFirstSub = false)
+		private float GetFirstPieceSize()
 		{
-			vlnParagraph paraLast = GetFirstPieceLastPart(includeFirstSub);
+			vlnParagraph paraLast = GetFirstPieceLastPart();
 			float retval = (paraLast.YBottom) - YTopMost;
 			//Console.WriteLine(MyItemInfo.DBSequence);
 			return retval;
@@ -3372,12 +3355,10 @@ namespace Volian.Print.Library
 			get { return _YBottomForBox; }
 			set { _YBottomForBox = value; }
 		}
-		// F2024-006: Vogtle Alarms pagination - added 'includeFirstSub' to get that size of the first substep with the parent step
-		//            to help determine pagination - even when PaginateOnFirstSubstep is turned on
-		private vlnParagraph GetFirstPieceLastPart(bool includeFirstSub = false)
+		private vlnParagraph GetFirstPieceLastPart()
 		{
 			vlnParagraph para = this;
-			if ((!MyItemInfo.ActiveFormat.MyStepSectionLayoutData.PaginateOnFirstSubstep || includeFirstSub) && ChildrenBelow != null && ChildrenBelow.Count > 0)
+			if (!MyItemInfo.ActiveFormat.MyStepSectionLayoutData.PaginateOnFirstSubstep && ChildrenBelow != null && ChildrenBelow.Count > 0)
 			{
 				// If the substep has a separator (OR, AND) then return the last substep rather than the first.
 				string mySep = ChildrenBelow[0].MyItemInfo.FormatStepData.Sep ?? "{Null}";
@@ -3390,14 +3371,14 @@ namespace Volian.Print.Library
 					if (keepEqListTogether && !ChildrenBelow[0].MyItemInfo.IsSequential && !this.MyItemInfo.IsHigh) // Extend to the last Item.
 						para = ChildrenBelow[ChildrenBelow.Count - 1].GetFirstPieceLastPart();
 					else
-						para = ChildrenBelow[0].GetFirstPieceLastPart(includeFirstSub);
+						para = ChildrenBelow[0].GetFirstPieceLastPart();
 				}
 			}
 			if (ChildrenRight != null && ChildrenRight.Count > 0)
 			{
 				foreach (vlnParagraph paraRight in ChildrenRight)
 				{
-					vlnParagraph paraRightLast = paraRight.GetFirstPieceLastPart(includeFirstSub);
+					vlnParagraph paraRightLast = paraRight.GetFirstPieceLastPart();
 					if (paraRightLast.YBottom > para.YBottom)
 						para = paraRightLast;
 				}
@@ -6238,8 +6219,7 @@ namespace Volian.Print.Library
 					if (!itemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm || !UseTemplateWidthOrXOff(itemInfo.MyParent))
 					{
 						// B2018-146 Adjust the width to match the HLS Right Margin.
-						// F2023-112 added format flag for Vogtle Units 3 & 4 backgrounds. This allows use of override width on AND and List sub-step types
-						if (itemInfo.IsBackgroundStepOrChild() || itemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.Vogtle3and4BackgroundFormat)
+						if (itemInfo.IsBackgroundStepOrChild())
 							Width = this.MyHighLevelParagraph.Width + this.MyHighLevelParagraph.XOffset - this.XOffset;
 						else
 							Width = (float)itemInfo.MyDocStyle.Layout.PageWidth - (float)itemInfo.MyDocStyle.Layout.LeftMargin - delta;
@@ -6616,7 +6596,7 @@ namespace Volian.Print.Library
 			int? bxIndx = itemInfo.IsStep ? itemInfo.FormatStepData.StepLayoutData.STBoxindex : null;
 			float? widOvrd = 0;
 			float xwid = 0;
-				if (itemInfo.IsStep && itemInfo.MyHLS != null && UseTemplateWidthOrXOff(itemInfo) && (xwid = GetWidthOrStartFromTemplate(itemInfo, formatInfo, true)) > 0)
+			if (itemInfo.IsStep && itemInfo.MyHLS != null && UseTemplateWidthOrXOff(itemInfo) && (xwid = GetWidthOrStartFromTemplate(itemInfo, formatInfo, true)) > 0)
 				widOvrd = xwid;
 			else
 				widOvrd = itemInfo.FormatStepData == null ? null : itemInfo.FormatStepData.WidthOverride == null ? null :
@@ -6675,15 +6655,10 @@ namespace Volian.Print.Library
 			}
 			if ((widOvrd ?? 0) != 0)
 			{
-				//F2023-112 Vogtle Units 3 & 4 Backgrounds. Don't use override width of paragraph when it's off of TitleWithTextRight
-				//          We need to allow the code to calculate the width of that paragraph for this case (later in this function)
-				if (!(itemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.Vogtle3and4BackgroundFormat && itemInfo.MyParent.FormatStepData != null && itemInfo.MyParent.FormatStepData.Type == "TitleWithTextRight"))
-				{
-					Width = (float)widOvrd;
-					// if there's a box, we may need to do an adjustment on the width, if the tab data was changed
-					// so don't return.
-					if (bxIndx == null) return;
-				}
+				Width = (float)widOvrd;
+				// if there's a box, we may need to do an adjustment on the width, if the tab data was changed
+				// so don't return.
+				if (bxIndx == null) return;
 			}
 			float tabWidth = (myTab == null) ? 0 : myTab.Width;
 			if (itemInfo.IsHigh)