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

Merge pull request #2121 from jlewin/design_tools

Browse source 
Design tools
This commit is contained in:
johnlewin 2017-06-04 17:47:42 -07:00 • committed by GitHub
commit 85f04ca27d
18 changed files with 125 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ActionBar/PrinterSelector.cs
View file

@ -1,5 +1,5 @@
/*
Copyright (c) 2016, John Lewin
Copyright (c) 2017, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without
@ -27,18 +27,13 @@ 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.Agg.Image;
using MatterHackers.Agg.ImageProcessing;
using System;
using System.Linq;
using MatterHackers.Agg.PlatformAbstract;
using MatterHackers.Agg.UI;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.PrinterCommunication;
using MatterHackers.MatterControl.PrinterControls.PrinterConnections;
using MatterHackers.MatterControl.SlicerConfiguration;
using MatterHackers.VectorMath;
using System;
using System.Linq;
namespace MatterHackers.MatterControl
{

18
ControlElements/TextImageButtonFactory.cs
View file

@ -66,7 +66,7 @@ namespace MatterHackers.MatterControl
{
// make sure the contents are centered
GuiWidget leftSpace = new GuiWidget(0, 1);
leftSpace.HAnchor = Agg.UI.HAnchor.ParentLeftRight;
leftSpace.HAnchor = HAnchor.ParentLeftRight;
container.AddChild(leftSpace);
}
@ -89,18 +89,18 @@ namespace MatterHackers.MatterControl
if (centerText)
{
GuiWidget rightSpace = new GuiWidget(0, 1);
rightSpace.HAnchor = Agg.UI.HAnchor.ParentLeftRight;
rightSpace.HAnchor = HAnchor.ParentLeftRight;
container.AddChild(rightSpace);
container.HAnchor = Agg.UI.HAnchor.ParentLeftRight | Agg.UI.HAnchor.FitToChildren;
container.HAnchor = HAnchor.ParentLeftRight | HAnchor.FitToChildren;
}
container.VAnchor = Agg.UI.VAnchor.ParentCenter;
container.VAnchor = VAnchor.ParentCenter;
container.MinimumSize = new Vector2(width, height);
container.Margin = margin;
this.AddChild(container);
HAnchor = HAnchor.ParentLeftRight | HAnchor.FitToChildren;
VAnchor = VAnchor.ParentCenter | Agg.UI.VAnchor.FitToChildren;
VAnchor = VAnchor.ParentCenter | VAnchor.FitToChildren;
}
public override void OnDraw(Graphics2D graphics2D)
@ -218,8 +218,8 @@ namespace MatterHackers.MatterControl
editButton = GetThemedEditButton();
editButton.Margin = new BorderDouble(2, 2, 2, 0);
editButton.VAnchor = Agg.UI.VAnchor.ParentBottom;
textWidget.VAnchor = Agg.UI.VAnchor.ParentBottom;
editButton.VAnchor = VAnchor.ParentBottom;
textWidget.VAnchor = VAnchor.ParentBottom;
groupLableAndEditControl.AddChild(textWidget);
groupLableAndEditControl.AddChild(editButton);
@ -256,9 +256,9 @@ namespace MatterHackers.MatterControl
editButton = GetThemedEditButton();
editButton.Margin = new BorderDouble(2, 2, 2, 0);
editButton.VAnchor = Agg.UI.VAnchor.ParentBottom;
editButton.VAnchor = VAnchor.ParentBottom;
TextWidget textLabel = new TextWidget(label, textColor: ActiveTheme.Instance.PrimaryTextColor, pointSize: 12);
textLabel.VAnchor = Agg.UI.VAnchor.ParentBottom;
textLabel.VAnchor = VAnchor.ParentBottom;
groupLableAndEditControl.AddChild(textLabel);
groupLableAndEditControl.AddChild(editButton);

5
CustomWidgets/LibrarySelector/FolderBreadCrumbWidget.cs
View file

@ -65,6 +65,9 @@ namespace MatterHackers.MatterControl.CustomWidgets
bool haveFilterRunning = !string.IsNullOrEmpty(currentContainer.KeywordFilter);
var initialMargin = buttonFactory.Margin;
buttonFactory.Margin = new BorderDouble(8, 0);
var icon = LibraryProviderHelpers.LoadInvertIcon("FileDialog", "up_folder_20.png");
//icon = LibraryProviderHelpers.ResizeImage(icon, 20, 20);
@ -79,6 +82,8 @@ namespace MatterHackers.MatterControl.CustomWidgets
}
};
buttonFactory.Margin = initialMargin;
this.AddChild(upbutton);
bool firstItem = true;

19
MatterControlApplication.cs
View file

@ -441,25 +441,6 @@ namespace MatterHackers.MatterControl
[STAThread]
public static void Main()
{
//foreach (string file in Directory.GetFiles(@"D:\Sources\TempTestX\MatterControl\StaticData\Icons\FileDialog", "*.png").Where(n => !n.Contains(".x.") && n.Contains("shared_folder")))
//{
// var image = new ImageBuffer();
// ImageIO.LoadImageData(file, image);
// image = image.ReplaceColor(new RGBA_Bytes(255, 255, 255, 0), RGBA_Bytes.Blue, false);
// image = image.ReplaceColor(RGBA_Bytes.Transparent, RGBA_Bytes.Blue, false);
// image = image.ReplaceColor(RGBA_Bytes.Black, RGBA_Bytes.Transparent, false);
// // image = image.ReplaceColor(RGBA_Bytes.Blue, RGBA_Bytes.Black, false);
// image = image.AllWhite(RGBA_Bytes.Black);
// ImageIO.SaveImageData(file, image);
// //ImageIO.SaveImageData(Path.ChangeExtension(file, ".x.png"), image);
// //5break;
//}
//return;
PerformanceTimer.GetParentWindowFunction = () => { return MatterControlApplication.instance; };
CultureInfo.DefaultThreadCurrentCulture = CultureInfo.InvariantCulture;

35
PartPreviewWindow/View3D/PrinterActionsBar.cs
View file

@ -28,6 +28,7 @@ either expressed or implied, of the FreeBSD Project.
*/
using System;
using MatterHackers.Agg;
using MatterHackers.Agg.PlatformAbstract;
using MatterHackers.Agg.UI;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.ActionBar;
@ -63,10 +64,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
this.AddChild(new PrintActionRow(buttonFactory, this));
//ImageBuffer terminalSettingsImage = StaticData.Instance.LoadIcon("terminal-24x24.png", 24, 24).InvertLightness();
var terminalButton = buttonFactory.Generate("Terminal".Localize().ToUpper());
terminalButton.Name = "Show Terminal Button";
terminalButton.Click += (s, e) => UiThread.RunOnIdle(TerminalWindow.Show);
this.AddChild(terminalButton);
/*
ImageBuffer levelingImage = StaticData.Instance.LoadIcon("leveling_32x32.png", 24, 24);
@ -75,18 +72,29 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
levelingImage.InvertLightness();
}*/
Button configureEePromButton = buttonFactory.Generate("EEProm".Localize().ToUpper());
configureEePromButton.Click += configureEePromButton_Click;
this.AddChild(configureEePromButton);
//this.AddChild(new PrintStatusRow());
this.AddChild(new HorizontalSpacer());
//this.AddChild(GeneratePopupContent());
var initialMargin = buttonFactory.Margin;
Button undoButton = buttonFactory.Generate("Undo".Localize(), centerText: true);
buttonFactory.Margin = new BorderDouble(8, 0);
Button terminalButton = buttonFactory.Generate("", StaticData.Instance.LoadIcon("terminal-24x24.png", 16, 16));
terminalButton.Name = "Show Terminal Button";
terminalButton.ToolTipText = "Terminal";
terminalButton.Click += (s, e) => UiThread.RunOnIdle(TerminalWindow.Show);
this.AddChild(terminalButton);
Button configureEePromButton = buttonFactory.Generate("", StaticData.Instance.LoadIcon("chip_24x24.png", 16, 16));
configureEePromButton.ToolTipText = "EEProm";
configureEePromButton.Click += configureEePromButton_Click;
this.AddChild(configureEePromButton);
Button undoButton = buttonFactory.Generate("", StaticData.Instance.LoadIcon("undo_24x24.png", 16, 16));
undoButton.Name = "3D View Undo";
undoButton.ToolTipText = "Undo";
undoButton.Enabled = false;
undoButton.Margin = new BorderDouble(8, 0);
undoButton.Click += (sender, e) =>
@ -94,15 +102,22 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
undoBuffer.Undo();
};
this.AddChild(undoButton);
undoButton.VAnchor = VAnchor.ParentCenter;
undoButton.Margin = 3;
Button redoButton = buttonFactory.Generate("Redo".Localize(), centerText: true);
Button redoButton = buttonFactory.Generate("", StaticData.Instance.LoadIcon("redo_24x24.png", 16, 16));
redoButton.Name = "3D View Redo";
redoButton.ToolTipText = "Redo";
redoButton.Enabled = false;
redoButton.Click += (sender, e) =>
{
undoBuffer.Redo();
};
this.AddChild(redoButton);
redoButton.VAnchor = VAnchor.ParentCenter;
redoButton.Margin = 3;
buttonFactory.Margin = initialMargin;
undoBuffer.Changed += (sender, e) =>
{

1
SlicerConfiguration/Settings/PrinterSettings.cs
View file

@ -354,6 +354,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
}
}
[JsonIgnore]
public string DocumentPath => ProfileManager.Instance.ProfilePath(this.ID);
[JsonIgnore]

BIN
StaticData/Icons/chip_24x24.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 609 B

BIN
StaticData/Icons/redo_24x24.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 577 B

BIN
StaticData/Icons/undo_24x24.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 580 B

0
StaticData/Icons/mh-logo.png → StaticData/Images/mh-logo.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before After
Before After

2
StaticData/OEMSettings/AboutPage.html
View file

@ -8,6 +8,8 @@
<tr><td>Special thanks to:</td></tr>
<tr><td>Alessandro Ranellucci for <a href='https://github.com/alexrj/Slic3r'>Slic3r</a></td></tr>
<tr><td>David Braam and Ultimaker BV for <a href='https://github.com/Ultimaker/CuraEngine'>CuraEngine</a></td></tr>
<tr><td>EEProm icon made by Freepik from www.flaticon.com is licensed by CC 3.0 BY</td></tr>
<tr><td>Undo/Redo icons made by Icomoon from www.flaticon.com is licensed by CC 3.0 BY</td></tr>
<tr style='height:100%;'><td>&nbsp;</td></tr>
<tr><td id='sendFeedback' class='centeredButton translate'>Send FeedBack</td></tr>
<tr><td>&nbsp;</td></tr>

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 878b11f5d4f9ff6faa46c3b7e52f1661bfbf8a6c
Subproject commit 7063695984d142804f9f4a0bc186437048513a51

80
Tests/MatterControl.AutomationTests/FileMenuTest.cs
View file

@ -8,13 +8,13 @@ using NUnit.Framework;
namespace MatterHackers.MatterControl.Tests.Automation
{
[TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain]
[TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain, Apartment(ApartmentState.STA)]
public class FileMenuTest
{
[Test, Apartment(ApartmentState.STA)]
[Test]
public async Task FileMenuAddPrinter()
{
AutomationTest testToRun = (testRunner) =>
await MatterControlUtilities.RunTest((testRunner) =>
{
testRunner.CloseSignInAndPrinterSelect();
@ -27,15 +27,13 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.ClickByName("Cancel Wizard Button");
return Task.CompletedTask;
};
await MatterControlUtilities.RunTest(testToRun, queueItemFolderToAdd: QueueTemplate.Three_Queue_Items);
}, queueItemFolderToAdd: QueueTemplate.Three_Queue_Items);
}
[Test, Apartment(ApartmentState.STA)]
[Test]
public async Task AddToQueueMenuItemAddsSingleFile()
{
AutomationTest testToRun = (testRunner) =>
await MatterControlUtilities.RunTest((testRunner) =>
{
testRunner.CloseSignInAndPrinterSelect();
@ -44,30 +42,26 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.ClickByName("Add File To Queue Menu Item");
testRunner.Delay(2);
string queueItemPath = MatterControlUtilities.GetTestItemPath("Fennec_Fox.stl");
int expectedCount = QueueData.Instance.ItemCount + 1;
int queueBeforeCount = QueueData.Instance.ItemCount;
testRunner.Type(queueItemPath);
testRunner.Type(MatterControlUtilities.GetTestItemPath("Fennec_Fox.stl"));
testRunner.Delay(1);
testRunner.Type("{Enter}");
testRunner.Delay(2);
Assert.IsTrue(testRunner.WaitForName("Queue Item Fennec_Fox", 2));
int queueAfterCount = QueueData.Instance.ItemCount;
testRunner.NavigateToFolder("Print Queue Row Item Collection");
Assert.IsTrue(queueAfterCount == queueBeforeCount + 1);
Assert.IsTrue(testRunner.WaitForName("Row Item Fennec_Fox"));
Assert.AreEqual(expectedCount, QueueData.Instance.ItemCount, "Queue count should increase by one after adding Fennec part");
return Task.CompletedTask;
};
await MatterControlUtilities.RunTest(testToRun);
});
}
[Test, Apartment(ApartmentState.STA)]
[Test]
public async Task AddToQueueMenuItemAddsMultipleFiles()
{
AutomationTest testToRun = (testRunner) =>
await MatterControlUtilities.RunTest((testRunner) =>
{
testRunner.CloseSignInAndPrinterSelect();
@ -76,34 +70,32 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.ClickByName("Add File To Queue Menu Item");
testRunner.Delay(2);
string queueItemPath = MatterControlUtilities.GetTestItemPath("Fennec_Fox.stl");
int expectedCount = QueueData.Instance.ItemCount + 2;
string pathToSecondQueueItem = MatterControlUtilities.GetTestItemPath("Batman.stl");
string textForBothQueueItems = string.Format("\"{0}\" \"{1}\"", queueItemPath, pathToSecondQueueItem);
testRunner.Type(
string.Format("\"{0}\" \"{1}\"",
MatterControlUtilities.GetTestItemPath("Fennec_Fox.stl"),
MatterControlUtilities.GetTestItemPath("Batman.stl")));
int queueBeforeAddCount = QueueData.Instance.ItemCount;
testRunner.Type(textForBothQueueItems);
testRunner.Delay(2);
testRunner.Type("{Enter}");
testRunner.Delay(2);
Assert.IsTrue(testRunner.WaitForName("Queue Item Fennec_Fox", 2));
Assert.IsTrue(testRunner.WaitForName("Queue Item Batman", 2));
int queueAfterAddCount = QueueData.Instance.ItemCount;
testRunner.NavigateToFolder("Print Queue Row Item Collection");
Assert.IsTrue(queueAfterAddCount == queueBeforeAddCount + 2);
Assert.IsTrue(testRunner.WaitForName("Row Item Fennec_Fox", 2));
Assert.IsTrue(testRunner.WaitForName("Row Item Batman", 2));
Assert.AreEqual(expectedCount, QueueData.Instance.ItemCount, "Queue count should increase by two after adding Fennec and Batman parts");
return Task.CompletedTask;
};
await MatterControlUtilities.RunTest(testToRun);
});
}
[Test, Apartment(ApartmentState.STA)]
[Test]
public async Task AddToQueueMenuItemAddsZipFiles()
{
AutomationTest testToRun = (testRunner) =>
await MatterControlUtilities.RunTest((testRunner) =>
{
testRunner.CloseSignInAndPrinterSelect();
@ -112,22 +104,22 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.ClickByName("Add File To Queue Menu Item");
testRunner.Delay(2);
int beforeCount = QueueData.Instance.ItemCount;
int expectedCount = QueueData.Instance.ItemCount + 2;
string pathToType = MatterControlUtilities.GetTestItemPath("Batman.zip");
testRunner.Type(pathToType);
testRunner.Type(MatterControlUtilities.GetTestItemPath("Batman.zip"));
testRunner.Delay(1);
testRunner.Type("{Enter}");
testRunner.Delay(1);
Assert.IsTrue(testRunner.WaitForName("Queue Item Batman", 1));
Assert.IsTrue(testRunner.WaitForName("Queue Item 2013-01-25_Mouthpiece_v2", 1));
Assert.IsTrue(QueueData.Instance.ItemCount == beforeCount + 2);
testRunner.NavigateToFolder("Print Queue Row Item Collection");
Assert.IsTrue(testRunner.WaitForName("Row Item Batman", 1));
Assert.IsTrue(testRunner.WaitForName("Row Item 2013-01-25_Mouthpiece_v2", 1));
Assert.AreEqual(expectedCount, QueueData.Instance.ItemCount, "Queue count should increase by two after adding contents of Batmap.zip");
return Task.CompletedTask;
};
await MatterControlUtilities.RunTest(testToRun);
});
}
}
}

28
Tests/MatterControl.AutomationTests/PrintQueueTests.cs
View file

@ -38,10 +38,10 @@ using NUnit.Framework;
namespace MatterHackers.MatterControl.Tests.Automation
{
[TestFixture, Category("MatterControl.UI.Automation"), Category("MatterControl.Automation"), RunInApplicationDomain]
[TestFixture, Category("MatterControl.UI.Automation"), Category("MatterControl.Automation"), RunInApplicationDomain, Apartment(ApartmentState.STA)]
public class PrintQueueTests
{
[Test, Apartment(ApartmentState.STA)]
[Test]
public async Task AddOneItemToQueue()
{
await MatterControlUtilities.RunTest((testRunner) =>
@ -71,7 +71,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
});
}
[Test, Apartment(ApartmentState.STA)]
[Test]
public async Task AddTwoItemsToQueue()
{
await MatterControlUtilities.RunTest((testRunner) =>
@ -112,7 +112,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
/// 2. QueueData.Instance.Count is correctly decremented after remove
/// 3. Target item does not exist after remove
/// </summary>
[Test, Apartment(ApartmentState.STA)]
[Test]
public async Task RemoveButtonRemovesSingleItem()
{
AutomationTest testToRun = (testRunner) =>
@ -140,10 +140,10 @@ namespace MatterHackers.MatterControl.Tests.Automation
await MatterControlUtilities.RunTest(testToRun, queueItemFolderToAdd: QueueTemplate.Three_Queue_Items);
}
[Test, Apartment(ApartmentState.STA)]
[Test]
public async Task RemoveLastItemInListChangesSelection()
{
AutomationTest testToRun = (testRunner) =>
await MatterControlUtilities.RunTest((testRunner) =>
{
testRunner.CloseSignInAndPrinterSelect();
@ -169,12 +169,10 @@ namespace MatterHackers.MatterControl.Tests.Automation
Assert.IsFalse(testRunner.WaitForName("Queue Item MatterControl - Coin", .5), "Target item should not exist after Remove");
return Task.CompletedTask;
};
await MatterControlUtilities.RunTest(testToRun, queueItemFolderToAdd: QueueTemplate.Three_Queue_Items);
}, queueItemFolderToAdd: QueueTemplate.Three_Queue_Items);
}
[Test, Apartment(ApartmentState.STA)]
[Test]
public async Task RemoveButtonRemovesMultipleItems()
{
AutomationTest testToRun = (testRunner) =>
@ -215,7 +213,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
await MatterControlUtilities.RunTest(testToRun, queueItemFolderToAdd: QueueTemplate.Three_Queue_Items);
}
[Test, Apartment(ApartmentState.STA)]
[Test]
public async Task QueueSelectCheckBoxWorks()
{
AutomationTest testToRun = (testRunner) =>
@ -258,7 +256,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
await MatterControlUtilities.RunTest(testToRun, queueItemFolderToAdd: QueueTemplate.Three_Queue_Items);
}
[Test, Apartment(ApartmentState.STA)]
[Test]
public async Task DragTo3DViewAddsItem()
{
AutomationTest testToRun = (testRunner) =>
@ -289,7 +287,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
await MatterControlUtilities.RunTest(testToRun, queueItemFolderToAdd: QueueTemplate.Three_Queue_Items);
}
[Test, Apartment(ApartmentState.STA)]
[Test]
public async Task AddAmfFile()
{
await MatterControlUtilities.RunTest((testRunner) =>
@ -320,7 +318,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
});
}
[Test, Apartment(ApartmentState.STA)]
[Test]
public async Task AddStlFile()
{
await MatterControlUtilities.RunTest((testRunner) =>
@ -351,7 +349,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
});
}
[Test, Apartment(ApartmentState.STA)]
[Test]
public async Task AddGCodeFile()
{
await MatterControlUtilities.RunTest((testRunner) =>

5
Tests/MatterControl.AutomationTests/PrinterDropDownTests.cs
View file

@ -36,9 +36,8 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.Delay(4);
//Check to make sure the Printer dropdown gets the name change
testRunner.ClickByName("Printers... Menu", 2);
testRunner.Delay(1);
Assert.IsTrue(testRunner.NameExists(newName + " Menu Item"), "Widget with updated printer name exists");
testRunner.OpenPrintersDropdown();
Assert.IsTrue(testRunner.WaitForName(newName + " Menu Item"), "Widget with updated printer name exists");
//Make sure the Active profile name changes as well
Assert.IsTrue(ProfileManager.Instance.ActiveProfile.Name == newName, "ActiveProfile has updated name");

3
Tests/MatterControl.AutomationTests/SliceSettingsTests.cs
View file

@ -323,8 +323,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
Assert.AreEqual(2, ProfileManager.Instance.ActiveProfiles.Count(), "ProfileManager has 2 Profiles");
// Check if Guest printer names exists in dropdown
testRunner.ClickByName("Printer Overflow Menu", 2);
testRunner.ClickByName("Printers... Menu", 2);
testRunner.OpenPrintersDropdown();
testRunner.ClickByName("Airwolf 3D HD Menu Item", 5);
testRunner.Delay(1);

30
Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
View file

@ -267,11 +267,17 @@ namespace MatterHackers.MatterControl.Tests.Automation
public static void AddAndSelectPrinter(this AutomationRunner testRunner, string make, string model)
{
// If SelectMake is not visible and the ConnectionWizard is, click Skip
if (!testRunner.NameExists("Select Make")
&& testRunner.WaitForName("Connection Wizard Skip Sign In Button", 1))
{
testRunner.ClickByName("Connection Wizard Skip Sign In Button");
}
if (!testRunner.WaitForName("Select Make", 1))
{
// TODO: The overflow menu needs to always be on screen and when there's not enough room siblings should be removed from the actions bar and pushed into the overflow menu, rather than the menu clipping from the screen
testRunner.ClickByName("Printer Overflow Menu", 2, delayBeforeReturn: .5);
testRunner.ClickByName("Printers... Menu", 2, delayBeforeReturn: .5);
testRunner.OpenPrintersDropdown();
testRunner.ClickByName("Add New Printer... Menu Item", 5, delayBeforeReturn: .5);
}
@ -291,6 +297,23 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.Delay(1);
}
public static void OpenPrintersDropdown(this AutomationRunner testRunner)
{
testRunner.ClickByName("Printer Overflow Menu");
testRunner.ClickByName("Printers... Menu");
}
public static void ClosePrintersDropdown(this AutomationRunner testRunner)
{
testRunner.ClickByName("Printer Overflow Menu");
// If a sub menu is open the first click will close it but not the main menu. Second click as needed
if (testRunner.WaitForName("Printers... Menu", 0.5))
{
testRunner.ClickByName("Printer Overflow Menu");
}
}
private static void OutputImage(ImageBuffer imageToOutput, string fileName)
{
if (saveImagesForDebug)
@ -431,8 +454,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
if (queueItemFolderToAdd != QueueTemplate.None)
{
string queueTemplateDirectory = queueItemFolderToAdd.ToString();
MatterControlUtilities.AddItemsToQueue(queueTemplateDirectory);
MatterControlUtilities.AddItemsToQueue(queueItemFolderToAdd.ToString());
}
if (defaultTestImages == null)

2
TextCreator/Library/TextLibraryContainer.cs
View file

@ -87,7 +87,7 @@ namespace MatterHackers.MatterControl.Library
return brailleItem;
}),
// TODO: Filepath won't work on Android. Needs to load from/to stream via custom type
new FileSystemFileItem(StaticData.Instance.MapPath(Path.Combine("Icons", "mh-logo.png")))
new FileSystemFileItem(StaticData.Instance.MapPath(Path.Combine("Images", "mh-logo.png")))
{
Name = "Image Converter".Localize()
}