epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3486 from pchote/misc-ui-polish

Browse Source 
Misc UI polish.
This commit is contained in:
Matthias Mailänder
2013-06-29 01:22:12 -07:00
parent 8f087878be 05030e6b98
commit e805dff16f
29 changed files with 1302 additions and 1368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mods/ra/chrome/cheats.yaml
View File

@@ -3,7 +3,7 @@ Background@CHEATS_PANEL:
X:(WINDOW_RIGHT - WIDTH)/2
Y:(WINDOW_BOTTOM - HEIGHT)/2
Width:350
Height:505
Height:475
Visible:false
Children:
Label@LABEL_TITLE:
@@ -93,21 +93,9 @@ Background@CHEATS_PANEL:
Height:20
Width:200
Text:Show Render Geometry
Checkbox@DESYNC_ARMED:
X:30
Y:412
Width:20
Height:20
Button@DESYNC:
X:60
Y:410
Width:150
Height:20
Text: Force Desync
Height:25
Button@CLOSE:
X:30
Y:450
Y:420
Width:PARENT_RIGHT - 60
Height:25
Text:Close

51
mods/ra/chrome/lobby-dialogs.yaml Normal file
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

310
mods/ra/chrome/lobby-playerbin.yaml Normal file
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

366
mods/ra/chrome/lobby.yaml
View File

@@ -6,7 +6,6 @@ Background@SERVER_LOBBY:
Height:600
Children:
ColorPreviewManager@COLOR_MANAGER:
RemapIndices: 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95
Label@SERVER_NAME:
X:0
Y:17
@@ -14,7 +13,6 @@ Background@SERVER_LOBBY:
Width:530
Height:20
Font:Bold
Text:OpenRA Multiplayer Lobby
Label@MAP_TITLE:
X:532
Y:17
@@ -35,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
@@ -491,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:

33
mods/ra/chrome/map-chooser.yaml
View File

@@ -21,43 +21,46 @@ Background@MAPCHOOSER_PANEL:
Children:
ScrollItem@MAP_TEMPLATE:
Width:180
Height:208
X:2
Height:229
X:4
Y:0
Visible:false
Children:
Background@PREVIEW_PLACEHOLDER:
X:(PARENT_RIGHT - WIDTH)/2
Y:4
Width:170
Height:170
Background:dialog3
ClickThrough:true
MapPreview@PREVIEW:
X:(PARENT_RIGHT - WIDTH)/2
Y:4
Width:170
Height:170
Label@TITLE:
X:2
Y:PARENT_BOTTOM-47
Y:PARENT_BOTTOM-48
Width:PARENT_RIGHT-4
Height:25
Align:Center
Label@DETAILS:
Width:PARENT_RIGHT-4
X:2
Y:PARENT_BOTTOM-35
Y:PARENT_BOTTOM-34
Align:Center
Height:25
Font:Tiny
Label@AUTHOR:
Width:PARENT_RIGHT-4
X:2
Y:PARENT_BOTTOM-26
Y:PARENT_BOTTOM-22
Align:Center
Height:25
Font:Tiny
Label@SIZE:
Width:PARENT_RIGHT-4
X:2
Y:PARENT_BOTTOM-17
Y:PARENT_BOTTOM-10
Align:Center
Height:25
Font:Tiny
MapPreview@PREVIEW:
X:(PARENT_RIGHT - WIDTH)/2
Y:4
Width:160
Height:160
DropDownButton@GAMEMODE_FILTER:
X:PARENT_RIGHT - 220
Y:17

37
mods/ra/chrome/settings.yaml
View File

@@ -127,7 +127,7 @@ Background@SETTINGS_MENU:
Y:210
Width:200
Height:20
Text: Try to discover routers suitable for automatic port-forwarding on startup.
Text: Enable Network Discovery (UPnP)
Container@AUDIO_PANE:
X:37
Y:100
@@ -202,35 +202,22 @@ Background@SETTINGS_MENU:
Height:PARENT_BOTTOM - 100
Visible: false
Children:
Label@RENDERER_LABEL:
X:0
Y:0
Width:75
Height:25
Text:Renderer:
DropDownButton@GRAPHICS_RENDERER:
X:80
Y:1
Width:120
Height:25
Font:Regular
Text:OpenGL
Label@MODE_LABEL:
X:0
Y:30
Y:0
Width:45
Height:25
Text:Mode:
DropDownButton@MODE_DROPDOWN:
X:50
Y:30
Y:0
Width:170
Height:25
Font:Regular
Text:Windowed
Container@WINDOW_RESOLUTION:
X:225
Y:30
Y:0
Children:
Label@At:
Text:@
@@ -258,27 +245,27 @@ Background@SETTINGS_MENU:
Height:25
MaxLength:5
Label@VIDEO_DESC:
Y:60
Y:30
Width:PARENT_RIGHT
Height:25
Font:Tiny
Align:Center
Text:Renderer/Mode/Resolution changes will be applied after the game is restarted.
Checkbox@PIXELDOUBLE_CHECKBOX:
Y:90
Y:60
Width:200
Height:20
Font:Regular
Text:Enable Pixel Doubling
Checkbox@CAPFRAMERATE_CHECKBOX:
Y:120
Y:90
Width:200
Height:20
Font:Regular
Text:Cap Framerate @
TextField@MAX_FRAMERATE:
X:150
Y:120
Y:90
Width:45
Height:25
MaxLength:3
@@ -386,15 +373,15 @@ Background@SETTINGS_MENU:
Width:300
Height:20
Text:Show Bot Debug Messages
Checkbox@IGNOREVERSIONMISMATCH_CHECKBOX:
Checkbox@VERBOSE_NAT_DISCOVERY_CHECKBOX:
X:0
Y:150
Width:300
Height:20
Text:Don't check for compatible version in game server browser.
Checkbox@VERBOSE_NAT_DISCOVERY_CHECKBOX:
Text:Detailed NAT logging
Checkbox@DEVELOPER_MENU_CHECKBOX:
X:0
Y:180
Width:300
Height:20
Text:Print very detailed information to server.log about NAT devices.
Text:Enable Asset Browser (requires restart)

1
mods/ra/metrics.yaml
View File

@@ -4,3 +4,4 @@ Metrics:
ButtonDepth: 1
ButtonFont: Regular
CheckboxPressedState: false
ColorPickerRemapIndices: 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95

2
mods/ra/mod.yaml
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