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

Merge branch 'master' of https://github.com/MatterHackers/MatterControl

Browse source
This commit is contained in:
Lars Brubaker 2016-11-29 14:18:03 -08:00
commit 7c9128c01c
9 changed files with 173 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

11
SetupWizard/EditPrinterSettingsPage.cs
View file

@ -54,7 +54,16 @@ namespace MatterHackers.MatterControl
AddNameSetting(SettingsKey.printer_name, contentRow, ref tabIndex);
AddNameSetting(SettingsKey.auto_connect, contentRow, ref tabIndex);
AddNameSetting(SettingsKey.baud_rate, contentRow, ref tabIndex);
AddNameSetting(SettingsKey.com_port, contentRow, ref tabIndex);
//Check if networked printing is on before displaying comport or ip/port
if(ActiveSliceSettings.Instance.GetValue(SettingsKey.enable_network_printing)=="1")
{
AddNameSetting(SettingsKey.ip_address, contentRow, ref tabIndex);
AddNameSetting(SettingsKey.ip_port, contentRow, ref tabIndex);
}
else
{
AddNameSetting(SettingsKey.com_port, contentRow, ref tabIndex);
}
contentRow.AddChild(new VerticalSpacer());