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

Merge pull request #1349 from larsbrubaker/master

Browse source 
Make sure we show the no settings page window printer is selected on …
This commit is contained in:
Lars Brubaker 2016-09-02 14:59:43 -07:00 • committed by GitHub
commit 44c8e0c034
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ApplicationView/TouchscreenTabView.cs
View file

@ -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,

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 769f62ca0128288f42e486cce0fab470637673d0
Subproject commit f1d11a4b7b54ec6de7339ec5e39dbbe3dd362ae5