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

Merge pull request #4971 from larsbrubaker/master

Browse source 
Make sure we show clear_bed_gcode settings
This commit is contained in:
Lars Brubaker 2021-02-04 13:39:32 -08:00 • committed by GitHub
commit 44c7d1de50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
MatterControl.Printing/Settings/PrinterSettings.cs
View file

@ -104,6 +104,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
SettingsKey.before_toolchange_gcode_3,
SettingsKey.build_height,
SettingsKey.cancel_gcode,
SettingsKey.clear_bed_gcode,
SettingsKey.com_port,
SettingsKey.connect_gcode,
SettingsKey.create_brim,

5
MatterControl.Printing/Settings/SliceSettingsFields.cs
View file

@ -406,10 +406,11 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
SlicerConfigName = SettingsKey.clear_bed_gcode,
PresentationName = "Clear Bed G-Code".Localize(),
HelpText = "G-Code the Auto Pilot Pro Tool will run to clear the bed after a print completes. This is only useful on a printer designed to clear the bed.".Localize(),
RequiredDisplayDetail = DisplayDetailRequired.Simple,
HelpText = "G-Code used by Auto Pilot to clear the bed after a print completes. This is only useful on a printer designed to clear the bed.".Localize(),
RequiredDisplayDetail = DisplayDetailRequired.Advanced,
DataEditType = DataEditTypes.MULTI_LINE_TEXT,
DefaultValue = "",
RebuildGCodeOnChange = false,
Converter = new GCodeMapping(),
},
new SliceSettingData()

4
MatterControlLib/ApplicationView/ApplicationController.cs
View file

@ -128,7 +128,7 @@ namespace MatterHackers.MatterControl
public bool IsMatterControlPro()
{
var result = ApplicationController.Instance.UserHasPermissionToId?.Invoke("ag1zfm1oLWRmcy1wcm9kchgLEgtEaWdpdGFsSXRlbRiAgIDzyMGxCgw");
var result = ApplicationController.Instance.UserHasPro?.Invoke();
if (result != null)
{
return result.Value;
@ -373,7 +373,7 @@ namespace MatterHackers.MatterControl
public Func<IObject3D, bool> UserHasPermission { get; set; } = (item) => false;
// check permission to a purchase
public Func<string, bool> UserHasPermissionToId { get; set; }
public Func<bool> UserHasPro { get; set; }
public Func<IObject3D, ThemeConfig, (string url, GuiWidget markdownWidget)> GetUnlockData { get; set; }

2
MatterControlLib/MatterControlApplication.cs
View file

@ -38,7 +38,7 @@ namespace MatterHackers.MatterControl
static MatterControlApplication()
{
if (MatterHackers.MatterControl.AppContext.Options.McwsTestEnvironment)
if (AppContext.Options.McwsTestEnvironment)
{
MCWSBaseUri = "https://mattercontrol-test.appspot.com"; // http://192.168.2.129:9206
}

2
MatterControlLib/SetupWizard/HelpTreePanel.cs
View file

@ -38,9 +38,7 @@ using MatterHackers.Agg.Image;
using MatterHackers.Agg.UI;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.CustomWidgets;
using MatterHackers.MatterControl.PartPreviewWindow;
using MatterHackers.MatterControl.PrintLibrary;
using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl
{