@@ -1,96 +1,37 @@
|
||||
<Control xmlns="https://spacestation14.io"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
|
||||
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
|
||||
|
||||
<TextureRect Access="Public" TexturePath="/Textures/Ohio/ohfuck.png" VerticalExpand="True" HorizontalExpand="True" Name="Background" Stretch="KeepAspectCovered"/>
|
||||
|
||||
<Control HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||
|
||||
<PanelContainer StyleClasses="AngleRect" />
|
||||
|
||||
<BoxContainer Orientation="Vertical" MinSize="300 200">
|
||||
|
||||
<BoxContainer Orientation="Horizontal">
|
||||
|
||||
<Label Margin="8 0 0 0" Text="{Loc 'connecting-title'}"
|
||||
StyleClasses="LabelHeading" VAlign="Center" />
|
||||
|
||||
xmlns:mainMenu="clr-namespace:Content.Client.MainMenu">
|
||||
<mainMenu:BackgroundControl TexturePath="/Textures/Logo/logo-ru.png" Stretch="KeepAspectCentered" Name="Background"/>
|
||||
<Control HorizontalAlignment="Stretch" VerticalAlignment="Bottom">
|
||||
<PanelContainer MinWidth="900" StyleClasses="LobbyShadedBackground" HorizontalAlignment="Center">
|
||||
<BoxContainer Orientation="Horizontal" HorizontalAlignment="Center" Margin="4 4 4 4">
|
||||
<BoxContainer Orientation="Horizontal" Name="ConnectingStatus">
|
||||
<Label StyleClasses="LabelHeadingFuckingBigger" Text="{Loc 'connecting-in-progress'}" Align="Center" Margin="0 0 24 0" />
|
||||
<!-- Who the fuck named these cont- oh wait I did -->
|
||||
<Label Name="ConnectStatus" StyleClasses="LabelHeadingFuckingBigger" Align="Center" />
|
||||
</BoxContainer>
|
||||
<BoxContainer Orientation="Horizontal" Name="Disconnected">
|
||||
<Label Text="{Loc 'connecting-disconnected'}" StyleClasses="LabelHeadingFuckingBigger" Align="Center" Margin="0 0 24 0" />
|
||||
<Label Name="DisconnectReason" StyleClasses="LabelHeadingFuckingBigger" Align="Center" />
|
||||
</BoxContainer>
|
||||
</BoxContainer>
|
||||
<PanelContainer Name="ConnectFail" HorizontalAlignment="Center" VerticalAlignment="Center" Visible="False">
|
||||
<RichTextLabel Name="ConnectFailReason" />
|
||||
</PanelContainer>
|
||||
</PanelContainer>
|
||||
<PanelContainer HorizontalAlignment="Left">
|
||||
<Label Name="ConnectingAddress" StyleClasses="LabelSubText" Margin="4 4 4 4" VerticalAlignment="Bottom" />
|
||||
</PanelContainer>
|
||||
<PanelContainer StyleClasses="LobbyShadedBackground" HorizontalAlignment="Right">
|
||||
<BoxContainer Orientation="Horizontal" Margin="4 4 4 4">
|
||||
<Button Name="ExitButton" Text="{Loc 'connecting-exit'}"
|
||||
HorizontalAlignment="Right" HorizontalExpand="True" />
|
||||
|
||||
<Button Name="RetryButton" Text="{Loc 'connecting-retry'}"
|
||||
HorizontalAlignment="Right" HorizontalExpand="True" />
|
||||
<Button Name="RedialButton" Text="{Loc 'connecting-redial'}"
|
||||
Disabled="True"
|
||||
HorizontalAlignment="Right" HorizontalExpand="True" />
|
||||
</BoxContainer>
|
||||
|
||||
<controls:HighDivider />
|
||||
|
||||
<BoxContainer Orientation="Vertical" VerticalExpand="True" Margin="4 4 4 0">
|
||||
|
||||
<Control VerticalExpand="True" Margin="0 0 0 8">
|
||||
|
||||
<BoxContainer Orientation="Vertical" Name="ConnectingStatus">
|
||||
|
||||
<Label Text="{Loc 'connecting-in-progress'}" Align="Center" />
|
||||
|
||||
<!-- Who the fuck named these cont- oh wait I did -->
|
||||
|
||||
<Label Name="ConnectStatus" StyleClasses="LabelSubText" Align="Center" />
|
||||
|
||||
</BoxContainer>
|
||||
|
||||
<BoxContainer Orientation="Vertical" Name="ConnectFail" Visible="False">
|
||||
|
||||
<RichTextLabel Name="ConnectFailReason" VerticalAlignment="Stretch"/>
|
||||
|
||||
<Button Name="RetryButton" Text="{Loc 'connecting-retry'}"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalExpand="True" VerticalAlignment="Bottom" />
|
||||
|
||||
</BoxContainer>
|
||||
|
||||
<BoxContainer Orientation="Vertical" Name="Disconnected">
|
||||
|
||||
<Label Text="{Loc 'connecting-disconnected'}" Align="Center" />
|
||||
|
||||
<Label Name="DisconnectReason" Align="Center" />
|
||||
|
||||
<Button Name="ReconnectButton" Text="{Loc 'connecting-reconnect'}"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalExpand="True" VerticalAlignment="Bottom" />
|
||||
|
||||
<Button Name="RedialButton" Text="{Loc 'connecting-redial'}"
|
||||
Disabled="True"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalExpand="True" VerticalAlignment="Bottom" />
|
||||
|
||||
</BoxContainer>
|
||||
|
||||
</Control>
|
||||
|
||||
<Label Name="ConnectingAddress" StyleClasses="LabelSubText" HorizontalAlignment="Center" />
|
||||
|
||||
</BoxContainer>
|
||||
|
||||
<PanelContainer>
|
||||
|
||||
<PanelContainer.PanelOverride>
|
||||
|
||||
<gfx:StyleBoxFlat BackgroundColor="#444" ContentMarginTopOverride="2" />
|
||||
|
||||
</PanelContainer.PanelOverride>
|
||||
|
||||
</PanelContainer>
|
||||
|
||||
<BoxContainer Orientation="Horizontal" Margin="12 0 4 0" VerticalAlignment="Bottom">
|
||||
|
||||
<Label Text="{Loc 'connecting-tip'}" StyleClasses="LabelSubText" />
|
||||
|
||||
<Label Text="{Loc 'connecting-version'}" StyleClasses="LabelSubText"
|
||||
HorizontalAlignment="Right" HorizontalExpand="True" />
|
||||
|
||||
</BoxContainer>
|
||||
|
||||
</BoxContainer>
|
||||
|
||||
</PanelContainer>
|
||||
</Control>
|
||||
|
||||
</Control>
|
||||
|
||||
@@ -16,7 +16,7 @@ namespace Content.Client.Launcher;
|
||||
[GenerateTypedNameReferences]
|
||||
public sealed partial class LauncherConnectingGui : Control
|
||||
{
|
||||
private const float RedialWaitTimeSeconds = 15f;
|
||||
private const float RedialWaitTimeSeconds = 47f;
|
||||
private readonly LauncherConnecting _state;
|
||||
private readonly IRobustRandom _random;
|
||||
private readonly IPrototypeManager _prototype;
|
||||
@@ -36,10 +36,9 @@ public sealed partial class LauncherConnectingGui : Control
|
||||
|
||||
LayoutContainer.SetAnchorPreset(this, LayoutContainer.LayoutPreset.Wide);
|
||||
|
||||
Stylesheet = IoCManager.Resolve<IStylesheetManager>().SheetSpace;
|
||||
Stylesheet = IoCManager.Resolve<IStylesheetManager>().SheetNano;
|
||||
|
||||
ChangeLoginTip();
|
||||
ReconnectButton.OnPressed += _ => _state.RetryConnect();
|
||||
// Redial shouldn't fail, but if it does, try a reconnect (maybe we're being run from debug)
|
||||
RedialButton.OnPressed += _ =>
|
||||
{
|
||||
@@ -76,7 +75,6 @@ public sealed partial class LauncherConnectingGui : Control
|
||||
{
|
||||
var redialFlag = args?.RedialFlag ?? false;
|
||||
RedialButton.Visible = redialFlag;
|
||||
ReconnectButton.Visible = !redialFlag;
|
||||
}
|
||||
|
||||
private void ChangeLoginTip()
|
||||
|
||||
Reference in New Issue
Block a user