Fix unused and improperly named xaml namespaces (#4172)

Content.Client/Administration/UI/AdminMenuWindow.xaml

@@ -1,17 +1,13 @@
 <SS14Window
     xmlns="https://spacestation14.io"
-    xmlns:adminMenu="clr-namespace:Content.Client.UserInterface.AdminMenu.Tabs;assembly=Content.Client"
-    xmlns:adminTab="clr-namespace:Content.Client.UserInterface.AdminMenu.Tabs.AdminTab"
-    xmlns:adminbusTab="clr-namespace:Content.Client.UserInterface.AdminMenu.Tabs.AdminbusTab"
-    xmlns:atmosTab="clr-namespace:Content.Client.UserInterface.AdminMenu.Tabs.AtmosTab"
-    xmlns:adminTab1="clr-namespace:Content.Client.Administration.UI.Tabs.AdminTab"
-    xmlns:adminbusTab1="clr-namespace:Content.Client.Administration.UI.Tabs.AdminbusTab"
-    xmlns:atmosTab1="clr-namespace:Content.Client.Administration.UI.Tabs.AtmosTab"
+    xmlns:adminTab="clr-namespace:Content.Client.Administration.UI.Tabs.AdminTab"
+    xmlns:adminbusTab="clr-namespace:Content.Client.Administration.UI.Tabs.AdminbusTab"
+    xmlns:atmosTab="clr-namespace:Content.Client.Administration.UI.Tabs.AtmosTab"
     xmlns:tabs="clr-namespace:Content.Client.Administration.UI.Tabs">
     <TabContainer Name="MasterTabContainer">
-        <adminTab1:AdminTab />
-        <adminbusTab1:AdminbusTab />
-        <atmosTab1:AtmosTab />
+        <adminTab:AdminTab />
+        <adminbusTab:AdminbusTab />
+        <atmosTab:AtmosTab />
         <tabs:RoundTab />
         <tabs:ServerTab />
         <tabs:PlayerTab Name="PlayerTabControl" />

Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml

@@ -1,19 +1,17 @@
 <Control
     xmlns="https://spacestation14.io"
-    xmlns:amc="clr-namespace:Content.Client.UserInterface.AdminMenu.CustomControls"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:at="clr-namespace:Content.Client.UserInterface.AdminMenu.Tabs.AdminTab"
-    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
-    xmlns:adminTab="clr-namespace:Content.Client.Administration.UI.Tabs.AdminTab"
+    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    xmlns:at="clr-namespace:Content.Client.Administration.UI.Tabs.AdminTab"
     Margin="4"
     MinSize="50 50">
     <VBoxContainer>
         <GridContainer Columns="4">
-            <customControls:UICommandButton Command="kick" Text="{Loc Kick}" WindowType="{x:Type adminTab:KickWindow}" />
-            <customControls:UICommandButton Command="ban" Text="{Loc Ban}" WindowType="{x:Type adminTab:BanWindow}" />
-            <customControls:CommandButton Command="aghost" Text="{Loc Admin Ghost}" />
-            <customControls:UICommandButton Command="tpto" Text="{Loc Teleport}" WindowType="{x:Type adminTab:TeleportWindow}" />
-            <customControls:CommandButton Command="permissions" Text="{Loc Permissions Panel}" />
+            <cc:UICommandButton Command="kick" Text="{Loc Kick}" WindowType="{x:Type at:KickWindow}" />
+            <cc:UICommandButton Command="ban" Text="{Loc Ban}" WindowType="{x:Type at:BanWindow}" />
+            <cc:CommandButton Command="aghost" Text="{Loc Admin Ghost}" />
+            <cc:UICommandButton Command="tpto" Text="{Loc Teleport}" WindowType="{x:Type at:TeleportWindow}" />
+            <cc:CommandButton Command="permissions" Text="{Loc Permissions Panel}" />
         </GridContainer>
     </VBoxContainer>
 </Control>

Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml

@@ -1,6 +1,5 @@
 <SS14Window
     xmlns="https://spacestation14.io"
-    xmlns:cc="clr-namespace:Content.Client.UserInterface.AdminMenu.CustomControls"
     Title="{Loc Ban}" MinSize="425 162">
     <VBoxContainer>
         <HBoxContainer>

Content.Client/Administration/UI/Tabs/AdminTab/KickWindow.xaml

@@ -1,7 +1,6 @@
 <SS14Window
     xmlns="https://spacestation14.io"
-    xmlns:cc="clr-namespace:Content.Client.UserInterface.AdminMenu.CustomControls"
-    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
     Title="{Loc Kick}" MinSize="425 272">
     <VBoxContainer>
         <HBoxContainer>
@@ -9,7 +8,7 @@
             <Control MinWidth="50" />
             <LineEdit Name="ReasonLine" MinWidth="100" HorizontalExpand="True" />
         </HBoxContainer>
-        <customControls:PlayerListControl Name="PlayerList" />
+        <cc:PlayerListControl Name="PlayerList" />
         <Button Name="SubmitButton" Text="{Loc Kick}" />
     </VBoxContainer>
 </SS14Window>

Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml

@@ -1,10 +1,9 @@
 <SS14Window
     xmlns="https://spacestation14.io"
-    xmlns:cc="clr-namespace:Content.Client.UserInterface.AdminMenu.CustomControls"
-    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
     Title="{Loc Teleport}" MinSize="425 230">
     <VBoxContainer>
-        <customControls:PlayerListControl Name="PlayerList" />
+        <cc:PlayerListControl Name="PlayerList" />
         <Button Name="SubmitButton" Text="{Loc Teleport}" />
     </VBoxContainer>
 </SS14Window>

Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml

@@ -1,16 +1,14 @@
 <Control
     xmlns="https://spacestation14.io"
-    xmlns:amc="clr-namespace:Content.Client.UserInterface.AdminMenu.CustomControls"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:abt="clr-namespace:Content.Client.UserInterface.AdminMenu.Tabs.AdminbusTab"
-    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
-    xmlns:adminbusTab="clr-namespace:Content.Client.Administration.UI.Tabs.AdminbusTab"
+    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    xmlns:abt="clr-namespace:Content.Client.Administration.UI.Tabs.AdminbusTab"
     Margin="4"
     MinSize="50 50">
     <GridContainer
         Columns="4">
-        <customControls:CommandButton Name="SpawnEntitiesButton" Text="{Loc Spawn Entities}" />
-        <customControls:CommandButton Name="SpawnTilesButton" Text="{Loc Spawn Tiles} " />
-        <customControls:UICommandButton Command="events" Text="{Loc Station Events}" WindowType="{x:Type adminbusTab:StationEventsWindow}" />
+        <cc:CommandButton Name="SpawnEntitiesButton" Text="{Loc Spawn Entities}" />
+        <cc:CommandButton Name="SpawnTilesButton" Text="{Loc Spawn Tiles} " />
+        <cc:UICommandButton Command="events" Text="{Loc Station Events}" WindowType="{x:Type abt:StationEventsWindow}" />
     </GridContainer>
 </Control>

Content.Client/Administration/UI/Tabs/AtmosTab/AtmosTab.xaml

@@ -1,17 +1,15 @@
 <Control
     xmlns="https://spacestation14.io"
-    xmlns:amc="clr-namespace:Content.Client.UserInterface.AdminMenu.CustomControls"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:at="clr-namespace:Content.Client.UserInterface.AdminMenu.Tabs.AtmosTab"
-    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
-    xmlns:atmosTab="clr-namespace:Content.Client.Administration.UI.Tabs.AtmosTab"
+    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    xmlns:at="clr-namespace:Content.Client.Administration.UI.Tabs.AtmosTab"
     Margin="4"
     MinSize="50 50">
     <GridContainer Columns="4">
-        <customControls:UICommandButton Text="{Loc Add Atmos}" Command="addatmos" WindowType="{x:Type atmosTab:AddAtmosWindow}" />
-        <customControls:UICommandButton Text="{Loc Add Gas}" Command="addgas" WindowType="{x:Type atmosTab:AddGasWindow}" />
-        <customControls:UICommandButton Text="{Loc Fill Gas}" Command="fillgas" WindowType="{x:Type atmosTab:FillGasWindow}" />
-        <customControls:UICommandButton Text="{Loc Set Temperature}" Command="settemp"
-                             WindowType="{x:Type atmosTab:SetTemperatureWindow}" />
+        <cc:UICommandButton Text="{Loc Add Atmos}" Command="addatmos" WindowType="{x:Type at:AddAtmosWindow}" />
+        <cc:UICommandButton Text="{Loc Add Gas}" Command="addgas" WindowType="{x:Type at:AddGasWindow}" />
+        <cc:UICommandButton Text="{Loc Fill Gas}" Command="fillgas" WindowType="{x:Type at:FillGasWindow}" />
+        <cc:UICommandButton Text="{Loc Set Temperature}" Command="settemp"
+                             WindowType="{x:Type at:SetTemperatureWindow}" />
     </GridContainer>
 </Control>

Content.Client/Administration/UI/Tabs/RoundTab.xaml

@@ -1,13 +1,12 @@
 <Control
     xmlns="https://spacestation14.io"
-    xmlns:amc="clr-namespace:Content.Client.UserInterface.AdminMenu.CustomControls"
-    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
     Margin="4"
     MinSize="50 50">
     <GridContainer
         Columns="4">
-        <customControls:CommandButton Command="startround" Text="{Loc Start Round}" />
-        <customControls:CommandButton Command="endround" Text="{Loc End Round}" />
-        <customControls:CommandButton Command="restartround" Text="{Loc Restart Round}" />
+        <cc:CommandButton Command="startround" Text="{Loc Start Round}" />
+        <cc:CommandButton Command="endround" Text="{Loc End Round}" />
+        <cc:CommandButton Command="restartround" Text="{Loc Restart Round}" />
     </GridContainer>
 </Control>

Content.Client/Administration/UI/Tabs/ServerTab.xaml

@@ -1,12 +1,11 @@
 <Control
     xmlns="https://spacestation14.io"
-    xmlns:amc="clr-namespace:Content.Client.UserInterface.AdminMenu.CustomControls"
-    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
     Margin="4"
     MinSize="50 50">
     <GridContainer
         Columns="4" >
-        <customControls:CommandButton Command="restart" Text="{Loc Reboot}"></customControls:CommandButton>
-        <customControls:CommandButton Command="shutdown" Text="{Loc Shutdown}"></customControls:CommandButton>
+        <cc:CommandButton Command="restart" Text="{Loc Reboot}"></cc:CommandButton>
+        <cc:CommandButton Command="shutdown" Text="{Loc Shutdown}"></cc:CommandButton>
     </GridContainer>
 </Control>