Clean up client game ticker status code.

Fixes #495
This commit is contained in:
Pieter-Jan Briers
2020-02-26 16:42:12 +01:00
parent 0adc134cd4
commit 0e6b55de66
14 changed files with 484 additions and 468 deletions

View File

@@ -24,7 +24,6 @@ namespace Content.Client.UserInterface
public LobbyCharacterPreviewPanel CharacterPreview { get; }
public LobbyGui(IEntityManager entityManager,
ILocalizationManager localization,
IResourceCache resourceCache,
IClientPreferencesManager preferencesManager)
{
@@ -69,7 +68,7 @@ namespace Content.Client.UserInterface
{
new Label
{
Text = localization.GetString("Lobby"),
Text = Loc.GetString("Lobby"),
StyleClasses = {NanoStyle.StyleClassLabelHeadingBigger},
/*MarginBottom = 40,
MarginLeft = 8,*/
@@ -88,7 +87,7 @@ namespace Content.Client.UserInterface
(LeaveButton = new Button
{
SizeFlagsHorizontal = SizeFlags.ShrinkEnd,
Text = localization.GetString("Leave"),
Text = Loc.GetString("Leave"),
StyleClasses = {NanoStyle.StyleClassButtonBig},
//GrowHorizontal = GrowDirection.Begin
})
@@ -115,7 +114,6 @@ namespace Content.Client.UserInterface
CharacterPreview = new LobbyCharacterPreviewPanel(
entityManager,
localization,
preferencesManager)
{
SizeFlagsHorizontal = SizeFlags.None
@@ -147,7 +145,7 @@ namespace Content.Client.UserInterface
{
(ObserveButton = new Button
{
Text = localization.GetString("Observe"),
Text = Loc.GetString("Observe"),
StyleClasses = {NanoStyle.StyleClassButtonBig}
}),
(StartTime = new Label
@@ -160,7 +158,7 @@ namespace Content.Client.UserInterface
(ReadyButton = new Button
{
ToggleMode = true,
Text = localization.GetString("Ready Up"),
Text = Loc.GetString("Ready Up"),
StyleClasses = {NanoStyle.StyleClassButtonBig}
}),
}
@@ -181,7 +179,7 @@ namespace Content.Client.UserInterface
{
(Chat = new ChatBox
{
Input = {PlaceHolder = localization.GetString("Say something!")}
Input = {PlaceHolder = Loc.GetString("Say something!")}
})
}
},
@@ -201,7 +199,7 @@ namespace Content.Client.UserInterface
{
new NanoHeading
{
Text = localization.GetString("Online Players"),
Text = Loc.GetString("Online Players"),
},
new MarginContainer
{
@@ -217,7 +215,7 @@ namespace Content.Client.UserInterface
},
new NanoHeading
{
Text = localization.GetString("Server Info"),
Text = Loc.GetString("Server Info"),
},
new MarginContainer
{
@@ -228,7 +226,7 @@ namespace Content.Client.UserInterface
MarginBottomOverride = 2,
Children =
{
(ServerInfo = new ServerInfo(localization))
(ServerInfo = new ServerInfo())
}
},
}