Move/Rename stuff (#11209)

- Change namespace, and folder of FancyWindow to Content.Client.UserInterface.Controls - Change xaml reference from ui to controls in some places - Change ClientAlertsSystem from internal to public - Change namespace, and folder of HighDivider to Content.Client.UserInterface.Controls
2022-09-11 18:56:21 -07:00
parent a905f601c3
commit 56c2ad6a16
36 changed files with 66 additions and 66 deletions
--- a/Content.Client/Administration/QuickDialogSystem.cs
+++ b/Content.Client/Administration/QuickDialogSystem.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using Content.Client.UserInterface;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.Administration;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
--- a/Content.Client/Alerts/ClientAlertsSystem.cs
+++ b/Content.Client/Alerts/ClientAlertsSystem.cs
@@ -9,7 +9,7 @@ using Robust.Shared.Prototypes;
 namespace Content.Client.Alerts;

 [UsedImplicitly]
-internal sealed class ClientAlertsSystem : AlertsSystem
+public sealed class ClientAlertsSystem : AlertsSystem
 {
    public AlertOrderPrototype? AlertOrder { get; set; }

--- a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml
+++ b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml
@@ -1,6 +1,6 @@
-<userInterface:FancyWindow xmlns="https://spacestation14.io"
+<controls:FancyWindow xmlns="https://spacestation14.io"
                           xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-                           xmlns:userInterface="clr-namespace:Content.Client.UserInterface"
+                           xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                           SetSize="600 600"
                           MinSize="600 600">
    <BoxContainer Orientation="Vertical" Margin="5 0 5 0">
@@ -65,4 +65,4 @@
        </PanelContainer>
        <TextureButton VerticalExpand="True" />
    </BoxContainer>
-</userInterface:FancyWindow>
+</controls:FancyWindow>
--- a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using Content.Client.UserInterface;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.Prototypes;
 using Robust.Client.AutoGenerated;
--- a/Content.Client/Cargo/UI/CargoShuttleMenu.xaml
+++ b/Content.Client/Cargo/UI/CargoShuttleMenu.xaml
@@ -1,6 +1,6 @@
-<userInterface:FancyWindow xmlns="https://spacestation14.io"
+<controls:FancyWindow xmlns="https://spacestation14.io"
            xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-            xmlns:userInterface="clr-namespace:Content.Client.UserInterface"
+            xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
            SetSize="600 600"
            MinSize="600 600">
    <BoxContainer Orientation="Vertical">
@@ -38,10 +38,9 @@
                <BoxContainer Name="Orders"
                              Orientation="Vertical"
                              StyleClasses="transparentItemList"
-                              VerticalExpand="True">
-                </BoxContainer>
+                              VerticalExpand="True"/>
            </ScrollContainer>
        </PanelContainer>
        <TextureButton VerticalExpand="True" />
    </BoxContainer>
-</userInterface:FancyWindow>
+</controls:FancyWindow>
--- a/Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Client.UserInterface;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.Prototypes;
 using Robust.Client.AutoGenerated;
--- a/Content.Client/Changelog/ChangelogWindow.xaml
+++ b/Content.Client/Changelog/ChangelogWindow.xaml
@@ -1,6 +1,6 @@
 <changelog:ChangelogWindow xmlns="https://spacestation14.io"
                           xmlns:changelog="clr-namespace:Content.Client.Changelog"
-                           xmlns:ui="clr-namespace:Content.Client.HUD.UI"
+                           xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                           MinSize="500 400" MouseFilter="Stop">
    <PanelContainer StyleClasses="AngleRect" />
    <BoxContainer Orientation="Vertical">
@@ -10,7 +10,7 @@
            <TextureButton Margin="0 0 8 0" Name="CloseButton" StyleClasses="windowCloseButton"
                           VerticalAlignment="Center" />
        </BoxContainer>
-        <ui:HighDivider />
+        <controls:HighDivider />

        <ScrollContainer VerticalExpand="True" HScrollEnabled="False">
            <BoxContainer Orientation="Vertical" Name="ChangelogBody" />
--- a/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml
+++ b/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml
@@ -1,5 +1,5 @@
-<ui:FancyWindow xmlns="https://spacestation14.io"
-                xmlns:ui="clr-namespace:Content.Client.UserInterface"
+<controls:FancyWindow xmlns="https://spacestation14.io"
+                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                Title="{Loc 'gravity-generator-window-title'}"
                MinSize="270 130"
                SetSize="360 180">
@@ -32,4 +32,4 @@
        </PanelContainer>
    </BoxContainer>

-</ui:FancyWindow>
+</controls:FancyWindow>
--- a/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs
+++ b/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs
@@ -1,6 +1,6 @@
 using System;
 using Content.Client.Message;
-using Content.Client.UserInterface;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.Gravity;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
--- a/Content.Client/Hands/HandsComponent.cs
+++ b/Content.Client/Hands/HandsComponent.cs
@@ -1,3 +1,5 @@
+using Content.Client.Hands.Systems;
+using Content.Client.Hands.UI;
 using Content.Shared.Hands.Components;

 namespace Content.Client.Hands
--- a/Content.Client/Hands/ShowHandItemOverlay.cs
+++ b/Content.Client/Hands/ShowHandItemOverlay.cs
@@ -1,3 +1,4 @@
+using Content.Client.Hands.Systems;
 using Content.Shared.CCVar;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
--- a/Content.Client/Hands/Systems/HandVirtualItemSystem.cs
+++ b/Content.Client/Hands/Systems/HandVirtualItemSystem.cs
@@ -1,4 +1,5 @@
-using Content.Client.Items;
+using Content.Client.Hands.UI;
+using Content.Client.Items;
 using Content.Shared.Hands;
 using Content.Shared.Hands.Components;
 using JetBrains.Annotations;
--- a/Content.Client/Hands/Systems/HandsSystem.cs
+++ b/Content.Client/Hands/Systems/HandsSystem.cs
@@ -1,6 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Client.Animations;
+using Content.Client.Hands.UI;
 using Content.Client.HUD;
 using Content.Shared.Hands;
 using Content.Shared.Hands.Components;
@@ -14,7 +15,7 @@ using Robust.Shared.GameStates;
 using Robust.Shared.Map;
 using Robust.Shared.Timing;

-namespace Content.Client.Hands
+namespace Content.Client.Hands.Systems
 {
    [UsedImplicitly]
    public sealed class HandsSystem : SharedHandsSystem
--- a/Content.Client/Hands/UI/HandVirtualItemStatus.xaml
+++ b/Content.Client/Hands/UI/HandVirtualItemStatus.xaml
--- a/Content.Client/Hands/UI/HandVirtualItemStatus.xaml.cs
+++ b/Content.Client/Hands/UI/HandVirtualItemStatus.xaml.cs
@@ -1,7 +1,7 @@
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;

-namespace Content.Client.Hands
+namespace Content.Client.Hands.UI
 {
    public sealed class HandVirtualItemStatus : Control
    {
--- a/Content.Client/Hands/UI/HandsGui.xaml
+++ b/Content.Client/Hands/UI/HandsGui.xaml
--- a/Content.Client/Hands/UI/HandsGui.xaml.cs
+++ b/Content.Client/Hands/UI/HandsGui.xaml.cs
@@ -1,6 +1,5 @@
-using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using Content.Client.Hands.Systems;
 using Content.Client.HUD;
 using Content.Client.Inventory;
 using Content.Client.Items.Managers;
@@ -14,13 +13,10 @@ using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Configuration;
-using Robust.Shared.GameObjects;
 using Robust.Shared.Input;
-using Robust.Shared.IoC;
 using Robust.Shared.Timing;
-using Robust.Shared.ViewVariables;

-namespace Content.Client.Hands
+namespace Content.Client.Hands.UI
 {
    [GenerateTypedNameReferences]
    public sealed partial class HandsGui : Control
--- a/Content.Client/Launcher/LauncherConnectingGui.xaml
+++ b/Content.Client/Launcher/LauncherConnectingGui.xaml
@@ -2,7 +2,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
         xmlns:parallax="clr-namespace:Content.Client.Parallax"
-         xmlns:ui="clr-namespace:Content.Client.HUD.UI">
+         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
    <parallax:ParallaxControl />
    <Control HorizontalAlignment="Center" VerticalAlignment="Center">
        <PanelContainer StyleClasses="AngleRect" />
@@ -13,7 +13,7 @@
                <Button Name="ExitButton" Text="{Loc 'connecting-exit'}"
                        HorizontalAlignment="Right" HorizontalExpand="True" />
            </BoxContainer>
-            <ui:HighDivider />
+            <controls:HighDivider />
            <BoxContainer Orientation="Vertical" VerticalExpand="True" Margin="4 4 4 0">
                <Control VerticalExpand="True" Margin="0 0 0 8">
                    <BoxContainer Orientation="Vertical" Name="ConnectingStatus">
--- a/Content.Client/NPC/NPCWindow.xaml
+++ b/Content.Client/NPC/NPCWindow.xaml
@@ -1,7 +1,7 @@
-<userInterface:FancyWindow xmlns="https://spacestation14.io"
+<controls:FancyWindow xmlns="https://spacestation14.io"
            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
            xmlns:ui="clr-namespace:Content.Client.HUD.UI"
-            xmlns:userInterface="clr-namespace:Content.Client.UserInterface"
+            xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
            Title="NPC debug"
            MinSize="200 200">
    <BoxContainer Name="Options" Orientation="Vertical">
@@ -21,4 +21,4 @@
            <CheckBox Name="PathRegions" Text="Regions"/>
        </BoxContainer>
    </BoxContainer>
-</userInterface:FancyWindow>
+</controls:FancyWindow>
--- a/Content.Client/NPC/NPCWindow.xaml.cs
+++ b/Content.Client/NPC/NPCWindow.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Client.UserInterface;
+using Content.Client.UserInterface.Controls;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Console;
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml
@@ -1,5 +1,5 @@
-<ui:FancyWindow xmlns="https://spacestation14.io"
-                xmlns:ui="clr-namespace:Content.Client.UserInterface"
+<controls:FancyWindow xmlns="https://spacestation14.io"
+                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                xmlns:networkConfigurator="clr-namespace:Content.Client.NetworkConfigurator"
                Title="Network Configurator" MinSize="350 100">
    <BoxContainer Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True">
@@ -17,4 +17,4 @@
        </BoxContainer>
        <Label Name="Count" HorizontalAlignment="Right" />
    </BoxContainer>
-</ui:FancyWindow>
+</controls:FancyWindow>
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs
@@ -1,5 +1,5 @@
 using Content.Client.Stylesheets;
-using Content.Client.UserInterface;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.DeviceNetwork;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml
@@ -1,5 +1,5 @@
-<ui:FancyWindow xmlns="https://spacestation14.io"
-                xmlns:ui="clr-namespace:Content.Client.UserInterface"
+<controls:FancyWindow xmlns="https://spacestation14.io"
+                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                xmlns:networkConfigurator="clr-namespace:Content.Client.NetworkConfigurator"
                Title="Network Configurator" MinSize="220 400">
    <BoxContainer Orientation="Vertical" VerticalExpand="True">
@@ -10,4 +10,4 @@
            <Button Name="ClearButton" Access="Public" Text="{Loc 'network-configurator-ui-clear-button'}"></Button>
        </BoxContainer>
    </BoxContainer>
-</ui:FancyWindow>
+</controls:FancyWindow>
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml.cs
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Client.UserInterface;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.DeviceNetwork;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
--- a/Content.Client/Shuttles/UI/EmergencyConsoleWindow.xaml
+++ b/Content.Client/Shuttles/UI/EmergencyConsoleWindow.xaml
@@ -1,5 +1,5 @@
-<userInterface:FancyWindow xmlns="https://spacestation14.io"
-                           xmlns:userInterface="clr-namespace:Content.Client.UserInterface"
+<controls:FancyWindow xmlns="https://spacestation14.io"
+                           xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                           Title="{Loc 'emergency-shuttle-console-window-title'}"
                           MinSize="400 400">
 <BoxContainer Orientation="Vertical"
@@ -38,4 +38,4 @@
    <BoxContainer Name="AuthorizationsContainer" Orientation="Vertical">
    </BoxContainer>
 </BoxContainer>
-</userInterface:FancyWindow>
+</controls:FancyWindow>
--- a/Content.Client/Shuttles/UI/EmergencyConsoleWindow.xaml.cs
+++ b/Content.Client/Shuttles/UI/EmergencyConsoleWindow.xaml.cs
@@ -1,5 +1,5 @@
 using Content.Client.Computer;
-using Content.Client.UserInterface;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.Shuttles.BUIStates;
 using Content.Shared.Shuttles.Events;
 using Robust.Client.AutoGenerated;
--- a/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml
+++ b/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml
@@ -1,5 +1,5 @@
-<userInterface:FancyWindow xmlns="https://spacestation14.io"
-                           xmlns:userInterface="clr-namespace:Content.Client.UserInterface"
+<controls:FancyWindow xmlns="https://spacestation14.io"
+                           xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                           Title="{Loc 'iff-console-window-title'}"
                           MinSize="200 200">
    <BoxContainer Orientation="Vertical" HorizontalExpand="True">
@@ -17,4 +17,4 @@
            </BoxContainer>
        </GridContainer>
    </BoxContainer>
-</userInterface:FancyWindow>
+</controls:FancyWindow>
--- a/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml.cs
+++ b/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml.cs
@@ -1,5 +1,5 @@
 using Content.Client.Computer;
-using Content.Client.UserInterface;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.Shuttles.BUIStates;
 using Content.Shared.Shuttles.Components;
 using Robust.Client.AutoGenerated;
--- a/Content.Client/Shuttles/UI/RadarConsoleWindow.xaml
+++ b/Content.Client/Shuttles/UI/RadarConsoleWindow.xaml
@@ -1,6 +1,6 @@
-<userInterface:FancyWindow xmlns="https://spacestation14.io"
-                           xmlns:userInterface="clr-namespace:Content.Client.UserInterface"
+<controls:FancyWindow xmlns="https://spacestation14.io"
+                           xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                           xmlns:ui="clr-namespace:Content.Client.Shuttles.UI"
               Title="{Loc 'radar-console-window-title'}">
    <ui:RadarControl Name="RadarScreen"/>
-</userInterface:FancyWindow>
+</controls:FancyWindow>
--- a/Content.Client/Shuttles/UI/RadarConsoleWindow.xaml.cs
+++ b/Content.Client/Shuttles/UI/RadarConsoleWindow.xaml.cs
@@ -1,5 +1,5 @@
 using Content.Client.Computer;
-using Content.Client.UserInterface;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.Shuttles.BUIStates;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;
--- a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml
+++ b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml
@@ -1,5 +1,5 @@
-<userInterface:FancyWindow xmlns="https://spacestation14.io"
-                           xmlns:userInterface="clr-namespace:Content.Client.UserInterface"
+<controls:FancyWindow xmlns="https://spacestation14.io"
+                           xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                           xmlns:ui="clr-namespace:Content.Client.Shuttles.UI"
                           xmlns:ui1="clr-namespace:Content.Client.HUD.UI"
                           Title="{Loc 'shuttle-console-window-title'}">
@@ -97,4 +97,4 @@
                    Disabled="True"/>
        </BoxContainer>
    </GridContainer>
-</userInterface:FancyWindow>
+</controls:FancyWindow>
--- a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs
+++ b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs
@@ -1,5 +1,5 @@
 using Content.Client.Computer;
-using Content.Client.UserInterface;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.Shuttles.BUIStates;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Shuttles.Systems;
--- a/Content.Client/UserInterface/Controls/FancyWindow.xaml
+++ b/Content.Client/UserInterface/Controls/FancyWindow.xaml
@@ -1,6 +1,6 @@

-<ui:FancyWindow xmlns="https://spacestation14.io"
-                xmlns:ui="clr-namespace:Content.Client.UserInterface"
+<controls:FancyWindow xmlns="https://spacestation14.io"
+                      xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                      MouseFilter="Stop"
                      MinWidth="200" MinHeight="150">
    <PanelContainer StyleClasses="AngleRect" />
@@ -18,4 +18,4 @@
        <PanelContainer StyleClasses="LowDivider" />
        <Control Access="Public" Name="ContentsContainer" Margin="0 2" RectClipContent="True" VerticalExpand="true" />
    </BoxContainer>
-</ui:FancyWindow>
+</controls:FancyWindow>
--- a/Content.Client/UserInterface/Controls/FancyWindow.xaml.cs
+++ b/Content.Client/UserInterface/Controls/FancyWindow.xaml.cs
@@ -3,7 +3,7 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Maths;

-namespace Content.Client.UserInterface
+namespace Content.Client.UserInterface.Controls
 {
    [GenerateTypedNameReferences]
    [Virtual]
--- a/Content.Client/UserInterface/Controls/HighDivider.cs
+++ b/Content.Client/UserInterface/Controls/HighDivider.cs
@@ -2,7 +2,7 @@ using Content.Client.Stylesheets;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;

-namespace Content.Client.HUD.UI
+namespace Content.Client.UserInterface.Controls
 {
    public sealed class HighDivider : Control
    {
--- a/Content.Client/Voting/UI/VoteCallMenu.xaml
+++ b/Content.Client/Voting/UI/VoteCallMenu.xaml
@@ -1,6 +1,6 @@
 <ui:VoteCallMenu xmlns="https://spacestation14.io"
                 xmlns:ui="clr-namespace:Content.Client.Voting.UI"
-                 xmlns:hudUi="clr-namespace:Content.Client.HUD.UI"
+                 xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                 MouseFilter="Stop" MinSize="350 150">
    <PanelContainer StyleClasses="AngleRect" />
    <BoxContainer Orientation="Vertical">
@@ -10,7 +10,7 @@
            <TextureButton Name="CloseButton" StyleClasses="windowCloseButton"
                           VerticalAlignment="Center" />
        </BoxContainer>
-        <hudUi:HighDivider />
+        <controls:HighDivider />

        <BoxContainer Orientation="Vertical" Margin="8 2 8 0" VerticalExpand="True" VerticalAlignment="Top">
            <BoxContainer Orientation="Horizontal">