Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

C2019-012: Merge pdfs

Browse Source
This commit is contained in:
Kathy Ruffing
2019-03-12 12:56:58 +00:00
parent cfcf9de352
commit 76bd61b435
13 changed files with 2331 additions and 1242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
PROMS/VEPROMS User Interface/frmPDFStatusForm.cs
View File

@@ -89,7 +89,7 @@ namespace VEPROMS
InitializeComponent();
// if the version number of PROMS is 1.0, then we are running a Demo version.
// When running a Demo version, force a "Sample" watermark when printing.
MyPromsPrinter = new PromsPrinter(myItem, rev, (VlnSettings.ReleaseMode.Equals("DEMO")) ? "Sample" : watermark, debugOutput, origPgBrk, pdfPath + @"\\Compare", false, overWrite, cbd, pdfFile, insertBlankPages, allOrAuto,Prefix,saveLinks,removeTrailingHardReturnsAndManualPageBreaks, blankPageText);
MyPromsPrinter = new PromsPrinter(myItem, rev, (VlnSettings.ReleaseMode.Equals("DEMO")) ? "Sample" : watermark, debugOutput, origPgBrk, pdfPath + @"\\Compare", false, overWrite, cbd, pdfFile, insertBlankPages, allOrAuto,Prefix,saveLinks,removeTrailingHardReturnsAndManualPageBreaks, blankPageText, DidAll);
MyPromsPrinter.PromsVersion = (showPROMSVer) ? AboutVEPROMS.PROMSVersion : ""; //C2018-009 print PROMS version
PDFPath = pdfPath;
this.Text = "Creating PDF of " + myItem.DisplayNumber;
@@ -139,7 +139,11 @@ namespace VEPROMS
}
private string _PdfFile;
public string PdfFile
{
get { return _PdfFile; }
set { _PdfFile = value; }
}
private bool _MakePlaceKeeper = false;
public bool MakePlaceKeeper
@@ -193,7 +197,7 @@ namespace VEPROMS
PartInfo.RestoreCacheList(cachePartInfo);
}
}
while (_PdfFile == null && MessageBox.Show("Try Again?", "PDF Creation Failed", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes);
while (!MyPromsPrinter.MergeNotIncluded && _PdfFile == null && MessageBox.Show("Try Again?", "PDF Creation Failed", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes);
if (_PdfFile == null)
{
this.Close();