From a9397e088845fec8422bc567f0eee289fd41891c Mon Sep 17 00:00:00 2001
From: Acumen <stuart@wildfiregames.com>
Date: Sun, 31 Jul 2005 03:08:07 +0000
Subject: [PATCH] Some experiments with audio controls in the options window.
 (Doesn't really work yet, though.)

This was SVN commit r2571.
---
 .../mods/official/gui/test/2_mainmenu.xml     | 64 ++++++++++++++++---
 .../gui/test/functions_utility_music.js       |  2 +-
 .../data/mods/official/gui/test/sprite1.xml   | 10 ++-
 .../data/mods/official/gui/test/styles.xml    | 33 ++++++++++
 4 files changed, 97 insertions(+), 12 deletions(-)

diff --git a/binaries/data/mods/official/gui/test/2_mainmenu.xml b/binaries/data/mods/official/gui/test/2_mainmenu.xml
index 53102b9b53..81d8e5da16 100644
--- a/binaries/data/mods/official/gui/test/2_mainmenu.xml
+++ b/binaries/data/mods/official/gui/test/2_mainmenu.xml
@@ -20,7 +20,7 @@
 			curr_music.loop();
 
 			// Display a .cfg file variable to prove we can access it.
-			console.write ("Language Version: " + (new ConfigDB()).system.language + ".")
+			console.write ("Volume: " + g_ConfigDB.system["sound.mastergain"] + ".")
 			// Unfortunately, although Philip's workaround certainly works,
 			// a] The value cannot be modified.
 			// b] Variables a step up in the hierarchy are not recognised (eg system.sound.mastergain).
@@ -889,23 +889,67 @@
 					style="wheatCrossBox"
 					type="checkbox"
 					hotkey="audio.toggle"
-					size="50%-100 20% 50%-100 30%"
+					size="50%-50 20% 50%+50 25%"
 				>Play Sound
 					<action on="Load"><![CDATA[
-						// (Would like to set checkbox state to value of snd_disabled, but looks like that variable isn't exposed until after the GUI is loaded.
+						// (Would like to set checkbox state to value of snd_disabled, but looks
+						// like that variable isn't exposed until after the GUI is loaded.
 //						this.checked = !snd_disabled;
 					]]></action>
 					<action on="Press"><![CDATA[
 						// Clicking the checkbox turns sound on and off.
-						// (Or at least it should, but it doesn't. Checkbox text doesn't appear either. Maybe this control isn't finished yet?)
-						if (snd_disabled == true)
-							snd_disable (false);
-						else
-							snd_disable (true);
+						// (Or at least it should, but it doesn't. Checkbox text doesn't appear
+						// either. Maybe this control isn't finished yet?)
+//						if (snd_disabled == true)
+//							snd_disable (false);
+//						else
+//							snd_disable (true);
 
-						this.checked = !snd_disabled;
+//						this.checked = !snd_disabled;
 					]]></action>		
 				</object>
+
+				<object name="pgOptionsAudioMusicGain"
+					style="wheatBorderBlack"
+					type="text"
+					size="50%-20 30% 50%+20 35%"
+					text_align="center"
+					text_valign="center"
+				>
+					<action on="Load"><![CDATA[
+						this.caption = g_ConfigDB.system["sound.mastergain"];
+					]]></action>
+				</object>
+
+				<object name="pgOptionsAudioMusicGainDec"
+					style="wheatArrowLeft"
+					type="button"
+					size="50%-40 30% 50%-25 35%"
+				>
+					<action on="Press"><![CDATA[
+						if (getGUIObjectByName ("pgOptionsAudioMusicGain").caption > 0.0)
+							guiModifyCaption ("pgOptionsAudioMusicGain", -.1, 1);
+
+						curr_music.setGain (getGUIObjectByName ("pgOptionsAudioMusicGain").caption);
+						g_ConfigDB.system["sound.mastergain"] = getGUIObjectByName ("pgOptionsAudioMusicGain").caption;
+					]]></action>
+				</object>
+
+				<object name="pgOptionsAudioMusicGainInc"
+					style="wheatArrowRight"
+					type="button"
+					size="50%+25 30% 50%+40 35%"
+				>
+					<action on="Press"><![CDATA[
+						if (getGUIObjectByName ("pgOptionsAudioMusicGain").caption < 1.0)
+							guiModifyCaption ("pgOptionsAudioMusicGain", .1, 1);
+
+						curr_music.setGain (getGUIObjectByName ("pgOptionsAudioMusicGain").caption);
+						g_ConfigDB.system["sound.mastergain"] = getGUIObjectByName ("pgOptionsAudioMusicGain").caption;
+					]]></action>
+				</object>
+
+
 			</object>
 
 			<!--
@@ -990,7 +1034,7 @@
 				<action on="Press"><![CDATA[
 					// Save changes.
 					// TODO:
-
+			console.write ("Volume: " + g_ConfigDB.system["sound.mastergain"] + ".")
 					// Close options screen.
 					closeMainMenuSubWindow ("pgOptions");
 				]]></action>
diff --git a/binaries/data/mods/official/gui/test/functions_utility_music.js b/binaries/data/mods/official/gui/test/functions_utility_music.js
index bc268b7f77..e81c318e63 100755
--- a/binaries/data/mods/official/gui/test/functions_utility_music.js
+++ b/binaries/data/mods/official/gui/test/functions_utility_music.js
@@ -20,7 +20,7 @@
 // s.free();
 
 // Adjust the gain (volume) of a sound (floating point range between 0 (silent) and 1 (max volume)).
-// s.SetGain(value);
+// s.setGain(value);
 
 // ====================================================================
 
diff --git a/binaries/data/mods/official/gui/test/sprite1.xml b/binaries/data/mods/official/gui/test/sprite1.xml
index 6bd596fa23..2780899b09 100644
--- a/binaries/data/mods/official/gui/test/sprite1.xml
+++ b/binaries/data/mods/official/gui/test/sprite1.xml
@@ -294,7 +294,15 @@
         </sprite>
 
 	<sprite name="wheatButtonDisabled">
-		<effect grayscale=""/>
+		<effect grayscale="" />
+		<image 	texture="global/button/button_wood.png"
+			real_texture_placement="0 0 160 31" 
+			size="0 0 100% 100%" 
+		/>
+        </sprite>
+
+	<sprite name="wheatButtonTabbed">
+		<effect	add_color="60 42 42 0" />
 		<image 	texture="global/button/button_wood.png"
 			real_texture_placement="0 0 160 31" 
 			size="0 0 100% 100%" 
diff --git a/binaries/data/mods/official/gui/test/styles.xml b/binaries/data/mods/official/gui/test/styles.xml
index 7d968d7e26..f50d4f0879 100755
--- a/binaries/data/mods/official/gui/test/styles.xml
+++ b/binaries/data/mods/official/gui/test/styles.xml
@@ -70,6 +70,15 @@
 		text_valign="center"
 	/>
 
+	<style 	name="wheatTabButton"
+		sprite="wheatButton"
+		sprite_disabled="wheatButtonTabbed"
+		sprite_over="wheatButtonOver"
+		sprite_pressed="wheatButtonTabbed"
+		text_align="center"
+		text_valign="center"
+	/>
+
 	<style 	name="wheatExit"
 		size="100%+9 0%-25 100%+25 0%-9"
 		sprite="wheatCheckBoxCross"
@@ -86,6 +95,30 @@
 		textcolor="black"
 	/>
 
+	<style 	name="wheatArrowLeft"
+		font="verdana12"
+		sprite="wheatCheckBoxOpen"
+		textcolor="black"
+	/>
+
+	<style 	name="wheatArrowRight"
+		font="verdana12"
+		sprite="wheatCheckBoxOpen"
+		textcolor="black"
+	/>
+
+	<style 	name="wheatArrowUp"
+		font="verdana12"
+		sprite="wheatCheckBoxOpen"
+		textcolor="black"
+	/>
+
+	<style 	name="wheatArrowDn"
+		font="verdana12"
+		sprite="wheatCheckBoxOpen"
+		textcolor="black"
+	/>
+
 	<style 	name="wheatList"
 		buffer_zone="5"
 		font="verdana12"