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

C2013-009: Use PDF Location text box on General Tab for setting location and remove PDF Location text box on Settings Tab

Browse Source 
B2013-173: Print Shortcut - when multiple tabs are open, Ctrl-P now prints correct procedure
This commit is contained in:
Kathy Ruffing 2015-08-06 13:16:46 +00:00
parent 450c3ef6c1
commit ae7058eb8d
4 changed files with 440 additions and 490 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

872
PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

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

@ -110,11 +110,6 @@ namespace VEPROMS
get { return txbReviewDate.Text; } get { return txbReviewDate.Text; }
set { txbReviewDate.Text = value; } set { txbReviewDate.Text = value; }
} }
public string PDFPathSetting
{
get { return txbPdfLocationS.Text; }
set { txbPdfLocationS.Text = value; }
}
public DlgPrintProcedure(DocVersionInfo dvi, bool automatic) public DlgPrintProcedure(DocVersionInfo dvi, bool automatic)
{ {
_Automatic = automatic; _Automatic = automatic;
@ -816,27 +811,14 @@ namespace VEPROMS
} }
} }
private bool _Initializing = false; private bool _Initializing = false;
private void tbSettings_Click(object sender, EventArgs e)
{
// Fill in the settings from the config. This tab is used
// to update the settings for PdfLocation, RevNum, RevDate and ReviewDate
_Initializing = true;
txbPdfLocationS.Text = txbPDFLocation.Text;
_Initializing = false;
}
private void btnPdfLocation_Click(object sender, EventArgs e) private void btnPdfLocation_Click(object sender, EventArgs e)
{ {
DlgBrowseFolder.SelectedPath = PDFPathSetting; DlgBrowseFolder.SelectedPath = PDFPath;
DialogResult drslt = DlgBrowseFolder.ShowDialog(); DialogResult drslt = DlgBrowseFolder.ShowDialog();
if (drslt == DialogResult.OK) if (drslt == DialogResult.OK)
{ {
//cbxPDFloc.Text = DlgBrowseFolder.SelectedPath; txbPDFLocation.Text = DlgBrowseFolder.SelectedPath;
txbPdfLocationS.Text = DlgBrowseFolder.SelectedPath;
txbPDFLocation.Text = txbPdfLocationS.Text;
//lblCurPDFLoc.Text = cbxPDFloc.Text;
//UpdateDropDown2();
} }
} }

28
PROMS/VEPROMS User Interface/DlgPrintProcedure.resx
View File

@ -117,26 +117,26 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="docVersionConfigBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>321, 17</value>
</metadata>
<metadata name="docVersionConfigBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>321, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btnPdfLocation.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="btnPdfLocation.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASdAAA YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
EnQB3mYfeAAAAVlJREFUOE+l098rQ2EYwPHHteIfsMiSWhqh3Sjzo9xJKYVQaBfcrKQoicQuyIk77im5 EnEB89x6jgAAAVlJREFUOE+l088rw2EcwPHPXfEPWGRJLY3QLsr8KDcppRAK7cBlJUVJJHYg37hxp+RA
oCQd+W1bGDmbGXcuaKYWF+/Zzs7s1OM8K9ZY6t3e+ty89X2e9+bNQ0TI6QQWLYKOZUD3+TrIhBYnlz8s SZr8ti2MfDczbg40U4vD892++8539fF8Lt81k3rm8Lo8Pe9Pn556ABH/BcJLNoljv6DzAo7u5DAGPK40
N8jau4SJt9MfWvgKQ4dzqn++VtAV6OC31IAla0S9H0L1biDFb8N4YApfxWnV56hh/xDAv1AnK9ddGHU2 KukPGfX3M0M6do3Ro3kttFAncYUc/JQZsGyPaw/DqN0PZoQcmApP45t7Rgu6atkfJAgt1ivqTTcmPC0Z
p7haUPF0oOobw8TzTtrrvl+qfXhRmqliIM1aZMXVhpE9UzqxEqPH9ag4W1Fxt/8Rk+x4M2lmcDlRLQfX 3lZU/Z2oBcdRf9nN2s7Y8jOA8mw1A3nOpqjedozvW7K5qzBx0oCqpw1VX0eOpOzE2ykrg6vJGiWy3oSv
GvFltZRLcL0JPeMVDC5GTUwL72I2qAWXvZwlQpsY8/ZwoYZaOB8uY59PKxg9s3Khhlo4sRlZ/NGBEdHM a2VCIhvN6J+oZHA5ZmHp2B5/OHHUgtdZwfToFiYDvUKooRYuRsrZ1/MqJs7tQqihFk4dZpZ6cvFHswqh
hRpq4ai/hKm3IyhvG7hQQy0c9BYzxd2HbKOQCzXUwn63QR8wiPKWkQs11ILYWSToWJaE5I/KxRd5GZ5M hlo4Hihl2t0oKjsmIdRQC4d9JUz19SPbLBJCDbVw0GPiA4ZQ2TYLoYZacHcVSxzLk2R8ivwgfAOkg8se
Xbgb9AAAAABJRU5ErkJggg== rIQcQAAAAABJRU5ErkJggg==
</value> </value>
</data> </data>
<metadata name="docVersionConfigBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>321, 17</value>
</metadata>
<metadata name="docVersionConfigBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>321, 17</value>
</metadata>
<metadata name="DlgBrowseFolder.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="DlgBrowseFolder.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>153, 17</value> <value>153, 17</value>
</metadata> </metadata>

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

@ -762,7 +762,15 @@ namespace VEPROMS
} }
void MyStepTabRibbon_PrintRequest(object sender, StepTabRibbonEventArgs args) void MyStepTabRibbon_PrintRequest(object sender, StepTabRibbonEventArgs args)
{ {
// Fix for B2013-173:
// if the user did the print by using the shortcut keys 'Ctrl-P' the arguments sent in
// is the first opened procedure rather than the active procedure. So check for this
// and if they are not the same, use the CurrentItem from the main frmVEPROMS.
ProcedureInfo piThis = null;
if (_CurrentItem != null) piThis = _CurrentItem.MyProcedure;
ProcedureInfo pi = args.Proc as ProcedureInfo; ProcedureInfo pi = args.Proc as ProcedureInfo;
if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis;
//added by jcb 20130718 to support create pdf button when multiunit and user selects a unit //added by jcb 20130718 to support create pdf button when multiunit and user selects a unit
pi.MyDocVersion.DocVersionConfig.SelectedSlave = pi.ProcedureConfig.SelectedSlave; pi.MyDocVersion.DocVersionConfig.SelectedSlave = pi.ProcedureConfig.SelectedSlave;
//end added by jcb 20130718 //end added by jcb 20130718