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

Browse Source
This commit is contained in:
Jake
2022-06-07 15:03:04 +00:00
parent 3a2f6f58e5
commit 0e0a733c55
3 changed files with 18 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -452,20 +452,7 @@ namespace VEPROMS
}
}
// Part of Separate Windows upgrade C2015-022
// Extend changeds to BookMark information to all of the child windows
void displayBookMarks_ResetBookMarksInPROMSWindows(object sender, EventArgs args)
{
foreach (int k in PROMSWindowForms.Keys)
{
frmVEPROMS tmp = PROMSWindowForms[k];
if (tmp.MyDocVersion.VersionID != this.SelectedDVI.VersionID)
tmp.displayBookMarks.ResetBookMarkList();
else if (tmp.MyParent != null)
tmp.MyParent.displayBookMarks.ResetBookMarkList();
}
}
void tv_SelectDateToStartChangeBars(object sender, vlnTreeEventArgs args)
{
ProcedureInfo pi = (args.Node as VETreeNode).VEObject as ProcedureInfo;
@@ -526,7 +513,7 @@ namespace VEPROMS
void tv_NodeCopy(object sender, vlnTreeEventArgs args)
{
VETreeNode tn = args.Node as VETreeNode;
ItemInfo ii = tn.VEObject as ItemInfo;?
ItemInfo ii = tn.VEObject as ItemInfo;
tc.MyCopyStep = ii;
tc_CopyStepSelected(sender, null); // C2015-022 set copy step info in the child windows
}
@@ -1294,9 +1281,9 @@ namespace VEPROMS
}
//C2015-022 Separate Windows - if child windows are open and we are closing the main PROMS window, give user a chance to not close PROMS and that child windows
// B2019-101 if we are exiting from PROMS main window no need to prompt user about child windows.
if (MyParent == null && PROMSWindowForms.Count > 0 && !_WeAreExitingPROMS)?
if (MyParent == null && PROMSWindowForms.Count > 0 && !_WeAreExitingPROMS)
{
DialogResult dr = MessageBox.Show("Close all of the child windows and exit PROMS?", "Exit PROMS", MessageBoxButtons.YesNo);?
DialogResult dr = MessageBox.Show("Close all of the child windows and exit PROMS?", "Exit PROMS", MessageBoxButtons.YesNo);
if (dr == System.Windows.Forms.DialogResult.No)
{
e.Cancel = true;
@@ -2179,7 +2166,7 @@ namespace VEPROMS
{
DisplayTabItem dti = tc.OpenItem(ii);// B2018-035 Allow procedure to be printed and property grid to be opened
// B2019-003: was crashing if another user was in same procedure (dti would have been null because procedure could not be opened):
if (dti == null) return;?
if (dti == null) return;
SelectedStepTabPanel = dti.MyStepTabPanel;
tc.SelectedDisplayTabItem = dti;
@@ -2219,8 +2206,6 @@ namespace VEPROMS
}
private static VolianTimer _TimeActivity1 = new VolianTimer("frmVEPROMS.cs tmrCloseTabItems_Tick", 2108);
private static VolianTimer _TimeActivity1 = new VolianTimer("frmVEPROMS.cs tmrCloseTabItems_Tick", 2108);
void tmrCloseTabItems_Tick(object sender, EventArgs e)
{
_TimeActivity1.Open();
@@ -3870,7 +3855,7 @@ namespace VEPROMS
btnNew.Enabled = false;
// if focus is in the step editor, position in the tree view to match the location in the step editor
if (!tv.Focused && tc.SelectedDisplayTabItem != null && tc.SelectedDisplayTabItem.SelectedItemInfo != null)
tv.AdjustTree(tc.SelectedDisplayTabItem.SelectedItemInfo);?
tv.AdjustTree(tc.SelectedDisplayTabItem.SelectedItemInfo);
VETreeNode vtn = tv.SelectedNode as VETreeNode;
if (vtn == null) return;
@@ -3975,7 +3960,7 @@ namespace VEPROMS
if (si.ActiveFormat.PlantFormat.FormatData.SectData.UseMetaSections)
{
ButtonItem subbtn = new ButtonItem("subbtn", "SubSection");
btnNew.SubItems.Add(subbtn);?
btnNew.SubItems.Add(subbtn);
subbtn.Click += new EventHandler(subbtn_Click);
}
ButtonItem stpbtn = new ButtonItem("stpbtn", "New Step");