diff --git a/PROMS/Volian.Controls.Library/frmEPAnnotationDetails.cs b/PROMS/Volian.Controls.Library/frmEPAnnotationDetails.cs index 13077a6f..a641fd1c 100644 --- a/PROMS/Volian.Controls.Library/frmEPAnnotationDetails.cs +++ b/PROMS/Volian.Controls.Library/frmEPAnnotationDetails.cs @@ -20,7 +20,7 @@ namespace Volian.Controls.Library private AnnotationConfig MyConfig; private StepTabRibbon _MyStepTabRibbon; - private Dictionary _DicStepRtb; + private Dictionary _DicTB; private Dictionary _DicCheckBox; private Dictionary _DicComboBox; private Dictionary _DicSingleRO; @@ -32,7 +32,7 @@ namespace Volian.Controls.Library public frmEPAnnotationDetails(AnnotationInfo currAnn) { InitializeComponent(); - _DicStepRtb = new Dictionary(); + _DicTB = new Dictionary(); _DicCheckBox = new Dictionary(); _DicComboBox = new Dictionary(); _DicSingleRO = new Dictionary(); @@ -72,28 +72,20 @@ namespace Volian.Controls.Library if (EP.type.ToLower() == "text") { - StepRTB tb = new StepRTB(); - tb.Font = tb.FormatFont = new Font("Arial", 8); - tb.FieldToEdit = E_FieldToEdit.PSI; //use same right click menu as PSI + TextBox tb = new TextBox(); + tb.Font = tb.Font = new Font("Arial", 8); tb.BorderStyle = BorderStyle.FixedSingle; //aligning to both left and right stretches the textbox to the width of the form tb.Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top; - tb.Enter += new System.EventHandler(this.FieldStepRTB_Enter); - - string val = MyConfig.GetValue("EP", EP.name).Replace("\\u8209?", "-"); - DisplayText dt = new DisplayText(val, new VE_Font("Arial", 10, E_Style.None, 12), false); - StringBuilder sb = new StringBuilder(); - sb.Append(@"{\rtf1\ansi\ansicpg1252\deff0\deflang1033{\fonttbl{\f0\fnil\fcharset2 Arial;}"); - sb.Append(@"{\f1\fnil\fcharset0 Arial;}}{\colortbl ;\red255\green0\blue0;}"); //C2017-036 changed to just Arial because Microsoft removed Arial Unicode MS with Word16 - sb.Append(@"\viewkind4\uc1\pard\sl-240\slmult0\fs" + (int)(this.Font.SizeInPoints * 2) + " " + dt.StartText + @"}"); - tb.Rtf = sb.ToString(); + string val = MyConfig.GetValue("EP", EP.name).Replace("\\u8209?", "-").Replace(@"\u9586?", @"\"); + tb.Text = val; tb.Visible = true; tb.Height = EP.numlines * tb.Font.Height + 1 + tb.Margin.Vertical; tb.MinimumSize = new Size(0, EP.numlines * tb.Font.Height + 1 + tb.Margin.Vertical); if (EP.numlines > 1) { tb.Multiline = true; - tb.ScrollBars = RichTextBoxScrollBars.Both; + tb.ScrollBars = ScrollBars.Both; panelEP.RowStyles.Insert(panelEP.RowCount - 1, new RowStyle(SizeType.Absolute, 50)); } else @@ -101,7 +93,7 @@ namespace Volian.Controls.Library panelEP.RowStyles.Insert(panelEP.RowCount - 1, new RowStyle(SizeType.AutoSize)); } - _DicStepRtb.Add(EP.name, tb); + _DicTB.Add(EP.name, tb); panelEP.Controls.Add(tb, 1, panelEP.RowCount - 1); } else @@ -226,9 +218,8 @@ namespace Volian.Controls.Library { if (EP.type.ToLower() == "text") { - StepRTB cur = _DicStepRtb[EP.name]; - string rtf = cur.Rtf; - string newval = DisplayText.StaticStripRtfCommands(rtf, false); + TextBox cur = _DicTB[EP.name]; + string newval = cur.Text; string oldval = MyConfig.GetValue("EP", EP.name); if (oldval != newval) { @@ -318,11 +309,6 @@ namespace Volian.Controls.Library //remove events so no memory loss private void frmEPAnnotationDetails_FormClosing(object sender, FormClosingEventArgs e) { - foreach (StepRTB tb in _DicStepRtb.Values) - { - tb.Enter -= FieldStepRTB_Enter; - } - foreach (ListBoxMulti lb in _DicMultiRO.Values) { lb.Dispose();