Station Map window edges (#24024)

diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml
index b4bd76c32831b2a6cee8965a7bf088bbef2bccde..660f2e5e11f5edde971475e8b7da54edde3b1f2d 100644 (file)
--- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml
+++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml
@@ -2,6 +2,7 @@
                xmlns:ui="clr-namespace:Content.Client.Medical.CrewMonitoring"
                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                Title="{Loc 'crew-monitoring-user-interface-title'}"
+               Resizable="False"
                SetSize="1210 700"
                MinSize="1210 700">
     <BoxContainer Orientation="Vertical">
@@ -13,7 +14,7 @@
                         <Label Name="StationName" Text="Unknown station" Align="Center" Margin="0 5 0 3"/>
                     </PanelContainer>
                 </controls:StripeBack>
-                
+
                 <ScrollContainer Name="SensorScroller"
                                  VerticalExpand="True"
                                  SetWidth="520"

diff --git a/Content.Client/Pinpointer/UI/StationMapWindow.xaml b/Content.Client/Pinpointer/UI/StationMapWindow.xaml
index 86d2dc3244d4892908b30074d60d97c26413798c..00424a3566aa42f9c37625aff9e9a5892459beb9 100644 (file)
--- a/Content.Client/Pinpointer/UI/StationMapWindow.xaml
+++ b/Content.Client/Pinpointer/UI/StationMapWindow.xaml
@@ -2,6 +2,24 @@
                       xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                       xmlns:ui="clr-namespace:Content.Client.Pinpointer.UI"
                       Title="{Loc 'station-map-window-title'}"
-                      Resizable="False">
-    <ui:NavMapControl Name="NavMapScreen"/>
+                      Resizable="False"
+                      SetSize="668 713"
+                      MinSize="668 713">
+    <BoxContainer Orientation="Vertical">
+        <BoxContainer Orientation="Horizontal"  HorizontalExpand="True" Margin="0 8 0 10" VerticalAlignment="Top">
+            <ui:NavMapControl Name="NavMapScreen"/>
+        </BoxContainer>
+
+        <!-- Footer -->
+        <BoxContainer Orientation="Vertical">
+            <PanelContainer StyleClasses="LowDivider" />
+            <BoxContainer Orientation="Horizontal" Margin="10 0 5 0" VerticalAlignment="Bottom">
+                <Label Text="{Loc 'station-map-user-interface-flavor-left'}" StyleClasses="WindowFooterText" />
+                <Label Text="{Loc 'station-map-user-interface-flavor-right'}" StyleClasses="WindowFooterText"
+                        HorizontalAlignment="Right" HorizontalExpand="True"  Margin="0 0 2 0" />
+                <TextureRect StyleClasses="NTLogoDark" Stretch="KeepAspectCentered"
+                        VerticalAlignment="Center" HorizontalAlignment="Right" SetSize="19 19"/>
+            </BoxContainer>
+        </BoxContainer>
+    </BoxContainer>
 </controls:FancyWindow>

diff --git a/Content.Client/Power/PowerMonitoringWindow.xaml b/Content.Client/Power/PowerMonitoringWindow.xaml
index cdd5b8f13faf79dc55cb6ab6ba5fa2be124785da..9bab3ad1c998ecf9d66d1863706c2aa40cc64f4a 100644 (file)
--- a/Content.Client/Power/PowerMonitoringWindow.xaml
+++ b/Content.Client/Power/PowerMonitoringWindow.xaml
@@ -3,6 +3,7 @@
                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
                Title="{Loc 'power-monitoring-window-title'}"
+               Resizable="False"
                SetSize="1120 750"
                MinSize="1120 750">
     <BoxContainer Orientation="Vertical">
@@ -36,7 +37,7 @@
                     <TextureRect Stretch="KeepAspectCentered"
                                  TexturePath="/Textures/Interface/NavMap/beveled_hexagon.png"
                                  SetSize="16 16"
-                                 Modulate="#ff4500"                               
+                                 Modulate="#ff4500"
                                  Margin="20 0 5 0"/>
                     <Label Text="{Loc 'power-monitoring-window-label-smes'}"/>
                     <TextureRect Stretch="KeepAspectCentered"
@@ -53,7 +54,7 @@
                     <Label Text="{Loc 'power-monitoring-window-label-apc'}"/>
                 </BoxContainer>
             </BoxContainer>
-            
+
             <!-- Power status -->
             <BoxContainer Orientation="Vertical" VerticalExpand="True" SetWidth="440" Margin="0 0 10 10">
 
@@ -101,7 +102,7 @@
                 </BoxContainer>
             </BoxContainer>
         </BoxContainer>
-    
+
         <!-- Footer -->
         <BoxContainer Orientation="Vertical">
             <PanelContainer StyleClasses="LowDivider" />

diff --git a/Resources/Locale/en-US/pinpointer/station_map.ftl b/Resources/Locale/en-US/pinpointer/station_map.ftl
index bd20a65fac89019313e3b3592f7ce0e67edc312c..d58d93bdb4e97b1bf359dda59f6abe4d3b2e4a43 100644 (file)
--- a/Resources/Locale/en-US/pinpointer/station_map.ftl
+++ b/Resources/Locale/en-US/pinpointer/station_map.ftl
@@ -1,4 +1,6 @@
 station-map-window-title = Station map
+station-map-user-interface-flavor-left = Don't panic
+station-map-user-interface-flavor-right = v1.42
 
 nav-beacon-window-title = Station Beacon
 nav-beacon-toggle-visible = Visible