refactor(settings-refactor): regroup Database tab into storage, viewer, stats tree nodes

ChatTwo/Resources/HellionStrings.Designer.cs

@@ -228,4 +228,9 @@ internal class HellionStrings
     internal static string Settings_Chat_Behaviour_Heading => Get(nameof(Settings_Chat_Behaviour_Heading));
     internal static string Settings_Chat_Preview_Heading => Get(nameof(Settings_Chat_Preview_Heading));
     internal static string Settings_Chat_Emotes_Heading => Get(nameof(Settings_Chat_Emotes_Heading));
+
+    // Hellion Chat — Database-Tab section headings
+    internal static string Settings_Database_Storage_Heading => Get(nameof(Settings_Database_Storage_Heading));
+    internal static string Settings_Database_Viewer_Heading => Get(nameof(Settings_Database_Viewer_Heading));
+    internal static string Settings_Database_Stats_Heading => Get(nameof(Settings_Database_Stats_Heading));
 }

ChatTwo/Resources/HellionStrings.de.resx

@@ -522,4 +522,15 @@
   <data name="Settings_Chat_Emotes_Heading" xml:space="preserve">
     <value>Emotes</value>
   </data>
+
+  <!-- Hellion Chat — Sektions-Überschriften des Database-Tabs -->
+  <data name="Settings_Database_Storage_Heading" xml:space="preserve">
+    <value>Speicherung</value>
+  </data>
+  <data name="Settings_Database_Viewer_Heading" xml:space="preserve">
+    <value>DB-Viewer</value>
+  </data>
+  <data name="Settings_Database_Stats_Heading" xml:space="preserve">
+    <value>Statistiken</value>
+  </data>
 </root>

ChatTwo/Resources/HellionStrings.resx

@@ -522,4 +522,15 @@
   <data name="Settings_Chat_Emotes_Heading" xml:space="preserve">
     <value>Emotes</value>
   </data>
+
+  <!-- Hellion Chat — Database-Tab section headings -->
+  <data name="Settings_Database_Storage_Heading" xml:space="preserve">
+    <value>Storage</value>
+  </data>
+  <data name="Settings_Database_Viewer_Heading" xml:space="preserve">
+    <value>DB Viewer</value>
+  </data>
+  <data name="Settings_Database_Stats_Heading" xml:space="preserve">
+    <value>Statistics</value>
+  </data>
 </root>

ChatTwo/Ui/SettingsTabs/Database.cs

@@ -33,30 +33,47 @@ internal sealed class Database : ISettingsTab
 
     public void Draw(bool changed)
     {
+        // Shift-on-open keeps the Advanced tools available without a permanent
+        // toggle in the UI, mirroring upstream Chat 2 behaviour.
         if (changed)
             ShowAdvanced = ImGui.GetIO().KeyShift;
 
-        ImGuiUtil.OptionCheckbox(ref Mutable.DatabaseBattleMessages, Language.Options_DatabaseBattleMessages_Name, Language.Options_DatabaseBattleMessages_Description);
+        DrawStorageSection();
         ImGui.Spacing();
+        DrawViewerSection();
+        ImGui.Spacing();
+        DrawStatsSection();
+    }
 
-        if (ImGuiUtil.OptionCheckbox(ref Mutable.LoadPreviousSession, Language.Options_LoadPreviousSession_Name, Language.Options_LoadPreviousSession_Description))
+    private void DrawStorageSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Database_Storage_Heading);
+        if (!tree.Success)
+            return;
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            ImGui.Checkbox(Language.Options_DatabaseBattleMessages_Name, ref Mutable.DatabaseBattleMessages);
+            ImGuiUtil.HelpMarker(Language.Options_DatabaseBattleMessages_Description);
+
+            if (ImGui.Checkbox(Language.Options_LoadPreviousSession_Name, ref Mutable.LoadPreviousSession))
                 if (Mutable.LoadPreviousSession)
                     Mutable.FilterIncludePreviousSessions = true;
+            ImGuiUtil.HelpMarker(Language.Options_LoadPreviousSession_Description);
 
-        ImGui.Spacing();
+            if (ImGui.Checkbox(Language.Options_FilterIncludePreviousSessions_Name, ref Mutable.FilterIncludePreviousSessions))
-
-        if (ImGuiUtil.OptionCheckbox(ref Mutable.FilterIncludePreviousSessions, Language.Options_FilterIncludePreviousSessions_Name, Language.Options_FilterIncludePreviousSessions_Description))
                 if (!Mutable.FilterIncludePreviousSessions)
                     Mutable.LoadPreviousSession = false;
-
+            ImGuiUtil.HelpMarker(Language.Options_FilterIncludePreviousSessions_Description);
-        ImGui.Spacing();
-        ImGui.Separator();
-        ImGui.Spacing();
 
             var old = new FileInfo(Path.Join(Plugin.Interface.ConfigDirectory.FullName, "chat.db"));
             var migratedOld = new FileInfo(Path.Join(Plugin.Interface.ConfigDirectory.FullName, "chat-litedb.db"));
             if (old.Exists || migratedOld.Exists)
             {
+                ImGui.Spacing();
+                ImGui.Separator();
+                ImGui.Spacing();
+
                 ImGui.TextUnformatted(Language.Options_Database_Old_Heading);
                 ImGui.Spacing();
 
@@ -76,12 +93,18 @@ internal sealed class Database : ISettingsTab
                         WrapperUtil.AddNotification(Language.Options_Database_Old_Delete_Error, NotificationType.Error);
                     }
                 }
-
+            }
-            ImGui.Spacing();
+        }
-            ImGui.Separator();
-            ImGui.Spacing();
     }
 
+    private void DrawViewerSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Database_Viewer_Heading);
+        if (!tree.Success)
+            return;
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
             ImGui.TextUnformatted(Language.Options_Database_Metadata_Heading);
             using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
             {
@@ -132,12 +155,20 @@ internal sealed class Database : ISettingsTab
                     WrapperUtil.AddNotification(Language.Options_ClearDatabase_Success, NotificationType.Info);
                 }
             }
+        }
+    }
 
-        ImGui.Spacing();
+    private void DrawStatsSection()
-
+    {
         if (!ShowAdvanced)
             return;
 
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Database_Stats_Heading);
+        if (!tree.Success)
+            return;
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
             using var treeNode = ImRaii.TreeNode(Language.Options_Database_Advanced);
             using var wrap = ImRaii.TextWrapPos(0.0f);
 
@@ -153,7 +184,7 @@ internal sealed class Database : ISettingsTab
 
             if (ImGuiUtil.CtrlShiftButton("Inject 10,000 messages", "Ctrl+Shift: creates 10,000 unique messages (async)"))
                 new Thread(() => InsertMessages(10_000)).Start();
-        ImGui.Spacing();
+        }
     }
 
     private void InsertMessages(int count)