diff --git a/mods/cnc/chrome/gamelobby.yaml b/mods/cnc/chrome/gamelobby.yaml index 778a158bf6..b02df84ecf 100644 --- a/mods/cnc/chrome/gamelobby.yaml +++ b/mods/cnc/chrome/gamelobby.yaml @@ -28,182 +28,224 @@ Background@SERVER_LOBBY: Y:4 Width:244 Height:244 - Container@PLAYERS: - Id:PLAYERS + ScrollPanel@PLAYERSX: + Id:PLAYERSX X:20 - Y:75 - Width:500 - Height:200 + Y:67 + Width:504 + Height:235 Children: - Container@TEMPLATE_LOCAL: - Id:TEMPLATE_LOCAL - X:0 - Y:0 + Container@PLAYERS: + Id:PLAYERS + X:5 + Y:5 Width:500 - Height:30 - Visible:false + Height:2270 Children: - TextField@NAME: - Id:NAME - Text:Name - Width:139 - Height:25 + Container@TEMPLATE_LOCAL: + Id:TEMPLATE_LOCAL X:0 Y:0 - MaxLength:16 - Button@COLOR: - Id:COLOR - Width:65 - Height:25 - X:159 - Y:0 + Width:475 + Height:30 + Visible:false Children: - ColorBlock@COLORBLOCK: - Id:COLORBLOCK - X:5 - Y:7 - Width:PARENT_RIGHT-10 - Height:PARENT_BOTTOM-12 - Button@FACTION: - Id:FACTION - Width:110 - Height:25 - X:244 - Y:0 - Children: - Image@FACTIONFLAG: - Id:FACTIONFLAG - Width:30 - Height:15 - X:5 - Y:5 - Label@FACTIONNAME: - Id:FACTIONNAME - Text:Faction - Width:60 + TextField@NAME: + Id:NAME + Text:Name + Width:150 Height:25 - X:40 + X:0 Y:0 - Button@TEAM: - Id:TEAM - Text:Team - Width:25 - Height:25 - X:374 - Y:0 - Checkbox@STATUS: - Id:STATUS - X:455 - Y:2 - Width:20 - Height:20 - Container@TEMPLATE_REMOTE: - Id:TEMPLATE_REMOTE - X:0 - Y:0 - Width:500 - Height:30 - Visible:false - Children: - Label@NAME: - Id:NAME - Text:Name - Width:139 - Height:25 - X:0 - Y:0 - ColorBlock@COLOR: - Id:COLOR - X:164 - Y:7 - Width:55 - Height:13 - Label@FACTION: - Id:FACTION - Width:110 - Height:25 - X:244 - Y:0 - Children: - Image@FACTIONFLAG: - Id:FACTIONFLAG - Width:30 - Height:15 - X:5 - Y:5 - Label@FACTIONNAME: - Id:FACTIONNAME - Text:Faction - Width:60 + MaxLength:16 + DropDownButton@COLOR: + Id:COLOR + Width:80 Height:25 - X:40 + X:160 Y:0 - Label@TEAM: - Id:TEAM - Text:Team - Width:70 - Height:25 - X:351 - Y:0 - Align:Center - Bold: false - Checkbox@STATUS: - Id:STATUS - X:455 - Y:2 - Width:20 - Height:20 - Container@TEMPLATE_EMPTY: - Id:TEMPLATE_EMPTY - X:0 - Y:0 - Width:500 - Height:30 - Visible:false - Children: - Label@NAME: - Id:NAME - Text:Name - Width:139 - Height:25 + Children: + ColorBlock@COLORBLOCK: + Id:COLORBLOCK + X:5 + Y:6 + Width:PARENT_RIGHT-35 + Height:PARENT_BOTTOM-12 + DropDownButton@FACTION: + Id:FACTION + Width:130 + Height:25 + X:250 + Y:0 + Children: + Image@FACTIONFLAG: + Id:FACTIONFLAG + Width:30 + Height:15 + X:5 + Y:5 + Label@FACTIONNAME: + Id:FACTIONNAME + Text:Faction + Width:60 + Height:25 + X:40 + Y:0 + DropDownButton@TEAM: + Id:TEAM + Text:Team + Width:48 + Height:25 + X:390 + Y:0 + Checkbox@STATUS: + Id:STATUS + X:448 + Y:2 + Width:20 + Height:20 + Label@SPECTATOR: + Id:SPECTATOR + Text:Spectator + Width:278 + Height:25 + X:160 + Y:0 + Align:Center + Bold:True + Container@TEMPLATE_REMOTE: + Id:TEMPLATE_REMOTE X:0 Y:0 - Button@JOIN: - Id:JOIN - Text:Play in this slot - Width:PARENT_RIGHT - 160 - Height:25 - X:160 - Y:0 - Container@TEMPLATE_EMPTY_HOST: - Id:TEMPLATE_EMPTY_HOST - X:0 - Y:0 - Width:500 - Height:30 - Visible:false - Children: - DropDownButton@NAME: -- TODO: replace with dropdown - Id:NAME - Text:Name - Width:155 - Height:25 + Width:475 + Height:30 + Visible:false + Children: + Label@NAME: + Id:NAME + Text:Name + Width:145 + Height:25 + X:5 + Y:0-1 + ColorBlock@COLOR: + Id:COLOR + X:165 + Y:6 + Width:45 + Height:13 + Label@FACTION: + Id:FACTION + Width:130 + Height:25 + X:250 + Y:0 + Children: + Image@FACTIONFLAG: + Id:FACTIONFLAG + Width:30 + Height:15 + X:5 + Y:5 + Label@FACTIONNAME: + Id:FACTIONNAME + Text:Faction + Width:60 + Height:25 + X:40 + Y:0 + Label@TEAM: + Id:TEAM + Text:Team + Width:23 + Height:25 + Align:Center + X:390 + Y:0 + Checkbox@STATUS: + Id:STATUS + X:448 + Y:2 + Width:20 + Height:20 + Label@SPECTATOR: + Id:SPECTATOR + Text:Spectator + Width:278 + Height:25 + X:160 + Y:0 + Align:Center + Bold:True + Container@TEMPLATE_EMPTY: + Id:TEMPLATE_EMPTY X:0 Y:0 - Button@JOIN: - Id:JOIN - Text:Play in this slot - Width:PARENT_RIGHT - 160 - Height:25 - X:160 + Width:475 + Height:30 + Visible:false + Children: + Label@NAME: + Id:NAME + Text:Name + Width:145 + Height:25 + X:5 + Y:0-1 + Button@JOIN: + Id:JOIN + Text:Play in this slot + Width:278 + Height:25 + X:160 + Y:0 + Label@BOT: + Id:BOT + Text:Bot + Width:278 + Height:25 + X:160 + Y:0 + Align:Center + Bold:True + Container@TEMPLATE_EMPTY_HOST: + Id:TEMPLATE_EMPTY_HOST + X:0 Y:0 + Width:400 + Height:30 + Visible:false + Children: + DropDownButton@NAME: + Id:NAME + Text:Name + Width:150 + Height:25 + X:0 + Y:0 + Button@JOIN: + Id:JOIN + Text:Play in this slot + Width:278 + Height:25 + X:160 + Y:0 + Label@BOT: + Id:BOT + Text:Bot + Width:278 + Height:25 + X:160 + Y:0 + Align:Center + Bold:True Container@LABEL_CONTAINER: - X:30 - Y:45 + X:25 + Y:40 Children: Label@LABEL_LOBBY_NAME: Id:LABEL_LOBBY_NAME - Width:139 + Width:150 Height:25 X:0 Y:0 @@ -212,43 +254,42 @@ Background@SERVER_LOBBY: Bold:True Label@LABEL_LOBBY_COLOR: Id:LABEL_LOBBY_COLOR - Width:65 + Width:80 Height:25 - X:159 + X:160 Y:0 Text:Color Align:Center Bold:True Label@LABEL_LOBBY_FACTION: Id:LABEL_LOBBY_FACTION - Width:110 + Width:130 Height:25 - X:244 + X:250 Y:0 Text:Faction Align:Center Bold:True Label@LABEL_LOBBY_TEAM: Id:LABEL_LOBBY_TEAM - Width:70 + Width:48 Height:25 - X:351 + X:390 Y:0 Text:Team Align:Center Bold:True Label@LABEL_LOBBY_STATUS: Id:LABEL_LOBBY_STATUS - X:432 + X:448 Y:0 - Width:70 + Width:20 Height:25 Text:Ready - Align:Center + Align:Left Bold:True Button@CHANGEMAP_BUTTON: Id:CHANGEMAP_BUTTON - Visible:true X:PARENT_RIGHT-160 Y:PARENT_BOTTOM-269 Width:120 @@ -257,7 +298,6 @@ Background@SERVER_LOBBY: Bold:True ChatDisplay@CHAT_DISPLAY: Id:CHAT_DISPLAY - Visible:true X:20 Notification: beepy2.aud Height:230 @@ -273,14 +313,12 @@ Background@SERVER_LOBBY: Align:Right TextField@CHAT_TEXTFIELD: Id:CHAT_TEXTFIELD - Visible:true X:70 Y:PARENT_BOTTOM - 49 Width:550 Height:25 Button@START_GAME_BUTTON: Id:START_GAME_BUTTON - Visible:true X:PARENT_RIGHT-160 Y:PARENT_BOTTOM-49 Width:120 @@ -289,7 +327,6 @@ Background@SERVER_LOBBY: Bold:True Button@DISCONNECT_BUTTON: Id:DISCONNECT_BUTTON - Visible:true X:PARENT_RIGHT-160 Y:PARENT_BOTTOM-189 Width:120 @@ -298,100 +335,89 @@ Background@SERVER_LOBBY: Bold:True Checkbox@LOCKTEAMS_CHECKBOX: Id:LOCKTEAMS_CHECKBOX - Visible: true X: PARENT_RIGHT-160 Y: PARENT_BOTTOM-229 Width: 80 Height: 20 Text: Lock Teams - Background@COLOR_CHOOSER: - Id:COLOR_CHOOSER - Width:500 - Height:195 - X:(WINDOW_RIGHT - WIDTH)/2 - PARENT_LEFT - Y:100 - Visible:false - Children: - Button@BUTTON_OK: - Id:BUTTON_OK - X:PARENT_RIGHT - 180 - Y:PARENT_BOTTOM - 45 - Width:160 - Height:25 - Text:Ok - Bold:True - ShpImage@MCV: - Id:MCV - X:PARENT_RIGHT - 90 - Y:20 - Image:mcv - Frame:8 - Palette:colorpicker - ShpImage@FACT: - Id:FACT - X:PARENT_RIGHT - 100 - Y:70 - Image:fact - Palette:colorpicker - Label@HUE_LABEL: - X:0 - Y:30 - Width:110 - Height:20 - Align: Right - Text: Hue: - Slider@HUE: - Id:HUE_SLIDER - X:120 - Y:30 - Width:260 - Height:20 - Ticks:5 - Label@SAT_LABEL: - X:0 - Y:60 - Width:110 - Height:20 - Align: Right - Text: Saturation: - Slider@SAT: - Id:SAT_SLIDER - X:120 - Y:60 - Width:260 - Height:20 - Ticks:5 - Label@LUM_LABEL: - X:0 - Y:90 - Width:110 - Height:20 - Align: Right - Text: Brightness: - Slider@LUM: - Id:LUM_SLIDER - X:120 - Id:LUM_SLIDER - Y:90 - Width:260 - Height:20 - Ticks:5 - Range:0.2,1 - Label@RANGE_LABEL: - X:0 - Y:120 - Width:110 - Height:20 - Align: Right - Text: Range: - Slider@RANGE: - Id:RANGE_SLIDER - X:120 - Y:120 - Width:260 - Height:20 - Ticks:5 - Range:0,0.25 +Background@COLOR_CHOOSER: + Id:COLOR_CHOOSER + Background:dialog2 + Width:310 + Height:120 + Children: + Button@BUTTON_OK: + Id:BUTTON_OK + X:210 + Y:85 + Width:90 + Height:25 + Text:Ok + Bold:True + ShpImage@FACT: + Id:FACT + X:220 + Y:10 + Image:fact + Palette:colorpicker + Label@HUE_LABEL: + X:0 + Y:5 + Width:40 + Height:20 + Align: Right + Text: Hue: + Slider@HUE: + Id:HUE_SLIDER + X:43 + Y:10 + Width:160 + Height:20 + Ticks:5 + Label@SAT_LABEL: + X:0 + Y:30 + Width:40 + Height:20 + Align: Right + Text: Sat: + Slider@SAT: + Id:SAT_SLIDER + X:43 + Y:35 + Width:160 + Height:20 + Ticks:5 + Label@LUM_LABEL: + X:0 + Y:55 + Width:40 + Height:20 + Align: Right + Text: Lum: + Slider@LUM: + Id:LUM_SLIDER + X:43 + Y:60 + Width:160 + Height:20 + Ticks:5 + Range:0.2,1 + Label@RANGE_LABEL: + X:0 + Y:80 + Width:40 + Height:20 + Align: Right + Text: Ran: + Slider@RANGE: + Id:RANGE_SLIDER + X:43 + Y:85 + Width:160 + Height:20 + Ticks:5 + Range:0,0.25 Background@MAP_CHOOSER: Id:MAP_CHOOSER X:(WINDOW_RIGHT - WIDTH)/2 @@ -515,4 +541,4 @@ Background@MAP_CHOOSER: Width:160 Height:25 Text:Cancel - Bold:True \ No newline at end of file + Bold:True diff --git a/mods/cnc/chrome/ingame.yaml b/mods/cnc/chrome/ingame.yaml index 476533d50d..892c0c7993 100644 --- a/mods/cnc/chrome/ingame.yaml +++ b/mods/cnc/chrome/ingame.yaml @@ -294,6 +294,136 @@ Container@INGAME_ROOT: Width:200 Height:20 Text: Give Exploration +Container@OBSERVER_ROOT: + Id:OBSERVER_ROOT + Visible:true + Delegate:IngameObserverChromeDelegate + Children: + WorldInteractionController: + X:0 + Y:0 + Width:WINDOW_RIGHT + Height:WINDOW_BOTTOM + ViewportScrollController: + X:0 + Y:0 + Width:WINDOW_RIGHT + Height:WINDOW_BOTTOM + Timer@GAME_TIMER: + Id:GAME_TIMER + X: WINDOW_RIGHT/2 + Y: 10 + Background@POSTGAME_BG: + Id:POSTGAME_BG + X:(WINDOW_RIGHT - WIDTH)/2 + Y:(WINDOW_BOTTOM - HEIGHT)/2 + Width:400 + Height:100 + Background:dialog4 + Visible:false + Children: + Label@TEXT: + Id:TEXT + X:(PARENT_RIGHT - WIDTH)/2 + Y:(PARENT_BOTTOM - HEIGHT)/2 + Width:200 + Height:40 + Align:Center + Bold:True + SpecialPowerBin@INGAME_POWERS_BIN: + Id:INGAME_POWERS_BIN + X:0 + Y:25 + Button@INGAME_OPTIONS_BUTTON: + Id:INGAME_OPTIONS_BUTTON + X:0 + Y:0 + Width:160 + Height:25 + Text:Options + Bold:True + WorldTooltip: + Background@INGAME_OPTIONS_BG: + Id:INGAME_OPTIONS_BG + X:(WINDOW_RIGHT - WIDTH)/2 + Y:(WINDOW_BOTTOM - HEIGHT)/2 + Width:300 + Height:320 + Visible:false + Children: + Label@LABEL_TITLE: + Id:LABEL_TITLE + X:(PARENT_RIGHT - WIDTH)/2 + Y:20 + Width:250 + Height:25 + Text:Options + Align:Center + Bold:True + Button@RESUME: + Id:RESUME + X:(PARENT_RIGHT - WIDTH)/2 + Y:60 + Width:160 + Height:25 + Text:Resume + Bold:True + Button@SETTINGS: + Id:SETTINGS + X:(PARENT_RIGHT - WIDTH)/2 + Y:100 + Width:160 + Height:25 + Text:Settings + Bold:True + Button@MUSIC: + Id:MUSIC + X:(PARENT_RIGHT - WIDTH)/2 + Y:140 + Width:160 + Height:25 + Text:Music + Bold:True + Button@SURRENDER: + Id:SURRENDER + X:(PARENT_RIGHT - WIDTH)/2 + Y:180 + Width:160 + Height:25 + Text:Surrender + Bold:True + Button@DISCONNECT: + Id:DISCONNECT + X:(PARENT_RIGHT - WIDTH)/2 + Y:220 + Width:160 + Height:25 + Text:Disconnect + Bold:True + Button@QUIT: + Id:QUIT + X:(PARENT_RIGHT - WIDTH)/2 + Y:260 + Width:160 + Height:25 + Text:Quit + Bold:True + ChatDisplay@CHAT_DISPLAY: + Id:CHAT_DISPLAY + X:250 + Y:WINDOW_BOTTOM - HEIGHT - 30 + Width: 760 + Height: 200 + ClickThrough: True + DrawBackground: False + RemoveTime:250 + ChatEntry@CHAT_ENTRY: + Id:CHAT_ENTRY + X:250 + Y:WINDOW_BOTTOM - HEIGHT + Width: 760 + Height: 30 + ClickThrough: True Background@FMVPLAYER: Id:FMVPLAYER Width:WINDOW_RIGHT diff --git a/mods/ra/chrome/gamelobby.yaml b/mods/ra/chrome/gamelobby.yaml index 6f0f389c3f..1b2db6d0d1 100644 --- a/mods/ra/chrome/gamelobby.yaml +++ b/mods/ra/chrome/gamelobby.yaml @@ -5,7 +5,6 @@ Background@SERVER_LOBBY: Y:(WINDOW_BOTTOM - HEIGHT)/2 Width:800 Height:600 - Visible:true Children: Label@LOBBY_TITLE: Id:LOBBY_TITLE @@ -291,7 +290,6 @@ Background@SERVER_LOBBY: Bold:True Button@CHANGEMAP_BUTTON: Id:CHANGEMAP_BUTTON - Visible:true X:PARENT_RIGHT-160 Y:PARENT_BOTTOM-269 Width:120 @@ -300,7 +298,6 @@ Background@SERVER_LOBBY: Bold:True ChatDisplay@CHAT_DISPLAY: Id:CHAT_DISPLAY - Visible:true X:20 Notification: rabeep1.aud Height:230 @@ -316,14 +313,12 @@ Background@SERVER_LOBBY: Align:Right TextField@CHAT_TEXTFIELD: Id:CHAT_TEXTFIELD - Visible:true X:70 Y:PARENT_BOTTOM - 49 Width:550 Height:25 Button@START_GAME_BUTTON: Id:START_GAME_BUTTON - Visible:true X:PARENT_RIGHT-160 Y:PARENT_BOTTOM-49 Width:120 @@ -332,7 +327,6 @@ Background@SERVER_LOBBY: Bold:True Button@DISCONNECT_BUTTON: Id:DISCONNECT_BUTTON - Visible:true X:PARENT_RIGHT-160 Y:PARENT_BOTTOM-189 Width:120 @@ -341,7 +335,6 @@ Background@SERVER_LOBBY: Bold:True Checkbox@LOCKTEAMS_CHECKBOX: Id:LOCKTEAMS_CHECKBOX - Visible: true X: PARENT_RIGHT-160 Y: PARENT_BOTTOM-229 Width: 80 @@ -352,7 +345,6 @@ Background@COLOR_CHOOSER: Background:dialog2 Width:310 Height:120 - Visible:false Children: Button@BUTTON_OK: Id:BUTTON_OK @@ -433,7 +425,6 @@ Background@MAP_CHOOSER: Delegate:MapChooserDelegate Width:800 Height:600 - Visible:true Children: Label@MAPCHOOSER_TITLE: X:0 diff --git a/mods/ra/chrome/ingame.yaml b/mods/ra/chrome/ingame.yaml index dff879caef..d4d3ca238f 100644 --- a/mods/ra/chrome/ingame.yaml +++ b/mods/ra/chrome/ingame.yaml @@ -1,7 +1,6 @@ Container@INGAME_ROOT: Id:INGAME_ROOT Delegate:IngameChromeDelegate - Visible:true Children: WorldInteractionController: Id:INTERACTION_CONTROLLER @@ -432,3 +431,15 @@ Container@OBSERVER_ROOT: Width: 760 Height: 30 ClickThrough: True +Background@FMVPLAYER: + Id:FMVPLAYER + Width:WINDOW_RIGHT + Height:WINDOW_BOTTOM + Background:dialog4 + Children: + VqaPlayer: + Id:PLAYER + X:0 + Y:0 + Width:WINDOW_RIGHT + Height:WINDOW_BOTTOM \ No newline at end of file diff --git a/mods/ra/chrome/mainmenu.yaml b/mods/ra/chrome/mainmenu.yaml index 21dee47944..190bb0aee8 100644 --- a/mods/ra/chrome/mainmenu.yaml +++ b/mods/ra/chrome/mainmenu.yaml @@ -136,7 +136,6 @@ Background@MUSIC_MENU: Y:(WINDOW_BOTTOM - HEIGHT)/2 Width: 450 Height: 250 - Visible: true Children: Label@SETTINGS_LABEL_TITLE: Id:SETTINGS_LABEL_TITLE @@ -283,4 +282,4 @@ Background@MUSIC_MENU: Y:140 Width:100 Height:20 - Text:Loop + Text:Loop \ No newline at end of file diff --git a/mods/ra/chrome/settings.yaml b/mods/ra/chrome/settings.yaml index aeaf5d6035..633ac47b0e 100644 --- a/mods/ra/chrome/settings.yaml +++ b/mods/ra/chrome/settings.yaml @@ -5,7 +5,6 @@ Background@SETTINGS_MENU: Y:(WINDOW_BOTTOM- HEIGHT)/2 Width: 450 Height: 350 - Visible: true Children: Label@SETTINGS_LABEL_TITLE: Id:SETTINGS_LABEL_TITLE diff --git a/mods/ra/chrome/videoplayer.yaml b/mods/ra/chrome/videoplayer.yaml index 08448de714..38eeff162a 100644 --- a/mods/ra/chrome/videoplayer.yaml +++ b/mods/ra/chrome/videoplayer.yaml @@ -5,7 +5,6 @@ Background@VIDEOPLAYER_MENU: Y:(WINDOW_BOTTOM- HEIGHT)/2 Width: 700 Height: 680 - Visible: false Children: Label@VIDEOPLAYER_TITLE: X:0