Compare commits
2 Commits
C2025-027-
...
B2025-036-
Author | SHA1 | Date | |
---|---|---|---|
ad0d091b49 | |||
22de686a44 |
@@ -1483,9 +1483,11 @@ namespace VEPROMS
|
||||
// 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;
|
||||
if (args.OringFlg == 1) // B2025-036 split screen print issue. if oringFlg == 1 the ctrl-p keys was pressed.
|
||||
{
|
||||
if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis;
|
||||
}
|
||||
|
||||
// Check if Procedure Info is null
|
||||
if (pi == null) return;
|
||||
@@ -1527,8 +1529,11 @@ namespace VEPROMS
|
||||
if (_CurrentItem != null) piThis = _CurrentItem.MyProcedure;
|
||||
|
||||
ProcedureInfo pi = args.Proc as ProcedureInfo;
|
||||
if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis;
|
||||
|
||||
if (args.OringFlg == 1) // B2025-036 split screen print issue. if oringFlg == 1 the ctrl-p keys was pressed.
|
||||
{
|
||||
if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis;
|
||||
}
|
||||
// Check if Procedure Info is null
|
||||
if (pi == null) return;
|
||||
|
||||
|
@@ -618,6 +618,15 @@ namespace Volian.Controls.Library
|
||||
}
|
||||
private int _MyLastFormatID = -1;
|
||||
private StepRTB _MyStepRTB;
|
||||
private static int _OringFlg;
|
||||
public static int OringFlg
|
||||
{
|
||||
get { return _OringFlg; }
|
||||
set
|
||||
{
|
||||
_OringFlg = value;
|
||||
}
|
||||
}
|
||||
public StepRTB MyStepRTB
|
||||
{
|
||||
get { return _MyStepRTB; }
|
||||
@@ -4143,16 +4152,22 @@ namespace Volian.Controls.Library
|
||||
|
||||
private void btnPdfCreate_Click(object sender, EventArgs e)
|
||||
{
|
||||
// B2025-036 split screen print issue. if oringFlg == 1 the ctrl-p keys was pressed.
|
||||
_OringFlg = 0;
|
||||
DevComponents.DotNetBar.eEventSource oring = ((DevComponents.DotNetBar.Events.EventSourceArgs)e).Source;
|
||||
if (oring == eEventSource.Keyboard)
|
||||
_OringFlg = 1;
|
||||
|
||||
if (MyItemInfo == null) return; // if creating a pdf before rtb exists, return;
|
||||
if (MyEditItem != null) MyEditItem.SaveCurrentAndContents();
|
||||
OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure), 0);
|
||||
OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure, _OringFlg), 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, _OringFlg), 1);
|
||||
}
|
||||
|
||||
private void btnCASCreate_Click(object sender, EventArgs e)
|
||||
@@ -4814,9 +4829,10 @@ namespace Volian.Controls.Library
|
||||
public class StepTabRibbonEventArgs : EventArgs
|
||||
{
|
||||
public StepTabRibbonEventArgs() { ; }
|
||||
public StepTabRibbonEventArgs(ItemInfo proc)
|
||||
public StepTabRibbonEventArgs(ItemInfo proc, int oringFlg = 0)
|
||||
{
|
||||
_Proc = proc;
|
||||
OringFlg = oringFlg;
|
||||
}
|
||||
private ItemInfo _Proc;
|
||||
|
||||
@@ -4825,6 +4841,13 @@ namespace Volian.Controls.Library
|
||||
get { return _Proc; }
|
||||
set { _Proc = value; }
|
||||
}
|
||||
// B2025-036 split screen print issue. if oringFlg == 1 the ctrl-p keys was pressed.
|
||||
private int _OringFlg;
|
||||
public int OringFlg
|
||||
{
|
||||
get { return _OringFlg; }
|
||||
set { _OringFlg = value; }
|
||||
}
|
||||
}
|
||||
public delegate void StepTabRibbonEvent(object sender, StepTabRibbonEventArgs args);
|
||||
|
||||
|
Reference in New Issue
Block a user