diff --git a/MatterControlLib/CustomWidgets/HelpArticleHeader.cs b/MatterControlLib/CustomWidgets/HelpArticleHeader.cs index e553d92fd..2b2684e0f 100644 --- a/MatterControlLib/CustomWidgets/HelpArticleHeader.cs +++ b/MatterControlLib/CustomWidgets/HelpArticleHeader.cs @@ -53,7 +53,7 @@ namespace MatterHackers.MatterControl.CustomWidgets VAnchor = VAnchor.Center, AutoExpandBoundsToText = true, EllipsisIfClipped = true, - Margin = new BorderDouble(left: 5) + Margin = new BorderDouble(left: 3) }; this.AddChild(titleText); diff --git a/MatterControlLib/Library/Widgets/StorePage/UpgradeToProTabPage.cs b/MatterControlLib/Library/Widgets/StorePage/UpgradeToProTabPage.cs index c778c80e9..b3ecfea2f 100644 --- a/MatterControlLib/Library/Widgets/StorePage/UpgradeToProTabPage.cs +++ b/MatterControlLib/Library/Widgets/StorePage/UpgradeToProTabPage.cs @@ -32,12 +32,16 @@ using MatterHackers.Agg; using MatterHackers.Agg.UI; using MatterHackers.MatterControl.SettingsManagement; using MatterHackers.VectorMath; +using System; +using System.Net.Http; namespace MatterHackers.MatterControl.PartPreviewWindow.PlusTab { public class UpgradeToProTabPage : GuiWidget { + private MarkdownWidget markdownWidget; + public UpgradeToProTabPage(ThemeConfig theme) { this.Padding = new BorderDouble(3); @@ -48,14 +52,27 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.PlusTab this.Name = "UpgradeTab"; - var markdownWidget = new MarkdownWidget(theme) + markdownWidget = new MarkdownWidget(theme) { Padding = new BorderDouble(left: theme.DefaultContainerPadding / 2) }; markdownWidget.Markdown = "# Upgrade to [MatterControl Pro](https://www.matterhackers.com/admin/product-preview/ag1zfm1oLXBscy1wcm9kchsLEg5Qcm9kdWN0TGlzdGluZxiAgIC_65WICww)"; + CheckForUpdate(); + this.AddChild(markdownWidget); } + + private async void CheckForUpdate() + { + var httpClient = new HttpClient(); + var response = await httpClient.GetStringAsync("https://matterhackers.github.io/MatterControl-Docs/ProContent/Upgrade_To_Pro.md"); + + if (!string.IsNullOrEmpty(response)) + { + markdownWidget.Markdown = response; + } + } } } diff --git a/MatterControlLib/Utilities/MarkdigAgg/HeadingRowX.cs b/MatterControlLib/Utilities/MarkdigAgg/HeadingRowX.cs index dbb9b1a66..a26d728d0 100644 --- a/MatterControlLib/Utilities/MarkdigAgg/HeadingRowX.cs +++ b/MatterControlLib/Utilities/MarkdigAgg/HeadingRowX.cs @@ -15,7 +15,8 @@ namespace Markdig.Renderers.Agg { this.VAnchor = VAnchor.Fit; this.HAnchor = HAnchor.Stretch; - this.Margin = new BorderDouble(0, 4, 0, 12); + this.Margin = new BorderDouble(3, 4, 0, 12); + this.RowPadding = new BorderDouble(0, 3); } public override void AddChild(GuiWidget childToAdd, int indexInChildrenList = -1)