Merge branch 'Aviuz-feature/sort_by_version'

DoctorVanGogh · Oct 22, 2018 · 48480d9 · 48480d9
2 parents 9ecb2d7 + 3e03d17
commit 48480d9
Show file tree

Hide file tree

Showing 7 changed files with 452 additions and 5 deletions.
diff --git a/Assemblies/ModSwitch.dll b/Assemblies/ModSwitch.dll
diff --git a/Languages/English/Keyed/Keyed.xml b/Languages/English/Keyed/Keyed.xml
@@ -99,4 +99,5 @@ Do you want to keep your existing settings from the local copy or replace them w
 	<ModSwitch.RestartRequired.Restart>Restart</ModSwitch.RestartRequired.Restart>
 	<ModSwitch.RestartRequired.Defer>Later</ModSwitch.RestartRequired.Defer>
 
+	<ModSwitch.TreeView.Active>Active</ModSwitch.TreeView.Active>
 </LanguageData>
diff --git a/Source/ModSwitch/Properties/AssemblyInfo.cs b/Source/ModSwitch/Properties/AssemblyInfo.cs
@@ -12,6 +12,6 @@
 [assembly: System.Reflection.AssemblyCopyright("Copyright © DoctorVanGogh 2017")]
 [assembly: System.Runtime.InteropServices.ComVisible(false)]
 [assembly: System.Runtime.InteropServices.Guid("ab2e8e89-3d1d-4e36-a0ae-489b6ebc84a6")]
-[assembly: System.Reflection.AssemblyVersion("1.5.0.143")]
+[assembly: System.Reflection.AssemblyVersion("1.6.0.204")]
 
 
diff --git a/Source/ModSwitch/Properties/version.txt b/Source/ModSwitch/Properties/version.txt
@@ -1 +1 @@
-1.5.0.143
+1.6.0.204
diff --git a/Source/ModSwitch/[Patches]/Patches.cs b/Source/ModSwitch/[Patches]/Patches.cs
diff --git a/Source/ModSwitch/[UI]/Assets.cs b/Source/ModSwitch/[UI]/Assets.cs
@@ -18,6 +18,8 @@ public class Assets {
         public static readonly Texture2D DragHash;
         public static readonly Texture2D WarningSmall;
         public static readonly Texture2D Debug;
+        public static readonly Texture2D Collapsed;
+        public static readonly Texture2D Expanded;
 
         static Assets() {
             Edit = ContentFinder<Texture2D>.Get("UI/Edit", true);
@@ -32,6 +34,8 @@ static Assets() {
             SteamCopy = ContentFinder<Texture2D>.Get("UI/ContentSources/SteamCopy", true);
             DragHash = ContentFinder<Texture2D>.Get("UI/Buttons/DragHash", true);
             WarningSmall = ContentFinder<Texture2D>.Get("UI/Warning-small", true);
+            Collapsed = ContentFinder<Texture2D>.Get("UI/Buttons/Dev/Reveal", true);
+            Expanded = ContentFinder<Texture2D>.Get("UI/Buttons/Dev/Collapse", true);
         }
     }
 }
diff --git a/Source/ModSwitch/[UI]/ModsConfigUI.cs b/Source/ModSwitch/[UI]/ModsConfigUI.cs
@@ -436,6 +436,12 @@ public static void DoSearchBlock(Rect area, string weatermark, GUIStyle style =
                 if (shouldClearSearch)
                     searchTerm = string.Empty;
             }
+
+            public static bool MatchCriteria(string value) {
+                if (searchTerm != string.Empty)
+                    return value.IndexOf(searchTerm, StringComparison.CurrentCultureIgnoreCase) != -1;
+                return true;
+            }
         }
     }
 }