epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add requires-auth indicator to the server lists.

Browse Source
This commit is contained in:
Paul Chote
2018-08-12 13:12:57 +00:00
committed by reaperrr
parent e374c8e6c3
commit 8634c001f9
13 changed files with 70 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/Widgets/Logic/ServerListLogic.cs
View File

@@ -599,6 +599,16 @@ namespace OpenRA.Mods.Common.Widgets.Logic
password.GetImageName = () => canJoin ? "protected" : "protected-disabled";
}
var auth = item.GetOrNull<ImageWidget>("REQUIRES_AUTHENTICATION");
if (auth != null)
{
auth.IsVisible = () => game.Authentication;
auth.GetImageName = () => canJoin ? "authentication" : "authentication-disabled";
if (game.Protected && password != null)
auth.Bounds.X -= password.Bounds.Width + 5;
}
var players = item.GetOrNull<LabelWithTooltipWidget>("PLAYERS");
if (players != null)
{

6
mods/cnc/chrome.yaml
View File

@@ -449,8 +449,10 @@ lobby-bits: chrome.png
colorpicker: 257,33,14,14
huepicker: 388,96,7,15
kick: 386,115,11,11
protected: 403,97,10,13
protected-disabled: 403,113,10,13
protected: 402,97,12,13
protected-disabled: 402,113,12,13
authentication: 418,97,12,13
authentication-disabled: 418,113,12,13
admin-registered: 448,112,16,16
admin-anonymous: 464,112,16,16
player-registered: 480,112,16,16

15
mods/cnc/chrome/lobby-servers.yaml
View File

@@ -87,17 +87,26 @@ Container@LOBBY_SERVERS_BIN:
Children:
Label@TITLE:
X: 5
Width: 255
Width: 245
Height: 25
Image@PASSWORD_PROTECTED:
X: 272
Y: 6
Width: 8
Height: 10
Width: 12
Height: 13
ImageCollection: lobby-bits
TooltipContainer: TOOLTIP_CONTAINER
TooltipTemplate: SIMPLE_TOOLTIP
TooltipText: Requires Password
Image@REQUIRES_AUTHENTICATION:
X: 272
Y: 6
Width: 12
Height: 13
ImageCollection: lobby-bits
TooltipContainer: TOOLTIP_CONTAINER
TooltipTemplate: SIMPLE_TOOLTIP
TooltipText: Requires OpenRA forum account
LabelWithTooltip@PLAYERS:
X: 290
Width: 85

15
mods/cnc/chrome/multiplayer-browser.yaml
View File

@@ -108,17 +108,26 @@ Container@MULTIPLAYER_PANEL:
Children:
Label@TITLE:
X: 5
Width: 255
Width: 245
Height: 25
Image@PASSWORD_PROTECTED:
X: 272
Y: 6
Width: 8
Height: 10
Width: 12
Height: 13
ImageCollection: lobby-bits
TooltipContainer: TOOLTIP_CONTAINER
TooltipTemplate: SIMPLE_TOOLTIP
TooltipText: Requires Password
Image@REQUIRES_AUTHENTICATION:
X: 272
Y: 6
Width: 12
Height: 13
ImageCollection: lobby-bits
TooltipContainer: TOOLTIP_CONTAINER
TooltipTemplate: SIMPLE_TOOLTIP
TooltipText: Requires OpenRA forum account
LabelWithTooltip@PLAYERS:
X: 290
Width: 85

BIN
mods/cnc/uibits/chrome.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 93 KiB

After

Width:  |  Height:  |  Size: 93 KiB

15
mods/common/chrome/lobby-servers.yaml
View File

@@ -84,17 +84,26 @@ Container@LOBBY_SERVERS_BIN:
Children:
Label@TITLE:
X: 5
Width: 255
Width: 245
Height: 25
Image@PASSWORD_PROTECTED:
X: 272
Y: 6
Width: 10
Height: 12
Width: 12
Height: 13
ImageCollection: lobby-bits
TooltipContainer: TOOLTIP_CONTAINER
TooltipTemplate: SIMPLE_TOOLTIP
TooltipText: Requires Password
Image@REQUIRES_AUTHENTICATION:
X: 272
Y: 6
Width: 12
Height: 13
ImageCollection: lobby-bits
TooltipContainer: TOOLTIP_CONTAINER
TooltipTemplate: SIMPLE_TOOLTIP
TooltipText: Requires OpenRA forum account
LabelWithTooltip@PLAYERS:
X: 290
Width: 85

15
mods/common/chrome/multiplayer-browser.yaml
View File

@@ -100,17 +100,26 @@ Background@MULTIPLAYER_PANEL:
Children:
Label@TITLE:
X: 5
Width: 255
Width: 245
Height: 25
Image@PASSWORD_PROTECTED:
X: 272
Y: 6
Width: 10
Height: 12
Width: 12
Height: 13
ImageCollection: lobby-bits
TooltipContainer: TOOLTIP_CONTAINER
TooltipTemplate: SIMPLE_TOOLTIP
TooltipText: Requires Password
Image@REQUIRES_AUTHENTICATION:
X: 272
Y: 6
Width: 12
Height: 13
ImageCollection: lobby-bits
TooltipContainer: TOOLTIP_CONTAINER
TooltipTemplate: SIMPLE_TOOLTIP
TooltipText: Requires OpenRA forum account
LabelWithTooltip@PLAYERS:
X: 290
Width: 85

2
mods/d2k/chrome.yaml
View File

@@ -215,6 +215,8 @@ lobby-bits: buttons.png
huepicker: 193,0,7,15
protected: 200,0,12,13
protected-disabled: 211,0,12,13
authentication: 199,16,12,13
authentication-disabled: 212,16,12,13
admin-registered: 224,0,16,16
admin-anonymous: 240,0,16,16
player-registered: 224,16,16,16

BIN
mods/d2k/uibits/buttons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

6
mods/ra/chrome.yaml
View File

@@ -531,8 +531,10 @@ lobby-bits: buttons.png
admin: 187,5,7,5
colorpicker: 127,5,23,22
huepicker: 194,0,7,15
protected: 202,0,10,13
protected-disabled: 213,0,10,13
protected: 201,0,12,13
protected-disabled: 212,0,12,13
authentication: 199,16,12,13
authentication-disabled: 212,16,12,13
admin-registered: 224,0,16,16
admin-anonymous: 240,0,16,16
player-registered: 224,16,16,16

BIN
mods/ra/uibits/buttons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

2
mods/ts/chrome.yaml
View File

@@ -377,6 +377,8 @@ lobby-bits: buttons.png
huepicker: 194,0,7,15
protected: 202,0,10,13
protected-disabled: 213,0,10,13
authentication: 199,16,12,13
authentication-disabled: 212,16,12,13
admin-registered: 224,0,16,16
admin-anonymous: 240,0,16,16
player-registered: 224,16,16,16

BIN
mods/ts/uibits/buttons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 12 KiB