Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
bf06c9e14f | |||
5a263107da | |||
d30bb2e329 | |||
8248bd8e47 |
@@ -705,7 +705,7 @@ namespace VEPROMS.CSLA.Library
|
|||||||
Match m = Regex.Match(newvalue, @"(\\f[0-9]+)(\\u[0-9]{1,4}\?)(\\f[0-9]+ ?)");
|
Match m = Regex.Match(newvalue, @"(\\f[0-9]+)(\\u[0-9]{1,4}\?)(\\f[0-9]+ ?)");
|
||||||
if (m == null)
|
if (m == null)
|
||||||
newvalue = newvalue.Replace(@"\u916?", "^");
|
newvalue = newvalue.Replace(@"\u916?", "^");
|
||||||
else if (m.Groups[1].Value == "" && !ContentItems[0].MyItem.MyItemInfo.MyDocVersion.MyFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta)
|
else if (m.Groups[1].Value == "" && !ContentItems[0].MyItem.MyItemInfo.MyDocVersion.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta)
|
||||||
newvalue = newvalue.Replace(@"\u916?", "^");
|
newvalue = newvalue.Replace(@"\u916?", "^");
|
||||||
else if (m.Groups[1].Value == "")
|
else if (m.Groups[1].Value == "")
|
||||||
{
|
{
|
||||||
@@ -1420,7 +1420,7 @@ namespace VEPROMS.CSLA.Library
|
|||||||
if (newvalue.Contains(@"\u916?"))
|
if (newvalue.Contains(@"\u916?"))
|
||||||
{
|
{
|
||||||
Match m = Regex.Match(gg, @"(\\f[0-9]+)(\\u[0-9]{1,4}\?)(\\f[0-9]+ ?)");
|
Match m = Regex.Match(gg, @"(\\f[0-9]+)(\\u[0-9]{1,4}\?)(\\f[0-9]+ ?)");
|
||||||
if (m.Groups.Count < 3 && !ContentItems[0].MyDocVersion.MyFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta)
|
if (m.Groups.Count < 3 && !ContentItems[0].MyDocVersion.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta)
|
||||||
newvalue = newvalue.Replace(@"\u916?", "^");
|
newvalue = newvalue.Replace(@"\u916?", "^");
|
||||||
else if (m.Groups.Count < 3)
|
else if (m.Groups.Count < 3)
|
||||||
newvalue = newvalue.Replace(@"\u916?", $"{(char)916}");
|
newvalue = newvalue.Replace(@"\u916?", $"{(char)916}");
|
||||||
|
@@ -2712,6 +2712,17 @@ namespace Volian.Controls.Library
|
|||||||
lstCheckedStepTypes.Remove((int)sd.Index);
|
lstCheckedStepTypes.Remove((int)sd.Index);
|
||||||
lstCheckedStepTypesStr.Remove(advTreeStepTypes.SelectedNode.Text);
|
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
|
//C2023-010: Check if the node has children and if we need to process those children as well
|
||||||
@@ -2724,6 +2735,37 @@ namespace Volian.Controls.Library
|
|||||||
advTreeStepTypes_AfterCheck(sender, null);
|
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();
|
buildStepTypePannelTitle();
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user