UI changes

This commit is contained in:
vulppine
2022-08-19 04:06:09 -07:00
parent bf215350a7
commit a0e9f4d0b8
7 changed files with 45 additions and 122 deletions

View File

@@ -20,9 +20,14 @@
<!-- Right column (address, device total) -->
<BoxContainer Orientation="Horizontal" Margin="0 0 2 0" 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-device-count-label'}" HorizontalExpand="True"/>
</BoxContainer>
<BoxContainer Orientation="Vertical" HorizontalExpand="True">
<Label Name="CDeviceAddress" HorizontalAlignment="Right" HorizontalExpand="True" Margin="0 0 4 0" />
<Label Name="CDeviceTotal" HorizontalAlignment="Right" HorizontalExpand="True" Margin="0 0 4 0" />
</BoxContainer>
<Button Name="CResyncButton" Text="{Loc 'air-alarm-ui-window-resync-devices-label'}" HorizontalExpand="True" />
</BoxContainer>
</BoxContainer>
@@ -39,30 +44,8 @@
<!-- Sensors -->
<ScrollContainer VerticalExpand="True">
<BoxContainer Name="CSensorContainer" Orientation="Vertical"/>
<!-- <BoxContainer Orientation="Vertical" VerticalExpand="True">
<BoxContainer Name="CPressureThreshold" Orientation="Vertical" Margin="2 0 2 0" />
<BoxContainer Name="CTemperatureThreshold" Orientation="Vertical" Margin="2 0 2 0" />
<Collapsible Orientation="Vertical">
<CollapsibleHeading Title="Gases" />
<CollapsibleBody Margin="4 2 4 2">
<BoxContainer Name="CGasThresholdContainer" Orientation="Vertical" Margin="2 0 2 0" />
</CollapsibleBody>
</Collapsible>
</BoxContainer> -->
</ScrollContainer>
</TabContainer>
<BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="0 0 0 2">
<BoxContainer Orientation="Horizontal" HorizontalExpand="True">
<Label Text="{Loc 'air-alarm-ui-window-address-label'}" HorizontalExpand="True"/>
<Label Name="CDeviceAddress" HorizontalAlignment="Right" HorizontalExpand="True" Margin="0 0 4 0" />
</BoxContainer>
<BoxContainer Orientation="Horizontal" HorizontalExpand="True">
<Label Text="{Loc 'air-alarm-ui-window-device-count-label'}" HorizontalExpand="True"/>
<Label Name="CDeviceTotal" HorizontalAlignment="Right" HorizontalExpand="True" Margin="0 0 4 0" />
</BoxContainer>
<Button Name="CResyncButton" Text="{Loc 'air-alarm-ui-window-resync-devices-label'}" HorizontalExpand="True" />
</BoxContainer>
<!-- Mode buttons -->
<BoxContainer Orientation="Horizontal">
<Label Text="{Loc 'air-alarm-ui-window-mode-label'}" Margin="0 0 2 0" />