Merge branch 'release/9.3' into bugfix/flextextImport

Author: jasonleenaylor

DistFiles/Language Explorer/Configuration/Parts/MorphologyParts.xml

@@ -2669,7 +2669,13 @@
 		<part id="PhNaturalClass-Detail-DescriptionAllA" type="Detail">
 			<slice field="Description" label="Description" editor="multistring" ws="all analysis"/>
 		</part>
-	</bin>
+        <!-- The following is a hack to keep the Phoneme/Features column from disappearing (LT-22171).
+             The Segments field is technically part of PhNCSegments, but the display code is expecting PhNaturalClass.
+        -->
+        <part id="PhNaturalClass-Jt-Segments" type="JtView">
+          <seq field="Segments" layout="shortname" />
+        </part>
+    </bin>
 	<bin class="PhNCSegments">
 		<part id="PhNCSegments-Detail-Segments" type="Detail">
 			<slice field="Segments" label="Phonemes" editor="defaultVectorReference">

Src/LexText/Interlinear/ChooseAnalysisHandler.cs

@@ -3,16 +3,17 @@
 // (http://www.gnu.org/licenses/lgpl-2.1.html)
 
 using System;
-using System.Windows.Forms;
 using System.Drawing;
-using SIL.LCModel;
+using System.Linq;
+using System.Windows.Forms;
 using SIL.FieldWorks.Common.ViewsInterfaces;
-using SIL.LCModel.DomainServices;
-using SIL.FieldWorks.FdoUi;
-using SIL.LCModel.Utils;
 using SIL.FieldWorks.Common.Widgets;
-using SIL.LCModel.Core.Text;
+using SIL.FieldWorks.FdoUi;
+using SIL.LCModel;
 using SIL.LCModel.Core.KernelInterfaces;
+using SIL.LCModel.Core.Text;
+using SIL.LCModel.DomainServices;
+using SIL.LCModel.Utils;
 
 
 namespace SIL.FieldWorks.IText
@@ -311,9 +312,7 @@ void AddAnalysisItems(IWfiAnalysis wa)
 		{
 			AddItem(wa,
 				MakeAnalysisStringRep(wa, m_cache, StyleSheet != null, (m_owner as SandboxBase).RawWordformWs), true);
-			var guess_services = new AnalysisGuessServices(m_cache, IsParsingDevMode());
-			var sorted_glosses = guess_services.GetSortedGlossGuesses(wa, m_occurrence);
-			foreach (var gloss in sorted_glosses)
+			foreach (var gloss in wa.MeaningsOC.ToList())
 			{
 				AddItem(gloss, MakeGlossStringRep(gloss, m_cache, StyleSheet != null), true);
 			}

Src/xWorks/RecordClerk.cs

@@ -2864,15 +2864,15 @@ public void UpdateParsingDevStatusBarPanel()
 			var b = m_propertyTable.GetValue<StatusBarTextBox>("ParsingDev");
 			if (b == null) //Other xworks apps may not have this panel
 				return;
-			if (!m_propertyTable.GetBoolProperty("ParsingDevMode", false, PropertyTable.SettingsGroup.LocalSettings))
+			if (Id == "interlinearTexts"  && m_propertyTable.GetBoolProperty("ParsingDevMode", false, PropertyTable.SettingsGroup.LocalSettings))
 			{
-				b.BackBrush = System.Drawing.Brushes.Transparent;
-				b.TextForReal = "";
+				b.BackBrush = System.Drawing.Brushes.Tan;
+				b.TextForReal = xWorksStrings.ParsingDev;
 			}
 			else
 			{
-				b.BackBrush = System.Drawing.Brushes.Tan;
-				b.TextForReal = xWorksStrings.ParsingDev;
+				b.BackBrush = System.Drawing.Brushes.Transparent;
+				b.TextForReal = "";
 			}
 		}