From c9c542cb37362d4579a81c8b0fe68c4f9b9dbe89 Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Sun, 28 Aug 2016 13:40:12 +0200 Subject: [PATCH] Show advisory notice when UPNP isn't supported by the router --- OpenRA.Mods.Common/Widgets/Logic/ServerCreationLogic.cs | 4 ++++ mods/cnc/chrome/multiplayer-createserver.yaml | 9 +++++++++ mods/ra/chrome/multiplayer-createserver.yaml | 9 +++++++++ 3 files changed, 22 insertions(+) diff --git a/OpenRA.Mods.Common/Widgets/Logic/ServerCreationLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/ServerCreationLogic.cs index b87acdc2d6..235d6013f6 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/ServerCreationLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/ServerCreationLogic.cs @@ -94,6 +94,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic if (labelUPnP != null) labelUPnP.IsVisible = () => !Game.Settings.Server.DiscoverNatDevices; + var labelUPnPUnsupported = panel.GetOrNull("UPNP_UNSUPPORTED_NOTICE"); + if (labelUPnPUnsupported != null) + labelUPnPUnsupported.IsVisible = () => Game.Settings.Server.DiscoverNatDevices && !Game.Settings.Server.AllowPortForward; + var passwordField = panel.GetOrNull("PASSWORD"); if (passwordField != null) passwordField.Text = Game.Settings.Server.Password; diff --git a/mods/cnc/chrome/multiplayer-createserver.yaml b/mods/cnc/chrome/multiplayer-createserver.yaml index c67bbf7d47..053c080102 100644 --- a/mods/cnc/chrome/multiplayer-createserver.yaml +++ b/mods/cnc/chrome/multiplayer-createserver.yaml @@ -101,6 +101,15 @@ Container@MULTIPLAYER_CREATESERVER_PANEL: Align: Left WordWrap: True Text: Requires Network Discovery (UPnP). Enable in Settings - Advanced. + Label@UPNP_UNSUPPORTED_NOTICE: + X: 130 + Y: 180 + Width: 220 + Height: 25 + Font: Tiny + Align: Left + WordWrap: True + Text: Your router does not seem to support UPnP. Please consult your router's manual. Container@SIDEBAR: X: PARENT_RIGHT-WIDTH Y: 30 diff --git a/mods/ra/chrome/multiplayer-createserver.yaml b/mods/ra/chrome/multiplayer-createserver.yaml index 5e72929059..d73c31f6ea 100644 --- a/mods/ra/chrome/multiplayer-createserver.yaml +++ b/mods/ra/chrome/multiplayer-createserver.yaml @@ -101,6 +101,15 @@ Container@MULTIPLAYER_CREATESERVER_PANEL: Align: Left WordWrap: True Text: Requires Network Discovery (UPnP). Enable in Settings - Advanced. + Label@UPNP_UNSUPPORTED_NOTICE: + X: 130 + Y: 180 + Width: 220 + Height: 25 + Font: Tiny + Align: Left + WordWrap: True + Text: Your router does not seem to support UPnP. Please consult your router's manual. Container@SIDEBAR: X: PARENT_RIGHT-WIDTH Y: 30