tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweak solution editing window (#6587)

Browse Source
This commit is contained in:
Leon Friedrich
2022-02-10 15:05:45 +13:00
committed by GitHub
parent af4a3c59d5
commit 7efb1c81eb
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml
View File

@@ -1,5 +1,5 @@
<DefaultWindow <DefaultWindow
SetSize="300 300" SetSize="300 400"
Margin="4 0" Margin="4 0"
xmlns="https://spacestation14.io"> xmlns="https://spacestation14.io">
<BoxContainer Orientation="Vertical"> <BoxContainer Orientation="Vertical">
@@ -12,12 +12,18 @@
<BoxContainer Name="VolumeBox" Orientation="Vertical" HorizontalExpand="True" Margin="0 4"/> <BoxContainer Name="VolumeBox" Orientation="Vertical" HorizontalExpand="True" Margin="0 4"/>
<!-- The temperature / heat capacity / thermal energy of the solution --> <!-- The temperature / heat capacity / thermal energy of the solution -->
<BoxContainer Name="ThermalBox" Orientation="Vertical" HorizontalExpand="True" Margin="0 4"/> <Collapsible Orientation="Vertical">
<CollapsibleHeading Name="ThermalHeading" Title="{Loc 'admin-solutions-window-thermals'}" />
<CollapsibleBody>
<BoxContainer Name="ThermalBox" Orientation="Vertical" HorizontalExpand="True" Margin="0 4"/>
</CollapsibleBody>
</Collapsible>
<!-- The reagents in the solution --> <!-- The reagents in the solution -->
<ScrollContainer HorizontalExpand="True" VerticalExpand="True" Margin="0 4"> <ScrollContainer HorizontalExpand="True" VerticalExpand="True" Margin="0 4">
<BoxContainer Name="ReagentList" Orientation="Vertical"/> <BoxContainer Name="ReagentList" Orientation="Vertical"/>
</ScrollContainer> </ScrollContainer>
<Button Name="AddButton" Text="{Loc 'admin-solutions-window-add-new-button'}" HorizontalExpand="True" Margin="0 4"/> <Button Name="AddButton" Text="{Loc 'admin-solutions-window-add-new-button'}" HorizontalExpand="True" Margin="0 4"/>
</BoxContainer> </BoxContainer>
</DefaultWindow> </DefaultWindow>

10
Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs
View File

@@ -1,15 +1,9 @@
using System;
using System.Collections.Generic;
using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Components;
using Robust.Client.AutoGenerated; using Robust.Client.AutoGenerated;
using Robust.Client.Console; using Robust.Client.Console;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML; using Robust.Client.UserInterface.XAML;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Maths;
namespace Content.Client.Administration.UI.ManageSolutions namespace Content.Client.Administration.UI.ManageSolutions
{ {
@@ -126,12 +120,12 @@ namespace Content.Client.Administration.UI.ManageSolutions
var specificHeatLabel = new Label(); var specificHeatLabel = new Label();
specificHeatLabel.HorizontalExpand = true; specificHeatLabel.HorizontalExpand = true;
specificHeatLabel.Margin = new Thickness(0, 1); specificHeatLabel.Margin = new Thickness(0, 1);
specificHeatLabel.Text = Loc.GetString("admin-solutions-window-specific-heat-label", ("specificHeat", solution.SpecificHeat)); specificHeatLabel.Text = Loc.GetString("admin-solutions-window-specific-heat-label", ("specificHeat", solution.SpecificHeat.ToString("G3")));
var heatCapacityLabel = new Label(); var heatCapacityLabel = new Label();
heatCapacityLabel.HorizontalExpand = true; heatCapacityLabel.HorizontalExpand = true;
heatCapacityLabel.Margin = new Thickness(0, 1); heatCapacityLabel.Margin = new Thickness(0, 1);
heatCapacityLabel.Text = Loc.GetString("admin-solutions-window-heat-capacity-label", ("heatCapacity", solution.HeatCapacity)); heatCapacityLabel.Text = Loc.GetString("admin-solutions-window-heat-capacity-label", ("heatCapacity", solution.HeatCapacity.ToString("G3")));
// Temperature entry: // Temperature entry:
var temperatureBox = new BoxContainer(); var temperatureBox = new BoxContainer();

1
Resources/Locale/en-US/administration/ui/manage-solutions/manage-solutions.ftl
View File

@@ -7,3 +7,4 @@ admin-solutions-window-specific-heat-label = Specific Heat: {$specificHeat} J/(K
admin-solutions-window-heat-capacity-label = Heat Capacity: {$heatCapacity} J/K admin-solutions-window-heat-capacity-label = Heat Capacity: {$heatCapacity} J/K
admin-solutions-window-temperature-label = Temperature (K): admin-solutions-window-temperature-label = Temperature (K):
admin-solutions-window-thermal-energy-label = Thermal Energy (J): admin-solutions-window-thermal-energy-label = Thermal Energy (J):
admin-solutions-window-thermals = Thermals