Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

B2016-282: remove new subsection menu item off of V-Button when selected section is a Word Section

Browse Source 
B2016-236: for global search – add ‘Figure’ to Results style as Document Text & change ‘AER’ to ‘Left’ in list of step types for figures.
B2016-282: remove new subsection menu item off of a Word Section from
This commit is contained in:
Kathy Ruffing 2017-01-12 15:23:27 +00:00
parent e6fbb77546
commit 4744bcd450
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PROMS/VEPROMS User Interface/frmVEPROMS.cs
View File

@ -3393,15 +3393,21 @@ namespace VEPROMS
} }
ButtonItem sbbtn = new ButtonItem("sbbtn", "Section Before"); ButtonItem sbbtn = new ButtonItem("sbbtn", "Section Before");
ButtonItem sabtn = new ButtonItem("sabtn", "Section After"); ButtonItem sabtn = new ButtonItem("sabtn", "Section After");
ButtonItem subbtn = new ButtonItem("subbtn", "SubSection");
btnNew.SubItems.Add(sbbtn); btnNew.SubItems.Add(sbbtn);
btnNew.SubItems.Add(sabtn); btnNew.SubItems.Add(sabtn);
btnNew.SubItems.Add(subbtn);
sbbtn.Click += new EventHandler(sbbtn_Click); sbbtn.Click += new EventHandler(sbbtn_Click);
sabtn.Click += new EventHandler(sabtn_Click); sabtn.Click += new EventHandler(sabtn_Click);
subbtn.Click += new EventHandler(subbtn_Click);
if (si.IsStepSection) 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"); ButtonItem stpbtn = new ButtonItem("stpbtn", "New Step");
btnNew.SubItems.Add(stpbtn); btnNew.SubItems.Add(stpbtn);
stpbtn.Click += new EventHandler(stpbtn_Click); stpbtn.Click += new EventHandler(stpbtn_Click);

1
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
View File

@ -2462,6 +2462,7 @@ namespace VEPROMS.CSLA.Library
get get
{ {
if (IsRtfRaw) return ("Equation"); if (IsRtfRaw) return ("Equation");
if (IsFigure) return ("Figure"); // Added for B2016-236
string str = MyContent.Text; string str = MyContent.Text;
if (MyDocVersion != null) if (MyDocVersion != null)
{ {

5
PROMS/Volian.Controls.Library/DisplaySearch.cs
View File

@ -435,7 +435,10 @@ namespace Volian.Controls.Library
} }
else 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.Name = sd.Type; // this needed for the FindNodeByName() function
newnode.Tag = sd; newnode.Tag = sd;

6
PROMS/Volian.Controls.Library/vlnTreeView.cs
View File

@ -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(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 Before", new EventHandler(mi_Click));
cm.MenuItems.Add("Insert Section After", 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; bool meta = si.ActiveFormat.PlantFormat.FormatData.SectData.UseMetaSections;
if (meta) cm.MenuItems.Add("New Subsection", new EventHandler(mi_Click)); 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) else if (p.IndexOf("After") > -1)
PasteBeforeOrAfter(MenuSelections.StepAfter, tn, iiClipboard.ItemID); PasteBeforeOrAfter(MenuSelections.StepAfter, tn, iiClipboard.ItemID);
else if (p.IndexOf("Replace") > -1) else if (p.IndexOf("Replace") > -1)
{
PasteReplace(tn, iiClipboard.ItemID); PasteReplace(tn, iiClipboard.ItemID);
}
else // paste as child else // paste as child
PasteAsChild(tn, iiClipboard.ItemID); PasteAsChild(tn, iiClipboard.ItemID);
this.Cursor = Cursors.Default; this.Cursor = Cursors.Default;
@ -3691,12 +3693,14 @@ namespace Volian.Controls.Library
} }
public VETreeNode RefreshRelatedNode(IVEDrillDownReadOnly selectedItem) public VETreeNode RefreshRelatedNode(IVEDrillDownReadOnly selectedItem)
{ {
Console.WriteLine("vlntreeview:refreshrelatednote:start");
VETreeNode child = FindNode(selectedItem, this.Nodes); VETreeNode child = FindNode(selectedItem, this.Nodes);
if (child == null) return null; if (child == null) return null;
if (!child.IsExpanded) if (!child.IsExpanded)
child.Expand(); child.Expand();
child.ChildrenLoaded = false; child.ChildrenLoaded = false;
child.RefreshNode(); child.RefreshNode();
Console.WriteLine("vlntreeview:refreshrelatednote:end");
return child; return child;
} }