diff --git a/Content.Client/Guidebook/Controls/GuidebookControl.xaml b/Content.Client/Guidebook/Controls/GuidebookControl.xaml
deleted file mode 100644
index 110cf4ea85..0000000000
--- a/Content.Client/Guidebook/Controls/GuidebookControl.xaml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Content.Client/Guidebook/Controls/GuidebookControl.xaml.cs b/Content.Client/Guidebook/Controls/GuidebookControl.xaml.cs
deleted file mode 100644
index b490f8faa6..0000000000
--- a/Content.Client/Guidebook/Controls/GuidebookControl.xaml.cs
+++ /dev/null
@@ -1,187 +0,0 @@
-using System.Linq;
-using Content.Client.Guidebook.RichText;
-using Content.Client.UserInterface.ControlExtensions;
-using Content.Client.UserInterface.Controls.FancyTree;
-using Robust.Client.AutoGenerated;
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.XAML;
-using Robust.Shared.ContentPack;
-
-namespace Content.Client.Guidebook.Controls;
-[GenerateTypedNameReferences]
-public sealed partial class GuidebookControl : Control, ILinkClickHandler
-{
- [Dependency] private readonly IResourceManager _resourceManager = default!;
- [Dependency] private readonly DocumentParsingManager _parsingMan = default!;
-
- private Dictionary _entries = new();
-
- public GuidebookControl()
- {
- RobustXamlLoader.Load(this);
- IoCManager.InjectDependencies(this);
-
- Tree.OnSelectedItemChanged += OnSelectionChanged;
-
- SearchBar.OnTextChanged += _ =>
- {
- HandleFilter();
- };
- }
-
- private IClydeWindow? ClydeWindow { get; set; }
-
- private void OnSelectionChanged(TreeItem? item)
- {
- if (item != null && item.Metadata is GuideEntry entry)
- ShowGuide(entry);
- else
- ClearSelectedGuide();
- }
-
- public void ClearSelectedGuide()
- {
- Placeholder.Visible = true;
- EntryContainer.Visible = false;
- SearchContainer.Visible = false;
- EntryContainer.RemoveAllChildren();
- }
-
- private void ShowGuide(GuideEntry entry)
- {
- Scroll.SetScrollValue(default);
- Placeholder.Visible = false;
- EntryContainer.Visible = true;
- SearchBar.Text = "";
- EntryContainer.RemoveAllChildren();
- using var file = _resourceManager.ContentFileReadText(entry.Text);
-
- SearchContainer.Visible = entry.FilterEnabled;
-
- if (!_parsingMan.TryAddMarkup(EntryContainer, file.ReadToEnd()))
- {
- EntryContainer.AddChild(new Label() { Text = "ERROR: Failed to parse document." });
- Logger.Error($"Failed to parse contents of guide document {entry.Id}.");
- }
- }
-
- public void UpdateGuides(
- Dictionary entries,
- List? rootEntries = null,
- string? forceRoot = null,
- string? selected = null)
- {
- _entries = entries;
- RepopulateTree(rootEntries, forceRoot);
- ClearSelectedGuide();
-
- Split.State = SplitContainer.SplitState.Auto;
- if (entries.Count == 1)
- {
- TreeBox.Visible = false;
- Split.ResizeMode = SplitContainer.SplitResizeMode.NotResizable;
- selected = entries.Keys.First();
- }
- else
- {
- TreeBox.Visible = true;
- Split.ResizeMode = SplitContainer.SplitResizeMode.RespectChildrenMinSize;
- }
-
- if (selected != null)
- {
- var item = Tree.Items.FirstOrDefault(x => x.Metadata is GuideEntry entry && entry.Id == selected);
- Tree.SetSelectedIndex(item?.Index);
- }
- }
-
- private IEnumerable GetSortedRootEntries(List? rootEntries)
- {
- if (rootEntries == null)
- {
- HashSet entries = new(_entries.Keys);
- foreach (var entry in _entries.Values)
- {
- entries.ExceptWith(entry.Children);
- }
- rootEntries = entries.ToList();
- }
-
- return rootEntries
- .Select(x => _entries[x])
- .OrderBy(x => x.Priority)
- .ThenBy(x => Loc.GetString(x.Name));
- }
-
- private void RepopulateTree(List? roots = null, string? forcedRoot = null)
- {
- Tree.Clear();
-
- HashSet addedEntries = new();
-
- TreeItem? parent = forcedRoot == null ? null : AddEntry(forcedRoot, null, addedEntries);
- foreach (var entry in GetSortedRootEntries(roots))
- {
- AddEntry(entry.Id, parent, addedEntries);
- }
- Tree.SetAllExpanded(true);
- }
-
- private TreeItem? AddEntry(string id, TreeItem? parent, HashSet addedEntries)
- {
- if (!_entries.TryGetValue(id, out var entry))
- return null;
-
- if (!addedEntries.Add(id))
- {
- Logger.Error($"Adding duplicate guide entry: {id}");
- return null;
- }
-
- var item = Tree.AddItem(parent);
- item.Metadata = entry;
- var name = Loc.GetString(entry.Name);
- item.Label.Text = name;
-
- foreach (var child in entry.Children)
- {
- AddEntry(child, item, addedEntries);
- }
-
- return item;
- }
-
- public void HandleClick(string link)
- {
- if (!_entries.TryGetValue(link, out var entry))
- return;
-
- if (Tree.TryGetIndexFromMetadata(entry, out var index))
- {
- Tree.ExpandParentEntries(index.Value);
- Tree.SetSelectedIndex(index);
- }
- else
- {
- ShowGuide(entry);
- }
- }
-
- private void HandleFilter()
- {
- var emptySearch = SearchBar.Text.Trim().Length == 0;
-
- if (Tree.SelectedItem != null && Tree.SelectedItem.Metadata is GuideEntry entry && entry.FilterEnabled)
- {
- var foundElements = EntryContainer.GetSearchableControls();
-
- foreach (var element in foundElements)
- {
- element.SetHiddenState(true, SearchBar.Text.Trim());
- }
- }
-
- }
-}
diff --git a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml
index ceb2b65be8..8dbfde3c47 100644
--- a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml
+++ b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml
@@ -2,8 +2,34 @@
xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
xmlns:fancyTree="clr-namespace:Content.Client.UserInterface.Controls.FancyTree"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
- xmlns:controls1="clr-namespace:Content.Client.Guidebook.Controls"
+ SetSize="750 700"
+ MinSize="100 200"
Resizable="True"
Title="{Loc 'guidebook-window-title'}">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs
index 0daf413aa2..113c192beb 100644
--- a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs
+++ b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs
@@ -6,7 +6,6 @@ using Content.Client.UserInterface.Controls;
using Content.Client.UserInterface.Controls.FancyTree;
using JetBrains.Annotations;
using Robust.Client.AutoGenerated;
-using Robust.Client.Graphics;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;
@@ -15,6 +14,175 @@ using Robust.Shared.ContentPack;
namespace Content.Client.Guidebook.Controls;
[GenerateTypedNameReferences]
-public sealed partial class GuidebookWindow : FancyWindow
+public sealed partial class GuidebookWindow : FancyWindow, ILinkClickHandler
{
+ [Dependency] private readonly IResourceManager _resourceManager = default!;
+ [Dependency] private readonly DocumentParsingManager _parsingMan = default!;
+
+ private Dictionary _entries = new();
+
+ public GuidebookWindow()
+ {
+ RobustXamlLoader.Load(this);
+ IoCManager.InjectDependencies(this);
+
+ Tree.OnSelectedItemChanged += OnSelectionChanged;
+
+ SearchBar.OnTextChanged += _ =>
+ {
+ HandleFilter();
+ };
+ }
+
+ private void OnSelectionChanged(TreeItem? item)
+ {
+ if (item != null && item.Metadata is GuideEntry entry)
+ ShowGuide(entry);
+ else
+ ClearSelectedGuide();
+ }
+
+ public void ClearSelectedGuide()
+ {
+ Placeholder.Visible = true;
+ EntryContainer.Visible = false;
+ SearchContainer.Visible = false;
+ EntryContainer.RemoveAllChildren();
+ }
+
+ private void ShowGuide(GuideEntry entry)
+ {
+ Scroll.SetScrollValue(default);
+ Placeholder.Visible = false;
+ EntryContainer.Visible = true;
+ SearchBar.Text = "";
+ EntryContainer.RemoveAllChildren();
+ using var file = _resourceManager.ContentFileReadText(entry.Text);
+
+ SearchContainer.Visible = entry.FilterEnabled;
+
+ if (!_parsingMan.TryAddMarkup(EntryContainer, file.ReadToEnd()))
+ {
+ EntryContainer.AddChild(new Label() { Text = "ERROR: Failed to parse document." });
+ Logger.Error($"Failed to parse contents of guide document {entry.Id}.");
+ }
+ }
+
+ public void UpdateGuides(
+ Dictionary entries,
+ List? rootEntries = null,
+ string? forceRoot = null,
+ string? selected = null)
+ {
+ _entries = entries;
+ RepopulateTree(rootEntries, forceRoot);
+ ClearSelectedGuide();
+
+ Split.State = SplitContainer.SplitState.Auto;
+ if (entries.Count == 1)
+ {
+ TreeBox.Visible = false;
+ Split.ResizeMode = SplitContainer.SplitResizeMode.NotResizable;
+ selected = entries.Keys.First();
+ }
+ else
+ {
+ TreeBox.Visible = true;
+ Split.ResizeMode = SplitContainer.SplitResizeMode.RespectChildrenMinSize;
+ }
+
+ if (selected != null)
+ {
+ var item = Tree.Items.FirstOrDefault(x => x.Metadata is GuideEntry entry && entry.Id == selected);
+ Tree.SetSelectedIndex(item?.Index);
+ }
+ }
+
+ private IEnumerable GetSortedRootEntries(List? rootEntries)
+ {
+ if (rootEntries == null)
+ {
+ HashSet entries = new(_entries.Keys);
+ foreach (var entry in _entries.Values)
+ {
+ entries.ExceptWith(entry.Children);
+ }
+ rootEntries = entries.ToList();
+ }
+
+ return rootEntries
+ .Select(x => _entries[x])
+ .OrderBy(x => x.Priority)
+ .ThenBy(x => Loc.GetString(x.Name));
+ }
+
+ private void RepopulateTree(List? roots = null, string? forcedRoot = null)
+ {
+ Tree.Clear();
+
+ HashSet addedEntries = new();
+
+ TreeItem? parent = forcedRoot == null ? null : AddEntry(forcedRoot, null, addedEntries);
+ foreach (var entry in GetSortedRootEntries(roots))
+ {
+ AddEntry(entry.Id, parent, addedEntries);
+ }
+ Tree.SetAllExpanded(true);
+ }
+
+ private TreeItem? AddEntry(string id, TreeItem? parent, HashSet addedEntries)
+ {
+ if (!_entries.TryGetValue(id, out var entry))
+ return null;
+
+ if (!addedEntries.Add(id))
+ {
+ Logger.Error($"Adding duplicate guide entry: {id}");
+ return null;
+ }
+
+ var item = Tree.AddItem(parent);
+ item.Metadata = entry;
+ var name = Loc.GetString(entry.Name);
+ item.Label.Text = name;
+
+ foreach (var child in entry.Children)
+ {
+ AddEntry(child, item, addedEntries);
+ }
+
+ return item;
+ }
+
+ public void HandleClick(string link)
+ {
+ if (!_entries.TryGetValue(link, out var entry))
+ return;
+
+ if (Tree.TryGetIndexFromMetadata(entry, out var index))
+ {
+ Tree.ExpandParentEntries(index.Value);
+ Tree.SetSelectedIndex(index);
+ }
+ else
+ {
+ ShowGuide(entry);
+ }
+ }
+
+ private void HandleFilter()
+ {
+ var emptySearch = SearchBar.Text.Trim().Length == 0;
+
+ if (Tree.SelectedItem != null && Tree.SelectedItem.Metadata is GuideEntry entry && entry.FilterEnabled)
+ {
+ var foundElements = EntryContainer.GetSearchableControls();
+
+ foreach (var element in foundElements)
+ {
+ element.SetHiddenState(true, SearchBar.Text.Trim());
+ }
+ }
+
+ }
}
diff --git a/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs b/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs
index 046ff9663b..20e3158f74 100644
--- a/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs
+++ b/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs
@@ -5,7 +5,6 @@ using Content.Client.Guidebook.Controls;
using Content.Client.Lobby;
using Content.Client.UserInterface.Controls;
using Content.Shared.Input;
-using Robust.Client.Graphics;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controllers;
using static Robust.Client.UserInterface.Controls.BaseButton;
@@ -18,11 +17,7 @@ namespace Content.Client.UserInterface.Systems.Guidebook;
public sealed class GuidebookUIController : UIController, IOnStateEntered, IOnStateEntered, IOnStateExited, IOnStateExited, IOnSystemChanged
{
[UISystemDependency] private readonly GuidebookSystem _guidebookSystem = default!;
- [Dependency] private readonly IClyde _clyde = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
- [Dependency] private readonly IUserInterfaceManager _uiManager = default!;
-
- private IClydeWindow? ClydeWindow { get; set; }
private GuidebookWindow? _guideWindow;
private MenuButton? GuidebookButton => UIManager.GetActiveUIWidgetOrNull()?.GuidebookButton;
@@ -45,7 +40,6 @@ public sealed class GuidebookUIController : UIController, IOnStateEntered();
_guideWindow.OnClose += OnWindowClosed;
_guideWindow.OnOpen += OnWindowOpen;
- _guideWindow.Guidebook.PopOutButton.OnPressed += _ => PopOut();
// setup keybinding
CommandBinds.Builder
@@ -141,12 +135,7 @@ public sealed class GuidebookUIController : UIController, IOnStateEntered();
- _guideWindow.OnClose += OnWindowClosed;
- _guideWindow.OnOpen += OnWindowOpen;
- _guideWindow.Guidebook.PopOutButton.OnPressed += _ => PopOut();
- }
+ return;
if (_guideWindow.IsOpen)
{
@@ -172,11 +161,11 @@ public sealed class GuidebookUIController : UIController, IOnStateEntered