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

Merge pull request #3525 from pchote/ra-widget-cleanup

Browse Source 
Widget fixes
This commit is contained in:
Matthias Mailänder
2013-07-08 10:39:25 -07:00
parent f0f64010ec ec15aa5ee4
commit a90b3a9cd3
23 changed files with 431 additions and 580 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mods/cnc/chrome.yaml
View File

@@ -422,8 +422,8 @@ strategic: strategic.png
player_owned: 96,0,32,32
sidebar-bits: chrome.png
left-indicator: 320,40,11,8
right-indicator: 325,40,11,8
indicator-left: 400,48,16,8
indicator-right: 400,56,16,8
production-icons: chrome.png
building: 384,0,16,16

6
mods/cnc/chrome/dialogs.yaml
View File

@@ -215,19 +215,19 @@ Background@LOBBY_OPTIONS_BIN:
Checkbox@ALLOWCHEATS_CHECKBOX:
X:150
Y:80
Width:80
Width:230
Height:20
Text:Enable Cheats / Debug Menu
Checkbox@CRATES_CHECKBOX:
X:150
Y:110
Width:80
Width:230
Height:20
Text:Enable Crates
Checkbox@FRAGILEALLIANCES_CHECKBOX:
X:150
Y:140
Width:80
Width:230
Height:20
Text:Allow Team Changes
Label@DIFFICULTY_DESC:

6
mods/cnc/chrome/ingame.yaml
View File

@@ -81,7 +81,7 @@ Container@OBSERVER_WIDGETS:
Visible:true
Container@PLAYER_WIDGETS:
Children:
LogicTicker@WIN_LOSS_WATCHER:
LogicTicker@SIDEBAR_TICKER:
WorldCommand:
Width:WINDOW_RIGHT
Height:WINDOW_BOTTOM
@@ -146,7 +146,7 @@ Container@PLAYER_WIDGETS:
Height:168
Background:panel-gray
Children:
Radar:
Radar@RADAR_MINIMAP:
X:1
Y:1
Width:PARENT_RIGHT-2
@@ -165,6 +165,7 @@ Container@PLAYER_WIDGETS:
Width:PARENT_RIGHT-2
Height:PARENT_BOTTOM-2
TooltipContainer:TOOLTIP_CONTAINER
IndicatorImage:indicator-left
Background@SILOBAR_PANEL:
X:180
Y:5
@@ -178,6 +179,7 @@ Container@PLAYER_WIDGETS:
Width:PARENT_RIGHT-2
Height:PARENT_BOTTOM-2
TooltipContainer:TOOLTIP_CONTAINER
IndicatorImage:indicator-right
Label@CASH:
Y:170
Width:PARENT_RIGHT

12
mods/cnc/chrome/lobby.yaml
View File

@@ -90,17 +90,17 @@ Container@SERVER_LOBBY:
Align:Left
Font:Bold
Container@PLAYER_BIN_ROOT:
Button@OPTIONS_BUTTON:
X:15
Y:254
Width:112
Height:25
DropDownButton@SLOTS_DROPDOWNBUTTON:
X:132
X:15
Y:254
Width:150
Height:25
Text:Slot Admin
Button@OPTIONS_BUTTON:
X:170
Y:254
Width:112
Height:25
Button@CHANGEMAP_BUTTON:
X:287
Y:254

BIN
mods/cnc/uibits/chrome.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 74 KiB

28
mods/d2k/chrome.yaml
View File

@@ -2,15 +2,10 @@ chrome-atreides: chrome-atreides.png
specialbin-top: 0,0,30,51
specialbin-middle: 0,51,30,51
specialbin-bottom: 0,153,30,39
moneybin: 192,0,320,32
moneybin: 192,0,320,31
radar: 297,31,210,222
tooltip-bg: 0,288,272,136
radar-atreides: chrome-atreides.png
left: 297,31,9,192
right: 498,31,9,192
bottom: 297,223,210,30
bg: 306,31,192,192
power-atreides: chrome-atreides.png
power-indicator: 187,4,4,7
@@ -44,16 +39,10 @@ chrome-harkonnen: chrome-harkonnen.png
specialbin-top: 0,0,30,51
specialbin-middle: 0,51,30,51
specialbin-bottom: 0,153,30,39
moneybin: 192,0,320,32
moneybin: 192,0,320,31
radar: 297,31,210,222
tooltip-bg: 0,288,272,136
radar-harkonnen: chrome-harkonnen.png
left: 297,31,9,192
right: 498,31,9,192
bottom: 297,223,210,30
bg: 306,31,192,192
power-indicator: 187,4,4,7
power-harkonnen: chrome-harkonnen.png
power-indicator: 187,4,4,7
@@ -87,15 +76,10 @@ chrome-ordos: chrome-ordos.png
specialbin-top: 0,0,30,51
specialbin-middle: 0,51,30,51
specialbin-bottom: 0,153,30,39
moneybin: 192,0,320,32
moneybin: 192,0,320,31
radar: 297,31,210,222
tooltip-bg: 0,288,272,136
radar-ordos: chrome-ordos.png
left: 297,31,9,192
right: 498,31,9,192
bottom: 297,223,210,30
bg: 306,31,192,192
power-ordos: chrome-ordos.png
power-indicator: 187,4,4,7

11
mods/d2k/chrome/tooltips.yaml
View File

@@ -1,3 +1,14 @@
Background@SIMPLE_TOOLTIP:
Logic:SimpleTooltipLogic
Background:dialog3
Height:31
Children:
Label@LABEL:
X:5
Y:3
Height:23
Font:Bold
Background@SPAWN_TOOLTIP:
Logic:SpawnSelectorTooltipLogic
Background:dialog3

19
mods/ra/chrome.yaml
View File

@@ -2,15 +2,10 @@ chrome-allies: chrome-allies.png
specialbin-top: 0,0,30,51
specialbin-middle: 0,51,30,51
specialbin-bottom: 0,153,30,39
moneybin: 192,0,320,32
moneybin: 192,0,320,31
radar: 297,31,210,222
tooltip-bg: 0,288,272,136
radar-allies: chrome-allies.png
left: 297,31,9,192
right: 498,31,9,192
bottom: 297,223,210,30
bg: 306,31,192,192
power-allies: chrome-allies.png
power-indicator: 187,4,4,7
@@ -44,16 +39,10 @@ chrome-soviet: chrome-soviet.png
specialbin-top: 0,0,30,51
specialbin-middle: 0,51,30,51
specialbin-bottom: 0,153,30,39
moneybin: 192,0,320,32
moneybin: 192,0,320,31
radar: 297,31,210,222
tooltip-bg: 0,288,272,136
radar-soviet: chrome-soviet.png
left: 297,31,9,192
right: 498,31,9,192
bottom: 297,223,210,30
bg: 306,31,192,192
power-indicator: 187,4,4,7
power-soviet: chrome-soviet.png
power-indicator: 187,4,4,7

29
mods/ra/chrome/ingame.yaml
View File

@@ -51,10 +51,11 @@ Container@INGAME_ROOT:
Y:205
Width:170
Height:40
TooltipContainer@TOOLTIP_CONTAINER:
Container@PLAYER_WIDGETS:
Children:
LogicTicker@WIN_LOSS_WATCHER:
LogicTicker@SIDEBAR_TICKER:
Button@INGAME_DIPLOMACY_BUTTON:
X:162
Y:0
@@ -81,9 +82,29 @@ Container@PLAYER_WIDGETS:
Visible:false
Font:Bold
Key: f3
RadarBin@INGAME_RADAR_BIN:
WorldInteractionController:INTERACTION_CONTROLLER
PowerBin@INGAME_POWER_BIN:
SlidingContainer@INGAME_RADAR_BIN:
X:WINDOW_RIGHT-215
Y:0
OpenOffset:0,29
ClosedOffset:0,-166
AnimationLength:15
Children:
Image@RADAR_BIN_BG:
ImageName:radar
Radar@RADAR_MINIMAP:
WorldInteractionController:INTERACTION_CONTROLLER
X:9
Width:192
Height:192
ResourceBar@POWERBAR:
X:42
Y:205
Width:138
Height:5
TooltipContainer:TOOLTIP_CONTAINER
IndicatorImage:power-indicator
Orientation:Horizontal
Style:Bevelled
MoneyBin@INGAME_MONEY_BIN:
X:WINDOW_RIGHT - WIDTH
Y:0

6
mods/ra/chrome/lobby-dialogs.yaml
View File

@@ -68,19 +68,19 @@ Background@LOBBY_OPTIONS_BIN:
Checkbox@ALLOWCHEATS_CHECKBOX:
X:150
Y:80
Width:80
Width:220
Height:20
Text:Enable Cheats / Debug Menu
Checkbox@CRATES_CHECKBOX:
X:150
Y:110
Width:80
Width:220
Height:20
Text:Enable Crates
Checkbox@FRAGILEALLIANCES_CHECKBOX:
X:150
Y:140
Width:80
Width:220
Height:20
Text:Allow Team Changes
Label@DIFFICULTY_DESC:

11
mods/ra/chrome/tooltips.yaml
View File

@@ -1,3 +1,14 @@
Background@SIMPLE_TOOLTIP:
Logic:SimpleTooltipLogic
Background:dialog4
Height:29
Children:
Label@LABEL:
X:7
Y:2
Height:23
Font:Bold
Background@SPAWN_TOOLTIP:
Logic:SpawnSelectorTooltipLogic
Background:dialog4