libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-01 00:12:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bugs #1709323: "GUI: Button overlapping" and #1677997: "GUI: Switching

Browse Source 
options dialog between 1x and 2x" by introducing Volume tab to all resolutions

svn-id: r27345
This commit is contained in:
Eugene Sandulenko 2007-06-11 07:57:39 +00:00
parent 7f7abe8706
commit 2982a6ebb3
5 changed files with 39 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gui/launcher.cpp
View File

@ -218,15 +218,9 @@ EditGameDialog::EditGameDialog(const String &domain, const String &desc)
//
// 5) The volume tab
//
int volControlPos = g_gui.evaluator()->getVar("volumeControlsInAudio", true);
tab->addTab("Volume");
if (!volControlPos) {
tab->addTab("Volume");
_globalVolumeOverride = new CheckboxWidget(tab, "gameoptions_volumeCheckbox", "Override global volume settings", kCmdGlobalVolumeOverride, 0);
} else {
_globalVolumeOverride = NULL;
}
_globalVolumeOverride = new CheckboxWidget(tab, "gameoptions_volumeCheckbox", "Override global volume settings", kCmdGlobalVolumeOverride, 0);
addVolumeControls(tab, "gameoptions_");
@ -288,7 +282,7 @@ void EditGameDialog::open() {
OptionsDialog::open();
int sel, i;
bool e, f;
bool e;
// En-/disable dialog items depending on whether overrides are active or not.
@ -302,17 +296,12 @@ void EditGameDialog::open() {
ConfMan.hasKey("output_rate", _domain) ||
ConfMan.hasKey("subtitles", _domain) ||
ConfMan.hasKey("talkspeed", _domain);
_globalAudioOverride->setState(e);
f = ConfMan.hasKey("music_volume", _domain) ||
e = ConfMan.hasKey("music_volume", _domain) ||
ConfMan.hasKey("sfx_volume", _domain) ||
ConfMan.hasKey("speech_volume", _domain);
if (_globalVolumeOverride) {
_globalAudioOverride->setState(e);
_globalVolumeOverride->setState(f);
} else {
_globalAudioOverride->setState(e || f);
}
_globalVolumeOverride->setState(e);
e = ConfMan.hasKey("soundfont", _domain) ||
ConfMan.hasKey("multi_midi", _domain) ||

12
gui/options.cpp
View File

@ -675,18 +675,10 @@ GlobalOptionsDialog::GlobalOptionsDialog()
//
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

39
gui/theme-config.cpp
View File

@ -193,9 +193,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"
@ -274,9 +277,14 @@ const char *Theme::_defaultConfigINI =
"gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight\n"
"opYoffset=(opYoffset + buttonHeight)\n"
"useWithPrefix=audioControls gameoptions_\n"
"useWithPrefix=volumeControls gameoptions_\n"
"useWithPrefix=subtitleControls gameoptions_\n"
"\n"
"# volume tab\n"
"opYoffset=vBorder\n"
"gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 190) buttonHeight\n"
"opYoffset=(opYoffset + buttonHeight)\n"
"useWithPrefix=volumeControls gameoptions_\n"
"\n"
"# midi tab\n"
"opYoffset=vBorder\n"
"gameoptions_midiCheckbox=gox opYoffset (kFontHeight + 10 + 174) buttonHeight\n"
@ -480,7 +488,6 @@ const char *Theme::_defaultConfigINI =
"def_insetH=(h - 13 - insetY)\n"
"def_launcherVersionX=50\n"
"def_launcherVersionY=5\n"
"def_volumeControlsInAudio=false\n"
"def_midiControlsSpacing=2\n"
"def_gameOptionsOverrideVPad=10\n"
"def_aboutXOff=3\n"
@ -488,32 +495,6 @@ const char *Theme::_defaultConfigINI =
"def_aboutOuterBorder=10\n"
"\n"
"use=XxY\n"
"\n"
"# Override audio tab\n"
"set_parent=gameoptions\n"
"vBorder=5\n"
"\n"
"# 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"
"\n"
"# audio tab\n"
"opYoffset=vBorder\n"
"gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight\n"
"opYoffset=(opYoffset + buttonHeight + 6)\n"
"useWithPrefix=audioControls gameoptions_\n"
"useWithPrefix=subtitleControls gameoptions_\n"
"\n"
"# volume tab\n"
"opYoffset=vBorder\n"
"gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 190) buttonHeight\n"
"opYoffset=(opYoffset + buttonHeight + 6)\n"
"useWithPrefix=volumeControls gameoptions_\n"
"";
using Common::String;

41
gui/themes/classic080.ini
View File

@ -112,9 +112,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_
@ -193,9 +196,14 @@ opYoffset=vBorder
gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight
opYoffset=(opYoffset + buttonHeight)
useWithPrefix=audioControls gameoptions_
useWithPrefix=volumeControls gameoptions_
useWithPrefix=subtitleControls gameoptions_
# volume tab
opYoffset=vBorder
gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 190) buttonHeight
opYoffset=(opYoffset + buttonHeight)
useWithPrefix=volumeControls gameoptions_
# midi tab
opYoffset=vBorder
gameoptions_midiCheckbox=gox opYoffset (kFontHeight + 10 + 174) buttonHeight
@ -430,7 +438,6 @@ scummsaveload_thumbnail=(parent.w - (kThumbnailWidth + 22)) 18
scummsaveload_cancel=(parent.w - 2 * (buttonWidth + 10)) (parent.h - buttonHeight - 8) buttonWidth buttonHeight
scummsaveload_choose=(prev.x2 + 10) prev.y prev.w prev.h
scummsaveload_extinfo.visible=false
def_volumeControlsInAudio=false
# MM NES resolution
[256x240]
@ -446,7 +453,6 @@ def_insetW=(w - 2 * insetX)
def_insetH=(h - 13 - insetY)
def_launcherVersionX=50
def_launcherVersionY=5
def_volumeControlsInAudio=false
def_midiControlsSpacing=2
def_gameOptionsOverrideVPad=10
def_aboutXOff=3
@ -454,30 +460,3 @@ def_aboutYOff=2
def_aboutOuterBorder=10
use=XxY
# Override audio tab
set_parent=gameoptions
vBorder=5
# audio tab
opYoffset=vBorder
useWithPrefix=audioControls globaloptions_
useWithPrefix=subtitleControls globaloptions_
# volume tab
opYoffset=vBorder
useWithPrefix=volumeControls globaloptions_
# audio tab
opYoffset=vBorder
gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight
opYoffset=(opYoffset + buttonHeight + 6)
useWithPrefix=audioControls gameoptions_
useWithPrefix=subtitleControls gameoptions_
# volume tab
opYoffset=vBorder
gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 190) buttonHeight
opYoffset=(opYoffset + buttonHeight + 6)
useWithPrefix=volumeControls gameoptions_

42
gui/themes/modern.ini
View File

@ -223,7 +223,7 @@ Console.leftPadding=7
Console.rightPadding=5
Console.topPadding=5
Console.bottomPadding=5
TabWidget.tabWidth=85
TabWidget.tabWidth=75
TabWidget.tabHeight=27
TabWidget.titleVPad=8
TabWidget.navButtonRightPad=3
@ -278,9 +278,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_
@ -359,9 +362,14 @@ opYoffset=vBorder
gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight
opYoffset=(opYoffset + buttonHeight + 6)
useWithPrefix=audioControls gameoptions_
useWithPrefix=volumeControls gameoptions_
useWithPrefix=subtitleControls gameoptions_
# volume tab
opYoffset=vBorder
gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight
opYoffset=(opYoffset + buttonHeight + 6)
useWithPrefix=volumeControls gameoptions_
# midi tab
opYoffset=vBorder
gameoptions_midiCheckbox=gox opYoffset (kFontHeight + 10 + 174) buttonHeight
@ -566,7 +574,6 @@ use=extra
pix_checkbox_empty="checkbox_empty320.bmp"
pix_checkbox_checked="checkbox_checked320.bmp"
pix_cursor_image="cursor320.bmp"
def_volumeControlsInAudio=false
# NES resoltuion
[256x240]
@ -582,7 +589,6 @@ def_insetW=(w - buttonWidth - 17 * 2 - insetX)
def_insetH=(h - 13 - insetY)
def_launcherVersionX=50
def_launcherVersionY=5
def_volumeControlsInAudio=false
def_midiControlsSpacing=2
def_gameOptionsOverrideVPad=10
def_aboutXOff=3
@ -602,29 +608,3 @@ launcher_logo.visible=true
# Override extras
inactive_dialog_shading=kShadingNone
# Override audio tab
set_parent=gameoptions
vBorder=10
# audio tab
opYoffset=vBorder
useWithPrefix=audioControls globaloptions_
useWithPrefix=subtitleControls globaloptions_
# volume tab
opYoffset=vBorder
useWithPrefix=volumeControls globaloptions_
# audio tab
opYoffset=vBorder
gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight
opYoffset=(opYoffset + buttonHeight + 6)
useWithPrefix=audioControls gameoptions_
useWithPrefix=subtitleControls gameoptions_
# volume tab
opYoffset=vBorder
gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight
opYoffset=(opYoffset + buttonHeight + 6)
useWithPrefix=volumeControls gameoptions_