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

Move/Rename stuff (#11209)

Browse Source 
-     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
This commit is contained in:
wrexbe
2022-09-11 18:56:21 -07:00
committed by GitHub
parent a905f601c3
commit 56c2ad6a16
36 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Administration/QuickDialogSystem.cs
View File

@@ -1,5 +1,5 @@
using System.Linq; using System.Linq;
using Content.Client.UserInterface; using Content.Client.UserInterface.Controls;
using Content.Shared.Administration; using Content.Shared.Administration;
using Robust.Client.UserInterface; using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;

2
Content.Client/Alerts/ClientAlertsSystem.cs
View File

@@ -9,7 +9,7 @@ using Robust.Shared.Prototypes;
namespace Content.Client.Alerts; namespace Content.Client.Alerts;
[UsedImplicitly] [UsedImplicitly]
internal sealed class ClientAlertsSystem : AlertsSystem public sealed class ClientAlertsSystem : AlertsSystem
{ {
public AlertOrderPrototype? AlertOrder { get; set; } public AlertOrderPrototype? AlertOrder { get; set; }

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

@@ -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: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" SetSize="600 600"
MinSize="600 600"> MinSize="600 600">
<BoxContainer Orientation="Vertical" Margin="5 0 5 0"> <BoxContainer Orientation="Vertical" Margin="5 0 5 0">
@@ -65,4 +65,4 @@
</PanelContainer> </PanelContainer>
<TextureButton VerticalExpand="True" /> <TextureButton VerticalExpand="True" />
</BoxContainer> </BoxContainer>
</userInterface:FancyWindow> </controls:FancyWindow>

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

@@ -1,5 +1,5 @@
using System.Linq; using System.Linq;
using Content.Client.UserInterface; using Content.Client.UserInterface.Controls;
using Content.Shared.Cargo; using Content.Shared.Cargo;
using Content.Shared.Cargo.Prototypes; using Content.Shared.Cargo.Prototypes;
using Robust.Client.AutoGenerated; using Robust.Client.AutoGenerated;

9
Content.Client/Cargo/UI/CargoShuttleMenu.xaml
View File

@@ -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: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" SetSize="600 600"
MinSize="600 600"> MinSize="600 600">
<BoxContainer Orientation="Vertical"> <BoxContainer Orientation="Vertical">
@@ -38,10 +38,9 @@
<BoxContainer Name="Orders" <BoxContainer Name="Orders"
Orientation="Vertical" Orientation="Vertical"
StyleClasses="transparentItemList" StyleClasses="transparentItemList"
VerticalExpand="True"> VerticalExpand="True"/>
</BoxContainer>
</ScrollContainer> </ScrollContainer>
</PanelContainer> </PanelContainer>
<TextureButton VerticalExpand="True" /> <TextureButton VerticalExpand="True" />
</BoxContainer> </BoxContainer>
</userInterface:FancyWindow> </controls:FancyWindow>

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

@@ -1,4 +1,4 @@
using Content.Client.UserInterface; using Content.Client.UserInterface.Controls;
using Content.Shared.Cargo; using Content.Shared.Cargo;
using Content.Shared.Cargo.Prototypes; using Content.Shared.Cargo.Prototypes;
using Robust.Client.AutoGenerated; using Robust.Client.AutoGenerated;

4
Content.Client/Changelog/ChangelogWindow.xaml
View File

@@ -1,6 +1,6 @@
<changelog:ChangelogWindow xmlns="https://spacestation14.io" <changelog:ChangelogWindow xmlns="https://spacestation14.io"
xmlns:changelog="clr-namespace:Content.Client.Changelog" 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"> MinSize="500 400" MouseFilter="Stop">
<PanelContainer StyleClasses="AngleRect" /> <PanelContainer StyleClasses="AngleRect" />
<BoxContainer Orientation="Vertical"> <BoxContainer Orientation="Vertical">
@@ -10,7 +10,7 @@
<TextureButton Margin="0 0 8 0" Name="CloseButton" StyleClasses="windowCloseButton" <TextureButton Margin="0 0 8 0" Name="CloseButton" StyleClasses="windowCloseButton"
VerticalAlignment="Center" /> VerticalAlignment="Center" />
</BoxContainer> </BoxContainer>
<ui:HighDivider /> <controls:HighDivider />
<ScrollContainer VerticalExpand="True" HScrollEnabled="False"> <ScrollContainer VerticalExpand="True" HScrollEnabled="False">
<BoxContainer Orientation="Vertical" Name="ChangelogBody" /> <BoxContainer Orientation="Vertical" Name="ChangelogBody" />

6
Content.Client/Gravity/UI/GravityGeneratorWindow.xaml
View File

@@ -1,5 +1,5 @@
<ui:FancyWindow xmlns="https://spacestation14.io" <controls:FancyWindow xmlns="https://spacestation14.io"
xmlns:ui="clr-namespace:Content.Client.UserInterface" xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
Title="{Loc 'gravity-generator-window-title'}" Title="{Loc 'gravity-generator-window-title'}"
MinSize="270 130" MinSize="270 130"
SetSize="360 180"> SetSize="360 180">
@@ -32,4 +32,4 @@
</PanelContainer> </PanelContainer>
</BoxContainer> </BoxContainer>
</ui:FancyWindow> </controls:FancyWindow>

2
Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs
View File

@@ -1,6 +1,6 @@
using System; using System;
using Content.Client.Message; using Content.Client.Message;
using Content.Client.UserInterface; using Content.Client.UserInterface.Controls;
using Content.Shared.Gravity; using Content.Shared.Gravity;
using Robust.Client.AutoGenerated; using Robust.Client.AutoGenerated;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;

2
Content.Client/Hands/HandsComponent.cs
View File

@@ -1,3 +1,5 @@
using Content.Client.Hands.Systems;
using Content.Client.Hands.UI;
using Content.Shared.Hands.Components; using Content.Shared.Hands.Components;
namespace Content.Client.Hands namespace Content.Client.Hands

1
Content.Client/Hands/ShowHandItemOverlay.cs
View File

@@ -1,3 +1,4 @@
using Content.Client.Hands.Systems;
using Content.Shared.CCVar; using Content.Shared.CCVar;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;
using Robust.Client.Graphics; using Robust.Client.Graphics;

3
Content.Client/Hands/Systems/HandVirtualItemSystem.cs
View File

@@ -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;
using Content.Shared.Hands.Components; using Content.Shared.Hands.Components;
using JetBrains.Annotations; using JetBrains.Annotations;

3
Content.Client/Hands/Systems/HandsSystem.cs
View File

@@ -1,6 +1,7 @@
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using System.Linq; using System.Linq;
using Content.Client.Animations; using Content.Client.Animations;
using Content.Client.Hands.UI;
using Content.Client.HUD; using Content.Client.HUD;
using Content.Shared.Hands; using Content.Shared.Hands;
using Content.Shared.Hands.Components; using Content.Shared.Hands.Components;
@@ -14,7 +15,7 @@ using Robust.Shared.GameStates;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Timing; using Robust.Shared.Timing;
namespace Content.Client.Hands namespace Content.Client.Hands.Systems
{ {
[UsedImplicitly] [UsedImplicitly]
public sealed class HandsSystem : SharedHandsSystem public sealed class HandsSystem : SharedHandsSystem

0
Content.Client/Hands/HandVirtualItemStatus.xaml → Content.Client/Hands/UI/HandVirtualItemStatus.xaml
View File

2
Content.Client/Hands/HandVirtualItemStatus.xaml.cs → Content.Client/Hands/UI/HandVirtualItemStatus.xaml.cs
View File

@@ -1,7 +1,7 @@
using Robust.Client.UserInterface; using Robust.Client.UserInterface;
using Robust.Client.UserInterface.XAML; using Robust.Client.UserInterface.XAML;
namespace Content.Client.Hands namespace Content.Client.Hands.UI
{ {
public sealed class HandVirtualItemStatus : Control public sealed class HandVirtualItemStatus : Control
{ {

0
Content.Client/Hands/HandsGui.xaml → Content.Client/Hands/UI/HandsGui.xaml
View File

8
Content.Client/Hands/HandsGui.xaml.cs → Content.Client/Hands/UI/HandsGui.xaml.cs
View File

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

4
Content.Client/Launcher/LauncherConnectingGui.xaml
View File

@@ -2,7 +2,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client" xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
xmlns:parallax="clr-namespace:Content.Client.Parallax" 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 /> <parallax:ParallaxControl />
<Control HorizontalAlignment="Center" VerticalAlignment="Center"> <Control HorizontalAlignment="Center" VerticalAlignment="Center">
<PanelContainer StyleClasses="AngleRect" /> <PanelContainer StyleClasses="AngleRect" />
@@ -13,7 +13,7 @@
<Button Name="ExitButton" Text="{Loc 'connecting-exit'}" <Button Name="ExitButton" Text="{Loc 'connecting-exit'}"
HorizontalAlignment="Right" HorizontalExpand="True" /> HorizontalAlignment="Right" HorizontalExpand="True" />
</BoxContainer> </BoxContainer>
<ui:HighDivider /> <controls:HighDivider />
<BoxContainer Orientation="Vertical" VerticalExpand="True" Margin="4 4 4 0"> <BoxContainer Orientation="Vertical" VerticalExpand="True" Margin="4 4 4 0">
<Control VerticalExpand="True" Margin="0 0 0 8"> <Control VerticalExpand="True" Margin="0 0 0 8">
<BoxContainer Orientation="Vertical" Name="ConnectingStatus"> <BoxContainer Orientation="Vertical" Name="ConnectingStatus">

6
Content.Client/NPC/NPCWindow.xaml
View File

@@ -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:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:ui="clr-namespace:Content.Client.HUD.UI" 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" Title="NPC debug"
MinSize="200 200"> MinSize="200 200">
<BoxContainer Name="Options" Orientation="Vertical"> <BoxContainer Name="Options" Orientation="Vertical">
@@ -21,4 +21,4 @@
<CheckBox Name="PathRegions" Text="Regions"/> <CheckBox Name="PathRegions" Text="Regions"/>
</BoxContainer> </BoxContainer>
</BoxContainer> </BoxContainer>
</userInterface:FancyWindow> </controls:FancyWindow>

2
Content.Client/NPC/NPCWindow.xaml.cs
View File

@@ -1,4 +1,4 @@
using Content.Client.UserInterface; using Content.Client.UserInterface.Controls;
using Robust.Client.AutoGenerated; using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.XAML; using Robust.Client.UserInterface.XAML;
using Robust.Shared.Console; using Robust.Shared.Console;

6
Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml
View File

@@ -1,5 +1,5 @@
<ui:FancyWindow xmlns="https://spacestation14.io" <controls:FancyWindow xmlns="https://spacestation14.io"
xmlns:ui="clr-namespace:Content.Client.UserInterface" xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
xmlns:networkConfigurator="clr-namespace:Content.Client.NetworkConfigurator" xmlns:networkConfigurator="clr-namespace:Content.Client.NetworkConfigurator"
Title="Network Configurator" MinSize="350 100"> Title="Network Configurator" MinSize="350 100">
<BoxContainer Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True"> <BoxContainer Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True">
@@ -17,4 +17,4 @@
</BoxContainer> </BoxContainer>
<Label Name="Count" HorizontalAlignment="Right" /> <Label Name="Count" HorizontalAlignment="Right" />
</BoxContainer> </BoxContainer>
</ui:FancyWindow> </controls:FancyWindow>

2
Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs
View File

@@ -1,5 +1,5 @@
using Content.Client.Stylesheets; using Content.Client.Stylesheets;
using Content.Client.UserInterface; using Content.Client.UserInterface.Controls;
using Content.Shared.DeviceNetwork; using Content.Shared.DeviceNetwork;
using Robust.Client.AutoGenerated; using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;

6
Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml
View File

@@ -1,5 +1,5 @@
<ui:FancyWindow xmlns="https://spacestation14.io" <controls:FancyWindow xmlns="https://spacestation14.io"
xmlns:ui="clr-namespace:Content.Client.UserInterface" xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
xmlns:networkConfigurator="clr-namespace:Content.Client.NetworkConfigurator" xmlns:networkConfigurator="clr-namespace:Content.Client.NetworkConfigurator"
Title="Network Configurator" MinSize="220 400"> Title="Network Configurator" MinSize="220 400">
<BoxContainer Orientation="Vertical" VerticalExpand="True"> <BoxContainer Orientation="Vertical" VerticalExpand="True">
@@ -10,4 +10,4 @@
<Button Name="ClearButton" Access="Public" Text="{Loc 'network-configurator-ui-clear-button'}"></Button> <Button Name="ClearButton" Access="Public" Text="{Loc 'network-configurator-ui-clear-button'}"></Button>
</BoxContainer> </BoxContainer>
</BoxContainer> </BoxContainer>
</ui:FancyWindow> </controls:FancyWindow>

2
Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml.cs
View File

@@ -1,4 +1,4 @@
using Content.Client.UserInterface; using Content.Client.UserInterface.Controls;
using Content.Shared.DeviceNetwork; using Content.Shared.DeviceNetwork;
using Robust.Client.AutoGenerated; using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;

6
Content.Client/Shuttles/UI/EmergencyConsoleWindow.xaml
View File

@@ -1,5 +1,5 @@
<userInterface:FancyWindow xmlns="https://spacestation14.io" <controls:FancyWindow xmlns="https://spacestation14.io"
xmlns:userInterface="clr-namespace:Content.Client.UserInterface" xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
Title="{Loc 'emergency-shuttle-console-window-title'}" Title="{Loc 'emergency-shuttle-console-window-title'}"
MinSize="400 400"> MinSize="400 400">
<BoxContainer Orientation="Vertical" <BoxContainer Orientation="Vertical"
@@ -38,4 +38,4 @@
<BoxContainer Name="AuthorizationsContainer" Orientation="Vertical"> <BoxContainer Name="AuthorizationsContainer" Orientation="Vertical">
</BoxContainer> </BoxContainer>
</BoxContainer> </BoxContainer>
</userInterface:FancyWindow> </controls:FancyWindow>

2
Content.Client/Shuttles/UI/EmergencyConsoleWindow.xaml.cs
View File

@@ -1,5 +1,5 @@
using Content.Client.Computer; using Content.Client.Computer;
using Content.Client.UserInterface; using Content.Client.UserInterface.Controls;
using Content.Shared.Shuttles.BUIStates; using Content.Shared.Shuttles.BUIStates;
using Content.Shared.Shuttles.Events; using Content.Shared.Shuttles.Events;
using Robust.Client.AutoGenerated; using Robust.Client.AutoGenerated;

6
Content.Client/Shuttles/UI/IFFConsoleWindow.xaml
View File

@@ -1,5 +1,5 @@
<userInterface:FancyWindow xmlns="https://spacestation14.io" <controls:FancyWindow xmlns="https://spacestation14.io"
xmlns:userInterface="clr-namespace:Content.Client.UserInterface" xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
Title="{Loc 'iff-console-window-title'}" Title="{Loc 'iff-console-window-title'}"
MinSize="200 200"> MinSize="200 200">
<BoxContainer Orientation="Vertical" HorizontalExpand="True"> <BoxContainer Orientation="Vertical" HorizontalExpand="True">
@@ -17,4 +17,4 @@
</BoxContainer> </BoxContainer>
</GridContainer> </GridContainer>
</BoxContainer> </BoxContainer>
</userInterface:FancyWindow> </controls:FancyWindow>

2
Content.Client/Shuttles/UI/IFFConsoleWindow.xaml.cs
View File

@@ -1,5 +1,5 @@
using Content.Client.Computer; using Content.Client.Computer;
using Content.Client.UserInterface; using Content.Client.UserInterface.Controls;
using Content.Shared.Shuttles.BUIStates; using Content.Shared.Shuttles.BUIStates;
using Content.Shared.Shuttles.Components; using Content.Shared.Shuttles.Components;
using Robust.Client.AutoGenerated; using Robust.Client.AutoGenerated;

6
Content.Client/Shuttles/UI/RadarConsoleWindow.xaml
View File

@@ -1,6 +1,6 @@
<userInterface:FancyWindow xmlns="https://spacestation14.io" <controls:FancyWindow xmlns="https://spacestation14.io"
xmlns:userInterface="clr-namespace:Content.Client.UserInterface" xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
xmlns:ui="clr-namespace:Content.Client.Shuttles.UI" xmlns:ui="clr-namespace:Content.Client.Shuttles.UI"
Title="{Loc 'radar-console-window-title'}"> Title="{Loc 'radar-console-window-title'}">
<ui:RadarControl Name="RadarScreen"/> <ui:RadarControl Name="RadarScreen"/>
</userInterface:FancyWindow> </controls:FancyWindow>

2
Content.Client/Shuttles/UI/RadarConsoleWindow.xaml.cs
View File

@@ -1,5 +1,5 @@
using Content.Client.Computer; using Content.Client.Computer;
using Content.Client.UserInterface; using Content.Client.UserInterface.Controls;
using Content.Shared.Shuttles.BUIStates; using Content.Shared.Shuttles.BUIStates;
using Robust.Client.AutoGenerated; using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.XAML; using Robust.Client.UserInterface.XAML;

6
Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml
View File

@@ -1,5 +1,5 @@
<userInterface:FancyWindow xmlns="https://spacestation14.io" <controls:FancyWindow xmlns="https://spacestation14.io"
xmlns:userInterface="clr-namespace:Content.Client.UserInterface" xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
xmlns:ui="clr-namespace:Content.Client.Shuttles.UI" xmlns:ui="clr-namespace:Content.Client.Shuttles.UI"
xmlns:ui1="clr-namespace:Content.Client.HUD.UI" xmlns:ui1="clr-namespace:Content.Client.HUD.UI"
Title="{Loc 'shuttle-console-window-title'}"> Title="{Loc 'shuttle-console-window-title'}">
@@ -97,4 +97,4 @@
Disabled="True"/> Disabled="True"/>
</BoxContainer> </BoxContainer>
</GridContainer> </GridContainer>
</userInterface:FancyWindow> </controls:FancyWindow>

2
Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs
View File

@@ -1,5 +1,5 @@
using Content.Client.Computer; using Content.Client.Computer;
using Content.Client.UserInterface; using Content.Client.UserInterface.Controls;
using Content.Shared.Shuttles.BUIStates; using Content.Shared.Shuttles.BUIStates;
using Content.Shared.Shuttles.Components; using Content.Shared.Shuttles.Components;
using Content.Shared.Shuttles.Systems; using Content.Shared.Shuttles.Systems;

10
Content.Client/UserInterface/FancyWindow.xaml → Content.Client/UserInterface/Controls/FancyWindow.xaml
View File

@@ -1,8 +1,8 @@
 
<ui:FancyWindow xmlns="https://spacestation14.io" <controls:FancyWindow xmlns="https://spacestation14.io"
xmlns:ui="clr-namespace:Content.Client.UserInterface" xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
MouseFilter="Stop" MouseFilter="Stop"
MinWidth="200" MinHeight="150"> MinWidth="200" MinHeight="150">
<PanelContainer StyleClasses="AngleRect" /> <PanelContainer StyleClasses="AngleRect" />
<BoxContainer Orientation="Vertical"> <BoxContainer Orientation="Vertical">
@@ -18,4 +18,4 @@
<PanelContainer StyleClasses="LowDivider" /> <PanelContainer StyleClasses="LowDivider" />
<Control Access="Public" Name="ContentsContainer" Margin="0 2" RectClipContent="True" VerticalExpand="true" /> <Control Access="Public" Name="ContentsContainer" Margin="0 2" RectClipContent="True" VerticalExpand="true" />
</BoxContainer> </BoxContainer>
</ui:FancyWindow> </controls:FancyWindow>

2
Content.Client/UserInterface/FancyWindow.xaml.cs → Content.Client/UserInterface/Controls/FancyWindow.xaml.cs
View File

@@ -3,7 +3,7 @@ using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML; using Robust.Client.UserInterface.XAML;
using Robust.Shared.Maths; using Robust.Shared.Maths;
namespace Content.Client.UserInterface namespace Content.Client.UserInterface.Controls
{ {
[GenerateTypedNameReferences] [GenerateTypedNameReferences]
[Virtual] [Virtual]

2
Content.Client/HUD/UI/HighDivider.cs → Content.Client/UserInterface/Controls/HighDivider.cs
View File

@@ -2,7 +2,7 @@ using Content.Client.Stylesheets;
using Robust.Client.UserInterface; using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
namespace Content.Client.HUD.UI namespace Content.Client.UserInterface.Controls
{ {
public sealed class HighDivider : Control public sealed class HighDivider : Control
{ {

4
Content.Client/Voting/UI/VoteCallMenu.xaml
View File

@@ -1,6 +1,6 @@
<ui:VoteCallMenu xmlns="https://spacestation14.io" <ui:VoteCallMenu xmlns="https://spacestation14.io"
xmlns:ui="clr-namespace:Content.Client.Voting.UI" 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"> MouseFilter="Stop" MinSize="350 150">
<PanelContainer StyleClasses="AngleRect" /> <PanelContainer StyleClasses="AngleRect" />
<BoxContainer Orientation="Vertical"> <BoxContainer Orientation="Vertical">
@@ -10,7 +10,7 @@
<TextureButton Name="CloseButton" StyleClasses="windowCloseButton" <TextureButton Name="CloseButton" StyleClasses="windowCloseButton"
VerticalAlignment="Center" /> VerticalAlignment="Center" />
</BoxContainer> </BoxContainer>
<hudUi:HighDivider /> <controls:HighDivider />
<BoxContainer Orientation="Vertical" Margin="8 2 8 0" VerticalExpand="True" VerticalAlignment="Top"> <BoxContainer Orientation="Vertical" Margin="8 2 8 0" VerticalExpand="True" VerticalAlignment="Top">
<BoxContainer Orientation="Horizontal"> <BoxContainer Orientation="Horizontal">