diff --git a/PROMS/DropDownPanel/Controls/DropDownPanel.cs b/PROMS/DropDownPanel/Controls/DropDownPanel.cs index 78f5d816..49646260 100644 --- a/PROMS/DropDownPanel/Controls/DropDownPanel.cs +++ b/PROMS/DropDownPanel/Controls/DropDownPanel.cs @@ -28,7 +28,9 @@ namespace AT.STO.UI.Win _dropDownHelper = new DropDownWindowHelper(); + _dropDownHelper.DropDownClosed -= new DropDownClosedEventHandler(DropDownHelper_DropDownClosed); _dropDownHelper.DropDownClosed += new DropDownClosedEventHandler(DropDownHelper_DropDownClosed); + _dropDownHelper.DropDownCancel -= new DropDownCancelEventHandler(DropDownHelper_DropDownCancel); _dropDownHelper.DropDownCancel += new DropDownCancelEventHandler(DropDownHelper_DropDownCancel); combo.DisplayMember = "Text"; @@ -82,7 +84,9 @@ namespace AT.STO.UI.Win DropDownForm dropDown = new DropDownForm(_dropDownControl); + dropDown.FinishEditing -= new DropDownValueChangedEventHandler(DropDown_FinishEditing); dropDown.FinishEditing += new DropDownValueChangedEventHandler(DropDown_FinishEditing); + dropDown.ValueChanged -= new DropDownValueChangedEventHandler(DropDown_ValueChanged); dropDown.ValueChanged += new DropDownValueChangedEventHandler(DropDown_ValueChanged); combo.DroppedDown = false; diff --git a/PROMS/DropDownPanel/Forms/DropDownForm.cs b/PROMS/DropDownPanel/Forms/DropDownForm.cs index 6e6a45db..c6923a15 100644 --- a/PROMS/DropDownPanel/Forms/DropDownForm.cs +++ b/PROMS/DropDownPanel/Forms/DropDownForm.cs @@ -49,7 +49,9 @@ namespace AT.STO.UI.Win { base.OnShown(e); + _control.FinishEditing -= new DropDownValueChangedEventHandler(Ctrl_FinishEditing); _control.FinishEditing += new DropDownValueChangedEventHandler(Ctrl_FinishEditing); + _control.ValueChanged -= new DropDownValueChangedEventHandler(Ctrl_ValueChanged); _control.ValueChanged += new DropDownValueChangedEventHandler(Ctrl_ValueChanged); } #endregion diff --git a/PROMS/DropDownPanel/Helper/DropDownWindowHelper.cs b/PROMS/DropDownPanel/Helper/DropDownWindowHelper.cs index 0d996e60..e3eb0308 100644 --- a/PROMS/DropDownPanel/Helper/DropDownWindowHelper.cs +++ b/PROMS/DropDownPanel/Helper/DropDownWindowHelper.cs @@ -39,6 +39,7 @@ namespace AT.STO.UI.Win public DropDownWindowHelper() { _filter = new DropDownMessageFilter(this); + _filter.DropDownCancel -= new DropDownCancelEventHandler(Popup_Cancel); _filter.DropDownCancel += new DropDownCancelEventHandler(Popup_Cancel); } #endregion diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs index f38f9188..15031b4a 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs @@ -393,6 +393,7 @@ namespace VEPROMS { SetupForProcedure(); _MyTimer = new Timer(); + _MyTimer.Tick -= new EventHandler(_MyTimer_Tick); _MyTimer.Tick += new EventHandler(_MyTimer_Tick); _MyTimer.Interval = 100; _MyTimer.Enabled = true; diff --git a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs index 59420ece..e3e997b7 100644 --- a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs +++ b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs @@ -65,11 +65,13 @@ namespace VEPROMS MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing _MyApproval = new ApprovalInfo(myFrmVEPROMS);// Save frmVEPROMS for Import to shutoff SessionPing ApplicabilityIndex = myDocVersion.DocVersionConfig.SelectedSlave; + this.ConsistencyPrintRequest -= new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest); this.ConsistencyPrintRequest += new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest); _MyDocVersion = myDocVersion; _MyDocVersion.ResetProcedures(); // B2021-035: Pasted, modified number and deleted procedures not refreshed so missing from list InitializeComponent(); FlexGridAddEvents(); + _MyApproval.StatusUpdated -= new ApprovalStatusChangeEvent(_MyApproval_StatusUpdated); _MyApproval.StatusUpdated += new ApprovalStatusChangeEvent(_MyApproval_StatusUpdated); SetupComboBoxes(); foreach (ProcedureInfo pi in myDocVersion.Procedures) @@ -101,6 +103,7 @@ namespace VEPROMS //fgProcs.SetupEditor += new C1.Win.C1FlexGrid.RowColEventHandler(fgProcs_SetupEditor); //fgProcs.StartEdit += new C1.Win.C1FlexGrid.RowColEventHandler(fgProcs_StartEdit); //fgProcs.ValidateEdit += new C1.Win.C1FlexGrid.ValidateEditEventHandler(fgProcs_ValidateEdit); + fgProcs.ComboCloseUp -= new C1.Win.C1FlexGrid.RowColEventHandler(fgProcs_ComboCloseUp); fgProcs.ComboCloseUp += new C1.Win.C1FlexGrid.RowColEventHandler(fgProcs_ComboCloseUp); //fgProcs.MouseDown += new MouseEventHandler(fgProcs_MouseDown); //fgProcs.MouseUp += new MouseEventHandler(fgProcs_MouseUp); @@ -275,6 +278,7 @@ namespace VEPROMS { MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing _MyApproval = new ApprovalInfo(myFrmVEPROMS);// Save frmVEPROMS for Import to shutoff SessionPing + this.ConsistencyPrintRequest -= new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest); this.ConsistencyPrintRequest += new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest); _MyDocVersion = myDocVersion; _MyDocVersion.ResetProcedures(); // B2021-035: Pasted, modified number and deleted procedures not refreshed so missing from list @@ -295,6 +299,7 @@ namespace VEPROMS { MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing _MyApproval = new ApprovalInfo(myFrmVEPROMS);// Save frmVEPROMS for Import to shutoff SessionPing + this.ConsistencyPrintRequest -= new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest); this.ConsistencyPrintRequest += new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest); _MyDocVersion = myProcedure.MyDocVersion; _MyDocVersion.ResetProcedures(); // B2021-035: Pasted, modified number and deleted procedures not refreshed so missing from list @@ -450,6 +455,7 @@ namespace VEPROMS int checkedCount = clbMore.CheckedItems.Count; string oldLabel = lblMore.Text; pbMore.Visible = true; + ItemInfoList.ConsistencyCheckUpdated -= new ItemInfoListCCEvent(ItemInfoList_ConsistencyCheckUpdated); ItemInfoList.ConsistencyCheckUpdated += new ItemInfoListCCEvent(ItemInfoList_ConsistencyCheckUpdated); List myProcs = new List(); // B2018-136 use the list of procedures that have checkboxes and are checked (right panel) instead of the list to be approved (left panel) diff --git a/PROMS/VEPROMS User Interface/dlgManageSecurity.cs b/PROMS/VEPROMS User Interface/dlgManageSecurity.cs index 54f2bf58..defb3a4d 100644 --- a/PROMS/VEPROMS User Interface/dlgManageSecurity.cs +++ b/PROMS/VEPROMS User Interface/dlgManageSecurity.cs @@ -40,6 +40,7 @@ namespace VEPROMS rb.Parent = pnlGroups; rb.Dock = DockStyle.Top; rb.Tag = gi; + rb.CheckedChanged -= new EventHandler(rb_CheckedChanged); rb.CheckedChanged += new EventHandler(rb_CheckedChanged); pnlGroups.Controls.Add(rb); rb.BringToFront(); diff --git a/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs b/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs index a2088150..9b024af5 100644 --- a/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs +++ b/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs @@ -254,6 +254,7 @@ namespace VEPROMS if (CancelStop) btnCancel.Visible = true; Application.DoEvents(); + MyPromsPrinter.StatusChanged -= new PromsPrinterStatusEvent(pp_StatusChanged); MyPromsPrinter.StatusChanged += new PromsPrinterStatusEvent(pp_StatusChanged); MyPromsPrinter.DocReplace = DocReplace; // used when approve generates an export with unlinked ROs and Transitions diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 840dbd6e..6d7aafa8 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -3601,9 +3601,13 @@ namespace VEPROMS if (tn == null) return; _ExpandingTree = true; + tn.LoadingChildrenDone -= new VETreeNodeEvent(tn_LoadingChildrenDone); tn.LoadingChildrenDone += new VETreeNodeEvent(tn_LoadingChildrenDone); + tn.LoadingChildrenMax -= new VETreeNodeEvent(tn_LoadingChildrenMax); tn.LoadingChildrenMax += new VETreeNodeEvent(tn_LoadingChildrenMax); + tn.LoadingChildrenValue -= new VETreeNodeEvent(tn_LoadingChildrenValue); tn.LoadingChildrenValue += new VETreeNodeEvent(tn_LoadingChildrenValue); + tn.LoadingChildrenSQL -= new VETreeNodeEvent(tn_LoadingChildrenSQL); tn.LoadingChildrenSQL += new VETreeNodeEvent(tn_LoadingChildrenSQL); tn.LoadChildren(true); } @@ -4324,7 +4328,11 @@ namespace VEPROMS _LastStepRTB.EditModeChanged -= new StepRTBEvent(_LastStepRTB_EditModeChanged); _LastStepRTB = args != null && args.MyEditItem != null ? args.MyEditItem.MyStepRTB : null; - if (_LastStepRTB != null) _LastStepRTB.EditModeChanged += new StepRTBEvent(_LastStepRTB_EditModeChanged); + if (_LastStepRTB != null) + { + _LastStepRTB.EditModeChanged -= new StepRTBEvent(_LastStepRTB_EditModeChanged); + _LastStepRTB.EditModeChanged += new StepRTBEvent(_LastStepRTB_EditModeChanged); + } lblEditView.Text = " "; if (args == null) @@ -4459,6 +4467,7 @@ namespace VEPROMS displayHistory.MyEditItem = args.MyEditItem; lblEditView.Text = args.MyEditItem.MyStepPanel.VwMode == E_ViewMode.Edit ? "Edit" : "View"; + _CurrentItem.Deleted -= new ItemInfoEvent(_CurrentItem_Deleted); _CurrentItem.Deleted += new ItemInfoEvent(_CurrentItem_Deleted); dlgFindReplace.MyEditItem = args.MyEditItem; SpellChecker.MyEditItem = args.MyEditItem; diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index b0649cc6..2ddb1b73 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -8325,6 +8325,7 @@ namespace VEPROMS.CSLA.Library if (_ProcedureConfig == null) { _ProcedureConfig = new ProcedureConfig(this); + this.MyContent.Changed -= new ContentInfoEvent(MyContent_Changed); this.MyContent.Changed += new ContentInfoEvent(MyContent_Changed); } return _ProcedureConfig; @@ -8334,6 +8335,7 @@ namespace VEPROMS.CSLA.Library void MyContent_Changed(object sender) { + this.MyContent.Changed -= new ContentInfoEvent(MyContent_Changed); this.MyContent.Changed += new ContentInfoEvent(MyContent_Changed); } #endregion diff --git a/PROMS/VEPROMS.CSLA.Library/VEObjects/VETreeNode.cs b/PROMS/VEPROMS.CSLA.Library/VEObjects/VETreeNode.cs index d29e4595..4ae00cc6 100644 --- a/PROMS/VEPROMS.CSLA.Library/VEObjects/VETreeNode.cs +++ b/PROMS/VEPROMS.CSLA.Library/VEObjects/VETreeNode.cs @@ -386,12 +386,19 @@ namespace VEPROMS.CSLA.Library ItemInfo myItemInfo = o as ItemInfo; if (myItemInfo != null) { + myItemInfo.Deleted -= new ItemInfoEvent(myItemInfo_Deleted); myItemInfo.Deleted += new ItemInfoEvent(myItemInfo_Deleted); + myItemInfo.ChildrenDeleted -= new ItemInfoEvent(myItemInfo_ChildrenDeleted); myItemInfo.ChildrenDeleted += new ItemInfoEvent(myItemInfo_ChildrenDeleted); + myItemInfo.MyContent.Changed -= new ContentInfoEvent(NodeText_Changed); myItemInfo.MyContent.Changed += new ContentInfoEvent(NodeText_Changed); + myItemInfo.OrdinalChanged -= new ItemInfoEvent(NodeText_Changed); myItemInfo.OrdinalChanged += new ItemInfoEvent(NodeText_Changed); + myItemInfo.NewSiblingAfter -= new ItemInfoInsertEvent(myItemInfo_NewSiblingAfter); myItemInfo.NewSiblingAfter += new ItemInfoInsertEvent(myItemInfo_NewSiblingAfter); + myItemInfo.NewSiblingBefore -= new ItemInfoInsertEvent(myItemInfo_NewSiblingBefore); myItemInfo.NewSiblingBefore += new ItemInfoInsertEvent(myItemInfo_NewSiblingBefore); + myItemInfo.NewChild -= new ItemInfoInsertEvent(myItemInfo_NewChild); myItemInfo.NewChild += new ItemInfoInsertEvent(myItemInfo_NewChild); } } @@ -429,12 +436,19 @@ namespace VEPROMS.CSLA.Library ItemInfo myItemInfo = o as ItemInfo; if (myItemInfo != null) { + myItemInfo.Deleted -= new ItemInfoEvent(myItemInfo_Deleted); myItemInfo.Deleted += new ItemInfoEvent(myItemInfo_Deleted); + myItemInfo.ChildrenDeleted -= new ItemInfoEvent(myItemInfo_ChildrenDeleted); myItemInfo.ChildrenDeleted += new ItemInfoEvent(myItemInfo_ChildrenDeleted); + myItemInfo.MyContent.Changed -= new ContentInfoEvent(NodeText_Changed); myItemInfo.MyContent.Changed += new ContentInfoEvent(NodeText_Changed); + myItemInfo.OrdinalChanged -= new ItemInfoEvent(NodeText_Changed); myItemInfo.OrdinalChanged += new ItemInfoEvent(NodeText_Changed); + myItemInfo.NewSiblingAfter -= new ItemInfoInsertEvent(myItemInfo_NewSiblingAfter); myItemInfo.NewSiblingAfter += new ItemInfoInsertEvent(myItemInfo_NewSiblingAfter); + myItemInfo.NewSiblingBefore -= new ItemInfoInsertEvent(myItemInfo_NewSiblingBefore); myItemInfo.NewSiblingBefore += new ItemInfoInsertEvent(myItemInfo_NewSiblingBefore); + myItemInfo.NewChild -= new ItemInfoInsertEvent(myItemInfo_NewChild); myItemInfo.NewChild += new ItemInfoInsertEvent(myItemInfo_NewChild); } } diff --git a/PROMS/Volian.Controls.Library/AnnotationSearch.cs b/PROMS/Volian.Controls.Library/AnnotationSearch.cs index 68f3acec..19218a76 100644 --- a/PROMS/Volian.Controls.Library/AnnotationSearch.cs +++ b/PROMS/Volian.Controls.Library/AnnotationSearch.cs @@ -69,6 +69,7 @@ namespace Volian.Controls.Library _AnnotationDetails = annotationDetails; cbAnnoType.DisplayMember = "Name"; cbAnnoType.DataSource = AnnotationTypeInfoList.Get(); + lbResults.MouseMove -= new MouseEventHandler(lbResults_MouseMove); lbResults.MouseMove += new MouseEventHandler(lbResults_MouseMove); _TabControl = tc; } diff --git a/PROMS/Volian.Controls.Library/DisplayApplicability.cs b/PROMS/Volian.Controls.Library/DisplayApplicability.cs index 51947f06..a5869b64 100644 --- a/PROMS/Volian.Controls.Library/DisplayApplicability.cs +++ b/PROMS/Volian.Controls.Library/DisplayApplicability.cs @@ -354,7 +354,10 @@ namespace Volian.Controls.Library private void WireCheckboxes() { foreach (CheckBox cb in MyCheckBoxes.Values) + { + cb.CheckedChanged -= new EventHandler(cb_CheckedChanged); cb.CheckedChanged += new EventHandler(cb_CheckedChanged); + } } private void UnwireCheckboxes(bool reset) { diff --git a/PROMS/Volian.Controls.Library/DisplayRO.cs b/PROMS/Volian.Controls.Library/DisplayRO.cs index b5acdb7d..b82e6f3c 100644 --- a/PROMS/Volian.Controls.Library/DisplayRO.cs +++ b/PROMS/Volian.Controls.Library/DisplayRO.cs @@ -211,7 +211,9 @@ namespace Volian.Controls.Library } _myRTB = value; + MyRTB.LinkChanged -= new StepRTBLinkEvent(MyRTB_LinkChanged); MyRTB.LinkChanged += new StepRTBLinkEvent(MyRTB_LinkChanged); + MyRTB.SelectionChanged -= new EventHandler(MyRTB_SelectionChanged); MyRTB.SelectionChanged += new EventHandler(MyRTB_SelectionChanged); if (string.IsNullOrEmpty(MyRTB.MyLinkText)) diff --git a/PROMS/Volian.Controls.Library/DisplayReports.cs b/PROMS/Volian.Controls.Library/DisplayReports.cs index a32a2d43..a347edda 100644 --- a/PROMS/Volian.Controls.Library/DisplayReports.cs +++ b/PROMS/Volian.Controls.Library/DisplayReports.cs @@ -161,8 +161,11 @@ namespace Volian.Controls.Library if (_MyROFSTLookup == null) return; + advTreeRO.BeforeExpand -= new AdvTreeNodeCancelEventHandler(advTreeRO_BeforeExpand); advTreeRO.BeforeExpand += new AdvTreeNodeCancelEventHandler(advTreeRO_BeforeExpand); + advTreeRO.AfterExpand -= new AdvTreeNodeEventHandler(advTreeRO_AfterExpandorCollapse); advTreeRO.AfterExpand += new AdvTreeNodeEventHandler(advTreeRO_AfterExpandorCollapse); + advTreeRO.AfterCollapse -= new AdvTreeNodeEventHandler(advTreeRO_AfterExpandorCollapse); advTreeRO.AfterCollapse += new AdvTreeNodeEventHandler(advTreeRO_AfterExpandorCollapse); topnode = new DevComponents.AdvTree.Node(); @@ -250,6 +253,7 @@ namespace Volian.Controls.Library topnode.Tag = fi; } + advTreeProcSets.BeforeExpand -= new DevComponents.AdvTree.AdvTreeNodeCancelEventHandler(advTreeProcSets_BeforeExpand); advTreeProcSets.BeforeExpand += new DevComponents.AdvTree.AdvTreeNodeCancelEventHandler(advTreeProcSets_BeforeExpand); // position to the procedure set in the tree if we have a procedure open diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs index 0ddb5b59..dbca6c18 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs @@ -468,7 +468,9 @@ namespace Volian.Controls.Library lastLastFormatID = fv.FormatID; } } + cbxTranVersion.SelectedIndexChanged -= new EventHandler(cbxTranVersion_SelectedIndexChanged); cbxTranVersion.SelectedIndexChanged += new EventHandler(cbxTranVersion_SelectedIndexChanged); + cbxTranFormat.SelectedIndexChanged -= new EventHandler(cbxTranFormat_SelectedIndexChanged); cbxTranFormat.SelectedIndexChanged += new EventHandler(cbxTranFormat_SelectedIndexChanged); } this.Cursor = Cursors.Default; @@ -892,6 +894,7 @@ namespace Volian.Controls.Library topnode.DataKey = fi.FolderID; } + advTreeProcSets.BeforeExpand -= new DevComponents.AdvTree.AdvTreeNodeCancelEventHandler(advTreeProcSets_BeforeExpand); advTreeProcSets.BeforeExpand += new DevComponents.AdvTree.AdvTreeNodeCancelEventHandler(advTreeProcSets_BeforeExpand); // position to the procedure set in the tree if we have a procedure open @@ -986,6 +989,7 @@ namespace Volian.Controls.Library annoTypes.Add(new AnnotationTypeSearch(ati.Name, ati.TypeID.ToString())); cbxAnnoTypes.DisplayMember = "Name"; cbxAnnoTypes.DataSource = annoTypes; + lbSrchResults.MouseMove -= new MouseEventHandler(lbSrchResults_MouseMove); lbSrchResults.MouseMove += new MouseEventHandler(lbSrchResults_MouseMove); _TabControl = tc; } diff --git a/PROMS/Volian.Controls.Library/DisplayTabControl.cs b/PROMS/Volian.Controls.Library/DisplayTabControl.cs index 4d6dbda8..c516993f 100644 --- a/PROMS/Volian.Controls.Library/DisplayTabControl.cs +++ b/PROMS/Volian.Controls.Library/DisplayTabControl.cs @@ -378,7 +378,10 @@ namespace Volian.Controls.Library { _MyStepRTB = _MyEditItem.MyStepRTB; if (_MyStepRTB != null) + { + _MyStepRTB.Disposed -= new EventHandler(_MyStepRTB_Disposed); _MyStepRTB.Disposed += new EventHandler(_MyStepRTB_Disposed); + } } else _MyStepRTB = null; @@ -469,6 +472,7 @@ namespace Volian.Controls.Library myBar.DockTabControl.CloseButtonPosition = DevComponents.DotNetBar.eTabCloseButtonPosition.Right; myBar.DockTabControl.Width = ClientRectangle.Width; } + myBar.DockTabClosing -= new DockTabClosingEventHandler(myBar_DockTabClosing); myBar.DockTabClosing += new DockTabClosingEventHandler(myBar_DockTabClosing); if (!myBar.Visible) myBar.Visible = true; diff --git a/PROMS/Volian.Controls.Library/DisplayTransition.cs b/PROMS/Volian.Controls.Library/DisplayTransition.cs index bab8747c..5134ecbb 100644 --- a/PROMS/Volian.Controls.Library/DisplayTransition.cs +++ b/PROMS/Volian.Controls.Library/DisplayTransition.cs @@ -566,6 +566,7 @@ namespace Volian.Controls.Library startitm = startitm.GetNext(); } if (!setsel2) tvTran.SelectedNode = tvTran.Nodes[0]; + tvTran.BeforeExpand -= new TreeViewCancelEventHandler(tvTran_BeforeExpand); tvTran.BeforeExpand += new TreeViewCancelEventHandler(tvTran_BeforeExpand); // bug fix. TreeView needs the next two lines to properly display the bottom node. jsj 01/08/2010 tvTran.ItemHeight++; @@ -599,6 +600,7 @@ namespace Volian.Controls.Library startitm = startitm.GetNext(); } if (!setsel) tvTran.SelectedNode = tvTran.Nodes[0]; + tvTran.BeforeExpand -= new TreeViewCancelEventHandler(tvTran_BeforeExpand); tvTran.BeforeExpand += new TreeViewCancelEventHandler(tvTran_BeforeExpand); // bug fix. TreeView needs the next two lines to properly display the bottom node. jsj 01/08/2010 tvTran.ItemHeight++; diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs index e5b2677d..8181c1c1 100644 --- a/PROMS/Volian.Controls.Library/EditItem.cs +++ b/PROMS/Volian.Controls.Library/EditItem.cs @@ -214,10 +214,14 @@ namespace Volian.Controls.Library UserCheckOffChar = (char)co.UIMark; } // Deal with changes in content data + value.MyContent.Changed -= new ContentInfoEvent(MyContent_Changed); value.MyContent.Changed += new ContentInfoEvent(MyContent_Changed); + value.MyProcedure.MyContent.Changed -= new ContentInfoEvent(MyContent_Changed); value.MyProcedure.MyContent.Changed += new ContentInfoEvent(MyContent_Changed); // Deal with change in item data + value.Changed -= new ItemInfoEvent(value_Changed); value.Changed += new ItemInfoEvent(value_Changed); + value.OrdinalChanged -= new ItemInfoEvent(value_OrdinalChanged); value.OrdinalChanged += new ItemInfoEvent(value_OrdinalChanged); // do something like this to draw circle around step numbers - note got NULL reference error on NSP data //if (value.FormatStepData != null && value.FormatStepData.TabData.IdentPrint.Contains("C0")) Circle = true; @@ -3997,9 +4001,13 @@ namespace Volian.Controls.Library if (!itemInfo.IsStep) // C2025-036 reduce un-needed processing - this will prevent duplicat calls that generate step tabs when loading a procedure SetupHeader(itemInfo); SetupAlarmTableView(itemInfo); // C2021-018 display alarm point table information in the step editor (if the format flag is set) + this.Paint -= new PaintEventHandler(EditItem_Paint); this.Paint += new PaintEventHandler(EditItem_Paint); + this.BackColorChanged -= new EventHandler(EditItem_BackColorChanged); this.BackColorChanged += new EventHandler(EditItem_BackColorChanged); + this.Move -= new EventHandler(EditItem_Move); this.Move += new EventHandler(EditItem_Move); + this.Resize -= new EventHandler(EditItem_Resize); this.Resize += new EventHandler(EditItem_Resize); if (itemInfo != null) { @@ -4050,6 +4058,7 @@ namespace Volian.Controls.Library SeqLevel = myParentEditItem.SeqLevel + ((myChildRelation == ChildRelation.After || myChildRelation == ChildRelation.Before) && itemInfo.IsSequential ? 1 : 0); //// TIMING: DisplayItem.TimeIt("CSLARTB seqLevel"); MyItemInfo = itemInfo; + MyItemInfo.MyConfig.PropertyChanged -= new PropertyChangedEventHandler(MyConfig_PropertyChanged); MyItemInfo.MyConfig.PropertyChanged += new PropertyChangedEventHandler(MyConfig_PropertyChanged); } //// TIMING: DisplayItem.TimeIt("CSLARTB MyItem");