From ce13f6f59cde542d271ca75c8de5edd8ca9ce411 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Fri, 13 May 2016 14:23:33 -0700 Subject: [PATCH] Put in a hack for the printer edit button. --- ActionBar/PrinterActionRow.cs | 26 +++++++++++++++------- CustomWidgets/PartThumbnailWidget.cs | 3 +++ MatterControlApplication.cs | 1 + SlicerConfiguration/SliceSettingsWidget.cs | 9 ++++++-- StaticData/SliceSettings/Layouts.txt | 6 ++--- StaticData/Translations/Master.txt | 6 +++++ 6 files changed, 38 insertions(+), 13 deletions(-) diff --git a/ActionBar/PrinterActionRow.cs b/ActionBar/PrinterActionRow.cs index 74c013ebc..566aaed64 100644 --- a/ActionBar/PrinterActionRow.cs +++ b/ActionBar/PrinterActionRow.cs @@ -29,11 +29,13 @@ either expressed or implied, of the FreeBSD Project. using MatterHackers.Agg; using MatterHackers.Agg.UI; +using MatterHackers.GuiAutomation; using MatterHackers.Localizations; using MatterHackers.MatterControl.PrinterCommunication; using MatterHackers.MatterControl.PrinterControls.PrinterConnections; using MatterHackers.MatterControl.SlicerConfiguration; using System; +using System.Threading.Tasks; namespace MatterHackers.MatterControl.ActionBar { @@ -171,6 +173,7 @@ namespace MatterHackers.MatterControl.ActionBar private void EditButton_Click(object sender, EventArgs e) { Button editButton = sender as Button; + editButton.ToolTipText = "Edit Printer Settings".Localize(); if (editButton != null) { editButton.Closed += (s, e2) => @@ -184,17 +187,24 @@ namespace MatterHackers.MatterControl.ActionBar private void AutomationTest() { - AutomationRunner test = new AutomationRunner("C:/TestImages"); - test.Wait(2); - test.ClickByName("SettingsAndControls"); - test.Wait(2); - test.ClickImage("BackButton.png"); - - //ImageIO.SaveImageData("test.png", test.GetCurrentScreen()); + AutomationRunner testRunner = new AutomationRunner(inputType: AutomationRunner.InputType.Simulated); + if (testRunner.NameExists("SettingsAndControls")) + { + testRunner.ClickByName("SettingsAndControls", 5); + testRunner.Wait(.5); + } + testRunner.ClickByName("SETTINGS Tab"); + testRunner.ClickByName("Printer Tab"); + testRunner.ClickByName("Connection Tab", 5); + testRunner.MoveToByName("Printer Name Edit", 5); + testRunner.MoveToByName("Auto Connect Checkbox", 5); + testRunner.MoveToByName("Baud Rate Edit", 5); + testRunner.MoveToByName("Printer Name Edit", 5); + testRunner.Dispose(); } - protected override void AddHandlers() + protected override void AddHandlers() { ActiveSliceSettings.ActivePrinterChanged.RegisterEvent(onActivePrinterChanged, ref unregisterEvents); PrinterConnectionAndCommunication.Instance.EnableChanged.RegisterEvent(onPrinterStatusChanged, ref unregisterEvents); diff --git a/CustomWidgets/PartThumbnailWidget.cs b/CustomWidgets/PartThumbnailWidget.cs index a3b2a0264..4de44fd80 100644 --- a/CustomWidgets/PartThumbnailWidget.cs +++ b/CustomWidgets/PartThumbnailWidget.cs @@ -45,6 +45,7 @@ using System.Collections.Generic; using System.IO; using System.Threading.Tasks; using MatterHackers.Localizations; +using MatterHackers.Agg.ImageProcessing; namespace MatterHackers.MatterControl { @@ -115,7 +116,9 @@ namespace MatterHackers.MatterControl if (noThumbnailImage.Width == 0) { StaticData.Instance.LoadIcon(noThumbnailFileName, noThumbnailImage); + noThumbnailImage.InvertLightness(); StaticData.Instance.LoadIcon(buildingThumbnailFileName, buildingThumbnailImage); + buildingThumbnailImage.InvertLightness(); } this.thumbnailImage = new ImageBuffer(buildingThumbnailImage); diff --git a/MatterControlApplication.cs b/MatterControlApplication.cs index e866bf164..28275cebb 100644 --- a/MatterControlApplication.cs +++ b/MatterControlApplication.cs @@ -52,6 +52,7 @@ using System.Threading; using System.Threading.Tasks; using MatterHackers.GCodeVisualizer; using Gaming.Game; +using MatterHackers.GuiAutomation; namespace MatterHackers.MatterControl { diff --git a/SlicerConfiguration/SliceSettingsWidget.cs b/SlicerConfiguration/SliceSettingsWidget.cs index 11562745c..9c5fe909c 100644 --- a/SlicerConfiguration/SliceSettingsWidget.cs +++ b/SlicerConfiguration/SliceSettingsWidget.cs @@ -687,7 +687,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration var intEditWidget = new MHNumberEdit(currentValue, pixelWidth: intEditWidth, tabIndex: tabIndexForItem++) { ToolTipText = settingData.HelpText, - SelectAllOnFocus = true + SelectAllOnFocus = true, + Name = settingData.PresentationName + " Edit", }; intEditWidget.ActuallNumberEdit.EditComplete += (sender, e) => { @@ -1045,8 +1046,12 @@ namespace MatterHackers.MatterControl.SlicerConfiguration case OrganizerSettingsData.DataEditTypes.STRING: { - var stringEdit = new MHTextEditWidget(sliceSettingValue, pixelWidth: 120, tabIndex: tabIndexForItem++); + var stringEdit = new MHTextEditWidget(sliceSettingValue, pixelWidth: 120, tabIndex: tabIndexForItem++) + { + Name = settingData.PresentationName + " Edit", + }; stringEdit.ToolTipText = settingData.HelpText; + stringEdit.ActualTextEditWidget.EditComplete += (sender, e) => { SaveSetting(settingData.SlicerConfigName, ((TextEditWidget)sender).Text); diff --git a/StaticData/SliceSettings/Layouts.txt b/StaticData/SliceSettings/Layouts.txt index 35bcf5d8f..896ee3011 100644 --- a/StaticData/SliceSettings/Layouts.txt +++ b/StaticData/SliceSettings/Layouts.txt @@ -11,7 +11,7 @@ Simple Connection Description MatterControl.PrinterName - Connection + Details MatterControl.AutoConnect MatterControl.BaudRate MatterControl.ComPort @@ -72,7 +72,7 @@ Intermediate Connection Description MatterControl.PrinterName - Connection + Details MatterControl.AutoConnect MatterControl.BaudRate MatterControl.ComPort @@ -272,7 +272,7 @@ Advanced Connection Description MatterControl.PrinterName - Connection + Details MatterControl.AutoConnect MatterControl.BaudRate MatterControl.ComPort diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index e45cad4a7..005618e29 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -4849,3 +4849,9 @@ Translated:Connection Info English:Camera Monitoring Translated:Camera Monitoring +English:Details +Translated:Details + +English:Edit Printer Settings +Translated:Edit Printer Settings +