Revert "Revert "Some speculative work.""

This reverts commit d0a2991.
fingerboxes · Apr 30, 2015 · 61b5ad1 · 61b5ad1
1 parent e368348
commit 61b5ad1
Show file tree

Hide file tree

Showing 8 changed files with 353 additions and 307 deletions.
diff --git a/Source/CrewQ.csproj b/Source/CrewQ.csproj
@@ -50,7 +50,8 @@
   <ItemGroup>
     <Compile Include="API\CrewQAPI.cs" />
     <Compile Include="Main.cs" />
-    <Compile Include="Data.cs" />
+    <Compile Include="Roster.cs" />
+    <Compile Include="Settings.cs" />
     <Compile Include="Interface\AppLauncher.cs" />
     <Compile Include="Interface\EditorModule.cs" />
     <Compile Include="Interface\SettingsWindow.cs" />

diff --git a/Source/Data.cs b/Source/Data.cs
diff --git a/Source/Interface/AppLauncher.cs b/Source/Interface/AppLauncher.cs
@@ -39,7 +39,7 @@ class AppLauncher : ProtoAppLauncher
     {        
         public override Texture AppLauncherIcon
         {
-            get { return GameDatabase.Instance.GetTexture("Fingerboxes/CrewQ/Icons/appLauncher", false); }
+            get { return GameDatabase.Instance.GetTexture("Fingerboxes/CrewQueue/Icons/appLauncher", false); }
         }
 
         public override ApplicationLauncher.AppScenes Visibility
@@ -49,7 +49,7 @@ public override ApplicationLauncher.AppScenes Visibility
                 try
                 {
                     bool coalescedCondition = (settingsWindow != null) &&
-                                              (Data.Instance.settingHideSettingsIcon == false || settingsWindow.Visible == true);
+                                              (Settings.Instance.HideSettingsIcon == false || settingsWindow.Visible == true);
 
                     return coalescedCondition ? ApplicationLauncher.AppScenes.SPACECENTER : ApplicationLauncher.AppScenes.NEVER;
                 }

diff --git a/Source/Interface/SceneModule.cs b/Source/Interface/SceneModule.cs
@@ -39,7 +39,7 @@ public abstract class SceneModule : MonoBehaviourExtended
     {
         public void CleanManifest()
         {
-            if (CMAssignmentDialog.Instance != null && (Data.Instance.settingRemoveDefaultCrews || Data.Instance.settingDoCustomAssignment))
+            if (CMAssignmentDialog.Instance != null && Settings.Instance.AssignCrews)
             {
                 VesselCrewManifest originalVesselManifest = CMAssignmentDialog.Instance.GetManifest();
                 IList<PartCrewManifest> partCrewManifests = originalVesselManifest.GetCrewableParts();
@@ -55,7 +55,7 @@ public void CleanManifest()
                             partManifest.RemoveCrewFromSeat(partManifest.GetCrewSeat(crewMember));
                         }
                     }
-                    if (Data.Instance.settingDoCustomAssignment)
+                    if (Settings.Instance.AssignCrews)
                     {
                         partManifest.AddCrewToOpenSeats(Main.Instance.GetCrewForPart(partManifest.PartInfo.partPrefab, true));
                     }
@@ -77,7 +77,7 @@ public void OnFillButton(ref POINTER_INFO eventPointer)
             if (eventPointer.evt == POINTER_INFO.INPUT_EVENT.TAP)
             {
                 Logging.Debug("Fill Button Pressed");                
-                if (Data.Instance.settingDoCustomAssignment)
+                if (Settings.Instance.AssignCrews)
                 {
                     // TODO - make this work.
                 }

diff --git a/Source/Interface/SettingsWindow.cs b/Source/Interface/SettingsWindow.cs
@@ -119,34 +119,34 @@ protected override void Update()
 
         public void PreSync()
         {
-            Data settings = Data.Instance;
+            Settings settings = Settings.Instance;
 
             if (settings != null)
             {
-                toggleDoCustomAssignment = settings.settingDoCustomAssignment;
-                toggleUseCrewCompositions = settings.settingUseCrewCompositions;
-                toggleVacationHardlock = settings.settingVacationHardlock;
-                localMinimumVacationDays = settings.settingMinimumVacationDays.ToString();
-                localMaximumVacationDays = settings.settingMaximumVacationDays.ToString();
-                localVacationScalar = (settings.settingVacationScalar * 100).ToString();
+                toggleDoCustomAssignment = settings.AssignCrews;
+                toggleUseCrewCompositions = settings.StrictCrewCompositions;
+                toggleVacationHardlock = settings.VacationHardLock;
+                localMinimumVacationDays = settings.MinimumVacationDays.ToString();
+                localMaximumVacationDays = settings.MaximumVacationDays.ToString();
+                localVacationScalar = (settings.VacationScalar * 100).ToString();
             }
         }
 
         public void Sync()
         {
-            Data settings = Data.Instance;
+            Settings settings = Settings.Instance;
 
             if (settings != null)
             {
-                settings.settingHideSettingsIcon = toggleRemoveDefaultCrews;
-                settings.settingDoCustomAssignment = toggleDoCustomAssignment;
-                settings.settingUseCrewCompositions = toggleUseCrewCompositions;
-                settings.settingVacationHardlock = toggleVacationHardlock;
-                settings.settingHideSettingsIcon = toggleHideSettingsIcon;
+                settings.HideSettingsIcon = toggleRemoveDefaultCrews;
+                settings.AssignCrews = toggleDoCustomAssignment;
+                settings.StrictCrewCompositions = toggleUseCrewCompositions;
+                settings.VacationHardLock = toggleVacationHardlock;
+                settings.HideSettingsIcon = toggleHideSettingsIcon;
 
                 try
                 {
-                    settings.settingMinimumVacationDays = Int32.Parse(localMinimumVacationDays);
+                    settings.MinimumVacationDays = Int32.Parse(localMinimumVacationDays);
                 }
                 catch (Exception)
                 {
@@ -155,7 +155,7 @@ public void Sync()
 
                 try
                 {
-                    settings.settingMaximumVacationDays = Int32.Parse(localMaximumVacationDays);
+                    settings.MaximumVacationDays = Int32.Parse(localMaximumVacationDays);
                 }
                 catch (Exception)
                 {
@@ -164,7 +164,7 @@ public void Sync()
 
                 try
                 {
-                    settings.settingVacationScalar = (Double.Parse(localVacationScalar) / 100);
+                    settings.VacationScalar = (Double.Parse(localVacationScalar) / 100);
                 }
                 catch (Exception)
                 {