From 0dd74bb25f4982272169fa5d66a4bc2fe13adab5 Mon Sep 17 00:00:00 2001
From: thedrunkyak <danfuhr@wildfiregames.com>
Date: Thu, 12 Jan 2006 10:41:45 +0000
Subject: [PATCH] Added Cancel button and cosmetic changes to options menu

This was SVN commit r3353.
---
 .../mods/official/gui/test/2_mainmenu.xml     | 44 ++++++++++++++-----
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/binaries/data/mods/official/gui/test/2_mainmenu.xml b/binaries/data/mods/official/gui/test/2_mainmenu.xml
index f0fb495aa6..487bee4984 100644
--- a/binaries/data/mods/official/gui/test/2_mainmenu.xml
+++ b/binaries/data/mods/official/gui/test/2_mainmenu.xml
@@ -1203,6 +1203,19 @@ A large landmass with rivers, forests and coastal fishing grounds.
 					]]></action>	
 				</object>
 
+				<object name="pgOptionsAudioMusicGainTitle"
+					style="wheatBorder"
+					type="text"
+					size="50%-200 30% 50%+20 35%"
+					text_align="center"
+					text_valign="center"
+				>Volume
+					<action on="Load"><![CDATA[
+						this.caption = "Main Sound";
+					]]></action>
+				</object>
+
+
 				<object name="pgOptionsAudioMusicGain"
 					style="wheatBorderBlack"
 					type="text"
@@ -1224,11 +1237,8 @@ A large landmass with rivers, forests and coastal fishing grounds.
 						if (getGUIObjectByName ("pgOptionsAudioMusicGain").caption > 0.0)
 							guiModifyCaption ("pgOptionsAudioMusicGain", -.1, 1);
 
-						if (pgOptionsAudioSoundCheckBox.unchecked)
-						{
-							curr_music.setGain (getGUIObjectByName ("pgOptionsAudioMusicGain").caption);
-							g_ConfigDB.system["sound.mastergain"] = getGUIObjectByName ("pgOptionsAudioMusicGain").caption;
-						}
+						curr_music.setGain (getGUIObjectByName ("pgOptionsAudioMusicGain").caption);
+						g_ConfigDB.system["sound.mastergain"] = getGUIObjectByName ("pgOptionsAudioMusicGain").caption;
 					]]></action>
 				</object>
 
@@ -1241,15 +1251,11 @@ A large landmass with rivers, forests and coastal fishing grounds.
 						if (getGUIObjectByName ("pgOptionsAudioMusicGain").caption < 1.0)
 							guiModifyCaption ("pgOptionsAudioMusicGain", .1, 1);
 
-						if (pgOptionsAudioSoundCheckBox.unchecked)
-						{
-							curr_music.setGain (getGUIObjectByName ("pgOptionsAudioMusicGain").caption);
-							g_ConfigDB.system["sound.mastergain"] = getGUIObjectByName ("pgOptionsAudioMusicGain").caption;
-						}
+						curr_music.setGain (getGUIObjectByName ("pgOptionsAudioMusicGain").caption);
+						g_ConfigDB.system["sound.mastergain"] = getGUIObjectByName ("pgOptionsAudioMusicGain").caption;
 					]]></action>
 				</object>
 
-
 			</object>
 
 			<!--
@@ -1320,6 +1326,22 @@ A large landmass with rivers, forests and coastal fishing grounds.
 				]]></action>
 			</object>
 
+			<!--
+			===============================================
+			- OPTIONS SCREEN - CANCEL BUTTON
+			===============================================
+			-->
+
+			<object name="pgOptionsCancelButton"
+				style="wheatButton"
+				type="button"
+				size="1% 92% 30% 100%"
+			>Cancel
+				<action on="Press"><![CDATA[
+					closeMainMenuSubWindow ("pgOptions");
+				]]></action>
+			</object>
+
 			<!--
 			===============================================
 			- OPTIONS SCREEN - ACCEPT BUTTON