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

Fixing some warnings (#6250)

Browse Source 
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
This commit is contained in:
wrexbe
2022-01-21 01:38:35 -08:00
committed by GitHub
parent 29b22e2871
commit cea1b21832
191 changed files with 341 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Benchmarks/DynamicTreeBenchmark.cs
View File

@@ -1,4 +1,4 @@
using BenchmarkDotNet.Attributes;
using BenchmarkDotNet.Attributes;
using Robust.Shared.Maths;
using Robust.Shared.Physics;
@@ -7,7 +7,7 @@ namespace Content.Benchmarks
[SimpleJob, MemoryDiagnoser]
public class DynamicTreeBenchmark
{
private static readonly Box2[] aabbs1 =
private static readonly Box2[] _aabbs1 =
{
((Box2) default).Enlarged(1), //2x2 square
((Box2) default).Enlarged(2), //4x4 square
@@ -37,11 +37,11 @@ namespace Content.Benchmarks
public void Setup()
{
_b2Tree = new B2DynamicTree<int>();
_tree = new DynamicTree<int>((in int value) => aabbs1[value], capacity: 16);
_tree = new DynamicTree<int>((in int value) => _aabbs1[value], capacity: 16);
for (var i = 0; i < aabbs1.Length; i++)
for (var i = 0; i < _aabbs1.Length; i++)
{
var aabb = aabbs1[i];
var aabb = _aabbs1[i];
_b2Tree.CreateProxy(aabb, i);
_tree.Add(i);
}

3
Content.Client/AI/ClientPathfindingDebugSystem.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using Content.Shared.AI;
@@ -18,7 +18,6 @@ namespace Content.Client.AI
#if DEBUG
public class ClientPathfindingDebugSystem : EntitySystem
{
[Dependency] private readonly IOverlayManager _overlayManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IEyeManager _eyeManager = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!;

4
Content.Client/AME/UI/AMEWindow.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window xmlns="https://spacestation14.io"
<DefaultWindow xmlns="https://spacestation14.io"
Title="{Loc 'ame-window-title'}"
MinSize="250 250">
<BoxContainer Orientation="Vertical">
@@ -43,4 +43,4 @@
<Label Name="CoreCount" Text="0" />
</BoxContainer>
</BoxContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/AME/UI/AMEWindow.xaml.cs
View File

@@ -12,7 +12,7 @@ using static Content.Shared.AME.SharedAMEControllerComponent;
namespace Content.Client.AME.UI
{
[GenerateTypedNameReferences]
public partial class AMEWindow : SS14Window
public partial class AMEWindow : DefaultWindow
{
public AMEWindow(AMEControllerBoundUserInterface ui)
{

4
Content.Client/Access/UI/IdCardConsoleWindow.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window xmlns="https://spacestation14.io"
<DefaultWindow xmlns="https://spacestation14.io"
MinSize="650 290">
<BoxContainer Orientation="Vertical">
<GridContainer Columns="3">
@@ -27,4 +27,4 @@
</GridContainer>
</BoxContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
View File

@@ -13,7 +13,7 @@ using static Content.Shared.Access.Components.SharedIdCardConsoleComponent;
namespace Content.Client.Access.UI
{
[GenerateTypedNameReferences]
public partial class IdCardConsoleWindow : SS14Window
public partial class IdCardConsoleWindow : DefaultWindow
{
private readonly IdCardConsoleBoundUserInterface _owner;

2
Content.Client/Actions/UI/ActionMenu.cs
View File

@@ -27,7 +27,7 @@ namespace Content.Client.Actions.UI
/// Action selection menu, allows filtering and searching over all possible
/// actions and populating those actions into the hotbar.
/// </summary>
public class ActionMenu : SS14Window
public class ActionMenu : DefaultWindow
{
private const string ItemTag = "item";
private const string NotItemTag = "not item";

1
Content.Client/Administration/AdminVerbSystem.cs
View File

@@ -12,7 +12,6 @@ namespace Content.Client.Verbs
class AdminVerbSystem : EntitySystem
{
[Dependency] private readonly IClientConGroupController _clientConGroupController = default!;
[Dependency] private readonly IViewVariablesManager _viewVariablesManager = default!;
[Dependency] private readonly IClientConsoleHost _clientConsoleHost = default!;
public override void Initialize()

4
Content.Client/Administration/UI/AdminAnnounceWindow.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window
<DefaultWindow
xmlns="https://spacestation14.io"
Title="{Loc 'admin-announce-title'}"
MinWidth="500">
@@ -12,4 +12,4 @@
<Button Name="AnnounceButton" Access="Public" Disabled="True" Text="{Loc 'Announce'}" HorizontalAlignment="Center"/>
</GridContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/Administration/UI/AdminAnnounceWindow.xaml.cs
View File

@@ -10,7 +10,7 @@ using Robust.Shared.Localization;
namespace Content.Client.Administration.UI
{
[GenerateTypedNameReferences]
public partial class AdminAnnounceWindow : SS14Window
public partial class AdminAnnounceWindow : DefaultWindow
{
[Dependency] private readonly ILocalizationManager _localization = default!;

4
Content.Client/Administration/UI/AdminMenuWindow.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window
<DefaultWindow
xmlns="https://spacestation14.io"
xmlns:adminTab="clr-namespace:Content.Client.Administration.UI.Tabs.AdminTab"
xmlns:adminbusTab="clr-namespace:Content.Client.Administration.UI.Tabs.AdminbusTab"
@@ -13,4 +13,4 @@
<tabs:ServerTab />
<playerTab:PlayerTab Name="PlayerTabControl" Access="Public" />
</TabContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
View File

@@ -9,7 +9,7 @@ using Robust.Shared.Localization;
namespace Content.Client.Administration.UI
{
[GenerateTypedNameReferences]
public partial class AdminMenuWindow : SS14Window
public partial class AdminMenuWindow : DefaultWindow
{
[Dependency] private readonly IGameHud? _gameHud = default!;

4
Content.Client/Administration/UI/CustomControls/UICommandButton.cs
View File

@@ -7,13 +7,13 @@ namespace Content.Client.Administration.UI.CustomControls
public class UICommandButton : CommandButton
{
public Type? WindowType { get; set; }
private SS14Window? _window;
private DefaultWindow? _window;
protected override void Execute(ButtonEventArgs obj)
{
if (WindowType == null)
return;
_window = (SS14Window) IoCManager.Resolve<IDynamicTypeFactory>().CreateInstance(WindowType);
_window = (DefaultWindow) IoCManager.Resolve<IDynamicTypeFactory>().CreateInstance(WindowType);
_window?.OpenCentered();
}
}

4
Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml
View File

@@ -1,7 +1,7 @@
<SS14Window xmlns="https://spacestation14.io"
<DefaultWindow xmlns="https://spacestation14.io"
xmlns:logs="clr-namespace:Content.Client.Administration.UI.Logs"
Title="{Loc admin-logs-title}"
MinWidth="1000"
MinHeight="400">
<logs:AdminLogsControl Name="Logs" Access="Public"/>
</SS14Window>
</DefaultWindow>

2
Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml.cs
View File

@@ -5,7 +5,7 @@ using Robust.Client.UserInterface.XAML;
namespace Content.Client.Administration.UI.Logs;
[GenerateTypedNameReferences]
public partial class AdminLogsWindow : SS14Window
public partial class AdminLogsWindow : DefaultWindow
{
public AdminLogsWindow()
{

4
Content.Client/Administration/UI/ManageSolutions/AddReagentWindow.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window
<DefaultWindow
SetSize="250 300"
Margin="4 0"
xmlns="https://spacestation14.io">
@@ -10,4 +10,4 @@
<ItemList Name="ReagentList" SelectMode="Single" VerticalExpand="True" Margin ="0 4"/>
<Button Name="AddButton" HorizontalExpand="True" Margin ="0 4" />
</BoxContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/Administration/UI/ManageSolutions/AddReagentWindow.xaml.cs
View File

@@ -16,7 +16,7 @@ namespace Content.Client.Administration.UI.ManageSolutions
/// cref="EditSolutionsWindow"/>
/// </summary>
[GenerateTypedNameReferences]
public sealed partial class AddReagentWindow : SS14Window
public sealed partial class AddReagentWindow : DefaultWindow
{
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IClientConsoleHost _consoleHost = default!;

4
Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window
<DefaultWindow
SetSize="300 300"
Margin="4 0"
xmlns="https://spacestation14.io">
@@ -20,4 +20,4 @@
</ScrollContainer>
<Button Name="AddButton" Text="{Loc 'admin-solutions-window-add-new-button'}" HorizontalExpand="True" Margin="0 4"/>
</BoxContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs
View File

@@ -17,7 +17,7 @@ namespace Content.Client.Administration.UI.ManageSolutions
/// A simple window that displays solutions and their contained reagents. Allows you to edit the reagent quantities and add new reagents.
/// </summary>
[GenerateTypedNameReferences]
public sealed partial class EditSolutionsWindow : SS14Window
public sealed partial class EditSolutionsWindow : DefaultWindow
{
[Dependency] private readonly IClientConsoleHost _consoleHost = default!;
[Dependency] private readonly IEntityManager _entityManager = default!;

8
Content.Client/Administration/UI/PermissionsEui.cs
View File

@@ -26,7 +26,7 @@ namespace Content.Client.Administration.UI
[Dependency] private readonly IClientAdminManager _adminManager = default!;
private readonly Menu _menu;
private readonly List<SS14Window> _subWindows = new();
private readonly List<DefaultWindow> _subWindows = new();
private Dictionary<int, PermissionsEuiState.AdminRankData> _ranks =
new();
@@ -289,7 +289,7 @@ namespace Content.Client.Administration.UI
OpenRankEditWindow(rank);
}
private sealed class Menu : SS14Window
private sealed class Menu : DefaultWindow
{
private readonly PermissionsEui _ui;
public readonly GridContainer AdminsList;
@@ -341,7 +341,7 @@ namespace Content.Client.Administration.UI
protected override Vector2 ContentsMinimumSize => (600, 400);
}
private sealed class EditAdminWindow : SS14Window
private sealed class EditAdminWindow : DefaultWindow
{
public readonly PermissionsEuiState.AdminData? SourceData;
public readonly LineEdit? NameEdit;
@@ -522,7 +522,7 @@ namespace Content.Client.Administration.UI
}
}
private sealed class EditAdminRankWindow : SS14Window
private sealed class EditAdminRankWindow : DefaultWindow
{
public readonly int? SourceId;
public readonly LineEdit NameEdit;

4
Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window
<DefaultWindow
xmlns="https://spacestation14.io">
<BoxContainer Orientation="Horizontal" HorizontalExpand="True">
<BoxContainer Orientation="Vertical" HorizontalExpand="True" SizeFlagsStretchRatio="0.45">
@@ -12,4 +12,4 @@
<Button Name="ConfirmButton" HorizontalExpand="True" />
</BoxContainer>
</BoxContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs
View File

@@ -12,7 +12,7 @@ using Robust.Shared.Prototypes;
namespace Content.Client.Administration.UI.SetOutfit
{
[GenerateTypedNameReferences]
public partial class SetOutfitMenu : SS14Window
public partial class SetOutfitMenu : DefaultWindow
{
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IClientConsoleHost _consoleHost = default!;

4
Content.Client/Administration/UI/Tabs/AdminTab/AdminShuttleWindow.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window xmlns="https://spacestation14.io"
<DefaultWindow xmlns="https://spacestation14.io"
xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
Title="{Loc 'admin-shuttle-title'}"
MinWidth="300">
@@ -11,4 +11,4 @@
<cc:CommandButton Command="recallshuttle" Name="_recallShuttleButton" Text="{Loc 'communicationsconsole-menu-recall-shuttle'}" HorizontalAlignment="Center"/>
</BoxContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/Administration/UI/Tabs/AdminTab/AdminShuttleWindow.xaml.cs
View File

@@ -11,7 +11,7 @@ using Robust.Shared.Localization;
namespace Content.Client.Administration.UI.Tabs.AdminTab
{
[GenerateTypedNameReferences]
public partial class AdminShuttleWindow : SS14Window
public partial class AdminShuttleWindow : DefaultWindow
{
public AdminShuttleWindow()
{

4
Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window
<DefaultWindow
xmlns="https://spacestation14.io"
xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
Title="{Loc Ban}" MinSize="425 325">
@@ -26,4 +26,4 @@
<Control MinWidth="50" />
<Button Name="SubmitButton" Text="{Loc Ban}" />
</BoxContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml.cs
View File

@@ -13,7 +13,7 @@ namespace Content.Client.Administration.UI.Tabs.AdminTab
{
[GenerateTypedNameReferences]
[UsedImplicitly]
public partial class BanWindow : SS14Window
public partial class BanWindow : DefaultWindow
{
public BanWindow()
{

4
Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window
<DefaultWindow
xmlns="https://spacestation14.io"
xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
Title="{Loc admin-player-actions-window-title}" MinSize="425 272">
@@ -15,4 +15,4 @@
<Button Name="SubmitRespawnButton" Text="{Loc admin-player-actions-respawn}" Disabled="True"/>
</BoxContainer>
</BoxContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml.cs
View File

@@ -12,7 +12,7 @@ namespace Content.Client.Administration.UI.Tabs.AdminTab
{
[GenerateTypedNameReferences]
[UsedImplicitly]
public partial class PlayerActionsWindow : SS14Window
public partial class PlayerActionsWindow : DefaultWindow
{
private PlayerInfo? _selectedPlayer;

4
Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window
<DefaultWindow
xmlns="https://spacestation14.io"
xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
Title="{Loc Teleport}" MinSize="425 230">
@@ -6,4 +6,4 @@
<cc:PlayerListControl Name="PlayerList" />
<Button Name="SubmitButton" Text="{Loc Teleport}" />
</BoxContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml.cs
View File

@@ -11,7 +11,7 @@ namespace Content.Client.Administration.UI.Tabs.AdminTab
{
[GenerateTypedNameReferences]
[UsedImplicitly]
public partial class TeleportWindow : SS14Window
public partial class TeleportWindow : DefaultWindow
{
private PlayerInfo? _selectedPlayer;

4
Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window
<DefaultWindow
xmlns="https://spacestation14.io" Title="{Loc Events}">
<BoxContainer Orientation="Vertical">
<BoxContainer Orientation="Horizontal">
@@ -10,4 +10,4 @@
<Button Name="ResumeButton" Text="{Loc Resume}" Disabled="True" />
<Button Name="SubmitButton" Text="{Loc Run}" Disabled="True" />
</BoxContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml.cs
View File

@@ -14,7 +14,7 @@ namespace Content.Client.Administration.UI.Tabs.AdminbusTab
{
[GenerateTypedNameReferences]
[UsedImplicitly]
public partial class StationEventsWindow : SS14Window
public partial class StationEventsWindow : DefaultWindow
{
private List<string>? _data;

4
Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window
<DefaultWindow
xmlns="https://spacestation14.io" Title="{Loc Add Atmos}">
<BoxContainer Orientation="Vertical">
<BoxContainer Orientation="Horizontal">
@@ -8,4 +8,4 @@
</BoxContainer>
<Button Name="SubmitButton" Text="{Loc Add Atmos}" />
</BoxContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs
View File

@@ -14,7 +14,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
{
[GenerateTypedNameReferences]
[UsedImplicitly]
public partial class AddAtmosWindow : SS14Window
public partial class AddAtmosWindow : DefaultWindow
{
private IEnumerable<IMapGrid>? _data;

4
Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window
<DefaultWindow
xmlns="https://spacestation14.io" Title="{Loc Add Gas}">
<BoxContainer Orientation="Vertical">
<BoxContainer Orientation="Horizontal">
@@ -28,4 +28,4 @@
</BoxContainer>
<Button Name="SubmitButton" Text="{Loc Add Gas}" />
</BoxContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs
View File

@@ -16,7 +16,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
{
[GenerateTypedNameReferences]
[UsedImplicitly]
public partial class AddGasWindow : SS14Window
public partial class AddGasWindow : DefaultWindow
{
private IEnumerable<IMapGrid>? _gridData;
private IEnumerable<GasPrototype>? _gasData;

4
Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window
<DefaultWindow
xmlns="https://spacestation14.io" Title="{Loc Fill Gas}">
<BoxContainer Orientation="Vertical">
<BoxContainer Orientation="Horizontal">
@@ -18,4 +18,4 @@
</BoxContainer>
<Button Name="SubmitButton" Text="{Loc Fill Gas}" />
</BoxContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs
View File

@@ -16,7 +16,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
{
[GenerateTypedNameReferences]
[UsedImplicitly]
public partial class FillGasWindow : SS14Window
public partial class FillGasWindow : DefaultWindow
{
private IEnumerable<IMapGrid>? _gridData;
private IEnumerable<GasPrototype>? _gasData;

4
Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window
<DefaultWindow
xmlns="https://spacestation14.io" Title="{Loc Set Temperature}">
<BoxContainer Orientation="Vertical">
<BoxContainer Orientation="Horizontal">
@@ -23,4 +23,4 @@
</BoxContainer>
<Button Name="SubmitButton" Text="{Loc Set Temperature}" />
</BoxContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs
View File

@@ -14,7 +14,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
{
[GenerateTypedNameReferences]
[UsedImplicitly]
public partial class SetTemperatureWindow : SS14Window
public partial class SetTemperatureWindow : DefaultWindow
{
private IEnumerable<IMapGrid>? _data;

2
Content.Client/Arcade/BlockGameMenu.cs
View File

@@ -18,7 +18,7 @@ using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Arcade
{
public class BlockGameMenu : SS14Window
public class BlockGameMenu : DefaultWindow
{
private static readonly Color OverlayBackgroundColor = new(74,74,81,180);
private static readonly Color OverlayShadowColor = new(0,0,0,83);

2
Content.Client/Arcade/SpaceVillainArcadeMenu.cs
View File

@@ -7,7 +7,7 @@ using Vector2 = Robust.Shared.Maths.Vector2;
namespace Content.Client.Arcade
{
public class SpaceVillainArcadeMenu : SS14Window
public class SpaceVillainArcadeMenu : DefaultWindow
{
public SpaceVillainArcadeBoundUserInterface Owner { get; set; }

4
Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window xmlns="https://spacestation14.io"
<DefaultWindow xmlns="https://spacestation14.io"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
MinSize="500 500" Title="Air Alarm">
<BoxContainer Orientation="Vertical" Margin="5 5 5 5">
@@ -72,4 +72,4 @@
<OptionButton Name="CModeButton" HorizontalExpand="True" />
</BoxContainer>
</BoxContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
View File

@@ -16,7 +16,7 @@ using Robust.Shared.Localization;
namespace Content.Client.Atmos.Monitor.UI
{
[GenerateTypedNameReferences]
public partial class AirAlarmWindow : SS14Window
public partial class AirAlarmWindow : DefaultWindow
{
public event Action<string, IAtmosDeviceData>? AtmosDeviceDataChanged;
public event Action<AtmosMonitorThresholdType, AtmosAlarmThreshold, Gas?>? AtmosAlarmThresholdChanged;

2
Content.Client/Atmos/UI/GasAnalyzerMenu.cs
View File

@@ -108,7 +108,7 @@ namespace Content.Client.Atmos.UI
},
(CloseButton = new TextureButton
{
StyleClasses = {SS14Window.StyleClassWindowCloseButton},
StyleClasses = {DefaultWindow.StyleClassWindowCloseButton},
VerticalAlignment = VAlignment.Center
})
}

4
Content.Client/Atmos/UI/GasCanisterWindow.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window xmlns="https://spacestation14.io"
<DefaultWindow xmlns="https://spacestation14.io"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:s="clr-namespace:Content.Client.Stylesheets"
MinSize="480 400" Title="Canister">
@@ -49,4 +49,4 @@
</BoxContainer>
</BoxContainer>
</BoxContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/Atmos/UI/GasCanisterWindow.xaml.cs
View File

@@ -11,7 +11,7 @@ namespace Content.Client.Atmos.UI
/// Client-side UI used to control a canister.
/// </summary>
[GenerateTypedNameReferences]
public partial class GasCanisterWindow : SS14Window
public partial class GasCanisterWindow : DefaultWindow
{
private readonly ButtonGroup _buttonGroup = new();

4
Content.Client/Atmos/UI/GasFilterWindow.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window xmlns="https://spacestation14.io"
<DefaultWindow xmlns="https://spacestation14.io"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:s="clr-namespace:Content.Client.Stylesheets"
MinSize="480 400" Title="Filter">
@@ -25,4 +25,4 @@
<Button Name="SelectGasButton" Text="{Loc comp-gas-filter-ui-filter-gas-confirm}" HorizontalExpand="True" Disabled="True" />
</BoxContainer>
</BoxContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/Atmos/UI/GasFilterWindow.xaml.cs
View File

@@ -14,7 +14,7 @@ namespace Content.Client.Atmos.UI
/// Client-side UI used to control a gas filter.
/// </summary>
[GenerateTypedNameReferences]
public partial class GasFilterWindow : SS14Window
public partial class GasFilterWindow : DefaultWindow
{
private readonly ButtonGroup _buttonGroup = new();

4
Content.Client/Atmos/UI/GasMixerWindow.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window xmlns="https://spacestation14.io"
<DefaultWindow xmlns="https://spacestation14.io"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:s="clr-namespace:Content.Client.Stylesheets"
MinSize="200 200" Title="Gas Mixer">
@@ -35,4 +35,4 @@
<Button Name="SetMixerPercentageButton" Text="{Loc comp-gas-mixer-ui-mixer-set}" HorizontalAlignment="Right" Disabled="True"/>
</BoxContainer>
</BoxContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/Atmos/UI/GasMixerWindow.xaml.cs
View File

@@ -19,7 +19,7 @@ namespace Content.Client.Atmos.UI
/// Client-side UI used to control a gas mixer.
/// </summary>
[GenerateTypedNameReferences]
public partial class GasMixerWindow : SS14Window
public partial class GasMixerWindow : DefaultWindow
{
public bool MixerStatus = true;

4
Content.Client/Atmos/UI/GasPressurePumpWindow.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window xmlns="https://spacestation14.io"
<DefaultWindow xmlns="https://spacestation14.io"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:s="clr-namespace:Content.Client.Stylesheets"
MinSize="200 120" Title="Pressure Pump">
@@ -20,4 +20,4 @@
<Button Name="SetOutputPressureButton" Text="{Loc comp-gas-pump-ui-pump-set-rate}" HorizontalAlignment="Right" Disabled="True"/>
</BoxContainer>
</BoxContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/Atmos/UI/GasPressurePumpWindow.xaml.cs
View File

@@ -16,7 +16,7 @@ namespace Content.Client.Atmos.UI
/// Client-side UI used to control a gas pressure pump.
/// </summary>
[GenerateTypedNameReferences]
public partial class GasPressurePumpWindow : SS14Window
public partial class GasPressurePumpWindow : DefaultWindow
{
public bool PumpStatus = true;

4
Content.Client/Atmos/UI/GasVolumePumpWindow.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window xmlns="https://spacestation14.io"
<DefaultWindow xmlns="https://spacestation14.io"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:s="clr-namespace:Content.Client.Stylesheets"
MinSize="200 120" Title="Volume Pump">
@@ -20,4 +20,4 @@
<Button Name="SetTransferRateButton" Text="{Loc comp-gas-pump-ui-pump-set-rate}" HorizontalAlignment="Right" Disabled="True"/>
</BoxContainer>
</BoxContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/Atmos/UI/GasVolumePumpWindow.xaml.cs
View File

@@ -16,7 +16,7 @@ namespace Content.Client.Atmos.UI
/// Client-side UI used to control a gas volume pump.
/// </summary>
[GenerateTypedNameReferences]
public partial class GasVolumePumpWindow : SS14Window
public partial class GasVolumePumpWindow : DefaultWindow
{
public bool PumpStatus = true;

2
Content.Client/Body/UI/BodyScannerDisplay.cs
View File

@@ -11,7 +11,7 @@ using static Robust.Client.UserInterface.Controls.ItemList;
namespace Content.Client.Body.UI
{
public sealed class BodyScannerDisplay : SS14Window
public sealed class BodyScannerDisplay : DefaultWindow
{
private EntityUid? _currentEntity;
private SharedBodyPartComponent? _currentBodyPart;

4
Content.Client/Cargo/UI/CargoConsoleMenu.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window xmlns="https://spacestation14.io"
<DefaultWindow xmlns="https://spacestation14.io"
xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
SetSize="400 600"
MinSize="400 600">
@@ -80,4 +80,4 @@
</PanelContainer>
<TextureButton VerticalExpand="True" />
</BoxContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
View File

@@ -19,7 +19,7 @@ using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Cargo.UI
{
[GenerateTypedNameReferences]
public partial class CargoConsoleMenu : SS14Window
public partial class CargoConsoleMenu : DefaultWindow
{
public CargoConsoleBoundUserInterface Owner { get; private set; }

4
Content.Client/Cargo/UI/CargoConsoleOrderMenu.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window xmlns="https://spacestation14.io"
<DefaultWindow xmlns="https://spacestation14.io"
Title="{Loc 'cargo-console-order-menu-title'}">
<BoxContainer Orientation="Vertical">
<GridContainer Columns="2">
@@ -19,4 +19,4 @@
Text="{Loc 'cargo-console-order-menu-submit-button'}"
TextAlign="Center" />
</BoxContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/Cargo/UI/CargoConsoleOrderMenu.xaml.cs
View File

@@ -8,7 +8,7 @@ using Robust.Shared.IoC;
namespace Content.Client.Cargo.UI
{
[GenerateTypedNameReferences]
partial class CargoConsoleOrderMenu : SS14Window
partial class CargoConsoleOrderMenu : DefaultWindow
{
public CargoConsoleOrderMenu()
{

2
Content.Client/Cargo/UI/GalacticBankSelectionMenu.cs
View File

@@ -5,7 +5,7 @@ using Robust.Shared.Localization;
namespace Content.Client.Cargo.UI
{
public class GalacticBankSelectionMenu : SS14Window
public class GalacticBankSelectionMenu : DefaultWindow
{
private readonly ItemList _accounts;
private int _accountCount;

2
Content.Client/CharacterAppearance/MagicMirrorBoundUserInterface.cs
View File

@@ -329,7 +329,7 @@ namespace Content.Client.CharacterAppearance
// ColorSlider
}
public class MagicMirrorWindow : SS14Window
public class MagicMirrorWindow : DefaultWindow
{
private readonly HairStylePicker _hairStylePicker;
private readonly HairStylePicker _facialHairStylePicker;

2
Content.Client/CharacterInterface/CharacterInterfaceComponent.cs
View File

@@ -29,7 +29,7 @@ namespace Content.Client.CharacterInterface
/// <summary>
/// A window that collects and shows all the individual character user interfaces
/// </summary>
public class CharacterWindow : SS14Window
public class CharacterWindow : DefaultWindow
{
private readonly List<ICharacterUI> _windowComponents;

4
Content.Client/CharacterInterface/CharacterInterfaceSystem.cs
View File

@@ -52,7 +52,7 @@ namespace Content.Client.CharacterInterface
{
SetSize = (545, 400)
};
comp.Window.OnClose += () => _gameHud.CharacterButtonDown = false;
}
@@ -122,7 +122,7 @@ namespace Content.Client.CharacterInterface
}
}
private void _setOpenValue(SS14Window menu, bool value)
private void _setOpenValue(DefaultWindow menu, bool value)
{
_gameHud.CharacterButtonDown = value;
if (value)

4
Content.Client/Chemistry/UI/ChemMasterWindow.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window xmlns="https://spacestation14.io"
<DefaultWindow xmlns="https://spacestation14.io"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
MinSize="400 525"
@@ -115,4 +115,4 @@
</PanelContainer>
</PanelContainer>
</BoxContainer>
</SS14Window>
</DefaultWindow>

4
Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
View File

@@ -26,7 +26,7 @@ namespace Content.Client.Chemistry.UI
/// Client-side UI used to control a <see cref="SharedChemMasterComponent"/>
/// </summary>
[GenerateTypedNameReferences]
public partial class ChemMasterWindow : SS14Window
public partial class ChemMasterWindow : DefaultWindow
{
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
public event Action<string>? OnLabelEntered;
@@ -197,7 +197,7 @@ namespace Content.Client.Chemistry.UI
if (!state.BufferReagents.Any())
{
BufferInfo.Children.Add(new Label { Text = Loc.GetString("chem-master-window-buffer-empty-text") });
return;
}

4
Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window xmlns="https://spacestation14.io"
<DefaultWindow xmlns="https://spacestation14.io"
xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
Title="{Loc 'reagent-dispenser-bound-user-interface-title'}"
SetSize="590 450"
@@ -46,4 +46,4 @@
</BoxContainer>
</PanelContainer>
</BoxContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs
View File

@@ -20,7 +20,7 @@ namespace Content.Client.Chemistry.UI
/// Client-side UI used to control a <see cref="SharedReagentDispenserComponent"/>
/// </summary>
[GenerateTypedNameReferences]
public partial class ReagentDispenserWindow : SS14Window
public partial class ReagentDispenserWindow : DefaultWindow
{
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;

4
Content.Client/Chemistry/UI/TransferAmountWindow.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window xmlns="https://spacestation14.io"
<DefaultWindow xmlns="https://spacestation14.io"
Title="{Loc 'ui-transfer-amount-title'}"
Resizable="False">
@@ -8,4 +8,4 @@
</BoxContainer>
<Button Name="ApplyButton" Access="Public" Text="{Loc 'ui-transfer-amount-apply'}"/>
</BoxContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs
View File

@@ -6,7 +6,7 @@ using Robust.Client.UserInterface.XAML;
namespace Content.Client.Chemistry.UI
{
[GenerateTypedNameReferences]
public partial class TransferAmountWindow : SS14Window
public partial class TransferAmountWindow : DefaultWindow
{
public TransferAmountWindow()
{

2
Content.Client/Cloning/UI/AcceptCloningWindow.cs
View File

@@ -6,7 +6,7 @@ using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Cloning.UI
{
public sealed class AcceptCloningWindow : SS14Window
public sealed class AcceptCloningWindow : DefaultWindow
{
public readonly Button DenyButton;
public readonly Button AcceptButton;

2
Content.Client/Cloning/UI/CloningPodWindow.cs
View File

@@ -13,7 +13,7 @@ using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Cloning.UI
{
public sealed class CloningPodWindow : SS14Window
public sealed class CloningPodWindow : DefaultWindow
{
private Dictionary<int, string?> _scanManager;

2
Content.Client/Communications/UI/CommunicationsConsoleMenu.cs
View File

@@ -10,7 +10,7 @@ using Timer = Robust.Shared.Timing.Timer;
namespace Content.Client.Communications.UI
{
public class CommunicationsConsoleMenu : SS14Window
public class CommunicationsConsoleMenu : DefaultWindow
{
private CommunicationsConsoleBoundUserInterface Owner { get; set; }
private readonly CancellationTokenSource _timerCancelTokenSource = new();

2
Content.Client/Configurable/UI/ConfigurationMenu.cs
View File

@@ -10,7 +10,7 @@ using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Configurable.UI
{
public class ConfigurationMenu : SS14Window
public class ConfigurationMenu : DefaultWindow
{
public ConfigurationBoundUserInterface Owner { get; }

4
Content.Client/Construction/UI/ConstructionMenu.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window xmlns="https://spacestation14.io">
<DefaultWindow xmlns="https://spacestation14.io">
<BoxContainer Orientation="Horizontal" HorizontalExpand="True">
<BoxContainer Orientation="Vertical" HorizontalExpand="True" SizeFlagsStretchRatio="0.4">
<BoxContainer Orientation="Horizontal" HorizontalExpand="True">
@@ -29,4 +29,4 @@
</BoxContainer>
</BoxContainer>
</BoxContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/Construction/UI/ConstructionMenu.xaml.cs
View File

@@ -53,7 +53,7 @@ namespace Content.Client.Construction.UI
}
[GenerateTypedNameReferences]
public partial class ConstructionMenu : SS14Window, IConstructionMenuView
public partial class ConstructionMenu : DefaultWindow, IConstructionMenuView
{
public bool BuildButtonPressed
{

4
Content.Client/Crayon/UI/CrayonWindow.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window xmlns="https://spacestation14.io"
<DefaultWindow xmlns="https://spacestation14.io"
Title="{Loc 'crayon-window-title'}"
MinSize="250 300"
SetSize="250 300">
@@ -10,4 +10,4 @@
</GridContainer>
</ScrollContainer>
</BoxContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/Crayon/UI/CrayonWindow.xaml.cs
View File

@@ -15,7 +15,7 @@ using static Robust.Client.UserInterface.Controls.BaseButton;
namespace Content.Client.Crayon.UI
{
[GenerateTypedNameReferences]
public partial class CrayonWindow : SS14Window
public partial class CrayonWindow : DefaultWindow
{
public CrayonBoundUserInterface Owner { get; }

4
Content.Client/Credits/CreditsWindow.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window xmlns="https://spacestation14.io"
<DefaultWindow xmlns="https://spacestation14.io"
Title="{Loc 'credits-window-title'}"
SetSize="650 650" >
<TabContainer>
@@ -27,4 +27,4 @@
</BoxContainer>
</ScrollContainer>
</TabContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/Credits/CreditsWindow.xaml.cs
View File

@@ -21,7 +21,7 @@ using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Credits
{
[GenerateTypedNameReferences]
public sealed partial class CreditsWindow : SS14Window
public sealed partial class CreditsWindow : DefaultWindow
{
[Dependency] private readonly IResourceCache _resourceManager = default!;
[Dependency] private readonly IConfigurationManager _cfg = default!;

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

@@ -1,4 +1,4 @@
<SS14Window xmlns="https://spacestation14.io"
<DefaultWindow xmlns="https://spacestation14.io"
Title="{Loc 'disposal-router-window-title'}"
MinSize="500 110"
SetSize="500 110">
@@ -17,4 +17,4 @@
Text="{Loc 'disposal-router-window-tag-input-confirm-button'}" />
</BoxContainer>
</BoxContainer>
</SS14Window>
</DefaultWindow>

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

@@ -11,7 +11,7 @@ namespace Content.Client.Disposal.UI
/// Client-side UI used to control a <see cref="SharedDisposalRouterComponent"/>
/// </summary>
[GenerateTypedNameReferences]
public partial class DisposalRouterWindow : SS14Window
public partial class DisposalRouterWindow : DefaultWindow
{
public DisposalRouterWindow()
{

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

@@ -1,4 +1,4 @@
<SS14Window xmlns="https://spacestation14.io"
<DefaultWindow xmlns="https://spacestation14.io"
Title="{Loc 'disposal-tagger-window-title'}"
MinSize="500 110"
SetSize="500 110">
@@ -16,4 +16,4 @@
Text="{Loc 'disposal-tagger-window-tag-confirm-button'}" />
</BoxContainer>
</BoxContainer>
</SS14Window>
</DefaultWindow>

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

@@ -11,7 +11,7 @@ namespace Content.Client.Disposal.UI
/// Client-side UI used to control a <see cref="SharedDisposalTaggerComponent"/>
/// </summary>
[GenerateTypedNameReferences]
public partial class DisposalTaggerWindow : SS14Window
public partial class DisposalTaggerWindow : DefaultWindow
{
public DisposalTaggerWindow()
{

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

@@ -1,4 +1,4 @@
<SS14Window xmlns="https://spacestation14.io"
<DefaultWindow xmlns="https://spacestation14.io"
MinSize="300 140"
SetSize="300 140"
Resizable="False">
@@ -38,4 +38,4 @@
StyleClasses="OpenLeft" />
</BoxContainer>
</BoxContainer>
</SS14Window>
</DefaultWindow>

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

@@ -17,7 +17,7 @@ namespace Content.Client.Disposal.UI
/// Client-side UI used to control a <see cref="SharedDisposalUnitComponent"/>
/// </summary>
[GenerateTypedNameReferences]
public partial class DisposalUnitWindow : SS14Window
public partial class DisposalUnitWindow : DefaultWindow
{
public DisposalUnitWindow()
{

4
Content.Client/EscapeMenu/UI/EscapeMenu.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window xmlns="https://spacestation14.io"
<DefaultWindow xmlns="https://spacestation14.io"
xmlns:changelog="clr-namespace:Content.Client.Changelog"
xmlns:ui="clr-namespace:Content.Client.Voting.UI"
Title="{Loc 'ui-escape-title'}"
@@ -12,4 +12,4 @@
<Button Name="DisconnectButton" Text="{Loc 'ui-escape-disconnect'}" />
<Button Name="QuitButton" Text="{Loc 'ui-escape-quit'}" />
</BoxContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/EscapeMenu/UI/EscapeMenu.xaml.cs
View File

@@ -9,7 +9,7 @@ using Robust.Shared.GameObjects;
namespace Content.Client.EscapeMenu.UI
{
[GenerateTypedNameReferences]
internal partial class EscapeMenu : SS14Window
internal partial class EscapeMenu : DefaultWindow
{
private readonly IClientConsoleHost _consoleHost;

4
Content.Client/EscapeMenu/UI/OptionsMenu.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window xmlns="https://spacestation14.io"
<DefaultWindow xmlns="https://spacestation14.io"
xmlns:tabs="clr-namespace:Content.Client.EscapeMenu.UI.Tabs"
Title="{Loc 'ui-options-title'}"
MinSize="800 450">
@@ -7,4 +7,4 @@
<tabs:KeyRebindTab />
<tabs:AudioTab />
</TabContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/EscapeMenu/UI/OptionsMenu.xaml.cs
View File

@@ -7,7 +7,7 @@ using Robust.Shared.Localization;
namespace Content.Client.EscapeMenu.UI
{
[GenerateTypedNameReferences]
public partial class OptionsMenu : SS14Window
public partial class OptionsMenu : DefaultWindow
{
public OptionsMenu()
{

4
Content.Client/GameTicking/Managers/ClientGameTicker.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using Content.Client.Lobby;
using Content.Client.RoundEnd;
@@ -32,7 +32,7 @@ namespace Content.Client.GameTicking.Managers
[ViewVariables] public bool DisallowedLateJoin { get; private set; }
[ViewVariables] public string? ServerInfoBlob { get; private set; }
[ViewVariables] public TimeSpan StartTime { get; private set; }
[ViewVariables] public bool Paused { get; private set; }
[ViewVariables] public new bool Paused { get; private set; }
[ViewVariables] public Dictionary<NetUserId, LobbyPlayerStatus> Status { get; private set; } = new();
[ViewVariables] public IReadOnlyDictionary<StationId, Dictionary<string, int>> JobsAvailable => _jobsAvailable;
[ViewVariables] public IReadOnlyDictionary<StationId, string> StationNames => _stationNames;

6
Content.Client/Ghost/Roles/UI/GhostRoleRulesWindow.xaml
View File

@@ -1,8 +1,8 @@
<SS14Window xmlns="https://spacestation14.io"
<DefaultWindow xmlns="https://spacestation14.io"
Title="{Loc 'ghost-roles-window-title'}">
<BoxContainer Orientation="Vertical"
HorizontalExpand="True">
<RichTextLabel Name="Title" VerticalExpand="True"/>
<RichTextLabel Name="TopBanner" VerticalExpand="True"/>
<Button Name="RequestButton"
Text="{Loc 'ghost-roles-window-request-role-button'}"
Disabled="True"
@@ -10,4 +10,4 @@
HorizontalAlignment="Center"
VerticalAlignment="Center" />
</BoxContainer>
</SS14Window>
</DefaultWindow>

4
Content.Client/Ghost/Roles/UI/GhostRoleRulesWindow.xaml.cs
View File

@@ -11,13 +11,13 @@ using Robust.Shared.Utility;
namespace Content.Client.Ghost.Roles.UI
{
[GenerateTypedNameReferences]
public partial class GhostRoleRulesWindow : SS14Window
public partial class GhostRoleRulesWindow : DefaultWindow
{
private float _timer = 5.0f;
public GhostRoleRulesWindow(string rules, Action<BaseButton.ButtonEventArgs> requestAction)
{
RobustXamlLoader.Load(this);
Title.SetMessage(FormattedMessage.FromMarkupPermissive(rules + "\n" + Loc.GetString("ghost-roles-window-rules-footer")));
TopBanner.SetMessage(FormattedMessage.FromMarkupPermissive(rules + "\n" + Loc.GetString("ghost-roles-window-rules-footer")));
RequestButton.OnPressed += requestAction;
}

4
Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window xmlns="https://spacestation14.io"
<DefaultWindow xmlns="https://spacestation14.io"
Title="{Loc 'ghost-roles-window-title'}"
MinSize="375 275">
<Label Name="NoRolesMessage"
@@ -13,4 +13,4 @@
<!-- Ghost role entries are added here by code -->
</BoxContainer>
</ScrollContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml.cs
View File

@@ -6,7 +6,7 @@ using Robust.Client.UserInterface.CustomControls;
namespace Content.Client.Ghost.Roles.UI
{
[GenerateTypedNameReferences]
public partial class GhostRolesWindow : SS14Window
public partial class GhostRolesWindow : DefaultWindow
{
public event Action<GhostRoleInfo>? RoleRequested;

4
Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window Title="Make Ghost Role"
<DefaultWindow Title="Make Ghost Role"
xmlns="https://spacestation14.io">
<BoxContainer Orientation="Vertical">
@@ -27,4 +27,4 @@
</BoxContainer>
</BoxContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml.cs
View File

@@ -7,7 +7,7 @@ using static Robust.Client.UserInterface.Controls.BaseButton;
namespace Content.Client.Ghost.Roles.UI
{
[GenerateTypedNameReferences]
public partial class MakeGhostRoleWindow : SS14Window
public partial class MakeGhostRoleWindow : DefaultWindow
{
public delegate void MakeRole(EntityUid uid, string name, string description, string rules, bool makeSentient);

4
Content.Client/Ghost/UI/GhostTargetWindow.xaml
View File

@@ -1,4 +1,4 @@
<SS14Window xmlns="https://spacestation14.io"
<DefaultWindow xmlns="https://spacestation14.io"
Title="{Loc 'ghost-target-window-title'}"
MinSize="300 450"
SetSize="300 450">
@@ -11,4 +11,4 @@
<!-- Target buttons get added here by code -->
</BoxContainer>
</ScrollContainer>
</SS14Window>
</DefaultWindow>

2
Content.Client/Ghost/UI/GhostTargetWindow.xaml.cs
View File

@@ -12,7 +12,7 @@ using Robust.Shared.Localization;
namespace Content.Client.Ghost.UI
{
[GenerateTypedNameReferences]
public partial class GhostTargetWindow : SS14Window
public partial class GhostTargetWindow : DefaultWindow
{
private readonly IEntityNetworkManager _netManager;

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

@@ -7,7 +7,7 @@ using Robust.Shared.Localization;
namespace Content.Client.Info
{
public sealed class RulesAndInfoWindow : SS14Window
public sealed class RulesAndInfoWindow : DefaultWindow
{
[Dependency] private readonly RulesManager _rulesManager = default!;
[Dependency] private readonly IResourceCache _resourceManager = default!;

Some files were not shown because too many files have changed in this diff Show More