libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-04 08:17:40 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Put volume controls conditionally into separate tab. Used by PSP theme.

Browse Source 
svn-id: r22775
This commit is contained in:
Eugene Sandulenko 2006-05-30 17:49:53 +00:00
parent b6a56e0795
commit b13e157c16
3 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gui/options.cpp
View File

@ -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

5
gui/theme-config.cpp
View File

@ -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"

19
gui/themes/modern.ini
View File

@ -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_