From 984369e21ee210787a6825ebf5e38c6fe5b8d8bc Mon Sep 17 00:00:00 2001 From: John Lewin Date: Fri, 23 Nov 2018 11:06:02 -0800 Subject: [PATCH] Move private members below public, restore Android namespaces --- .../ApplicationView/ApplicationController.cs | 9 +++++---- .../View3D/PrinterBar/PrinterConnectButton.cs | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/MatterControlLib/ApplicationView/ApplicationController.cs b/MatterControlLib/ApplicationView/ApplicationController.cs index 696a76fbc..659bcb798 100644 --- a/MatterControlLib/ApplicationView/ApplicationController.cs +++ b/MatterControlLib/ApplicationView/ApplicationController.cs @@ -253,10 +253,9 @@ namespace MatterHackers.MatterControl public class ApplicationController { - public HelpArticle HelpArticles { get; set; } public event EventHandler ApplicationError; - private Dictionary> objectEditorsByType; + public HelpArticle HelpArticles { get; set; } public ThemeConfig Theme => AppContext.Theme; @@ -264,10 +263,12 @@ namespace MatterHackers.MatterControl public RunningTasksConfig Tasks { get; set; } = new RunningTasksConfig(); + public IReadOnlyList ActivePrinters => _activePrinters; + // A list of printers which are open (i.e. displaying a tab) on this instance of MatterControl private List _activePrinters = new List(); - - public IReadOnlyList ActivePrinters => _activePrinters; + + private Dictionary> objectEditorsByType; public PopupMenu GetActionMenuForSceneItem(IObject3D selectedItem, InteractiveScene scene, bool addInSubmenu) { diff --git a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterConnectButton.cs b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterConnectButton.cs index 4770d523a..2f6cb0516 100644 --- a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterConnectButton.cs +++ b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterConnectButton.cs @@ -34,6 +34,8 @@ using MatterHackers.Localizations; using MatterHackers.MatterControl.CustomWidgets; using MatterHackers.MatterControl.PrinterCommunication; using MatterHackers.MatterControl.PrinterControls.PrinterConnections; +using MatterHackers.MatterControl.SlicerConfiguration; +using MatterHackers.SerialPortCommunication.FrostedSerial; namespace MatterHackers.MatterControl.ActionBar {