Corrected enum value (EnhancedBackgrounds)
Numerous fixes
This commit is contained in:
parent
9e45e5601d
commit
c549e65bf5
@ -22,7 +22,7 @@ namespace VEPROMS.CSLA.Library
|
|||||||
ApproveGenericBack = 0x0200,
|
ApproveGenericBack = 0x0200,
|
||||||
DistributeApproved = 0x0400,
|
DistributeApproved = 0x0400,
|
||||||
OutsideTransitions = 0x0800,
|
OutsideTransitions = 0x0800,
|
||||||
EnhancedBackGrounds = 0x1000,
|
EnhancedBackgrounds = 0x1000,
|
||||||
EnhancedDeviations = 0x2000,
|
EnhancedDeviations = 0x2000,
|
||||||
AutoTableOfContents = 0x4000,
|
AutoTableOfContents = 0x4000,
|
||||||
AutoPlacekeeper = 0x8000
|
AutoPlacekeeper = 0x8000
|
||||||
|
@ -2603,12 +2603,13 @@ namespace VEPROMS.CSLA.Library
|
|||||||
public class Separator : vlnFormatItem
|
public class Separator : vlnFormatItem
|
||||||
{
|
{
|
||||||
public Separator(XmlNode xmlNode) : base(xmlNode) { }
|
public Separator(XmlNode xmlNode) : base(xmlNode) { }
|
||||||
private LazyLoad<int?> _SeparatorLocation;
|
private LazyLoad<int?> _Location;
|
||||||
public int? SeparatorLocation
|
public int? Location
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
return LazyLoad(ref _SeparatorLocation, "@SeparatorLocation");
|
return LazyLoad(ref _Location, "@Location");
|
||||||
|
//return LazyLoad(ref _SeparatorLocation, "@SeparatorLocation");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private VE_Font _Font;
|
private VE_Font _Font;
|
||||||
@ -2810,6 +2811,14 @@ namespace VEPROMS.CSLA.Library
|
|||||||
return LazyLoad(ref _TabFormat, "@TabFormat");
|
return LazyLoad(ref _TabFormat, "@TabFormat");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
private LazyLoad<string> _PrintTabFormat;
|
||||||
|
public string PrintTabFormat
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return LazyLoad(ref _TabFormat, "@PrintTabFormat");
|
||||||
|
}
|
||||||
|
}
|
||||||
public override string GetPDDisplayName()
|
public override string GetPDDisplayName()
|
||||||
{ return string.Format("Index [{0}]",Index); }
|
{ return string.Format("Index [{0}]",Index); }
|
||||||
public override string GetPDDescription()
|
public override string GetPDDescription()
|
||||||
@ -3503,12 +3512,12 @@ namespace VEPROMS.CSLA.Library
|
|||||||
return LazyLoad(ref _SameRowAsParent, "@SameRowAsParent");
|
return LazyLoad(ref _SameRowAsParent, "@SameRowAsParent");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private LazyLoad<bool> _CheckoffSameAsParent;
|
private LazyLoad<bool> _CheckOffSameAsParent;
|
||||||
public bool CheckoffSameAsParent
|
public bool CheckOffSameAsParent
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
return LazyLoad(ref _CheckoffSameAsParent, "@CheckoffSameAsParent");
|
return LazyLoad(ref _CheckOffSameAsParent, "@CheckOffSameAsParent");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private LazyLoad<bool> _AtLeastTwoDigits;
|
private LazyLoad<bool> _AtLeastTwoDigits;
|
||||||
@ -3593,7 +3602,7 @@ namespace VEPROMS.CSLA.Library
|
|||||||
}
|
}
|
||||||
public override string ToString()
|
public override string ToString()
|
||||||
{
|
{
|
||||||
return string.Format("{0}", Type);
|
return string.Format("{0:00} - {1}", Index, Type);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
@ -3775,12 +3784,20 @@ namespace VEPROMS.CSLA.Library
|
|||||||
return LazyLoad(ref _BackColor, "StepLayoutData/@BackColor");
|
return LazyLoad(ref _BackColor, "StepLayoutData/@BackColor");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private LazyLoad<int?> _STExtralines;
|
//private LazyLoad<int?> _STExtralines; Replaced with STExtraSpace
|
||||||
public int? STExtralines
|
//public int? STExtralines
|
||||||
|
//{
|
||||||
|
// get
|
||||||
|
// {
|
||||||
|
// return LazyLoad(ref _STExtralines, "StepLayoutData/@STExtralines");
|
||||||
|
// }
|
||||||
|
//}
|
||||||
|
private LazyLoad<int?> _STExtraSpace;
|
||||||
|
public int? STExtraSpace
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
return LazyLoad(ref _STExtralines, "StepLayoutData/@STExtralines");
|
return LazyLoad(ref _STExtraSpace, "StepLayoutData/@STExtraSpace");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private LazyLoad<int?> _STBoxindex;
|
private LazyLoad<int?> _STBoxindex;
|
||||||
@ -3933,12 +3950,12 @@ namespace VEPROMS.CSLA.Library
|
|||||||
return LazyLoad(ref _IdentPrint, "TabData/@Ident");
|
return LazyLoad(ref _IdentPrint, "TabData/@Ident");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private LazyLoad<string> _AltPrintTBIdent;
|
private LazyLoad<string> _IdentAltPrint;
|
||||||
public string AltPrintTBIdent
|
public string IdentAltPrint
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
return LazyLoad(ref _AltPrintTBIdent, "TabData/@AltPrintTBIdent");
|
return LazyLoad(ref _IdentAltPrint, "TabData/@IdentAltPrint");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private LazyLoad<string> _RNOIdentEdit;
|
private LazyLoad<string> _RNOIdentEdit;
|
||||||
@ -3978,7 +3995,8 @@ namespace VEPROMS.CSLA.Library
|
|||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
return (_Font == null ? _Font = new VE_Font(base.XmlNode) : _Font);
|
XmlNode xn = vlnFormatDocument.LookupSingleStepNode(base.XmlNode, "TabData[Font]");
|
||||||
|
return (_Font == null ? _Font = new VE_Font(xn) : _Font);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user