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

Widget fixes
This commit is contained in:
Matthias Mailänder
2013-07-08 10:39:25 -07:00
23 changed files with 431 additions and 580 deletions

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

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:

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

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 74 KiB