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

Merge pull request #1306 from jlewin/master

Browse source 
Rebuild printers droplist on ProfilesListChanged event
This commit is contained in:
johnlewin 2016-08-20 12:17:09 -07:00 • committed by GitHub
commit 39d375be3c
3 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ActionBar/PrinterSelector.cs
View file

@ -84,7 +84,9 @@ namespace MatterHackers.MatterControl
};
SliceSettingsWidget.SettingChanged.RegisterEvent(SettingChanged, ref unregisterEvents);
ProfileManager.ProfilesListChanged.RegisterEvent(SettingChanged, ref unregisterEvents);
// Rebuild the droplist any time the Profiles list changes
ProfileManager.ProfilesListChanged.RegisterEvent((s, e) => Rebuild(), ref unregisterEvents);
}
public void Rebuild()

8
SetupWizard/CopyGuestProfilesToUser.cs
View file

@ -92,8 +92,8 @@ namespace MatterHackers.MatterControl
}
}
var uploadButton = textImageButtonFactory.Generate("Sync".Localize());
uploadButton.Click += (s, e) =>
var syncButton = textImageButtonFactory.Generate("Sync".Localize());
syncButton.Click += (s, e) =>
{
// do the import
foreach(var checkBox in checkBoxes)
@ -120,13 +120,13 @@ namespace MatterHackers.MatterControl
});
};
uploadButton.Visible = true;
syncButton.Visible = true;
cancelButton.Visible = true;
cancelButton.Click += (s, e) => UiThread.RunOnIdle(WizardWindow.Close);
//Add buttons to buttonContainer
footerRow.AddChild(uploadButton);
footerRow.AddChild(syncButton);
footerRow.AddChild(new HorizontalSpacer());
footerRow.AddChild(cancelButton);

18
SlicerConfiguration/SliceSettingsWidget.cs
View file

@ -741,15 +741,15 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
var button = buttonFactory.Generate("Delete Printer".Localize());
button.HAnchor = HAnchor.ParentCenter;
button.Click += (s, e) =>
{
StyledMessageBox.ShowMessageBox((doDelete) =>
{
if (doDelete)
{
ActiveSliceSettings.Instance.Helpers.SetMarkedForDelete(true);
}
}, "Are you sure you want to delete your currently selected printer?".Localize(), "Delete Printer?".Localize(), StyledMessageBox.MessageType.YES_NO, "Delete Printer".Localize());
};
{
StyledMessageBox.ShowMessageBox((doDelete) =>
{
if (doDelete)
{
ActiveSliceSettings.Instance.Helpers.SetMarkedForDelete(true);
}
}, "Are you sure you want to delete your currently selected printer?".Localize(), "Delete Printer?".Localize(), StyledMessageBox.MessageType.YES_NO, "Delete Printer".Localize());
};
dataArea.AddChild(button);
}