Compare commits
8 Commits
B2025-056
...
F2025-030_
| Author | SHA1 | Date | |
|---|---|---|---|
| f3c8c860f5 | |||
| f7b27142c4 | |||
| 4fc37c54c5 | |||
| 849e1e57dd | |||
| c768ca5eba | |||
| c9516d90e9 | |||
| 327aae687a | |||
| 3cbe4617eb |
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -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;
|
||||
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user