Merge pull request #3395 from jlewin/design_tools

Only show first ArrayRadial3D child in tree

ConfigurationPage/PrintLeveling/PrintLevelingWizard.cs

@@ -120,8 +120,8 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
 				if (targetBedTemp > 0 && targetHotendTemp > 0)
 				{
 					// heating both the bed and the hotend
-					heatingInstructions = $"Waiting for the bed to heat to {targetBedTemp}".Localize() + "\n"
-						+ $"and the hotend to heat to {targetHotendTemp}.".Localize() + "\n"
+					heatingInstructions = "Waiting for the bed to heat to ".Localize() + targetBedTemp +"\n"
+						+ "and the hotend to heat to ".Localize() + targetHotendTemp + ".\n"
 						+ "\n"
 						+ "This will improve the accuracy of print leveling".Localize()
 						+ "and ensure no filament is stuck to the tip of the extruder.".Localize() + "\n"
@@ -132,13 +132,13 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
 				else if (targetBedTemp > 0)
 				{
 					// only heating the bed
-					heatingInstructions = $"Waiting for the bed to heat to {targetBedTemp}.".Localize() + "\n"
+					heatingInstructions = "Waiting for the bed to heat to ".Localize() + targetBedTemp + ".\n"
 						+ "This will improve the accuracy of print leveling.".Localize();
 				}
 				else // targetHotendTemp > 0
 				{
 					// only heating the hotend
-					heatingInstructions += $"Waiting for the hotend to heat to {targetHotendTemp}.".Localize() + "\n"
+					heatingInstructions += "Waiting for the hotend to heat to ".Localize() + targetHotendTemp + ".\n"
 						+ "This will ensure no filament is stuck to the tip.".Localize() + "\n"
 						+ "\n"
 						+ "Warning! The tip of the nozzle will be HOT!".Localize() + "\n"
@@ -226,8 +226,8 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
 				this,
 				"Print Leveling Wizard".Localize(),
 				string.Format(
-					"{0} {1}\n\n{2}\n{3}\n\n{4}",
-					"Congratulations!".Localize(),
+					"{0}! {1}\n\n{2}\n{3}\n\n{4}",
+					"Congratulations".Localize(),
 					"Print Leveling is now configured and enabled.".Localize(),
 					useZProbe ? "" : $"\t• {"Remove the paper".Localize()}\n",
 					"If you need to recalibrate the printer in the future, the print leveling controls can be found under: Controls, Calibration".Localize(),

ConfigurationPage/PrintLeveling/ProbeCalibrationWizard.cs

@@ -114,7 +114,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
 			yield return new WaitForTempPage(
 				this,
 				"Waiting For Printer To Heat".Localize(),
-				$"Waiting for the hotend to heat to {targetHotendTemp}.".Localize() + "\n"
+				"Waiting for the hotend to heat to ".Localize() + targetHotendTemp + ".\n"
 					+ "This will ensure no filament is stuck to the tip.".Localize() + "\n"
 					+ "\n"
 					+ "Warning! The tip of the nozzle will be HOT!".Localize() + "\n"

ConfigurationPage/PrintLeveling/WizardPages/FindBedHeight.cs

@@ -95,7 +95,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
 		{
 			// always make sure we don't have print leveling turned on
 			PrintLevelingStream.AllowLeveling = false;
-			nextButton.ToolTipText = "[Right Arrow]".Localize();
+			nextButton.ToolTipText = string.Format("[{0}]", "Right Arrow".Localize());
 
 			base.PageIsBecomingActive();
 		}
@@ -127,11 +127,11 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
 
 			// set these to 0 so the button does not do any movements by default (we will handle the movement on our click callback)
 			zPlusControl.MoveAmount = 0;
-			zPlusControl.ToolTipText += " [Up Arrow]".Localize();
+			zPlusControl.ToolTipText += string.Format(" [{0}]", "Up Arrow".Localize());
 			zPlusControl.Click += zPlusControl_Click;
 
 			zMinusControl.MoveAmount = 0;
-			zMinusControl.ToolTipText += " [Down Arrow]".Localize();
+			zMinusControl.ToolTipText += string.Format(" [{0}]", "Down Arrow".Localize());
 			zMinusControl.Click += zMinusControl_Click;
 			return zButtons;
 		}

PartPreviewWindow/Object3DTreeBuilder.cs

@@ -139,6 +139,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 						Source = item
 					};
 
+				// TODO: array operations should only expose OperationSource
 				case ArrayAdvanced3D arrayAdvanced3D:
 					return new ObjectView()
 					{
@@ -147,6 +148,15 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 						Source = item
 					};
 
+				// TODO: array operations should only expose OperationSource
+				case ArrayRadial3D arrayRadial3D:
+					return new ObjectView()
+					{
+						Children = item.Children.Take(1),
+						Name = $"{arrayRadial3D.Name} ({arrayRadial3D.Count})",
+						Source = item
+					};
+
 				default:
 					return new ObjectView(item);
 			}

PartPreviewWindow/PlusTab/ExplorerBar.cs

@@ -261,6 +261,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.PlusTab
 
 								var printer = ApplicationController.Instance.ActivePrinter;
 								printer.ViewState.ViewMode = PartViewMode.Model;
+
+								// Always switch to printer tab after loading plate
+								partPreviewContent.TabControl.SelectedTabIndex = 1;
 							});
 						}
 					};

PartPreviewWindow/ViewControls3D.cs

@@ -608,7 +608,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 				new NamedAction() { Title = "----" },
 				new NamedAction()
 				{
-					Title = "Help...".Localize(),
+					Title = "Help".Localize() + "...",
 					Action = () =>
 					{
 						UiThread.RunOnIdle(() =>

SetupWizard/ImportSettingsPage.cs

@@ -200,7 +200,7 @@ namespace MatterHackers.MatterControl
 
 						string sectionName = destIsMaterial ? "Material".Localize() : "Quality".Localize();
 
-						string importSettingSuccessMessage = $"You have successfully imported a new {sectionName} setting. You can find '{layerName}' in your list of {sectionName} settings.".Localize();
+						string importSettingSuccessMessage = string.Format("You have successfully imported a new {0} setting. You can find '{1}' in your list of {0} settings.".Localize(), sectionName, layerName);
 
 						WizardWindow.ChangeToPage(
 							new ImportSucceeded(importSettingSuccessMessage)

Tools/RoslynLocalizeDetector/Program.cs

@@ -80,7 +80,8 @@ namespace RoslynLocalizeDetector
 				}
 			}
 
-			using (var outstream = new StreamWriter(Path.Combine(matterControlRoot, "StaticData", "Translations", "Master.txt")))
+			string outputPath = Path.Combine(matterControlRoot, "StaticData", "Translations", "Master.txt");
+			using (var outstream = new StreamWriter(outputPath))
 			{
 				foreach (var line in translationStrings.OrderBy(x => x).ToArray())
 				{
@@ -90,6 +91,8 @@ namespace RoslynLocalizeDetector
 				}
 			}
 
+			System.Diagnostics.Process.Start(outputPath);
+
 			//GenerateComparisonData();
 		}