MERGE.

4 files changed, 26 insertions, 2 deletions

diff --git a/Software/Visual_Studio/Tango.Settings/MachineStudio.cs b/Software/Visual_Studio/Tango.Settings/MachineStudioSettings/MachineStudio.cs
index bc486b6c3..723d85c5d 100644
--- a/Software/Visual_Studio/Tango.Settings/MachineStudio.cs
+++ b/Software/Visual_Studio/Tango.Settings/MachineStudioSettings/MachineStudio.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Tango.Core.Cryptography;
 
-namespace Tango.Settings
+namespace Tango.Settings.MachineStudioSettings
 {
     public class MachineStudio
     {
@@ -14,5 +14,12 @@ namespace Tango.Settings
         public String LastLoginPassword { get; set; }
 
         public bool RememberMe { get; set; }
+
+        public SynchronizationModule SynchronizationModule { get; set; }
+
+        public MachineStudio()
+        {
+            SynchronizationModule = new SynchronizationModule();
+        }
     }
 }
diff --git a/Software/Visual_Studio/Tango.Settings/MachineStudioSettings/SynchronizationModule.cs b/Software/Visual_Studio/Tango.Settings/MachineStudioSettings/SynchronizationModule.cs
new file mode 100644
index 000000000..18e50da90
--- /dev/null
+++ b/Software/Visual_Studio/Tango.Settings/MachineStudioSettings/SynchronizationModule.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.Settings.MachineStudioSettings
+{
+    public class SynchronizationModule
+    {
+        public String LocalMasterDBFile { get; set; }
+
+        public String LocalSlaveDBFile { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.Settings/SettingsCollection.cs b/Software/Visual_Studio/Tango.Settings/SettingsCollection.cs
index 1e0fbd522..aae228b49 100644
--- a/Software/Visual_Studio/Tango.Settings/SettingsCollection.cs
+++ b/Software/Visual_Studio/Tango.Settings/SettingsCollection.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.Serialization;
+using Tango.Settings.MachineStudioSettings;
 
 namespace Tango.Settings
 {
diff --git a/Software/Visual_Studio/Tango.Settings/Tango.Settings.csproj b/Software/Visual_Studio/Tango.Settings/Tango.Settings.csproj
index 895079449..e85a5f1bd 100644
--- a/Software/Visual_Studio/Tango.Settings/Tango.Settings.csproj
+++ b/Software/Visual_Studio/Tango.Settings/Tango.Settings.csproj
@@ -44,7 +44,8 @@
       <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="DataBase.cs" />
-    <Compile Include="MachineStudio.cs" />
+    <Compile Include="MachineStudioSettings\MachineStudio.cs" />
+    <Compile Include="MachineStudioSettings\SynchronizationModule.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SettingsCollection.cs" />
     <Compile Include="SettingsManager.cs" />