nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

A bit more work on printer editing.

Browse source
This commit is contained in:
Lars Brubaker 2016-05-15 11:52:40 -07:00
parent ba33eb1d37
commit 8f94679671
6 changed files with 27 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
ActionBar/PrinterActionRow.cs
View file

@ -173,7 +173,7 @@ namespace MatterHackers.MatterControl.ActionBar
private void EditButton_Click(object sender, EventArgs e) private void EditButton_Click(object sender, EventArgs e)
{ {
Button editButton = sender as Button; Button editButton = sender as Button;
editButton.ToolTipText = "Edit Printer Settings".Localize(); editButton.ToolTipText = "Edit Current Printer Settings".Localize();
if (editButton != null) if (editButton != null)
{ {
editButton.Closed += (s, e2) => editButton.Closed += (s, e2) =>
@ -193,13 +193,15 @@ namespace MatterHackers.MatterControl.ActionBar
testRunner.ClickByName("SettingsAndControls", 5); testRunner.ClickByName("SettingsAndControls", 5);
testRunner.Wait(.5); testRunner.Wait(.5);
} }
testRunner.ClickByName("SETTINGS Tab"); testRunner.ClickByName("Slice Settings Tab", .1);
testRunner.ClickByName("Printer Tab"); testRunner.ClickByName("Slice Settings Tab", .1);
testRunner.ClickByName("Connection Tab", 5); testRunner.ClickByName("Slice Settings Tab", .1);
testRunner.MoveToByName("Printer Name Edit", 5); testRunner.ClickByName("Printer Tab", .2);
testRunner.MoveToByName("Auto Connect Checkbox", 5); testRunner.ClickByName("Connection Tab", .1);
testRunner.MoveToByName("Baud Rate Edit", 5); testRunner.MoveToByName("Printer Name Edit", .1);
testRunner.MoveToByName("Printer Name Edit", 5); testRunner.MoveToByName("Auto Connect Checkbox", .1);
testRunner.MoveToByName("Baud Rate Edit", .1);
testRunner.MoveToByName("Printer Name Edit", .1);
testRunner.Dispose(); testRunner.Dispose();
} }

14
ControlElements/TextImageButtonFactory.cs
View file

@ -233,15 +233,17 @@ namespace MatterHackers.MatterControl
Button editButton; Button editButton;
if (ActiveTheme.Instance.IsDarkTheme) if (ActiveTheme.Instance.IsDarkTheme)
{ {
editButton = new Button(0, 0, new ButtonViewThreeImage(SetToColor.CreateSetToColor(normalImage, RGBA_Bytes.White), editButton = new Button(0, 0, new ButtonViewThreeImage(
SetToColor.CreateSetToColor(normalImage, RGBA_Bytes.Gray), SetToColor.CreateSetToColor(normalImage, RGBA_Bytes.White.AdjustLightness(.8).GetAsRGBA_Bytes()),
normalImage)); SetToColor.CreateSetToColor(normalImage, RGBA_Bytes.White.AdjustLightness(.9).GetAsRGBA_Bytes()),
SetToColor.CreateSetToColor(normalImage, RGBA_Bytes.White.AdjustLightness(1).GetAsRGBA_Bytes())));
} }
else else
{ {
editButton = new Button(0, 0, new ButtonViewThreeImage(normalImage, editButton = new Button(0, 0, new ButtonViewThreeImage(
SetToColor.CreateSetToColor(normalImage, RGBA_Bytes.Gray), SetToColor.CreateSetToColor(normalImage, RGBA_Bytes.White.AdjustLightness(.4).GetAsRGBA_Bytes()),
SetToColor.CreateSetToColor(normalImage, RGBA_Bytes.White))); SetToColor.CreateSetToColor(normalImage, RGBA_Bytes.White.AdjustLightness(.2).GetAsRGBA_Bytes()),
SetToColor.CreateSetToColor(normalImage, RGBA_Bytes.White.AdjustLightness(0).GetAsRGBA_Bytes())));
} }
return editButton; return editButton;

1
MatterControlApplication.cs
View file

@ -591,7 +591,6 @@ namespace MatterHackers.MatterControl
if (firstDraw) if (firstDraw)
{ {
DrawAfter += ShowNamesUnderMouse;
firstDraw = false; firstDraw = false;
foreach (string arg in commandLineArgs) foreach (string arg in commandLineArgs)
{ {

2
SlicerConfiguration/SettingsControlSelectors.cs
View file

@ -92,6 +92,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
editButton = TextImageButtonFactory.GetThemedEditButton(); editButton = TextImageButtonFactory.GetThemedEditButton();
editButton.ToolTipText = "Edit Selected Setting".Localize();
editButton.VAnchor = VAnchor.ParentCenter; editButton.VAnchor = VAnchor.ParentCenter;
editButton.Margin = new BorderDouble(left: 6); editButton.Margin = new BorderDouble(left: 6);
editButton.Click += (sender, e) => editButton.Click += (sender, e) =>

6
StaticData/Translations/Master.txt
View file

@ -4855,3 +4855,9 @@ Translated:Details
English:Edit Printer Settings English:Edit Printer Settings
Translated: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

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit b5a4de982723c0e453a77579e1b4903f1c0bca7c Subproject commit fe51518649cfd8207cccab18ee9f1dc262eb71b5