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

more UI adjustments

Browse Source
This commit is contained in:
vulppine
2022-08-19 04:17:52 -07:00
parent 11c1b60df9
commit 14fad57e14
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml
View File

@@ -18,18 +18,19 @@
</BoxContainer> </BoxContainer>
</BoxContainer> </BoxContainer>
<!-- Right column (address, device total) --> <!-- Right column (address, device total) -->
<BoxContainer Orientation="Vertical">
<BoxContainer Orientation="Horizontal" Margin="0 0 2 0" HorizontalExpand="True"> <BoxContainer Orientation="Horizontal" Margin="0 0 2 0" HorizontalExpand="True">
<BoxContainer Orientation="Vertical" HorizontalExpand="True"> <BoxContainer Orientation="Vertical" HorizontalExpand="True">
<Label Text="{Loc 'air-alarm-ui-window-address-label'}" HorizontalExpand="True"/> <Label Text="{Loc 'air-alarm-ui-window-address-label'}" />
<Label Text="{Loc 'air-alarm-ui-window-device-count-label'}" HorizontalExpand="True"/> <Label Text="{Loc 'air-alarm-ui-window-device-count-label'}" />
</BoxContainer> </BoxContainer>
<BoxContainer Orientation="Vertical" HorizontalExpand="True"> <BoxContainer Orientation="Vertical" HorizontalExpand="True">
<Label Name="CDeviceAddress" HorizontalAlignment="Right" HorizontalExpand="True" Margin="0 0 4 0" /> <Label Name="CDeviceAddress" HorizontalAlignment="Right" />
<Label Name="CDeviceTotal" HorizontalAlignment="Right" HorizontalExpand="True" Margin="0 0 4 0" /> <Label Name="CDeviceTotal" HorizontalAlignment="Right" />
</BoxContainer>
</BoxContainer> </BoxContainer>
<Button Name="CResyncButton" Text="{Loc 'air-alarm-ui-window-resync-devices-label'}" HorizontalExpand="True" /> <Button Name="CResyncButton" Text="{Loc 'air-alarm-ui-window-resync-devices-label'}" HorizontalExpand="True" />
</BoxContainer> </BoxContainer>
</BoxContainer> </BoxContainer>
<!-- Gas/Device Data --> <!-- Gas/Device Data -->
<TabContainer Name="CTabContainer" VerticalExpand="True" Margin="0 0 0 2"> <TabContainer Name="CTabContainer" VerticalExpand="True" Margin="0 0 0 2">

6
Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml
View File

@@ -1,7 +1,7 @@
<BoxContainer xmlns="https://spacestation14.io"> <BoxContainer xmlns="https://spacestation14.io">
<Collapsible Orientation="Vertical"> <Collapsible Orientation="Vertical">
<CollapsibleHeading Name="SensorAddress" /> <CollapsibleHeading Name="SensorAddress" />
<CollapsibleBody> <CollapsibleBody Margin="2">
<BoxContainer Orientation="Vertical"> <BoxContainer Orientation="Vertical">
<BoxContainer Orientation="Horizontal" HorizontalExpand="True"> <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
<BoxContainer Orientation="Vertical" Margin="0 0 2 0" HorizontalExpand="True"> <BoxContainer Orientation="Vertical" Margin="0 0 2 0" HorizontalExpand="True">
@@ -15,7 +15,7 @@
<RichTextLabel Name="AlarmStateLabel" /> <RichTextLabel Name="AlarmStateLabel" />
</BoxContainer> </BoxContainer>
</BoxContainer> </BoxContainer>
<Collapsible Margin="0 0 2 0"> <Collapsible Orientation="Vertical" Margin="2">
<CollapsibleHeading Title="{Loc 'air-alarm-ui-sensor-gases'}" /> <CollapsibleHeading Title="{Loc 'air-alarm-ui-sensor-gases'}" />
<CollapsibleBody> <CollapsibleBody>
<BoxContainer Name="GasContainer" Orientation="Vertical" Margin="2" /> <BoxContainer Name="GasContainer" Orientation="Vertical" Margin="2" />
@@ -27,7 +27,7 @@
<BoxContainer Orientation="Vertical"> <BoxContainer Orientation="Vertical">
<Control Name="PressureThresholdContainer" Margin="2 0 2 0" /> <Control Name="PressureThresholdContainer" Margin="2 0 2 0" />
<Control Name="TemperatureThresholdContainer" Margin="2 0 2 0" /> <Control Name="TemperatureThresholdContainer" Margin="2 0 2 0" />
<Collapsible Orientation="Vertical"> <Collapsible Orientation="Vertical" Margin="2 0 2 0">
<CollapsibleHeading Title="{Loc 'air-alarm-ui-sensor-gases'}" /> <CollapsibleHeading Title="{Loc 'air-alarm-ui-sensor-gases'}" />
<CollapsibleBody Margin="4 2 4 2"> <CollapsibleBody Margin="4 2 4 2">
<BoxContainer Name="GasThresholds" Orientation="Vertical" Margin="2 0 2 0" /> <BoxContainer Name="GasThresholds" Orientation="Vertical" Margin="2 0 2 0" />