diff --git a/EeProm/EePromMarlineWidget.cs b/EeProm/EePromMarlinWidget.cs similarity index 95% rename from EeProm/EePromMarlineWidget.cs rename to EeProm/EePromMarlinWidget.cs index 5184b26cf..47dc71bad 100644 --- a/EeProm/EePromMarlineWidget.cs +++ b/EeProm/EePromMarlinWidget.cs @@ -93,14 +93,20 @@ namespace MatterHackers.MatterControl.EeProm { Title = new LocalizedString("Marlin Firmware EEPROM Settings").Translated; - BackgroundColor = ActiveTheme.Instance.SecondaryBackgroundColor; - currentEePromSettings = new EePromMarlinSettings(); currentEePromSettings.eventAdded += SetUiToPrinterSettings; + FlowLayoutWidget mainContainer = new FlowLayoutWidget (FlowDirection.TopToBottom); + mainContainer.VAnchor = Agg.UI.VAnchor.Max_FitToChildren_ParentHeight; + mainContainer.HAnchor = Agg.UI.HAnchor.ParentLeftRight; + mainContainer.BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor; + mainContainer.Padding = new BorderDouble (3, 0); + FlowLayoutWidget topToBottom = new FlowLayoutWidget(FlowDirection.TopToBottom); topToBottom.VAnchor = Agg.UI.VAnchor.Max_FitToChildren_ParentHeight; topToBottom.HAnchor = Agg.UI.HAnchor.ParentLeftRight; + topToBottom.BackgroundColor = ActiveTheme.Instance.SecondaryBackgroundColor; + topToBottom.Padding = new BorderDouble (top: 3); // the top button bar { @@ -111,12 +117,12 @@ namespace MatterHackers.MatterControl.EeProm CreateMainButton(ref buttonReLoadSettings, topButtonBar, "Re-Load Default Settings"); buttonReLoadSettings.Click += buttonReLoadSettings_Click; - topButtonBar.AddChild(new GuiWidget(10, 1)); + topButtonBar.Margin = new BorderDouble (0, 3); CreateMainButton(ref buttonSetToFactorySettings, topButtonBar, "Set Default To Factory Settings"); buttonSetToFactorySettings.Click += SetToFactorySettings; - topToBottom.AddChild(topButtonBar); + mainContainer.AddChild(topButtonBar); } topToBottom.AddChild(Create4FieldSet("Steps per mm:", @@ -160,18 +166,18 @@ namespace MatterHackers.MatterControl.EeProm topBottomSpacer.VAnchor = VAnchor.ParentBottomTop; topToBottom.AddChild(topBottomSpacer); + mainContainer.AddChild (topToBottom); // the bottom button bar { FlowLayoutWidget bottomButtonBar = new FlowLayoutWidget(); bottomButtonBar.HAnchor = Agg.UI.HAnchor.Max_FitToChildren_ParentWidth; bottomButtonBar.BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor; + bottomButtonBar.Margin = new BorderDouble (0, 3); CreateMainButton(ref buttonSetActive, bottomButtonBar, "Make Settings Active"); buttonSetActive.Click += buttonSetActive_Click; - bottomButtonBar.AddChild(new GuiWidget(10, 1)); - CreateMainButton(ref buttonSave, bottomButtonBar, "Make Settings Active\nAnd Save To Default"); buttonSave.Click += buttonSave_Click; @@ -180,14 +186,14 @@ namespace MatterHackers.MatterControl.EeProm CreateMainButton(ref buttonAbort, bottomButtonBar, "Cancel"); buttonAbort.Click += buttonAbort_Click; - topToBottom.AddChild(bottomButtonBar); + mainContainer.AddChild(bottomButtonBar); } PrinterCommunication.Instance.CommunicationUnconditionalFromPrinter.RegisterEvent(currentEePromSettings.Add, ref unregisterEvents); currentEePromSettings.eventAdded += SetUiToPrinterSettings; - AddChild(topToBottom); + AddChild(mainContainer); ShowAsSystemWindow(); @@ -296,7 +302,6 @@ namespace MatterHackers.MatterControl.EeProm private void CreateMainButton(ref Button button, FlowLayoutWidget buttonBar, string text) { button = textImageButtonFactory.Generate(new LocalizedString(text).Translated); - button.Margin = new BorderDouble(3); buttonBar.AddChild(button); } diff --git a/EeProm/EePromRepatierParameter.cs b/EeProm/EePromRepetierParameter.cs similarity index 96% rename from EeProm/EePromRepatierParameter.cs rename to EeProm/EePromRepetierParameter.cs index b68b63102..9bd656fc2 100644 --- a/EeProm/EePromRepatierParameter.cs +++ b/EeProm/EePromRepetierParameter.cs @@ -34,7 +34,7 @@ using System.Text; namespace MatterHackers.MatterControl.EeProm { - public class EePromRepatierParameter : EventArgs + public class EePromRepetierParameter : EventArgs { public string description; public int type; @@ -42,7 +42,7 @@ namespace MatterHackers.MatterControl.EeProm string val = ""; bool changed = false; - public EePromRepatierParameter(string line) + public EePromRepetierParameter(string line) { update(line); } diff --git a/EeProm/EePromRepatierStorage.cs b/EeProm/EePromRepetierStorage.cs similarity index 87% rename from EeProm/EePromRepatierStorage.cs rename to EeProm/EePromRepetierStorage.cs index 8bd1a4bcb..d1963d4d8 100644 --- a/EeProm/EePromRepatierStorage.cs +++ b/EeProm/EePromRepetierStorage.cs @@ -36,16 +36,16 @@ using MatterHackers.Agg.UI; namespace MatterHackers.MatterControl.EeProm { - public delegate void OnEePromRepatierAdded(EePromRepatierParameter param); + public delegate void OnEePromRepetierAdded(EePromRepetierParameter param); - public class EePromRepatierStorage + public class EePromRepetierStorage { - public Dictionary eePromSettingsList; + public Dictionary eePromSettingsList; public event EventHandler eventAdded = null; - public EePromRepatierStorage() + public EePromRepetierStorage() { - eePromSettingsList = new Dictionary(); + eePromSettingsList = new Dictionary(); } public void Clear() @@ -55,7 +55,7 @@ namespace MatterHackers.MatterControl.EeProm public void Save() { - foreach (EePromRepatierParameter p in eePromSettingsList.Values) + foreach (EePromRepetierParameter p in eePromSettingsList.Values) { p.save(); } @@ -77,7 +77,7 @@ namespace MatterHackers.MatterControl.EeProm return; } - EePromRepatierParameter parameter = new EePromRepatierParameter(line); + EePromRepetierParameter parameter = new EePromRepetierParameter(line); if (eePromSettingsList.ContainsKey(parameter.position)) { eePromSettingsList.Remove(parameter.position); diff --git a/EeProm/EePromRepatierWidget.cs b/EeProm/EePromRepetierWidget.cs similarity index 93% rename from EeProm/EePromRepatierWidget.cs rename to EeProm/EePromRepetierWidget.cs index c263fed24..6ea20c92d 100644 --- a/EeProm/EePromRepatierWidget.cs +++ b/EeProm/EePromRepetierWidget.cs @@ -43,8 +43,8 @@ namespace MatterHackers.MatterControl.EeProm { protected TextImageButtonFactory textImageButtonFactory = new TextImageButtonFactory(); - EePromRepatierStorage currentEePromSettings; - BindingList data = new BindingList(); + EePromRepetierStorage currentEePromSettings; + BindingList data = new BindingList(); FlowLayoutWidget settingsColmun; event EventHandler unregisterEvents; @@ -57,11 +57,13 @@ namespace MatterHackers.MatterControl.EeProm { BackgroundColor = ActiveTheme.Instance.SecondaryBackgroundColor; - currentEePromSettings = new EePromRepatierStorage(); + currentEePromSettings = new EePromRepetierStorage(); FlowLayoutWidget topToBottom = new FlowLayoutWidget(FlowDirection.TopToBottom); topToBottom.VAnchor = Agg.UI.VAnchor.Max_FitToChildren_ParentHeight; topToBottom.HAnchor = Agg.UI.HAnchor.ParentLeftRight; + topToBottom.BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor; + topToBottom.Padding = new BorderDouble (3, 0); FlowLayoutWidget row = new FlowLayoutWidget(); row.HAnchor = Agg.UI.HAnchor.ParentLeftRight; @@ -82,6 +84,7 @@ namespace MatterHackers.MatterControl.EeProm ScrollableWidget settingsAreaScrollBox = new ScrollableWidget(true); settingsAreaScrollBox.ScrollArea.HAnchor |= Agg.UI.HAnchor.ParentLeftRight; settingsAreaScrollBox.AnchorAll(); + settingsAreaScrollBox.BackgroundColor = ActiveTheme.Instance.SecondaryBackgroundColor; topToBottom.AddChild(settingsAreaScrollBox); settingsColmun = new FlowLayoutWidget(FlowDirection.TopToBottom); @@ -94,7 +97,7 @@ namespace MatterHackers.MatterControl.EeProm buttonBar.HAnchor = Agg.UI.HAnchor.Max_FitToChildren_ParentWidth; buttonBar.BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor; buttonSave = textImageButtonFactory.Generate(new LocalizedString("Save To EEPROM").Translated); - buttonSave.Margin = new BorderDouble(3); + buttonSave.Margin = new BorderDouble(0,3); buttonBar.AddChild(buttonSave); CreateSpacer(buttonBar); @@ -146,7 +149,7 @@ namespace MatterHackers.MatterControl.EeProm private void NewSettingReadFromPrinter(object sender, EventArgs e) { - EePromRepatierParameter newSetting = e as EePromRepatierParameter; + EePromRepetierParameter newSetting = e as EePromRepetierParameter; if (newSetting != null) { data.Add(newSetting); @@ -157,7 +160,7 @@ namespace MatterHackers.MatterControl.EeProm void AddItemToUi(object state) { - EePromRepatierParameter newSetting = state as EePromRepatierParameter; + EePromRepetierParameter newSetting = state as EePromRepetierParameter; if (newSetting != null) { FlowLayoutWidget row = new FlowLayoutWidget(); diff --git a/MatterControl.csproj b/MatterControl.csproj index 0b9cc825b..ad0289bea 100644 --- a/MatterControl.csproj +++ b/MatterControl.csproj @@ -38,6 +38,7 @@ 1.0.0.%2a false true + 0.8.2 True @@ -74,11 +75,7 @@ - - - - @@ -189,6 +186,10 @@ + + + + @@ -281,10 +282,6 @@ {D3ABF72C-64C2-4E51-A119-E077210FA990} SerialPortCommunication - - {A526DC5D-65F3-461B-805F-D3AC9665F5C9} - WindowsFileDialogs - {F1653F20-D47D-4F29-8C55-3C835542AF5F} Community.CsharpSqlite @@ -325,7 +322,7 @@ {865172A0-A1A9-49C2-9386-F2FDB4E141B7} MatterControlPluginSystem - + {657DBC6D-C3EA-4398-A3FA-DDB73C14F71B} Agg