Merge pull request #4942 from pchote/more-replays

Overhaul observer shroud selector.
This commit is contained in:
Matthias Mailänder
2014-03-22 12:20:40 +01:00
17 changed files with 514 additions and 31 deletions

View File

@@ -40,4 +40,41 @@ ScrollPanel@TEAM_DROPDOWN_TEMPLATE:
X:0
Width:PARENT_RIGHT
Height:25
Align:Center
Align:Center
ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE:
Width:DROPDOWN_WIDTH
Children:
ScrollItem@HEADER:
BaseName:scrollheader
Width:PARENT_RIGHT-27
Height:13
X:2
Y:0
Visible:false
Children:
Label@LABEL:
Font:TinyBold
Width:PARENT_RIGHT
Height:10
Align:Center
ScrollItem@TEMPLATE:
Width:PARENT_RIGHT-27
Height:25
X:2
Y:0
Visible:false
Children:
Image@FLAG:
X:4
Y:4
Width:32
Height:16
Label@LABEL:
X:40
Width:60
Height:25
Label@NOFLAG_LABEL:
X:5
Width:PARENT_RIGHT
Height:25

View File

@@ -33,6 +33,21 @@ Container@OBSERVER_WIDGETS:
Width:220
Height:25
Font:Bold
Children:
LogicKeyListener@SHROUD_KEYHANDLER:
Image@FLAG:
X:4
Y:4
Width:32
Height:16
Label@LABEL:
X:40
Width:60
Height:25
Label@NOFLAG_LABEL:
X:5
Width:PARENT_RIGHT
Height:25
Container@REPLAY_PLAYER:
Logic:ReplayControlBarLogic
X:PARENT_RIGHT/2 - 80

View File

@@ -1,5 +1,7 @@
Container@PLAYER_WIDGETS:
Children:
LogicKeyListener@CONTROLGROUP_KEYHANDLER:
Logic:ControlGroupLogic
LogicTicker@SIDEBAR_TICKER:
Button@INGAME_DIPLOMACY_BUTTON:
X:162