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

Merge pull request #3455 from jlewin/design_tools

Browse source 
Close parent Window not self
This commit is contained in:
Lars Brubaker 2018-06-22 11:49:35 -07:00 • committed by GitHub
commit 8fe497b73b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

39
EeProm/EePromMarlinWindow.cs
View file

@ -34,8 +34,6 @@ using MatterHackers.Agg.Platform;
using MatterHackers.Agg.UI;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.PartPreviewWindow;
using MatterHackers.MatterControl.PrinterCommunication;
using MatterHackers.MatterControl.SlicerConfiguration;
namespace MatterHackers.MatterControl.EeProm
{
@ -154,26 +152,21 @@ namespace MatterHackers.MatterControl.EeProm
mainContainer.AddChild(conterContent);
// the bottom button bar
var buttonSave = theme.CreateDialogButton("Save to EEProm".Localize());
buttonSave.Click += (s, e) =>UiThread.RunOnIdle(() =>
{
var buttonSave = theme.CreateDialogButton("Save to EEProm".Localize());
buttonSave.Click += (s, e) =>
{
UiThread.RunOnIdle(() =>
{
SaveSettingsToActive();
currentEePromSettings.SaveToEeProm();
Close();
});
};
this.AddPageAction(buttonSave);
SaveSettingsToActive();
currentEePromSettings.SaveToEeProm();
this.DialogWindow.Close();
});
this.AddPageAction(buttonSave);
var exportButton = theme.CreateDialogButton("Export".Localize());
exportButton.Click += (s, e) =>
{
UiThread.RunOnIdle(this.ExportSettings, .1);
};
this.AddPageAction(exportButton);
}
var exportButton = theme.CreateDialogButton("Export".Localize());
exportButton.Click += (s, e) =>
{
UiThread.RunOnIdle(this.ExportSettings, .1);
};
this.AddPageAction(exportButton);
printer.Connection.CommunicationUnconditionalFromPrinter.RegisterEvent(currentEePromSettings.Add, ref unregisterEvents);
@ -234,18 +227,16 @@ namespace MatterHackers.MatterControl.EeProm
private void ExportSettings()
{
string defaultFileName = $"eeprom_settings_{base.GetSanitizedPrinterName()}.ini";
AggContext.FileDialogs.SaveFileDialog(
new SaveFileDialogParams("EEPROM Settings|*.ini")
{
ActionButtonLabel = "Export EEPROM Settings".Localize(),
Title = "Export EEPROM".Localize(),
FileName = defaultFileName
FileName = $"eeprom_settings_{base.GetSanitizedPrinterName()}.ini"
},
(saveParams) =>
{
if (!string.IsNullOrEmpty(saveParams.FileName)
&& saveParams.FileName != defaultFileName)
if (!string.IsNullOrEmpty(saveParams.FileName))
{
currentEePromSettings.Export(saveParams.FileName);
}