diff --git a/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs b/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs index 68117f97..795b6fdd 100644 --- a/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs +++ b/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs @@ -12,6 +12,12 @@ namespace VEPROMS { public partial class frmPDFStatusForm : Form { + private bool _CloseWhenDone = false; + public bool CloseWhenDone + { + get { return _CloseWhenDone; } + set { _CloseWhenDone = value; } + } private string _PDFPath; public string PDFPath @@ -91,6 +97,11 @@ namespace VEPROMS return; } btnOpenFolder.Visible = btnOpenPDF.Visible = true; + if (CloseWhenDone) + { + this.Close(); + return; + } } private void btnOpenPDF_Click(object sender, EventArgs e) diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 16ad5207..114b0328 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -195,6 +195,23 @@ namespace VEPROMS ContentInfo.InfoChanged += new ContentInfoEvent(RefreshDisplayHistory); ItemInfo.InfoRestored += new ItemInfoEvent(RefreshDisplayHistory); ItemInfo.ItemDeleted += new ItemInfoEvent(RefreshDisplayHistory); + tv.PrintProcedure += new vlnTreeViewEvent(tv_PrintProcedure); + tv.PrintAllProcedures += new vlnTreeViewEvent(tv_PrintAllProcedures); + } + + void tv_PrintAllProcedures(object sender, vlnTreeEventArgs args) + { + DocVersionInfo dvi = (args.Node as VETreeNode).VEObject as DocVersionInfo; + if (dvi == null) return; + DlgPrintProcedure prnDlg = new DlgPrintProcedure(dvi); + prnDlg.Show(); + } + void tv_PrintProcedure(object sender, vlnTreeEventArgs args) + { + ProcedureInfo pi = (args.Node as VETreeNode).VEObject as ProcedureInfo; + if (pi == null) return; + DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi); + prnDlg.Show(); } void RefreshDisplayHistory(object sender) { diff --git a/PROMS/Volian.Base.Library/VlnSettings.cs b/PROMS/Volian.Base.Library/VlnSettings.cs index 078e743d..43f89d16 100644 --- a/PROMS/Volian.Base.Library/VlnSettings.cs +++ b/PROMS/Volian.Base.Library/VlnSettings.cs @@ -16,6 +16,18 @@ namespace Volian.Base.Library // // For DataLoader, this is set via the Debug checkbox on the form. private static bool WasLoaded = false; + private static bool _DebugPagination = false; + public static bool DebugPagination + { + get { return VlnSettings._DebugPagination; } + set { VlnSettings._DebugPagination = value; } + } + private static bool _DebugText = false; + public static bool DebugText + { + get { return VlnSettings._DebugText; } + set { VlnSettings._DebugText = value; } + } private static bool _DebugMode = false; public static bool DebugMode {