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

- Replace slashes and backslashes with underscores in the pdf file name

Browse Source 
- Use pdf name specified in the dialog
Fixed properties so that procedures and sections can be open in the propertygrid without error
This commit is contained in:
Rich
2011-05-06 13:59:06 +00:00
parent 3c32f936c7
commit ed8b4d11ee
3 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -467,6 +467,7 @@ namespace VEPROMS.CSLA.Library
private static int CountLevels(ItemInfo item)
{
int level = 0;
if (item.IsProcedure) return 0;
int ignoreRNOs = item.ActiveSection.ColumnMode;
while (item != null && !item.IsHigh)
{
@@ -896,12 +897,15 @@ namespace VEPROMS.CSLA.Library
get
{
// check config value on my section, if null/default use Pmode of active format
SectionInfo si = SectionInfo.Get(ActiveSection.ItemID); //ActiveSection as SectionInfo;
if (si != null)
if (ActiveSection != null)
{
// there is no longer a "default" ENUM item - SectionConfig will return format default if needed
//if (si.SectionConfig.Section_ColumnMode != SectionConfig.SectionColumnMode.Default)
SectionInfo si = SectionInfo.Get(ActiveSection.ItemID); //ActiveSection as SectionInfo;
if (si != null)
{
// there is no longer a "default" ENUM item - SectionConfig will return format default if needed
//if (si.SectionConfig.Section_ColumnMode != SectionConfig.SectionColumnMode.Default)
return (int)si.SectionConfig.Section_ColumnMode - 1;
}
}
return (ActiveFormat.MyStepSectionLayoutData.PMode ?? 2) -1;
}
@@ -1011,7 +1015,9 @@ namespace VEPROMS.CSLA.Library
ItemInfo temp = FirstSibling;
if(temp.ActiveParent.GetType() == typeof(VEPROMS.CSLA.Library.DocVersionInfo))return false;
if (temp.MyParent.IsSection) return false; // already at hls
while (((ItemInfo)temp.ActiveParent).IsHigh == false) temp = ((ItemInfo)temp.ActiveParent).FirstSibling;
if (temp.IsProcedure || temp.IsSection) return false;
while (((ItemInfo)temp.ActiveParent).IsHigh == false)
temp = ((ItemInfo)temp.ActiveParent).FirstSibling;
return temp.IsStepPart;
}
}
@@ -1142,10 +1148,10 @@ namespace VEPROMS.CSLA.Library
{
get { return _SearchPath; }
}
public string ShortSearchPath
{
get { return ConvertToDisplayText(Regex.Replace(_SearchPath, "\x11.*?\x07", "\x07")); }
}
public string ShortSearchPath
{
get { return ConvertToDisplayText(Regex.Replace(_SearchPath ?? "", "\x11.*?\x07", "\x07")); }
}
internal int _SearchAnnotationID;
public int SearchAnnotationID
{
@@ -1686,7 +1692,8 @@ namespace VEPROMS.CSLA.Library
if (IsHigh) _MyHLS = this;
else
{
_MyHLS = ((ItemInfo)MyActiveParent).MyHLS;
if(MyActiveParent is ItemInfo)
_MyHLS = ((ItemInfo)MyActiveParent).MyHLS;
}
}
return _MyHLS;
@@ -1785,7 +1792,7 @@ namespace VEPROMS.CSLA.Library
{
get
{
if (_MyDocStyle == null)
if (_MyDocStyle == null && ActiveSection != null)
{
int typ = (int)ActiveSection.MyContent.Type;
int subtyp = typ % 10000;