From 8ab72edc6a8bc07da25fc71a9750fa33d0e1b87d Mon Sep 17 00:00:00 2001 From: Alexandre Oliveira Date: Tue, 19 Jan 2016 16:10:12 -0200 Subject: [PATCH 1/2] Fix alignment of Retry connection button on RA --- mods/ra/chrome/connection.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ra/chrome/connection.yaml b/mods/ra/chrome/connection.yaml index ac333084c7..8aa93af0cd 100644 --- a/mods/ra/chrome/connection.yaml +++ b/mods/ra/chrome/connection.yaml @@ -43,7 +43,7 @@ Background@CONNECTIONFAILED_PANEL: MaxLength: 20 Height: 25 Button@RETRY_BUTTON: - X: PARENT_RIGHT - 360 + X: PARENT_RIGHT - 430 Y: PARENT_BOTTOM - 45 Width: 160 Height: 25 From 6f715a6a4ee37abaa29d2c0dd879cfdeff3f9322 Mon Sep 17 00:00:00 2001 From: Alexandre Oliveira Date: Tue, 19 Jan 2016 16:18:26 -0200 Subject: [PATCH 2/2] Change CONNECTIONFAILED_PANEL title if server requires password If the server requires a password, display Password Required instead of the usual Connection Error title. --- OpenRA.Mods.Common/Widgets/Logic/ConnectionLogic.cs | 3 +++ mods/cnc/chrome/connection.yaml | 1 - mods/ra/chrome/connection.yaml | 3 +-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/OpenRA.Mods.Common/Widgets/Logic/ConnectionLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/ConnectionLogic.cs index d62973fd77..4e39ba2105 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/ConnectionLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/ConnectionLogic.cs @@ -106,6 +106,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic var connectionError = widget.Get("CONNECTION_ERROR"); connectionError.GetText = () => orderManager.ServerError; + var panelTitle = widget.Get("TITLE"); + panelTitle.GetText = () => orderManager.AuthenticationFailed ? "Password Required" : "Connection Failed"; + passwordField = panel.GetOrNull("PASSWORD"); if (passwordField != null) { diff --git a/mods/cnc/chrome/connection.yaml b/mods/cnc/chrome/connection.yaml index 38b66db2c2..8f546b8965 100644 --- a/mods/cnc/chrome/connection.yaml +++ b/mods/cnc/chrome/connection.yaml @@ -46,7 +46,6 @@ Container@CONNECTIONFAILED_PANEL: Font: BigBold Contrast: true Align: Center - Text: Connection Failed Background@CONNECTION_BACKGROUND: Width: 370 Height: 85 diff --git a/mods/ra/chrome/connection.yaml b/mods/ra/chrome/connection.yaml index 8aa93af0cd..ddebd34792 100644 --- a/mods/ra/chrome/connection.yaml +++ b/mods/ra/chrome/connection.yaml @@ -6,12 +6,11 @@ Background@CONNECTIONFAILED_PANEL: Height: 160 Children: LogicTicker@CONNECTION_FAILED_TICKER: - Label@CONNECTION_FAILED_TITLE: + Label@TITLE: X: 0 Y: 20 Width: 450 Height: 25 - Text: Connection Failed Align: Center Font: Bold Label@CONNECTING_DESC: