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

Added other symbol font names (Symbol, VESymb) to IsSymbolFont.

Browse Source 
Check for null mySection before checking details on a new node.
Error 177 - Hidden property added to use for collapse rather than Visible.
Error 173 - Use DeleteItemInfoAndChildren on Cancel of a new ItemInfo.
This commit is contained in:
Rich 2010-11-29 16:31:41 +00:00
parent 29e4ffceea
commit 9de2eb9d9a
4 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PROMS/LBWordLibrary/LBObjectExtension.cs
View File

@ -285,11 +285,11 @@ namespace LBWordLibrary
return ReplaceSymbolCharacters(GetRangeText(myRange));
}
}
private static string[] SymbolFontName = { "VolianDraw", "WingDings" };
private static string[] SymbolFontName = { "VolianDraw", "WingDings", "VESymb", "VESymbFix", "Symbol" };
private static bool IsSymbolFont(string fontName)
{
foreach (string symbolFont in SymbolFontName)
if (symbolFont.ToUpper() == fontName.ToUpper())
if (fontName.ToUpper().StartsWith(symbolFont.ToUpper()))
return true;
return false;
}

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

@ -338,7 +338,7 @@ namespace VEPROMS
VETreeNode vNode = (VETreeNode)args.Node;
IVEDrillDownReadOnly veObj = vNode.VEObject;
SectionInfo mySection = veObj as SectionInfo;
if (mySection.MyContent.MyEntry != null)
if (mySection != null && mySection.MyContent.MyEntry != null)
{
// if it is a word section, find the DisplayTabItem;
DisplayTabItem tabItem = tc.GetProcDisplayTabItem(mySection);

14
PROMS/Volian.Controls.Library/StepItem.cs
View File

@ -543,9 +543,15 @@ namespace Volian.Controls.Library
{
get
{
return Top + (Visible ? Height : 0);
return Top + (Hidden ? 0 : Height);
}
}
private bool _Hidden = false;
public bool Hidden
{
get { return _Hidden; }
set { _Hidden = value; Visible = !value; }
}
/// <summary>
/// Bottom most child
/// </summary>
@ -1958,7 +1964,7 @@ namespace Volian.Controls.Library
foreach (StepItem child in childStepItems)
{
if (child.Expanded) child.HideChildren();
child.Visible = false;
child.Hidden = true;
}
}
}
@ -1989,7 +1995,7 @@ namespace Volian.Controls.Library
child.UnhideChildren(expand);
else if (expand)
child.Expand(expand);
child.Visible = true;
child.Hidden = false;
}
}
}
@ -2031,7 +2037,7 @@ namespace Volian.Controls.Library
{
child.Expand(true);
}
child.Visible = true;
child.Hidden = false;
}
}
}

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

@ -860,7 +860,8 @@ namespace Volian.Controls.Library
else
p1 = procedure.ItemID;
}
if (p1 != -1) Item.Delete(p1);
if (p1 != -1)
DeleteItemInfoAndChildren(_LastProcedureInfo);// Delete Item and reset Previous and Next
}
else if (newtype == MenuSelections.ProcedureAfter || newtype == MenuSelections.ProcedureBefore)
{
@ -881,7 +882,8 @@ namespace Volian.Controls.Library
else
p2 = procedure.ItemID;
}
if (p2 != -1) Item.Delete(p2);
if (p2 != -1)
DeleteItemInfoAndChildren(_LastProcedureInfo); // Delete Item and reset Previous and Next
}
#endregion
#region InsertSection
@ -902,7 +904,8 @@ namespace Volian.Controls.Library
else
s1 = section.ItemID;
}
if (s1 != -1) Item.Delete(s1);
if (s1 != -1)
DeleteItemInfoAndChildren(_LastSectionInfo);// Delete Item and reset Previous and Next
}
}
else if (newtype == MenuSelections.SectionAfter || newtype == MenuSelections.SectionBefore)
@ -923,7 +926,8 @@ namespace Volian.Controls.Library
else
s2 = section.ItemID;
}
if (s2 != -1) Item.Delete(s2);
if (s2 != -1)
DeleteItemInfoAndChildren(_LastSectionInfo);// Delete Item and reset Previous and Next
}
#endregion
#region InsertStep