Remove duplication between ra and d2k lobby yaml.

This commit is contained in:
Paul Chote
2013-06-29 13:20:21 +12:00
parent ec7bbd6c18
commit e6eac5a6c0
11 changed files with 998 additions and 1224 deletions

View File

@@ -102,7 +102,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
name.GetText = () => orderManager.LobbyInfo.GlobalSettings.ServerName;
UpdateCurrentMap();
Players = lobby.Get<ScrollPanelWidget>("PLAYERS");
Players = Ui.LoadWidget<ScrollPanelWidget>("LOBBY_PLAYER_BIN", lobby, new WidgetArgs());
EditablePlayerTemplate = Players.Get("TEMPLATE_EDITABLE_PLAYER");
NonEditablePlayerTemplate = Players.Get("TEMPLATE_NONEDITABLE_PLAYER");
EmptySlotTemplate = Players.Get("TEMPLATE_EMPTY");

View File

@@ -0,0 +1,319 @@
ScrollPanel@LOBBY_PLAYER_BIN:
X:15
Y:30
Width:503
ItemSpacing:5
Height:219
Children:
Container@TEMPLATE_EDITABLE_PLAYER:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Background@LATENCY:
Background:button
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@LATENCY_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer:TOOLTIP_CONTAINER
Template:CLIENT_TOOLTIP
Width:11
Height:25
TextField@NAME:
Text:Name
X:15
Width:190
Height:25
MaxLength:16
Visible:false
DropDownButton@SLOT_OPTIONS:
Text:Name
X:15
Width:190
Height:25
Font:Regular
Visible:false
DropDownButton@COLOR:
Width:70
Height:25
X:210
Font:Regular
IgnoreChildMouseOver: true
Children:
ColorBlock@COLORBLOCK:
X:5
Y:6
Width:PARENT_RIGHT-35
Height:PARENT_BOTTOM-12
DropDownButton@FACTION:
Width:100
Height:25
X:285
Font:Regular
IgnoreChildMouseOver: true
Children:
Image@FACTIONFLAG:
Width:32
Height:16
X:4
Y:4
Label@FACTIONNAME:
Text:Faction
Width:60
Height:25
X:40
Y:0
DropDownButton@TEAM:
Width:50
Height:25
X:390
Font:Regular
Image@STATUS_IMAGE:
Visible:false
X:450
Y:4
Width:20
Height:20
ImageCollection:checkbox-bits
ImageName:checked
Checkbox@STATUS_CHECKBOX:
Visible:false
X:448
Y:2
Width:20
Height:20
Container@TEMPLATE_NONEDITABLE_PLAYER:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Background@LATENCY:
Background:button
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@LATENCY_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer:TOOLTIP_CONTAINER
Template:CLIENT_TOOLTIP
Width:11
Height:25
Label@NAME:
Text:Name
Width:185
Height:25
X:15
Y:0-1
Button@KICK:
Width:25
Height:25
X:180
Children:
Image:
ImageCollection:lobby-bits
ImageName:kick
X:7
Y:7
ColorBlock@COLORBLOCK:
X:215
Y:6
Width:35
Height:13
Container@FACTION:
Width:100
Height:25
X:285
Y:0
Children:
Image@FACTIONFLAG:
Width:30
Height:15
X:5
Y:5
Label@FACTIONNAME:
Text:Faction
Width:60
Height:25
X:40
Y:0
Label@TEAM:
Align:Center
Width:25
Height:25
X:390
Y:0
Image@STATUS_IMAGE:
Visible:false
X:450
Y:4
Width:20
Height:20
ImageCollection:checkbox-bits
ImageName:checked
Container@TEMPLATE_EMPTY:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
DropDownButton@SLOT_OPTIONS:
Text:Name
X:15
Width:190
Height:25
Font:Regular
Visible:false
Label@NAME:
Text:Name
Width:200
Height:25
X:15
Y:0-1
Visible:false
Button@JOIN:
Text:Play in this slot
Font:Regular
Width:315-55
Height:25
X:210
Y:0
Container@TEMPLATE_EDITABLE_SPECTATOR:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Background@LATENCY:
Background:button
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@LATENCY_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer:TOOLTIP_CONTAINER
Template:CLIENT_TOOLTIP
Width:11
Height:25
TextField@NAME:
Text:Name
X:15
Width:190
Height:25
MaxLength:16
Label@SPECTATOR:
Text:Spectator
Width:315-55
Height:25
X:210
Y:0
Align:Center
Font:Bold
Container@TEMPLATE_NONEDITABLE_SPECTATOR:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Background@LATENCY:
Background:button
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@LATENCY_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer:TOOLTIP_CONTAINER
Template:CLIENT_TOOLTIP
Width:11
Height:25
Label@NAME:
Text:Name
Width:185
Height:25
X:15
Y:0-1
Button@KICK:
Text:X
Width:25
Height:23
X:180
Y:2
Font:Bold
Label@SPECTATOR:
Text:Spectator
Width:315-55
Height:25
X:210
Y:0
Align:Center
Font:Bold
Container@TEMPLATE_NEW_SPECTATOR:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Button@SPECTATE:
Text:Spectate
Font:Regular
Width:455
Height:25
X:15
Y:0

View File

@@ -51,325 +51,6 @@ Container@SERVER_LOBBY:
Height:25
Font:Tiny
Align:Center
ScrollPanel@PLAYERS:
X:15
Y:30
Width:503
ItemSpacing:5
Height:219
Children:
Container@TEMPLATE_EDITABLE_PLAYER:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Background@LATENCY:
Background:button
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@LATENCY_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer:TOOLTIP_CONTAINER
Template:CLIENT_TOOLTIP
Width:11
Height:25
TextField@NAME:
Text:Name
X:15
Width:190
Height:25
MaxLength:16
Visible:false
DropDownButton@SLOT_OPTIONS:
Text:Name
X:15
Width:190
Height:25
Font:Regular
Visible:false
DropDownButton@COLOR:
Width:70
Height:25
X:210
Font:Regular
IgnoreChildMouseOver: true
Children:
ColorBlock@COLORBLOCK:
X:5
Y:6
Width:PARENT_RIGHT-35
Height:PARENT_BOTTOM-12
DropDownButton@FACTION:
Width:100
Height:25
X:285
Font:Regular
IgnoreChildMouseOver: true
Children:
Image@FACTIONFLAG:
Width:32
Height:16
X:4
Y:4
Label@FACTIONNAME:
Text:Faction
Width:60
Height:25
X:40
Y:0
DropDownButton@TEAM:
Width:50
Height:25
X:390
Font:Regular
Image@STATUS_IMAGE:
Visible:false
X:450
Y:4
Width:20
Height:20
ImageCollection:checkbox-bits
ImageName:checked
Checkbox@STATUS_CHECKBOX:
Visible:false
X:448
Y:2
Width:20
Height:20
Container@TEMPLATE_NONEDITABLE_PLAYER:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Background@LATENCY:
Background:button
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@LATENCY_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer:TOOLTIP_CONTAINER
Template:CLIENT_TOOLTIP
Width:11
Height:25
Label@NAME:
Text:Name
Width:185
Height:25
X:15
Y:0-1
Button@KICK:
Width:25
Height:25
X:180
Children:
Image:
ImageCollection:lobby-bits
ImageName:kick
X:7
Y:7
ColorBlock@COLORBLOCK:
X:215
Y:6
Width:35
Height:13
Container@FACTION:
Width:100
Height:25
X:285
Y:0
Children:
Image@FACTIONFLAG:
Width:30
Height:15
X:5
Y:5
Label@FACTIONNAME:
Text:Faction
Width:60
Height:25
X:40
Y:0
Label@TEAM:
Align:Center
Width:25
Height:25
X:390
Y:0
Image@STATUS_IMAGE:
Visible:false
X:450
Y:4
Width:20
Height:20
ImageCollection:checkbox-bits
ImageName:checked
Container@TEMPLATE_EMPTY:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
DropDownButton@SLOT_OPTIONS:
Text:Name
X:15
Width:190
Height:25
Font:Regular
Visible:false
Label@NAME:
Text:Name
Width:200
Height:25
X:15
Y:0-1
Visible:false
Button@JOIN:
Text:Play in this slot
Font:Regular
Width:315-55
Height:25
X:210
Y:0
Container@TEMPLATE_EDITABLE_SPECTATOR:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Background@LATENCY:
Background:button
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@LATENCY_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer:TOOLTIP_CONTAINER
Template:CLIENT_TOOLTIP
Width:11
Height:25
TextField@NAME:
Text:Name
X:15
Width:190
Height:25
MaxLength:16
Label@SPECTATOR:
Text:Spectator
Width:315-55
Height:25
X:210
Y:0
Align:Center
Font:Bold
Container@TEMPLATE_NONEDITABLE_SPECTATOR:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Background@LATENCY:
Background:button
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@LATENCY_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer:TOOLTIP_CONTAINER
Template:CLIENT_TOOLTIP
Width:11
Height:25
Label@NAME:
Text:Name
Width:185
Height:25
X:15
Y:0-1
Button@KICK:
Text:X
Width:25
Height:23
X:180
Y:2
Font:Bold
Label@SPECTATOR:
Text:Spectator
Width:315-55
Height:25
X:210
Y:0
Align:Center
Font:Bold
Container@TEMPLATE_NEW_SPECTATOR:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Button@SPECTATE:
Text:Spectate
Font:Regular
Width:455
Height:25
X:15
Y:0
Container@LABEL_CONTAINER:
X:20
Y:5

View File

@@ -69,6 +69,7 @@ ChromeLayout:
mods/cnc/chrome/createserver.yaml
mods/cnc/chrome/directconnect.yaml
mods/cnc/chrome/lobby.yaml
mods/cnc/chrome/lobby-playerbin.yaml
mods/cnc/chrome/connection.yaml
mods/cnc/chrome/mapchooser.yaml
mods/cnc/chrome/replaybrowser.yaml

View File

@@ -0,0 +1,310 @@
ScrollPanel@LOBBY_PLAYER_BIN:
X:20
Y:67
ItemSpacing:5
Width:504
Height:235
Children:
Container@TEMPLATE_EDITABLE_PLAYER:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Container@LATENCY:
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@LATENCY_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer:TOOLTIP_CONTAINER
Template:CLIENT_TOOLTIP
Width:11
Height:25
TextField@NAME:
Text:Name
X:15
Width:135
Height:25
MaxLength:16
DropDownButton@SLOT_OPTIONS:
Text:Name
X:15
Width:135
Height:25
Font:Regular
Visible:false
DropDownButton@COLOR:
Width:80
Height:25
X:160
Y:0
Children:
ColorBlock@COLORBLOCK:
X:5
Y:6
Width:PARENT_RIGHT-35
Height:PARENT_BOTTOM-12
DropDownButton@FACTION:
Width:130
Height:25
X:250
Y:0
Children:
Image@FACTIONFLAG:
Width:23
Height:23
X:5
Y:2
Label@FACTIONNAME:
Text:Faction
Width:70
Height:25
X:30
Y:0
DropDownButton@TEAM:
Text:Team
Width:48
Height:25
X:390
Y:0
Checkbox@STATUS_CHECKBOX:
X:448
Y:2
Width:20
Height:20
Visible:false
Image@STATUS_IMAGE:
Visible:false
X:450
Y:4
Width:20
Height:20
ImageCollection:checkbox-bits
ImageName:checked
Visible:false
Container@TEMPLATE_NONEDITABLE_PLAYER:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Container@LATENCY:
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@LATENCY_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer:TOOLTIP_CONTAINER
Template:CLIENT_TOOLTIP
Width:11
Height:25
Label@NAME:
Text:Name
Width:130
Height:25
X:20
Y:0-1
Button@KICK:
Text:X
Width:25
Height:23
X:125
Y:2
Font:Bold
ColorBlock@COLORBLOCK:
X:165
Y:6
Width:45
Height:13
Container@FACTION:
Width:130
Height:25
X:250
Y:0
Children:
Image@FACTIONFLAG:
Width:23
Height:23
X:5
Y:2
Label@FACTIONNAME:
Text:Faction
Width:60
Height:25
X:40
Y:0
Label@TEAM:
Text:Team
Width:23
Height:25
Align:Center
X:390
Y:0
Image@STATUS_IMAGE:
Visible:false
X:450
Y:4
Width:20
Height:20
ImageCollection:checkbox-bits
ImageName:checked
Container@TEMPLATE_EMPTY:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Label@NAME:
Text:Name
Width:130
Height:25
X:20
Y:0-1
DropDownButton@SLOT_OPTIONS:
Text:Name
Width:135
Height:25
X:15
Y:0
Visible:false
Button@JOIN:
Text:Play in this slot
Width:278
Height:25
X:160
Y:0
Container@TEMPLATE_EDITABLE_SPECTATOR:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Container@LATENCY:
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@LATENCY_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer:TOOLTIP_CONTAINER
Template:CLIENT_TOOLTIP
Width:11
Height:25
TextField@NAME:
Text:Name
X:15
Width:135
Height:25
MaxLength:16
Label@SPECTATOR:
Text:Spectator
Width:278
Height:25
X:160
Y:0
Align:Center
Font:Bold
Container@TEMPLATE_NONEDITABLE_SPECTATOR:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Container@LATENCY:
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@LATENCY_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer:TOOLTIP_CONTAINER
Template:CLIENT_TOOLTIP
Width:11
Height:25
Label@NAME:
Text:Name
Width:130
Height:25
X:20
Y:0-1
Button@KICK:
Text:X
Width:25
Height:23
X:125
Y:2
Font:Bold
Label@SPECTATOR:
Text:Spectator
Width:278
Height:25
X:160
Y:0
Align:Center
Font:Bold
Container@TEMPLATE_NEW_SPECTATOR:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Button@SPECTATE:
Text:Spectate
Font:Regular
Width:278
Height:25
X:160
Y:0

View File

@@ -1,539 +0,0 @@
Background@SERVER_LOBBY:
Logic:LobbyLogic
X:(WINDOW_RIGHT - WIDTH)/2
Y:(WINDOW_BOTTOM - HEIGHT)/2
Width:800
Height:600
Children:
ColorPreviewManager@COLOR_MANAGER:
Label@SERVER_NAME:
X:0
Y:17
Align:Center
Width:530
Height:20
Font:Bold
Text:OpenD2k Multiplayer Lobby
Label@MAP_TITLE:
X:532
Y:17
Align:Center
Width:250
Height:20
Font:Bold
Background@LOBBY_MAP_BG:
X:PARENT_RIGHT-268
Y:50
Width:252
Height:252
Background:dialog3
Children:
MapPreview@MAP_PREVIEW:
X:4
Y:4
Width:244
Height:244
TooltipContainer:TOOLTIP_CONTAINER
ScrollPanel@PLAYERS:
X:20
Y:67
ItemSpacing:5
Width:504
Height:235
Children:
Container@TEMPLATE_EDITABLE_PLAYER:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Container@LATENCY:
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@LATENCY_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer:TOOLTIP_CONTAINER
Template:CLIENT_TOOLTIP
Width:11
Height:25
TextField@NAME:
Text:Name
X:15
Width:135
Height:25
MaxLength:16
DropDownButton@SLOT_OPTIONS:
Text:Name
X:15
Width:135
Height:25
Font:Regular
Visible:false
DropDownButton@COLOR:
Width:80
Height:25
X:160
Y:0
Children:
ColorBlock@COLORBLOCK:
X:5
Y:6
Width:PARENT_RIGHT-35
Height:PARENT_BOTTOM-12
DropDownButton@FACTION:
Width:130
Height:25
X:250
Y:0
Children:
Image@FACTIONFLAG:
Width:23
Height:23
X:5
Y:2
Label@FACTIONNAME:
Text:Faction
Width:70
Height:25
X:30
Y:0
DropDownButton@TEAM:
Text:Team
Width:48
Height:25
X:390
Y:0
Checkbox@STATUS_CHECKBOX:
X:448
Y:2
Width:20
Height:20
Visible:false
Image@STATUS_IMAGE:
Visible:false
X:450
Y:4
Width:20
Height:20
ImageCollection:checkbox-bits
ImageName:checked
Visible:false
Container@TEMPLATE_NONEDITABLE_PLAYER:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Container@LATENCY:
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@LATENCY_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer:TOOLTIP_CONTAINER
Template:CLIENT_TOOLTIP
Width:11
Height:25
Label@NAME:
Text:Name
Width:130
Height:25
X:20
Y:0-1
Button@KICK:
Text:X
Width:25
Height:23
X:125
Y:2
Font:Bold
ColorBlock@COLORBLOCK:
X:165
Y:6
Width:45
Height:13
Container@FACTION:
Width:130
Height:25
X:250
Y:0
Children:
Image@FACTIONFLAG:
Width:23
Height:23
X:5
Y:2
Label@FACTIONNAME:
Text:Faction
Width:60
Height:25
X:40
Y:0
Label@TEAM:
Text:Team
Width:23
Height:25
Align:Center
X:390
Y:0
Image@STATUS_IMAGE:
Visible:false
X:450
Y:4
Width:20
Height:20
ImageCollection:checkbox-bits
ImageName:checked
Container@TEMPLATE_EMPTY:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Label@NAME:
Text:Name
Width:130
Height:25
X:20
Y:0-1
DropDownButton@SLOT_OPTIONS:
Text:Name
Width:135
Height:25
X:15
Y:0
Visible:false
Button@JOIN:
Text:Play in this slot
Width:278
Height:25
X:160
Y:0
Container@TEMPLATE_EDITABLE_SPECTATOR:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Container@LATENCY:
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@LATENCY_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer:TOOLTIP_CONTAINER
Template:CLIENT_TOOLTIP
Width:11
Height:25
TextField@NAME:
Text:Name
X:15
Width:135
Height:25
MaxLength:16
Label@SPECTATOR:
Text:Spectator
Width:278
Height:25
X:160
Y:0
Align:Center
Font:Bold
Container@TEMPLATE_NONEDITABLE_SPECTATOR:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Container@LATENCY:
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@LATENCY_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer:TOOLTIP_CONTAINER
Template:CLIENT_TOOLTIP
Width:11
Height:25
Label@NAME:
Text:Name
Width:130
Height:25
X:20
Y:0-1
Button@KICK:
Text:X
Width:25
Height:23
X:125
Y:2
Font:Bold
Label@SPECTATOR:
Text:Spectator
Width:278
Height:25
X:160
Y:0
Align:Center
Font:Bold
Container@TEMPLATE_NEW_SPECTATOR:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Button@SPECTATE:
Text:Spectate
Font:Regular
Width:278
Height:25
X:160
Y:0
Container@LABEL_CONTAINER:
X:25
Y:40
Children:
Label@LABEL_LOBBY_NAME:
Width:150
Height:25
X:0
Y:0
Text:Name
Align:Center
Font:Bold
Label@LABEL_LOBBY_COLOR:
Width:80
Height:25
X:160
Y:0
Text:Color
Align:Center
Font:Bold
Label@LABEL_LOBBY_FACTION:
Width:130
Height:25
X:250
Y:0
Text:Faction
Align:Center
Font:Bold
Label@LABEL_LOBBY_TEAM:
Width:48
Height:25
X:390
Y:0
Text:Team
Align:Center
Font:Bold
Label@LABEL_LOBBY_STATUS:
X:448
Y:0
Width:20
Height:25
Text:Ready
Align:Left
Font:Bold
ScrollPanel@CHAT_DISPLAY:
X:20
Y:PARENT_BOTTOM - 289
Width:PARENT_RIGHT - 200
Height:230
ItemSpacing:1
Children:
Container@CHAT_TEMPLATE:
Width:PARENT_RIGHT-27
Height:16
X:2
Y:0
Children:
Label@TIME:
X:3
Width:50
Height:15
VAlign:Top
Label@NAME:
X:45
Width:50
Height:15
VAlign:Top
Label@TEXT:
X:55
Width:PARENT_RIGHT - 60
Height:15
WordWrap:true
VAlign:Top
Label@LABEL_CHATTYPE:
Width:65
Height:25
X:0
Y:PARENT_BOTTOM - 50
Text:Chat:
Align:Right
TextField@CHAT_TEXTFIELD:
X:70
Y:PARENT_BOTTOM - 49
Width:550
Height:25
Button@CHANGEMAP_BUTTON:
X:PARENT_RIGHT-154
Y:PARENT_BOTTOM-289
Width:120
Height:25
Text:Change Map
Font:Bold
Button@ADD_BOTS:
X:PARENT_RIGHT-154
Y:PARENT_BOTTOM-(289-25-5)
Width:120
Height:25
Text:Add Bots
Font:Bold
DropDownButton@ASSIGNTEAMS_DROPDOWNBUTTON:
X:PARENT_RIGHT-154
Y:PARENT_BOTTOM-229
Width:120
Height:25
Font:Bold
Visible:false
Text:Assign
DropDownButton@DIFFICULTY_DROPDOWNBUTTON:
X:PARENT_RIGHT-154
Y:PARENT_BOTTOM-199
Width:120
Height:25
Font:Bold
Visible:false
Checkbox@ALLOWCHEATS_CHECKBOX:
X: PARENT_RIGHT-154
Y: PARENT_BOTTOM-169
Width: 80
Height: 20
Text: Allow Cheats
Checkbox@CRATES_CHECKBOX:
X: PARENT_RIGHT-154
Y: PARENT_BOTTOM-144
Width: 80
Height: 20
Text: Crates
Button@DISCONNECT_BUTTON:
X:PARENT_RIGHT-154
Y:PARENT_BOTTOM-99
Width:120
Height:25
Text:Disconnect
Font:Bold
Button@START_GAME_BUTTON:
X:PARENT_RIGHT-154
Y:PARENT_BOTTOM-49
Width:120
Height:25
Text:Start Game
Font:Bold
TooltipContainer@TOOLTIP_CONTAINER:
Background@KICK_CLIENT_DIALOG:
X:20
Y:67
Width:504
Height:235
Logic:KickClientLogic
Background:dialog3
Children:
Label@TITLE:
X:0
Y:40
Width:PARENT_RIGHT
Height:25
Font:Bold
Align:Center
Label@TEXTA:
X:0
Y:67
Width:PARENT_RIGHT
Height:25
Font:Regular
Align:Center
Text:You may also apply a temporary ban, preventing
Label@TEXTB:
X:0
Y:85
Width:PARENT_RIGHT
Height:25
Font:Regular
Align:Center
Text:them from joining for the remainder of this game.
Checkbox@PREVENT_REJOINING_CHECKBOX:
X:(PARENT_RIGHT - WIDTH)/2
Y:120
Width:150
Height:20
Text:Temporarily Ban
Button@OK_BUTTON:
X:(PARENT_RIGHT - WIDTH)/2 + 75
Y:155
Width:120
Height:25
Text:Kick
Font:Bold
Button@CANCEL_BUTTON:
X:(PARENT_RIGHT - WIDTH)/2 - 75
Y:155
Width:120
Height:25
Text:Cancel
Font:Bold

View File

@@ -57,7 +57,9 @@ ChromeLayout:
mods/d2k/chrome/mainmenu.yaml
mods/ra/chrome/settings.yaml
mods/ra/chrome/credits.yaml
mods/d2k/chrome/lobby.yaml
mods/ra/chrome/lobby.yaml
mods/d2k/chrome/lobby-playerbin.yaml
mods/ra/chrome/lobby-dialogs.yaml
mods/d2k/chrome/color-picker.yaml
mods/ra/chrome/map-chooser.yaml
mods/ra/chrome/create-server.yaml

View File

@@ -0,0 +1,51 @@
Background@KICK_CLIENT_DIALOG:
X:20
Y:67
Width:504
Height:235
Logic:KickClientLogic
Background:dialog3
Children:
Label@TITLE:
X:0
Y:40
Width:PARENT_RIGHT
Height:25
Font:Bold
Align:Center
Label@TEXTA:
X:0
Y:67
Width:PARENT_RIGHT
Height:25
Font:Regular
Align:Center
Text:You may also apply a temporary ban, preventing
Label@TEXTB:
X:0
Y:85
Width:PARENT_RIGHT
Height:25
Font:Regular
Align:Center
Text:them from joining for the remainder of this game.
Checkbox@PREVENT_REJOINING_CHECKBOX:
X:(PARENT_RIGHT - WIDTH)/2
Y:120
Width:150
Height:20
Text:Temporarily Ban
Button@OK_BUTTON:
X:(PARENT_RIGHT - WIDTH)/2 + 75
Y:155
Width:120
Height:25
Text:Kick
Font:Bold
Button@CANCEL_BUTTON:
X:(PARENT_RIGHT - WIDTH)/2 - 75
Y:155
Width:120
Height:25
Text:Cancel
Font:Bold

View File

@@ -0,0 +1,310 @@
ScrollPanel@LOBBY_PLAYER_BIN:
X:20
Y:67
ItemSpacing:5
Width:504
Height:235
Children:
Container@TEMPLATE_EDITABLE_PLAYER:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Container@LATENCY:
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@LATENCY_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer:TOOLTIP_CONTAINER
Template:CLIENT_TOOLTIP
Width:11
Height:25
TextField@NAME:
Text:Name
X:15
Width:135
Height:25
MaxLength:16
DropDownButton@SLOT_OPTIONS:
Text:Name
X:15
Width:135
Height:25
Font:Regular
Visible:false
DropDownButton@COLOR:
Width:80
Height:25
X:160
Y:0
Children:
ColorBlock@COLORBLOCK:
X:5
Y:6
Width:PARENT_RIGHT-35
Height:PARENT_BOTTOM-12
DropDownButton@FACTION:
Width:130
Height:25
X:250
Y:0
Children:
Image@FACTIONFLAG:
Width:30
Height:15
X:5
Y:5
Label@FACTIONNAME:
Text:Faction
Width:60
Height:25
X:40
Y:0
DropDownButton@TEAM:
Text:Team
Width:48
Height:25
X:390
Y:0
Checkbox@STATUS_CHECKBOX:
X:448
Y:2
Width:20
Height:20
Visible:false
Image@STATUS_IMAGE:
Visible:false
X:450
Y:4
Width:20
Height:20
ImageCollection:checkbox-bits
ImageName:checked
Visible:false
Container@TEMPLATE_NONEDITABLE_PLAYER:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Container@LATENCY:
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@LATENCY_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer:TOOLTIP_CONTAINER
Template:CLIENT_TOOLTIP
Width:11
Height:25
Label@NAME:
Text:Name
Width:130
Height:25
X:20
Y:0-1
Button@KICK:
Text:X
Width:25
Height:23
X:125
Y:2
Font:Bold
ColorBlock@COLORBLOCK:
X:165
Y:6
Width:45
Height:13
Container@FACTION:
Width:130
Height:25
X:250
Y:0
Children:
Image@FACTIONFLAG:
Width:30
Height:15
X:5
Y:5
Label@FACTIONNAME:
Text:Faction
Width:60
Height:25
X:40
Y:0
Label@TEAM:
Text:Team
Width:23
Height:25
Align:Center
X:390
Y:0
Image@STATUS_IMAGE:
Visible:false
X:450
Y:4
Width:20
Height:20
ImageCollection:checkbox-bits
ImageName:checked
Container@TEMPLATE_EMPTY:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Label@NAME:
Text:Name
Width:130
Height:25
X:20
Y:0-1
DropDownButton@SLOT_OPTIONS:
Text:Name
Width:135
Height:25
X:15
Y:0
Visible:false
Button@JOIN:
Text:Play in this slot
Width:278
Height:25
X:160
Y:0
Container@TEMPLATE_EDITABLE_SPECTATOR:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Container@LATENCY:
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@LATENCY_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer:TOOLTIP_CONTAINER
Template:CLIENT_TOOLTIP
Width:11
Height:25
TextField@NAME:
Text:Name
X:15
Width:135
Height:25
MaxLength:16
Label@SPECTATOR:
Text:Spectator
Width:278
Height:25
X:160
Y:0
Align:Center
Font:Bold
Container@TEMPLATE_NONEDITABLE_SPECTATOR:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Container@LATENCY:
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@LATENCY_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer:TOOLTIP_CONTAINER
Template:CLIENT_TOOLTIP
Width:11
Height:25
Label@NAME:
Text:Name
Width:130
Height:25
X:20
Y:0-1
Button@KICK:
Text:X
Width:25
Height:23
X:125
Y:2
Font:Bold
Label@SPECTATOR:
Text:Spectator
Width:278
Height:25
X:160
Y:0
Align:Center
Font:Bold
Container@TEMPLATE_NEW_SPECTATOR:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Button@SPECTATE:
Text:Spectate
Font:Regular
Width:278
Height:25
X:160
Y:0

View File

@@ -13,7 +13,6 @@ Background@SERVER_LOBBY:
Width:530
Height:20
Font:Bold
Text:OpenRA Multiplayer Lobby
Label@MAP_TITLE:
X:532
Y:17
@@ -34,316 +33,6 @@ Background@SERVER_LOBBY:
Width:244
Height:244
TooltipContainer:TOOLTIP_CONTAINER
ScrollPanel@PLAYERS:
X:20
Y:67
ItemSpacing:5
Width:504
Height:235
Children:
Container@TEMPLATE_EDITABLE_PLAYER:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Container@LATENCY:
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@LATENCY_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer:TOOLTIP_CONTAINER
Template:CLIENT_TOOLTIP
Width:11
Height:25
TextField@NAME:
Text:Name
X:15
Width:135
Height:25
MaxLength:16
DropDownButton@SLOT_OPTIONS:
Text:Name
X:15
Width:135
Height:25
Font:Regular
Visible:false
DropDownButton@COLOR:
Width:80
Height:25
X:160
Y:0
Children:
ColorBlock@COLORBLOCK:
X:5
Y:6
Width:PARENT_RIGHT-35
Height:PARENT_BOTTOM-12
DropDownButton@FACTION:
Width:130
Height:25
X:250
Y:0
Children:
Image@FACTIONFLAG:
Width:30
Height:15
X:5
Y:5
Label@FACTIONNAME:
Text:Faction
Width:60
Height:25
X:40
Y:0
DropDownButton@TEAM:
Text:Team
Width:48
Height:25
X:390
Y:0
Checkbox@STATUS_CHECKBOX:
X:448
Y:2
Width:20
Height:20
Visible:false
Image@STATUS_IMAGE:
Visible:false
X:450
Y:4
Width:20
Height:20
ImageCollection:checkbox-bits
ImageName:checked
Visible:false
Container@TEMPLATE_NONEDITABLE_PLAYER:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Container@LATENCY:
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@LATENCY_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer:TOOLTIP_CONTAINER
Template:CLIENT_TOOLTIP
Width:11
Height:25
Label@NAME:
Text:Name
Width:130
Height:25
X:20
Y:0-1
Button@KICK:
Text:X
Width:25
Height:23
X:125
Y:2
Font:Bold
ColorBlock@COLORBLOCK:
X:165
Y:6
Width:45
Height:13
Container@FACTION:
Width:130
Height:25
X:250
Y:0
Children:
Image@FACTIONFLAG:
Width:30
Height:15
X:5
Y:5
Label@FACTIONNAME:
Text:Faction
Width:60
Height:25
X:40
Y:0
Label@TEAM:
Text:Team
Width:23
Height:25
Align:Center
X:390
Y:0
Image@STATUS_IMAGE:
Visible:false
X:450
Y:4
Width:20
Height:20
ImageCollection:checkbox-bits
ImageName:checked
Container@TEMPLATE_EMPTY:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Label@NAME:
Text:Name
Width:130
Height:25
X:20
Y:0-1
DropDownButton@SLOT_OPTIONS:
Text:Name
Width:135
Height:25
X:15
Y:0
Visible:false
Button@JOIN:
Text:Play in this slot
Width:278
Height:25
X:160
Y:0
Container@TEMPLATE_EDITABLE_SPECTATOR:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Container@LATENCY:
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@LATENCY_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer:TOOLTIP_CONTAINER
Template:CLIENT_TOOLTIP
Width:11
Height:25
TextField@NAME:
Text:Name
X:15
Width:135
Height:25
MaxLength:16
Label@SPECTATOR:
Text:Spectator
Width:278
Height:25
X:160
Y:0
Align:Center
Font:Bold
Container@TEMPLATE_NONEDITABLE_SPECTATOR:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Container@LATENCY:
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@LATENCY_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer:TOOLTIP_CONTAINER
Template:CLIENT_TOOLTIP
Width:11
Height:25
Label@NAME:
Text:Name
Width:130
Height:25
X:20
Y:0-1
Button@KICK:
Text:X
Width:25
Height:23
X:125
Y:2
Font:Bold
Label@SPECTATOR:
Text:Spectator
Width:278
Height:25
X:160
Y:0
Align:Center
Font:Bold
Container@TEMPLATE_NEW_SPECTATOR:
X:5
Y:0
Width:475
Height:25
Visible:false
Children:
Button@SPECTATE:
Text:Spectate
Font:Regular
Width:278
Height:25
X:160
Y:0
Container@LABEL_CONTAINER:
X:25
Y:40
@@ -490,56 +179,4 @@ Background@SERVER_LOBBY:
Height:25
Text:Start Game
Font:Bold
TooltipContainer@TOOLTIP_CONTAINER:
Background@KICK_CLIENT_DIALOG:
X:20
Y:67
Width:504
Height:235
Logic:KickClientLogic
Background:dialog3
Children:
Label@TITLE:
X:0
Y:40
Width:PARENT_RIGHT
Height:25
Font:Bold
Align:Center
Label@TEXTA:
X:0
Y:67
Width:PARENT_RIGHT
Height:25
Font:Regular
Align:Center
Text:You may also apply a temporary ban, preventing
Label@TEXTB:
X:0
Y:85
Width:PARENT_RIGHT
Height:25
Font:Regular
Align:Center
Text:them from joining for the remainder of this game.
Checkbox@PREVENT_REJOINING_CHECKBOX:
X:(PARENT_RIGHT - WIDTH)/2
Y:120
Width:150
Height:20
Text:Temporarily Ban
Button@OK_BUTTON:
X:(PARENT_RIGHT - WIDTH)/2 + 75
Y:155
Width:120
Height:25
Text:Kick
Font:Bold
Button@CANCEL_BUTTON:
X:(PARENT_RIGHT - WIDTH)/2 - 75
Y:155
Width:120
Height:25
Text:Cancel
Font:Bold
TooltipContainer@TOOLTIP_CONTAINER:

View File

@@ -70,6 +70,8 @@ ChromeLayout:
mods/ra/chrome/settings.yaml
mods/ra/chrome/credits.yaml
mods/ra/chrome/lobby.yaml
mods/ra/chrome/lobby-playerbin.yaml
mods/ra/chrome/lobby-dialogs.yaml
mods/ra/chrome/color-picker.yaml
mods/ra/chrome/map-chooser.yaml
mods/ra/chrome/create-server.yaml