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

Remove conditional Markdig on Android, use Markdig NuGet

Browse source
This commit is contained in:
John Lewin 2018-11-03 20:44:18 -07:00
parent 90692ff521
commit 2f1724ce89
5 changed files with 1 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

10
MatterControlLib/ConfigurationPage/PrintLeveling/LoadFilamentWizard.cs
View file

@ -30,15 +30,12 @@ either expressed or implied, of the FreeBSD Project.
using System;
using System.Collections.Generic;
using System.Diagnostics;
#if !__ANDROID__
using Markdig.Agg;
#endif
using MatterHackers.Agg;
using MatterHackers.Agg.UI;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.PrinterCommunication;
using MatterHackers.MatterControl.SlicerConfiguration;
using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{
@ -101,12 +98,10 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
// start heating up the extruder
printer.Connection.SetTargetHotendTemperature(0, printer.Settings.GetValue<double>(SettingsKey.temperature));
#if !__ANDROID__
var markdownText = printer.Settings.GetValue(SettingsKey.trim_filament_markdown);
var markdownWidget = new MarkdownWidget(theme);
markdownWidget.Markdown = markdownText = markdownText.Replace("\\n", "\n");
trimFilamentPage.ContentRow.AddChild(markdownWidget);
#endif
}
};
yield return trimFilamentPage;
@ -123,12 +118,10 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{
BecomingActive = () =>
{
#if !__ANDROID__
var markdownText = printer.Settings.GetValue(SettingsKey.insert_filament_markdown);
var markdownWidget = new MarkdownWidget(theme);
markdownWidget.Markdown = markdownText = markdownText.Replace("\\n", "\n");
insertFilamentPage.ContentRow.AddChild(markdownWidget);
#endif
// turn off the fan
printer.Connection.FanSpeed0To255 = 0;
@ -284,12 +277,11 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
BecomingActive = () =>
{
runningCleanPage.ShowWizardFinished();
#if !__ANDROID__
var markdownText = printer.Settings.GetValue(SettingsKey.running_clean_markdown);
var markdownWidget = new MarkdownWidget(theme);
markdownWidget.Markdown = markdownText = markdownText.Replace("\\n", "\n");
runningCleanPage.ContentRow.AddChild(markdownWidget);
#endif
var runningTime = Stopwatch.StartNew();
runningGCodeCommands = UiThread.SetInterval(() =>

4
MatterControlLib/ConfigurationPage/RunningMacroPage.cs
View file

@ -28,9 +28,7 @@ either expressed or implied, of the FreeBSD Project.
*/
using System;
#if !__ANDROID__
using Markdig.Agg;
#endif
using MatterHackers.Agg;
using MatterHackers.Agg.Image;
using MatterHackers.Agg.UI;
@ -81,7 +79,6 @@ namespace MatterHackers.MatterControl.PrinterControls
this.AddPageAction(okButton);
}
#if !__ANDROID__
if (!string.IsNullOrEmpty(macroData.markdown))
{
var markdown = new MarkdownWidget(theme);
@ -90,7 +87,6 @@ namespace MatterHackers.MatterControl.PrinterControls
contentRow.AddChild(markdown);
}
#endif
var holder = new FlowLayoutWidget();
progressBar = new ProgressBar((int)(150 * GuiWidget.DeviceScale), (int)(15 * GuiWidget.DeviceScale))

4
MatterControlLib/Library/Widgets/HardwarePage/PrinterDetails.cs
View file

@ -28,9 +28,7 @@ either expressed or implied, of the FreeBSD Project.
*/
#if !__ANDROID__
using Markdig.Agg;
#endif
using MatterHackers.Agg;
using MatterHackers.Agg.Image;
using MatterHackers.Agg.UI;
@ -125,7 +123,6 @@ namespace MatterHackers.MatterControl.Library.Widgets.HardwarePage
Padding = theme.DefaultContainerPadding
};
#if !__ANDROID__
var description = new MarkdownWidget(theme)
{
MinimumSize = new VectorMath.Vector2(350, 0),
@ -134,7 +131,6 @@ namespace MatterHackers.MatterControl.Library.Widgets.HardwarePage
Markdown = product.ProductDescription.Trim()
};
descriptionBackground.AddChild(description);
#endif
descriptionBackground.BeforeDraw += (s, e) =>
{
var rect = new RoundedRect(descriptionBackground.LocalBounds, 3);

7
MatterControlLib/Library/Widgets/PrintLibraryWidget.cs
View file

@ -31,11 +31,6 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
#if !__ANDROID__
using Markdig.Agg;
#endif
using MatterHackers.Agg;
using MatterHackers.Agg.Platform;
@ -44,9 +39,7 @@ using MatterHackers.Localizations;
using MatterHackers.MatterControl.CustomWidgets;
using MatterHackers.MatterControl.Library;
using MatterHackers.MatterControl.PartPreviewWindow;
using MatterHackers.MatterControl.PrinterCommunication;
using MatterHackers.MatterControl.PrintQueue;
using Newtonsoft.Json;
namespace MatterHackers.MatterControl.PrintLibrary
{

4
MatterControlLib/SetupWizard/HelpPage.cs
View file

@ -30,9 +30,7 @@ either expressed or implied, of the FreeBSD Project.
using System;
using System.Collections.Generic;
using System.Linq;
#if !__ANDROID__
using Markdig.Agg;
#endif
using MatterHackers.Agg;
using MatterHackers.Agg.Image;
using MatterHackers.Agg.UI;
@ -220,7 +218,6 @@ namespace MatterHackers.MatterControl
private void AddGuides(FlowLayoutWidget guideContainer)
{
#if !__ANDROID__
var sequence = new ImageSequence()
{
FramesPerSecond = 3,
@ -313,7 +310,6 @@ namespace MatterHackers.MatterControl
splitter.Panel1.AddChild(treeView);
splitter.Panel2.AddChild(markdownWidget);
guideContainer.AddChild(splitter);
#endif
}
private TreeNode initialSelection = null;