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

Merge pull request 'Development' (#323) from Development into master

Browse Source 
Merging C2024-001 from development into master after successful testing.
This commit is contained in:
Devin Jankowski 2024-05-16 14:17:17 -04:00
commit 9d680aa500
1 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
PROMS/VEPROMS User Interface/frmVEPROMS.cs
View File

@ -3126,24 +3126,46 @@ namespace VEPROMS
if (dvi != null) if (dvi != null)
{ {
DlgPrintProcedure prnDlg = new DlgPrintProcedure(dvi, true); DlgPrintProcedure prnDlg = new DlgPrintProcedure(dvi, true);
if (dvi.MultiUnitCount == 0) prnDlg.SelectedSlave = -1; if (dvi.MultiUnitCount == 0)
{
prnDlg.SelectedSlave = -1;
}
else if (dvi.MultiUnitCount > 0)
{
string[] arguments = Environment.GetCommandLineArgs();
for (int i = 0; i < arguments.Length; i++)
{
if (arguments[i].Contains("/C="))
{
Console.WriteLine("In arguments loop");
//int num;
string[] childarg = arguments[i].Split('=');
if (int.TryParse(childarg[1], out int num))
{
prnDlg.SelectedSlave = num;
}
}
}
}
prnDlg.AllowDateTimePrefixSuffix = false; //C2018-033 don't append any selected date/time pdf file prefix or suffix (defined in working draft properties) prnDlg.AllowDateTimePrefixSuffix = false; //C2018-033 don't append any selected date/time pdf file prefix or suffix (defined in working draft properties)
prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window
//prnDlg.FormClosed += new FormClosedEventHandler(prnDlg_FormClosed); //prnDlg.FormClosed += new FormClosedEventHandler(prnDlg_FormClosed);
//while (!_RunNext) Application.DoEvents(); //while (!_RunNext) Application.DoEvents();
}
} }
}
ranAuto = true; ranAuto = true;
} }
}
}
if (ranAuto) if (ranAuto)
{ {
this.Close(); this.Close();
} }
} }
}
}
private FontFamily GetFamily(string name) private FontFamily GetFamily(string name)
{ {