Merge remote-tracking branch 'origin/Development' into B2025-011-Global-search-is-not-finding-question-marks
This commit is contained in:
@@ -2391,6 +2391,17 @@ namespace Volian.Controls.Library
|
||||
if (n.Nodes != null && n.Nodes.Count > 0 && n.Nodes[0].Text != DummyNodeText) CheckTreeNodeChildren(n.Nodes);
|
||||
checkingChildren = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
//C2025-005 Find Step Elements
|
||||
//uncheck the parents if there are any
|
||||
DevComponents.AdvTree.Node tmp_n = n;
|
||||
while (tmp_n.Parent != null)
|
||||
{
|
||||
tmp_n = tmp_n.Parent;
|
||||
tmp_n.Checked = false;
|
||||
}
|
||||
}
|
||||
|
||||
// if the selected folder has a docversion, handle it:
|
||||
if (n.Tag != SelectAllProcedureSetsText)
|
||||
@@ -2408,6 +2419,26 @@ namespace Volian.Controls.Library
|
||||
|
||||
SetupContextMenu();
|
||||
buildSetToSearchPanelTitle();
|
||||
|
||||
//C2025-005 Find Step Elements
|
||||
//Need to refresh the Doc List and Available Step Types
|
||||
//if All Procedure Sets was selected
|
||||
if (n.Tag == SelectAllProcedureSetsText)
|
||||
{
|
||||
if (n.Checked)
|
||||
{
|
||||
checkingChildren = true;
|
||||
foreach (Node node in advTreeProcSets.Nodes[0].Nodes)
|
||||
{
|
||||
node.Checked = true;
|
||||
CheckTreeNodeChildren(node.Nodes);
|
||||
}
|
||||
checkingChildren = false;
|
||||
}
|
||||
RefreshLstCheckedDocVersions();
|
||||
RefreshStepTypes();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// check all folder nodes below this
|
||||
@@ -2481,14 +2512,19 @@ namespace Volian.Controls.Library
|
||||
ResetStepTypes("....select a procedure set for types to appear...");
|
||||
}
|
||||
|
||||
private void ResetStepTypes(string str)
|
||||
//C2025-005 Find Step Elements
|
||||
//improve messaging when multiple formats
|
||||
private void ResetStepTypes(params string[] strs)
|
||||
{
|
||||
advTreeStepTypes.Nodes.Clear();
|
||||
lstCheckedStepTypes.Clear();
|
||||
lstCheckedStepTypesStr.Clear();
|
||||
Node newnode = new DevComponents.AdvTree.Node();
|
||||
newnode.Text = str;
|
||||
advTreeStepTypes.Nodes.Add(newnode);
|
||||
foreach (string str in strs)
|
||||
{
|
||||
Node newnode = new DevComponents.AdvTree.Node();
|
||||
newnode.Text = str;
|
||||
advTreeStepTypes.Nodes.Add(newnode);
|
||||
}
|
||||
buildStepTypePannelTitle();
|
||||
}
|
||||
|
||||
@@ -2515,7 +2551,11 @@ namespace Volian.Controls.Library
|
||||
{
|
||||
if (formatName != dvi.ActiveFormat.Name)
|
||||
{
|
||||
ResetStepTypes("...folders selected include multiple formats");
|
||||
//C2025-005 Find Step Elements
|
||||
//improve messaging when multiple formats
|
||||
string frmt1 = $" Format is {formatName} before {dvi.MyFolder.Name}";
|
||||
string frmt2 = $" which begins format: {dvi.ActiveFormat.Name}";
|
||||
ResetStepTypes("...folders selected include multiple formats.", frmt1, frmt2);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -2701,6 +2741,17 @@ namespace Volian.Controls.Library
|
||||
lstCheckedStepTypes.Remove((int)sd.Index);
|
||||
lstCheckedStepTypesStr.Remove(advTreeStepTypes.SelectedNode.Text);
|
||||
}
|
||||
|
||||
//B2025-012 Find Step Elements
|
||||
//uncheck the parents if there are any
|
||||
DevComponents.AdvTree.Node tmp_n = n;
|
||||
while (tmp_n.Parent != null)
|
||||
{
|
||||
tmp_n = tmp_n.Parent;
|
||||
tmp_n.Checked = false;
|
||||
}
|
||||
//uncheck All Types
|
||||
advTreeStepTypes.Nodes[0].Checked = false;
|
||||
}
|
||||
|
||||
//C2023-010: Check if the node has children and if we need to process those children as well
|
||||
@@ -2713,6 +2764,37 @@ namespace Volian.Controls.Library
|
||||
advTreeStepTypes_AfterCheck(sender, null);
|
||||
}
|
||||
}
|
||||
else if (n.Text == "All Types")
|
||||
{
|
||||
//B2025-012 Find Step Elements
|
||||
//if checking / un-checking All Types
|
||||
//Add Types to type list appropriately
|
||||
if (n.Checked)
|
||||
{
|
||||
foreach (Node child in advTreeStepTypes.Nodes)
|
||||
{
|
||||
if (child.Text != "All Types")
|
||||
{
|
||||
child.Checked = true;
|
||||
advTreeStepTypes.SelectedNode = child;
|
||||
advTreeStepTypes_AfterCheck(sender, null);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
foreach (Node child in advTreeStepTypes.Nodes)
|
||||
{
|
||||
if (child.Text != "All Types")
|
||||
{
|
||||
child.Checked = false;
|
||||
advTreeStepTypes.SelectedNode = child;
|
||||
advTreeStepTypes_AfterCheck(sender, null);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
buildStepTypePannelTitle();
|
||||
|
||||
|
Reference in New Issue
Block a user