Merge branch 'feature-toolbarwrapper' into develop

Majiir · Sep 2, 2014 · 34d4a8c · 34d4a8c
2 parents 114d507 + 8a3b19a
commit 34d4a8c
Show file tree

Hide file tree

Showing 8 changed files with 910 additions and 142 deletions.
diff --git a/KethaneToolbar/KethaneToolbar.csproj b/KethaneToolbar/KethaneToolbar.csproj
diff --git a/KethaneToolbar/Properties/AssemblyInfo.cs b/KethaneToolbar/Properties/AssemblyInfo.cs
diff --git a/Plugin/IWindowToggle.cs b/Plugin/IWindowToggle.cs
diff --git a/Plugin/Kethane.csproj b/Plugin/Kethane.csproj
@@ -63,7 +63,6 @@
     <Compile Include="GeodesicGrid\Triangle.cs" />
     <Compile Include="GeodesicGrid\TriangleHit.cs" />
     <Compile Include="InstallCleanup.cs" />
-    <Compile Include="IWindowToggle.cs" />
     <Compile Include="LegacyResourceGenerator.cs" />
     <Compile Include="HeatSinkAnimator.cs" />
     <Compile Include="IResourceGenerator.cs" />
@@ -93,6 +92,8 @@
     <Compile Include="SettingsManager.cs" />
     <Compile Include="TerrainData.cs" />
     <Compile Include="TimedMovingAverage.cs" />
+    <Compile Include="WindowToggle.cs" />
+    <Compile Include="Toolbar\ToolbarWrapper.cs" />
     <Compile Include="TutorialInstaller.cs" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Plugin/Kethane.sln b/Plugin/Kethane.sln
@@ -1,10 +1,10 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kethane", "Kethane.csproj", "{8D1501AC-6C11-459B-9561-6CC5E3EC15FE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KethaneToolbar", "..\KethaneToolbar\KethaneToolbar.csproj", "{0A4BDEC5-89C4-4470-A40E-177D2FEF8300}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,10 +15,6 @@ Global
 		{8D1501AC-6C11-459B-9561-6CC5E3EC15FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8D1501AC-6C11-459B-9561-6CC5E3EC15FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8D1501AC-6C11-459B-9561-6CC5E3EC15FE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0A4BDEC5-89C4-4470-A40E-177D2FEF8300}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0A4BDEC5-89C4-4470-A40E-177D2FEF8300}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0A4BDEC5-89C4-4470-A40E-177D2FEF8300}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0A4BDEC5-89C4-4470-A40E-177D2FEF8300}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Plugin/MapOverlay.cs b/Plugin/MapOverlay.cs
@@ -1,4 +1,5 @@
 using Kethane.GeodesicGrid;
+using Kethane.Toolbar;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -33,7 +34,7 @@ public class MapOverlay : MonoBehaviour
         private static Rect controlWindowPos = new Rect(0, 0, 160, 0);
         private static bool revealAll = false;
         private static bool expandWindow = true;
-        private static IWindowToggle toolbar = findToolbar();
+        private static WindowToggle toolbar = findToolbar();
 
         private static readonly Color32 colorEmpty = Misc.Parse(SettingsManager.GetValue("ColorEmpty"), new Color32(128, 128, 128, 192));
         private static readonly Color32 colorUnknown = Misc.Parse(SettingsManager.GetValue("ColorUnknown"), new Color32(0, 0, 0, 128));
@@ -272,35 +273,16 @@ private static Color32 getDepositColor(ResourceDefinition definition, IBodyResou
             return color;
         }
 
-        private static IWindowToggle findToolbar()
+        private static WindowToggle findToolbar()
         {
-            System.Reflection.ConstructorInfo constructor = null;
-            foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
+            if (ToolbarManager.ToolbarAvailable)
             {
-                try
-                {
-                    constructor = assembly.GetTypes()
-                        .Where(t => t.GetInterfaces().Contains(typeof(IWindowToggle)))
-                        .Select(t => t.GetConstructor(System.Type.EmptyTypes))
-                        .FirstOrDefault(c => c != null);
-
-                    if (constructor != null) { break; }
-                }
-                catch (Exception e)
-                {
-                    Debug.LogWarning("[Kethane] Error inspecting assembly '" + assembly.GetName().Name + "': \n" + e);
-                }
+                Debug.Log("[Kethane] Toolbar instance found. Using new interface.");
+                return new WindowToggle();
             }
-
-            if (constructor == null) { return null; }
-
-            try
-            {
-                return (IWindowToggle)constructor.Invoke(new object[0]);
-            }
-            catch (Exception e)
+            else
             {
-                Debug.LogError("[Kethane] Could not instantiate " + constructor.DeclaringType.Name + ":\n" + e);
+                Debug.LogWarning("[Kethane] Could not find Toolbar instance. Reverting to legacy interface.");
                 return null;
             }
         }