Merge remote-tracking branch 'Greg/development' into development

This commit is contained in:
larsbrubaker 2014-06-27 10:57:47 -07:00
commit e80c635b66

View file

@ -454,7 +454,7 @@ namespace MatterHackers.MatterControl
}
ImageWidget levelingIcon = new ImageWidget (notificationSettingsImage);
levelingIcon.Margin = new BorderDouble (right: 6);
levelingIcon.Margin = new BorderDouble (right: 6, bottom: 6);
configureNotificationSettingsButton = textImageButtonFactory.Generate ("Configure".Localize ().ToUpper ());
configureNotificationSettingsButton.Margin = new BorderDouble (left: 6);
@ -803,7 +803,7 @@ namespace MatterHackers.MatterControl
{
UiThread.RunOnIdle ((state) =>
{
openPrintNotificationFunction(null);
openPrintNotificationFunction(null);
});
}
}