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

Make more touch screen settings be about touch not android.

Browse source
This commit is contained in:
Lars Brubaker 2017-01-23 14:58:29 -08:00
parent 6e00ff2d64
commit 0ffb3a5b41
9 changed files with 55 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

31
ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs
View file

@ -56,10 +56,11 @@ namespace MatterHackers.MatterControl.ConfigurationPage
{
cannotRestartWhilePrintIsActiveMessage = "Oops! You cannot restart while a print is active.".Localize();
cannotRestartWhileActive = "Unable to restart".Localize();
#if __ANDROID__
mainContainer.AddChild(new HorizontalLine(separatorLineColor));
if (UserSettings.Instance.IsTouchScreen)
{
mainContainer.AddChild(new HorizontalLine(separatorLineColor));
}
#endif
if (UserSettings.Instance.IsTouchScreen)
{
mainContainer.AddChild(GetUpdateControl());
@ -77,14 +78,15 @@ namespace MatterHackers.MatterControl.ConfigurationPage
}
#if !__ANDROID__
mainContainer.AddChild(GetThumbnailRenderingControl());
mainContainer.AddChild(new HorizontalLine(separatorLineColor));
if (!UserSettings.Instance.IsTouchScreen)
{
mainContainer.AddChild(GetThumbnailRenderingControl());
mainContainer.AddChild(new HorizontalLine(separatorLineColor));
mainContainer.AddChild(GetDisplayControl());
mainContainer.AddChild(new HorizontalLine(separatorLineColor));
#endif
mainContainer.AddChild(GetDisplayControl());
mainContainer.AddChild(new HorizontalLine(separatorLineColor));
}
if (UserSettings.Instance.IsTouchScreen)
{
mainContainer.AddChild(GetModeControl());
@ -446,11 +448,14 @@ namespace MatterHackers.MatterControl.ConfigurationPage
if (acceptableUpdateFeedTypeValues.IndexOf(currentThumbnailRenderingMode) == -1)
{
#if __ANDROID__
if (!UserSettings.Instance.IsTouchScreen)
{
UserSettings.Instance.set(UserSettingsKey.ThumbnailRenderingMode, "orthographic");
#else
}
else
{
UserSettings.Instance.set(UserSettingsKey.ThumbnailRenderingMode, "raytraced");
#endif
}
}
interfaceOptionsDropList.SelectedValue = UserSettings.Instance.get(UserSettingsKey.ThumbnailRenderingMode);