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

Merge branch '1.6'

Browse source 
# Conflicts:
#	SlicerConfiguration/Settings/ProfileManager.cs
#	Tests/MatterControl.AutomationTests/PrintQueueTests.cs
#	Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
This commit is contained in:
Lars Brubaker 2016-12-07 16:14:56 -08:00
commit dbd2c20398
5 changed files with 75 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

14
SetupWizard/CopyGuestProfilesToUser.cs
View file

@ -46,7 +46,7 @@ namespace MatterHackers.MatterControl
List<CheckBox> checkBoxes = new List<CheckBox>();
public CopyGuestProfilesToUser(Action afterProfilesImported)
public CopyGuestProfilesToUser()
: base("Close", "Copy Printers to Account")
{
var scrollWindow = new ScrollableWidget()
@ -68,7 +68,7 @@ namespace MatterHackers.MatterControl
var byCheckbox = new Dictionary<CheckBox, PrinterInfo>();
var guest = ProfileManager.LoadGuestProfiles();
var guest = ProfileManager.Load("guest");
if (guest?.Profiles.Count > 0)
{
container.AddChild(new TextWidget("Printers to Copy:".Localize())
@ -122,13 +122,13 @@ namespace MatterHackers.MatterControl
guest.Save();
// close the window
// Close the window and update the PrintersImported flag
UiThread.RunOnIdle(() =>
{
WizardWindow.Close();
// Call back into the original source
afterProfilesImported?.Invoke();
ProfileManager.Instance.PrintersImported = true;
ProfileManager.Instance.Save();
});
};
@ -138,12 +138,14 @@ namespace MatterHackers.MatterControl
syncButton.Visible = true;
cancelButton.Visible = true;
// Close the window and update the PrintersImported flag
cancelButton.Click += (s, e) => UiThread.RunOnIdle(() =>
{
WizardWindow.Close();
if (rememberChoice.Checked)
{
afterProfilesImported?.Invoke();
ProfileManager.Instance.PrintersImported = true;
ProfileManager.Instance.Save();
}
});