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

Re-organise main menu screen (#25173)

Browse Source 
- The dummy control of 2px size has annoyed me for almost 5 years.
- Why is it in the top-right.
- Why is the server address not labelled.
This commit is contained in:
metalgearsloth
2024-02-17 05:55:42 +11:00
committed by GitHub
parent 7461091af0
commit 1a438e644f
2 changed files with 40 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
Content.Client/MainMenu/UI/MainMenuControl.xaml
View File

@@ -2,44 +2,46 @@
xmlns:pllax="clr-namespace:Content.Client.Parallax" xmlns:pllax="clr-namespace:Content.Client.Parallax"
xmlns:clog="clr-namespace:Content.Client.Changelog"> xmlns:clog="clr-namespace:Content.Client.Changelog">
<pllax:ParallaxControl /> <pllax:ParallaxControl />
<LayoutContainer> <BoxContainer Name="VBox"
<BoxContainer Name="VBox" Orientation="Vertical"
Orientation="Vertical" HorizontalAlignment="Center"
StyleIdentifier="mainMenuVBox"> VerticalAlignment="Center"
<TextureRect Name="Logo" HorizontalExpand="True"
Stretch="KeepCentered" /> VerticalExpand="True"
<BoxContainer Orientation="Horizontal" StyleIdentifier="mainMenuVBox"
SeparationOverride="4"> SeparationOverride="3">
<Label Text="{Loc 'main-menu-username-label'}" /> <TextureRect Name="Logo"
<LineEdit Name="UsernameBox" Stretch="KeepCentered"/>
Access="Public" <GridContainer Columns="2">
PlaceHolder="{Loc 'main-menu-username-text'}" <Label Text="{Loc 'main-menu-username-label'}" />
HorizontalExpand="True" /> <LineEdit Name="UsernameBox"
</BoxContainer> Access="Public"
PlaceHolder="{Loc 'main-menu-username-text'}"
HorizontalExpand="True" />
<Label Text="{Loc 'main-menu-address-label'}"/>
<LineEdit Name="AddressBox" <LineEdit Name="AddressBox"
Access="Public" Access="Public"
Text="localhost" Text="localhost"
PlaceHolder="server address:port" PlaceHolder="server address:port"
HorizontalExpand="True" /> HorizontalExpand="True" />
<Button Name="DirectConnectButton" </GridContainer>
Access="Public" <Button Name="DirectConnectButton"
Text="{Loc 'main-menu-direct-connect-button'}" Access="Public"
TextAlign="Center" Text="{Loc 'main-menu-direct-connect-button'}"
StyleIdentifier="mainMenu" /> TextAlign="Center"
<Control MinSize="0 2" /> StyleIdentifier="mainMenu"/>
<Button Name="OptionsButton" <Button Name="OptionsButton"
Access="Public" Access="Public"
Text="{Loc 'main-menu-options-button'}" Text="{Loc 'main-menu-options-button'}"
TextAlign="Center" TextAlign="Center"
StyleIdentifier="mainMenu" /> StyleIdentifier="mainMenu"/>
<Button Name="QuitButton" <Button Name="QuitButton"
Access="Public" Access="Public"
Text="{Loc 'main-menu-quit-button'}" Text="{Loc 'main-menu-quit-button'}"
TextAlign="Center" TextAlign="Center"
StyleIdentifier="mainMenu" /> StyleIdentifier="mainMenu"/>
<clog:ChangelogButton <clog:ChangelogButton
Name="ChangelogButton" Name="ChangelogButton"
Access="Public"/> Access="Public"/>
</BoxContainer> </BoxContainer>
</LayoutContainer>
</Control> </Control>

5
Resources/Locale/en-US/main-menu/main-menu.ftl
View File

@@ -2,11 +2,12 @@ main-menu-invalid-username-with-reason = Invalid username:
{$invalidReason} {$invalidReason}
main-menu-invalid-username = Invalid username main-menu-invalid-username = Invalid username
main-menu-failed-to-connect = Failed to connect: main-menu-failed-to-connect = Failed to connect:
{$reason} {$reason}
main-menu-username-label = Username: main-menu-username-label = Username:
main-menu-username-text = Username main-menu-username-text = Username
main-menu-address-label = Server Address:
main-menu-join-public-server-button = Join Public Server main-menu-join-public-server-button = Join Public Server
main-menu-join-public-server-button-tooltip = Cannot connect to public server with a debug build. main-menu-join-public-server-button-tooltip = Cannot connect to public server with a debug build.
main-menu-direct-connect-button = Direct Connect main-menu-direct-connect-button = Direct Connect
main-menu-options-button = Options main-menu-options-button = Options
main-menu-quit-button = Quit main-menu-quit-button = Quit