From 411a3bb32eb9a3c092b12b97a5094df71d5ea455 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Fri, 2 Sep 2016 14:30:23 -0700 Subject: [PATCH] Make sure we show the no settings page window printer is selected on touchscreen. --- ApplicationView/TouchscreenTabView.cs | 11 +++++++++-- Submodules/agg-sharp | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ApplicationView/TouchscreenTabView.cs b/ApplicationView/TouchscreenTabView.cs index 3c8595d46..e120a356a 100644 --- a/ApplicationView/TouchscreenTabView.cs +++ b/ApplicationView/TouchscreenTabView.cs @@ -64,7 +64,7 @@ namespace MatterHackers.MatterControl private QueueDataView queueDataView; private TabPage QueueTabPage; private bool simpleMode; - private SliceSettingsWidget sliceSettingsWidget; + private GuiWidget sliceSettingsWidget; private TabPage sliceTabPage; private int TabTextSize; private TabPage TerminalTabPage; @@ -106,7 +106,14 @@ namespace MatterHackers.MatterControl ActiveTheme.Instance.SecondaryAccentColor, new RGBA_Bytes(), unselectedTextColor, new RGBA_Bytes())); string sliceSettingsLabel = LocalizedString.Get("Settings").ToUpper(); - sliceSettingsWidget = new SliceSettingsWidget(); + if (ActiveSliceSettings.Instance.PrinterSelected) + { + sliceSettingsWidget = new SliceSettingsWidget(); + } + else + { + sliceSettingsWidget = new NoSettingsWidget(); + } sliceTabPage = new TabPage(sliceSettingsWidget, sliceSettingsLabel); this.AddTab(new SimpleTextTabWidget(sliceTabPage, "Slice Settings Tab", TabTextSize, diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 769f62ca0..f1d11a4b7 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 769f62ca0128288f42e486cce0fab470637673d0 +Subproject commit f1d11a4b7b54ec6de7339ec5e39dbbe3dd362ae5