Adjust chrome.png and yaml layout.

Also cleans up stray whitespace.
This commit is contained in:
Paul Chote
2017-08-05 21:09:28 +00:00
committed by reaperrr
parent 2f66f83051
commit 7997a24559
3 changed files with 111 additions and 161 deletions

View File

@@ -6,66 +6,61 @@ sidebar-gdi: chrome.png
background-top: 0,0,235,260
background-iconrow: 0,260,235,52
background-bottom: 0,312,235,26
background-supportoverlay: 168,392,64,48
sidebar-button-gdi: chrome.png
background: 265,289,30,31
background: 235,119,30,31
sidebar-button-gdi-hover: chrome.png
background: 265,321,30,31
background: 235,150,30,31
sidebar-button-gdi-pressed: chrome.png
background: 265,353,30,31
background: 235,181,30,31
sidebar-button-gdi-highlighted: chrome.png
background: 265,385,30,31
background: 235,212,30,31
sidebar-button-gdi-highlighted-hover: chrome.png
background: 265,417,30,31
background: 235,243,30,31
sidebar-button-gdi-highlighted-pressed: chrome.png
background: 265,449,30,31
background: 235,274,30,31
sidebar-button-gdi-highlighted-disabled: chrome.png
background: 265,481,30,31
background: 235,305,30,31
sidebar-button-gdi-disabled: chrome.png
background: 265,481,30,31
background: 235,305,30,31
scrollup-buttons-gdi: chrome.png
background: 0,363,34,27
background: 0,338,34,27
scrollup-buttons-gdi-hover: chrome.png
background: 35,363,34,27
background: 34,338,34,27
scrollup-buttons-gdi-pressed: chrome.png
background: 70,363,34,27
background: 66,338,34,27
scrollup-buttons-gdi-highlighted: chrome.png
background: 35,363,34,27
background: 34,338,34,27
scrollup-buttons-gdi-highlighted-hover: chrome.png
background: 35,363,34,27
background: 34,338,34,27
scrollup-buttons-gdi-highlighted-pressed: chrome.png
background: 70,363,34,27
background: 66,338,34,27
scrollup-button-gdi-highlighted-disabled: chrome.png
background: 0,363,34,27
background: 0,338,34,27
scrollup-buttons-gdi-disabled: chrome.png
background: 0,363,34,27
background: 0,338,34,27
scrolldown-buttons-gdi: chrome.png
background: 105,363,34,27
background: 102,338,34,27
scrolldown-buttons-gdi-hover: chrome.png
background: 140,363,34,27
background: 136,338,34,27
scrolldown-buttons-gdi-pressed: chrome.png
background: 175,363,34,27
background: 170,338,34,27
scrolldown-buttons-gdi-highlighted: chrome.png
background: 140,363,34,27
background: 136,338,34,27
scrolldown-buttons-gdi-highlighted-hover: chrome.png
background: 140,363,34,27
background: 136,338,34,27
scrolldown-buttons-gdi-highlighted-pressed: chrome.png
background: 175,363,34,27
background: 170,338,34,27
scrolldown-button-gdi-highlighted-disabled: chrome.png
background: 105,363,34,27
background: 102,338,34,27
scrolldown-buttons-gdi-disabled: chrome.png
background: 105,363,34,27
background: 102,338,34,27
radar-gdi: chrome.png
insignia: 1,392,164,119
insignia: 235,0,164,119
production-icons-gdi: chrome.png
building: 416,0,16,16
building-disabled: 432,0,16,16
@@ -84,35 +79,25 @@ production-icons-gdi: chrome.png
air-alert: 448,64,16,16
order-icons-gdi: chrome.png
debug: 296,289,30,31
debug-disabled: 327,289,30,31
debug-active: 296,289,30,31
repair: 296,321,30,31
repair-disabled: 327,321,30,31
repair-active: 296,321,30,31
sell: 296,353,30,31
sell-disabled: 327,353,30,31
sell-active: 296,353,30,31
options: 296,385,30,31
options-disabled: 327,385,30,31
options-active: 296,385,30,31
beacon: 296,417,30,31
beacon-disabled: 327,417,30,31
beacon-active: 296,417,30,31
power: 296,449,30,31
power-disabled: 327,449,30,31
power-active: 296,449,30,31
diplomacy: 296,481,30,31
diplomacy-disabled: 327,481,30,31
diplomacy-active: 296,481,30,31
debug: 265,119,30,31
debug-disabled: 295,119,30,31
debug-active: 265,119,30,31
repair: 265,150,30,31
repair-disabled: 295,150,30,31
repair-active: 265,150,30,31
sell: 265,181,30,31
sell-disabled: 295,181,30,31
sell-active: 265,181,30,31
options: 265,212,30,31
options-disabled: 295,212,30,31
options-active: 265,212,30,31
beacon: 265,243,30,31
beacon-disabled: 295,243,30,31
beacon-active: 265,243,30,31
power: 265,274,30,31
power-disabled: 295,274,30,31
power-active: 265,274,30,31
# make this paragraph AddFactionSuffixLogic compatible
sidebar-bits-gdi: chrome.png
production-tooltip-time: 416,208,16,16
production-tooltip-power: 480,160,16,16
production-tooltip-cost: 480,144,16,16
production-iconoverlay: 168,392,64,48
power-icons-gdi: chrome.png
power-normal: 480,160,16,16
power-critical: 496,160,16,16
@@ -120,8 +105,7 @@ power-icons-gdi: chrome.png
cash-icons-gdi: chrome.png
cash-normal: 480,144,16,16
cash-critical: 496,144,16,16
# ----------------------------------------------------------------------
# NOD
# ----------------------------------------------------------------------
@@ -130,63 +114,60 @@ sidebar-nod: chrome.png
background-top: 512,0,235,260
background-iconrow: 512,260,235,52
background-bottom: 512,312,235,26
background-supportoverlay: 168,392,64,48
sidebar-button-nod: chrome.png
background: 777,289,30,31
background: 747,119,30,31
sidebar-button-nod-hover: chrome.png
background: 777,321,30,31
background: 747,150,30,31
sidebar-button-nod-pressed: chrome.png
background: 777,353,30,31
background: 747,181,30,31
sidebar-button-nod-highlighted: chrome.png
background: 777,385,30,31
background: 747,212,30,31
sidebar-button-nod-highlighted-hover: chrome.png
background: 777,417,30,31
background: 747,243,30,31
sidebar-button-nod-highlighted-pressed: chrome.png
background: 777,449,30,31
background: 747,274,30,31
sidebar-button-nod-highlighted-disabled: chrome.png
background: 777,481,30,31
background: 747,305,30,31
sidebar-button-nod-disabled: chrome.png
background: 777,481,30,31
background: 747,305,30,31
scrollup-buttons-nod: chrome.png
background: 512,364,34,27
background: 512,338,34,27
scrollup-buttons-nod-hover: chrome.png
background: 547,364,34,27
background: 546,338,34,27
scrollup-buttons-nod-pressed: chrome.png
background: 582,364,34,27
background: 580,338,34,27
scrollup-buttons-nod-highlighted: chrome.png
background: 547,364,34,27
background: 546,338,34,27
scrollup-buttons-nod-highlighted-hover: chrome.png
background: 547,364,34,27
background: 546,338,34,27
scrollup-buttons-nod-highlighted-pressed: chrome.png
background: 582,364,34,27
background: 580,338,34,27
scrollup-button-nod-highlighted-disabled: chrome.png
background: 512,364,34,27
background: 512,338,34,27
scrollup-buttons-nod-disabled: chrome.png
background: 512,364,34,27
background: 512,338,34,27
scrolldown-buttons-nod: chrome.png
background: 617,364,34,27
background: 614,338,34,27
scrolldown-buttons-nod-hover: chrome.png
background: 652,364,34,27
background: 648,338,34,27
scrolldown-buttons-nod-pressed: chrome.png
background: 687,364,34,27
background: 682,338,34,27
scrolldown-buttons-nod-highlighted: chrome.png
background: 652,364,34,27
background: 648,338,34,27
scrolldown-buttons-nod-highlighted-hover: chrome.png
background: 652,364,34,27
background: 648,338,34,27
scrolldown-buttons-nod-highlighted-pressed: chrome.png
background: 687,364,34,27
background: 682,338,34,27
scrolldown-button-nod-highlighted-disabled: chrome.png
background: 617,364,34,27
background: 614,338,34,27
scrolldown-buttons-nod-disabled: chrome.png
background: 617,364,34,27
background: 614,338,34,27
radar-nod: chrome.png
insignia: 513,392,164,119
insignia: 747,0,164,119
production-icons-nod: chrome.png
building: 928,0,16,16
@@ -194,7 +175,7 @@ production-icons-nod: chrome.png
building-alert: 960,0,16,16
defense: 928,16,16,16
defense-disabled: 944,16,16,16
defense-alert: 960,16,16,16
defense-alert: 960,16,16,16
infantry: 928,32,16,16
infantry-disabled: 944,32,16,16
infantry-alert: 960,32,16,16
@@ -206,34 +187,27 @@ production-icons-nod: chrome.png
air-alert: 960,64,16,16
order-icons-nod: chrome.png
debug: 808,289,30,31
debug-disabled: 839,289,30,31
debug-active: 808,808,30,31
repair: 808,321,30,31
repair-disabled: 839,321,30,31
repair-active: 808,321,30,31
sell: 808,353,30,31
sell-disabled: 839,353,30,31
sell-active: 808,353,30,31
options: 808,385,30,31
options-disabled: 839,385,30,31
options-active: 808,385,30,31
beacon: 808,417,30,31
beacon-disabled: 839,417,30,31
beacon-active: 808,417,30,31
power: 808,449,30,31
power-disabled: 839,449,30,31
power-active: 808,449,30,31
diplomacy: 808,481,30,31
diplomacy-disabled: 839,481,30,31
diplomacy-active: 808,481,30,31
# make this paragraph AddFactionSuffixLogic compatible
sidebar-bits-nod: chrome.png
production-tooltip-time: 928,208,16,16
production-tooltip-power: 992,160,16,16
production-tooltip-cost: 992,144,16,16
production-iconoverlay: 168,392,64,48
debug: 777,119,30,31
debug-disabled: 807,119,30,31
debug-active: 777,119,30,31
repair: 777,150,30,31
repair-disabled: 807,150,30,31
repair-active: 777,150,30,31
sell: 777,181,30,31
sell-disabled: 807,181,30,31
sell-active: 777,181,30,31
options: 777,212,30,31
options-disabled: 807,212,30,31
options-active: 777,212,30,31
beacon: 777,243,30,31
beacon-disabled: 807,243,30,31
beacon-active: 777,243,30,31
power: 777,274,30,31
power-disabled: 807,274,30,31
power-active: 777,274,30,31
diplomacy: 777,305,30,31
diplomacy-disabled: 807,305,30,31
diplomacy-active: 777,305,30,31
power-icons-nod: chrome.png
power-normal: 992,160,16,16
@@ -246,26 +220,25 @@ cash-icons-nod: chrome.png
# ----------------------------------------------------------------------
# GENERIC
# ----------------------------------------------------------------------
# make this paragraph AddFactionSuffixLogic compatible
sidebar-bits: chrome.png
production-tooltip-time: 416,208,16,16
production-tooltip-time: 464,128,16,16
production-tooltip-power: 480,160,16,16
production-tooltip-cost: 480,144,16,16
production-iconoverlay: 168,392,64,48
scrollbar: buttons.png
down_arrow: 16,140,16,16
down_pressed: 16,140,16,16
up_arrow: 32,140,16,16
up_pressed: 32,140,16,16
up_pressed: 32,140,16,16
flags: buttons.png
gdi: 30,112,30,15
nod: 0,112,30,15
Random: 60,112,30,15
spectator: 60,112,30,15
spectator: 60,112,30,15
lobby-bits: buttons.png
spawn-unclaimed: 159,5,23,22
spawn-claimed: 127,5,23,22
@@ -289,12 +262,11 @@ music: buttons.png
prev: 110,193,25,25
fastforward: 131,193,25,25
slowmo: 159,193,25,25
# ----------------------------------------------------------------------
# Other UI stuff
# ----------------------------------------------------------------------
# Used for the menu
dialog: dialog.png
background: 0,0,480,480
@@ -307,7 +279,7 @@ dialog: dialog.png
corner-bl: 437,481,21,21
corner-br: 459,481,21,21
# Same as a normal button
# Same as a normal button
dialog2: dialog.png
background: 513,1,126,126
border-r: 639,1,1,126
@@ -319,7 +291,7 @@ dialog2: dialog.png
corner-bl: 512,127,1,1
corner-br: 639,127,1,1
# Same as a pressed button
# Same as a pressed button
dialog3: dialog.png
background: 641,1,126,126
border-r: 767,1,1,126
@@ -390,7 +362,7 @@ button-hover: dialog.png
corner-tr: 639,128,1,1
corner-bl: 512,255,1,1
corner-br: 639,255,1,1
# A copy of dialog3 (pressed button)
button-pressed: dialog.png
background: 641,1,126,126
@@ -413,7 +385,7 @@ button-disabled: dialog.png
corner-tl: 512,256,1,1
corner-tr: 639,256,1,1
corner-bl: 512,383,1,1
corner-br: 639,383,1,1
corner-br: 639,383,1,1
# 10% darker than a normal button - Used in Settings when you select Display Audio Input or Advanced
button-highlighted: dialog.png
@@ -485,7 +457,7 @@ newsbutton-hover: dialog.png
corner-tr: 639,0,1,1
corner-bl: 512,127,1,1
corner-br: 639,127,1,1
newsbutton-highlighted: dialog.png
background: 769,1,126,126
border-r: 895,1,1,126
@@ -496,7 +468,7 @@ newsbutton-highlighted: dialog.png
corner-tr: 895,0,1,1
corner-bl: 768,127,1,1
corner-br: 895,127,1,1
newsbutton-highlighted-hover: dialog.png
background: 769,1,126,126
border-r: 895,1,1,126
@@ -507,7 +479,7 @@ newsbutton-highlighted-hover: dialog.png
corner-tr: 895,0,1,1
corner-bl: 768,127,1,1
corner-br: 895,127,1,1
newsbutton-highlighted-pressed: dialog.png
background: 641,1,126,126
border-r: 767,1,1,126
@@ -652,7 +624,7 @@ slider-track: dialog.png
corner-tr: 767,0,1,1
corner-bl: 640,127,1,1
corner-br: 767,127,1,1
# A copy of dialog2 (normal button)
slider-thumb: dialog.png
background: 513,1,126,126
@@ -700,7 +672,7 @@ slider-thumb-disabled: dialog.png
corner-tr: 639,0,1,1
corner-bl: 512,127,1,1
corner-br: 639,127,1,1
# A copy of dialog3 (pressed button)
checkbox: dialog.png
background: 641,1,126,126

View File

@@ -18,17 +18,6 @@ Container@PLAYER_WIDGETS:
ReadyText: READY
HoldText: ON HOLD
ClockPalette: iconclock
Container@PALETTE_FOREGROUND:
Children:
Image@ICON_TEMPLATE:
Logic: AddFactionSuffixLogic
X: 0 - 2
Y: 0 - 2
Width: 64
Height: 48
IgnoreMouseOver: true
ImageCollection: sidebar
ImageName: background-supportoverlay
Image@SIDEBAR_BACKGROUND_TOP:
Logic: AddFactionSuffixLogic
X: WINDOW_RIGHT - 235
@@ -252,17 +241,6 @@ Container@PLAYER_WIDGETS:
IconSpriteOffset: 0, 0
MinimumRows: 4
MaximumRows: 6
Container@PALETTE_FOREGROUND:
X: 22
Y: 0
Children:
Image@ROW_TEMPLATE:
Logic: AddFactionSuffixLogic
Width: 235
Height: 52
IgnoreMouseOver: true
ImageCollection: sidebar-bits
ImageName: production-iconoverlay
Container@PRODUCTION_TYPES:
X: 0
Y: 0 - 32

Binary file not shown.

Before

Width:  |  Height:  |  Size: 200 KiB

After

Width:  |  Height:  |  Size: 320 KiB