Skip to content

Fix LT-22146: Darken guess colors #365

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

Closed
jtmaxwell3 wants to merge 14 commits into from
Closed

Fix LT-22146: Darken guess colors #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3b4bdec
Bump version to 9.3 Alpha
jasonleenaylor Feb 12, 2025
f68f7ee
LT-21757: Allow moving templates and slots up or down in Category hie…
jtmaxwell3 Feb 26, 2025
15e8b49
LT-22038: Tone diacritics are hardly visible (#273)
jtmaxwell3 Mar 1, 2025
7fe8b30
LT-21988: Improve Hermit Crab performance (#275)
jtmaxwell3 Mar 4, 2025
7a1d141
LT-22063: Crash while navigating to Word Analyses view (#276)
jtmaxwell3 Mar 4, 2025
644fefd
Fix LT-22058: In XLingPaper interlinear export, texts get same IDs (#…
jtmaxwell3 Mar 5, 2025
c117685
LT-22064: Issue with uppercase words in "Word Analyses" view (#279)
jtmaxwell3 Mar 6, 2025
aebae99
Makes changes for LT-21947 requested by Andy Black (#266)
jtmaxwell3 Mar 9, 2025
7affcfe
Fix LT-21826: Usage figures for Publications show inverted values (#282)
jtmaxwell3 Mar 11, 2025
676f62f
LT-22039: xhtml has new nodeId attribute (#283)
jtmaxwell3 Mar 12, 2025
0e323c9
Fix LT-22057: Duplicate Analysis ws created for English (#285)
jtmaxwell3 Mar 13, 2025
09f401d
LT-21766: Fix Reversal Sort Order in Webonary (#363)
mark-sil Jun 5, 2025
d5dc9a3
Merge branch 'release/9.2' into release/9.3
jasonleenaylor Jun 5, 2025
36846e4
Fix LT-22146: Darken guess colors in interlinear text display
jtmaxwell3 Jun 10, 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
2 changes: 1 addition & 1 deletion Build/mkall.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@
<ParatextNugetVersion>9.4.0.1-beta</ParatextNugetVersion>
<LcmNugetVersion>11.0.0-beta0121</LcmNugetVersion>
<IcuNugetVersion>70.1.123</IcuNugetVersion>
<HermitCrabNugetVersion>3.4.2</HermitCrabNugetVersion>
<HermitCrabNugetVersion>3.6.1</HermitCrabNugetVersion>
<IPCFrameworkVersion>1.1.1-beta0001</IPCFrameworkVersion>
<!-- bt393 is the master branch build of ExCss for Windows development. Update when appropriate. -->
<ExCssBuildType Condition="'$(OS)'=='Windows_NT'">bt393</ExCssBuildType>
Expand Down
4 changes: 2 additions & 2 deletions Build/nuget-common/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
<package id="SIL.libpalaso.l10ns" version="6.0.0" targetFramework="net461" />
<package id="SIL.Lift" version="15.0.0-beta0117" targetFramework="net462" />
<package id="SIL.Media" version="15.0.0-beta0117" targetFramework="net462" />
<package id="SIL.Machine" version="3.4.2" targetFramework="netstandard2.0" />
<package id="SIL.Machine.Morphology.HermitCrab" version="3.4.2" targetFramework="netstandard2.0" />
<package id="SIL.Machine" version="3.6.1" targetFramework="netstandard2.0" />
<package id="SIL.Machine.Morphology.HermitCrab" version="3.6.1" targetFramework="netstandard2.0" />
<package id="SIL.ParatextShared" version="7.4.0.1" targetFramework="net40" /> <!-- REVIEW (Hasso) 2023.05: do we still integrate with PT 7? -->
<package id="SIL.Scripture" version="15.0.0-beta0117" targetFramework="net461" />
<package id="SIL.TestUtilities" version="15.0.0-beta0117" targetFramework="net461" />
Expand Down
22 changes: 15 additions & 7 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 @@ -76,16 +76,22 @@
<command id="CmdDataTree-Insert-POS-AffixSlot" label="Insert Affix Slot" message="DataTreeInsert">
<parameters field="AffixSlots" className="MoInflAffixSlot"/>
</command>
<command id="CmdDataTree-Delete-POS-AffixSlot" label="Delete Affix Slot" message="DataTreeDelete" icon="Delete">
<command id="CmdDataTree-Move-POS-AffixSlot" label="Move Affix Slot" message="DataTreeMove">
<parameters field="AffixSlots" className="MoInflAffixSlot"/>
</command>
<command id="CmdDataTree-Delete-POS-AffixSlot" label="Delete Affix Slot" message="DataTreeDelete" icon="Delete">
<parameters field="AffixSlots" className="MoInflAffixSlot"/>
</command>
<command id="CmdDataTree-Insert-POS-AffixTemplate" label="Insert Affix Template" message="DataTreeInsert">
<parameters field="AffixTemplates" className="MoInflAffixTemplate"/>
</command>
<command id="CmdDataTree-Copy-POS-AffixTemplate" label="Duplicate Affix Template" message="DataTreeCopy">
<parameters field="AffixTemplates" className="MoInflAffixTemplate"/>
</command>
<command id="CmdDataTree-Delete-POS-AffixTemplate" label="Delete Affix Template" message="DataTreeDelete" icon="Delete">
<command id="CmdDataTree-Copy-POS-AffixTemplate" label="Duplicate Affix Template" message="DataTreeCopy">
<parameters field="AffixTemplates" className="MoInflAffixTemplate"/>
</command>
<command id="CmdDataTree-Move-POS-AffixTemplate" label="Move Affix Template" message="DataTreeMove">
<parameters field="AffixTemplates" className="MoInflAffixTemplate"/>
</command>
<command id="CmdDataTree-Delete-POS-AffixTemplate" label="Delete Affix Template" message="DataTreeDelete" icon="Delete">
<parameters field="AffixTemplates" className="MoInflAffixTemplate"/>
</command>
<command id="CmdDataTree-MoveUp-POS-AffixTemplate" label="Move Affix Template Up" message="MoveUpObjectInSequence" icon="MoveUp">
Expand Down Expand Up @@ -213,8 +219,9 @@
<!-- <item command="CmdDataTree-Help"/> -->
</menu>
<menu id="mnuDataTree-POS-AffixSlot">
<item command="CmdDataTree-Delete-POS-AffixSlot"/>
<!-- <item command="CmdDataTree-Help"/> -->
<item command="CmdDataTree-Move-POS-AffixSlot"/>
<item command="CmdDataTree-Delete-POS-AffixSlot"/>
<!-- <item command="CmdDataTree-Help"/> -->
</menu>
<menu id="mnuDataTree-POS-AffixTemplates">
<item command="CmdDataTree-Insert-POS-AffixTemplate"/>
Expand All @@ -223,6 +230,7 @@
<menu id="mnuDataTree-POS-AffixTemplate">
<item command="CmdDataTree-Delete-POS-AffixTemplate"/>
<item command="CmdDataTree-Copy-POS-AffixTemplate"/>
<item command="CmdDataTree-Move-POS-AffixTemplate"/>
<item command="CmdDataTree-MoveUp-POS-AffixTemplate"/>
<item command="CmdDataTree-MoveDown-POS-AffixTemplate"/>
<!-- <item command="CmdDataTree-Help"/> -->
Expand Down
234 changes: 166 additions & 68 deletions DistFiles/Language Explorer/Configuration/Parts/MorphologyParts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -941,7 +941,19 @@
<if class="MoInflAffixSlot" field="Optional" boolequals="true">
<lit translate="do not translate">(</lit>
</if>
<string class="MoInflAffixSlot" field="Name" ws="analysis"/>
<if func="TemplateSlotOutOfScope" class="MoInflAffixSlot" boolequals="true">
<span>
<properties>
<forecolor value="orange"/>
</properties>
<string target="owner" class="PartOfSpeech" field="Abbreviation" ws="analysis"/>
<lit>:</lit>
<string class="MoInflAffixSlot" field="Name" ws="analysis"/>
</span>
</if>
<ifnot func="TemplateSlotOutOfScope" class="MoInflAffixSlot" boolequals="true">
<string class="MoInflAffixSlot" field="Name" ws="analysis"/>
</ifnot>
<if class="MoInflAffixSlot" field="Optional" boolequals="true">
<lit translate="do not translate">)</lit>
</if>
Expand Down Expand Up @@ -987,8 +999,20 @@
<if class="MoInflAffixSlot" field="Optional" boolequals="true">
<lit translate="do not translate">(</lit>
</if>
<string class="MoInflAffixSlot" field="Name" ws="analysis"/>
<if class="MoInflAffixSlot" field="Optional" boolequals="true">
<if func="TemplateSlotOutOfScope" class="MoInflAffixSlot" boolequals="true">
<span>
<properties>
<forecolor value="orange"/>
</properties>
<string target="owner" class="PartOfSpeech" field="Abbreviation" ws="analysis"/>
<lit>:</lit>
<string class="MoInflAffixSlot" field="Name" ws="analysis"/>
</span>
</if>
<ifnot func="TemplateSlotOutOfScope" class="MoInflAffixSlot" boolequals="true">
<string class="MoInflAffixSlot" field="Name" ws="analysis"/>
</ifnot>
<if class="MoInflAffixSlot" field="Optional" boolequals="true">
<lit translate="do not translate">)</lit>
</if>
<lit>&#xA0;&#xA0;</lit>
Expand Down Expand Up @@ -1033,8 +1057,20 @@
<if class="MoInflAffixSlot" field="Optional" boolequals="true">
<lit translate="do not translate">&#x200E;)&#xA0;&#xA0;</lit>
</if>
<string class="MoInflAffixSlot" field="Name" ws="analysis"/>
<if class="MoInflAffixSlot" field="Optional" boolequals="false">
<if func="TemplateSlotOutOfScope" class="MoInflAffixSlot" boolequals="true">
<span>
<properties>
<forecolor value="orange"/>
</properties>
<string class="MoInflAffixSlot" field="Name" ws="analysis"/>
<lit>:</lit>
<string target="owner" class="PartOfSpeech" field="Abbreviation" ws="analysis"/>
</span>
</if>
<ifnot func="TemplateSlotOutOfScope" class="MoInflAffixSlot" boolequals="true">
<string class="MoInflAffixSlot" field="Name" ws="analysis"/>
</ifnot>
<if class="MoInflAffixSlot" field="Optional" boolequals="false">
<lit translate="do not translate">&#x200F;&#xA0;&#xA0;-</lit>
</if>
<if class="MoInflAffixSlot" field="Optional" boolequals="true">
Expand Down Expand Up @@ -1084,8 +1120,20 @@
<if class="MoInflAffixSlot" field="Optional" boolequals="true">
<lit translate="do not translate">&#x200E;)-&#xA0;&#xA0;</lit>
</if>
<string class="MoInflAffixSlot" field="Name" ws="analysis"/>
<if class="MoInflAffixSlot" field="Optional" boolequals="false">
<if func="TemplateSlotOutOfScope" class="MoInflAffixSlot" boolequals="true">
<span>
<properties>
<forecolor value="orange"/>
</properties>
<string class="MoInflAffixSlot" field="Name" ws="analysis"/>
<lit>:</lit>
<string target="owner" class="PartOfSpeech" field="Abbreviation" ws="analysis"/>
</span>
</if>
<ifnot func="TemplateSlotOutOfScope" class="MoInflAffixSlot" boolequals="true">
<string class="MoInflAffixSlot" field="Name" ws="analysis"/>
</ifnot>
<if class="MoInflAffixSlot" field="Optional" boolequals="false">
<lit translate="do not translate">&#x200F;&#xA0;&#xA0;</lit>
</if>
<if class="MoInflAffixSlot" field="Optional" boolequals="true">
Expand Down Expand Up @@ -1135,8 +1183,20 @@
<if class="MoInflAffixSlot" field="Optional" boolequals="true">
<lit translate="do not translate">(</lit>
</if>
<string class="MoInflAffixSlot" field="Name" ws="analysis"/>
<if class="MoInflAffixSlot" field="Optional" boolequals="false">
<if func="TemplateSlotOutOfScope" class="MoInflAffixSlot" boolequals="true">
<span>
<properties>
<forecolor value="orange"/>
</properties>
<string target="owner" class="PartOfSpeech" field="Abbreviation" ws="analysis"/>
<lit>:</lit>
<string class="MoInflAffixSlot" field="Name" ws="analysis"/>
</span>
</if>
<ifnot func="TemplateSlotOutOfScope" class="MoInflAffixSlot" boolequals="true">
<string class="MoInflAffixSlot" field="Name" ws="analysis"/>
</ifnot>
<if class="MoInflAffixSlot" field="Optional" boolequals="false">
<lit translate="do not translate">-&#xA0;&#xA0;</lit>
</if>
<if class="MoInflAffixSlot" field="Optional" boolequals="true">
Expand Down Expand Up @@ -1186,8 +1246,20 @@
<if class="MoInflAffixSlot" field="Optional" boolequals="true">
<lit translate="do not translate">&#xA0;&#xA0;-(</lit>
</if>
<string class="MoInflAffixSlot" field="Name" ws="analysis"/>
<if class="MoInflAffixSlot" field="Optional" boolequals="false">
<if func="TemplateSlotOutOfScope" class="MoInflAffixSlot" boolequals="true">
<span>
<properties>
<forecolor value="orange"/>
</properties>
<string target="owner" class="PartOfSpeech" field="Abbreviation" ws="analysis"/>
<lit>:</lit>
<string class="MoInflAffixSlot" field="Name" ws="analysis"/>
</span>
</if>
<ifnot func="TemplateSlotOutOfScope" class="MoInflAffixSlot" boolequals="true">
<string class="MoInflAffixSlot" field="Name" ws="analysis"/>
</ifnot>
<if class="MoInflAffixSlot" field="Optional" boolequals="false">
<lit translate="do not translate">&#xA0;&#xA0;</lit>
</if>
<if class="MoInflAffixSlot" field="Optional" boolequals="true">
Expand Down Expand Up @@ -1237,8 +1309,20 @@
<if class="MoInflAffixSlot" field="Optional" boolequals="true">
<lit translate="do not translate">&#xA0;&#xA0;-(</lit>
</if>
<string class="MoInflAffixSlot" field="Name" ws="analysis"/>
<if class="MoInflAffixSlot" field="Optional" boolequals="false">
<if func="TemplateSlotOutOfScope" class="MoInflAffixSlot" boolequals="true">
<span>
<properties>
<forecolor value="orange"/>
</properties>
<string target="owner" class="PartOfSpeech" field="Abbreviation" ws="analysis"/>
<lit>:</lit>
<string class="MoInflAffixSlot" field="Name" ws="analysis"/>
</span>
</if>
<ifnot func="TemplateSlotOutOfScope" class="MoInflAffixSlot" boolequals="true">
<string class="MoInflAffixSlot" field="Name" ws="analysis"/>
</ifnot>
<if class="MoInflAffixSlot" field="Optional" boolequals="false">
<lit translate="do not translate">&#xA0;&#xA0;</lit>
</if>
<if class="MoInflAffixSlot" field="Optional" boolequals="true">
Expand Down Expand Up @@ -1288,8 +1372,20 @@
<if class="MoInflAffixSlot" field="Optional" boolequals="true">
<lit translate="do not translate">&#xA0;&#xA0;(</lit>
</if>
<string class="MoInflAffixSlot" field="Name" ws="analysis"/>
<if class="MoInflAffixSlot" field="Optional" boolequals="false">
<if func="TemplateSlotOutOfScope" class="MoInflAffixSlot" boolequals="true">
<span>
<properties>
<forecolor value="orange"/>
</properties>
<string target="owner" class="PartOfSpeech" field="Abbreviation" ws="analysis"/>
<lit>:</lit>
<string class="MoInflAffixSlot" field="Name" ws="analysis"/>
</span>
</if>
<ifnot func="TemplateSlotOutOfScope" class="MoInflAffixSlot" boolequals="true">
<string class="MoInflAffixSlot" field="Name" ws="analysis"/>
</ifnot>
<if class="MoInflAffixSlot" field="Optional" boolequals="false">
<lit translate="do not translate">-&#xA0;&#xA0;</lit>
</if>
<if class="MoInflAffixSlot" field="Optional" boolequals="true">
Expand Down Expand Up @@ -1380,7 +1476,7 @@
</part>
<part id="MoInflAffixTemplate-Detail-TemplateTable" type="Detail">
<slice id="TemplateTable" label="Table" editor="Custom" assemblyPath="MorphologyEditorDll.dll" class="SIL.FieldWorks.XWorks.MorphologyEditor.InflAffixTemplateSlice" layout="TemplateTablex" menu="mnuDataTree-Help" helpTopicID="khtpField-MoInflAffixTemplate-Table">
<deParams menu="mnuInflAffixTemplate-TemplateTable"/>
<deParams menu="mnuInflAffixTemplate-TemplateTable"/>
</slice>
</part>
<part id="MoInflAffixTemplate-Detail-Message" type="detail" paramType="JtLayoutsOfThisClass">
Expand Down Expand Up @@ -1408,68 +1504,70 @@
<slice field="Disabled" label="Active" editor="checkboxwithrefresh" editable="true" toggleValue="true" menu="mnuDataTree-Help"/>
</part>
<part id="MoInflAffixTemplate-Jt-TemplateTabley" type="jtview">
<savehvo>
<table columns="%ColumnCount">
<properties>
<borderbottom value="3"/>
</properties>
<if field="Disabled" boolequals="true">
<row>
<seq class="MoInflAffixTemplate" field="PrefixSlots" layout="PrefixSlotNameDisabled"/>
<cell>
<properties>
<bold value="on"/>
<bordertrailing value="3"/>
<forecolor value="GrayText"/>
</properties>
<para>
<lit>&#xA0;&#xA0;</lit>
<commandIcon visibility="focused"/>
<lit>STEM</lit>
<lit>&#xA0;&#xA0;</lit>
</para>
</cell>
<seq class="MoInflAffixTemplate" field="SuffixSlots" layout="SuffixSlotNameDisabled"/>
</row>
<row>
<seq class="MoInflAffixTemplate" field="PrefixSlots" layout="SlotContentsDisabled"/>
<cell>
<properties>
<bordertrailing value="3"/>
</properties>
<lit/>
</cell>
<seq class="MoInflAffixTemplate" field="SuffixSlots" layout="SlotContentsDisabled"/>
</row>
</if>
<if field="Disabled" boolequals="false">
<row>
<seq class="MoInflAffixTemplate" field="PrefixSlots" layout="PrefixSlotName"/>
<if field="Disabled" boolequals="true">
<row>
<seq class="MoInflAffixTemplate" field="PrefixSlots" layout="PrefixSlotNameDisabled"/>
<cell>
<properties>
<bold value="on"/>
<bordertrailing value="3"/>
<forecolor value="GrayText"/>
</properties>
<para>
<lit>&#xA0;&#xA0;</lit>
<commandIcon visibility="focused"/>
<lit>STEM</lit>
<lit>&#xA0;&#xA0;</lit>
</para>
</cell>
<seq class="MoInflAffixTemplate" field="SuffixSlots" layout="SuffixSlotName"/>
</row>
<row>
<seq class="MoInflAffixTemplate" field="PrefixSlots" layout="SlotContents"/>
<cell>
<properties>
<bordertrailing value="3"/>
</properties>
<lit/>
</cell>
<seq class="MoInflAffixTemplate" field="SuffixSlots" layout="SlotContents"/>
</row>
</if>
<para>
<lit>&#xA0;&#xA0;</lit>
<commandIcon visibility="focused"/>
<lit>STEM</lit>
<lit>&#xA0;&#xA0;</lit>
</para>
</cell>
<seq class="MoInflAffixTemplate" field="SuffixSlots" layout="SuffixSlotNameDisabled"/>
</row>
<row>
<seq class="MoInflAffixTemplate" field="PrefixSlots" layout="SlotContentsDisabled"/>
<cell>
<properties>
<bordertrailing value="3"/>
</properties>
<lit/>
</cell>
<seq class="MoInflAffixTemplate" field="SuffixSlots" layout="SlotContentsDisabled"/>
</row>
</if>
<if field="Disabled" boolequals="false">
<row>
<seq class="MoInflAffixTemplate" field="PrefixSlots" layout="PrefixSlotName"/>
<cell>
<properties>
<bold value="on"/>
<bordertrailing value="3"/>
</properties>
<para>
<lit>&#xA0;&#xA0;</lit>
<commandIcon visibility="focused"/>
<lit>STEM</lit>
<lit>&#xA0;&#xA0;</lit>
</para>
</cell>
<seq class="MoInflAffixTemplate" field="SuffixSlots" layout="SuffixSlotName"/>
</row>
<row>
<seq class="MoInflAffixTemplate" field="PrefixSlots" layout="SlotContents"/>
<cell>
<properties>
<bordertrailing value="3"/>
</properties>
<lit/>
</cell>
<seq class="MoInflAffixTemplate" field="SuffixSlots" layout="SlotContents"/>
</row>
</if>
</table>
</savehvo>
</part>
<!-- the display is inherently Left-To-Right: RTL vernacular scripts require reversed handling of the columns -->
<!-- see LT-4317 for the bug report -->
Expand Down
Loading
Loading