C2024-001 Quick-Print-in-ribbon
This commit is contained in:
3093
PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs
generated
3093
PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
@@ -21,7 +21,6 @@ using DescriptiveEnum;
|
||||
using Volian.Base.Library;
|
||||
using Volian.Print.Library;
|
||||
using JR.Utils.GUI.Forms;
|
||||
using System.Diagnostics;
|
||||
|
||||
[assembly: log4net.Config.XmlConfigurator(Watch = true)]
|
||||
|
||||
@@ -45,7 +44,7 @@ namespace VEPROMS
|
||||
public FindReplace dlgFindReplace = null;
|
||||
public VlnSpellCheck SpellChecker = null;
|
||||
private Int64 _LastContentChange;
|
||||
|
||||
|
||||
public Int64 LastContentChange
|
||||
{
|
||||
get { return _LastContentChange; }
|
||||
@@ -88,6 +87,8 @@ 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;
|
||||
@@ -1408,14 +1409,51 @@ 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;
|
||||
|
||||
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
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
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;
|
||||
|
||||
|
||||
//added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
|
||||
pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
|
||||
pi.MyDocVersion.DocVersionConfig.SelectedSlave = pi.ProcedureConfig.SelectedSlave;
|
||||
|
||||
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void displaySearch1_PrintRequest(object sender, DisplaySearchEventArgs args)
|
||||
@@ -4897,26 +4935,11 @@ namespace VEPROMS
|
||||
_MyLog.Error(str, ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void btnShowErrFld_Click(object sender, EventArgs e)
|
||||
{
|
||||
string path = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
|
||||
path = path + @"\Documents\VEPROMS";
|
||||
if (Directory.Exists(path))
|
||||
{
|
||||
Process.Start("explorer.exe", path);
|
||||
}
|
||||
}
|
||||
#region (Lock stuff / used for multi-user support)
|
||||
|
||||
private void btnHelp_Click(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
#region (Lock stuff / used for multi-user support)
|
||||
|
||||
public class TabItemsToClose : Stack<DisplayTabItem>
|
||||
public class TabItemsToClose : Stack<DisplayTabItem>
|
||||
{
|
||||
public void PushDTI(DisplayTabItem dti)
|
||||
{
|
||||
|
@@ -188,11 +188,6 @@
|
||||
llg/yF+gIjK+CZq8XgAAAABJRU5ErkJggg==
|
||||
</value>
|
||||
</data>
|
||||
<data name="btnShowErrFld.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAANUlEQVR4nGNgoBR8ahL8jw1/bBTooMiAT8Qa8gmPAUQZ8n+Z3n9KMMOoAf9Hw0CPCmEw4AAA71z+QhwwNhoAAAAASUVORK5CYII=
|
||||
</value>
|
||||
</data>
|
||||
<data name="office2007StartButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
R0lGODlhGwAVAIcAANmsrP7+/tqtrdmrq9Wjo9uwsNmtrf79/dSgoP/+/tShodalpdqsrN20tN64uNqv
|
||||
@@ -455,7 +450,7 @@
|
||||
<value>164, 17</value>
|
||||
</metadata>
|
||||
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>25</value>
|
||||
<value>64</value>
|
||||
</metadata>
|
||||
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
|
Reference in New Issue
Block a user