From 3c5d8500975c6c07e9d16c191bd1c1f3c72d84f5 Mon Sep 17 00:00:00 2001 From: Kathy Date: Wed, 19 Jan 2011 16:12:57 +0000 Subject: [PATCH] --- PROMS/VEPROMS User Interface/frmVEPROMS.cs | 44 +++++++++++----------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 8e08eafe..55da3ac6 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -212,18 +212,18 @@ namespace VEPROMS bool tv_InsertItemInfo(object sender, vlnTreeItemInfoInsertEventArgs args) { // Don't select the newly created Step. This will be handled by tmrTreeView - return tc.InsertStepItem(args.MyItemInfo, args.StepText, args.InsertType, args.FromType, args.Type, false); + return tc.InsertRTBItem(args.MyItemInfo, args.StepText, args.InsertType, args.FromType, args.Type, false); } private bool tv_DeleteItemInfo(object sender, vlnTreeItemInfoEventArgs args) { - return tc.DeleteStepItem(args.MyItemInfo); + return tc.DeleteRTBItem(args.MyItemInfo); //if (si == null) return false; //si.RemoveItem(); //return true; } private bool tv_PasteItemInfo(object sender, vlnTreeItemInfoPasteEventArgs args) { - return tc.PasteStepItem(args.MyItemInfo, args.CopyStartID, args.PasteType, (int)args.Type); + return tc.PasteRTBItem(args.MyItemInfo, args.CopyStartID, args.PasteType, (int)args.Type); } private void frmVEPROMS_FormClosing(object sender, FormClosingEventArgs e) { @@ -822,7 +822,7 @@ namespace VEPROMS displayRO.Mydvi = SelectedDVI; displayRO.MyROFST = SelectedROFst; - displayRO.MyRTB = (SelectedStepTabPanel == null) ? null : SelectedStepTabPanel.MyStepPanel.SelectedStepItem.MyStepRTB; + displayRO.MyRTB = (SelectedStepTabPanel == null) ? null : SelectedStepTabPanel.MyStepPanel.SelectedRTBItem.MyStepRTB; displayRO.TabControl = tc; displayRO.ProgressBar = bottomProgBar; @@ -833,7 +833,7 @@ namespace VEPROMS { if (tc == null || tc.SelectedDisplayTabItem == null) return; if (SelectedStepTabPanel == null) return; - displayTransition.MyRTB = SelectedStepTabPanel.MyStepPanel.SelectedStepItem.MyStepRTB; + displayTransition.MyRTB = SelectedStepTabPanel.MyStepPanel.SelectedRTBItem.MyStepRTB; //displayTransition.RangeColor = global::VEPROMS.Properties.Settings.Default.TransitionRangeColor; displayTransition.CurTrans = null; } @@ -865,7 +865,7 @@ namespace VEPROMS { infoPanel.Expanded = true; infoTabs.SelectedTab = infotabTags; - displayTags.MyRTB = (SelectedStepTabPanel == null) ? null : SelectedStepTabPanel.MyStepPanel.SelectedStepItem.MyStepRTB; + displayTags.MyRTB = (SelectedStepTabPanel == null) ? null : SelectedStepTabPanel.MyStepPanel.SelectedRTBItem.MyStepRTB; } #endregion #region InfoTabBookMarks @@ -873,7 +873,7 @@ namespace VEPROMS { infoPanel.Expanded = true; infoTabs.SelectedTab = infotabTags; - displayTags.MyRTB = (SelectedStepTabPanel == null) ? null : SelectedStepTabPanel.MyStepPanel.SelectedStepItem.MyStepRTB; + displayTags.MyRTB = (SelectedStepTabPanel == null) ? null : SelectedStepTabPanel.MyStepPanel.SelectedRTBItem.MyStepRTB; } #endregion #region PanelSupport @@ -981,7 +981,7 @@ namespace VEPROMS _CurrentItem = args.MyItemInfo; } //vlnStackTrace.ShowStack("enter tc_ItemSelectedChanged {0}", _CurrentItem); - if (args.MyStepItem == null) + if (args.MyRTBItem == null) { infotabTransition.Visible = false; infotabRO.Visible = true; @@ -992,7 +992,7 @@ namespace VEPROMS } else { - if (args.MyStepItem.MyItemInfo.IsSection || args.MyStepItem.MyItemInfo.IsProcedure) + if (args.MyRTBItem.MyItemInfo.IsSection || args.MyRTBItem.MyItemInfo.IsProcedure) { infotabRO.Visible = infotabTransition.Visible = false; infotabTags.Visible = false; @@ -1007,21 +1007,21 @@ namespace VEPROMS displayTags.IsVisible = true; } // When infotabTags is set to Visible, it is given focus. The next line returns focus to the StepRTB - args.MyStepItem.MyStepRTB.Focus(); - displayTransition.MyRTB = args.MyStepItem.MyStepRTB; - displayRO.MyRTB = args.MyStepItem.MyStepRTB; - displayTags.MyRTB = args.MyStepItem.MyStepRTB; - displayBookMarks.MyRTB = args.MyStepItem.MyStepRTB; + args.MyRTBItem.MyStepRTB.Focus(); + displayTransition.MyRTB = args.MyRTBItem.MyStepRTB; + displayRO.MyRTB = args.MyRTBItem.MyStepRTB; + displayTags.MyRTB = args.MyRTBItem.MyStepRTB; + displayBookMarks.MyRTB = args.MyRTBItem.MyStepRTB; displayRO.ProgressBar = bottomProgBar; - lblEditView.Text = args.MyStepItem.MyStepRTB.ViewRTB ? "View" : "Edit"; + lblEditView.Text = args.MyRTBItem.MyStepRTB.ViewRTB ? "View" : "Edit"; _CurrentItem.Deleted += new ItemInfoEvent(_CurrentItem_Deleted); - dlgFindReplace.MyStepItem = args.MyStepItem; - SpellChecker.MyStepItem = args.MyStepItem; + dlgFindReplace.MyRTBItem = args.MyRTBItem; + SpellChecker.MyRTBItem = args.MyRTBItem; } - if (args.MyStepItem != null) + if (args.MyRTBItem != null) { - SelectedStepTabPanel = args.MyStepItem.MyStepPanel.MyStepTabPanel; + SelectedStepTabPanel = args.MyRTBItem.MyStepPanel.MyStepTabPanel; //SelectedStepTabPanel = ((DisplayTabItem)tc.SelectedDisplayTabItem).MyStepTabPanel; } } @@ -1073,7 +1073,7 @@ namespace VEPROMS infoTabs.SelectedTab = infotabTransition; if (SelectedStepTabPanel == null) return; //displayTransition.RangeColor = global::VEPROMS.Properties.Settings.Default.TransitionRangeColor; - displayTransition.MyRTB = SelectedStepTabPanel.MyStepPanel.SelectedStepItem.MyStepRTB; + displayTransition.MyRTB = SelectedStepTabPanel.MyStepPanel.SelectedRTBItem.MyStepRTB; displayTransition.CurTrans = args.MyLinkText.MyTransitionInfo; } private void tc_LinkModifyRO(object sender, StepPanelLinkEventArgs args) @@ -1083,7 +1083,7 @@ namespace VEPROMS if (SelectedStepTabPanel == null) return; displayRO.MyROFST = SelectedROFst; - displayRO.MyRTB = SelectedStepTabPanel.MyStepPanel.SelectedStepItem.MyStepRTB; + displayRO.MyRTB = SelectedStepTabPanel.MyStepPanel.SelectedRTBItem.MyStepRTB; displayRO.CurROLink = args.MyLinkText.MyRoUsageInfo; displayRO.Mydvi = SelectedDVI; displayRO.ProgressBar = bottomProgBar; @@ -1272,7 +1272,7 @@ namespace VEPROMS #region PanelEvents private void infoPanel_Click(object sender, EventArgs e) { - displayTags.MyRTB = (SelectedStepTabPanel == null) ? null : SelectedStepTabPanel.MyStepPanel.SelectedStepItem.MyStepRTB; + displayTags.MyRTB = (SelectedStepTabPanel == null) ? null : SelectedStepTabPanel.MyStepPanel.SelectedRTBItem.MyStepRTB; } //private void tv_SectionShouldClose(object sender, vlnTreeSectionInfoEventArgs args) //{