Merge remote-tracking branch 'origin/Development' into C2025-027-AnnotationsTypeSelect
This commit is contained in:
@@ -3604,9 +3604,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);
|
||||
}
|
||||
@@ -4327,7 +4331,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)
|
||||
@@ -4462,6 +4470,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;
|
||||
|
Reference in New Issue
Block a user