From b13e157c16c4909fb26b1f3ba928643cf44dee08 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko <sev@scummvm.org>
Date: Tue, 30 May 2006 17:49:53 +0000
Subject: [PATCH] Put volume controls conditionally into separate tab. Used by
 PSP theme.

svn-id: r22775
---
 gui/options.cpp       | 13 ++++++++++---
 gui/theme-config.cpp  |  5 +----
 gui/themes/modern.ini | 19 +++++++++++++++----
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/gui/options.cpp b/gui/options.cpp
index 262a2ab59c4..8e7e29e4d35 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -610,11 +610,18 @@ GlobalOptionsDialog::GlobalOptionsDialog()
 	//
 	tab->addTab("Audio");
 	addAudioControls(tab, "globaloptions_");
+
+	int volControlPos = g_gui.evaluator()->getVar("volumeControlsInAudio", true);
+
+	if (volControlPos)
+		addVolumeControls(tab, "globaloptions_");
+
 	addSubtitleControls(tab, "globaloptions_");
 
-
-	tab->addTab("Volume");
-	addVolumeControls(tab, "globaloptions_");
+	if (!volControlPos) {
+		tab->addTab("Volume");
+		addVolumeControls(tab, "globaloptions_");
+	}
 
 	// TODO: cd drive setting
 
diff --git a/gui/theme-config.cpp b/gui/theme-config.cpp
index c96afb33f23..5ea07139842 100644
--- a/gui/theme-config.cpp
+++ b/gui/theme-config.cpp
@@ -149,11 +149,8 @@ const char *Theme::_defaultConfigINI =
 "# audio tab\n"
 "opYoffset=vBorder\n"
 "useWithPrefix=audioControls globaloptions_\n"
-"useWithPrefix=subtitleControls globaloptions_\n"
-"\n"
-"# volume tab\n"
-"opYoffset=vBorder\n"
 "useWithPrefix=volumeControls globaloptions_\n"
+"useWithPrefix=subtitleControls globaloptions_\n"
 "\n"
 "# MIDI tab\n"
 "opYoffset=vBorder\n"
diff --git a/gui/themes/modern.ini b/gui/themes/modern.ini
index 8baea8e9eb1..b05f80de238 100644
--- a/gui/themes/modern.ini
+++ b/gui/themes/modern.ini
@@ -259,11 +259,8 @@ useWithPrefix=graphicsControls globaloptions_
 # audio tab
 opYoffset=vBorder
 useWithPrefix=audioControls globaloptions_
-useWithPrefix=subtitleControls globaloptions_
-
-# volume tab
-opYoffset=vBorder
 useWithPrefix=volumeControls globaloptions_
+useWithPrefix=subtitleControls globaloptions_
 
 # MIDI tab
 opYoffset=vBorder
@@ -527,6 +524,20 @@ def_insetW=(w - buttonWidth - 17 * 2 - insetX)
 def_insetH=(h - 23 - insetY)
 def_launcherVersionX=50
 def_launcherVersionY=5
+def_volumeControlsInAudio=false
 use=XxY
 launcher_version.align=kTextAlignCenter
 launcher_logo.visible=false
+
+# Override audio tab
+set_parent=gameoptions
+vBorder=20
+
+# audio tab
+opYoffset=vBorder
+useWithPrefix=audioControls globaloptions_
+useWithPrefix=subtitleControls globaloptions_
+
+# volume tab
+opYoffset=vBorder
+useWithPrefix=volumeControls globaloptions_