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

Fix unused and improperly named xaml namespaces (#4172)

Browse Source
This commit is contained in:
DrSmugleaf
2021-06-10 23:09:07 +02:00
committed by GitHub
parent ff1a2d97ea
commit f9acdbe5cc
14 changed files with 49 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

16
Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml
View File

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

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

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

5
Content.Client/Administration/UI/Tabs/AdminTab/KickWindow.xaml
View File

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

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

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

12
Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml
View File

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

16
Content.Client/Administration/UI/Tabs/AtmosTab/AtmosTab.xaml
View File

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

9
Content.Client/Administration/UI/Tabs/RoundTab.xaml
View File

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

7
Content.Client/Administration/UI/Tabs/ServerTab.xaml
View File

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

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

@@ -1,5 +1,4 @@
<changelog:ChangelogWindow xmlns="https://spacestation14.io" <changelog:ChangelogWindow xmlns="https://spacestation14.io"
xmlns:cui="clr-namespace:Content.Client.UserInterface"
xmlns:changelog="clr-namespace:Content.Client.Changelog" xmlns:changelog="clr-namespace:Content.Client.Changelog"
xmlns:ui="clr-namespace:Content.Client.HUD.UI" xmlns:ui="clr-namespace:Content.Client.HUD.UI"
MinSize="500 400" MouseFilter="Stop"> MinSize="500 400" MouseFilter="Stop">

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

@@ -1,5 +1,4 @@
<SS14Window xmlns="https://spacestation14.io" <SS14Window xmlns="https://spacestation14.io"
xmlns:voting="clr-namespace:Content.Client.Voting"
xmlns:changelog="clr-namespace:Content.Client.Changelog" xmlns:changelog="clr-namespace:Content.Client.Changelog"
xmlns:ui="clr-namespace:Content.Client.Voting.UI" xmlns:ui="clr-namespace:Content.Client.Voting.UI"
Title="{Loc 'ui-escape-title'}" Title="{Loc 'ui-escape-title'}"

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

@@ -1,7 +1,6 @@
<Control xmlns="https://spacestation14.io" <Control xmlns="https://spacestation14.io"
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:cuic="clr-namespace:Content.Client.UserInterface"
xmlns:parallax="clr-namespace:Content.Client.Parallax" xmlns:parallax="clr-namespace:Content.Client.Parallax"
xmlns:ui="clr-namespace:Content.Client.HUD.UI"> xmlns:ui="clr-namespace:Content.Client.HUD.UI">
<parallax:ParallaxControl /> <parallax:ParallaxControl />

21
Content.Client/Lobby/UI/LobbyGui.xaml
View File

@@ -1,16 +1,13 @@
<Control xmlns="https://spacestation14.io" <Control xmlns="https://spacestation14.io"
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:cui="clr-namespace:Content.Client.UserInterface"
xmlns:chat="clr-namespace:Content.Client.Chat"
xmlns:maths="clr-namespace:Robust.Shared.Maths;assembly=Robust.Shared.Maths" xmlns:maths="clr-namespace:Robust.Shared.Maths;assembly=Robust.Shared.Maths"
xmlns:voting="clr-namespace:Content.Client.Voting"
xmlns:parallax="clr-namespace:Content.Client.Parallax" xmlns:parallax="clr-namespace:Content.Client.Parallax"
xmlns:ui="clr-namespace:Content.Client.Voting.UI" xmlns:ui="clr-namespace:Content.Client.Voting.UI"
xmlns:style="clr-namespace:Content.Client.Stylesheets" xmlns:style="clr-namespace:Content.Client.Stylesheets"
xmlns:ui1="clr-namespace:Content.Client.HUD.UI" xmlns:hudUi="clr-namespace:Content.Client.HUD.UI"
xmlns:ui2="clr-namespace:Content.Client.Chat.UI" xmlns:chatUi="clr-namespace:Content.Client.Chat.UI"
xmlns:ui3="clr-namespace:Content.Client.Lobby.UI" xmlns:lobbyUi="clr-namespace:Content.Client.Lobby.UI"
xmlns:info="clr-namespace:Content.Client.Info"> xmlns:info="clr-namespace:Content.Client.Info">
<Control> <Control>
@@ -43,7 +40,7 @@
<HBoxContainer VerticalExpand="True"> <HBoxContainer VerticalExpand="True">
<!-- Left panel --> <!-- Left panel -->
<VBoxContainer Name="CLeftPanelContainer" HorizontalExpand="True"> <VBoxContainer Name="CLeftPanelContainer" HorizontalExpand="True">
<ui1:StripeBack> <hudUi:StripeBack>
<MarginContainer MarginLeftOverride="3" MarginRightOverride="3" MarginBottomOverride="3" <MarginContainer MarginLeftOverride="3" MarginRightOverride="3" MarginBottomOverride="3"
MarginTopOverride="3"> MarginTopOverride="3">
<HBoxContainer SeparationOverride="6"> <HBoxContainer SeparationOverride="6">
@@ -55,11 +52,11 @@
StyleClasses="ButtonBig" /> StyleClasses="ButtonBig" />
</HBoxContainer> </HBoxContainer>
</MarginContainer> </MarginContainer>
</ui1:StripeBack> </hudUi:StripeBack>
<MarginContainer VerticalExpand="True" MarginLeftOverride="3" MarginRightOverride="3" <MarginContainer VerticalExpand="True" MarginLeftOverride="3" MarginRightOverride="3"
MarginBottomOverride="3" MarginBottomOverride="3"
MarginTopOverride="3"> MarginTopOverride="3">
<ui2:ChatBox Name="CChat" /> <chatUi:ChatBox Name="CChat" />
</MarginContainer> </MarginContainer>
</VBoxContainer> </VBoxContainer>
<!-- Gold line --> <!-- Gold line -->
@@ -72,16 +69,16 @@
<Control HorizontalExpand="True"> <Control HorizontalExpand="True">
<VBoxContainer> <VBoxContainer>
<!-- Player list --> <!-- Player list -->
<ui1:NanoHeading Text="{Loc 'Online Players'}" /> <hudUi:NanoHeading Text="{Loc 'Online Players'}" />
<MarginContainer VerticalExpand="True" <MarginContainer VerticalExpand="True"
MarginRightOverride="3" MarginLeftOverride="3" MarginRightOverride="3" MarginLeftOverride="3"
MarginBottomOverride="3" MarginTopOverride="3"> MarginBottomOverride="3" MarginTopOverride="3">
<ui3:LobbyPlayerList Name="COnlinePlayerList" <lobbyUi:LobbyPlayerList Name="COnlinePlayerList"
HorizontalExpand="True" HorizontalExpand="True"
VerticalExpand="True" /> VerticalExpand="True" />
</MarginContainer> </MarginContainer>
<!-- Server info --> <!-- Server info -->
<ui1:NanoHeading Text="{Loc 'Server Info'}" /> <hudUi:NanoHeading Text="{Loc 'Server Info'}" />
<MarginContainer VerticalExpand="True" <MarginContainer VerticalExpand="True"
MarginRightOverride="3" MarginLeftOverride="3" MarginRightOverride="3" MarginLeftOverride="3"
MarginBottomOverride="2" MarginTopOverride="3"> MarginBottomOverride="2" MarginTopOverride="3">

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

@@ -1,8 +1,7 @@
<ui:VoteCallMenu xmlns="https://spacestation14.io" <ui:VoteCallMenu xmlns="https://spacestation14.io"
xmlns:v="clr-namespace:Content.Client.Voting" 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:ui1="clr-namespace:Content.Client.HUD.UI" MouseFilter="Stop" MinSize="350 150">
MouseFilter="Stop" MinSize="350 150">
<PanelContainer StyleClasses="AngleRect" /> <PanelContainer StyleClasses="AngleRect" />
<VBoxContainer> <VBoxContainer>
<HBoxContainer> <HBoxContainer>
@@ -14,7 +13,7 @@
SizeFlagsVertical="ShrinkCenter" /> SizeFlagsVertical="ShrinkCenter" />
</MarginContainer> </MarginContainer>
</HBoxContainer> </HBoxContainer>
<ui1:HighDivider /> <hudUi:HighDivider />
<MarginContainer SizeFlagsHorizontal="Fill" SizeFlagsVertical="Expand" <MarginContainer SizeFlagsHorizontal="Fill" SizeFlagsVertical="Expand"
MarginLeftOverride="8" MarginRightOverride="8" MarginTopOverride="2"> MarginLeftOverride="8" MarginRightOverride="8" MarginTopOverride="2">