complete core functionality (create/rename/delete)

DoctorVanGogh · Sep 17, 2017 · 4b242a6 · 4b242a6
1 parent b5e259b
commit 4b242a6
Show file tree

Hide file tree

Showing 19 changed files with 406 additions and 27 deletions.
diff --git a/Assemblies/ModSwitch.dll b/Assemblies/ModSwitch.dll
diff --git a/README.md b/README.md
@@ -2,9 +2,19 @@
 
 # ModSwitch
 
-_A Rimworld mod manager *(in the making)*_
+_A Rimworld mod manager_
 
-## Powered by ![Harmony](https://github.com/pardeike/Harmony)
+Allows you to save and switch between sets of active mods with one click. 
+
+Supports importing your sets from ModListBackup.
+
+## Third party acknowledgements
+
+### Uses ![Open Iconic](www.useiconic.com/open)
+
+Open Iconic is lisenced under a [MIT license](http://opensource.org/licenses/MIT).
+
+### Powered by ![Harmony](https://github.com/pardeike/Harmony)
 
 <p align="center">
 <img alt="Powered by Harmony" src="https://camo.githubusercontent.com/074bf079275fa90809f51b74e9dd0deccc70328f/68747470733a2f2f7332342e706f7374696d672e6f72672f3538626c31727a33392f6c6f676f2e706e67" />

diff --git a/Source/ModSwitch/ModSwitch.cs b/Source/ModSwitch/ModSwitch.cs
@@ -7,7 +7,9 @@
 using Verse;
 
 namespace DoctorVanGogh.ModSwitch {
+
     class ModSwitch : Mod {
+
         private Settings _settings;
 
         public ModSwitch(ModContentPack content) : base(content) {
@@ -30,5 +32,10 @@ public override void DoSettingsWindowContents(Rect inRect) {
         public void DoModsConfigWindowContents(Rect bottom) {
             _settings.DoModsConfigWindowContents(bottom);
         }
+
+        public void DeleteSet(ModSet modSet) {
+            if (_settings.Sets.Remove(modSet))
+                WriteSettings();
+        }       
     }
 }
diff --git a/Source/ModSwitch/ModSwitch.csproj b/Source/ModSwitch/ModSwitch.csproj
@@ -51,12 +51,17 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Model\ModAttributes.cs" />
     <Compile Include="Model\ModSet.cs" />
     <Compile Include="ModSwitch.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Settings.cs" />
-    <Compile Include="Util.cs" />
+    <Compile Include="[UI]\Assets.cs" />
+    <Compile Include="[UI]\Dialog_SetText.cs" />
+    <Compile Include="[Util]\Util.cs" />
     <Compile Include="[Patches]\Patches.cs" />
+    <Compile Include="[Util]\Linq.cs" />
+    <Compile Include="[Util]\Widgets.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/Source/ModSwitch/ModSwitch.csproj.DotSettings b/Source/ModSwitch/ModSwitch.csproj.DotSettings
@@ -1,3 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=model/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=_005Bpatches_005D/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=_005Bpatches_005D/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=_005Bui_005D/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=_005Butil_005D/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/Source/ModSwitch/Model/ModAttributes.cs b/Source/ModSwitch/Model/ModAttributes.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Security.Policy;
+using UnityEngine;
+using Verse;
+
+namespace DoctorVanGogh.ModSwitch {
+
+    class ModAttributes : IExposable {
+        public string Key = String.Empty;
+
+        public List<IExposable> attributes = new List<IExposable>();
+
+        public void ExposeData() {
+            Scribe_Values.Look(ref Key, "key");
+            Scribe_Collections.Look(ref attributes, false, "attributes");
+        }
+    }
+
+    class MLBAttributes : IExposable {
+
+        public Color color = Color.white;
+        public string altName = String.Empty;
+        public string installName = String.Empty;
+
+        public void ExposeData() {
+            Scribe_Values.Look(ref color, "color");
+            Scribe_Values.Look(ref altName, "altName");
+            Scribe_Values.Look(ref installName, "installName");
+        }
+    }
+}
diff --git a/Source/ModSwitch/Model/ModSet.cs b/Source/ModSwitch/Model/ModSet.cs
@@ -13,22 +13,37 @@ class ModSet : IExposable {
 
         private static readonly FieldInfo fiModsConfig_data;
         private static readonly FieldInfo fiModsConfigData_activeMods;
+        private static readonly FieldInfo fiModsConfigData_buildNumber;
 
         static ModSet() {
             var tModsConfig = typeof(ModsConfig);
             var tModsConfigData = AccessTools.Inner(tModsConfig, "ModsConfigData");
             fiModsConfigData_activeMods = AccessTools.Field(tModsConfigData, "activeMods");
+            fiModsConfigData_buildNumber = AccessTools.Field(tModsConfigData, "buildNumber");
             fiModsConfig_data = AccessTools.Field(tModsConfig, "data");
+
+            TipRename = new TipSignal("Rename");
+            TipDelete = new TipSignal("Delete");
+
         }
 
-        public List<string> Mods = new List<string>();
+        public static TipSignal TipDelete { get; set; }
+
+        public static TipSignal TipRename { get; set; }
 
+        public List<string> Mods = new List<string>();
+        public int BuildNumber = -1;
         public string Name = String.Empty;
+        public bool AutoGenerated = false;
+
+
         private TipSignal? _tip;
 
         public void ExposeData() {
             Scribe_Collections.Look(ref Mods, false, "mods");
             Scribe_Values.Look(ref Name, "name");
+            Scribe_Values.Look(ref BuildNumber, "buildNumber");
+            Scribe_Values.Look(ref AutoGenerated, "autoGenerated", false);
         }
 
         private TipSignal Tip {
@@ -40,8 +55,45 @@ public override string ToString() {
         }
 
         public void DoWindowContents(Rect rect) {
-            GUI.Label(rect, Name);
-            TooltipHandler.TipRegion(rect, Tip);
+            const float padding = 2f;
+            var height = rect.height;
+            var buttonSize = height - 2 * padding;
+
+            var leftColumnsWidth = rect.width - 8*padding - 2*buttonSize;
+
+            var left = new Rect(rect.x, rect.y +padding, leftColumnsWidth * 0.6f -padding, buttonSize);
+            Widgets.Label(left, Name);
+
+            var right = new Rect(rect.x + leftColumnsWidth*0.6f + 3*padding, rect.y + padding, leftColumnsWidth*0.4f, buttonSize);
+            Widgets.Label(right, $"{Mods.Count} items");
+            TooltipHandler.TipRegion(right, Tip);
+
+            var rctRename = new Rect(rect.x + leftColumnsWidth + 5*padding, rect.y + padding, buttonSize, buttonSize);
+
+            if (ExtraWidgets.ButtonImage(rctRename,  Assets.Edit, false, TipRename, rctRename.ContractedBy(4))) {
+                Find.WindowStack.Add(
+                        new Dialog_SetText(
+                            s => {
+                                Name = s;
+                                LoadedModManager.GetMod<ModSwitch>().WriteSettings();
+                            },
+                            Name)
+                    );
+            }
+
+            var rctDelete = new Rect(rect.x + leftColumnsWidth + 7*padding + buttonSize, rect.y + padding, buttonSize, buttonSize);
+
+
+            if (ExtraWidgets.ButtonImage(rctDelete, Assets.Delete, false, TipDelete, rctDelete.ContractedBy(4))) {
+                Find.WindowStack.Add(
+                        Dialog_MessageBox.CreateConfirmation(
+                            $"Really delete '{Name}'?",
+                            () => {
+                                LoadedModManager.GetMod<ModSwitch>().DeleteSet(this);
+                            },
+                            true, 
+                            "Confirmation needed"));
+            }
         }
 
         public void Apply() {
@@ -69,5 +121,15 @@ public void Apply() {
                 Find.WindowStack.Add(new Dialog_MessageBox(sb.ToString(), title: "Missing mods"));
             }
         }
+
+        public static ModSet FromCurrent(string name) {
+            object modsConfigData = fiModsConfig_data.GetValue(null);
+
+            return new ModSet {
+                       Name = name,
+                       BuildNumber = (int) fiModsConfigData_buildNumber.GetValue(modsConfigData),
+                       Mods = new List<string>((IEnumerable<string>) fiModsConfigData_activeMods.GetValue(modsConfigData))
+                   };
+        }
     }
 }
diff --git a/Source/ModSwitch/Properties/AssemblyInfo.cs b/Source/ModSwitch/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.1.0")]
-[assembly: AssemblyFileVersion("0.0.1.0")]
+[assembly: AssemblyVersion("0.0.2.0")]
+[assembly: AssemblyFileVersion("0.0.2.0")]