B2017-091The Checkbox for inserting blank pages for duplex printing was shortened so that it does not run into the Cancel button. It now reads “Add Blank Pages For Duplex Printing”. Also when print a procedure that has facing pages this check box is checked by default.

B2017-090 Commented out a line of code that is no longer needed for printing facing pages, but was causing the main procedure to paginate incorrectly.
Sped up the logic that calculates how small to shrink the font size on the supplemental information facing page.
This commit is contained in:
2017-05-22 15:32:47 +00:00
parent 2055fa863e
commit 68aa1e9aab
4 changed files with 209 additions and 182 deletions

View File

@@ -1151,9 +1151,9 @@ namespace VEPROMS
this.cbxBlankPgsForDuplex.Location = new System.Drawing.Point(138, 340);
this.cbxBlankPgsForDuplex.Margin = new System.Windows.Forms.Padding(2);
this.cbxBlankPgsForDuplex.Name = "cbxBlankPgsForDuplex";
this.cbxBlankPgsForDuplex.Size = new System.Drawing.Size(323, 19);
this.cbxBlankPgsForDuplex.Size = new System.Drawing.Size(262, 19);
this.cbxBlankPgsForDuplex.TabIndex = 101;
this.cbxBlankPgsForDuplex.Text = "Add Blank Pages For Duplex Foldouts or SAMG Facing Pages";
this.cbxBlankPgsForDuplex.Text = "Add Blank Pages For Duplex Printing\r\n";
this.cbxBlankPgsForDuplex.UseVisualStyleBackColor = false;
//
// cbxGeneratePlacekeeper
@@ -1196,7 +1196,7 @@ namespace VEPROMS
this.cbxRemoveManualPageBreaks.Location = new System.Drawing.Point(138, 306);
this.cbxRemoveManualPageBreaks.Margin = new System.Windows.Forms.Padding(2);
this.cbxRemoveManualPageBreaks.Name = "cbxRemoveManualPageBreaks";
this.cbxRemoveManualPageBreaks.Size = new System.Drawing.Size(91, 19);
this.cbxRemoveManualPageBreaks.Size = new System.Drawing.Size(370, 19);
this.cbxRemoveManualPageBreaks.TabIndex = 101;
this.cbxRemoveManualPageBreaks.Text = "Remove Trailing Hard Returns && Manual Page Breaks";
this.cbxRemoveManualPageBreaks.UseVisualStyleBackColor = false;
@@ -1336,4 +1336,4 @@ namespace VEPROMS
private DevComponents.DotNetBar.ButtonX btnPdfLocation;
private System.Windows.Forms.CheckBox cbxGenerateConActSum;
}
}
}

View File

@@ -126,7 +126,7 @@ namespace VEPROMS
_AllProcedures = true;
_DocVersionConfig = dvi.DocVersionConfig;
_DocVersionInfo = dvi;
_MyProcedure = dvi.Procedures[0].MyProcedure;
MyProcedure = dvi.Procedures[0].MyProcedure;
btnCreatePDF.Text = "Create PDFs";
HandleDocVersionSettings();
PrepForAllOrOne(false);
@@ -141,13 +141,13 @@ namespace VEPROMS
_AllProcedures = true;
_DocVersionConfig = dvi.DocVersionConfig;
_DocVersionInfo = dvi;
_MyProcedure = dvi.Procedures[0].MyProcedure;
cbxBlankPgsForDuplex.Checked = dvi.DocVersionConfig.Print_AddBlankPagesWhenUsingDuplexFoldouts;
MyProcedure = dvi.Procedures[0].MyProcedure;
btnCreatePDF.Text = "Create PDFs";
HandleDocVersionSettings();
PrepForAllOrOne(false);
// don't open all PDFs if doing All Procedures
//cbxOpenAfterCreate2.Checked = dvi.DocVersionConfig.Print_AlwaysViewPDFAfterCreate;
cbxBlankPgsForDuplex.Checked = dvi.DocVersionConfig.Print_AddBlankPagesWhenUsingDuplexFoldouts;
}
private void PrepForAllOrOne(bool oneProcedure)
{
@@ -182,12 +182,12 @@ namespace VEPROMS
InitializeComponent();
_AllProcedures = false;
_DocVersionConfig = pi.MyDocVersion.DocVersionConfig;
_MyProcedure = pi;
cbxBlankPgsForDuplex.Checked = pi.MyDocVersion.DocVersionConfig.Print_AddBlankPagesWhenUsingDuplexFoldouts;
MyProcedure = pi;
btnCreatePDF.Text = "Create PDF";
HandleDocVersionSettings();
PrepForAllOrOne(true);
cbxOpenAfterCreate2.Checked = pi.MyDocVersion.DocVersionConfig.Print_AlwaysViewPDFAfterCreate;
cbxBlankPgsForDuplex.Checked = pi.MyDocVersion.DocVersionConfig.Print_AddBlankPagesWhenUsingDuplexFoldouts;
}
public DlgPrintProcedure(ProcedureInfo pi, bool automatic) // RHM20150506 Multiline ItemID TextBox
{
@@ -196,12 +196,12 @@ namespace VEPROMS
Rtf2iTextSharp.DoingComparison = cbxDebug.Checked;
_AllProcedures = false;
_DocVersionConfig = pi.MyDocVersion.DocVersionConfig;
_MyProcedure = pi;
cbxBlankPgsForDuplex.Checked = pi.MyDocVersion.DocVersionConfig.Print_AddBlankPagesWhenUsingDuplexFoldouts;
MyProcedure = pi;
btnCreatePDF.Text = "Create PDF";
HandleDocVersionSettings();
PrepForAllOrOne(true);
cbxOpenAfterCreate2.Checked = pi.MyDocVersion.DocVersionConfig.Print_AlwaysViewPDFAfterCreate;
cbxBlankPgsForDuplex.Checked = pi.MyDocVersion.DocVersionConfig.Print_AddBlankPagesWhenUsingDuplexFoldouts;
}
/// <summary>
/// RHM 20120925 Added so that the dialog would center over the PROMS window
@@ -526,7 +526,13 @@ namespace VEPROMS
public ProcedureInfo MyProcedure
{
get { return _MyProcedure; }
set { _MyProcedure = value; }
set
{
_MyProcedure = value;
// if procedure has supplemental information, the automatially check the add blank pages for duplex printing
if (_MyProcedure.ProcHasSupInfoData)
cbxBlankPgsForDuplex.Checked = true;
}
}
private int _SelectedSlave = 0;
public int SelectedSlave