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

AddedPDF SaveLink parameter to methods

Browse Source
This commit is contained in:
Rich 2015-06-17 11:28:53 +00:00
parent dc686ab082
commit 9bc892a040
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PROMS/VEPROMS User Interface/dlgApproveProcedure.cs
View File

@ -1100,7 +1100,7 @@ namespace VEPROMS
//ProcedureInfo myproc = pi; //ProcedureInfo myproc = pi;
//frmPDFStatusForm frm = new frmPDFStatusForm(myproc, ap.RevNumber, /* revdate change: ap.RevDate.ToString("MM/dd/yyyy") ,*/ waterMark, false, false, ViewPDF, true, VlnSettings.TemporaryFolder, new ChangeBarDefinition(pi.MyDocVersion.MyConfig as DocVersionConfig, pi.ActiveFormat), pdfTmp, location); //frmPDFStatusForm frm = new frmPDFStatusForm(myproc, ap.RevNumber, /* revdate change: ap.RevDate.ToString("MM/dd/yyyy") ,*/ waterMark, false, false, ViewPDF, true, VlnSettings.TemporaryFolder, new ChangeBarDefinition(pi.MyDocVersion.MyConfig as DocVersionConfig, pi.ActiveFormat), pdfTmp, location);
//myproc.ChangeBarDate = myDTS; //myproc.ChangeBarDate = myDTS;
frmPDFStatusForm frm = new frmPDFStatusForm(pi, ap.RevNumAndDate, /* revdate change: ap.RevDate.ToString("MM/dd/yyyy") ,*/ waterMark, false, false, ViewPDF, true, VlnSettings.TemporaryFolder, new ChangeBarDefinition(pi.MyDocVersion.MyConfig as DocVersionConfig, pi.ActiveFormat), pdfTmp, location, pi.MyDocVersion.DocVersionConfig.Print_AddBlankPagesWhenUsingDuplexFoldouts, true,""); frmPDFStatusForm frm = new frmPDFStatusForm(pi, ap.RevNumAndDate, /* revdate change: ap.RevDate.ToString("MM/dd/yyyy") ,*/ waterMark, false, false, ViewPDF, true, VlnSettings.TemporaryFolder, new ChangeBarDefinition(pi.MyDocVersion.MyConfig as DocVersionConfig, pi.ActiveFormat), pdfTmp, location, pi.MyDocVersion.DocVersionConfig.Print_AddBlankPagesWhenUsingDuplexFoldouts, true,"",false);
frm.AllowAllWatermarks = true; frm.AllowAllWatermarks = true;
frm.CloseWhenDone = !ViewPDF; frm.CloseWhenDone = !ViewPDF;
frm.ShowDialog(); frm.ShowDialog();

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

@ -72,11 +72,11 @@ namespace PrintMSWord
Cursor saveCursor = this.Cursor; Cursor saveCursor = this.Cursor;
this.Cursor = Cursors.WaitCursor; this.Cursor = Cursors.WaitCursor;
//ProcedureConfig.PrintWatermark pw = MyProcedure.ProcedureConfig.Print_Watermark; //ProcedureConfig.PrintWatermark pw = MyProcedure.ProcedureConfig.Print_Watermark;
CreatePDF(myProcedure,true); CreatePDF(myProcedure,true,false);
this.Cursor = saveCursor; this.Cursor = saveCursor;
} }
private void CreatePDF(ProcedureInfo myProcedure, bool openPdf) private void CreatePDF(ProcedureInfo myProcedure, bool openPdf,bool saveLinks)
{ {
// set up for using format default change bars. // set up for using format default change bars.
ChangeBarDefinition cbd = new ChangeBarDefinition(); ChangeBarDefinition cbd = new ChangeBarDefinition();
@ -87,7 +87,7 @@ namespace PrintMSWord
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, cbWatermark.Text, cbDebugOutput.Checked, false, @"C:\TEMP\32Bit\Compare", openPdf, true, cbd, PromsPrinter pp = new PromsPrinter(myProcedure, tbRev.Text, cbWatermark.Text, cbDebugOutput.Checked, false, @"C:\TEMP\32Bit\Compare", openPdf, true, cbd,
myProcedure.DisplayNumber.Replace('/','_').Replace('\\','_'),false,false,""); myProcedure.DisplayNumber.Replace('/','_').Replace('\\','_'),false,false,"",false);
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;
@ -145,7 +145,7 @@ namespace PrintMSWord
{ {
ProcedureNumber = myItem.DisplayNumber; ProcedureNumber = myItem.DisplayNumber;
if (tspbStatus != null) tspbStatus.Value++; if (tspbStatus != null) tspbStatus.Value++;
CreatePDF(myItem.MyProcedure, false); CreatePDF(myItem.MyProcedure, false,false);
} }
ProcedureNumber = ""; ProcedureNumber = "";
MyTimerStatus = "Processing Complete"; MyTimerStatus = "Processing Complete";