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

Added support to limit folder range.

Browse Source 
Added option (false) to Remove Trailing Hard Returns and Manual Page Breaks
This commit is contained in:
Rich 2016-01-20 20:18:11 +00:00
parent 9e170362cc
commit f51753ea4b
2 changed files with 83 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -429,12 +429,18 @@ namespace Volian.Controls.Library
} }
buildStepTypePannelTitle(); buildStepTypePannelTitle();
} }
private int _TopFolderID = 1;
public int TopFolderID
{
get { return _TopFolderID; }
set { _TopFolderID = value; }
}
public void advTreeProcSetsFillIn(bool blSeachTabClicked) public void advTreeProcSetsFillIn(bool blSeachTabClicked)
{ {
DevComponents.AdvTree.Node topnode = null; DevComponents.AdvTree.Node topnode = null;
int cntnd = 0; int cntnd = 0;
VETreeNode vtn = VETreeNode.GetFolder(1); VETreeNode vtn = VETreeNode.GetFolder(TopFolderID);
FolderInfo fi = vtn.VEObject as FolderInfo; FolderInfo fi = vtn.VEObject as FolderInfo;
int fiCount = fi.ChildFolderCount; int fiCount = fi.ChildFolderCount;
advTreeProcSets.Nodes.Clear(); advTreeProcSets.Nodes.Clear();
@ -445,7 +451,8 @@ namespace Volian.Controls.Library
advTreeProcSets.Nodes.Add(topnode); advTreeProcSets.Nodes.Add(topnode);
//advTreeProcSets.AfterNodeInsert += new TreeNodeCollectionEventHandler(advTreeProcSets_AfterNodeInsert); //advTreeProcSets.AfterNodeInsert += new TreeNodeCollectionEventHandler(advTreeProcSets_AfterNodeInsert);
if (fi.ChildFolders != null)
{
foreach (FolderInfo fic in fi.ChildFolders) foreach (FolderInfo fic in fi.ChildFolders)
{ {
DevComponents.AdvTree.Node newnode = new DevComponents.AdvTree.Node(); DevComponents.AdvTree.Node newnode = new DevComponents.AdvTree.Node();
@ -477,7 +484,23 @@ namespace Volian.Controls.Library
topnode.Nodes.Add(newnode); topnode.Nodes.Add(newnode);
} }
} }
}
else
{
DevComponents.AdvTree.Node newnode = new DevComponents.AdvTree.Node();
newnode.Text = fi.ToString();
newnode.Tag = fi;
//newnode.Checked = true;
//newnode.Selectable = true;
//newnode.CheckBoxAlignment = DevComponents.AdvTree.eCellPartAlignment.NearCenter;
//newnode.CheckBoxStyle = eCheckBoxStyle.CheckBox;
//newnode.CheckBoxThreeState = false;
//newnode.CheckBoxVisible = true;
AddDocVersionNodes(newnode, fi, true);
topnode.Nodes.Add(newnode);
lstCheckedDocVersions.Add(Mydocversion);
buildSetToSearchPanelTitle();
}
// if nothing was added to the tree, just put in the node above the docversions... // if nothing was added to the tree, just put in the node above the docversions...
if (advTreeProcSets.Nodes.Count == 0) if (advTreeProcSets.Nodes.Count == 0)
{ {
@ -544,6 +567,13 @@ namespace Volian.Controls.Library
} }
} }
else if (fi.FolderDocVersionCount > 0) else if (fi.FolderDocVersionCount > 0)
{
AddDocVersionNodes(par, fi, false);
}
}
}
private void AddDocVersionNodes(DevComponents.AdvTree.Node par, FolderInfo fi, bool isChecked)
{ {
foreach (DocVersionInfo dv in fi.FolderDocVersions) foreach (DocVersionInfo dv in fi.FolderDocVersions)
{ {
@ -557,6 +587,7 @@ namespace Volian.Controls.Library
newnode.CheckBoxStyle = eCheckBoxStyle.CheckBox; newnode.CheckBoxStyle = eCheckBoxStyle.CheckBox;
newnode.CheckBoxThreeState = false; newnode.CheckBoxThreeState = false;
newnode.CheckBoxVisible = true; newnode.CheckBoxVisible = true;
newnode.Checked = isChecked;
if (tabSearchTypes.SelectedTab == tabTranSearch) if (tabSearchTypes.SelectedTab == tabTranSearch)
{ {
if (!dicSelectedDocVersionNodes.ContainsKey(newnode)) dicSelectedDocVersionNodes.Add(newnode, false); if (!dicSelectedDocVersionNodes.ContainsKey(newnode)) dicSelectedDocVersionNodes.Add(newnode, false);
@ -569,8 +600,6 @@ namespace Volian.Controls.Library
//} //}
} }
} }
}
}
private Node LookInTree(NodeCollection monkeys, string bananna) private Node LookInTree(NodeCollection monkeys, string bananna)
{ {

2
PROMS/Volian.Controls.Library/StepRTB.cs
View File

@ -477,7 +477,7 @@ namespace Volian.Controls.Library
ActiveMode = activeMode; ActiveMode = activeMode;
OnAdjustTableWidth(this, new StepRTBTableWidthEventArgs(true)); OnAdjustTableWidth(this, new StepRTBTableWidthEventArgs(true));
_InitializingRTB = true; _InitializingRTB = true;
DisplayText vlntxt = new DisplayText(MyItemInfo, E_EditPrintMode.Edit, VwMode, !ActiveMode, FieldToEdit, true,null, null); DisplayText vlntxt = new DisplayText(MyItemInfo, E_EditPrintMode.Edit, VwMode, !ActiveMode, FieldToEdit, true,null, null,false);
//if (_origDisplayText != null && vlntxt.StartText == _origDisplayText.StartText) //if (_origDisplayText != null && vlntxt.StartText == _origDisplayText.StartText)
//{ //{
// ReadOnly = !(EpMode == E_EditPrintMode.Edit && VwMode == E_ViewMode.Edit); // ReadOnly = !(EpMode == E_EditPrintMode.Edit && VwMode == E_ViewMode.Edit);