diff --git a/ConfigurationPage/ConfigurationPage.cs b/ConfigurationPage/ConfigurationPage.cs index 620133fbe..79a37c522 100644 --- a/ConfigurationPage/ConfigurationPage.cs +++ b/ConfigurationPage/ConfigurationPage.cs @@ -101,6 +101,7 @@ namespace MatterHackers.MatterControl releaseControls.Margin = new BorderDouble (right: 10); releaseControls.HAnchor = Agg.UI.HAnchor.ParentLeftRight; + AddReleaseOptions (releaseControls); mainLayoutContainer.AddChild(settingsControls); @@ -126,8 +127,12 @@ namespace MatterHackers.MatterControl ThemeColorSelectorWidget themeSelector = new ThemeColorSelectorWidget(); themeControlsGroupBox.AddChild(themeSelector); - container.AddChild(themeControlsGroupBox); + FlowLayoutWidget colorSquare = new FlowLayoutWidget(); + colorSquare.HAnchor = Agg.UI.HAnchor.ParentLeftRight; + colorSquare.BackgroundColor = RGBA_Bytes.White; + themeControlsGroupBox.AddChild (colorSquare); + container.AddChild(themeControlsGroupBox); controlsTopToBottomLayout.AddChild(container); } @@ -144,6 +149,7 @@ namespace MatterHackers.MatterControl languageControlsGroupBox.VAnchor = Agg.UI.VAnchor.FitToChildren; languageControlsGroupBox.Height = 78; + FlowLayoutWidget controlsContainer = new FlowLayoutWidget(); controlsContainer.HAnchor = HAnchor.ParentLeftRight; @@ -201,17 +207,18 @@ namespace MatterHackers.MatterControl UserSettings.Instance.set("Language", languageCode); restartButton.Visible = true; } + } private void AddReleaseOptions(FlowLayoutWidget controlsTopToBottom) { - GroupBox releaseOptionsContainer = new GroupBox(LocalizedString.Get ("Release Options")); + GroupBox releaseOptionsGroupBox = new GroupBox(LocalizedString.Get ("Release Options")); - releaseOptionsContainer.Margin = new BorderDouble (0); - releaseOptionsContainer.TextColor = ActiveTheme.Instance.PrimaryTextColor; - releaseOptionsContainer.BorderColor = ActiveTheme.Instance.PrimaryTextColor; - releaseOptionsContainer.HAnchor = Agg.UI.HAnchor.ParentLeftRight; - releaseOptionsContainer.Height = 78; + releaseOptionsGroupBox.Margin = new BorderDouble (0); + releaseOptionsGroupBox.TextColor = ActiveTheme.Instance.PrimaryTextColor; + releaseOptionsGroupBox.BorderColor = ActiveTheme.Instance.PrimaryTextColor; + releaseOptionsGroupBox.HAnchor = Agg.UI.HAnchor.ParentLeftRight; + releaseOptionsGroupBox.Height = 78; FlowLayoutWidget controlsContainer = new FlowLayoutWidget(); controlsContainer.HAnchor = HAnchor.ParentLeftRight; @@ -219,15 +226,23 @@ namespace MatterHackers.MatterControl StyledDropDownList releaseOptionsDropList = new StyledDropDownList("Options"); releaseOptionsDropList.Margin = new BorderDouble (0, 3); //releaseOptionsDropList.MinimumSize = new Vector2(dropDownList.LocalBounds.Width, dropDownList.LocalBounds.Height); - MenuItem releaseOptionsDropDownItem = releaseOptionsDropList.AddItem ("Pre-Release"); - MenuItem preReleaseDropDownItem = releaseOptionsDropList.AddItem ("Release"); + MenuItem releaseOptionsDropDownItem = releaseOptionsDropList.AddItem ("Release"); + MenuItem preReleaseDropDownItem = releaseOptionsDropList.AddItem ("Pre-Release"); MenuItem developmentDropDownItem = releaseOptionsDropList.AddItem ("Development"); + GuiWidget hSpacer = new GuiWidget(); + hSpacer.HAnchor = HAnchor.ParentLeftRight; + + controlsContainer.AddChild(releaseOptionsDropList); - releaseOptionsContainer.AddChild(controlsContainer); - controlsTopToBottom.AddChild(releaseOptionsContainer); + releaseOptionsGroupBox.AddChild(controlsContainer); + controlsTopToBottom.AddChild(releaseOptionsGroupBox); + controlsTopToBottom.AddChild(hSpacer); + } + + private void AddTerminalControls(FlowLayoutWidget controlsTopToBottomLayout) { GroupBox terminalControlsContainer; @@ -336,6 +351,8 @@ namespace MatterHackers.MatterControl controlsTopToBottomLayout.AddChild(eePromControlsContainer); } + + private static GuiWidget CreateSeparatorLine() { GuiWidget topLine = new GuiWidget(10, 1); @@ -555,6 +572,8 @@ namespace MatterHackers.MatterControl } } + + event EventHandler unregisterEvents; private void AddHandlers() { @@ -610,4 +629,22 @@ namespace MatterHackers.MatterControl OpenPrintLevelWizard(); } } + + class RequestCurrentVersion + { + protected Dictionary requestValues; + protected string uri; + public RequestCurrentVersion() + { + string feedType = ApplicationSettings.Instance.get ("Update"); + if(feedType == null) + { + feedType = "release"; + ApplicationSettings.Instance.set("Update", feedType); + } + requestValues["Request Token"] = "ekshdsd5d5ssss5kels"; + requestValues["UpdateFeedType"] = feedType; + uri = "https://mattercontrol.appspot.com/api/1/get-current-release-version"; + } + } } diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index b5de96cd3..00d507c6c 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -1968,9 +1968,12 @@ Translated:The type of support to create inside of parts. English:Infill Type Translated:Infill Type -English:Unknown -Translated:Unknown - English:Release Options Translated:Release Options +English:No items to select. Press 'Add' to select a file to print. +Translated:No items to select. Press 'Add' to select a file to print. + +English:Unknown +Translated:Unknown +