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

Move private members below public, restore Android namespaces

Browse source
This commit is contained in:
John Lewin 2018-11-23 11:06:02 -08:00
parent a73659d6b9
commit 984369e21e
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
MatterControlLib/ApplicationView/ApplicationController.cs
View file

@ -253,10 +253,9 @@ namespace MatterHackers.MatterControl
public class ApplicationController
{
public HelpArticle HelpArticles { get; set; }
public event EventHandler<string> ApplicationError;
private Dictionary<Type, HashSet<IObject3DEditor>> 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<PrinterConfig> ActivePrinters => _activePrinters;
// A list of printers which are open (i.e. displaying a tab) on this instance of MatterControl
private List<PrinterConfig> _activePrinters = new List<PrinterConfig>();
public IReadOnlyList<PrinterConfig> ActivePrinters => _activePrinters;
private Dictionary<Type, HashSet<IObject3DEditor>> objectEditorsByType;
public PopupMenu GetActionMenuForSceneItem(IObject3D selectedItem, InteractiveScene scene, bool addInSubmenu)
{

2
MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterConnectButton.cs
View file

@ -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
{