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

Merge branch '1.4.0' of https://github.com/MatterHackers/MatterControl into 1.4.0

Browse source
This commit is contained in:
Kevin E. Pope 2015-09-17 19:19:20 -07:00
commit 5e2ecf93d3
2 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ApplicationView/MenuRow/ApplicationMenuRow.cs
View file

@ -58,12 +58,6 @@ namespace MatterHackers.MatterControl
linkButtonFactory.textColor = ActiveTheme.Instance.PrimaryTextColor; linkButtonFactory.textColor = ActiveTheme.Instance.PrimaryTextColor;
linkButtonFactory.fontSize = 8; linkButtonFactory.fontSize = 8;
Button signOutLink = linkButtonFactory.Generate("(Sign Out)");
signOutLink.Name = "Authentication Sign Out";
signOutLink.ToolTipText = "Sign out of your MatterControl account".Localize();
signOutLink.VAnchor = Agg.UI.VAnchor.ParentCenter;
signOutLink.Margin = new BorderDouble(top: 0);
this.HAnchor = HAnchor.ParentLeftRight; this.HAnchor = HAnchor.ParentLeftRight;
this.BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor; this.BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
@ -90,7 +84,7 @@ namespace MatterHackers.MatterControl
popUpAboutPage.AddChild(updateStatusMessage); popUpAboutPage.AddChild(updateStatusMessage);
updateStatusMessage.Click += (sender, e) => updateStatusMessage.Click += (sender, e) =>
{ {
UiThread.RunOnIdle(CheckForUpdateWindow.Show); UiThread.RunOnIdle(CheckForUpdateWindow.Show);
}; };
this.AddChild(popUpAboutPage); this.AddChild(popUpAboutPage);
SetUpdateNotification(this, null); SetUpdateNotification(this, null);

13
Tests/MatterControl.Tests/MatterControl/AutomationTests/CheckBoxInLibraryIsClickable.cs
View file

@ -54,12 +54,17 @@ namespace MatterHackers.MatterControl.UI
// Now do the actions specific to this test. (replace this for new tests) // Now do the actions specific to this test. (replace this for new tests)
{ {
testRunner.ClickByName("Library Tab", 3); testRunner.ClickByName("Library Tab", 3);
SystemWindow systemWindow; MatterControlUtilities.NavigateToFolder(testRunner, "Local Library Row Item Collection");
GuiWidget rowItem = testRunner.GetWidgetByName("Local Library Row Item Collection", out systemWindow, 3);
SearchRegion rowItemRegion = testRunner.GetRegionByName("Local Library Row Item Collection", 3); SystemWindow systemWindow;
string itemName = "Row Item " + "Calibration - Box";
GuiWidget rowItem = testRunner.GetWidgetByName(itemName, out systemWindow, 3);
SearchRegion rowItemRegion = testRunner.GetRegionByName(itemName, 3);
testRunner.ClickByName("Library Edit Button", 3); testRunner.ClickByName("Library Edit Button", 3);
testRunner.Wait(.5);
SystemWindow containingWindow; SystemWindow containingWindow;
GuiWidget foundWidget = testRunner.GetWidgetByName("Row Item Select Checkbox", out containingWindow, 3, searchRegion: rowItemRegion); GuiWidget foundWidget = testRunner.GetWidgetByName("Row Item Select Checkbox", out containingWindow, 3, searchRegion: rowItemRegion);
@ -71,7 +76,7 @@ namespace MatterHackers.MatterControl.UI
testRunner.ClickByName("Library Tab"); testRunner.ClickByName("Library Tab");
resultsHarness.AddTestResult(checkBoxWidget.Checked == true, "currently checked"); resultsHarness.AddTestResult(checkBoxWidget.Checked == true, "currently checked");
testRunner.ClickByName("Local Library Row Item Collection", 3); testRunner.ClickByName(itemName, 3);
testRunner.ClickByName("Library Tab"); testRunner.ClickByName("Library Tab");
resultsHarness.AddTestResult(checkBoxWidget.Checked == false, "currently not checked"); resultsHarness.AddTestResult(checkBoxWidget.Checked == false, "currently not checked");