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

Migrate EEProm windows to DialogPage

Browse source 
- Issue MatterHackers/MCCentral#3639
Use DialogPage for consistent styling and behavior
This commit is contained in:
John Lewin 2018-06-17 16:34:38 -07:00
parent 4860621108
commit 1b12d7ff41
3 changed files with 45 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

52
EeProm/EePromRepetierWindow.cs
View file

@ -1,5 +1,5 @@
/*
Copyright (c) 2014, Lars Brubaker
Copyright (c) 2018, Lars Brubaker, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without
@ -38,33 +38,34 @@ using MatterHackers.MatterControl.PrinterCommunication;
namespace MatterHackers.MatterControl.EeProm
{
public class CloseOnDisconnectWindow : SystemWindow
public class EEPromPage : DialogPage
{
private EventHandler unregisterEvents;
public CloseOnDisconnectWindow(PrinterConnection printerConnection, double width, double height)
: base(width, height)
public EEPromPage(PrinterConnection printerConnection)
{
this.WindowSize = new VectorMath.Vector2(650, 480);
headerRow.Visible = false;
// Close window if printer is disconnected
printerConnection.CommunicationStateChanged.RegisterEvent((s, e) =>
{
if(!printerConnection.IsConnected)
{
this.CloseOnIdle();
this.WizardWindow.CloseOnIdle();
}
}, ref unregisterEvents);
}
public override void OnClosed(ClosedEventArgs e)
{
if (unregisterEvents != null)
{
unregisterEvents(this, null);
}
unregisterEvents?.Invoke(this, null);
base.OnClosed(e);
}
}
public class EePromRepetierWindow : CloseOnDisconnectWindow
public class RepetierEEPromPage : EEPromPage
{
protected TextImageButtonFactory textImageButtonFactory = new TextImageButtonFactory();
@ -73,12 +74,14 @@ namespace MatterHackers.MatterControl.EeProm
private EventHandler unregisterEvents;
public EePromRepetierWindow(PrinterConnection printerConnection)
: base(printerConnection, 650 * GuiWidget.DeviceScale, 480 * GuiWidget.DeviceScale)
public RepetierEEPromPage(PrinterConnection printerConnection)
: base(printerConnection)
{
AlwaysOnTopOfMain = true;
BackgroundColor = ActiveTheme.Instance.SecondaryBackgroundColor;
this.WindowTitle = "Firmware EEPROM Settings".Localize();
currentEePromSettings = new EePromRepetierStorage();
FlowLayoutWidget topToBottom = new FlowLayoutWidget(FlowDirection.TopToBottom);
@ -159,7 +162,7 @@ namespace MatterHackers.MatterControl.EeProm
{
currentEePromSettings.Import(openParams.FileName);
RebuildUi();
}
}
});
});
};
@ -179,15 +182,15 @@ namespace MatterHackers.MatterControl.EeProm
{
ActionButtonLabel = "Export EEPROM Settings".Localize(),
Title = "Export EEPROM".Localize(),
FileName = "eeprom_settings.ini"
FileName = "eeprom_settings.ini"
},
(saveParams) =>
(saveParams) =>
{
if (!string.IsNullOrEmpty(saveParams.FileName))
{
if (!string.IsNullOrEmpty(saveParams.FileName))
{
currentEePromSettings.Export(saveParams.FileName);
}
});
currentEePromSettings.Export(saveParams.FileName);
}
});
});
};
buttonBar.AddChild(buttonExport);
@ -213,10 +216,6 @@ namespace MatterHackers.MatterControl.EeProm
this.AddChild(topToBottom);
Title = "Firmware EEPROM Settings".Localize();
ShowAsSystemWindow();
currentEePromSettings.Clear();
printerConnection.CommunicationUnconditionalFromPrinter.RegisterEvent(currentEePromSettings.Add, ref unregisterEvents);
currentEePromSettings.eventAdded += NewSettingReadFromPrinter;
@ -250,10 +249,7 @@ namespace MatterHackers.MatterControl.EeProm
public override void OnClosed(ClosedEventArgs e)
{
if (unregisterEvents != null)
{
unregisterEvents(this, null);
}
unregisterEvents?.Invoke(this, null);
base.OnClosed(e);
}