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

sev at users.sourceforge.net sev at users.sourceforge.net
Tue May 30 10:37:02 CEST 2006


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

Log Message:
-----------
- Split global audio tab into audio and volume
- More logical order in game options tab

Modified Paths:
--------------
    scummvm/trunk/gui/launcher.cpp
    scummvm/trunk/gui/options.cpp
    scummvm/trunk/gui/theme-config.cpp
    scummvm/trunk/gui/themes/modern.ini
Modified: scummvm/trunk/gui/launcher.cpp
===================================================================
--- scummvm/trunk/gui/launcher.cpp	2006-05-30 16:48:15 UTC (rev 22773)
+++ scummvm/trunk/gui/launcher.cpp	2006-05-30 17:35:57 UTC (rev 22774)
@@ -235,22 +235,22 @@
 	addSubtitleControls(tab, "gameoptions_");
 
 	//
-	// 5) The MIDI tab
+	// 5) The volume tab
 	//
-	tab->addTab("MIDI");
+	tab->addTab("Volume");
 
-	_globalMIDIOverride = new CheckboxWidget(tab, "gameoptions_midiCheckbox", "Override global MIDI settings", kCmdGlobalMIDIOverride, 0);
+	_globalVolumeOverride = new CheckboxWidget(tab, "gameoptions_volumeCheckbox", "Override global volume settings", kCmdGlobalVolumeOverride, 0);
 
-	addMIDIControls(tab, "gameoptions_");
+	addVolumeControls(tab, "gameoptions_");
 
 	//
-	// 6) The volume tab
+	// 6) The MIDI tab
 	//
-	tab->addTab("Volume");
+	tab->addTab("MIDI");
 
-	_globalVolumeOverride = new CheckboxWidget(tab, "gameoptions_volumeCheckbox", "Override global volume settings", kCmdGlobalVolumeOverride, 0);
+	_globalMIDIOverride = new CheckboxWidget(tab, "gameoptions_midiCheckbox", "Override global MIDI settings", kCmdGlobalMIDIOverride, 0);
 
-	addVolumeControls(tab, "gameoptions_");
+	addMIDIControls(tab, "gameoptions_");
 
 	// Activate the first tab
 	tab->setActiveTab(0);

Modified: scummvm/trunk/gui/options.cpp
===================================================================
--- scummvm/trunk/gui/options.cpp	2006-05-30 16:48:15 UTC (rev 22773)
+++ scummvm/trunk/gui/options.cpp	2006-05-30 17:35:57 UTC (rev 22774)
@@ -610,9 +610,12 @@
 	//
 	tab->addTab("Audio");
 	addAudioControls(tab, "globaloptions_");
-	addVolumeControls(tab, "globaloptions_");
 	addSubtitleControls(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 16:48:15 UTC (rev 22773)
+++ scummvm/trunk/gui/theme-config.cpp	2006-05-30 17:35:57 UTC (rev 22774)
@@ -149,9 +149,12 @@
 "# 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 16:48:15 UTC (rev 22773)
+++ scummvm/trunk/gui/themes/modern.ini	2006-05-30 17:35:57 UTC (rev 22774)
@@ -259,9 +259,12 @@
 # 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_


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