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

Convert ApplicationSettingsWidget to FlowLayoutWidget

Browse source
This commit is contained in:
John Lewin 2017-06-15 22:52:27 -07:00
parent 23c8993396
commit 887cfb424a
1 changed files with 22 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

48
ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs
View file

@ -1,5 +1,5 @@
/*
Copyright (c) 2014, Kevin Pope
Copyright (c) 2017, Kevin Pope, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without
@ -41,56 +41,56 @@ using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl.ConfigurationPage
{
public class ApplicationSettingsWidget : SettingsViewBase
public class ApplicationSettingsWidget : FlowLayoutWidget
{
private string cannotRestartWhilePrintIsActiveMessage = "Oops! You cannot restart while a print is active.".Localize();
private string cannotRestartWhileActive = "Unable to restart".Localize();
private TextImageButtonFactory buttonFactory;
public ApplicationSettingsWidget(TextImageButtonFactory buttonFactory)
: base("Application".Localize(), buttonFactory)
: base(FlowDirection.TopToBottom)
{
this.buttonFactory = buttonFactory;
this.HAnchor = HAnchor.ParentLeftRight;
this.VAnchor = VAnchor.FitToChildren;
this.Padding = 15;
if (UserSettings.Instance.IsTouchScreen)
{
mainContainer.AddChild(new HorizontalLine(50));
this.AddChild(new HorizontalLine(50));
}
if (UserSettings.Instance.IsTouchScreen)
{
mainContainer.AddChild(GetUpdateControl());
mainContainer.AddChild(new HorizontalLine(50));
this.AddChild(GetUpdateControl());
this.AddChild(new HorizontalLine(50));
}
mainContainer.AddChild(new HorizontalLine(50));
this.AddChild(new HorizontalLine(50));
mainContainer.AddChild(GetLanguageControl());
mainContainer.AddChild(new HorizontalLine(50));
this.AddChild(GetLanguageControl());
this.AddChild(new HorizontalLine(50));
#if !__ANDROID__
{
mainContainer.AddChild(GetThumbnailRenderingControl());
mainContainer.AddChild(new HorizontalLine(50));
this.AddChild(GetThumbnailRenderingControl());
this.AddChild(new HorizontalLine(50));
mainContainer.AddChild(GetDisplayControl());
mainContainer.AddChild(new HorizontalLine(50));
this.AddChild(GetDisplayControl());
this.AddChild(new HorizontalLine(50));
mainContainer.AddChild(GetTextSizeControl());
mainContainer.AddChild(new HorizontalLine(50));
this.AddChild(GetTextSizeControl());
this.AddChild(new HorizontalLine(50));
}
#endif
if (UserSettings.Instance.IsTouchScreen)
{
mainContainer.AddChild(GetModeControl());
mainContainer.AddChild(new HorizontalLine(50));
this.AddChild(GetModeControl());
this.AddChild(new HorizontalLine(50));
}
mainContainer.AddChild(GetThemeControl());
AddChild(mainContainer);
AddHandlers();
this.AddChild(GetThemeControl());
}
@ -481,10 +481,6 @@ namespace MatterHackers.MatterControl.ConfigurationPage
private string rebuildThumbnailsMessage = "You are switching to a different thumbnail rendering mode. If you want, your current thumbnails can be removed and recreated in the new style. You can switch back and forth at any time. There will be some processing overhead while the new thumbnails are created.\n\nDo you want to rebuild your existing thumbnails now?".Localize();
private string rebuildThumbnailsTitle = "Rebuild Thumbnails Now".Localize();
private void AddHandlers()
{
}
private void RestartApplication()
{
UiThread.RunOnIdle(() =>