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

Merge remote-tracking branch 'origin/Development' into B2025-011-Global-search-is-not-finding-question-marks

Browse Source
This commit is contained in:
Paul Larsen
2025-02-10 10:23:24 -05:00
parent 16509c2eab bc1f85b657
commit 4bfffc945a
2876 changed files with 1149685 additions and 163279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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();

1
PROMS/Volian.Controls.Library/DisplayTags.Designer.cs generated
View File

@@ -198,7 +198,6 @@ namespace Volian.Controls.Library
this.cmbShwRplWds.FormattingEnabled = true;
this.cmbShwRplWds.ItemHeight = 17;
this.cmbShwRplWds.Items.AddRange(new object[] {
"",
"Inherit from Section",
"Show replace words",
"Do not show replace words"});

7
PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj
View File

@@ -89,12 +89,13 @@
</Reference>
<Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL" />
<Reference Include="C1.Win.C1SpellChecker.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL" />
<Reference Include="Csla">
<HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
<Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\3rdPartyLibraries\CSLA\CSLA20cs_DLL_Net_4.8.1_Build\Csla.dll</HintPath>
</Reference>
<Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Program Files (x86)\DotNetBar for Windows Forms\DevComponents.DotNetBar2.dll</HintPath>
<HintPath>..\..\..\..\3rdPartyLibraries\DotNetBar\DotNetBar4.8.1Build\DevComponents.DotNetBar2.dll</HintPath>
</Reference>
<Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<SpecificVersion>False</SpecificVersion>