fix: changed the rotation info panel.

ArchiDog1998 · Apr 11, 2023 · 86c7369 · 86c7369
1 parent b1371d0
commit 86c7369
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 55 deletions.
diff --git a/RotationSolver/RotationHelper.cs b/RotationSolver/RotationHelper.cs
@@ -8,6 +8,7 @@
 using System.Diagnostics;
 using System.Runtime.Loader;
 using System.Text;
+using System.Xml.Linq;
 
 namespace RotationSolver;
 
@@ -113,11 +114,16 @@ public static bool IsAllowed(this ICustomRotation rotation, out string name)
             return false;
         }
         var assembly = rotation.GetType().Assembly;
+        name = assembly.GetName().Name;
 
-        if(_assemblyInfos.TryGetValue(assembly, out var info))
+        return assembly.IsAllowed();
+    }
+
+    public static bool IsAllowed(this Assembly assembly)
+    {
+        if (_assemblyInfos.TryGetValue(assembly, out var info))
         {
-            name = info.Name;
-            return _allowedAssembly.Contains(name + " - " + info.Author);
+            return _allowedAssembly.Contains(info.Name + " - " + info.Author);
         }
         return false;
     }

diff --git a/RotationSolver/UI/RotationConfigWindow_Rotation.cs b/RotationSolver/UI/RotationConfigWindow_Rotation.cs
@@ -1,6 +1,7 @@
 using Dalamud.Interface.Colors;
 using RotationSolver.Localization;
 using RotationSolver.Updaters;
+using System.Diagnostics;
 
 namespace RotationSolver.UI;
 internal partial class RotationConfigWindow
@@ -37,6 +38,16 @@ private static void DrawRoleItems()
                 ImGui.EndTabItem();
             }
         }
+
+        if (ImGui.BeginTabItem("Info"))
+        {
+            if (ImGui.BeginChild("Third-party Libs", new Vector2(0f, -1f), true))
+            {
+                DrawInfos();
+                ImGui.EndChild();
+            }
+            ImGui.EndTabItem();
+        }
     }
 
     private static void DrawRotations(RotationUpdater.CustomRotationGroup[] rotations)
@@ -55,7 +66,7 @@ private static void DrawRotations(RotationUpdater.CustomRotationGroup[] rotation
         }
     }
 
-    internal static void DrawRotationRole(ICustomRotation rotation)
+    private static void DrawRotationRole(ICustomRotation rotation)
     {
         DrawTargetHostileTYpe(rotation);
         DrawSpecialRoleSettings(rotation.Job.GetJobRole(), rotation.JobIDs[0]);
@@ -145,4 +156,42 @@ private static void DrawDragFloat(ClassJobID job, string desc, Func<float> getVa
             Service.Config.Save();
         }
     }
+
+    private static void DrawInfos()
+    {
+        var assemblyGrps = RotationUpdater.CustomRotationsDict
+            .SelectMany(d => d.Value)
+            .SelectMany(g => g.rotations)
+            .GroupBy(r => r.GetType().Assembly);
+
+        if (ImGui.BeginTable("AssemblyTable", 3))
+        {
+            foreach (var grp in assemblyGrps)
+            {
+                ImGui.TableNextRow();
+
+
+                var assembly = grp.Key;
+                var isAllowed = assembly.IsAllowed();
+                if (isAllowed) ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DPSRed);
+
+                var info = assembly.GetInfo();
+
+                if (ImGui.Button(info.Name + assembly.GetName().Version))
+                {
+                    Process.Start("explorer.exe", info.Path);
+                }
+
+                ImGui.TableNextColumn();
+                ImGui.Text(info.Author);
+
+                ImGui.TableNextColumn();
+
+                ImGui.Text(string.Join('\n', grp));
+
+                if (isAllowed) ImGui.PopStyleColor();
+            }
+            ImGui.EndTable();
+        }
+    }
 }
diff --git a/RotationSolver/UI/RotationConfigWindow_RotationDev.cs b/RotationSolver/UI/RotationConfigWindow_RotationDev.cs
@@ -27,30 +27,6 @@ private void DrawRotationDevTab()
         DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_InDebug,
             ref Service.Config.InDebug, Service.Default.InDebug);
 
-        ImGui.PushStyleVar(ImGuiStyleVar.ItemSpacing, new Vector2(0f, 5f));
-
-        if (ImGui.BeginTabBar("Rotation Devs"))
-        {
-            if (ImGui.BeginTabItem("Libs"))
-            {
-                DrawThridLibs();
-                ImGui.EndTabItem();
-            }
-
-            if (ImGui.BeginTabItem("Infos"))
-            {
-                DrawAssemblyInfos();
-                ImGui.EndTabItem();
-            }
-
-            ImGui.EndTabBar();
-        }
-        ImGui.PopStyleVar();
-    }
-
-    private void DrawThridLibs()
-    {
-
         if (ImGui.BeginChild("Third-party Libs", new Vector2(0f, -1f), true))
         {
             if (ImGui.Button("AddOne"))
@@ -84,31 +60,4 @@ private void DrawThridLibs()
             ImGui.EndChild();
         }
     }
-    private void DrawAssemblyInfos()
-    {
-        var assemblies = RotationUpdater.CustomRotationsDict
-            .SelectMany(d => d.Value)
-            .SelectMany(g => g.rotations)
-            .Select(r => r.GetType().Assembly)
-            .ToHashSet();
-
-        //if(ImGui.BeginTable("AssemblyTable", 2))
-        //{
-        //    foreach (var assembly in assemblies)
-        //    {
-        //        ImGui.TableNextRow();
-        //        if (ImGui.Button(assembly.GetName().Name + assembly.GetName().Version))
-        //        {
-        //            if (!RotationHelper.AssemblyInfos.TryGetValue(assembly.GetName().Name, out var path))
-        //                path = assembly.Location;
-
-        //            Process.Start("explorer.exe", path);
-        //        }
-
-        //        ImGui.TableNextColumn();
-        //        ImGui.Text(assembly.GetAuthor());
-        //    }
-        //    ImGui.EndTable();
-        //}
-    }
 }