Integrate global chat with the server lobby.

This commit is contained in:
Paul Chote
2015-10-09 23:03:32 +01:00
parent 3d7d7ff2a5
commit fa2b10b269
11 changed files with 416 additions and 106 deletions

View File

@@ -20,7 +20,7 @@ Container@GLOBALCHAT_PANEL:
Font: TinyBold
Align: Center
ScrollPanel@HISTORY_PANEL:
Y:20
Y: 20
Width: 565
Height: PARENT_BOTTOM - 50
ItemSpacing: 5

View File

@@ -0,0 +1,118 @@
Container@LOBBY_GLOBALCHAT_PANEL:
Logic: GlobalChatLogic
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Children:
Container@GLOBALCHAT_MAIN_PANEL:
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Children:
Background@TOPIC:
Width: 582
Height: 20
Background: dialog2
Children:
Label@CHANNEL_TOPIC:
X: 10
Y: 0-1
Width: PARENT_RIGHT - 20
Height: PARENT_BOTTOM
Font: TinyBold
Align: Center
ScrollPanel@HISTORY_PANEL:
Y: 20
Width: 582
Height: PARENT_BOTTOM - 50
ItemSpacing: 5
Children:
Label@HISTORY_TEMPLATE:
X: 5
Width: 530
Height: 25
WordWrap: True
TextField@CHAT_TEXTFIELD:
X: 205
Y: PARENT_BOTTOM - 25
Width: 582-205
Height: 25
LeftMargin: 60
Children:
Label@LABEL_CHATTYPE:
Y: 0-1
Width: 55
Height: 25
Align: Right
Text: Global:
ScrollPanel@NICKNAME_PANEL:
X: 596
Width: PARENT_RIGHT - 596
Height: PARENT_BOTTOM - 30
Children:
Container@NICKNAME_TEMPLATE:
Height: 20
Width: PARENT_RIGHT-25
Children:
Image@INDICATOR:
ImageCollection: lobby-bits
ImageName: admin
X: 4
Y: 9
Label@NICK:
X: 15
Width: PARENT_RIGHT-15
Height: 20
Button@DISCONNECT_BUTTON:
X: 596
Y: PARENT_BOTTOM - 25
Width: PARENT_RIGHT - 596
Height: 25
Text: Leave Chat
Font: Bold
Background@GLOBALCHAT_CONNECT_PANEL:
Width: PARENT_RIGHT
Height: PARENT_BOTTOM-30
Background: scrollpanel-bg
Children:
Label@GLOBAL_CHAT_LABEL:
Y: PARENT_BOTTOM / 4
Width: PARENT_RIGHT
Align: Center
Text: Global Chat
Font: Bold
Label@NICKNAME_LABEL:
X: 200
Y: PARENT_BOTTOM / 4 + 35
Text: Nickname:
TextField@NICKNAME_TEXTFIELD:
X: 270
Y: PARENT_BOTTOM / 4 + 25
Width: 150
Height: 25
Checkbox@CONNECT_AUTOMATICALLY_CHECKBOX:
X: 270
Y: PARENT_BOTTOM / 4 + 75
Height: 20
Width: 180
Font: Regular
Text: Connect Automatically
Button@CONNECT_BUTTON:
X: 430
Y: PARENT_BOTTOM / 4 + 25
Width: 100
Height: 25
Text: Connect
Font: Bold
TextField@FAKE_CHAT:
X: 205
Y: PARENT_BOTTOM + 5
Width: PARENT_RIGHT - 205
Height: 25
LeftMargin: 60
Disabled: true
Children:
Label@LABEL_CHATTYPE:
Y: 0-1
Width: 55
Height: 25
Align: Right
Text: Global:

View File

@@ -21,28 +21,28 @@ Background@SERVER_LOBBY:
DropDownButton@SLOTS_DROPDOWNBUTTON:
X: 20
Y: 291
Width: 180
Width: 200
Height: 25
Font: Bold
Text: Slot Admin
Button@PLAYERS_TAB:
X: 243
X: 225
Y: 285
Width: 120
Width: 126
Height: 31
Font: Bold
Text: Players
Button@OPTIONS_TAB:
X: 363
X: 351
Y: 285
Width: 120
Width: 126
Height: 31
Font: Bold
Text: Options
Button@MUSIC_TAB:
X: 483
X: 477
Y: 285
Width: 120
Width: 126
Height: 31
Font: Bold
Text: Music
@@ -58,49 +58,71 @@ Background@SERVER_LOBBY:
Height: 25
Text: Change Map
Font: Bold
ScrollPanel@CHAT_DISPLAY:
Button@LOBBYCHAT_TAB:
X: 20
Y: PARENT_BOTTOM - HEIGHT - 52
Y: PARENT_BOTTOM - 81
Width: 100
Height: 31
Text: Lobby
Font: Bold
Button@GLOBALCHAT_TAB:
X: 120
Y: PARENT_BOTTOM - 81
Width: 100
Height: 31
Text: Global
Font: Bold
Container@LOBBYCHAT:
X: 20
Y: PARENT_BOTTOM - HEIGHT - 50
Width: PARENT_RIGHT - 40
Height: 227
TopBottomSpacing: 2
ItemSpacing: 2
Height: 229
Children:
Container@CHAT_TEMPLATE:
Width: PARENT_RIGHT-27
Height: 16
X: 2
Y: 0
ScrollPanel@CHAT_DISPLAY:
Width: PARENT_RIGHT
Height: PARENT_BOTTOM - 30
TopBottomSpacing: 2
ItemSpacing: 2
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
TextField@CHAT_TEXTFIELD:
X: 20
Y: PARENT_BOTTOM - HEIGHT - 20
Width: PARENT_RIGHT - 300
Height: 25
LeftMargin: 50
Children:
Label@LABEL_CHATTYPE:
Y: 0-1
Width: 45
Container@CHAT_TEMPLATE:
Width: PARENT_RIGHT-27
Height: 16
X: 2
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
TextField@CHAT_TEXTFIELD:
X: 205
Y: PARENT_BOTTOM - HEIGHT
Width: PARENT_RIGHT - 205
Height: 25
Align: Right
Text: Chat:
LeftMargin: 50
Children:
Label@LABEL_CHATTYPE:
Y: 0-1
Width: 45
Height: 25
Align: Right
Text: Chat:
Container@GLOBALCHAT_ROOT:
X: 20
Y: PARENT_BOTTOM - HEIGHT - 50
Width: PARENT_RIGHT - 40
Height: 229
Button@START_GAME_BUTTON:
X: PARENT_RIGHT - WIDTH - 150
Y: PARENT_BOTTOM - HEIGHT - 20

View File

@@ -101,6 +101,7 @@ ChromeLayout:
./mods/ra/chrome/lobby-options.yaml
./mods/ra/chrome/lobby-music.yaml
./mods/ra/chrome/lobby-kickdialogs.yaml
./mods/ra/chrome/lobby-globalchat.yaml
./mods/ra/chrome/color-picker.yaml
./mods/ra/chrome/map-chooser.yaml
./mods/ra/chrome/create-server.yaml