From d70abd548ab03fb268676f0058ad991ddce72fdd Mon Sep 17 00:00:00 2001
From: JoshuaJB <joshuajb@wildfiregames.com>
Date: Sun, 11 May 2014 03:25:34 +0000
Subject: [PATCH] Move yellow modern buttons to their own style to correct
 naming issues (eg. ModernButtonRed was yellow). New name is
 ModernButtonYellow. Also switched the default button color back to red due to
 complaints by team members on IRC.

This was SVN commit r15144.
---
 .../button/red-unselected-center-bottom.png   |   4 +-
 .../button/red-unselected-center-center.png   |   4 +-
 .../button/red-unselected-center-top.png      |   4 +-
 .../button/red-unselected-left-bottom.png     |   4 +-
 .../button/red-unselected-left-center.png     |   4 +-
 .../modern/button/red-unselected-left-top.png |   4 +-
 .../button/red-unselected-right-bottom.png    |   4 +-
 .../button/red-unselected-right-center.png    |   4 +-
 .../button/red-unselected-right-top.png       |   4 +-
 .../yellow-unselected-center-bottom.png       |   3 +
 .../yellow-unselected-center-center.png       |   3 +
 .../button/yellow-unselected-center-top.png   |   3 +
 .../button/yellow-unselected-left-bottom.png  |   3 +
 .../button/yellow-unselected-left-center.png  |   3 +
 .../button/yellow-unselected-left-top.png     |   3 +
 .../button/yellow-unselected-right-bottom.png |   3 +
 .../button/yellow-unselected-right-center.png |   3 +
 .../button/yellow-unselected-right-top.png    |   3 +
 .../mods/public/gui/common/modern/sprites.xml | 142 ++++++++++++++++++
 .../mods/public/gui/common/modern/styles.xml  |  11 ++
 20 files changed, 198 insertions(+), 18 deletions(-)
 create mode 100644 binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-center-bottom.png
 create mode 100644 binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-center-center.png
 create mode 100644 binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-center-top.png
 create mode 100644 binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-left-bottom.png
 create mode 100644 binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-left-center.png
 create mode 100644 binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-left-top.png
 create mode 100644 binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-right-bottom.png
 create mode 100644 binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-right-center.png
 create mode 100644 binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-right-top.png

diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-center-bottom.png b/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-center-bottom.png
index 801cf57c87..99da6f6f51 100644
--- a/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-center-bottom.png
+++ b/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-center-bottom.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6e00744d5067d1acda995c5346328f37fdfe5f29d6b39e48fa899f297035422b
-size 4118
+oid sha256:0edeed1aa4695405cf11de9b674c0c1ae437c1e976add470de5595510d0fbfa7
+size 4230
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-center-center.png b/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-center-center.png
index 29f549dc7c..ecb7bdad6d 100644
--- a/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-center-center.png
+++ b/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-center-center.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b9f01e44c4eb48c73c696619c89945b76f6dcfe67d71289061a6a5d009b0b6b8
-size 6537
+oid sha256:f5b8f61d67585b37b1757dcb44859080fd110800b2046847c4e49e81e9eecc80
+size 8346
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-center-top.png b/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-center-top.png
index 9614f25f5e..838676274e 100644
--- a/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-center-top.png
+++ b/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-center-top.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6524ad6b0e29c70cdc5e356135de50276cda8e97a9527781ac2cb058c652ebee
-size 4138
+oid sha256:aa263d5657caf2fd978239bab29f9703317bccf962ce9c475b7fdd281baa4ea5
+size 4230
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-left-bottom.png b/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-left-bottom.png
index c6b8aa466a..315632b95e 100644
--- a/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-left-bottom.png
+++ b/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-left-bottom.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c33e325e00b5c60fd6358178be16646113f19faae47093a00596eb3ef922a4fd
-size 2938
+oid sha256:3bfd378e24cd174ba90aef80819bbd8cf45fab1a232eeb377b0d69bd4777a938
+size 390
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-left-center.png b/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-left-center.png
index 013cb588c8..3c256a7ce6 100644
--- a/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-left-center.png
+++ b/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-left-center.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:74933d4081391cf43134fbb2fd68d30ebcdf632fb0ff179c5151a275410dbf39
-size 3031
+oid sha256:d8361cc8ba8b892bcef0e6c71f75a5e3be56f8b925bf92d7afbfa238c1adb5a5
+size 654
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-left-top.png b/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-left-top.png
index b904c5e828..1f95fd03eb 100644
--- a/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-left-top.png
+++ b/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-left-top.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:05df51585c1120f8dda253184320e0cd4228054516840b7fdff9b0383fece313
-size 2909
+oid sha256:4ec05f136f4fe38ea74012aa0398cdbba469b30a94bdf4a8effabfa27278d79b
+size 390
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-right-bottom.png b/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-right-bottom.png
index 06b783c331..8e0eeacb6f 100644
--- a/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-right-bottom.png
+++ b/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-right-bottom.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6eee3854beb646a53ca9b3e1e0c7c89a0ebe3e8ccd0aae8a9a7667875db2ae12
-size 2935
+oid sha256:6d458d9c0d0a9f9872ec397b644b633d65265432676bac4d769c442da4d9764c
+size 390
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-right-center.png b/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-right-center.png
index d76121cd88..bffe55fe78 100644
--- a/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-right-center.png
+++ b/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-right-center.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2a612e1421fa887cd32b3e3e1cfc322b1b75e53723ecc13980f87400336baf3e
-size 3057
+oid sha256:7ae64693d5b80b6079984aa9581aa760baa756ef1420568491f59de9cc229b18
+size 654
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-right-top.png b/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-right-top.png
index e426bef537..09a1f7e8c1 100644
--- a/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-right-top.png
+++ b/binaries/data/mods/public/art/textures/ui/global/modern/button/red-unselected-right-top.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:42a0b36f93f685c8f6d6f2e78ba7579859f3783a43e7c75480b8013a35b8122d
-size 2936
+oid sha256:5171b20276cfa8d3fc37891e89b57bec8d1a092d9a0e74224c1c6671e5c67eb4
+size 390
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-center-bottom.png b/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-center-bottom.png
new file mode 100644
index 0000000000..4349650371
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-center-bottom.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d49d12a73ad49c50a1fe46252ebe0ae08ba553c03768fe4fd4b9f155ba4a0fc5
+size 4211
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-center-center.png b/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-center-center.png
new file mode 100644
index 0000000000..1caa1718f8
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-center-center.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9cc5daa6e3343bdfa601bc7a7f802424022a0c68ca37204f710cda834d311b6f
+size 8327
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-center-top.png b/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-center-top.png
new file mode 100644
index 0000000000..a4d563ab99
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-center-top.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:42b92765f0536a6d033eb0c71fcefa2b4aedf769cce5210450495f7c51d934ba
+size 4211
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-left-bottom.png b/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-left-bottom.png
new file mode 100644
index 0000000000..414370ab2d
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-left-bottom.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8181f3a5ad125d4d1e76cad0b25546acf2b4bad3ecd24d9fb103ae2cfd53ff03
+size 371
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-left-center.png b/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-left-center.png
new file mode 100644
index 0000000000..70847b734f
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-left-center.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c6ce92509153a4bd07d1ca3169899d1bbada24fa28cbeb884850480ef45ac1b4
+size 635
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-left-top.png b/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-left-top.png
new file mode 100644
index 0000000000..9e9eddaee0
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-left-top.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b573214439ae3888bcbb8dd73e21f10414a2fda1365c1a81daaf8efe6e199f3d
+size 371
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-right-bottom.png b/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-right-bottom.png
new file mode 100644
index 0000000000..a5eca05327
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-right-bottom.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:99e8cbd3386a02fe848cbafc0cbaea42f937603aace927d67193bf695787b1ef
+size 371
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-right-center.png b/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-right-center.png
new file mode 100644
index 0000000000..9460891366
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-right-center.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3197730a0798139ffac48dc4d5aa2fde71274324bd65dc77a8c09544a0441785
+size 635
diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-right-top.png b/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-right-top.png
new file mode 100644
index 0000000000..67763db8b2
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/global/modern/button/yellow-unselected-right-top.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a3babb18eb8322bb0897ec8ad4a469e8ccc016e2aed09bab9acdd2cb8c6c1aec
+size 371
diff --git a/binaries/data/mods/public/gui/common/modern/sprites.xml b/binaries/data/mods/public/gui/common/modern/sprites.xml
index 7ad2ffdea4..ea3e1a83cb 100644
--- a/binaries/data/mods/public/gui/common/modern/sprites.xml
+++ b/binaries/data/mods/public/gui/common/modern/sprites.xml
@@ -273,6 +273,7 @@
 	- Buttons -
 	==========================================
 	-->
+	<!-- RED -->
 	<sprite name="ModernButtonRed">
 		<!-- Left -->
 		<image texture="global/modern/button/red-unselected-left-top.png"
@@ -413,6 +414,147 @@
 			size="100%-8 100%-8 100% 100%"
 		/>
 	</sprite>
+	<!-- YELLOW -->
+	<sprite name="ModernButtonYellow">
+		<!-- Left -->
+		<image texture="global/modern/button/yellow-unselected-left-top.png"
+			real_texture_placement="0 0 8 8"
+			size="0 0 8 8"
+		/>
+		<image texture="global/modern/button/yellow-unselected-left-center.png"
+			real_texture_placement="0 0 8 16"
+			texture_size="0 0 8 16"
+			size="0 8 8 100%-8"
+		/>
+		<image texture="global/modern/button/yellow-unselected-left-bottom.png"
+			real_texture_placement="0 0 8 8"
+			size="0 100%-8 8 100%"
+		/>
+		<!-- Center -->
+		<image texture="global/modern/button/yellow-unselected-center-top.png"
+			real_texture_placement="0 0 128 8"
+			texture_size="0 0 128 8"
+			size="8 0 100%-8 8"
+		/>
+		<image texture="global/modern/button/yellow-unselected-center-center.png"
+			real_texture_placement="0 0 128 16"
+			texture_size="0 0 128 16"
+			size="8 8 100%-8 100%-8"
+		/>
+		<image texture="global/modern/button/yellow-unselected-center-bottom.png"
+			real_texture_placement="0 0 128 8"
+			texture_size="0 0 128 8"
+			size="8 100%-8 100%-8 100%"
+		/>
+		<!-- Right -->
+		<image texture="global/modern/button/yellow-unselected-right-top.png"
+			real_texture_placement="0 0 8 8"
+			size="100%-8 0 100% 8"
+		/>
+		<image texture="global/modern/button/yellow-unselected-right-center.png"
+			real_texture_placement="0 0 8 16"
+			texture_size="0 0 8 16"
+			size="100%-8 8 100% 100%-8"
+		/>
+		<image texture="global/modern/button/yellow-unselected-right-bottom.png"
+			real_texture_placement="0 0 8 8"
+			size="100%-8 100%-8 100% 100%"
+		/>
+	</sprite>
+	<sprite name="ModernButtonYellowOver">
+		<effect add_color="60 42 42 0"/>
+		<!-- Left -->
+		<image texture="global/modern/button/yellow-unselected-left-top.png"
+			real_texture_placement="0 0 8 8"
+			size="0 0 8 8"
+		/>
+		<image texture="global/modern/button/yellow-unselected-left-center.png"
+			real_texture_placement="0 0 8 16"
+			texture_size="0 0 8 16"
+			size="0 8 8 100%-8"
+		/>
+		<image texture="global/modern/button/yellow-unselected-left-bottom.png"
+			real_texture_placement="0 0 8 8"
+			size="0 100%-8 8 100%"
+		/>
+		<!-- Center -->
+		<image texture="global/modern/button/yellow-unselected-center-top.png"
+			real_texture_placement="0 0 128 8"
+			texture_size="0 0 128 8"
+			size="8 0 100%-8 8"
+		/>
+		<image texture="global/modern/button/yellow-unselected-center-center.png"
+			real_texture_placement="0 0 128 16"
+			texture_size="0 0 128 16"
+			size="8 8 100%-8 100%-8"
+		/>
+		<image texture="global/modern/button/yellow-unselected-center-bottom.png"
+			real_texture_placement="0 0 128 8"
+			texture_size="0 0 128 8"
+			size="8 100%-8 100%-8 100%"
+		/>
+		<!-- Right -->
+		<image texture="global/modern/button/yellow-unselected-right-top.png"
+			real_texture_placement="0 0 8 8"
+			size="100%-8 0 100% 8"
+		/>
+		<image texture="global/modern/button/yellow-unselected-right-center.png"
+			real_texture_placement="0 0 8 16"
+			texture_size="0 0 8 16"
+			size="100%-8 8 100% 100%-8"
+		/>
+		<image texture="global/modern/button/yellow-unselected-right-bottom.png"
+			real_texture_placement="0 0 8 8"
+			size="100%-8 100%-8 100% 100%"
+		/>
+	</sprite>
+	<sprite name="ModernButtonYellowDisabled">
+		<effect grayscale=""/>
+		<!-- Left -->
+		<image texture="global/modern/button/yellow-unselected-left-top.png"
+			real_texture_placement="0 0 8 8"
+			size="0 0 8 8"
+		/>
+		<image texture="global/modern/button/yellow-unselected-left-center.png"
+			real_texture_placement="0 0 8 16"
+			texture_size="0 0 8 16"
+			size="0 8 8 100%-8"
+		/>
+		<image texture="global/modern/button/yellow-unselected-left-bottom.png"
+			real_texture_placement="0 0 8 8"
+			size="0 100%-8 8 100%"
+		/>
+		<!-- Center -->
+		<image texture="global/modern/button/yellow-unselected-center-top.png"
+			real_texture_placement="0 0 128 8"
+			texture_size="0 0 128 8"
+			size="8 0 100%-8 8"
+		/>
+		<image texture="global/modern/button/yellow-unselected-center-center.png"
+			real_texture_placement="0 0 128 16"
+			texture_size="0 0 128 16"
+			size="8 8 100%-8 100%-8"
+		/>
+		<image texture="global/modern/button/yellow-unselected-center-bottom.png"
+			real_texture_placement="0 0 128 8"
+			texture_size="0 0 128 8"
+			size="8 100%-8 100%-8 100%"
+		/>
+		<!-- Right -->
+		<image texture="global/modern/button/yellow-unselected-right-top.png"
+			real_texture_placement="0 0 8 8"
+			size="100%-8 0 100% 8"
+		/>
+		<image texture="global/modern/button/yellow-unselected-right-center.png"
+			real_texture_placement="0 0 8 16"
+			texture_size="0 0 8 16"
+			size="100%-8 8 100% 100%-8"
+		/>
+		<image texture="global/modern/button/yellow-unselected-right-bottom.png"
+			real_texture_placement="0 0 8 8"
+			size="100%-8 100%-8 100% 100%"
+		/>
+	</sprite>
 	<!--
 	==========================================
 	- Basic. -
diff --git a/binaries/data/mods/public/gui/common/modern/styles.xml b/binaries/data/mods/public/gui/common/modern/styles.xml
index 0fc42a31ef..bc10470cb1 100644
--- a/binaries/data/mods/public/gui/common/modern/styles.xml
+++ b/binaries/data/mods/public/gui/common/modern/styles.xml
@@ -142,4 +142,15 @@
 		text_valign="center"
 		sound_pressed="audio/interface/ui/ui_button_click.ogg"
 	/>
+	<style name="ModernButtonYellow"
+		sprite="ModernButtonYellow"
+		sprite_disabled="ModernButtonYellowDisabled"
+		sprite_over="ModernButtonYellowOver"
+		sprite_pressed="ModernButtonRed"
+		font="sans-bold-14"
+		textcolor="black"
+		text_align="center"
+		text_valign="center"
+		sound_pressed="audio/interface/ui/ui_button_click.ogg"
+	/>
 </styles>