From 984a498ed26d7cd381374d3468ae3312ade8fd87 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Tue, 26 Jun 2012 19:24:59 +1200 Subject: [PATCH] Finish fixing #2136 --- OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs | 10 +++---- mods/cnc/chrome.yaml | 5 +++- mods/cnc/chrome/lobby.yaml | 35 ++++++++++++++++++++++ mods/d2k/chrome.yaml | 5 +++- mods/d2k/chrome/lobby.yaml | 35 ++++++++++++++++++++++ mods/ra/chrome/lobby.yaml | 21 +++++++++++++ 6 files changed, 103 insertions(+), 8 deletions(-) diff --git a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs index b4c53ddf75..f10f9bc0d7 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs @@ -371,11 +371,10 @@ namespace OpenRA.Mods.RA.Widgets.Logic kickButton.IsVisible = () => Game.IsHost && client.Index != orderManager.LocalClient.Index; kickButton.IsDisabled = () => orderManager.LocalClient.IsReady; kickButton.OnClick = () => orderManager.IssueOrder(Order.Command("kick " + client.Index)); - - var isadmin = template.Get("ISADMIN"); - isadmin.IsVisible = () => client.IsAdmin; } + template.Get("ISADMIN").IsVisible = () => client != null && client.IsAdmin; + template.IsVisible = () => true; Players.AddChild(template); } @@ -420,11 +419,10 @@ namespace OpenRA.Mods.RA.Widgets.Logic kickButton.IsVisible = () => Game.IsHost && c.Index != orderManager.LocalClient.Index; kickButton.IsDisabled = () => orderManager.LocalClient.IsReady; kickButton.OnClick = () => orderManager.IssueOrder(Order.Command("kick " + c.Index)); - - var isadmin = template.Get("ISADMIN"); - isadmin.IsVisible = () => client.IsAdmin; } + template.Get("ISADMIN").IsVisible = () => c.IsAdmin; + template.IsVisible = () => true; Players.AddChild(template); } diff --git a/mods/cnc/chrome.yaml b/mods/cnc/chrome.yaml index 21b9e17b4f..01f6cce512 100644 --- a/mods/cnc/chrome.yaml +++ b/mods/cnc/chrome.yaml @@ -450,4 +450,7 @@ order-icons: chrome.png sell-active: 496,32,16,16 repair: 384,48,16,16 repair-disabled: 384,64,16,16 - repair-active: 384,80,16,16 \ No newline at end of file + repair-active: 384,80,16,16 + +misc: misc.png + isadmin: 0,0,16,16 diff --git a/mods/cnc/chrome/lobby.yaml b/mods/cnc/chrome/lobby.yaml index 19a415435c..12d78388e4 100644 --- a/mods/cnc/chrome/lobby.yaml +++ b/mods/cnc/chrome/lobby.yaml @@ -61,6 +61,13 @@ Container@SERVER_LOBBY: Height:25 MaxLength:16 Visible:false + Image@ISADMIN: + Width:16 + Height:16 + X:200 + Y:4 + ImageName:isadmin + ImageCollection:misc DropDownButton@BOT_DROPDOWN: Text:Name Width:205 @@ -129,6 +136,13 @@ Container@SERVER_LOBBY: Height:25 X:5 Y:0-1 + Image@ISADMIN: + Width:16 + Height:16 + X:200 + Y:4 + ImageName:isadmin + ImageCollection:misc Button@KICK: Text:X Width:25 @@ -192,6 +206,13 @@ Container@SERVER_LOBBY: X:5 Y:0-1 Visible:false + Image@ISADMIN: + Width:16 + Height:16 + X:200 + Y:4 + ImageName:isadmin + ImageCollection:misc Button@JOIN: Text:Play in this slot Font:Regular @@ -211,6 +232,13 @@ Container@SERVER_LOBBY: Width:205 Height:25 MaxLength:16 + Image@ISADMIN: + Width:16 + Height:16 + X:200 + Y:4 + ImageName:isadmin + ImageCollection:misc DropDownButton@COLOR: Width:70 Height:25 @@ -249,6 +277,13 @@ Container@SERVER_LOBBY: Height:25 X:5 Y:0-1 + Image@ISADMIN: + Width:16 + Height:16 + X:200 + Y:4 + ImageName:isadmin + ImageCollection:misc Button@KICK: Text:X Width:25 diff --git a/mods/d2k/chrome.yaml b/mods/d2k/chrome.yaml index 3889680555..4587cee325 100644 --- a/mods/d2k/chrome.yaml +++ b/mods/d2k/chrome.yaml @@ -539,4 +539,7 @@ scrollitem-hover: dialog.png corner-tl: 512,0,1,1 corner-tr: 594,0,1,1 corner-bl: 512,82,1,1 - corner-br: 594,82,1,1 \ No newline at end of file + corner-br: 594,82,1,1 + +misc: misc.png + isadmin: 0,0,16,16 diff --git a/mods/d2k/chrome/lobby.yaml b/mods/d2k/chrome/lobby.yaml index 95a5d3c7df..2f9d430505 100644 --- a/mods/d2k/chrome/lobby.yaml +++ b/mods/d2k/chrome/lobby.yaml @@ -46,6 +46,13 @@ Background@SERVER_LOBBY: X:0 Y:0 MaxLength:16 + Image@ISADMIN: + Width:16 + Height:16 + X:150 + Y:4 + ImageName:isadmin + ImageCollection:misc DropDownButton@BOT_DROPDOWN: Text:Name Width:150 @@ -114,6 +121,13 @@ Background@SERVER_LOBBY: Height:25 X:5 Y:0-1 + Image@ISADMIN: + Width:16 + Height:16 + X:150 + Y:4 + ImageName:isadmin + ImageCollection:misc Button@KICK: Text:X Width:25 @@ -172,6 +186,13 @@ Background@SERVER_LOBBY: Height:25 X:5 Y:0-1 + Image@ISADMIN: + Width:16 + Height:16 + X:150 + Y:4 + ImageName:isadmin + ImageCollection:misc DropDownButton@NAME_HOST: Text:Name Width:150 @@ -197,6 +218,13 @@ Background@SERVER_LOBBY: Width:150 Height:25 MaxLength:16 + Image@ISADMIN: + Width:16 + Height:16 + X:150 + Y:4 + ImageName:isadmin + ImageCollection:misc DropDownButton@COLOR: Width:80 Height:25 @@ -243,6 +271,13 @@ Background@SERVER_LOBBY: Height:25 X:5 Y:0-1 + Image@ISADMIN: + Width:16 + Height:16 + X:150 + Y:4 + ImageName:isadmin + ImageCollection:misc Button@KICK: Text:X Width:25 diff --git a/mods/ra/chrome/lobby.yaml b/mods/ra/chrome/lobby.yaml index 5c43cc60aa..b908c3bf44 100644 --- a/mods/ra/chrome/lobby.yaml +++ b/mods/ra/chrome/lobby.yaml @@ -46,6 +46,13 @@ Background@SERVER_LOBBY: X:0 Y:0 MaxLength:16 + Image@ISADMIN: + Width:16 + Height:16 + X:150 + Y:4 + ImageName:isadmin + ImageCollection:misc DropDownButton@BOT_DROPDOWN: Text:Name Width:150 @@ -192,6 +199,13 @@ Background@SERVER_LOBBY: Height:25 X:160 Y:0 + Image@ISADMIN: + Width:16 + Height:16 + X:150 + Y:4 + ImageName:isadmin + ImageCollection:misc Container@TEMPLATE_EDITABLE_SPECTATOR: X:5 Y:0 @@ -236,6 +250,13 @@ Background@SERVER_LOBBY: Height:20 ImageCollection:checkbox-bits ImageName:checked + Image@ISADMIN: + Width:16 + Height:16 + X:150 + Y:4 + ImageName:isadmin + ImageCollection:misc Container@TEMPLATE_NONEDITABLE_SPECTATOR: X:5