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

Remove "join public server" button. (#6839)

Browse Source 
:salute:
This commit is contained in:
Pieter-Jan Briers
2022-02-22 15:13:51 +01:00
committed by GitHub
parent 242ca13f62
commit cfedff4a08
3 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Client/MainMenu/MainMenu.cs
View File

@@ -1,4 +1,3 @@
using System;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using Content.Client.EscapeMenu.UI; using Content.Client.EscapeMenu.UI;
using Content.Client.MainMenu.UI; using Content.Client.MainMenu.UI;
@@ -8,9 +7,6 @@ using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using Robust.Shared; using Robust.Shared;
using Robust.Shared.Configuration; using Robust.Shared.Configuration;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Log;
using Robust.Shared.Network; using Robust.Shared.Network;
using Robust.Shared.Utility; using Robust.Shared.Utility;
using UsernameHelpers = Robust.Shared.AuthLib.UsernameHelpers; using UsernameHelpers = Robust.Shared.AuthLib.UsernameHelpers;
@@ -23,8 +19,6 @@ namespace Content.Client.MainMenu
// Instantiated dynamically through the StateManager, Dependencies will be resolved. // Instantiated dynamically through the StateManager, Dependencies will be resolved.
public sealed class MainScreen : Robust.Client.State.State public sealed class MainScreen : Robust.Client.State.State
{ {
private const string PublicServerAddress = "server.spacestation14.io";
[Dependency] private readonly IBaseClient _client = default!; [Dependency] private readonly IBaseClient _client = default!;
[Dependency] private readonly IClientNetManager _netManager = default!; [Dependency] private readonly IClientNetManager _netManager = default!;
[Dependency] private readonly IConfigurationManager _configurationManager = default!; [Dependency] private readonly IConfigurationManager _configurationManager = default!;
@@ -48,7 +42,6 @@ namespace Content.Client.MainMenu
_mainMenuControl.QuitButton.OnPressed += QuitButtonPressed; _mainMenuControl.QuitButton.OnPressed += QuitButtonPressed;
_mainMenuControl.OptionsButton.OnPressed += OptionsButtonPressed; _mainMenuControl.OptionsButton.OnPressed += OptionsButtonPressed;
_mainMenuControl.DirectConnectButton.OnPressed += DirectConnectButtonPressed; _mainMenuControl.DirectConnectButton.OnPressed += DirectConnectButtonPressed;
_mainMenuControl.JoinPublicServerButton.OnPressed += JoinPublicServerButtonPressed;
_mainMenuControl.AddressBox.OnTextEntered += AddressBoxEntered; _mainMenuControl.AddressBox.OnTextEntered += AddressBoxEntered;
_client.RunLevelChanged += RunLevelChanged; _client.RunLevelChanged += RunLevelChanged;
@@ -82,11 +75,6 @@ namespace Content.Client.MainMenu
TryConnect(input.Text); TryConnect(input.Text);
} }
private void JoinPublicServerButtonPressed(BaseButton.ButtonEventArgs args)
{
TryConnect(PublicServerAddress);
}
private void AddressBoxEntered(LineEdit.LineEditEventArgs args) private void AddressBoxEntered(LineEdit.LineEditEventArgs args)
{ {
if (_isConnecting) if (_isConnecting)

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

@@ -16,12 +16,6 @@
PlaceHolder="{Loc 'main-menu-username-text'}" PlaceHolder="{Loc 'main-menu-username-text'}"
HorizontalExpand="True" /> HorizontalExpand="True" />
</BoxContainer> </BoxContainer>
<Button Name="JoinPublicServerButton"
Access="Public"
Text="{Loc 'main-menu-join-public-server-button'}"
StyleIdentifier="mainMenu"
TextAlign="Center" />
<Control MinSize="0 2" />
<LineEdit Name="AddressBox" <LineEdit Name="AddressBox"
Access="Public" Access="Public"
Text="localhost" Text="localhost"

5
Content.Client/MainMenu/UI/MainMenuControl.xaml.cs
View File

@@ -31,11 +31,6 @@ namespace Content.Client.MainMenu.UI
var currentUserName = configMan.GetCVar(CVars.PlayerName); var currentUserName = configMan.GetCVar(CVars.PlayerName);
UsernameBox.Text = currentUserName; UsernameBox.Text = currentUserName;
#if !FULL_RELEASE
JoinPublicServerButton.Disabled = true;
JoinPublicServerButton.ToolTip = Loc.GetString("main-menu-join-public-server-button-tooltip");
#endif
LayoutContainer.SetAnchorPreset(VersionLabel, LayoutContainer.LayoutPreset.BottomRight); LayoutContainer.SetAnchorPreset(VersionLabel, LayoutContainer.LayoutPreset.BottomRight);
LayoutContainer.SetGrowHorizontal(VersionLabel, LayoutContainer.GrowDirection.Begin); LayoutContainer.SetGrowHorizontal(VersionLabel, LayoutContainer.GrowDirection.Begin);
LayoutContainer.SetGrowVertical(VersionLabel, LayoutContainer.GrowDirection.Begin); LayoutContainer.SetGrowVertical(VersionLabel, LayoutContainer.GrowDirection.Begin);