Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Remove encapsulation for previously protected XAML UI fields (#4975)

Browse Source
This commit is contained in:
Visne
2021-10-28 14:23:17 +02:00
committed by GitHub
parent aed66cfc48
commit ac78145b94
49 changed files with 158 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Client/Disposal/UI/DisposalRouterWindow.xaml
View File

@@ -6,12 +6,14 @@
<Label Text="{Loc 'disposal-router-window-tags-label'}" />
<Control MinSize="0 10" />
<BoxContainer Orientation="Horizontal">
<LineEdit Name="TagInputProtected"
<LineEdit Name="TagInput"
Access="Public"
HorizontalExpand="True"
MinSize="320 0"
ToolTip="{Loc 'disposal-router-window-tag-input-tooltip'}" />
<Control MinSize="10 0" />
<Button Name="ConfirmProtected"
<Button Name="Confirm"
Access="Public"
Text="{Loc 'disposal-router-window-tag-input-confirm-button'}" />
</BoxContainer>
</BoxContainer>

3
Content.Client/Disposal/UI/DisposalRouterWindow.xaml.cs
View File

@@ -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);

6
Content.Client/Disposal/UI/DisposalTaggerWindow.xaml
View File

@@ -6,11 +6,13 @@
<Label Text="{Loc 'disposal-tagger-window-tag-input-label'}" />
<Control MinSize="0 10" />
<BoxContainer Orientation="Horizontal">
<LineEdit Name="TagInputProtected"
<LineEdit Name="TagInput"
Access="Public"
HorizontalExpand="True"
MinSize="320 0" />
<Control MinSize="10 0" />
<Button Name="ConfirmProtected"
<Button Name="Confirm"
Access="Public"
Text="{Loc 'disposal-tagger-window-tag-confirm-button'}" />
</BoxContainer>
</BoxContainer>

3
Content.Client/Disposal/UI/DisposalTaggerWindow.xaml.cs
View File

@@ -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);

9
Content.Client/Disposal/UI/DisposalUnitWindow.xaml
View File

@@ -23,14 +23,17 @@
</BoxContainer>
<Control MinSize="0 10" />
<BoxContainer Orientation="Horizontal">
<Button Name="EngageProtected"
<Button Name="Engage"
Access="Public"
Text="{Loc 'ui-disposal-unit-button-flush'}"
StyleClasses="OpenRight"
ToggleMode="True" />
<Button Name="EjectProtected"
<Button Name="Eject"
Access="Public"
Text="{Loc 'ui-disposal-unit-button-eject'}"
StyleClasses="OpenBoth" />
<CheckButton Name="PowerProtected"
<CheckButton Name="Power"
Access="Public"
Text="{Loc 'ui-disposal-unit-button-power'}"
StyleClasses="OpenLeft" />
</BoxContainer>

4
Content.Client/Disposal/UI/DisposalUnitWindow.xaml.cs
View File

@@ -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);