- Split global audio tab into audio and volume

- More logical order in game options tab

svn-id: r22774
This commit is contained in:
Eugene Sandulenko 2006-05-30 17:35:57 +00:00
parent 94272b6ba8
commit b6a56e0795
4 changed files with 22 additions and 13 deletions

View File

@ -235,16 +235,7 @@ EditGameDialog::EditGameDialog(const String &domain, const String &desc)
addSubtitleControls(tab, "gameoptions_");
//
// 5) The MIDI tab
//
tab->addTab("MIDI");
_globalMIDIOverride = new CheckboxWidget(tab, "gameoptions_midiCheckbox", "Override global MIDI settings", kCmdGlobalMIDIOverride, 0);
addMIDIControls(tab, "gameoptions_");
//
// 6) The volume tab
// 5) The volume tab
//
tab->addTab("Volume");
@ -252,6 +243,15 @@ EditGameDialog::EditGameDialog(const String &domain, const String &desc)
addVolumeControls(tab, "gameoptions_");
//
// 6) The MIDI tab
//
tab->addTab("MIDI");
_globalMIDIOverride = new CheckboxWidget(tab, "gameoptions_midiCheckbox", "Override global MIDI settings", kCmdGlobalMIDIOverride, 0);
addMIDIControls(tab, "gameoptions_");
// Activate the first tab
tab->setActiveTab(0);

View File

@ -610,9 +610,12 @@ GlobalOptionsDialog::GlobalOptionsDialog()
//
tab->addTab("Audio");
addAudioControls(tab, "globaloptions_");
addVolumeControls(tab, "globaloptions_");
addSubtitleControls(tab, "globaloptions_");
tab->addTab("Volume");
addVolumeControls(tab, "globaloptions_");
// TODO: cd drive setting
//

View File

@ -149,9 +149,12 @@ const char *Theme::_defaultConfigINI =
"# 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"

View File

@ -259,9 +259,12 @@ useWithPrefix=graphicsControls globaloptions_
# 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_