diff options
| -rw-r--r-- | gui/launcher.cpp | 16 | ||||
| -rw-r--r-- | gui/options.cpp | 5 | ||||
| -rw-r--r-- | gui/theme-config.cpp | 5 | ||||
| -rw-r--r-- | gui/themes/modern.ini | 5 |
4 files changed, 20 insertions, 11 deletions
diff --git a/gui/launcher.cpp b/gui/launcher.cpp index a03e32d903..dbf165de29 100644 --- a/gui/launcher.cpp +++ b/gui/launcher.cpp @@ -235,22 +235,22 @@ EditGameDialog::EditGameDialog(const String &domain, const String &desc) 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); diff --git a/gui/options.cpp b/gui/options.cpp index 62c5347520..262a2ab59c 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -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 // diff --git a/gui/theme-config.cpp b/gui/theme-config.cpp index 5ea0713984..c96afb33f2 100644 --- a/gui/theme-config.cpp +++ b/gui/theme-config.cpp @@ -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" diff --git a/gui/themes/modern.ini b/gui/themes/modern.ini index e7ca6cc15c..8baea8e9eb 100644 --- a/gui/themes/modern.ini +++ b/gui/themes/modern.ini @@ -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_ |