[Scummvm-cvs-logs] SF.net SVN: scummvm: [22775] scummvm/trunk/gui

sev at users.sourceforge.net sev at users.sourceforge.net
Tue May 30 10:51:00 CEST 2006


Revision: 22775
Author:   sev
Date:     2006-05-30 10:49:53 -0700 (Tue, 30 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22775&view=rev

Log Message:
-----------
Put volume controls conditionally into separate tab. Used by PSP theme.

Modified Paths:
--------------
    scummvm/trunk/gui/options.cpp
    scummvm/trunk/gui/theme-config.cpp
    scummvm/trunk/gui/themes/modern.ini
Modified: scummvm/trunk/gui/options.cpp
===================================================================
--- scummvm/trunk/gui/options.cpp	2006-05-30 17:35:57 UTC (rev 22774)
+++ scummvm/trunk/gui/options.cpp	2006-05-30 17:49:53 UTC (rev 22775)
@@ -610,12 +610,19 @@
 	//
 	tab->addTab("Audio");
 	addAudioControls(tab, "globaloptions_");
+
+	int volControlPos = g_gui.evaluator()->getVar("volumeControlsInAudio", true);
+
+	if (volControlPos)
+		addVolumeControls(tab, "globaloptions_");
+
 	addSubtitleControls(tab, "globaloptions_");
 
+	if (!volControlPos) {
+		tab->addTab("Volume");
+		addVolumeControls(tab, "globaloptions_");
+	}
 
-	tab->addTab("Volume");
-	addVolumeControls(tab, "globaloptions_");
-
 	// TODO: cd drive setting
 
 	//

Modified: scummvm/trunk/gui/theme-config.cpp
===================================================================
--- scummvm/trunk/gui/theme-config.cpp	2006-05-30 17:35:57 UTC (rev 22774)
+++ scummvm/trunk/gui/theme-config.cpp	2006-05-30 17:49:53 UTC (rev 22775)
@@ -149,12 +149,9 @@
 "# audio tab\n"
 "opYoffset=vBorder\n"
 "useWithPrefix=audioControls globaloptions_\n"
+"useWithPrefix=volumeControls globaloptions_\n"
 "useWithPrefix=subtitleControls globaloptions_\n"
 "\n"
-"# volume tab\n"
-"opYoffset=vBorder\n"
-"useWithPrefix=volumeControls globaloptions_\n"
-"\n"
 "# MIDI tab\n"
 "opYoffset=vBorder\n"
 "useWithPrefix=midiControls globaloptions_\n"

Modified: scummvm/trunk/gui/themes/modern.ini
===================================================================
--- scummvm/trunk/gui/themes/modern.ini	2006-05-30 17:35:57 UTC (rev 22774)
+++ scummvm/trunk/gui/themes/modern.ini	2006-05-30 17:49:53 UTC (rev 22775)
@@ -259,12 +259,9 @@
 # audio tab
 opYoffset=vBorder
 useWithPrefix=audioControls globaloptions_
+useWithPrefix=volumeControls globaloptions_
 useWithPrefix=subtitleControls globaloptions_
 
-# volume tab
-opYoffset=vBorder
-useWithPrefix=volumeControls globaloptions_
-
 # MIDI tab
 opYoffset=vBorder
 useWithPrefix=midiControls globaloptions_
@@ -527,6 +524,20 @@
 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_


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Scummvm-git-logs mailing list