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

Make the terminal do the right filtering when opening.

Browse source 
Make the open save state more robust.
This commit is contained in:
Lars Brubaker 2014-12-17 16:04:21 -08:00
parent 38208ae948
commit 2b69fdd0c7
2 changed files with 19 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

12
PrinterControls/TerminalWindow/TerminalWidget.cs
View file

@ -74,7 +74,6 @@ namespace MatterHackers.MatterControl
filterOutput = new CheckBox(filterOutputChkTxt);
filterOutput.Margin = new BorderDouble(5, 5, 5, 2);
filterOutput.Checked = UserSettings.Instance.Fields.GetValue(TerminalFilterOutputKey, false);
filterOutput.TextColor = this.textColor;
filterOutput.CheckedStateChanged += (object sender, EventArgs e) =>
{
@ -205,6 +204,17 @@ namespace MatterHackers.MatterControl
FileDialog.SaveFileDialog(saveParams, onExportLogFileSelected);
}
bool firstDraw = true;
public override void OnDraw(Graphics2D graphics2D)
{
if (firstDraw)
{
filterOutput.Checked = UserSettings.Instance.Fields.GetValue(TerminalFilterOutputKey, false);
firstDraw = false;
}
base.OnDraw(graphics2D);
}
void onExportLogFileSelected(SaveFileDialogParams saveParams)
{
if (saveParams.FileName != null)

32
PrinterControls/TerminalWindow/TerminalWindow.cs
View file

@ -42,10 +42,12 @@ namespace MatterHackers.MatterControl
static readonly string TerminalWindowSizeKey = "TerminalWindowSize";
static readonly string TerminalWindowPositionKey = "TerminalWindowPosition";
static TerminalWindow connectionWindow = null;
static bool terminalWasOpenOnAppClose = false;
public static void Show()
{
if (connectionWindow == null)
{
terminalWasOpenOnAppClose = false;
string windowSize = UserSettings.Instance.get(TerminalWindowSizeKey);
int width = 400;
int height = 300;
@ -83,6 +85,7 @@ namespace MatterHackers.MatterControl
{
if (connectionWindow != null)
{
terminalWasOpenOnAppClose = true;
connectionWindow.Close();
}
}
@ -109,37 +112,18 @@ namespace MatterHackers.MatterControl
}
}
void DelaySaveClosed(object state)
{
UserSettings.Instance.Fields.SetValue(TerminalWindowLeftOpen, false);
}
bool haveDoneSave = false;
void SaveOnClosing()
{
if (!haveDoneSave)
{
// save the last size of the window so we can restore it next time.
UserSettings.Instance.set(TerminalWindowSizeKey, string.Format("{0},{1}", Width, Height));
UserSettings.Instance.set(TerminalWindowPositionKey, string.Format("{0},{1}", DesktopPosition.x, DesktopPosition.y));
// make a delay so we only save this if it is closed by the user not by the app.
UiThread.RunOnIdle(DelaySaveClosed, 2);
haveDoneSave = true;
}
// save the last size of the window so we can restore it next time.
UserSettings.Instance.set(TerminalWindowSizeKey, string.Format("{0},{1}", Width, Height));
UserSettings.Instance.set(TerminalWindowPositionKey, string.Format("{0},{1}", DesktopPosition.x, DesktopPosition.y));
}
public override void OnClosing(out bool cancelClose)
{
cancelClose = false;
SaveOnClosing();
base.OnClosing(out cancelClose);
}
public override void OnClosed(EventArgs e)
{
SaveOnClosing();
UserSettings.Instance.Fields.SetValue(TerminalWindowLeftOpen, terminalWasOpenOnAppClose);
base.OnClosed(e);
}
}