From 4bdc127c870cb6fd2f2c839e5d4a83b88ffe58d9 Mon Sep 17 00:00:00 2001 From: Rich Date: Thu, 8 Oct 2009 14:27:52 +0000 Subject: [PATCH] Removed AncestorLookup property HasParent to Property rather than method Removed ActiveFormat from editable object Changed DefaultFormatSelection to use info objects Added Folder.MyFolderInfo Changed logic to use Info version of parent Changed Ancestor Lookup to use Info objects Fixed default value for disableduplex --- .../Config/FolderConfig.cs | 72 ++++++++++--------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Config/FolderConfig.cs b/PROMS/VEPROMS.CSLA.Library/Config/FolderConfig.cs index 73c1d09b..0565dcb0 100644 --- a/PROMS/VEPROMS.CSLA.Library/Config/FolderConfig.cs +++ b/PROMS/VEPROMS.CSLA.Library/Config/FolderConfig.cs @@ -36,14 +36,14 @@ namespace VEPROMS.CSLA.Library //PROPGRID: Hide AncestorLookup //PROPGRID: Needed to comment out [NonSerialized] in order to hide this field from the property grid //[NonSerialized] - [Browsable(false)] - private bool _AncestorLookup; - [Browsable(false)] - public bool AncestorLookup - { - get { return _AncestorLookup; } - set { _AncestorLookup = value; } - } + //[Browsable(false)] + //private bool _AncestorLookup; + //[Browsable(false)] + //public bool AncestorLookup + //{ + // get { return _AncestorLookup; } + // set { _AncestorLookup = value; } + //} private Folder _Folder; private FolderInfo _FolderInfo; public FolderConfig(Folder folder) @@ -52,34 +52,13 @@ namespace VEPROMS.CSLA.Library string xml = _Folder.Config; if (xml == string.Empty) xml = ""; _Xp = new XMLProperties(xml); - if (folder.MyParent != null) _Xp.LookInAncestor += new XMLPropertiesEvent(Xp_LookInAncestorFolder); + if (folder.MyFolderInfo.MyParent != null) _Xp.LookInAncestor += new XMLPropertiesEvent(Xp_LookInAncestorFolder); } private string Xp_LookInAncestorFolder(object sender, XMLPropertiesArgs args) { - if (_AncestorLookup || ParentLookup || args.AncestorLookup) - return GetParentValue(args.Group, args.Item); - return string.Empty; - } - public bool HasParent() - { - if (_Folder.ActiveParent != null) return true; - return false; - } - public string GetParentValue(string group, string item) - { - for (Folder folder = _Folder.MyParent; folder != null; folder = folder.MyParent) + if (ParentLookup || args.AncestorLookup) { - string retval = folder.FolderConfig.GetValue(group, item); - if (retval != string.Empty) return retval; - } - return string.Empty; - } - - private string Xp_LookInAncestorFolderInfo(object sender, XMLPropertiesArgs args) - { - if (_AncestorLookup || ParentLookup) - { - for (FolderInfo folder = _FolderInfo.MyParent; folder != null; folder = folder.MyParent) + for (FolderInfo folder = _Folder.MyFolderInfo.MyParent; folder != null; folder = folder.MyParent) { string retval = folder.FolderConfig.GetValue(args.Group, args.Item); if (retval != string.Empty) return retval; @@ -87,6 +66,27 @@ namespace VEPROMS.CSLA.Library } return string.Empty; } + public bool HasParent + { + get + { + if (_Folder != null) return _Folder.ParentID != _Folder.FolderID; + if (_FolderInfo != null) return _FolderInfo.ParentID != _FolderInfo.FolderID; + return false; + } + } + //private string Xp_LookInAncestorFolderInfo(object sender, XMLPropertiesArgs args) + //{ + // if (args.AncestorLookup || ParentLookup) + // { + // for (FolderInfo folder = _FolderInfo.MyParent; folder != null; folder = folder.MyParent) + // { + // string retval = folder.FolderConfig.GetValue(args.Group, args.Item); + // if (retval != string.Empty) return retval; + // } + // } + // return string.Empty; + //} public FolderConfig(FolderInfo folderInfo) { _FolderInfo = folderInfo; @@ -154,7 +154,7 @@ namespace VEPROMS.CSLA.Library if (_Folder != null) { _Folder.MyFormat = FormatList.ToFormat(value); - _Folder.ActiveFormat = null; + //_Folder.ActiveFormat = null; } } } @@ -166,13 +166,15 @@ namespace VEPROMS.CSLA.Library { get { - if (_Folder != null && _Folder.ActiveParent != null && _Folder.ActiveParent.ActiveFormat != null) return _Folder.ActiveParent.ActiveFormat.FullName; + if (_Folder != null && _Folder.MyFolderInfo.MyParent != null && _Folder.MyFolderInfo.MyParent.ActiveFormat != null) return _Folder.MyFolderInfo.MyParent.ActiveFormat.FullName; if (_FolderInfo != null && _FolderInfo.MyParent != null && _FolderInfo.MyParent.ActiveFormat != null) return _FolderInfo.MyParent.ActiveFormat.FullName; return null; } } public Folder MyFolder { get { return _Folder; } } + public FolderInfo MyFolderInfo + { get { return _FolderInfo; } } #endregion #region ToString public override string ToString() @@ -760,7 +762,7 @@ namespace VEPROMS.CSLA.Library string parval = _Xp.ParentValue("PrintSettings", "disableduplex"); // get the parent value if (parval.Equals(string.Empty)) // if the parent value is empty, then use the volian default - parval = "false"; + parval = "False"; if (parval.Equals(value.ToString())) _Xp["PrintSettings", "disableduplex"] = string.Empty; // reset to parent value