From 4744bcd45051f9755a2699b99bc76fc37d188eda Mon Sep 17 00:00:00 2001 From: Kathy Date: Thu, 12 Jan 2017 15:23:27 +0000 Subject: [PATCH] =?UTF-8?q?B2016-282:=20remove=20new=20subsection=20menu?= =?UTF-8?q?=20item=20off=20of=20V-Button=20when=20selected=20section=20is?= =?UTF-8?q?=20a=20Word=20Section=20B2016-236:=20for=20global=20search=20?= =?UTF-8?q?=E2=80=93=20add=20=E2=80=98Figure=E2=80=99=20to=20Results=20sty?= =?UTF-8?q?le=20as=20Document=20Text=20&=20change=20=E2=80=98AER=E2=80=99?= =?UTF-8?q?=20to=20=E2=80=98Left=E2=80=99=20in=20list=20of=20step=20types?= =?UTF-8?q?=20for=20figures.=20B2016-282:=20remove=20new=20subsection=20me?= =?UTF-8?q?nu=20item=20off=20of=20a=20Word=20Section=20from?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/VEPROMS User Interface/frmVEPROMS.cs | 12 +++++++++--- PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs | 1 + PROMS/Volian.Controls.Library/DisplaySearch.cs | 5 ++++- PROMS/Volian.Controls.Library/vlnTreeView.cs | 6 +++++- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index de67eb08..30fb03e2 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -3393,15 +3393,21 @@ namespace VEPROMS } ButtonItem sbbtn = new ButtonItem("sbbtn", "Section Before"); ButtonItem sabtn = new ButtonItem("sabtn", "Section After"); - ButtonItem subbtn = new ButtonItem("subbtn", "SubSection"); + btnNew.SubItems.Add(sbbtn); btnNew.SubItems.Add(sabtn); - btnNew.SubItems.Add(subbtn); sbbtn.Click += new EventHandler(sbbtn_Click); sabtn.Click += new EventHandler(sabtn_Click); - subbtn.Click += new EventHandler(subbtn_Click); + if (si.IsStepSection) { + // B2016-282: Don't allow insert of subsections off Word Section. + if (si.ActiveFormat.PlantFormat.FormatData.SectData.UseMetaSections) + { + ButtonItem subbtn = new ButtonItem("subbtn", "SubSection"); + btnNew.SubItems.Add(subbtn); + subbtn.Click += new EventHandler(subbtn_Click); + } ButtonItem stpbtn = new ButtonItem("stpbtn", "New Step"); btnNew.SubItems.Add(stpbtn); stpbtn.Click += new EventHandler(stpbtn_Click); diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 6682753a..6acc15e4 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -2462,6 +2462,7 @@ namespace VEPROMS.CSLA.Library get { if (IsRtfRaw) return ("Equation"); + if (IsFigure) return ("Figure"); // Added for B2016-236 string str = MyContent.Text; if (MyDocVersion != null) { diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs index 0faa5d74..375ca0ed 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs @@ -435,7 +435,10 @@ namespace Volian.Controls.Library } else { - newnode = NewAdvTreeNode(sdr.Name, true, true); + // B2016-236: for global search – change ‘AER’ to ‘Left’ in list of step types for figures + string nameInTree = sdr.Name; + if (sdr.Name.Contains("AER") && sdr.Name.ToUpper().Contains("FIGURE")) nameInTree = nameInTree.Replace("AER", "Left"); + newnode = NewAdvTreeNode(nameInTree, true, true); newnode.Name = sd.Type; // this needed for the FindNodeByName() function newnode.Tag = sd; diff --git a/PROMS/Volian.Controls.Library/vlnTreeView.cs b/PROMS/Volian.Controls.Library/vlnTreeView.cs index 14c30476..4f7d2f81 100644 --- a/PROMS/Volian.Controls.Library/vlnTreeView.cs +++ b/PROMS/Volian.Controls.Library/vlnTreeView.cs @@ -869,7 +869,7 @@ namespace Volian.Controls.Library cm.MenuItems.Add(string.Format("Document Checked Out to {0}", oi.SessionUserID), new EventHandler(mi_Click)); cm.MenuItems.Add("Insert Section Before", new EventHandler(mi_Click)); cm.MenuItems.Add("Insert Section After", new EventHandler(mi_Click)); - if (!si.IsAutoTOCSection) + if (!si.IsAutoTOCSection && si.IsStepSection) // B2016-282: Don't allow insert of subsections off Word Section. { bool meta = si.ActiveFormat.PlantFormat.FormatData.SectData.UseMetaSections; if (meta) cm.MenuItems.Add("New Subsection", new EventHandler(mi_Click)); @@ -2013,7 +2013,9 @@ namespace Volian.Controls.Library else if (p.IndexOf("After") > -1) PasteBeforeOrAfter(MenuSelections.StepAfter, tn, iiClipboard.ItemID); else if (p.IndexOf("Replace") > -1) + { PasteReplace(tn, iiClipboard.ItemID); + } else // paste as child PasteAsChild(tn, iiClipboard.ItemID); this.Cursor = Cursors.Default; @@ -3691,12 +3693,14 @@ namespace Volian.Controls.Library } public VETreeNode RefreshRelatedNode(IVEDrillDownReadOnly selectedItem) { + Console.WriteLine("vlntreeview:refreshrelatednote:start"); VETreeNode child = FindNode(selectedItem, this.Nodes); if (child == null) return null; if (!child.IsExpanded) child.Expand(); child.ChildrenLoaded = false; child.RefreshNode(); + Console.WriteLine("vlntreeview:refreshrelatednote:end"); return child; }