Merge pull request #9549 from pchote/lobby-music
Add a music player to the game lobby.
This commit is contained in:
Oliver Brakmann
@@ -9,7 +9,6 @@ Container@LOBBY_PLAYER_BIN:
|
||||
Height: PARENT_BOTTOM
|
||||
Children:
|
||||
Label@LABEL_LOBBY_NAME:
|
||||
X: 0
|
||||
Width: 180
|
||||
Height: 25
|
||||
Text: Name
|
||||
@@ -17,34 +16,34 @@ Container@LOBBY_PLAYER_BIN:
|
||||
Font: Bold
|
||||
Label@LABEL_LOBBY_COLOR:
|
||||
X: 190
|
||||
Width: 80
|
||||
Width: 70
|
||||
Height: 25
|
||||
Text: Color
|
||||
Align: Center
|
||||
Font: Bold
|
||||
Label@LABEL_LOBBY_FACTION:
|
||||
X: 280
|
||||
X: 270
|
||||
Width: 130
|
||||
Height: 25
|
||||
Text: Faction
|
||||
Align: Center
|
||||
Font: Bold
|
||||
Label@LABEL_LOBBY_TEAM:
|
||||
X: 420
|
||||
X: 410
|
||||
Width: 48
|
||||
Height: 25
|
||||
Text: Team
|
||||
Align: Center
|
||||
Font: Bold
|
||||
Label@LABEL_LOBBY_SPAWN:
|
||||
X: 478
|
||||
X: 468
|
||||
Width: 48
|
||||
Height: 25
|
||||
Text: Spawn
|
||||
Align: Center
|
||||
Font: Bold
|
||||
Label@LABEL_LOBBY_STATUS:
|
||||
X: 535
|
||||
X: 525
|
||||
Width: 20
|
||||
Height: 25
|
||||
Text: Ready
|
||||
@@ -58,18 +57,16 @@ Container@LOBBY_PLAYER_BIN:
|
||||
Children:
|
||||
Container@TEMPLATE_EDITABLE_PLAYER:
|
||||
X: 5
|
||||
Y: 0
|
||||
Width: 475
|
||||
Height: 25
|
||||
Visible: false
|
||||
Children:
|
||||
Image@ADMIN_INDICATOR:
|
||||
X: 2
|
||||
ImageCollection: lobby-bits
|
||||
ImageName: admin
|
||||
X: 2
|
||||
Visible: false
|
||||
Container@LATENCY:
|
||||
X: 0
|
||||
Y: 6
|
||||
Width: 11
|
||||
Height: 14
|
||||
@@ -81,26 +78,26 @@ Container@LOBBY_PLAYER_BIN:
|
||||
Width: PARENT_RIGHT-4
|
||||
Height: PARENT_BOTTOM-4
|
||||
ClientTooltipRegion@CLIENT_REGION:
|
||||
TooltipContainer: TOOLTIP_CONTAINER
|
||||
Template: CLIENT_TOOLTIP
|
||||
Width: 11
|
||||
Height: 25
|
||||
TooltipContainer: TOOLTIP_CONTAINER
|
||||
Template: CLIENT_TOOLTIP
|
||||
TextField@NAME:
|
||||
Text: Name
|
||||
X: 15
|
||||
Width: 165
|
||||
Height: 25
|
||||
Text: Name
|
||||
MaxLength: 16
|
||||
DropDownButton@SLOT_OPTIONS:
|
||||
Text: Name
|
||||
X: 15
|
||||
Width: 165
|
||||
Height: 25
|
||||
Text: Name
|
||||
Font: Regular
|
||||
Visible: false
|
||||
DropDownButton@COLOR:
|
||||
X: 190
|
||||
Width: 80
|
||||
Width: 70
|
||||
Height: 25
|
||||
IgnoreChildMouseOver: true
|
||||
Children:
|
||||
@@ -110,7 +107,7 @@ Container@LOBBY_PLAYER_BIN:
|
||||
Width: PARENT_RIGHT-35
|
||||
Height: PARENT_BOTTOM-12
|
||||
DropDownButton@FACTION:
|
||||
X: 280
|
||||
X: 270
|
||||
Width: 130
|
||||
Height: 25
|
||||
IgnoreChildMouseOver: true
|
||||
@@ -119,34 +116,33 @@ Container@LOBBY_PLAYER_BIN:
|
||||
PanelRoot: FACTION_DROPDOWN_PANEL_ROOT # ensure that tooltips for the options are on top of the dropdown panel
|
||||
Children:
|
||||
Image@FACTIONFLAG:
|
||||
Width: 23
|
||||
Height: 23
|
||||
X: 4
|
||||
Y: 2
|
||||
Width: 23
|
||||
Height: 23
|
||||
Label@FACTIONNAME:
|
||||
Text: Faction
|
||||
X: 34
|
||||
Width: 70
|
||||
Height: 25
|
||||
X: 34
|
||||
Y: 0
|
||||
Text: Faction
|
||||
DropDownButton@TEAM:
|
||||
X: 420
|
||||
X: 410
|
||||
Width: 48
|
||||
Height: 25
|
||||
Text: Team
|
||||
DropDownButton@SPAWN:
|
||||
X: 478
|
||||
X: 468
|
||||
Width: 48
|
||||
Height: 25
|
||||
Text: Spawn
|
||||
Checkbox@STATUS_CHECKBOX:
|
||||
X: 535
|
||||
X: 525
|
||||
Y: 2
|
||||
Width: 20
|
||||
Height: 20
|
||||
Visible: false
|
||||
Image@STATUS_IMAGE:
|
||||
X: 537
|
||||
X: 527
|
||||
Y: 4
|
||||
Width: 20
|
||||
Height: 20
|
||||
@@ -155,18 +151,16 @@ Container@LOBBY_PLAYER_BIN:
|
||||
Visible: false
|
||||
Container@TEMPLATE_NONEDITABLE_PLAYER:
|
||||
X: 5
|
||||
Y: 0
|
||||
Width: 475
|
||||
Height: 25
|
||||
Visible: false
|
||||
Children:
|
||||
Image@ADMIN_INDICATOR:
|
||||
X: 2
|
||||
ImageCollection: lobby-bits
|
||||
ImageName: admin
|
||||
X: 2
|
||||
Visible: false
|
||||
Container@LATENCY:
|
||||
X: 0
|
||||
Y: 6
|
||||
Width: 11
|
||||
Height: 14
|
||||
@@ -178,105 +172,97 @@ Container@LOBBY_PLAYER_BIN:
|
||||
Width: PARENT_RIGHT-4
|
||||
Height: PARENT_BOTTOM-4
|
||||
ClientTooltipRegion@CLIENT_REGION:
|
||||
TooltipContainer: TOOLTIP_CONTAINER
|
||||
Template: CLIENT_TOOLTIP
|
||||
Width: 11
|
||||
Height: 25
|
||||
TooltipContainer: TOOLTIP_CONTAINER
|
||||
Template: CLIENT_TOOLTIP
|
||||
Label@NAME:
|
||||
Text: Name
|
||||
Width: 165
|
||||
Height: 25
|
||||
X: 20
|
||||
Y: 0-1
|
||||
Width: 165
|
||||
Height: 25
|
||||
Text: Name
|
||||
Button@KICK:
|
||||
Text: X
|
||||
Width: 25
|
||||
Height: 23
|
||||
X: 155
|
||||
Y: 2
|
||||
Width: 25
|
||||
Height: 23
|
||||
Text: X
|
||||
Font: Bold
|
||||
ColorBlock@COLORBLOCK:
|
||||
X: 195
|
||||
Y: 6
|
||||
Width: 45
|
||||
Width: 35
|
||||
Height: 13
|
||||
Container@FACTION:
|
||||
X: 270
|
||||
Width: 160
|
||||
Height: 25
|
||||
X: 280
|
||||
Y: 0
|
||||
Children:
|
||||
Image@FACTIONFLAG:
|
||||
Width: 23
|
||||
Height: 23
|
||||
X: 4
|
||||
Y: 2
|
||||
Width: 23
|
||||
Height: 23
|
||||
Label@FACTIONNAME:
|
||||
Text: Faction
|
||||
X: 34
|
||||
Width: 60
|
||||
Height: 25
|
||||
X: 34
|
||||
Y: 0
|
||||
Text: Faction
|
||||
Label@TEAM:
|
||||
X: 410
|
||||
Width: 23
|
||||
Height: 25
|
||||
Align: Center
|
||||
Text: Team
|
||||
Width: 23
|
||||
Height: 25
|
||||
Align: Center
|
||||
X: 420
|
||||
Y: 0
|
||||
Label@SPAWN:
|
||||
Align: Center
|
||||
X: 478
|
||||
X: 468
|
||||
Width: 23
|
||||
Height: 25
|
||||
Align: Center
|
||||
Image@STATUS_IMAGE:
|
||||
Visible: false
|
||||
X: 537
|
||||
X: 527
|
||||
Y: 4
|
||||
Width: 20
|
||||
Height: 20
|
||||
ImageCollection: checkbox-bits
|
||||
ImageName: checked
|
||||
Visible: false
|
||||
Container@TEMPLATE_EMPTY:
|
||||
X: 5
|
||||
Y: 0
|
||||
Width: 475
|
||||
Height: 25
|
||||
Visible: false
|
||||
Children:
|
||||
Label@NAME:
|
||||
Text: Name
|
||||
Width: 165
|
||||
Height: 25
|
||||
X: 20
|
||||
Y: 0-1
|
||||
DropDownButton@SLOT_OPTIONS:
|
||||
Text: Name
|
||||
Width: 165
|
||||
Height: 25
|
||||
Text: Name
|
||||
DropDownButton@SLOT_OPTIONS:
|
||||
X: 15
|
||||
Y: 0
|
||||
Width: 165
|
||||
Height: 25
|
||||
Text: Name
|
||||
Visible: false
|
||||
Button@JOIN:
|
||||
Text: Play in this slot
|
||||
Width: 336
|
||||
Height: 25
|
||||
X: 190
|
||||
Y: 0
|
||||
Width: 326
|
||||
Height: 25
|
||||
Text: Play in this slot
|
||||
Container@TEMPLATE_EDITABLE_SPECTATOR:
|
||||
X: 5
|
||||
Y: 0
|
||||
Width: 475
|
||||
Height: 25
|
||||
Visible: false
|
||||
Children:
|
||||
Image@ADMIN_INDICATOR:
|
||||
X: 2
|
||||
ImageCollection: lobby-bits
|
||||
ImageName: admin
|
||||
X: 2
|
||||
Visible: false
|
||||
Container@LATENCY:
|
||||
X: 0
|
||||
Y: 6
|
||||
Width: 11
|
||||
Height: 14
|
||||
@@ -288,38 +274,35 @@ Container@LOBBY_PLAYER_BIN:
|
||||
Width: PARENT_RIGHT-4
|
||||
Height: PARENT_BOTTOM-4
|
||||
ClientTooltipRegion@CLIENT_REGION:
|
||||
TooltipContainer: TOOLTIP_CONTAINER
|
||||
Template: CLIENT_TOOLTIP
|
||||
Width: 11
|
||||
Height: 25
|
||||
TooltipContainer: TOOLTIP_CONTAINER
|
||||
Template: CLIENT_TOOLTIP
|
||||
TextField@NAME:
|
||||
Text: Name
|
||||
X: 15
|
||||
Width: 165
|
||||
Height: 25
|
||||
Text: Name
|
||||
MaxLength: 16
|
||||
Label@SPECTATOR:
|
||||
Text: Spectator
|
||||
Width: 336
|
||||
Height: 25
|
||||
X: 190
|
||||
Y: 0
|
||||
Width: 326
|
||||
Height: 25
|
||||
Text: Spectator
|
||||
Align: Center
|
||||
Font: Bold
|
||||
Container@TEMPLATE_NONEDITABLE_SPECTATOR:
|
||||
X: 5
|
||||
Y: 0
|
||||
Width: 475
|
||||
Height: 25
|
||||
Visible: false
|
||||
Children:
|
||||
Image@ADMIN_INDICATOR:
|
||||
X: 2
|
||||
ImageCollection: lobby-bits
|
||||
ImageName: admin
|
||||
X: 2
|
||||
Visible: false
|
||||
Container@LATENCY:
|
||||
X: 0
|
||||
Y: 6
|
||||
Width: 11
|
||||
Height: 14
|
||||
@@ -331,52 +314,48 @@ Container@LOBBY_PLAYER_BIN:
|
||||
Width: PARENT_RIGHT-4
|
||||
Height: PARENT_BOTTOM-4
|
||||
ClientTooltipRegion@CLIENT_REGION:
|
||||
TooltipContainer: TOOLTIP_CONTAINER
|
||||
Template: CLIENT_TOOLTIP
|
||||
Width: 11
|
||||
Height: 25
|
||||
TooltipContainer: TOOLTIP_CONTAINER
|
||||
Template: CLIENT_TOOLTIP
|
||||
Label@NAME:
|
||||
Text: Name
|
||||
Width: 160
|
||||
Height: 25
|
||||
X: 20
|
||||
Y: 0-1
|
||||
Width: 160
|
||||
Height: 25
|
||||
Text: Name
|
||||
Button@KICK:
|
||||
Text: X
|
||||
Width: 25
|
||||
Height: 23
|
||||
X: 155
|
||||
Y: 2
|
||||
Width: 25
|
||||
Height: 23
|
||||
Text: X
|
||||
Font: Bold
|
||||
Label@SPECTATOR:
|
||||
Text: Spectator
|
||||
Width: 336
|
||||
Height: 25
|
||||
X: 190
|
||||
Y: 0
|
||||
Width: 326
|
||||
Height: 25
|
||||
Text: Spectator
|
||||
Align: Center
|
||||
Font: Bold
|
||||
Container@TEMPLATE_NEW_SPECTATOR:
|
||||
X: 5
|
||||
Y: 0
|
||||
Width: 475
|
||||
Height: 25
|
||||
Visible: false
|
||||
Children:
|
||||
Checkbox@TOGGLE_SPECTATORS:
|
||||
Font: Regular
|
||||
X: 15
|
||||
Width: 165
|
||||
Height: 20
|
||||
X: 15
|
||||
Y: 0
|
||||
Text: Allow Spectators?
|
||||
Font: Regular
|
||||
Button@SPECTATE:
|
||||
X: 190
|
||||
Width: 326
|
||||
Height: 25
|
||||
Text: Spectate
|
||||
Font: Regular
|
||||
Width: 336
|
||||
Height: 25
|
||||
X: 190
|
||||
Y: 0
|
||||
|
||||
ScrollPanel@FACTION_DROPDOWN_TEMPLATE:
|
||||
Width: DROPDOWN_WIDTH
|
||||
|
||||
@@ -88,6 +88,7 @@ ChromeLayout:
|
||||
./mods/ra/chrome/lobby-mappreview.yaml
|
||||
./mods/d2k/chrome/lobby-players.yaml
|
||||
./mods/d2k/chrome/lobby-options.yaml
|
||||
./mods/ra/chrome/lobby-music.yaml
|
||||
./mods/ra/chrome/lobby-kickdialogs.yaml
|
||||
./mods/d2k/chrome/color-picker.yaml
|
||||
./mods/ra/chrome/map-chooser.yaml
|
||||
|
||||
Reference in New Issue
Block a user