Consolidate ButtonFactory - CheckForUpdateWindow
This commit is contained in:
John Lewin
parent
10f9b522f2
commit
322aac1bad
2 changed files with 162 additions and 207 deletions
|
|
@ -1,62 +1,40 @@
|
|||
using System;
|
||||
using System.Diagnostics;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using MatterHackers.Agg;
|
||||
using MatterHackers.Agg.Font;
|
||||
using MatterHackers.Agg.Image;
|
||||
using MatterHackers.Agg.PlatformAbstract;
|
||||
using MatterHackers.Agg.UI;
|
||||
using MatterHackers.Localizations;
|
||||
using MatterHackers.MatterControl.ContactForm;
|
||||
using MatterHackers.MatterControl.CustomWidgets;
|
||||
using MatterHackers.MatterControl.ConfigurationPage;
|
||||
using MatterHackers.MatterControl.HtmlParsing;
|
||||
using MatterHackers.MatterControl.PrintLibrary;
|
||||
using MatterHackers.MatterControl.PrintQueue;
|
||||
using System.IO;
|
||||
using System.Net;
|
||||
|
||||
|
||||
namespace MatterHackers.MatterControl.AboutPage
|
||||
{
|
||||
|
||||
public class CheckForUpdateWindow : SystemWindow
|
||||
{
|
||||
|
||||
private static CheckForUpdateWindow checkUpdate = null;
|
||||
TextImageButtonFactory textImageButtonFactory = new TextImageButtonFactory();
|
||||
LinkButtonFactory linkButtonFactory = new LinkButtonFactory();
|
||||
DropDownList releaseOptionsDropList;
|
||||
TextWidget stableInfoLabel;
|
||||
TextWidget alphaInfoLabel;
|
||||
TextWidget betaInfoLabel;
|
||||
TextWidget updateChannelLabel;
|
||||
public class CheckForUpdateWindow : SystemWindow
|
||||
{
|
||||
private static CheckForUpdateWindow checkUpdate = null;
|
||||
DropDownList releaseOptionsDropList;
|
||||
TextWidget stableInfoLabel;
|
||||
TextWidget alphaInfoLabel;
|
||||
TextWidget betaInfoLabel;
|
||||
TextWidget updateChannelLabel;
|
||||
TextWidget currentBuildInfo;
|
||||
|
||||
public CheckForUpdateWindow()
|
||||
: base (540, 350)
|
||||
{
|
||||
linkButtonFactory.fontSize = 10;
|
||||
linkButtonFactory.textColor = ActiveTheme.Instance.SecondaryAccentColor;
|
||||
public CheckForUpdateWindow(ThemeConfig theme)
|
||||
: base(540, 350)
|
||||
{
|
||||
FlowLayoutWidget topToBottom = new FlowLayoutWidget(FlowDirection.TopToBottom);
|
||||
topToBottom.AnchorAll();
|
||||
topToBottom.BackgroundColor = ActiveTheme.Instance.SecondaryBackgroundColor;
|
||||
Padding = new BorderDouble(left: 5, right: 5);
|
||||
|
||||
FlowLayoutWidget topToBottom = new FlowLayoutWidget(FlowDirection.TopToBottom);
|
||||
topToBottom.AnchorAll();
|
||||
topToBottom.BackgroundColor = ActiveTheme.Instance.SecondaryBackgroundColor;
|
||||
Padding = new BorderDouble(left: 5, right: 5);
|
||||
FlowLayoutWidget mainLabelContainer = new FlowLayoutWidget(FlowDirection.LeftToRight);
|
||||
mainLabelContainer.BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
|
||||
mainLabelContainer.VAnchor = VAnchor.FitToChildren;
|
||||
mainLabelContainer.HAnchor = HAnchor.ParentLeftRight;
|
||||
|
||||
FlowLayoutWidget mainLabelContainer = new FlowLayoutWidget(FlowDirection.LeftToRight);
|
||||
mainLabelContainer.BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
|
||||
mainLabelContainer.VAnchor = VAnchor.FitToChildren;
|
||||
mainLabelContainer.HAnchor = HAnchor.ParentLeftRight;
|
||||
|
||||
FlowLayoutWidget currentFeedAndDropDownContainer = new FlowLayoutWidget(FlowDirection.LeftToRight);
|
||||
currentFeedAndDropDownContainer.VAnchor = VAnchor.FitToChildren;
|
||||
currentFeedAndDropDownContainer.HAnchor = HAnchor.ParentLeftRight;
|
||||
currentFeedAndDropDownContainer.Margin = new BorderDouble(0,5,0,0);
|
||||
currentFeedAndDropDownContainer.BackgroundColor = ActiveTheme.Instance.SecondaryBackgroundColor;
|
||||
FlowLayoutWidget currentFeedAndDropDownContainer = new FlowLayoutWidget(FlowDirection.LeftToRight);
|
||||
currentFeedAndDropDownContainer.VAnchor = VAnchor.FitToChildren;
|
||||
currentFeedAndDropDownContainer.HAnchor = HAnchor.ParentLeftRight;
|
||||
currentFeedAndDropDownContainer.Margin = new BorderDouble(0, 5, 0, 0);
|
||||
currentFeedAndDropDownContainer.BackgroundColor = ActiveTheme.Instance.SecondaryBackgroundColor;
|
||||
|
||||
TextWidget checkUpdateLabel = new TextWidget("Check for Update".Localize(), pointSize: 20);
|
||||
if (UpdateControlData.Instance.UpdateRequired)
|
||||
|
|
@ -65,128 +43,124 @@ namespace MatterHackers.MatterControl.AboutPage
|
|||
}
|
||||
|
||||
checkUpdateLabel.TextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
checkUpdateLabel.Margin = new BorderDouble(2, 10, 10, 5);
|
||||
|
||||
UpdateControlView updateStatusWidget = new UpdateControlView();
|
||||
|
||||
String fullCurrentFeedLabel = "Update Channel".Localize();
|
||||
TextWidget feedLabel = new TextWidget(fullCurrentFeedLabel, pointSize: 12);
|
||||
feedLabel.TextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
feedLabel.VAnchor = VAnchor.ParentCenter;
|
||||
feedLabel.Margin = new BorderDouble(left: 5);
|
||||
checkUpdateLabel.Margin = new BorderDouble(2, 10, 10, 5);
|
||||
|
||||
releaseOptionsDropList = new DropDownList("Development", maxHeight: 200);
|
||||
releaseOptionsDropList.HAnchor = HAnchor.ParentLeftRight;
|
||||
UpdateControlView updateStatusWidget = new UpdateControlView();
|
||||
|
||||
MenuItem releaseOptionsDropDownItem = releaseOptionsDropList.AddItem("Stable".Localize(), "release");
|
||||
TextWidget feedLabel = new TextWidget("Update Channel".Localize(), pointSize: 12);
|
||||
feedLabel.TextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
feedLabel.VAnchor = VAnchor.ParentCenter;
|
||||
feedLabel.Margin = new BorderDouble(left: 5);
|
||||
|
||||
releaseOptionsDropList = new DropDownList("Development", maxHeight: 200);
|
||||
releaseOptionsDropList.HAnchor = HAnchor.ParentLeftRight;
|
||||
|
||||
MenuItem releaseOptionsDropDownItem = releaseOptionsDropList.AddItem("Stable".Localize(), "release");
|
||||
releaseOptionsDropDownItem.Selected += new EventHandler(FixTabDot);
|
||||
|
||||
MenuItem preReleaseDropDownItem = releaseOptionsDropList.AddItem("Beta".Localize(), "pre-release");
|
||||
MenuItem preReleaseDropDownItem = releaseOptionsDropList.AddItem("Beta".Localize(), "pre-release");
|
||||
preReleaseDropDownItem.Selected += new EventHandler(FixTabDot);
|
||||
|
||||
MenuItem developmentDropDownItem = releaseOptionsDropList.AddItem("Alpha".Localize(), "development");
|
||||
MenuItem developmentDropDownItem = releaseOptionsDropList.AddItem("Alpha".Localize(), "development");
|
||||
developmentDropDownItem.Selected += new EventHandler(FixTabDot);
|
||||
|
||||
List<string> acceptableUpdateFeedTypeValues = new List<string>() { "release", "pre-release", "development" };
|
||||
string currentUpdateFeedType = UserSettings.Instance.get(UserSettingsKey.UpdateFeedType);
|
||||
List<string> acceptableUpdateFeedTypeValues = new List<string>() { "release", "pre-release", "development" };
|
||||
string currentUpdateFeedType = UserSettings.Instance.get(UserSettingsKey.UpdateFeedType);
|
||||
|
||||
if (acceptableUpdateFeedTypeValues.IndexOf(currentUpdateFeedType) == -1)
|
||||
{
|
||||
UserSettings.Instance.set(UserSettingsKey.UpdateFeedType, "release");
|
||||
}
|
||||
if (acceptableUpdateFeedTypeValues.IndexOf(currentUpdateFeedType) == -1)
|
||||
{
|
||||
UserSettings.Instance.set(UserSettingsKey.UpdateFeedType, "release");
|
||||
}
|
||||
|
||||
releaseOptionsDropList.SelectedValue = UserSettings.Instance.get(UserSettingsKey.UpdateFeedType);
|
||||
releaseOptionsDropList.SelectionChanged += new EventHandler(ReleaseOptionsDropList_SelectionChanged);
|
||||
releaseOptionsDropList.SelectedValue = UserSettings.Instance.get(UserSettingsKey.UpdateFeedType);
|
||||
releaseOptionsDropList.SelectionChanged += new EventHandler(ReleaseOptionsDropList_SelectionChanged);
|
||||
|
||||
string currentBuildNo = VersionInfo.Instance.BuildVersion;
|
||||
string currentBuildInfoLabel = String.Format("Current Build : {0}", currentBuildNo);
|
||||
currentBuildInfo = new TextWidget(currentBuildInfoLabel.Localize());
|
||||
currentBuildInfo.HAnchor = HAnchor.ParentLeftRight;
|
||||
currentBuildInfo.Margin = new BorderDouble(left: 5,bottom: 15, top: 20);
|
||||
currentBuildInfo.Margin = new BorderDouble(left: 5, bottom: 15, top: 20);
|
||||
currentBuildInfo.TextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
|
||||
|
||||
FlowLayoutWidget additionalInfoContainer = new FlowLayoutWidget(FlowDirection.TopToBottom);
|
||||
additionalInfoContainer.BackgroundColor = ActiveTheme.Instance.SecondaryBackgroundColor;
|
||||
additionalInfoContainer.HAnchor = HAnchor.ParentLeftRight;
|
||||
additionalInfoContainer.Padding = new BorderDouble(left: 6, top: 6);
|
||||
FlowLayoutWidget additionalInfoContainer = new FlowLayoutWidget(FlowDirection.TopToBottom);
|
||||
additionalInfoContainer.BackgroundColor = ActiveTheme.Instance.SecondaryBackgroundColor;
|
||||
additionalInfoContainer.HAnchor = HAnchor.ParentLeftRight;
|
||||
additionalInfoContainer.Padding = new BorderDouble(left: 6, top: 6);
|
||||
|
||||
string aboutUpdateChannel = "Changing your update channel will change the version of MatterControl \nthat you receive when updating:";
|
||||
updateChannelLabel = new TextWidget(aboutUpdateChannel);
|
||||
updateChannelLabel.TextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
updateChannelLabel.HAnchor = HAnchor.ParentLeftRight;
|
||||
updateChannelLabel.Margin = new BorderDouble(bottom: 20);
|
||||
additionalInfoContainer.AddChild(updateChannelLabel);
|
||||
|
||||
|
||||
string stableFeedInfoText = "Stable: The current release version of MatterControl (recommended).".Localize();
|
||||
stableInfoLabel = new TextWidget(stableFeedInfoText);
|
||||
stableInfoLabel.TextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
stableInfoLabel.HAnchor = HAnchor.ParentLeftRight;
|
||||
stableInfoLabel.Margin = new BorderDouble(bottom:10);
|
||||
additionalInfoContainer.AddChild(stableInfoLabel);
|
||||
string aboutUpdateChannel = "Changing your update channel will change the version of MatterControl \nthat you receive when updating:";
|
||||
updateChannelLabel = new TextWidget(aboutUpdateChannel);
|
||||
updateChannelLabel.TextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
updateChannelLabel.HAnchor = HAnchor.ParentLeftRight;
|
||||
updateChannelLabel.Margin = new BorderDouble(bottom: 20);
|
||||
additionalInfoContainer.AddChild(updateChannelLabel);
|
||||
|
||||
string betaFeedInfoText = "Beta: The release candidate version of MatterControl.".Localize();
|
||||
betaInfoLabel = new TextWidget(betaFeedInfoText);
|
||||
betaInfoLabel.TextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
betaInfoLabel.HAnchor = HAnchor.ParentLeftRight;
|
||||
betaInfoLabel.Margin = new BorderDouble(bottom: 10);
|
||||
additionalInfoContainer.AddChild(betaInfoLabel);
|
||||
string stableFeedInfoText = "Stable: The current release version of MatterControl (recommended).".Localize();
|
||||
stableInfoLabel = new TextWidget(stableFeedInfoText);
|
||||
stableInfoLabel.TextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
stableInfoLabel.HAnchor = HAnchor.ParentLeftRight;
|
||||
stableInfoLabel.Margin = new BorderDouble(bottom: 10);
|
||||
additionalInfoContainer.AddChild(stableInfoLabel);
|
||||
|
||||
string alphaFeedInfoText = "Alpha: The in development version of MatterControl.".Localize();
|
||||
alphaInfoLabel = new TextWidget(alphaFeedInfoText);
|
||||
alphaInfoLabel.TextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
alphaInfoLabel.HAnchor = HAnchor.ParentLeftRight;
|
||||
alphaInfoLabel.Margin = new BorderDouble(bottom: 10);
|
||||
additionalInfoContainer.AddChild(alphaInfoLabel);
|
||||
string betaFeedInfoText = "Beta: The release candidate version of MatterControl.".Localize();
|
||||
betaInfoLabel = new TextWidget(betaFeedInfoText);
|
||||
betaInfoLabel.TextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
betaInfoLabel.HAnchor = HAnchor.ParentLeftRight;
|
||||
betaInfoLabel.Margin = new BorderDouble(bottom: 10);
|
||||
additionalInfoContainer.AddChild(betaInfoLabel);
|
||||
|
||||
FlowLayoutWidget buttonContainer = new FlowLayoutWidget(FlowDirection.LeftToRight);
|
||||
buttonContainer.HAnchor = HAnchor.ParentLeftRight;
|
||||
buttonContainer.BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
|
||||
|
||||
Button closeButton = textImageButtonFactory.Generate("Close".Localize(), centerText: true);
|
||||
closeButton.Click += (sender, e) =>
|
||||
{
|
||||
CloseOnIdle();
|
||||
};
|
||||
string alphaFeedInfoText = "Alpha: The in development version of MatterControl.".Localize();
|
||||
alphaInfoLabel = new TextWidget(alphaFeedInfoText);
|
||||
alphaInfoLabel.TextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
alphaInfoLabel.HAnchor = HAnchor.ParentLeftRight;
|
||||
alphaInfoLabel.Margin = new BorderDouble(bottom: 10);
|
||||
additionalInfoContainer.AddChild(alphaInfoLabel);
|
||||
|
||||
Button whatsThisLink = linkButtonFactory.Generate("What's this?".Localize());
|
||||
whatsThisLink.VAnchor = VAnchor.ParentCenter;
|
||||
whatsThisLink.Margin = new BorderDouble(left: 6);
|
||||
whatsThisLink.Click += (sender, e) =>
|
||||
{
|
||||
UiThread.RunOnIdle(() =>
|
||||
{
|
||||
if (!additionalInfoContainer.Visible)
|
||||
{
|
||||
additionalInfoContainer.Visible = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
additionalInfoContainer.Visible = false;
|
||||
}
|
||||
});
|
||||
};
|
||||
FlowLayoutWidget buttonContainer = new FlowLayoutWidget(FlowDirection.LeftToRight);
|
||||
buttonContainer.HAnchor = HAnchor.ParentLeftRight;
|
||||
buttonContainer.BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
|
||||
|
||||
Button closeButton = theme.textImageButtonFactory.Generate("Close".Localize(), centerText: true);
|
||||
closeButton.Click += (sender, e) =>
|
||||
{
|
||||
CloseOnIdle();
|
||||
};
|
||||
|
||||
mainLabelContainer.AddChild(checkUpdateLabel);
|
||||
topToBottom.AddChild(mainLabelContainer);
|
||||
topToBottom.AddChild(updateStatusWidget);
|
||||
Button whatsThisLink = theme.HelpLinkFactory.Generate("What's this?".Localize());
|
||||
whatsThisLink.VAnchor = VAnchor.ParentCenter;
|
||||
whatsThisLink.Margin = new BorderDouble(left: 6);
|
||||
whatsThisLink.Click += (sender, e) =>
|
||||
{
|
||||
UiThread.RunOnIdle(() =>
|
||||
{
|
||||
if (!additionalInfoContainer.Visible)
|
||||
{
|
||||
additionalInfoContainer.Visible = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
additionalInfoContainer.Visible = false;
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
mainLabelContainer.AddChild(checkUpdateLabel);
|
||||
topToBottom.AddChild(mainLabelContainer);
|
||||
topToBottom.AddChild(updateStatusWidget);
|
||||
topToBottom.AddChild(currentBuildInfo);
|
||||
currentFeedAndDropDownContainer.AddChild(feedLabel);
|
||||
currentFeedAndDropDownContainer.AddChild(whatsThisLink);
|
||||
currentFeedAndDropDownContainer.AddChild(new HorizontalSpacer());
|
||||
currentFeedAndDropDownContainer.AddChild(releaseOptionsDropList);
|
||||
topToBottom.AddChild(currentFeedAndDropDownContainer);
|
||||
|
||||
topToBottom.AddChild(additionalInfoContainer);
|
||||
buttonContainer.AddChild(new HorizontalSpacer());
|
||||
buttonContainer.AddChild(closeButton);
|
||||
topToBottom.AddChild(new VerticalSpacer());
|
||||
topToBottom.AddChild(buttonContainer);
|
||||
this.AddChild(topToBottom);
|
||||
currentFeedAndDropDownContainer.AddChild(feedLabel);
|
||||
currentFeedAndDropDownContainer.AddChild(whatsThisLink);
|
||||
currentFeedAndDropDownContainer.AddChild(new HorizontalSpacer());
|
||||
currentFeedAndDropDownContainer.AddChild(releaseOptionsDropList);
|
||||
topToBottom.AddChild(currentFeedAndDropDownContainer);
|
||||
|
||||
additionalInfoContainer.Visible = false;
|
||||
topToBottom.AddChild(additionalInfoContainer);
|
||||
buttonContainer.AddChild(new HorizontalSpacer());
|
||||
buttonContainer.AddChild(closeButton);
|
||||
topToBottom.AddChild(new VerticalSpacer());
|
||||
topToBottom.AddChild(buttonContainer);
|
||||
this.AddChild(topToBottom);
|
||||
|
||||
additionalInfoContainer.Visible = false;
|
||||
if (UpdateControlData.Instance.UpdateRequired)
|
||||
{
|
||||
this.Title = "Update Required".Localize();
|
||||
|
|
@ -196,68 +170,41 @@ namespace MatterHackers.MatterControl.AboutPage
|
|||
this.Title = "Check for Update".Localize();
|
||||
}
|
||||
this.BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
|
||||
this.ShowAsSystemWindow();
|
||||
this.AlwaysOnTopOfMain = true;
|
||||
this.ShowAsSystemWindow();
|
||||
this.AlwaysOnTopOfMain = true;
|
||||
}
|
||||
|
||||
}
|
||||
public static void Show()
|
||||
{
|
||||
if (checkUpdate == null)
|
||||
{
|
||||
checkUpdate = new CheckForUpdateWindow(ApplicationController.Instance.Theme);
|
||||
checkUpdate.Closed += (parentSender, e) =>
|
||||
{
|
||||
checkUpdate = null;
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
checkUpdate.BringToFront();
|
||||
}
|
||||
}
|
||||
|
||||
public static void Show()
|
||||
{
|
||||
if (checkUpdate == null)
|
||||
{
|
||||
checkUpdate = new CheckForUpdateWindow();
|
||||
checkUpdate.Closed += (parentSender, e) =>
|
||||
{
|
||||
checkUpdate = null;
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
checkUpdate.BringToFront();
|
||||
}
|
||||
}
|
||||
private void ReleaseOptionsDropList_SelectionChanged(object sender, EventArgs e)
|
||||
{
|
||||
//getAdditionalFeedInfo();
|
||||
|
||||
private void ReleaseOptionsDropList_SelectionChanged(object sender, EventArgs e)
|
||||
{
|
||||
//getAdditionalFeedInfo();
|
||||
|
||||
string releaseCode = ((DropDownList)sender).SelectedValue;
|
||||
if (releaseCode != UserSettings.Instance.get(UserSettingsKey.UpdateFeedType))
|
||||
{
|
||||
UserSettings.Instance.set(UserSettingsKey.UpdateFeedType, releaseCode);
|
||||
}
|
||||
|
||||
}
|
||||
string releaseCode = ((DropDownList)sender).SelectedValue;
|
||||
if (releaseCode != UserSettings.Instance.get(UserSettingsKey.UpdateFeedType))
|
||||
{
|
||||
UserSettings.Instance.set(UserSettingsKey.UpdateFeedType, releaseCode);
|
||||
}
|
||||
|
||||
private void FixTabDot(object sender, EventArgs e)
|
||||
}
|
||||
|
||||
private void FixTabDot(object sender, EventArgs e)
|
||||
{
|
||||
UpdateControlData.Instance.CheckForUpdateUserRequested();
|
||||
}
|
||||
|
||||
|
||||
/*private void getAdditionalFeedInfo()
|
||||
{
|
||||
|
||||
|
||||
if (releaseOptionsDropList.SelectedLabel == "release")
|
||||
{
|
||||
stableInfoLabel.Visible = true;
|
||||
betaInfoLabel.Visible = false;
|
||||
alphaInfoLabel.Visible = false;
|
||||
}
|
||||
else if (releaseOptionsDropList.SelectedLabel == "pre-release")
|
||||
{
|
||||
stableInfoLabel.Visible = false;
|
||||
betaInfoLabel.Visible = true;
|
||||
alphaInfoLabel.Visible = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
stableInfoLabel.Visible = false;
|
||||
betaInfoLabel.Visible = false;
|
||||
alphaInfoLabel.Visible = true;
|
||||
}
|
||||
}*/
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,15 +45,17 @@ namespace MatterHackers.MatterControl
|
|||
private static ImageBuffer restorePressed;
|
||||
|
||||
private readonly int fizedHeightA = (int)(25 * GuiWidget.DeviceScale + .5);
|
||||
private readonly int fontSizeA = 11;
|
||||
|
||||
private readonly double fizedHeightB = 52 * GuiWidget.DeviceScale;
|
||||
private readonly int fontSizeB = 14;
|
||||
|
||||
private readonly int fontSize10 = 10;
|
||||
private readonly int fontSize11 = 11;
|
||||
private readonly int fontSize14 = 14;
|
||||
|
||||
private int shortButtonHeight = 25;
|
||||
private int sideBarButtonWidth;
|
||||
|
||||
public LinkButtonFactory LinkButtonFactory { get; private set; }
|
||||
public LinkButtonFactory HelpLinkFactory { get; private set; }
|
||||
|
||||
public TextImageButtonFactory textImageButtonFactory;
|
||||
private TextImageButtonFactory checkboxButtonFactory;
|
||||
|
|
@ -120,7 +122,7 @@ namespace MatterHackers.MatterControl
|
|||
disabledBorderColor = new RGBA_Bytes(theme.PrimaryTextColor, 100),
|
||||
disabledTextColor = new RGBA_Bytes(theme.PrimaryTextColor, 100),
|
||||
FixedHeight = fizedHeightA,
|
||||
fontSize = fontSizeA,
|
||||
fontSize = fontSize11,
|
||||
borderWidth = borderWidth
|
||||
};
|
||||
|
||||
|
|
@ -133,7 +135,7 @@ namespace MatterHackers.MatterControl
|
|||
AllowThemeToAdjustImage = false,
|
||||
borderWidth = borderWidth,
|
||||
FixedHeight = fizedHeightB,
|
||||
fontSize = fontSizeB,
|
||||
fontSize = fontSize14,
|
||||
normalBorderColor = new RGBA_Bytes(255, 255, 255, 100),
|
||||
hoverBorderColor = new RGBA_Bytes(255, 255, 255, 100)
|
||||
};
|
||||
|
|
@ -311,14 +313,20 @@ namespace MatterHackers.MatterControl
|
|||
};
|
||||
#endregion
|
||||
|
||||
LinkButtonFactory = new LinkButtonFactory()
|
||||
this.LinkButtonFactory = new LinkButtonFactory()
|
||||
{
|
||||
fontSize = fontSizeA,
|
||||
fontSize = fontSize11,
|
||||
textColor = ActiveTheme.Instance.PrimaryTextColor
|
||||
};
|
||||
|
||||
this.HelpLinkFactory = new LinkButtonFactory()
|
||||
{
|
||||
fontSize = fontSize10,
|
||||
textColor = ActiveTheme.Instance.SecondaryAccentColor
|
||||
};
|
||||
}
|
||||
|
||||
internal TabControl CreateTabControl()
|
||||
internal TabControl CreateTabControl()
|
||||
{
|
||||
var tabControl = new TabControl(separator: new HorizontalLine(alpha: 50));
|
||||
tabControl.TabBar.BorderColor = RGBA_Bytes.Transparent; // theme.SecondaryTextColor;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue