F2025-029 Added the Westinghouse Proprietary statement to all of the section styles in the Vogtle Units 3 & 4 formats

Merge pull request 'B2021-092 The "Custom Change Bar Text" option does not output any change bar text in the PDF output when information is added to Line one and/or Line two off the print dialog.' (#643 ) from B2021-092 into Development
good for testing phase
2025-10-30 11:15:30 -04:00 · 2025-10-27 08:18:29 -04:00 · 2025-10-27 08:16:59 -04:00 · 2025-10-24 14:55:13 -04:00 · 2025-10-24 11:12:39 -04:00 · 2025-10-22 14:28:01 -04:00
5 changed files with 7 additions and 1 deletions
--- a/PROMS/Formats/fmtall/VEGP1all.xml
+++ b/PROMS/Formats/fmtall/VEGP1all.xml
--- a/PROMS/Formats/fmtall/VEGP2all.xml
+++ b/PROMS/Formats/fmtall/VEGP2all.xml
--- a/PROMS/Formats/fmtall/VEGPAlrall.xml
+++ b/PROMS/Formats/fmtall/VEGPAlrall.xml
--- a/Interface/DlgPrintProcedure.cs
+++ b/Interface/DlgPrintProcedure.cs
@@ -1099,7 +1099,9 @@ namespace VEPROMS
 					(int)changeBarData.FixedChangeColumn :
 					System.Convert.ToInt32(changeBarData.DefaultCBLoc.Split(" ,".ToCharArray())[System.Convert.ToInt32(cbd.MyChangeBarLoc)]);
 				//cbd.MyChangeBarColumn = (int)changeBarData.FixedChangeColumn;
-				if (cbd.MyChangeBarText == PrintChangeBarText.UserDef)
+				if (cbd.MyChangeBarText == PrintChangeBarText.UserDef && !string.IsNullOrEmpty(ppTxbxChangeBarUserMsgOne.Text))
+					cbd.MyChangeBarMessage = ppTxbxChangeBarUserMsgOne.Text + @"\n" + ppTxbxChangeBarUserMsgTwo.Text;
+				else if (cbd.MyChangeBarText == PrintChangeBarText.UserDef)
 					cbd.MyChangeBarMessage = _DocVersionConfig.Print_UserCBMess1 + @"\n" + _DocVersionConfig.Print_UserCBMess2;

 			}
--- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs
+++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs
@@ -4190,15 +4190,19 @@ namespace Volian.Controls.Library
 			if (oring == eEventSource.Keyboard)
 				_OringFlg = 1;

+			int selectedSlave = MyItemInfo.MyProcedure.ProcedureConfig.SelectedSlave;
 			if (MyItemInfo == null) return;   // if creating a pdf before rtb exists, return;
 			if (MyEditItem != null) MyEditItem.SaveCurrentAndContents();
+			MyItemInfo.MyProcedure.ProcedureConfig.SelectedSlave = selectedSlave;
 			OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure, _OringFlg), 0);
 		}

 		private void btnPdfQuickCreate_Click(object sender, EventArgs e)
 		{
+			int selectedSlave = MyItemInfo.MyProcedure.ProcedureConfig.SelectedSlave;
 			if (MyItemInfo == null) return;   // if creating a pdf before rtb exists, return;
 			if (MyEditItem != null) MyEditItem.SaveCurrentAndContents();
+			MyItemInfo.MyProcedure.ProcedureConfig.SelectedSlave = selectedSlave;
 			OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure, _OringFlg), 1);
 		}
Author	SHA1	Message	Date
John Jenko	4fc37c54c5	F2025-029 Added the Westinghouse Proprietary statement to all of the section styles in the Vogtle Units 3 & 4 formats	2025-10-30 11:15:30 -04:00
John Jenko	849e1e57dd	Merge pull request 'B2021-092 The "Custom Change Bar Text" option does not output any change bar text in the PDF output when information is added to Line one and/or Line two off the print dialog.' (#643 ) from B2021-092 into Development good for testing phase	2025-10-27 08:18:29 -04:00
John Jenko	c768ca5eba	Merge pull request 'B2025-053 Printing from Ribbon while Edits in progress' (#642 ) from B2025-053 into Development good for testing phase	2025-10-27 08:16:59 -04:00
mschill	c9516d90e9	B2021-092 The "Custom Change Bar Text" option does not output any change bar text in the PDF output when information is added to Line one and/or Line two off the print dialog.	2025-10-24 14:55:13 -04:00
mschill	327aae687a	B2025-053 Printing from Ribbon while Edits in progress	2025-10-24 11:12:39 -04:00
John Jenko	3cbe4617eb	Merge pull request 'B2025-056 Incoming Transitions Go To Procedure' (#641 ) from B2025-056 into Development good for testing phase	2025-10-22 14:28:01 -04:00