From 8640f342b5444c9209d41af53bb00180e2f3896e Mon Sep 17 00:00:00 2001
From: Leo <lzimann@users.noreply.github.com>
Date: Wed, 17 Feb 2021 11:22:51 -0300
Subject: [PATCH] Change all XAML to use spacestation14.io namespace (#3277)

---
 .../Construction/ConstructionMenu.xaml        | 60 +++++++++----------
 .../Observer/GhostRoles/GhostRolesEntry.xaml  | 16 ++---
 .../Observer/GhostRoles/GhostRolesWindow.xaml | 20 +++----
 .../GhostRoles/MakeGhostRoleWindow.xaml       | 49 ++++++++-------
 .../Instruments/InstrumentMenu.xaml           | 44 +++++++-------
 .../AdminMenu/SetOutfit/SetOutfitMenu.xaml    | 26 ++++----
 .../UserInterface/Suspicion/SuspicionGui.xaml | 15 +++--
 Content.Client/Voting/VotePopup.xaml          | 33 +++++-----
 8 files changed, 126 insertions(+), 137 deletions(-)

diff --git a/Content.Client/Construction/ConstructionMenu.xaml b/Content.Client/Construction/ConstructionMenu.xaml
index e4269c3209..0794b6beb2 100644
--- a/Content.Client/Construction/ConstructionMenu.xaml
+++ b/Content.Client/Construction/ConstructionMenu.xaml
@@ -1,31 +1,29 @@
-<customControls:SS14Window xmlns:customControls="clr-namespace:Robust.Client.UserInterface.CustomControls;assembly=Robust.Client"
-                           xmlns:controls="clr-namespace:Robust.Client.UserInterface.Controls;assembly=Robust.Client"
-                           xmlns:userInterface="clr-namespace:Robust.Client.UserInterface;assembly=Robust.Client">
-    <controls:HBoxContainer SizeFlagsHorizontal="FillExpand">
-        <controls:VBoxContainer SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="0.45">
-            <controls:HBoxContainer SizeFlagsHorizontal="FillExpand" SizeFlagsVertical="FillExpand" SizeFlagsStretchRatio="0.1">
-                <controls:LineEdit Name="SearchBar" PlaceHolder="Search" SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="0.6"/>
-                <controls:OptionButton Name="Category" SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="0.4"/>
-            </controls:HBoxContainer>
-            <controls:ItemList Name="RecipesList" SelectMode="Single" SizeFlagsVertical="FillExpand" SizeFlagsStretchRatio="0.9"/>
-        </controls:VBoxContainer>
-        <userInterface:Control SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="0.05"/>
-        <controls:VBoxContainer SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="0.45">
-            <controls:HBoxContainer Align="Center" SizeFlagsVertical="FillExpand" SizeFlagsStretchRatio="0.25">
-                <controls:TextureRect Name="TargetTexture" SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="0.15" Stretch="KeepCentered"/>
-                <controls:VBoxContainer SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="0.85">
-                    <controls:RichTextLabel Name="TargetName" SizeFlagsVertical="FillExpand" SizeFlagsStretchRatio="0.1"/>
-                    <controls:RichTextLabel Name="TargetDesc" SizeFlagsVertical="FillExpand" SizeFlagsStretchRatio="0.9"/>
-                </controls:VBoxContainer>
-            </controls:HBoxContainer>
-            <controls:ItemList Name="StepList" SizeFlagsVertical="FillExpand" SizeFlagsStretchRatio="0.1"/>
-            <controls:VBoxContainer SizeFlagsVertical="FillExpand" SizeFlagsStretchRatio="0.1">
-                <controls:Button Name="BuildButton" Disabled="True" ToggleMode="True" SizeFlagsVertical="FillExpand" SizeFlagsStretchRatio="0.5"/>
-                <controls:HBoxContainer SizeFlagsVertical="FillExpand" SizeFlagsStretchRatio="0.5">
-                    <controls:Button Name="EraseButton" ToggleMode="True" SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="0.7"/>
-                    <controls:Button Name="ClearButton" SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="0.3"/>
-                </controls:HBoxContainer>
-            </controls:VBoxContainer>
-        </controls:VBoxContainer>
-    </controls:HBoxContainer>
-</customControls:SS14Window>
+<SS14Window xmlns="https://spacestation14.io">
+    <HBoxContainer SizeFlagsHorizontal="FillExpand">
+        <VBoxContainer SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="0.45">
+            <HBoxContainer SizeFlagsHorizontal="FillExpand" SizeFlagsVertical="FillExpand" SizeFlagsStretchRatio="0.1">
+                <LineEdit Name="SearchBar" PlaceHolder="Search" SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="0.6"/>
+                <OptionButton Name="Category" SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="0.4"/>
+            </HBoxContainer>
+            <ItemList Name="RecipesList" SelectMode="Single" SizeFlagsVertical="FillExpand" SizeFlagsStretchRatio="0.9"/>
+        </VBoxContainer>
+        <Control SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="0.05"/>
+        <VBoxContainer SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="0.45">
+            <HBoxContainer Align="Center" SizeFlagsVertical="FillExpand" SizeFlagsStretchRatio="0.25">
+                <TextureRect Name="TargetTexture" SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="0.15" Stretch="KeepCentered"/>
+                <VBoxContainer SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="0.85">
+                    <RichTextLabel Name="TargetName" SizeFlagsVertical="FillExpand" SizeFlagsStretchRatio="0.1"/>
+                    <RichTextLabel Name="TargetDesc" SizeFlagsVertical="FillExpand" SizeFlagsStretchRatio="0.9"/>
+                </VBoxContainer>
+            </HBoxContainer>
+            <ItemList Name="StepList" SizeFlagsVertical="FillExpand" SizeFlagsStretchRatio="0.1"/>
+            <VBoxContainer SizeFlagsVertical="FillExpand" SizeFlagsStretchRatio="0.1">
+                <Button Name="BuildButton" Disabled="True" ToggleMode="True" SizeFlagsVertical="FillExpand" SizeFlagsStretchRatio="0.5"/>
+                <HBoxContainer SizeFlagsVertical="FillExpand" SizeFlagsStretchRatio="0.5">
+                    <Button Name="EraseButton" ToggleMode="True" SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="0.7"/>
+                    <Button Name="ClearButton" SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="0.3"/>
+                </HBoxContainer>
+            </VBoxContainer>
+        </VBoxContainer>
+    </HBoxContainer>
+</SS14Window>
diff --git a/Content.Client/GameObjects/Components/Observer/GhostRoles/GhostRolesEntry.xaml b/Content.Client/GameObjects/Components/Observer/GhostRoles/GhostRolesEntry.xaml
index a5725b2013..83ad91c3f1 100644
--- a/Content.Client/GameObjects/Components/Observer/GhostRoles/GhostRolesEntry.xaml
+++ b/Content.Client/GameObjects/Components/Observer/GhostRoles/GhostRolesEntry.xaml
@@ -1,9 +1,9 @@
-<uic:VBoxContainer
-    xmlns:uic="clr-namespace:Robust.Client.UserInterface.Controls;assembly=Robust.Client">
+<VBoxContainer
+    xmlns="https://spacestation14.io">
 
-    <uic:RichTextLabel Name="Title" />
-    <uic:HBoxContainer SeparationOverride="10">
-        <uic:RichTextLabel Name="Description" SizeFlagsHorizontal="FillExpand" />
-        <uic:Button Name="RequestButton" Text="Request" TextAlign="Center" SizeFlagsHorizontal="ShrinkEnd" />
-    </uic:HBoxContainer>
-</uic:VBoxContainer>
+    <RichTextLabel Name="Title" />
+    <HBoxContainer SeparationOverride="10">
+        <RichTextLabel Name="Description" SizeFlagsHorizontal="FillExpand" />
+        <Button Name="RequestButton" Text="Request" TextAlign="Center" SizeFlagsHorizontal="ShrinkEnd" />
+    </HBoxContainer>
+</VBoxContainer>
diff --git a/Content.Client/GameObjects/Components/Observer/GhostRoles/GhostRolesWindow.xaml b/Content.Client/GameObjects/Components/Observer/GhostRoles/GhostRolesWindow.xaml
index ab26c90d8c..221f26aa5c 100644
--- a/Content.Client/GameObjects/Components/Observer/GhostRoles/GhostRolesWindow.xaml
+++ b/Content.Client/GameObjects/Components/Observer/GhostRoles/GhostRolesWindow.xaml
@@ -1,12 +1,10 @@
-<cc:SS14Window Title="Ghost Roles"
-    xmlns:cc="clr-namespace:Robust.Client.UserInterface.CustomControls;assembly=Robust.Client"
-    xmlns:uic="clr-namespace:Robust.Client.UserInterface.Controls;assembly=Robust.Client">
+<SS14Window Title="Ghost Roles"
+            xmlns="https://spacestation14.io">
+    <CenterContainer Name="NoRolesMessage" SizeFlagsVertical="FillExpand" SizeFlagsHorizontal="FillExpand">
+        <Label Text="There are currently no available ghost roles." />
+    </CenterContainer>
+    <ScrollContainer SizeFlagsHorizontal="FillExpand" SizeFlagsVertical="FillExpand">
+        <VBoxContainer Name="EntryContainer" SizeFlagsHorizontal="FillExpand" SizeFlagsVertical="FillExpand" />
+    </ScrollContainer>
 
-    <uic:CenterContainer Name="NoRolesMessage" SizeFlagsVertical="FillExpand" SizeFlagsHorizontal="FillExpand">
-        <uic:Label Text="There are currently no available ghost roles."/>
-    </uic:CenterContainer>
-    <uic:ScrollContainer SizeFlagsHorizontal="FillExpand" SizeFlagsVertical="FillExpand">
-        <uic:VBoxContainer Name="EntryContainer" SizeFlagsHorizontal="FillExpand" SizeFlagsVertical="FillExpand" />
-    </uic:ScrollContainer>
-
-</cc:SS14Window>
+</SS14Window>
diff --git a/Content.Client/GameObjects/Components/Observer/GhostRoles/MakeGhostRoleWindow.xaml b/Content.Client/GameObjects/Components/Observer/GhostRoles/MakeGhostRoleWindow.xaml
index cadb52c617..4c775816a4 100644
--- a/Content.Client/GameObjects/Components/Observer/GhostRoles/MakeGhostRoleWindow.xaml
+++ b/Content.Client/GameObjects/Components/Observer/GhostRoles/MakeGhostRoleWindow.xaml
@@ -1,27 +1,26 @@
-<cc:SS14Window Title="Make Ghost Role"
-               xmlns:cc="clr-namespace:Robust.Client.UserInterface.CustomControls;assembly=Robust.Client"
-               xmlns:c="clr-namespace:Robust.Client.UserInterface.Controls;assembly=Robust.Client">
+<SS14Window Title="Make Ghost Role"
+            xmlns="https://spacestation14.io">
 
-    <c:VBoxContainer>
-        <c:HBoxContainer>
-            <c:Label Name="RoleEntityLabel" Text="Entity" />
-            <c:Label Name="RoleEntity" Text="" />
-        </c:HBoxContainer>
-        <c:HBoxContainer>
-            <c:Label Name="RoleNameLabel" Text="Role Name" />
-            <c:LineEdit Name="RoleName" SizeFlagsHorizontal="FillExpand"/>
-        </c:HBoxContainer>
-        <c:HBoxContainer>
-            <c:Label Name="RoleDescriptionLabel" Text="Role Description" />
-            <c:LineEdit Name="RoleDescription" SizeFlagsHorizontal="FillExpand"/>
-        </c:HBoxContainer>
-        <c:HBoxContainer>
-            <c:Label Name="MakeSentientLabel" Text="Make Sentient" />
-            <c:CheckBox Name="MakeSentientCheckbox" />
-        </c:HBoxContainer>
-        <c:HBoxContainer>
-            <c:Button Name="MakeButton" Text="Make" />
-        </c:HBoxContainer>
-    </c:VBoxContainer>
+    <VBoxContainer>
+        <HBoxContainer>
+            <Label Name="RoleEntityLabel" Text="Entity" />
+            <Label Name="RoleEntity" Text="" />
+        </HBoxContainer>
+        <HBoxContainer>
+            <Label Name="RoleNameLabel" Text="Role Name" />
+            <LineEdit Name="RoleName" SizeFlagsHorizontal="FillExpand" />
+        </HBoxContainer>
+        <HBoxContainer>
+            <Label Name="RoleDescriptionLabel" Text="Role Description" />
+            <LineEdit Name="RoleDescription" SizeFlagsHorizontal="FillExpand" />
+        </HBoxContainer>
+        <HBoxContainer>
+            <Label Name="MakeSentientLabel" Text="Make Sentient" />
+            <CheckBox Name="MakeSentientCheckbox" />
+        </HBoxContainer>
+        <HBoxContainer>
+            <Button Name="MakeButton" Text="Make" />
+        </HBoxContainer>
+    </VBoxContainer>
 
-</cc:SS14Window>
+</SS14Window>
diff --git a/Content.Client/Instruments/InstrumentMenu.xaml b/Content.Client/Instruments/InstrumentMenu.xaml
index 23e4b75a9b..fb501e4a96 100644
--- a/Content.Client/Instruments/InstrumentMenu.xaml
+++ b/Content.Client/Instruments/InstrumentMenu.xaml
@@ -1,23 +1,21 @@
-<cc:SS14Window xmlns:cc="clr-namespace:Robust.Client.UserInterface.CustomControls;assembly=Robust.Client"
-               xmlns:uic="clr-namespace:Robust.Client.UserInterface.Controls;assembly=Robust.Client"
-               xmlns:ui="clr-namespace:Robust.Client.UserInterface;assembly=Robust.Client">
-    <uic:MarginContainer Name="Margin" SizeFlagsVertical="FillExpand" SizeFlagsHorizontal="Fill">
-        <uic:VBoxContainer SizeFlagsVertical="FillExpand" SizeFlagsHorizontal="FillExpand" SeparationOverride="5">
-            <uic:HBoxContainer SizeFlagsVertical="FillExpand" SizeFlagsHorizontal="FillExpand">
-                <uic:Button Name="InputButton" ToggleMode="True" Text="MIDI Input" TextAlign="Center" SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="1"/>
-                <ui:Control SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="2" />
-                <uic:Button Name="FileButton" Text="Play MIDI File" TextAlign="Center" SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="1"/>
-            </uic:HBoxContainer>
-            <uic:HBoxContainer SizeFlagsVertical="FillExpand" SizeFlagsHorizontal="Fill">
-                <uic:Button Name="LoopButton" ToggleMode="True" Text="Loop" TextAlign="Center" SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="1"/>
-                <ui:Control SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="2" />
-                <uic:Button Name="StopButton" Text="Stop" TextAlign="Center" SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="1"/>
-            </uic:HBoxContainer>
-            <uic:HBoxContainer SizeFlagsVertical="ShrinkEnd" SizeFlagsHorizontal="FillExpand">
-                <ui:Control SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="0.125"/>
-                <uic:Slider Name="PlaybackSlider" SizeFlagsHorizontal="FillExpand" />
-                <ui:Control SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="0.125"/>
-            </uic:HBoxContainer>
-        </uic:VBoxContainer>
-    </uic:MarginContainer>
-</cc:SS14Window>
+<SS14Window xmlns="https://spacestation14.io">
+    <MarginContainer Name="Margin" SizeFlagsVertical="FillExpand" SizeFlagsHorizontal="Fill">
+        <VBoxContainer SizeFlagsVertical="FillExpand" SizeFlagsHorizontal="FillExpand" SeparationOverride="5">
+            <HBoxContainer SizeFlagsVertical="FillExpand" SizeFlagsHorizontal="FillExpand">
+                <Button Name="InputButton" ToggleMode="True" Text="MIDI Input" TextAlign="Center" SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="1"/>
+                <Control SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="2" />
+                <Button Name="FileButton" Text="Play MIDI File" TextAlign="Center" SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="1"/>
+            </HBoxContainer>
+            <HBoxContainer SizeFlagsVertical="FillExpand" SizeFlagsHorizontal="Fill">
+                <Button Name="LoopButton" ToggleMode="True" Text="Loop" TextAlign="Center" SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="1"/>
+                <Control SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="2" />
+                <Button Name="StopButton" Text="Stop" TextAlign="Center" SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="1"/>
+            </HBoxContainer>
+            <HBoxContainer SizeFlagsVertical="ShrinkEnd" SizeFlagsHorizontal="FillExpand">
+                <Control SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="0.125"/>
+                <Slider Name="PlaybackSlider" SizeFlagsHorizontal="FillExpand" />
+                <Control SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="0.125"/>
+            </HBoxContainer>
+        </VBoxContainer>
+    </MarginContainer>
+</SS14Window>
diff --git a/Content.Client/UserInterface/AdminMenu/SetOutfit/SetOutfitMenu.xaml b/Content.Client/UserInterface/AdminMenu/SetOutfit/SetOutfitMenu.xaml
index ddec212682..594f9e7cdf 100644
--- a/Content.Client/UserInterface/AdminMenu/SetOutfit/SetOutfitMenu.xaml
+++ b/Content.Client/UserInterface/AdminMenu/SetOutfit/SetOutfitMenu.xaml
@@ -1,17 +1,15 @@
-<customControls:SS14Window
-    xmlns:customControls="clr-namespace:Robust.Client.UserInterface.CustomControls;assembly=Robust.Client"
-    xmlns:controls="clr-namespace:Robust.Client.UserInterface.Controls;assembly=Robust.Client"
-    xmlns:userInterface="clr-namespace:Robust.Client.UserInterface;assembly=Robust.Client">
-    <controls:HBoxContainer SizeFlagsHorizontal="FillExpand">
-        <controls:VBoxContainer SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="0.45">
-            <controls:HBoxContainer SizeFlagsHorizontal="FillExpand" SizeFlagsVertical="FillExpand"
+<SS14Window
+    xmlns="https://spacestation14.io">
+    <HBoxContainer SizeFlagsHorizontal="FillExpand">
+        <VBoxContainer SizeFlagsHorizontal="FillExpand" SizeFlagsStretchRatio="0.45">
+            <HBoxContainer SizeFlagsHorizontal="FillExpand" SizeFlagsVertical="FillExpand"
                                     SizeFlagsStretchRatio="0.1">
-                <controls:LineEdit Name="SearchBar" PlaceHolder="Search" SizeFlagsHorizontal="FillExpand"
+                <LineEdit Name="SearchBar" PlaceHolder="Search" SizeFlagsHorizontal="FillExpand"
                                    SizeFlagsStretchRatio="0.6" />
-            </controls:HBoxContainer>
-            <controls:ItemList Name="OutfitList" SelectMode="Single" SizeFlagsVertical="FillExpand"
+            </HBoxContainer>
+            <ItemList Name="OutfitList" SelectMode="Single" SizeFlagsVertical="FillExpand"
                                SizeFlagsStretchRatio="0.9" />
-            <controls:Button Name="ConfirmButton" SizeFlagsHorizontal="FillExpand" />
-        </controls:VBoxContainer>
-    </controls:HBoxContainer>
-</customControls:SS14Window>
+            <Button Name="ConfirmButton" SizeFlagsHorizontal="FillExpand" />
+        </VBoxContainer>
+    </HBoxContainer>
+</SS14Window>
diff --git a/Content.Client/UserInterface/Suspicion/SuspicionGui.xaml b/Content.Client/UserInterface/Suspicion/SuspicionGui.xaml
index fb22a6d1fa..a9290ae0ab 100644
--- a/Content.Client/UserInterface/Suspicion/SuspicionGui.xaml
+++ b/Content.Client/UserInterface/Suspicion/SuspicionGui.xaml
@@ -1,8 +1,7 @@
-<ui:Control xmlns:uic="clr-namespace:Robust.Client.UserInterface.Controls;assembly=Robust.Client"
-            xmlns:ui="clr-namespace:Robust.Client.UserInterface;assembly=Robust.Client">
-    <uic:VBoxContainer SeparationOverride="0">
-        <uic:Button Name="RoleButton">
-            <uic:Label Name="TimerLabel" SizeFlagsHorizontal="ShrinkEnd" SizeFlagsVertical="ShrinkEnd" />
-        </uic:Button>
-    </uic:VBoxContainer>
-</ui:Control>
+<Control xmlns="https://spacestation14.io">
+    <VBoxContainer SeparationOverride="0">
+        <Button Name="RoleButton">
+            <Label Name="TimerLabel" SizeFlagsHorizontal="ShrinkEnd" SizeFlagsVertical="ShrinkEnd" />
+        </Button>
+    </VBoxContainer>
+</Control>
diff --git a/Content.Client/Voting/VotePopup.xaml b/Content.Client/Voting/VotePopup.xaml
index d27ab63012..e5e3faaee2 100644
--- a/Content.Client/Voting/VotePopup.xaml
+++ b/Content.Client/Voting/VotePopup.xaml
@@ -1,19 +1,18 @@
-<ui:Control xmlns:ui="clr-namespace:Robust.Client.UserInterface;assembly=Robust.Client"
-            xmlns:uic="clr-namespace:Robust.Client.UserInterface.Controls;assembly=Robust.Client">
-    <uic:PanelContainer StyleClasses="AngleRect" />
-    <uic:MarginContainer MarginLeftOverride="4" MarginRightOverride="4" MarginTopOverride="4" MarginBottomOverride="4">
-        <uic:VBoxContainer>
-            <uic:Label Name="VoteCaller" />
-            <uic:Label Name="VoteTitle" />
+<Control xmlns="https://spacestation14.io">
+    <PanelContainer StyleClasses="AngleRect" />
+    <MarginContainer MarginLeftOverride="4" MarginRightOverride="4" MarginTopOverride="4" MarginBottomOverride="4">
+        <VBoxContainer>
+            <Label Name="VoteCaller" />
+            <Label Name="VoteTitle" />
 
-            <uic:GridContainer Columns="3" Name="VoteOptionsContainer" />
-            <uic:HBoxContainer>
-                <uic:MarginContainer SizeFlagsHorizontal="FillExpand" MarginLeftOverride="2" MarginRightOverride="2"
+            <GridContainer Columns="3" Name="VoteOptionsContainer" />
+            <HBoxContainer>
+                <MarginContainer SizeFlagsHorizontal="FillExpand" MarginLeftOverride="2" MarginRightOverride="2"
                                      MarginTopOverride="2" MarginBottomOverride="2">
-                    <uic:ProgressBar Name="TimeLeftBar" MinValue="0" MaxValue="1" />
-                </uic:MarginContainer>
-                <uic:Label Name="TimeLeftText" />
-            </uic:HBoxContainer>
-        </uic:VBoxContainer>
-    </uic:MarginContainer>
-</ui:Control>
+                    <ProgressBar Name="TimeLeftBar" MinValue="0" MaxValue="1" />
+                </MarginContainer>
+                <Label Name="TimeLeftText" />
+            </HBoxContainer>
+        </VBoxContainer>
+    </MarginContainer>
+</Control>