diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 177e8441..d2e64113 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -1124,11 +1124,12 @@ namespace VEPROMS else { itemAnnotationsBindingSource.DataSource = args.MyVlnCSLARTB.MyItem.ItemAnnotations; - //_MyRTB = args.MyVlnCSLARTB.MyDisplayRTB; DisplayTabPanel dtp = ((DisplayTabItem)tc.SelectedTab).MyTabPanel; if (dtp == null) return; displayTransition.CurItem = dtp.ItemSelected; - displayTransition.MyRTB = _MyRTB; + displayTransition.MyRTB = dtp.MyPanel.DisplayItemSelected.MyDisplayRTB; + displayRO.CurItem = dtp.ItemSelected; + displayRO.MyRTB = dtp.MyPanel.DisplayItemSelected.MyDisplayRTB; } } private void itemAnnotationsBindingSource_DataSourceChanged(object sender, EventArgs e) diff --git a/PROMS/Volian.Controls.Library/DisplayItem.cs b/PROMS/Volian.Controls.Library/DisplayItem.cs index 607219c3..6af9c490 100644 --- a/PROMS/Volian.Controls.Library/DisplayItem.cs +++ b/PROMS/Volian.Controls.Library/DisplayItem.cs @@ -67,6 +67,10 @@ namespace Volian.Controls.Library ChangeBar = true; } } + public DisplayRTB MyDisplayRTB + { + get { return _DisplayRTB; } + } private void SetText() { if (_MyItem != null) diff --git a/PROMS/Volian.Controls.Library/DisplayItem.designer.cs b/PROMS/Volian.Controls.Library/DisplayItem.designer.cs index eee0ec8c..480a765b 100644 --- a/PROMS/Volian.Controls.Library/DisplayItem.designer.cs +++ b/PROMS/Volian.Controls.Library/DisplayItem.designer.cs @@ -50,7 +50,7 @@ namespace Volian.Controls.Library this._DisplayRTB.BackColor = System.Drawing.Color.Linen; this._DisplayRTB.BorderStyle = System.Windows.Forms.BorderStyle.None; this._DisplayRTB.ContentsRectangle = new System.Drawing.Rectangle(0, 0, 0, 0); - this._DisplayRTB.EpMode = VEPROMS.CSLA.Library.E_EditPrintMode.EDIT; + this._DisplayRTB.EpMode = VEPROMS.CSLA.Library.E_EditPrintMode.Edit; this._DisplayRTB.Font = new System.Drawing.Font("Prestige Elite Tall", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2))); this._DisplayRTB.Location = new System.Drawing.Point(80, 0); this._DisplayRTB.MyClassName = "RichEdit20W"; @@ -60,7 +60,7 @@ namespace Volian.Controls.Library this._DisplayRTB.Size = new System.Drawing.Size(234, 20); this._DisplayRTB.TabIndex = 2; this._DisplayRTB.Text = ""; - this._DisplayRTB.VwMode = VEPROMS.CSLA.Library.E_ViewMode.EDIT; + this._DisplayRTB.VwMode = VEPROMS.CSLA.Library.E_ViewMode.Edit; this._DisplayRTB.Enter += new System.EventHandler(this.veRichTextBoxText_Enter); this._DisplayRTB.LinkGoTo += new Volian.Controls.Library.DisplayRTBLinkEvent(this._DisplayRTB_LinkGoTo); this._DisplayRTB.Leave += new System.EventHandler(this.veRichTextBoxText_Leave);