From 9dc45d4c4d88bbdb76ff3dfdacbec4d5b3aece4a Mon Sep 17 00:00:00 2001 From: Kathy Date: Mon, 10 Mar 2008 13:13:55 +0000 Subject: [PATCH] --- PROMS/Volian.Controls.Library/DisplayRTB.cs | 10 +++++----- PROMS/Volian.Controls.Library/DisplayRTBSimple.cs | 4 ++-- PROMS/Volian.Controls.Library/DisplayTabPanel.cs | 5 ++++- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/PROMS/Volian.Controls.Library/DisplayRTB.cs b/PROMS/Volian.Controls.Library/DisplayRTB.cs index 800c141c..16bae2fe 100644 --- a/PROMS/Volian.Controls.Library/DisplayRTB.cs +++ b/PROMS/Volian.Controls.Library/DisplayRTB.cs @@ -129,7 +129,7 @@ namespace Volian.Controls.Library #region Constructors /// /// vlnRichTextBox constructor: - /// Creates a RichTextBox with extra support for veproms editing/printing. + /// Creates a MyDisplayRTB with extra support for veproms editing/printing. /// Arguments are: /// string txtbxname - name to give box (is this needed) /// ItemInfo itm - Item for which box is created @@ -606,11 +606,11 @@ namespace Volian.Controls.Library else if (e.ClickedItem.ToString() == "TitleCase") SetSelectedCase('T'); else if (e.ClickedItem.ToString() == "Insert RO") - InsertRO("kbr ro", "0000000000000"); + MessageBox.Show("Not supported from context menu yet"); else if (e.ClickedItem.ToString() == "Insert Transition") - InsertTran("kbr Tran", "5 3 5"); + MessageBox.Show("Not supported from context menu yet"); else if (e.ClickedItem.ToString() == "Insert Symbol") - InsertSymbol(@"\u916?"); // hardcode for now, but should get value from dialog + MessageBox.Show("Not supported from context menu yet"); else if (e.ClickedItem.ToString() == "Toggle View/Edit") ToggleViewEdit(); //else if (e.ClickedItem.ToString() == "Find text") findit(); @@ -620,7 +620,7 @@ namespace Volian.Controls.Library MessageBox.Show(ex.Message); } } - private void SetSelectedCase(char type) + public void SetSelectedCase(char type) { switch (type) { diff --git a/PROMS/Volian.Controls.Library/DisplayRTBSimple.cs b/PROMS/Volian.Controls.Library/DisplayRTBSimple.cs index bd70f1f1..5c4879c6 100644 --- a/PROMS/Volian.Controls.Library/DisplayRTBSimple.cs +++ b/PROMS/Volian.Controls.Library/DisplayRTBSimple.cs @@ -98,7 +98,7 @@ namespace Volian.Controls.Library _MyItem = value; if (value != null) { - //// TIMING: vlnCSLARTB.TimeIt("rtbMyItem Start"); + //// TIMING: DisplayItem.TimeIt("rtbMyItem Start"); //if (value.ItemID == 90) // if(_MyLog.IsInfoEnabled)_MyLog.InfoFormat(value.MyContent.Text); string txt = _MyItem.MyContent.Text; @@ -128,7 +128,7 @@ namespace Volian.Controls.Library { AddRtf(txt); } - //// TIMING: vlnCSLARTB.TimeIt("rtbMyItem End"); + //// TIMING: DisplayItem.TimeIt("rtbMyItem End"); } } } diff --git a/PROMS/Volian.Controls.Library/DisplayTabPanel.cs b/PROMS/Volian.Controls.Library/DisplayTabPanel.cs index a26a4d46..da5d6b6d 100644 --- a/PROMS/Volian.Controls.Library/DisplayTabPanel.cs +++ b/PROMS/Volian.Controls.Library/DisplayTabPanel.cs @@ -53,7 +53,8 @@ namespace Volian.Controls.Library _MyTabRibbon.Dock = System.Windows.Forms.DockStyle.Top; _MyTabRibbon.Location = new System.Drawing.Point(0, 0); _MyTabRibbon.Name = "displayTabRibbon1"; - _MyTabRibbon.RichTextBox = null; + //_MyTabRibbon.MyDisplayRTB = null; + _MyTabRibbon.MyDisplayItem = null; this.Controls.Add(_MyTabRibbon); } private void SetupDisplayTabPanel() @@ -93,6 +94,8 @@ namespace Volian.Controls.Library } void _MyPanel_ItemSelectedChanged(object sender, DisplayPanelEventArgs args) { + //_MyTabRibbon.MyDisplayRTB = args.MyDisplayItem.MyDisplayRTB; + _MyTabRibbon.MyDisplayItem = args.MyDisplayItem; _MyTabControl.OnItemSelectedChanged(sender, args); } void _MyPanel_AttachmentClicked(object sender, DisplayPanelAttachmentEventArgs args)