From ca90df29c033105b6ceecdf1737b2c51f604c4aa Mon Sep 17 00:00:00 2001
From: elexis <elexis@wildfiregames.com>
Date: Fri, 23 Sep 2016 09:07:38 +0000
Subject: [PATCH] Add click button sound to the gamesetup icon buttons and
 credits page. Patch by Vladislav, fixes #4222, refs #3805, #3744.

This was SVN commit r18745.
---
 binaries/data/mods/public/gui/credits/credits.xml    |  2 +-
 .../data/mods/public/gui/gamesetup/gamesetup.xml     |  6 +++---
 binaries/data/mods/public/gui/gamesetup/styles.xml   |  5 +++++
 binaries/data/mods/public/gui/page_summary.xml       |  1 +
 binaries/data/mods/public/gui/summary/summary.xml    | 12 ++++++------
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/binaries/data/mods/public/gui/credits/credits.xml b/binaries/data/mods/public/gui/credits/credits.xml
index d9712e8223..d780226f77 100644
--- a/binaries/data/mods/public/gui/credits/credits.xml
+++ b/binaries/data/mods/public/gui/credits/credits.xml
@@ -20,7 +20,7 @@
 
 		<object type="image" size="20 30 210 100%-54">
 			<repeat count="20">
-				<object name="creditsPanelButton[n]" type="button" sprite="BackgroundBox" size="0 0 190 30" hidden="true">
+				<object name="creditsPanelButton[n]" type="button" sprite="BackgroundBox" sound_pressed="audio/interface/ui/ui_button_click.ogg" size="0 0 190 30" hidden="true">
 					<object type="text" name="creditsPanelButtonText[n]" style="ModernLabelText" ghost="true">
 					</object>
 				</object>
diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
index 3c2f7ebc5d..c21f98cb75 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
@@ -61,10 +61,10 @@
 
 					<object name="civInfoButton"
 						type="button"
+						style="IconButton"
 						sprite="iconInfoGold"
 						sprite_over="iconInfoWhite"
 						size="85%-37 0 85%-21 16"
-						tooltip_style="onscreenToolTip"
 					>
 						<translatableAttribute id="tooltip">View civilization info</translatableAttribute>
 						<action on="Press"><![CDATA[
@@ -74,10 +74,10 @@
 
 					<object name="civResetButton"
 						type="button"
+						style="IconButton"
 						sprite="iconResetGold"
 						sprite_over="iconResetWhite"
 						size="85%-16 0 85% 16"
-						tooltip_style="onscreenToolTip"
 					>
 						<translatableAttribute id="tooltip">Reset any civilizations that have been selected to the default (random)</translatableAttribute>
 						<action on="Press">resetCivilizations();</action>
@@ -89,10 +89,10 @@
 
 					<object name="teamResetButton"
 						type="button"
+						style="IconButton"
 						sprite="iconResetGold"
 						sprite_over="iconResetWhite"
 						size="100%-21 0 100%-5 16"
-						tooltip_style="onscreenToolTip"
 					>
 						<translatableAttribute id="tooltip">Reset all teams to the default.</translatableAttribute>
 						<action on="Press">resetTeams();</action>
diff --git a/binaries/data/mods/public/gui/gamesetup/styles.xml b/binaries/data/mods/public/gui/gamesetup/styles.xml
index b8e755b995..b23ff0a5d4 100644
--- a/binaries/data/mods/public/gui/gamesetup/styles.xml
+++ b/binaries/data/mods/public/gui/gamesetup/styles.xml
@@ -14,4 +14,9 @@
 		text_valign="center"
 	/>
 
+	<style name="IconButton"
+		tooltip_style="onscreenToolTip"
+		sound_pressed="audio/interface/ui/ui_button_click.ogg"
+	/>
+
 </styles>
diff --git a/binaries/data/mods/public/gui/page_summary.xml b/binaries/data/mods/public/gui/page_summary.xml
index 84e092b3c7..e41bbdb806 100644
--- a/binaries/data/mods/public/gui/page_summary.xml
+++ b/binaries/data/mods/public/gui/page_summary.xml
@@ -6,6 +6,7 @@
 
 	<include>common/global.xml</include>
 
+	<include>summary/styles.xml</include>
 	<include>summary/summary.xml</include>
 	<include>summary/sprites.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/summary/summary.xml b/binaries/data/mods/public/gui/summary/summary.xml
index 7d27a47072..298402b7fe 100644
--- a/binaries/data/mods/public/gui/summary/summary.xml
+++ b/binaries/data/mods/public/gui/summary/summary.xml
@@ -56,42 +56,42 @@
 		<object name="tabDividerLeft" type="image" sprite="TabSpacer" size="172 120 174 122"/>
 		<object name="tabDividerRight" type="image" sprite="TabSpacer" size="328 120 330 122"/>
 
-		<object name="scorePanelButton" type="button" sprite="ForegroundTab" size="20 92 136 120">
+		<object name="scorePanelButton" type="button" sprite="ForegroundTab" style="TabButton" size="20 92 136 120">
 			<action on="Press">selectPanel(this);</action>
 			<object type="text" style="ModernLabelText" ghost="true">
 				<translatableAttribute id="caption">Score</translatableAttribute>
 			</object>
 		</object>
 
-		<object name="buildingsPanelButton" type="button" sprite="BackgroundTab" size="142 92 260 120">
+		<object name="buildingsPanelButton" type="button" sprite="BackgroundTab" style="TabButton" size="142 92 260 120">
 			<action on="Press">selectPanel(this);</action>
 			<object type="text" style="ModernLabelText" ghost="true">
 				<translatableAttribute id="caption">Buildings</translatableAttribute>
 			</object>
 		</object>
 
-		<object name="unitsPanelButton" type="button" sprite="BackgroundTab" size="266 92 384 120">
+		<object name="unitsPanelButton" type="button" sprite="BackgroundTab" style="TabButton" size="266 92 384 120">
 			<action on="Press">selectPanel(this);</action>
 			<object type="text" style="ModernLabelText" ghost="true">
 				<translatableAttribute id="caption">Units</translatableAttribute>
 			</object>
 		</object>
 
-		<object name="resourcesPanelButton" type="button" sprite="BackgroundTab" size="390 92 508 120">
+		<object name="resourcesPanelButton" type="button" sprite="BackgroundTab" style="TabButton" size="390 92 508 120">
 			<action on="Press">selectPanel(this);</action>
 			<object type="text" style="ModernLabelText" ghost="true">
 				<translatableAttribute id="caption">Resources</translatableAttribute>
 			</object>
 		</object>
 
-		<object name="marketPanelButton" type="button" sprite="BackgroundTab" size="514 92 632 120">
+		<object name="marketPanelButton" type="button" sprite="BackgroundTab" style="TabButton" size="514 92 632 120">
 			<action on="Press">selectPanel(this);</action>
 			<object type="text" style="ModernLabelText" ghost="true">
 				<translatableAttribute id="caption">Market</translatableAttribute>
 			</object>
 		</object>
 
-		<object name="miscPanelButton" type="button" sprite="BackgroundTab" size="638 92 756 120">
+		<object name="miscPanelButton" type="button" sprite="BackgroundTab" style="TabButton" size="638 92 756 120">
 			<action on="Press">selectPanel(this);</action>
 			<object type="text" style="ModernLabelText" ghost="true">
 				<translatableAttribute id="caption">Miscellaneous</translatableAttribute>