Upped revision number to 1.8
C2020-033: 2021 UPGRADE Handling of incoming transitions on delete or review
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -232,6 +232,9 @@ namespace VEPROMS
|
||||
tbSqlTimeout.Visible = true;
|
||||
lblSqlTimeout.Visible = true;
|
||||
lblSqlTimeoutDefault.Visible = true;
|
||||
this.cbIncTranCvtPerm.Visible = true;
|
||||
this.cbIncTranCvtPerm.Checked = _FolderConfig.General_IncTranCvtPerm; // C2020-033: defaults to does not have permission
|
||||
this.lblIncTrans.Visible = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -244,6 +247,8 @@ namespace VEPROMS
|
||||
this.btnRefObjs.Visible = false;
|
||||
this.btnAnnoTypes.Visible = false;
|
||||
this.btnRevisionStages.Visible = false;
|
||||
this.cbIncTranCvtPerm.Visible = false;
|
||||
this.lblIncTrans.Visible = false;
|
||||
|
||||
/* This color settings property page is currently no visible...
|
||||
*
|
||||
@@ -376,6 +381,9 @@ namespace VEPROMS
|
||||
Settings.Default.ShowDefaultFolderProp = ppCbShwDefSettings.Checked;
|
||||
Settings.Default.Save();
|
||||
_FolderConfig.Timeout = tbSqlTimeout.Text;
|
||||
|
||||
// C2020-033: Handling of external transitions - let admin decide who can convert transitions to text
|
||||
if (_FolderConfig.MyFolder.FolderID == 1)_FolderConfig.General_IncTranCvtPerm = cbIncTranCvtPerm.Checked; // only do top folder
|
||||
_FolderConfig.MyFolder.Config = _FolderConfig.ToString();
|
||||
_FolderConfig.MyFolder.Save().Dispose();
|
||||
SaveApprStages();
|
||||
|
@@ -112,15 +112,15 @@
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<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=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<metadata name="folderConfigBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<metadata name="folderConfigBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>282, 17</value>
|
||||
</metadata>
|
||||
<metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>518, 17</value>
|
||||
</metadata>
|
||||
<data name="ppBtnDefaultGrphFileExt.SuperTooltip" xml:space="preserve">
|
||||
@@ -128,10 +128,7 @@
|
||||
|
||||
Check "Show Default Settings" to display the "default" graphic file extension setting (below the Graphic File Extension selection box).</value>
|
||||
</data>
|
||||
<metadata name="imageCodecInfoBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>665, 17</value>
|
||||
</metadata>
|
||||
<metadata name="imageCodecInfoBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<metadata name="imageCodecInfoBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>665, 17</value>
|
||||
</metadata>
|
||||
<data name="ppBtnDeftDisAutoDuplx.SuperTooltip" xml:space="preserve">
|
||||
@@ -169,24 +166,23 @@ Check "Show Default Settings" to display the "default" Change Bar Custom Message
|
||||
|
||||
Check "Show Default Settings" to display the "default" Change Bar Custom Message (below the Line One selection box).</value>
|
||||
</data>
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<data name="ppBtnChgTextColors.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
|
||||
YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK9gAA
|
||||
CvYBwq9wAwAAArVJREFUOE+lkV1IU2EYx0/eBHURdWXWcsxCQuqqMAwk+u6iaLlAxb78yDKllSViGllK
|
||||
iSstHZpiCWm2Jjmcjj7oQgVrGg7nYTq3NLZ0H859eN5zzj7aeTpntLXhVXTxg/d53+f/43nfFwOA/yKm
|
||||
oF2yUkpfiUhdmZ/EbwZJ3e0A0pz3kIuNTdF90UQWtOttA6HJ9lHW1h9ejwrCUJZnPxFe7EfaApsVr7kV
|
||||
Heb4E5aVI/xagLJ3OGlPH4oROF/7KHuna1krNi+PirykRZq5SkDOVHgp+4tFLgB9JQCNZwEUJSEB7ehm
|
||||
aEcPQ1paPXrFSfL7p3NyNF9zIFaAi4F29y6FBI0i0AswyGSPvO5+aFENQP5jJUjkKnBMlVvVbXsdBpWw
|
||||
YZWAWu4KTUBk7YQKdtuQiAFla4J8iQKwNBbsEqC5UmQeyZl7V53sWpnKT48IiHGRjzQ/0XACDvY6DBem
|
||||
rM2QlKUEbANLipwTBFzTec6BGp53oiO5OSJAxrKrxoH9NDLVD9KWNiu1KGUoq5QhzRJA5lo2KAZkvALI
|
||||
UAQuPAd9qOfT6haB/K/AVMdnH+bg8HNeUN2VCkvDR8GNFwSI2cuMxJAOpz9iUCjHgNDnwdK4kBVs836V
|
||||
8npCAjR/Pw4ZK9dyBQeBFxX3V28MWsfOMMRsLtzQJ0HKUwywi5wgFxZGTrgU9zYxE+1bSiMTEDPiuLDA
|
||||
ohQw6patFtuYEFamL0Chch1g1zHY8QgD52SG/9vL3c7eqnjm88P1oUwotKLNWxMW2Ab5YFDsmXBrs9hr
|
||||
5LASFl120KERBqbfpSLZnfigujkh9hujManSjg1JBB778CGwjBwHh/oUmIYOk19e7QvIKxN8k+2bH0T3
|
||||
Rxbu0SORKXTdu0S9d7cvvK9LDL6pSvzVV5vk13bwO+dlvIxwT5iY4t8B7Dezkt2u9ZJf+wAAAABJRU5E
|
||||
rkJggg==
|
||||
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
|
||||
JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr2AAAK9gHCr3ADAAACtUlE
|
||||
QVQ4T6WRXUhTYRjHT94EdRF1ZdZyzEJC6qowDCT67qJouUDFvvzIMqWVJWIaWUqJKy0dmmIJabYmOZyO
|
||||
PuhCBWsaDudhOrc0tnQfzn143nPOPtp5Ome0teFVdPGD93nf5//jed8XA4D/IqagXbJSSl+JSF2Zn8Rv
|
||||
Bknd7QDSnPeQi41N0X3RRBa0620Docn2UdbWH16PCsJQlmc/EV7sR9oCmxWvuRUd5vgTlpUj/FqAsnc4
|
||||
aU8fihE4X/soe6drWSs2L4+KvKRFmrlKQM5UeCn7i0UuAH0lAI1nARQlIQHt6GZoRw9DWlo9esVJ8vun
|
||||
c3I0X3MgVoCLgXb3LoUEjSLQCzDIZI+87n5oUQ1A/mMlSOQqcEyVW9Vtex0GlbBhlYBa7gpNQGTthAp2
|
||||
25CIAWVrgnyJArA0FuwSoLlSZB7JmXtXnexamcpPjwiIcZGPND/RcAIO9joMF6aszZCUpQRsA0uKnBME
|
||||
XNN5zoEanneiI7k5IkDGsqvGgf00MtUP0pY2K7UoZSirlCHNEkDmWjYoBmS8AshQBC48B32o59PqFoH8
|
||||
r8BUx2cf5uDwc15Q3ZUKS8NHwY0XBIjZy4zEkA6nP2JQKMeA0OfB0riQFWzzfpXyekICNH8/Dhkr13IF
|
||||
B4EXFfdXbwxax84wxGwu3NAnQcpTDLCLnCAXFkZOuBT3NjET7VtKIxMQM+K4sMCiFDDqlq0W25gQVqYv
|
||||
QKFyHWDXMdjxCAPnZIb/28vdzt6qeObzw/WhTCi0os1bExbYBvlgUOyZcGuz2GvksBIWXXbQoREGpt+l
|
||||
Itmd+KC6OSH2G6MxqdKODUkEHvvwIbCMHAeH+hSYhg6TX17tC8grE3yT7ZsfRPdHFu7RI5EpdN27RL13
|
||||
ty+8r0sMvqlK/NVXm+TXdvA752W8jHBPmJji3wHsN7OS3a71kl/7AAAAAElFTkSuQmCC
|
||||
</value>
|
||||
</data>
|
||||
<data name="ppBtnDefEdCols.SuperTooltip" xml:space="preserve">
|
||||
@@ -225,21 +221,27 @@ We also found that the various printer drivers can differ in the starting positi
|
||||
|
||||
* The text of the Watermark will be the approval stage description text.</value>
|
||||
</data>
|
||||
<metadata name="dlgROFolder.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<metadata name="dlgROFolder.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>928, 17</value>
|
||||
</metadata>
|
||||
<data name="lblIncTrans.Text" xml:space="preserve">
|
||||
<value>PROMS has the capability to convert incoming transition links to text when steps, sections, or
|
||||
procedures are deleted. If PROMS security does not permit the user to write to the set that
|
||||
contains the incoming transition, PROMS will not allow the transition to be converted to text.
|
||||
If you want to override security in these cases, use the checkbox below.</value>
|
||||
</data>
|
||||
<data name="txbxRemoveMsg.Text" xml:space="preserve">
|
||||
<value>For the Remove button to be active, you must first clear all occurences of this Annotation Type.
|
||||
|
||||
We suggest using the Search function where you can search for the usage of a selected Annotation Type.</value>
|
||||
</data>
|
||||
<metadata name="formatInfoListBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<metadata name="formatInfoListBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>1066, 17</value>
|
||||
</metadata>
|
||||
<metadata name="annotationTypesBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<metadata name="annotationTypesBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>102</value>
|
||||
</metadata>
|
||||
</root>
|
@@ -1365,7 +1365,7 @@ namespace VEPROMS
|
||||
this.displaySearch1.Size = new System.Drawing.Size(314, 462);
|
||||
this.displaySearch1.TabIndex = 0;
|
||||
this.displaySearch1.TopFolderID = 1;
|
||||
this.displaySearch1.TypesSelected = null;
|
||||
this.displaySearch1.TypesSelected = "";
|
||||
//
|
||||
// toolstabResults
|
||||
//
|
||||
|
@@ -387,6 +387,8 @@ namespace VEPROMS
|
||||
tv.InsertItemInfo += new vlnTreeViewItemInfoInsertEvent(tv_InsertItemInfo);
|
||||
tv.NodeInsert += new vlnTreeViewEvent(tv_NodeInsert);
|
||||
tv.PasteItemInfo += new vlnTreeViewItemInfoPasteEvent(tv_PasteItemInfo);
|
||||
tv.SearchIncTrans += new vlnTreeViewSearchIncTransEvent(tv_SearchIncTrans);
|
||||
tc.SearchIncTrans += new DisplayTabControlEditorSearchIncTransEvent(tc_SearchIncTrans);
|
||||
tv.GetChangeId += new vlnTreeViewGetChangeIdEvent(tv_GetChangeId);
|
||||
tv.NodeCopy += new vlnTreeViewEvent(tv_NodeCopy);
|
||||
tv.ClipboardStatus += new vlnTreeViewClipboardStatusEvent(tv_ClipboardStatus);
|
||||
@@ -1198,6 +1200,22 @@ namespace VEPROMS
|
||||
{
|
||||
return tc.PasteRTBItem(args.MyItemInfo, args.CopyStartID, args.PasteType, (int)args.Type);
|
||||
}
|
||||
// C2020-033: Display the search panel with Incoming Transition info for the tree view
|
||||
// and for the editor.
|
||||
private ItemInfo tv_SearchIncTrans(object sender, vlnTreeItemInfoEventArgs args)
|
||||
{
|
||||
displaySearch1.SearchIncTransII = args.MyItemInfo;
|
||||
toolsPanel.Expanded = true;
|
||||
displaySearch1.UpdateSearchIncTransResults();
|
||||
return args.MyItemInfo;
|
||||
}
|
||||
private ItemInfo tc_SearchIncTrans(object sender, vlnTreeItemInfoEventArgs args)
|
||||
{
|
||||
displaySearch1.SearchIncTransII = args.MyItemInfo;
|
||||
toolsPanel.Expanded = true;
|
||||
displaySearch1.UpdateSearchIncTransResults();
|
||||
return args.MyItemInfo;
|
||||
}
|
||||
private bool _RemoveFromPROMSWindowForms = true;
|
||||
public bool ClosingWithError = false; // B2019-098: prevent looping between error & exit dialog
|
||||
private bool _WeAreExitingPROMS = false; // B2019-101 if exiting PROMS from main window don't prompt on each child window (separate windows)
|
||||
@@ -1636,6 +1654,7 @@ namespace VEPROMS
|
||||
StepTabRibbon.MyUserInfo = MyUserInfo; // set the user's security information in the ribbon
|
||||
DisplayTransition.MyUserInfo = MyUserInfo; // set the user's security information in the Transition panel
|
||||
DisplayTags.MyUserInfo = MyUserInfo; // set the user's security information in the Tags panel
|
||||
DisplaySearch.MyUserInfo = MyUserInfo; // set the user's security information in the Search panel
|
||||
DisplayHistory.MyUserInfo = MyUserInfo; // set the user's security information in the History panel
|
||||
DisplayApplicability.MyUserInfo = MyUserInfo; // set the user's security information in the Applicability panel
|
||||
StepRTB.MyUserInfo = MyUserInfo; // set the user's security information in the StepRTB
|
||||
|
Reference in New Issue
Block a user