tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rules popup (#8485)

Browse Source 
* CVar to show rules popup for localhost.

For testing purposes.

* Fix rules popup being broken and throwing.

😐
This commit is contained in:
Pieter-Jan Briers
2022-05-27 23:50:11 +02:00
committed by GitHub
parent 38368d1341
commit 4c1b0b87fb
4 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Content.Client/Info/RulesAndInfoWindow.cs
View File

@@ -1,9 +1,11 @@
using Content.Client.EscapeMenu.UI;
using Content.Shared.CCVar;
using Robust.Client.ResourceManagement;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.Configuration;
using Robust.Shared.ContentPack;
namespace Content.Client.Info
{
@@ -44,7 +46,7 @@ namespace Content.Client.Info
private void PopulateRules(Info rulesList)
{
AddSection(rulesList, Loc.GetString("ui-rules-header"), _cfgManager.GetCVar(CCVars.RulesFile), true);
AddSection(rulesList, MakeRules(_cfgManager, _resourceManager));
}
private void PopulateTutorial(Info tutorialList)
@@ -58,10 +60,24 @@ namespace Content.Client.Info
infoControlSection.ControlsButton.OnPressed += _ => optionsMenu.OpenCentered();
}
private static void AddSection(Info info, Control control)
{
info.InfoContainer.AddChild(control);
}
private void AddSection(Info info, string title, string path, bool markup = false)
{
info.InfoContainer.AddChild(new InfoSection(title,
_resourceManager.ContentFileReadAllText($"/Server Info/{path}"), markup));
AddSection(info, MakeSection(title, path, markup, _resourceManager));
}
private static Control MakeSection(string title, string path, bool markup, IResourceManager res)
{
return new InfoSection(title, res.ContentFileReadAllText($"/Server Info/{path}"), markup);
}
public static Control MakeRules(IConfigurationManager cfg, IResourceManager res)
{
return MakeSection(Loc.GetString("ui-rules-header"), cfg.GetCVar(CCVars.RulesFile), true, res);
}
}
}