Skip to content

Fix LT-3356: Inflectional Class Info area confusing #432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jtmaxwell3 merged 6 commits into from
Aug 12, 2025
Merged

Fix LT-3356: Inflectional Class Info area confusing #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
11244df
Fix LT-3356: Inflectional Class Info area confusing
jtmaxwell3 Aug 6, 2025
2e4ba73
Don't hide Subclasses
jtmaxwell3 Aug 6, 2025
8e0bedd
Remove menu item that is no longer necessary
jtmaxwell3 Aug 6, 2025
4fef98a
Removed System.Buffers.dll
jtmaxwell3 Aug 7, 2025
a44fe0e
Add System.Buffers.dll to .gitignore
jtmaxwell3 Aug 7, 2025
c07dece
Merge branch 'release/9.3' into LT-3356
jtmaxwell3 Aug 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ Bin/_setLatestBuildConfig.bat
Bin/_setroot.bat
Lib/debug/DebugProcs.lib
Lib/debug/Generic.lib
Lib/debug/System.Buffers.dll
Lib/debug/System.ValueTuple.dll
Lib/debug/unit++.*
Lib/release/DebugProcs.lib
Expand Down
4 changes: 2 additions & 2 deletions DistFiles/Language Explorer/Configuration/Grammar/DataTreeInclude.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
<command id="CmdDataTree-MoveDown-POS-AffixTemplate" label="Move Affix Template Down" message="MoveDownObjectInSequence" icon="MoveDown">
<parameters field="AffixTemplates" className="MoInflAffixTemplate"/>
</command>
<command id="CmdDataTree-Insert-POS-InflectionClass-Subclasses" label="Insert Inflection Class" message="DataTreeInsert">
<command id="CmdDataTree-Insert-POS-InflectionClass-Subclasses" label="Insert Inflection Subclass" message="DataTreeInsert">
<parameters field="Subclasses" className="MoInflClass"/>
</command>
<command id="CmdDataTree-Insert-POS-InflectionClass" label="Insert Inflection Class" message="DataTreeInsert">
Expand Down Expand Up @@ -248,7 +248,7 @@
<!-- <item command="CmdDataTree-Help"/> -->
</menu>
<menu id="mnuDataTree-POS-InflectionClass">
<item command="CmdDataTree-Delete-POS-InflectionClass"/>
<item command="CmdDataTree-Delete-POS-InflectionClass"/>
<!-- <item command="CmdDataTree-Help"/> -->
</menu>
<menu id="mnuDataTree-POS-StemNames">
Expand Down
44 changes: 24 additions & 20 deletions DistFiles/Language Explorer/Configuration/Parts/Morphology.fwlayout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,27 +453,31 @@
</part>
</layout>

<layout class="MoInflClass" type="detail" name="SubClassesAllA">
<part ref="NameAllA" label="Subclass Name" menu="mnuDataTree-POS-InflectionClass"/>
<part ref="AbbreviationAllA"/>
<part ref="DescriptionAllA"/>
<part ref="SubClassesSection" label="Subclasses" menu="mnuDataTree-POS-InflectionClass-Subclasses">
<indent indent="true">
<part ref="SubClasses" label="Subclasses"/>
</indent>
</part>
</layout>
<layout class="MoInflClass" type="detail" name="SubClassesAllA">
<part ref="NameAllA" label="Subclass Name" menu="mnuDataTree-POS-InflectionClass"/>
<part ref="AbbreviationAllA"/>
<part ref="DescriptionAllA"/>
<indent indent="true">
<part ref="SubClassesSection" label="Subclasses" menu="mnuDataTree-POS-InflectionClass-Subclasses">
<indent>
<part ref="SubClasses" label="Subclasses"/>
</indent>
</part>
</indent>
</layout>

<layout class="MoInflClass" type="detail" name="EditInflectionClass">
<part ref="NameAllA" label="Inflection Class Name" menu="mnuDataTree-POS-InflectionClass"/>
<part ref="AbbreviationAllA"/>
<part ref="DescriptionAllA"/>
<part ref="SubClassesSection" label="Subclasses" menu="mnuDataTree-POS-InflectionClass-Subclasses">
<indent indent="true">
<part ref="SubClasses" label="Subclasses"/>
</indent>
</part>
</layout>
<layout class="MoInflClass" type="detail" name="EditInflectionClass">
<part ref="NameAllA" label="Inflection Class Name" menu="mnuDataTree-POS-InflectionClass"/>
<part ref="AbbreviationAllA"/>
<part ref="DescriptionAllA"/>
<indent indent="true">
<part ref="SubClassesSection" label="Subclasses" menu="mnuDataTree-POS-InflectionClass-Subclasses">
<indent>
<part ref="SubClasses" label="Subclasses"/>
</indent>
</part>
</indent>
</layout>
<layout class="MoInflClass" type="detail" name="SubClasses">
<part ref="SubclassesAllA" label="Subclass" >
</part>
Expand Down
7 changes: 7 additions & 0 deletions Src/Common/Controls/DetailControls/DataTree.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2044,6 +2044,13 @@ private NodeTestResult ProcessPartRefNode(XmlNode partRef, ArrayList path, ObjSe
path.RemoveAt(path.Count - 1);
break;

case "indent":
foreach (XmlNode node in partRef.ChildNodes)
{
ProcessPartRefNode(node, path, reuseMap, obj, parentSlice, indent + Slice.ExtraIndent(partRef), ref insPos, isTestOnly);
}
break;

case "part":
// If the previously selected slice doesn't display in this refresh, we try for the next
// visible slice instead. So m_fSetCurrentSliceNew might still be set. See LT-9010.
Expand Down
Loading