Skip to content

Commit 8aadaff

Browse files
authored
Fix LT-3356: Inflectional Class Info area confusing (#432)
* Fix LT-3356: Inflectional Class Info area confusing * Don't hide Subclasses * Remove menu item that is no longer necessary * Removed System.Buffers.dll * Add System.Buffers.dll to .gitignore
1 parent 143f9d0 commit 8aadaff

4 files changed

Lines changed: 34 additions & 22 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ Bin/_setLatestBuildConfig.bat
3030
Bin/_setroot.bat
3131
Lib/debug/DebugProcs.lib
3232
Lib/debug/Generic.lib
33+
Lib/debug/System.Buffers.dll
3334
Lib/debug/System.ValueTuple.dll
3435
Lib/debug/unit++.*
3536
Lib/release/DebugProcs.lib

DistFiles/Language Explorer/Configuration/Grammar/DataTreeInclude.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
<command id="CmdDataTree-MoveDown-POS-AffixTemplate" label="Move Affix Template Down" message="MoveDownObjectInSequence" icon="MoveDown">
104104
<parameters field="AffixTemplates" className="MoInflAffixTemplate"/>
105105
</command>
106-
<command id="CmdDataTree-Insert-POS-InflectionClass-Subclasses" label="Insert Inflection Class" message="DataTreeInsert">
106+
<command id="CmdDataTree-Insert-POS-InflectionClass-Subclasses" label="Insert Inflection Subclass" message="DataTreeInsert">
107107
<parameters field="Subclasses" className="MoInflClass"/>
108108
</command>
109109
<command id="CmdDataTree-Insert-POS-InflectionClass" label="Insert Inflection Class" message="DataTreeInsert">
@@ -248,7 +248,7 @@
248248
<!-- <item command="CmdDataTree-Help"/> -->
249249
</menu>
250250
<menu id="mnuDataTree-POS-InflectionClass">
251-
<item command="CmdDataTree-Delete-POS-InflectionClass"/>
251+
<item command="CmdDataTree-Delete-POS-InflectionClass"/>
252252
<!-- <item command="CmdDataTree-Help"/> -->
253253
</menu>
254254
<menu id="mnuDataTree-POS-StemNames">

DistFiles/Language Explorer/Configuration/Parts/Morphology.fwlayout

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -453,27 +453,31 @@
453453
</part>
454454
</layout>
455455

456-
<layout class="MoInflClass" type="detail" name="SubClassesAllA">
457-
<part ref="NameAllA" label="Subclass Name" menu="mnuDataTree-POS-InflectionClass"/>
458-
<part ref="AbbreviationAllA"/>
459-
<part ref="DescriptionAllA"/>
460-
<part ref="SubClassesSection" label="Subclasses" menu="mnuDataTree-POS-InflectionClass-Subclasses">
461-
<indent indent="true">
462-
<part ref="SubClasses" label="Subclasses"/>
463-
</indent>
464-
</part>
465-
</layout>
456+
<layout class="MoInflClass" type="detail" name="SubClassesAllA">
457+
<part ref="NameAllA" label="Subclass Name" menu="mnuDataTree-POS-InflectionClass"/>
458+
<part ref="AbbreviationAllA"/>
459+
<part ref="DescriptionAllA"/>
460+
<indent indent="true">
461+
<part ref="SubClassesSection" label="Subclasses" menu="mnuDataTree-POS-InflectionClass-Subclasses">
462+
<indent>
463+
<part ref="SubClasses" label="Subclasses"/>
464+
</indent>
465+
</part>
466+
</indent>
467+
</layout>
466468

467-
<layout class="MoInflClass" type="detail" name="EditInflectionClass">
468-
<part ref="NameAllA" label="Inflection Class Name" menu="mnuDataTree-POS-InflectionClass"/>
469-
<part ref="AbbreviationAllA"/>
470-
<part ref="DescriptionAllA"/>
471-
<part ref="SubClassesSection" label="Subclasses" menu="mnuDataTree-POS-InflectionClass-Subclasses">
472-
<indent indent="true">
473-
<part ref="SubClasses" label="Subclasses"/>
474-
</indent>
475-
</part>
476-
</layout>
469+
<layout class="MoInflClass" type="detail" name="EditInflectionClass">
470+
<part ref="NameAllA" label="Inflection Class Name" menu="mnuDataTree-POS-InflectionClass"/>
471+
<part ref="AbbreviationAllA"/>
472+
<part ref="DescriptionAllA"/>
473+
<indent indent="true">
474+
<part ref="SubClassesSection" label="Subclasses" menu="mnuDataTree-POS-InflectionClass-Subclasses">
475+
<indent>
476+
<part ref="SubClasses" label="Subclasses"/>
477+
</indent>
478+
</part>
479+
</indent>
480+
</layout>
477481
<layout class="MoInflClass" type="detail" name="SubClasses">
478482
<part ref="SubclassesAllA" label="Subclass" >
479483
</part>

Src/Common/Controls/DetailControls/DataTree.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2044,6 +2044,13 @@ private NodeTestResult ProcessPartRefNode(XmlNode partRef, ArrayList path, ObjSe
20442044
path.RemoveAt(path.Count - 1);
20452045
break;
20462046

2047+
case "indent":
2048+
foreach (XmlNode node in partRef.ChildNodes)
2049+
{
2050+
ProcessPartRefNode(node, path, reuseMap, obj, parentSlice, indent + Slice.ExtraIndent(partRef), ref insPos, isTestOnly);
2051+
}
2052+
break;
2053+
20472054
case "part":
20482055
// If the previously selected slice doesn't display in this refresh, we try for the next
20492056
// visible slice instead. So m_fSetCurrentSliceNew might still be set. See LT-9010.

0 commit comments

Comments
 (0)