From ac78145b94df72c00b50e3655a1734503100f924 Mon Sep 17 00:00:00 2001
From: Visne <39844191+Visne@users.noreply.github.com>
Date: Thu, 28 Oct 2021 14:23:17 +0200
Subject: [PATCH] Remove encapsulation for previously protected XAML UI fields
(#4975)
---
.../UI/AdminAnnounceWindow.xaml | 8 ++---
.../UI/AdminAnnounceWindow.xaml.cs | 4 ---
.../Alerts/ClientAlertsComponent.cs | 12 +++----
Content.Client/Alerts/UI/AlertsUI.xaml | 2 +-
Content.Client/Alerts/UI/AlertsUI.xaml.cs | 2 --
Content.Client/Cargo/UI/CargoConsoleMenu.xaml | 5 +--
.../Cargo/UI/CargoConsoleMenu.xaml.cs | 2 --
.../Cargo/UI/CargoConsoleOrderMenu.xaml | 12 ++++---
.../Cargo/UI/CargoConsoleOrderMenu.xaml.cs | 5 ---
Content.Client/Cargo/UI/CargoOrderRow.xaml | 15 ++++++---
Content.Client/Cargo/UI/CargoOrderRow.xaml.cs | 5 ---
Content.Client/Cargo/UI/CargoProductRow.xaml | 12 ++++---
.../Cargo/UI/CargoProductRow.xaml.cs | 4 ---
.../UI/TransferAmountBoundUserInterface.cs | 4 +--
.../Chemistry/UI/TransferAmountWindow.xaml | 4 +--
.../Chemistry/UI/TransferAmountWindow.xaml.cs | 3 --
.../Construction/UI/ConstructionMenu.xaml | 6 ++--
.../Construction/UI/ConstructionMenu.xaml.cs | 15 +++------
.../UI/ConstructionMenuPresenter.cs | 4 +--
.../Disposal/UI/DisposalRouterWindow.xaml | 6 ++--
.../Disposal/UI/DisposalRouterWindow.xaml.cs | 3 --
.../Disposal/UI/DisposalTaggerWindow.xaml | 6 ++--
.../Disposal/UI/DisposalTaggerWindow.xaml.cs | 3 --
.../Disposal/UI/DisposalUnitWindow.xaml | 9 ++++--
.../Disposal/UI/DisposalUnitWindow.xaml.cs | 4 ---
.../Gravity/UI/GravityGeneratorWindow.xaml | 3 +-
.../Gravity/UI/GravityGeneratorWindow.xaml.cs | 2 --
.../Kitchen/UI/LabelledContentBox.xaml | 14 ++++-----
.../Kitchen/UI/LabelledContentBox.xaml.cs | 5 +--
Content.Client/Lobby/UI/LobbyGui.xaml | 31 ++++++++++++-------
Content.Client/Lobby/UI/LobbyGui.xaml.cs | 12 +------
Content.Client/MainMenu/MainMenu.cs | 4 +--
.../MainMenu/UI/MainMenuControl.xaml | 18 +++++++----
.../MainMenu/UI/MainMenuControl.xaml.cs | 9 +-----
.../UI/MedicalScannerWindow.xaml | 3 +-
.../UI/MedicalScannerWindow.xaml.cs | 2 --
Content.Client/PDA/PDAMenu.xaml | 17 ++++++----
Content.Client/PDA/PDAMenu.xaml.cs | 10 ------
Content.Client/Paper/UI/PaperWindow.xaml | 3 +-
Content.Client/Paper/UI/PaperWindow.xaml.cs | 2 --
.../Preferences/UI/CharacterSetupGui.xaml | 16 +++++-----
.../Preferences/UI/CharacterSetupGui.xaml.cs | 20 +++++-------
.../Research/UI/ResearchConsoleMenu.xaml | 9 ++++--
.../Research/UI/ResearchConsoleMenu.xaml.cs | 4 ---
.../Traitor/Uplink/UplinkListingControl.xaml | 3 +-
.../Uplink/UplinkListingControl.xaml.cs | 6 ++--
Content.Client/Traitor/Uplink/UplinkMenu.xaml | 3 +-
.../Traitor/Uplink/UplinkMenu.xaml.cs | 1 -
.../Components/Mobs/AlertsComponentTests.cs | 8 ++---
49 files changed, 158 insertions(+), 202 deletions(-)
diff --git a/Content.Client/Administration/UI/AdminAnnounceWindow.xaml b/Content.Client/Administration/UI/AdminAnnounceWindow.xaml
index 35c63cb975..20c64f827d 100644
--- a/Content.Client/Administration/UI/AdminAnnounceWindow.xaml
+++ b/Content.Client/Administration/UI/AdminAnnounceWindow.xaml
@@ -4,12 +4,12 @@
MinWidth="500">
-
+
-
+
-
+
-
+
diff --git a/Content.Client/Administration/UI/AdminAnnounceWindow.xaml.cs b/Content.Client/Administration/UI/AdminAnnounceWindow.xaml.cs
index bbb1f4907d..93f81ca807 100644
--- a/Content.Client/Administration/UI/AdminAnnounceWindow.xaml.cs
+++ b/Content.Client/Administration/UI/AdminAnnounceWindow.xaml.cs
@@ -13,10 +13,6 @@ namespace Content.Client.Administration.UI
public partial class AdminAnnounceWindow : SS14Window
{
[Dependency] private readonly ILocalizationManager _localization = default!;
- public Button AnnounceButton => _announceButton;
- public OptionButton AnnounceMethod => _announceMethod;
- public LineEdit Announcer => _announcer;
- public LineEdit Announcement => _announcement;
public AdminAnnounceWindow()
{
diff --git a/Content.Client/Alerts/ClientAlertsComponent.cs b/Content.Client/Alerts/ClientAlertsComponent.cs
index 7f400dce25..385135589c 100644
--- a/Content.Client/Alerts/ClientAlertsComponent.cs
+++ b/Content.Client/Alerts/ClientAlertsComponent.cs
@@ -112,7 +112,7 @@ namespace Content.Client.Alerts
{
_alertControls.Remove(alertKeyToRemove, out var control);
if (control == null) return;
- _ui.Grid.Children.Remove(control);
+ _ui.AlertContainer.Children.Remove(control);
}
// now we know that alertControls contains alerts that should still exist but
@@ -145,7 +145,7 @@ namespace Content.Client.Alerts
{
if (existingAlertControl != null)
{
- _ui.Grid.Children.Remove(existingAlertControl);
+ _ui.AlertContainer.Children.Remove(existingAlertControl);
}
// this is a new alert + alert key or just a different alert with the same
@@ -154,12 +154,12 @@ namespace Content.Client.Alerts
if (_alertOrder != null)
{
var added = false;
- foreach (var alertControl in _ui.Grid.Children)
+ foreach (var alertControl in _ui.AlertContainer.Children)
{
if (_alertOrder.Compare(newAlert, ((AlertControl) alertControl).Alert) < 0)
{
var idx = alertControl.GetPositionInParent();
- _ui.Grid.Children.Add(newAlertControl);
+ _ui.AlertContainer.Children.Add(newAlertControl);
newAlertControl.SetPositionInParent(idx);
added = true;
break;
@@ -168,12 +168,12 @@ namespace Content.Client.Alerts
if (!added)
{
- _ui.Grid.Children.Add(newAlertControl);
+ _ui.AlertContainer.Children.Add(newAlertControl);
}
}
else
{
- _ui.Grid.Children.Add(newAlertControl);
+ _ui.AlertContainer.Children.Add(newAlertControl);
}
_alertControls[newAlert.AlertKey] = newAlertControl;
diff --git a/Content.Client/Alerts/UI/AlertsUI.xaml b/Content.Client/Alerts/UI/AlertsUI.xaml
index 516db31159..bfb0824499 100644
--- a/Content.Client/Alerts/UI/AlertsUI.xaml
+++ b/Content.Client/Alerts/UI/AlertsUI.xaml
@@ -3,7 +3,7 @@
-
+
diff --git a/Content.Client/Alerts/UI/AlertsUI.xaml.cs b/Content.Client/Alerts/UI/AlertsUI.xaml.cs
index 0a1d35ef88..0bbbe9d08c 100644
--- a/Content.Client/Alerts/UI/AlertsUI.xaml.cs
+++ b/Content.Client/Alerts/UI/AlertsUI.xaml.cs
@@ -18,8 +18,6 @@ namespace Content.Client.Alerts.UI
public const float ChatSeparation = 38f;
- public GridContainer Grid => AlertContainer;
-
public AlertsUI()
{
IoCManager.InjectDependencies(this);
diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml
index 867556ce92..2a8953ff2b 100644
--- a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml
+++ b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml
@@ -2,7 +2,7 @@
xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
SetSize="400 600"
MinSize="400 600">
-
+
@@ -28,7 +28,8 @@
Text="0/20" />
-
diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
index a4a5ac5e9b..b0d45d7bf1 100644
--- a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
@@ -25,8 +25,6 @@ namespace Content.Client.Cargo.UI
public event Action? OnOrderApproved;
public event Action? OnOrderCanceled;
- public Button CallShuttleButton => CallShuttleButtonProtected;
-
private readonly List _categoryStrings = new();
private string? _category;
diff --git a/Content.Client/Cargo/UI/CargoConsoleOrderMenu.xaml b/Content.Client/Cargo/UI/CargoConsoleOrderMenu.xaml
index 513b3e749c..38b9da642b 100644
--- a/Content.Client/Cargo/UI/CargoConsoleOrderMenu.xaml
+++ b/Content.Client/Cargo/UI/CargoConsoleOrderMenu.xaml
@@ -3,15 +3,19 @@
-
+
-
+
-
-
diff --git a/Content.Client/Cargo/UI/CargoConsoleOrderMenu.xaml.cs b/Content.Client/Cargo/UI/CargoConsoleOrderMenu.xaml.cs
index f5b12989f8..00454b9f72 100644
--- a/Content.Client/Cargo/UI/CargoConsoleOrderMenu.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoConsoleOrderMenu.xaml.cs
@@ -10,11 +10,6 @@ namespace Content.Client.Cargo.UI
[GenerateTypedNameReferences]
partial class CargoConsoleOrderMenu : SS14Window
{
- public LineEdit Requester => RequesterProtected;
- public LineEdit Reason => ReasonProtected;
- public SpinBox Amount => AmountProtected;
- public Button SubmitButton => SubmitButtonProtected;
-
public CargoConsoleOrderMenu()
{
RobustXamlLoader.Load(this);
diff --git a/Content.Client/Cargo/UI/CargoOrderRow.xaml b/Content.Client/Cargo/UI/CargoOrderRow.xaml
index e20a5a7005..1d636a1a29 100644
--- a/Content.Client/Cargo/UI/CargoOrderRow.xaml
+++ b/Content.Client/Cargo/UI/CargoOrderRow.xaml
@@ -2,25 +2,30 @@
HorizontalExpand="True">
-
-
-
-
-
diff --git a/Content.Client/Cargo/UI/CargoOrderRow.xaml.cs b/Content.Client/Cargo/UI/CargoOrderRow.xaml.cs
index 9caebaf3bf..27e1aaa061 100644
--- a/Content.Client/Cargo/UI/CargoOrderRow.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoOrderRow.xaml.cs
@@ -9,11 +9,6 @@ namespace Content.Client.Cargo.UI
public partial class CargoOrderRow : PanelContainer
{
public CargoOrderData? Order { get; set; }
- public TextureRect Icon => IconProtected;
- public Label ProductName => ProductNameProtected;
- public Label Description => DescriptionProtected;
- public Button Approve => ApproveProtected;
- public Button Cancel => CancelProtected;
public CargoOrderRow()
{
diff --git a/Content.Client/Cargo/UI/CargoProductRow.xaml b/Content.Client/Cargo/UI/CargoProductRow.xaml
index 0a33a253d6..ccdf927019 100644
--- a/Content.Client/Cargo/UI/CargoProductRow.xaml
+++ b/Content.Client/Cargo/UI/CargoProductRow.xaml
@@ -1,21 +1,25 @@
-
-
-
-
diff --git a/Content.Client/Cargo/UI/CargoProductRow.xaml.cs b/Content.Client/Cargo/UI/CargoProductRow.xaml.cs
index e708ee4c6d..2c7c396500 100644
--- a/Content.Client/Cargo/UI/CargoProductRow.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoProductRow.xaml.cs
@@ -9,10 +9,6 @@ namespace Content.Client.Cargo.UI
public partial class CargoProductRow : PanelContainer
{
public CargoProductPrototype? Product { get; set; }
- public TextureRect Icon => IconProtected;
- public Button MainButton => MainButtonProtected;
- public Label ProductName => ProductNameProtected;
- public Label PointCost => PointCostProtected;
public CargoProductRow()
{
diff --git a/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs b/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs
index f2256d80f9..df0c3356e4 100644
--- a/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs
+++ b/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs
@@ -16,9 +16,9 @@ namespace Content.Client.Chemistry.UI
base.Open();
_window = new TransferAmountWindow();
- _window.applyButton.OnPressed += _ =>
+ _window.ApplyButton.OnPressed += _ =>
{
- if (int.TryParse(_window.amountLineEdit.Text, out var i))
+ if (int.TryParse(_window.AmountLineEdit.Text, out var i))
{
SendMessage(new TransferAmountSetValueMessage(ReagentUnit.New(i)));
_window.Close();
diff --git a/Content.Client/Chemistry/UI/TransferAmountWindow.xaml b/Content.Client/Chemistry/UI/TransferAmountWindow.xaml
index 63affa73b1..eb0e18b12a 100644
--- a/Content.Client/Chemistry/UI/TransferAmountWindow.xaml
+++ b/Content.Client/Chemistry/UI/TransferAmountWindow.xaml
@@ -4,8 +4,8 @@
-
+
-
+
diff --git a/Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs b/Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs
index 1c94789444..8a25af5f29 100644
--- a/Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs
+++ b/Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs
@@ -8,9 +8,6 @@ namespace Content.Client.Chemistry.UI
[GenerateTypedNameReferences]
public partial class TransferAmountWindow : SS14Window
{
- public Button applyButton => ApplyButton;
- public LineEdit amountLineEdit => AmountLineEdit;
-
public TransferAmountWindow()
{
RobustXamlLoader.Load(this);
diff --git a/Content.Client/Construction/UI/ConstructionMenu.xaml b/Content.Client/Construction/UI/ConstructionMenu.xaml
index 2c943206bb..193742e0e6 100644
--- a/Content.Client/Construction/UI/ConstructionMenu.xaml
+++ b/Content.Client/Construction/UI/ConstructionMenu.xaml
@@ -3,9 +3,9 @@
-
+
-
+
@@ -19,7 +19,7 @@
-
+
diff --git a/Content.Client/Construction/UI/ConstructionMenu.xaml.cs b/Content.Client/Construction/UI/ConstructionMenu.xaml.cs
index 7ad635d6b7..f149cfb36f 100644
--- a/Content.Client/Construction/UI/ConstructionMenu.xaml.cs
+++ b/Content.Client/Construction/UI/ConstructionMenu.xaml.cs
@@ -20,7 +20,7 @@ namespace Content.Client.Construction.UI
// It isn't optimal to expose UI controls like this, but the UI control design is
// questionable so it can't be helped.
string[] Categories { get; set; }
- OptionButton CategoryButton { get; }
+ OptionButton Category { get; }
bool EraseButtonPressed { get; set; }
bool BuildButtonPressed { get; set; }
@@ -63,19 +63,12 @@ namespace Content.Client.Construction.UI
public string[] Categories { get; set; } = Array.Empty();
- public OptionButton CategoryButton => Category;
-
public bool EraseButtonPressed
{
get => EraseButton.Pressed;
set => EraseButton.Pressed = value;
}
- ///
- public ItemList Recipes => RecipesList;
-
- public ItemList RecipeStepList => StepList;
-
public ConstructionMenu()
{
SetSize = MinSize = (720, 320);
@@ -86,8 +79,8 @@ namespace Content.Client.Construction.UI
Title = Loc.GetString("construction-menu-title");
BuildButton.Text = Loc.GetString("construction-menu-place-ghost");
- RecipesList.OnItemSelected += obj => RecipeSelected?.Invoke(this, obj.ItemList[obj.ItemIndex]);
- RecipesList.OnItemDeselected += _ => RecipeSelected?.Invoke(this, null);
+ Recipes.OnItemSelected += obj => RecipeSelected?.Invoke(this, obj.ItemList[obj.ItemIndex]);
+ Recipes.OnItemDeselected += _ => RecipeSelected?.Invoke(this, null);
SearchBar.OnTextChanged += _ => PopulateRecipes?.Invoke(this, (SearchBar.Text, Categories[Category.SelectedId]));
Category.OnItemSelected += obj =>
@@ -132,7 +125,7 @@ namespace Content.Client.Construction.UI
TargetName.SetMessage(string.Empty);
TargetDesc.SetMessage(string.Empty);
TargetTexture.Texture = null;
- StepList.Clear();
+ RecipeStepList.Clear();
}
}
}
diff --git a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
index cbd7bcb62b..684f89afd8 100644
--- a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
+++ b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
@@ -199,7 +199,7 @@ namespace Content.Client.Construction.UI
uniqueCategories.Add(category);
}
- _constructionView.CategoryButton.Clear();
+ _constructionView.Category.Clear();
var array = uniqueCategories.ToArray();
Array.Sort(array);
@@ -207,7 +207,7 @@ namespace Content.Client.Construction.UI
for (var i = 0; i < array.Length; i++)
{
var category = array[i];
- _constructionView.CategoryButton.AddItem(category, i);
+ _constructionView.Category.AddItem(category, i);
}
_constructionView.Categories = array;
diff --git a/Content.Client/Disposal/UI/DisposalRouterWindow.xaml b/Content.Client/Disposal/UI/DisposalRouterWindow.xaml
index 9f93d37b17..3849082435 100644
--- a/Content.Client/Disposal/UI/DisposalRouterWindow.xaml
+++ b/Content.Client/Disposal/UI/DisposalRouterWindow.xaml
@@ -6,12 +6,14 @@
-
-
diff --git a/Content.Client/Disposal/UI/DisposalRouterWindow.xaml.cs b/Content.Client/Disposal/UI/DisposalRouterWindow.xaml.cs
index c35653195d..eee479d05d 100644
--- a/Content.Client/Disposal/UI/DisposalRouterWindow.xaml.cs
+++ b/Content.Client/Disposal/UI/DisposalRouterWindow.xaml.cs
@@ -13,9 +13,6 @@ namespace Content.Client.Disposal.UI
[GenerateTypedNameReferences]
public partial class DisposalRouterWindow : SS14Window
{
- public LineEdit TagInput => TagInputProtected;
- public Button Confirm => ConfirmProtected;
-
public DisposalRouterWindow()
{
RobustXamlLoader.Load(this);
diff --git a/Content.Client/Disposal/UI/DisposalTaggerWindow.xaml b/Content.Client/Disposal/UI/DisposalTaggerWindow.xaml
index b395aa6698..0441b0f8f6 100644
--- a/Content.Client/Disposal/UI/DisposalTaggerWindow.xaml
+++ b/Content.Client/Disposal/UI/DisposalTaggerWindow.xaml
@@ -6,11 +6,13 @@
-
-
diff --git a/Content.Client/Disposal/UI/DisposalTaggerWindow.xaml.cs b/Content.Client/Disposal/UI/DisposalTaggerWindow.xaml.cs
index 89423b64bf..a7a8c98b78 100644
--- a/Content.Client/Disposal/UI/DisposalTaggerWindow.xaml.cs
+++ b/Content.Client/Disposal/UI/DisposalTaggerWindow.xaml.cs
@@ -13,9 +13,6 @@ namespace Content.Client.Disposal.UI
[GenerateTypedNameReferences]
public partial class DisposalTaggerWindow : SS14Window
{
- public LineEdit TagInput => TagInputProtected;
- public Button Confirm => ConfirmProtected;
-
public DisposalTaggerWindow()
{
RobustXamlLoader.Load(this);
diff --git a/Content.Client/Disposal/UI/DisposalUnitWindow.xaml b/Content.Client/Disposal/UI/DisposalUnitWindow.xaml
index 64e7c81cc0..f8776f7755 100644
--- a/Content.Client/Disposal/UI/DisposalUnitWindow.xaml
+++ b/Content.Client/Disposal/UI/DisposalUnitWindow.xaml
@@ -23,14 +23,17 @@
-
-
-
diff --git a/Content.Client/Disposal/UI/DisposalUnitWindow.xaml.cs b/Content.Client/Disposal/UI/DisposalUnitWindow.xaml.cs
index 911ade1385..9d39f54671 100644
--- a/Content.Client/Disposal/UI/DisposalUnitWindow.xaml.cs
+++ b/Content.Client/Disposal/UI/DisposalUnitWindow.xaml.cs
@@ -19,10 +19,6 @@ namespace Content.Client.Disposal.UI
[GenerateTypedNameReferences]
public partial class DisposalUnitWindow : SS14Window
{
- public Button Engage => EngageProtected;
- public Button Eject => EjectProtected;
- public Button Power => PowerProtected;
-
public DisposalUnitWindow()
{
IoCManager.InjectDependencies(this);
diff --git a/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml b/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml
index da20612921..29100d72a9 100644
--- a/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml
+++ b/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml
@@ -6,7 +6,8 @@
-
diff --git a/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs b/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs
index ed95b3c835..c092e4ddde 100644
--- a/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs
+++ b/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs
@@ -13,8 +13,6 @@ namespace Content.Client.Gravity.UI
{
private readonly GravityGeneratorBoundUserInterface _owner;
- public Button Switch => SwitchProtected;
-
public GravityGeneratorWindow(GravityGeneratorBoundUserInterface ui)
{
RobustXamlLoader.Load(this);
diff --git a/Content.Client/Kitchen/UI/LabelledContentBox.xaml b/Content.Client/Kitchen/UI/LabelledContentBox.xaml
index d69e52e2a1..0c6a5f9e9c 100644
--- a/Content.Client/Kitchen/UI/LabelledContentBox.xaml
+++ b/Content.Client/Kitchen/UI/LabelledContentBox.xaml
@@ -1,7 +1,7 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/Content.Client/Kitchen/UI/LabelledContentBox.xaml.cs b/Content.Client/Kitchen/UI/LabelledContentBox.xaml.cs
index b88f8fc4e3..a7a0447328 100644
--- a/Content.Client/Kitchen/UI/LabelledContentBox.xaml.cs
+++ b/Content.Client/Kitchen/UI/LabelledContentBox.xaml.cs
@@ -7,9 +7,6 @@ namespace Content.Client.Kitchen.UI
public partial class LabelledContentBox : BoxContainer
{
public string? LabelText { get => Label.Text; set => Label.Text = value; }
- public string? ButtonText { get => Button.Text; set => Button.Text = value; }
-
- public ItemList BoxContents => ItemList;
- public Button EjectButton => Button;
+ public string? ButtonText { get => EjectButton.Text; set => EjectButton.Text = value; }
}
}
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml
index d21526aab6..cbab3cf710 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml
@@ -20,10 +20,10 @@
-
-
-
-
+
+
+
+
@@ -35,18 +35,20 @@
-
+
-
-
+
-
-
+
@@ -59,16 +61,21 @@
-
-
+
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml.cs b/Content.Client/Lobby/UI/LobbyGui.xaml.cs
index f96344daa7..aff5d14146 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml.cs
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml.cs
@@ -15,16 +15,6 @@ namespace Content.Client.Lobby.UI
[GenerateTypedNameReferences]
internal sealed partial class LobbyGui : Control
{
- public Label ServerName => CServerName;
- public Label StartTime => CStartTime;
- public Button ReadyButton => CReadyButton;
- public Button ObserveButton => CObserveButton;
- public Button OptionsButton => COptionsButton;
- public Button LeaveButton => CLeaveButton;
- public ChatBox Chat => CChat;
- public BoxContainer VoteContainer => CVoteContainer;
- public LobbyPlayerList OnlinePlayerList => COnlinePlayerList;
- public ServerInfo ServerInfo => CServerInfo;
public LobbyCharacterPreviewPanel CharacterPreview { get; }
public LobbyGui(IEntityManager entityManager,
@@ -42,7 +32,7 @@ namespace Content.Client.Lobby.UI
HorizontalAlignment = HAlignment.Left
};
- CLeftPanelContainer.AddChild(CharacterPreview);
+ LeftPanelContainer.AddChild(CharacterPreview);
CharacterPreview.SetPositionFirst();
}
}
diff --git a/Content.Client/MainMenu/MainMenu.cs b/Content.Client/MainMenu/MainMenu.cs
index f37e78d10a..cb15e16584 100644
--- a/Content.Client/MainMenu/MainMenu.cs
+++ b/Content.Client/MainMenu/MainMenu.cs
@@ -99,7 +99,7 @@ namespace Content.Client.MainMenu
private void TryConnect(string address)
{
- var inputName = _mainMenuControl.UserNameBox.Text.Trim();
+ var inputName = _mainMenuControl.UsernameBox.Text.Trim();
if (!UsernameHelpers.IsNameValid(inputName, out var reason))
{
var invalidReason = Loc.GetString(reason.ToText());
@@ -110,7 +110,7 @@ namespace Content.Client.MainMenu
}
var configName = _configurationManager.GetCVar(CVars.PlayerName);
- if (_mainMenuControl.UserNameBox.Text != configName)
+ if (_mainMenuControl.UsernameBox.Text != configName)
{
_configurationManager.SetCVar(CVars.PlayerName, inputName);
_configurationManager.SaveToFile();
diff --git a/Content.Client/MainMenu/UI/MainMenuControl.xaml b/Content.Client/MainMenu/UI/MainMenuControl.xaml
index aa31a8f1ee..12c82db00c 100644
--- a/Content.Client/MainMenu/UI/MainMenuControl.xaml
+++ b/Content.Client/MainMenu/UI/MainMenuControl.xaml
@@ -11,29 +11,35 @@
-
-
-
-
-
-
diff --git a/Content.Client/MainMenu/UI/MainMenuControl.xaml.cs b/Content.Client/MainMenu/UI/MainMenuControl.xaml.cs
index ace22b16eb..ab30b5f65b 100644
--- a/Content.Client/MainMenu/UI/MainMenuControl.xaml.cs
+++ b/Content.Client/MainMenu/UI/MainMenuControl.xaml.cs
@@ -14,13 +14,6 @@ namespace Content.Client.MainMenu.UI
[GenerateTypedNameReferences]
public partial class MainMenuControl : Control
{
- public LineEdit UserNameBox => UsernameBoxProtected;
- public Button JoinPublicServerButton => JoinPublicServerButtonProtected;
- public LineEdit AddressBox => AddressBoxProtected;
- public Button DirectConnectButton => DirectConnectButtonProtected;
- public Button OptionsButton => OptionsButtonProtected;
- public Button QuitButton => QuitButtonProtected;
-
public MainMenuControl(IResourceCache resCache, IConfigurationManager configMan)
{
RobustXamlLoader.Load(this);
@@ -36,7 +29,7 @@ namespace Content.Client.MainMenu.UI
Logo.Texture = logoTexture;
var currentUserName = configMan.GetCVar(CVars.PlayerName);
- UserNameBox.Text = currentUserName;
+ UsernameBox.Text = currentUserName;
#if !FULL_RELEASE
JoinPublicServerButton.Disabled = true;
diff --git a/Content.Client/MedicalScanner/UI/MedicalScannerWindow.xaml b/Content.Client/MedicalScanner/UI/MedicalScannerWindow.xaml
index c0284c1805..454812010a 100644
--- a/Content.Client/MedicalScanner/UI/MedicalScannerWindow.xaml
+++ b/Content.Client/MedicalScanner/UI/MedicalScannerWindow.xaml
@@ -2,7 +2,8 @@
MinSize="250 100"
SetSize="250 100">
-
diff --git a/Content.Client/MedicalScanner/UI/MedicalScannerWindow.xaml.cs b/Content.Client/MedicalScanner/UI/MedicalScannerWindow.xaml.cs
index 1c5f0a62fd..3fc13a341b 100644
--- a/Content.Client/MedicalScanner/UI/MedicalScannerWindow.xaml.cs
+++ b/Content.Client/MedicalScanner/UI/MedicalScannerWindow.xaml.cs
@@ -17,8 +17,6 @@ namespace Content.Client.MedicalScanner.UI
[GenerateTypedNameReferences]
public partial class MedicalScannerWindow : SS14Window
{
- public Button ScanButton => ScanButtonProtected;
-
public MedicalScannerWindow()
{
RobustXamlLoader.Load(this);
diff --git a/Content.Client/PDA/PDAMenu.xaml b/Content.Client/PDA/PDAMenu.xaml
index e477c94577..5be5c1187b 100644
--- a/Content.Client/PDA/PDAMenu.xaml
+++ b/Content.Client/PDA/PDAMenu.xaml
@@ -7,25 +7,30 @@
VerticalExpand="True"
HorizontalExpand="True"
MinSize="50 50">
-
+
-
-
-
-
-
diff --git a/Content.Client/PDA/PDAMenu.xaml.cs b/Content.Client/PDA/PDAMenu.xaml.cs
index c25b209b74..cb3977ff85 100644
--- a/Content.Client/PDA/PDAMenu.xaml.cs
+++ b/Content.Client/PDA/PDAMenu.xaml.cs
@@ -1,5 +1,4 @@
using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;
using Robust.Shared.Localization;
@@ -9,15 +8,6 @@ namespace Content.Client.PDA
[GenerateTypedNameReferences]
public partial class PDAMenu : SS14Window
{
- public Button FlashLightToggleButton => FlashLightToggleButtonProtected;
- public Button EjectIdButton => EjectIdButtonProtected;
- public Button EjectPenButton => EjectPenButtonProtected;
-
- public Button ActivateUplinkButton => ActivateUplinkButtonProtected;
-
- public RichTextLabel PdaOwnerLabel => PdaOwnerLabelProtected;
- public RichTextLabel IdInfoLabel => IdInfoLabelProtected;
-
public PDAMenu()
{
RobustXamlLoader.Load(this);
diff --git a/Content.Client/Paper/UI/PaperWindow.xaml b/Content.Client/Paper/UI/PaperWindow.xaml
index dda0c339a8..c4929fd4e6 100644
--- a/Content.Client/Paper/UI/PaperWindow.xaml
+++ b/Content.Client/Paper/UI/PaperWindow.xaml
@@ -3,7 +3,8 @@
SetSize="300 300">
-
diff --git a/Content.Client/Paper/UI/PaperWindow.xaml.cs b/Content.Client/Paper/UI/PaperWindow.xaml.cs
index f80a8518f8..a35af8fd10 100644
--- a/Content.Client/Paper/UI/PaperWindow.xaml.cs
+++ b/Content.Client/Paper/UI/PaperWindow.xaml.cs
@@ -10,8 +10,6 @@ namespace Content.Client.Paper.UI
[GenerateTypedNameReferences]
public partial class PaperWindow : SS14Window
{
- public LineEdit Input => InputProtected;
-
public PaperWindow()
{
RobustXamlLoader.Load(this);
diff --git a/Content.Client/Preferences/UI/CharacterSetupGui.xaml b/Content.Client/Preferences/UI/CharacterSetupGui.xaml
index cc1ed26641..f4abb40c21 100644
--- a/Content.Client/Preferences/UI/CharacterSetupGui.xaml
+++ b/Content.Client/Preferences/UI/CharacterSetupGui.xaml
@@ -1,26 +1,26 @@
-
+
-
-
-
@@ -31,14 +31,14 @@
-
+
-
+
diff --git a/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs b/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
index 12d37b1345..f8ff373a54 100644
--- a/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
+++ b/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
@@ -29,14 +29,8 @@ namespace Content.Client.Preferences.UI
{
private readonly IClientPreferencesManager _preferencesManager;
private readonly IEntityManager _entityManager;
- private PanelContainer _backgroundPanel => CBackgroundPanel;
- private BoxContainer _charactersVBox => CCharacters;
- private Button _createNewCharacterButton;
- private HumanoidProfileEditor _humanoidProfileEditor;
- private BoxContainer _humanoidProfileEditorContainer => CCharEditor;
- public Button CloseButton => CCloseButton;
- public Button SaveButton => CSaveButton;
- public Button RulesButton => CRulesButton;
+ private readonly Button _createNewCharacterButton;
+ private readonly HumanoidProfileEditor _humanoidProfileEditor;
public CharacterSetupGui(
IEntityManager entityManager,
@@ -56,7 +50,7 @@ namespace Content.Client.Preferences.UI
};
back.SetPatchMargin(StyleBox.Margin.All, 10);
- _backgroundPanel.PanelOverride = back;
+ BackgroundPanel.PanelOverride = back;
_createNewCharacterButton = new Button
{
@@ -71,7 +65,7 @@ namespace Content.Client.Preferences.UI
_humanoidProfileEditor = new HumanoidProfileEditor(preferencesManager, prototypeManager, entityManager);
_humanoidProfileEditor.OnProfileChanged += ProfileChanged;
- _humanoidProfileEditorContainer.AddChild(_humanoidProfileEditor);
+ CharEditor.AddChild(_humanoidProfileEditor);
UpdateUI();
@@ -100,7 +94,7 @@ namespace Content.Client.Preferences.UI
{
var numberOfFullSlots = 0;
var characterButtonsGroup = new ButtonGroup();
- _charactersVBox.RemoveAllChildren();
+ Characters.RemoveAllChildren();
if (!_preferencesManager.ServerDataLoaded)
{
@@ -123,7 +117,7 @@ namespace Content.Client.Preferences.UI
_preferencesManager,
characterButtonsGroup,
character);
- _charactersVBox.AddChild(characterPickerButton);
+ Characters.AddChild(characterPickerButton);
var characterIndexCopy = slot;
characterPickerButton.OnPressed += args =>
@@ -139,7 +133,7 @@ namespace Content.Client.Preferences.UI
_createNewCharacterButton.Disabled =
numberOfFullSlots >= _preferencesManager.Settings.MaxCharacterSlots;
- _charactersVBox.AddChild(_createNewCharacterButton);
+ Characters.AddChild(_createNewCharacterButton);
}
private class CharacterPickerButton : ContainerButton
diff --git a/Content.Client/Research/UI/ResearchConsoleMenu.xaml b/Content.Client/Research/UI/ResearchConsoleMenu.xaml
index 636f5dbb92..af77597d05 100644
--- a/Content.Client/Research/UI/ResearchConsoleMenu.xaml
+++ b/Content.Client/Research/UI/ResearchConsoleMenu.xaml
@@ -71,11 +71,14 @@
Align="End"
HorizontalExpand="True"
VerticalExpand="True">
-
-
-
diff --git a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
index 26df39ae00..ef562430b1 100644
--- a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
+++ b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
@@ -21,10 +21,6 @@ namespace Content.Client.Research.UI
private readonly List _unlockableTechnologyPrototypes = new();
private readonly List _futureTechnologyPrototypes = new();
- public Button UnlockButton => UnlockButtonProtected;
- public Button ServerSelectionButton => ServerSelectionButtonProtected;
- public Button ServerSyncButton => ServerSyncButtonProtected;
-
public TechnologyPrototype? TechnologySelected;
public ResearchConsoleMenu(ResearchConsoleBoundUserInterface owner)
diff --git a/Content.Client/Traitor/Uplink/UplinkListingControl.xaml b/Content.Client/Traitor/Uplink/UplinkListingControl.xaml
index 46fa1062d7..544edc191d 100644
--- a/Content.Client/Traitor/Uplink/UplinkListingControl.xaml
+++ b/Content.Client/Traitor/Uplink/UplinkListingControl.xaml
@@ -4,7 +4,8 @@
-
diff --git a/Content.Client/Traitor/Uplink/UplinkListingControl.xaml.cs b/Content.Client/Traitor/Uplink/UplinkListingControl.xaml.cs
index 32d5468bc3..8080f42fd8 100644
--- a/Content.Client/Traitor/Uplink/UplinkListingControl.xaml.cs
+++ b/Content.Client/Traitor/Uplink/UplinkListingControl.xaml.cs
@@ -9,8 +9,6 @@ namespace Content.Client.Traitor.Uplink
[GenerateTypedNameReferences]
public partial class UplinkListingControl : Control
{
- public Button UplinkItemBuyButton => UplinkItemBuyButtonProtected;
-
public UplinkListingControl(string itemName, string itemDescription, int itemPrice, bool canBuy)
{
RobustXamlLoader.Load(this);
@@ -18,8 +16,8 @@ namespace Content.Client.Traitor.Uplink
UplinkItemName.Text = itemName;
UplinkItemDescription.SetMessage(itemDescription);
- UplinkItemBuyButtonProtected.Text = $"{itemPrice} TC";
- UplinkItemBuyButtonProtected.Disabled = !canBuy;
+ UplinkItemBuyButton.Text = $"{itemPrice} TC";
+ UplinkItemBuyButton.Disabled = !canBuy;
}
}
}
diff --git a/Content.Client/Traitor/Uplink/UplinkMenu.xaml b/Content.Client/Traitor/Uplink/UplinkMenu.xaml
index 43c6610f83..dae85f2e81 100644
--- a/Content.Client/Traitor/Uplink/UplinkMenu.xaml
+++ b/Content.Client/Traitor/Uplink/UplinkMenu.xaml
@@ -8,7 +8,8 @@
VerticalExpand="True">
-
diff --git a/Content.Client/Traitor/Uplink/UplinkMenu.xaml.cs b/Content.Client/Traitor/Uplink/UplinkMenu.xaml.cs
index f39644feff..a599a018cd 100644
--- a/Content.Client/Traitor/Uplink/UplinkMenu.xaml.cs
+++ b/Content.Client/Traitor/Uplink/UplinkMenu.xaml.cs
@@ -16,7 +16,6 @@ namespace Content.Client.Traitor.Uplink
{
private readonly IPrototypeManager _prototypeManager;
- public RichTextLabel BalanceInfo => BalanceInfoProtected;
public event Action? OnListingButtonPressed;
public event Action? OnCategoryButtonPressed;
diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs b/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs
index cad657e3ba..a517b5fc16 100644
--- a/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs
+++ b/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs
@@ -60,8 +60,8 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
Assert.NotNull(alertsUI);
// we should be seeing 3 alerts - our health, and the 2 debug alerts, in a specific order.
- Assert.That(alertsUI.Grid.ChildCount, Is.GreaterThanOrEqualTo(3));
- var alertControls = alertsUI.Grid.Children.Select(c => (AlertControl) c);
+ Assert.That(alertsUI.AlertContainer.ChildCount, Is.GreaterThanOrEqualTo(3));
+ var alertControls = alertsUI.AlertContainer.Children.Select(c => (AlertControl) c);
var alertIDs = alertControls.Select(ac => ac.Alert.AlertType).ToArray();
var expectedIDs = new [] {AlertType.HumanHealth, AlertType.Debug1, AlertType.Debug2};
Assert.That(alertIDs, Is.SupersetOf(expectedIDs));
@@ -96,8 +96,8 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
Assert.NotNull(alertsUI);
// we should be seeing 2 alerts now because one was cleared
- Assert.That(alertsUI.Grid.ChildCount, Is.GreaterThanOrEqualTo(2));
- var alertControls = alertsUI.Grid.Children.Select(c => (AlertControl) c);
+ Assert.That(alertsUI.AlertContainer.ChildCount, Is.GreaterThanOrEqualTo(2));
+ var alertControls = alertsUI.AlertContainer.Children.Select(c => (AlertControl) c);
var alertIDs = alertControls.Select(ac => ac.Alert.AlertType).ToArray();
var expectedIDs = new [] {AlertType.HumanHealth, AlertType.Debug2};
Assert.That(alertIDs, Is.SupersetOf(expectedIDs));