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

more changes to theme controls group box.

Browse source
This commit is contained in:
gregory-diaz 2014-04-17 12:11:34 -07:00
parent 374aa66c4a
commit 00f875b65b
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
ConfigurationPage/ConfigurationPage.cs
View file

@ -101,7 +101,6 @@ namespace MatterHackers.MatterControl
releaseControls.Margin = new BorderDouble (right: 10);
releaseControls.HAnchor = Agg.UI.HAnchor.ParentLeftRight;
AddReleaseOptions (releaseControls);
mainLayoutContainer.AddChild(settingsControls);
@ -128,12 +127,12 @@ namespace MatterHackers.MatterControl
colorSelectorContainer.HAnchor = HAnchor.ParentLeftRight;
ThemeColorSelectorWidget themeSelector = new ThemeColorSelectorWidget();
themeSelector.HAnchor = HAnchor.ParentLeftRight;
themeSelector.Margin = new BorderDouble(right: 5);
GuiWidget currentColorThemeBorder = new GuiWidget();
currentColorThemeBorder.HAnchor = Agg.UI.HAnchor.ParentLeftRight;
currentColorThemeBorder.VAnchor = VAnchor.ParentBottomTop;
currentColorThemeBorder.Margin = new BorderDouble (top: 2, bottom: 2);
currentColorThemeBorder.Padding = new BorderDouble(4);
currentColorThemeBorder.BackgroundColor = RGBA_Bytes.White;
@ -241,20 +240,26 @@ namespace MatterHackers.MatterControl
MenuItem releaseOptionsDropDownItem = releaseOptionsDropList.AddItem ("Release");
MenuItem preReleaseDropDownItem = releaseOptionsDropList.AddItem ("Pre-Release");
MenuItem developmentDropDownItem = releaseOptionsDropList.AddItem ("Development");
releaseOptionsDropList.SelectionChanged += new EventHandler (ReleaseOptionsDropList_SelectionChanged);
GuiWidget hSpacer = new GuiWidget();
hSpacer.HAnchor = HAnchor.ParentLeftRight;
controlsContainer.AddChild(releaseOptionsDropList);
releaseOptionsGroupBox.AddChild(controlsContainer);
controlsTopToBottom.AddChild(releaseOptionsGroupBox);
controlsTopToBottom.AddChild(hSpacer);
}
private void ReleaseOptionsDropList_SelectionChanged(object sender, EventArgs e)
{
string releaseCode = ((DropDownList)sender).SelectedLabel;
if(releaseCode != UserSettings.Instance.get("UpdateFeedType"));
{
UserSettings.Instance.set ("UpdateFeedType", releaseCode);
}
}
private void AddTerminalControls(FlowLayoutWidget controlsTopToBottomLayout)
{
GroupBox terminalControlsContainer;