From a25006f3023e08b50f1cf24cc39b4c2736cd6817 Mon Sep 17 00:00:00 2001
From: Lars Brubaker <larsbrubaker@gmail.com>
Date: Fri, 13 Nov 2020 16:36:03 -0800
Subject: [PATCH] Made settings show where they are

don't show bed leveling on temp message if leveling validation enabled
---
 .../Settings/SettingsValidationError.cs       | 20 +++++++++++++------
 .../ApplicationView/SettingsValidation.cs     |  7 +++----
 .../PrinterBar/ValidationErrorsPanel.cs       |  2 +-
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/MatterControl.Printing/Settings/SettingsValidationError.cs b/MatterControl.Printing/Settings/SettingsValidationError.cs
index 63998b97a..531a91e2e 100644
--- a/MatterControl.Printing/Settings/SettingsValidationError.cs
+++ b/MatterControl.Printing/Settings/SettingsValidationError.cs
@@ -27,6 +27,7 @@ of the authors and should not be interpreted as representing official policies,
 either expressed or implied, of the FreeBSD Project.
 */
 
+using MatterHackers.Agg;
 using MatterHackers.Localizations;
 using MatterHackers.MatterControl.SlicerConfiguration;
 
@@ -34,11 +35,18 @@ namespace MatterHackers.MatterControl
 {
 	public class SettingsValidationError : ValidationError
 	{
-		public SettingsValidationError(string settingsName)
+		public SettingsValidationError(string settingsName, string presentationNameOverride = null)
 			: base(settingsName)
 		{
 			this.CanonicalSettingsName = settingsName;
-			this.PresentationName = PrinterSettings.SettingsData[settingsName].PresentationName;
+			if (string.IsNullOrEmpty(presentationNameOverride))
+			{
+				this.PresentationName = PrinterSettings.SettingsData[settingsName].PresentationName;
+			}
+			else
+			{
+				PresentationName = presentationNameOverride;
+			}
 		}
 
 		public string CanonicalSettingsName { get; }
@@ -59,11 +67,11 @@ namespace MatterHackers.MatterControl
 				setingsSectionName = "Slice Settings";
 			}
 
-			return "Location".Localize() + ":"
+			return "Location of the '{0}' setting".Localize().FormatWith(settingData.PresentationName) + ":"
 				 + "\n" + setingsSectionName.Localize()
-				 + "\n  • " + settingData.OrganizerGroup.Category.Name.Localize()
-				 + "\n    • " + settingData.OrganizerGroup.Name.Localize()
-				 + "\n      • " + settingData.PresentationName.Localize();
+				 + "\n  • " + settingData.OrganizerGroup.Category.Name
+				 + "\n    • " + settingData.OrganizerGroup.Name
+				 + "\n      • " + settingData.PresentationName;
 		}
 	}
 }
\ No newline at end of file
diff --git a/MatterControlLib/ApplicationView/SettingsValidation.cs b/MatterControlLib/ApplicationView/SettingsValidation.cs
index e3954aa93..cbb26db96 100644
--- a/MatterControlLib/ApplicationView/SettingsValidation.cs
+++ b/MatterControlLib/ApplicationView/SettingsValidation.cs
@@ -30,13 +30,11 @@ either expressed or implied, of the FreeBSD Project.
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using MatterHackers.Agg;
 using MatterHackers.Agg.UI;
 using MatterHackers.Localizations;
 using MatterHackers.MatterControl.ConfigurationPage.PrintLeveling;
 using MatterHackers.MatterControl.DesignTools;
-using MatterHackers.MatterControl.SettingsManagement;
 using MatterHackers.MatterControl.SlicerConfiguration;
 
 namespace MatterHackers.MatterControl
@@ -238,7 +236,8 @@ namespace MatterHackers.MatterControl
 						&& !PrinterSetupRequired(printer)
 						&& printer.Settings.Helpers.PrintLevelingData is PrintLevelingData levelingData
 						&& !levelingData.IssuedLevelingTempWarning
-						&& Math.Abs(bedTemperature - levelingData.BedTemperature) > 10)
+						&& Math.Abs(bedTemperature - levelingData.BedTemperature) > 10
+						&& !printer.Settings.Helpers.HasProbeWithLevelingValidation)
 					{
 						errors.Add(
 							new ValidationError(ValidationErrors.BedLevelingTemperature)
@@ -390,7 +389,7 @@ namespace MatterHackers.MatterControl
 				if (printer.Settings?.Helpers.ComPort() == "Emulator")
 				{
 					errors.Add(
-						new SettingsValidationError(SettingsKey.com_port)
+						new SettingsValidationError(SettingsKey.com_port, "Connected to Emulator".Localize())
 						{
 							Error = "You are connected to the Emulator not an actual printer.".Localize(),
 							ErrorLevel = ValidationErrorLevel.Warning,
diff --git a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/ValidationErrorsPanel.cs b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/ValidationErrorsPanel.cs
index 9470fa126..e025d3fc7 100644
--- a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/ValidationErrorsPanel.cs
+++ b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/ValidationErrorsPanel.cs
@@ -67,7 +67,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 						settingsValidationError.PresentationName,
 						validationError.ErrorLevel == ValidationErrorLevel.Error ? "Error".Localize() : "Warning".Localize());
 
-					errorDetails = validationError.Error;
+					errorDetails = validationError.Error + "\n\n" + settingsValidationError.Location;
 				}
 				else
 				{