From 4cf8f9a4341b6299bdd00cdd463d17902737d148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 2 Mar 2013 14:36:15 +0100 Subject: [PATCH] remove admin indicator icon to avoid confusion/overlapping print admin names in bold text instead --- OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs | 8 ++--- OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs | 2 ++ mods/cnc/chrome.yaml | 3 -- mods/cnc/chrome/lobby.yaml | 35 --------------------- mods/cnc/uibits/misc.png | Bin 290 -> 0 bytes mods/d2k/chrome.yaml | 3 -- mods/d2k/chrome/lobby.yaml | 35 --------------------- mods/ra/chrome.yaml | 5 +-- mods/ra/chrome/lobby.yaml | 35 --------------------- mods/ra/uibits/misc.png | Bin 290 -> 0 bytes 10 files changed, 7 insertions(+), 119 deletions(-) delete mode 100644 mods/cnc/uibits/misc.png delete mode 100644 mods/ra/uibits/misc.png diff --git a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs index 70428ef9f3..bee8804315 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs @@ -399,6 +399,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic { // Non-editable player in slot template = NonEditablePlayerTemplate.Clone(); template.Get("NAME").GetText = () => client.Name; + if (client.IsAdmin) + template.Get("NAME").Font = "Bold"; var color = template.Get("COLOR"); color.GetColor = () => client.ColorRamp.GetColor(0); @@ -421,8 +423,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic kickButton.OnClick = () => orderManager.IssueOrder(Order.Command("kick " + client.Index)); } - template.Get("ISADMIN").IsVisible = () => client != null && client.IsAdmin; - template.IsVisible = () => true; Players.AddChild(template); } @@ -458,6 +458,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic { template = NonEditableSpectatorTemplate.Clone(); template.Get("NAME").GetText = () => c.Name; + if (client.IsAdmin) + template.Get("NAME").Font = "Bold"; var color = template.Get("COLOR"); color.GetColor = () => c.ColorRamp.GetColor(0); @@ -469,8 +471,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic kickButton.OnClick = () => orderManager.IssueOrder(Order.Command("kick " + c.Index)); } - template.Get("ISADMIN").IsVisible = () => c.IsAdmin; - template.IsVisible = () => true; Players.AddChild(template); } diff --git a/OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs b/OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs index c04e295525..12d792dd00 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs @@ -23,6 +23,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic { public static void SetupNameWidget(OrderManager orderManager, Session.Client c, TextFieldWidget name) { + if (c.IsAdmin) + name.Font = "Bold"; name.Text = c.Name; name.OnEnterKey = () => { diff --git a/mods/cnc/chrome.yaml b/mods/cnc/chrome.yaml index 919ae1466c..a75519177f 100644 --- a/mods/cnc/chrome.yaml +++ b/mods/cnc/chrome.yaml @@ -451,6 +451,3 @@ order-icons: chrome.png repair: 384,48,16,16 repair-disabled: 384,64,16,16 repair-active: 384,80,16,16 - -misc: misc.png - isadmin: 0,0,10,15 diff --git a/mods/cnc/chrome/lobby.yaml b/mods/cnc/chrome/lobby.yaml index ff2cb1bb77..a769f124b6 100644 --- a/mods/cnc/chrome/lobby.yaml +++ b/mods/cnc/chrome/lobby.yaml @@ -63,13 +63,6 @@ Container@SERVER_LOBBY: Height:25 MaxLength:16 Visible:false - Image@ISADMIN: - Width:16 - Height:16 - X:192 - Y:4 - ImageName:isadmin - ImageCollection:misc DropDownButton@BOT_DROPDOWN: Text:Name Width:205 @@ -138,13 +131,6 @@ Container@SERVER_LOBBY: Height:25 X:5 Y:0-1 - Image@ISADMIN: - Width:16 - Height:16 - X:192 - Y:4 - ImageName:isadmin - ImageCollection:misc Button@KICK: Text:X Width:25 @@ -208,13 +194,6 @@ Container@SERVER_LOBBY: X:5 Y:0-1 Visible:false - Image@ISADMIN: - Width:16 - Height:16 - X:192 - Y:4 - ImageName:isadmin - ImageCollection:misc Button@JOIN: Text:Play in this slot Font:Regular @@ -234,13 +213,6 @@ Container@SERVER_LOBBY: Width:205 Height:25 MaxLength:16 - Image@ISADMIN: - Width:16 - Height:16 - X:192 - Y:4 - ImageName:isadmin - ImageCollection:misc DropDownButton@COLOR: Width:70 Height:25 @@ -279,13 +251,6 @@ Container@SERVER_LOBBY: Height:25 X:5 Y:0-1 - Image@ISADMIN: - Width:16 - Height:16 - X:192 - Y:4 - ImageName:isadmin - ImageCollection:misc Button@KICK: Text:X Width:25 diff --git a/mods/cnc/uibits/misc.png b/mods/cnc/uibits/misc.png deleted file mode 100644 index e9e86ca27694847933043bb397c065c1a9a0958b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgf<4gr21t*yeVeSt!YJY5_^DsH{K zc98e5f`IEm{$9(usxNuWpPkk1(rMlO@yyK2b{i)gIOCC}k}C9Q^8&l>`6|(0w;SI5 z@+|!8^vpXs%n?85HLTw&>mQwvoBQqG|EfQhr<mdKI;Vst0O{6MQvd(} diff --git a/mods/d2k/chrome.yaml b/mods/d2k/chrome.yaml index 6424e01803..2ce1edabc5 100644 --- a/mods/d2k/chrome.yaml +++ b/mods/d2k/chrome.yaml @@ -540,6 +540,3 @@ scrollitem-hover: dialog.png corner-tr: 594,0,1,1 corner-bl: 512,82,1,1 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 3e96577e50..436b454739 100644 --- a/mods/d2k/chrome/lobby.yaml +++ b/mods/d2k/chrome/lobby.yaml @@ -48,13 +48,6 @@ 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 @@ -123,13 +116,6 @@ 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 @@ -188,13 +174,6 @@ 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 @@ -220,13 +199,6 @@ 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 @@ -273,13 +245,6 @@ 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.yaml b/mods/ra/chrome.yaml index 91be2c8e9a..cabb02a44f 100644 --- a/mods/ra/chrome.yaml +++ b/mods/ra/chrome.yaml @@ -522,7 +522,4 @@ 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 - -misc: misc.png - isadmin: 0,0,10,15 + corner-br: 594,82,1,1 \ No newline at end of file diff --git a/mods/ra/chrome/lobby.yaml b/mods/ra/chrome/lobby.yaml index a4a9978196..66ff373fd6 100644 --- a/mods/ra/chrome/lobby.yaml +++ b/mods/ra/chrome/lobby.yaml @@ -48,13 +48,6 @@ 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 @@ -123,13 +116,6 @@ 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 @@ -201,13 +187,6 @@ 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 @@ -252,13 +231,6 @@ 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 @@ -273,13 +245,6 @@ Background@SERVER_LOBBY: Height:25 X:5 Y:0-1 - Image@ISADMIN: - Width:16 - Height:16 - X:130 - Y:4 - ImageName:isadmin - ImageCollection:misc Button@KICK: Text:X Width:25 diff --git a/mods/ra/uibits/misc.png b/mods/ra/uibits/misc.png deleted file mode 100644 index f78470b191806d2753ad8a7ca3b2c043e3044e7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgf<4gr2%>A%-znE{0sdAc};RNQ)d z?I7=A1p(KC{JoZQRbTR$KRc`2rPI3m6v$Om?M79YgoTm);~HSH}~7W|5bl1Pd7