New Settings Library.

3 files changed, 39 insertions, 5 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/StubsModuleSettings.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/StubsModuleSettings.cs
new file mode 100644
index 000000000..1aa775fdc
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/StubsModuleSettings.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Settings;
+
+namespace Tango.MachineStudio.Stubs
+{
+    public class StubsModuleSettings : SettingsBase
+    {
+        /// <summary>
+        /// Gets or sets the last selected port.
+        /// </summary>
+        public String SelectedPort { get; set; }
+
+        /// <summary>
+        /// Gets or sets the last tabs.
+        /// </summary>
+        public List<String> LastTabs { get; set; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StubsModule"/> class.
+        /// </summary>
+        public StubsModuleSettings()
+        {
+            LastTabs = new List<string>();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj
index eb2248f61..ca3e77628 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj
@@ -71,6 +71,7 @@
     <None Include="Resources\CodeTabTemplate.cs" />
     <Compile Include="StubManager.cs" />
     <Compile Include="StubOnExecuteParameters.cs" />
+    <Compile Include="StubsModuleSettings.cs" />
     <Compile Include="ViewModelLocator.cs" />
     <Compile Include="ViewModels\CodeTabVM.cs" />
     <Compile Include="ViewModels\MainViewVM.cs" />
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/ViewModels/MainViewVM.cs
index df47273d0..afd5e4d70 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/ViewModels/MainViewVM.cs
@@ -30,6 +30,7 @@ namespace Tango.MachineStudio.Stubs.ViewModels
         private UsbTransportAdapter _adapter; //Holds the USB transport adapter.
         private StubManager _stubManager;
         private INotificationProvider _notification;
+        private StubsModuleSettings _settings;
 
         #region Properties
 
@@ -220,6 +221,8 @@ namespace Tango.MachineStudio.Stubs.ViewModels
         /// </summary>
         public MainViewVM(IStudioApplicationManager applicationManager, INotificationProvider notification)
         {
+            _settings = SettingsManager.Default.GetOrCreate<StubsModuleSettings>();
+
             ApplicationManager = applicationManager;
             _notification = notification;
 
@@ -264,13 +267,13 @@ namespace Tango.MachineStudio.Stubs.ViewModels
                 "COM9",
             };
 
-            SelectedPort = SettingsManager.Default.MachineStudio.StubsModule.SelectedPort != null ? SettingsManager.Default.MachineStudio.StubsModule.SelectedPort : Ports.First();
+            SelectedPort = _settings.SelectedPort != null ? _settings.SelectedPort : Ports.First();
 
             Status = "Ready";
 
-            if (SettingsManager.Default.MachineStudio.StubsModule.LastTabs.Count > 0)
+            if (_settings.LastTabs.Count > 0)
             {
-                foreach (var file in SettingsManager.Default.MachineStudio.StubsModule.LastTabs)
+                foreach (var file in _settings.LastTabs)
                 {
                     if (File.Exists(file))
                     {
@@ -534,8 +537,8 @@ namespace Tango.MachineStudio.Stubs.ViewModels
         /// <returns></returns>
         public override void OnShuttingDown()
         {
-            SettingsManager.Default.MachineStudio.StubsModule.SelectedPort = SelectedPort;
-            SettingsManager.Default.MachineStudio.StubsModule.LastTabs = CodeTabs.Select(x => x.File).ToList();
+            _settings.SelectedPort = SelectedPort;
+            _settings.LastTabs = CodeTabs.Select(x => x.File).ToList();
         }
 
         #endregion