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

Browse Source
This commit is contained in:
Kathy Ruffing 2010-08-24 15:17:27 +00:00
parent f7127f1fff
commit b744086cbb
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PROMS/VEPROMS User Interface/DlgPrintProcedure.cs
View File

@ -267,12 +267,14 @@ namespace VEPROMS
private void CreatePDF() private void CreatePDF()
{ {
// If file exists, determine if overwrite checkbox allows overwrite, if not prompt.
Volian.Print.Library.Rtf2Pdf.PdfDebug = true; Volian.Print.Library.Rtf2Pdf.PdfDebug = true;
PrintWatermark pw = (PrintWatermark)cbxWaterMark.SelectedValue; PrintWatermark pw = (PrintWatermark)cbxWaterMark.SelectedValue;
// Determine change bar settings. First get from config & then see if override from dialog. // Determine change bar settings. First get from config & then see if override from dialog.
// Also check that format allows override. // Also check that format allows override.
ChangeBarDefinition cbd = DetermineChangeBarSettings(); ChangeBarDefinition cbd = DetermineChangeBarSettings();
frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNum, RevDate, pw.ToString(), cbxDebug.Checked, VlnSettings.OldPDFFolder, cbxOpenAfterCreate2.Checked, PDFPath, cbd); frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNum, RevDate, pw.ToString(), cbxDebug.Checked, VlnSettings.OldPDFFolder, cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked,PDFPath, cbd);
frmStatus.ShowDialog(); frmStatus.ShowDialog();
this.Close(); this.Close();
} }

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

@ -34,11 +34,11 @@ namespace VEPROMS
get { return _OpenPDF; } get { return _OpenPDF; }
set { _OpenPDF = value; } set { _OpenPDF = value; }
} }
public frmPDFStatusForm(ItemInfo myItem, string rev, string revDate, string watermark, bool debugOutput, string backgroundFolder, bool openPDF, string pdfPath, ChangeBarDefinition cbd) public frmPDFStatusForm(ItemInfo myItem, string rev, string revDate, string watermark, bool debugOutput, string backgroundFolder, bool openPDF, bool overWrite, string pdfPath, ChangeBarDefinition cbd)
{ {
OpenPDF = openPDF; OpenPDF = openPDF;
InitializeComponent(); InitializeComponent();
MyPromsPrinter = new PromsPrinter(myItem, rev, revDate, watermark, debugOutput, backgroundFolder, false, cbd);//openPDF); MyPromsPrinter = new PromsPrinter(myItem, rev, revDate, watermark, debugOutput, backgroundFolder, false, overWrite, cbd);//openPDF);
PDFPath = pdfPath; PDFPath = pdfPath;
this.Text = "Creating PDF of " + myItem.DisplayNumber; this.Text = "Creating PDF of " + myItem.DisplayNumber;

2
PROMS/VEPROMS/PrintMSWord/frmPrintMsWord.cs
View File

@ -64,7 +64,7 @@ namespace PrintMSWord
changeBarData.ChangeBarMessage == "DateAndChgID" ? PrintChangeBarText.DateChgID : changeBarData.ChangeBarMessage == "DateAndChgID" ? PrintChangeBarText.DateChgID :
changeBarData.ChangeBarMessage == "None" ? PrintChangeBarText.None : changeBarData.ChangeBarMessage == "None" ? PrintChangeBarText.None :
changeBarData.ChangeBarMessage == "RevNum" ? PrintChangeBarText.RevNum : PrintChangeBarText.UserDef; changeBarData.ChangeBarMessage == "RevNum" ? PrintChangeBarText.RevNum : PrintChangeBarText.UserDef;
PromsPrinter pp = new PromsPrinter(myProcedure, tbRev.Text, tbRevDate.Text, cbWatermark.Text, cbDebugOutput.Checked, VlnSettings.OldPDFFolder, openPdf, cbd); PromsPrinter pp = new PromsPrinter(myProcedure, tbRev.Text, tbRevDate.Text, cbWatermark.Text, cbDebugOutput.Checked, VlnSettings.OldPDFFolder, openPdf, true, cbd);
pp.StatusChanged += new PromsPrinterStatusEvent(pp_StatusChanged); pp.StatusChanged += new PromsPrinterStatusEvent(pp_StatusChanged);
_ElapsedTime = new Dictionary<PromsPrinterStatusType, TimeSpan>(); _ElapsedTime = new Dictionary<PromsPrinterStatusType, TimeSpan>();
DateTime tStart = DateTime.Now; DateTime tStart = DateTime.Now;