From 8f94679671e6bd4e65fa2462dae48ea5dc0faf09 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Sun, 15 May 2016 11:52:40 -0700 Subject: [PATCH] A bit more work on printer editing. --- ActionBar/PrinterActionRow.cs | 18 ++++++++++-------- ControlElements/TextImageButtonFactory.cs | 14 ++++++++------ MatterControlApplication.cs | 1 - .../SettingsControlSelectors.cs | 2 ++ StaticData/Translations/Master.txt | 6 ++++++ Submodules/agg-sharp | 2 +- 6 files changed, 27 insertions(+), 16 deletions(-) diff --git a/ActionBar/PrinterActionRow.cs b/ActionBar/PrinterActionRow.cs index 566aaed64..1c2334855 100644 --- a/ActionBar/PrinterActionRow.cs +++ b/ActionBar/PrinterActionRow.cs @@ -173,7 +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(); + editButton.ToolTipText = "Edit Current Printer Settings".Localize(); if (editButton != null) { editButton.Closed += (s, e2) => @@ -193,13 +193,15 @@ namespace MatterHackers.MatterControl.ActionBar 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.ClickByName("Slice Settings Tab", .1); + testRunner.ClickByName("Slice Settings Tab", .1); + testRunner.ClickByName("Slice Settings Tab", .1); + testRunner.ClickByName("Printer Tab", .2); + testRunner.ClickByName("Connection Tab", .1); + testRunner.MoveToByName("Printer Name Edit", .1); + testRunner.MoveToByName("Auto Connect Checkbox", .1); + testRunner.MoveToByName("Baud Rate Edit", .1); + testRunner.MoveToByName("Printer Name Edit", .1); testRunner.Dispose(); } diff --git a/ControlElements/TextImageButtonFactory.cs b/ControlElements/TextImageButtonFactory.cs index e79469087..b5f4972b0 100644 --- a/ControlElements/TextImageButtonFactory.cs +++ b/ControlElements/TextImageButtonFactory.cs @@ -233,15 +233,17 @@ namespace MatterHackers.MatterControl Button editButton; if (ActiveTheme.Instance.IsDarkTheme) { - editButton = new Button(0, 0, new ButtonViewThreeImage(SetToColor.CreateSetToColor(normalImage, RGBA_Bytes.White), - SetToColor.CreateSetToColor(normalImage, RGBA_Bytes.Gray), - normalImage)); + editButton = new Button(0, 0, new ButtonViewThreeImage( + SetToColor.CreateSetToColor(normalImage, RGBA_Bytes.White.AdjustLightness(.8).GetAsRGBA_Bytes()), + SetToColor.CreateSetToColor(normalImage, RGBA_Bytes.White.AdjustLightness(.9).GetAsRGBA_Bytes()), + SetToColor.CreateSetToColor(normalImage, RGBA_Bytes.White.AdjustLightness(1).GetAsRGBA_Bytes()))); } else { - editButton = new Button(0, 0, new ButtonViewThreeImage(normalImage, - SetToColor.CreateSetToColor(normalImage, RGBA_Bytes.Gray), - SetToColor.CreateSetToColor(normalImage, RGBA_Bytes.White))); + editButton = new Button(0, 0, new ButtonViewThreeImage( + SetToColor.CreateSetToColor(normalImage, RGBA_Bytes.White.AdjustLightness(.4).GetAsRGBA_Bytes()), + SetToColor.CreateSetToColor(normalImage, RGBA_Bytes.White.AdjustLightness(.2).GetAsRGBA_Bytes()), + SetToColor.CreateSetToColor(normalImage, RGBA_Bytes.White.AdjustLightness(0).GetAsRGBA_Bytes()))); } return editButton; diff --git a/MatterControlApplication.cs b/MatterControlApplication.cs index 28275cebb..e13fecb09 100644 --- a/MatterControlApplication.cs +++ b/MatterControlApplication.cs @@ -591,7 +591,6 @@ namespace MatterHackers.MatterControl if (firstDraw) { - DrawAfter += ShowNamesUnderMouse; firstDraw = false; foreach (string arg in commandLineArgs) { diff --git a/SlicerConfiguration/SettingsControlSelectors.cs b/SlicerConfiguration/SettingsControlSelectors.cs index 481f25de4..0f8863def 100644 --- a/SlicerConfiguration/SettingsControlSelectors.cs +++ b/SlicerConfiguration/SettingsControlSelectors.cs @@ -92,6 +92,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration editButton = TextImageButtonFactory.GetThemedEditButton(); + editButton.ToolTipText = "Edit Selected Setting".Localize(); + editButton.VAnchor = VAnchor.ParentCenter; editButton.Margin = new BorderDouble(left: 6); editButton.Click += (sender, e) => diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index 005618e29..15d60e969 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -4855,3 +4855,9 @@ Translated:Details English:Edit Printer Settings Translated:Edit Printer Settings +English:Edit Selected Setting +Translated:Edit Selected Setting + +English:Edit Current Printer Settings +Translated:Edit Current Printer Settings + diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index b5a4de982..fe5151864 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit b5a4de982723c0e453a77579e1b4903f1c0bca7c +Subproject commit fe51518649cfd8207cccab18ee9f1dc262eb71b5