aboutsummaryrefslogtreecommitdiff
path: root/gui/launcher.cpp
diff options
context:
space:
mode:
authorMax Horn2006-05-13 17:30:04 +0000
committerMax Horn2006-05-13 17:30:04 +0000
commit0d6362ea485f89a940ffadd1c6fe954f94309c53 (patch)
tree1b6c0e09ff11ae5cb4d193333981304b6497c4d5 /gui/launcher.cpp
parent61c3f9d4aae5d7cbbc706a9fb1ecd0ef0f21bbf2 (diff)
downloadscummvm-rg350-0d6362ea485f89a940ffadd1c6fe954f94309c53.tar.gz
scummvm-rg350-0d6362ea485f89a940ffadd1c6fe954f94309c53.tar.bz2
scummvm-rg350-0d6362ea485f89a940ffadd1c6fe954f94309c53.zip
Patch #1091170: ALL, SCUMM: Subtitle speed control
svn-id: r22456
Diffstat (limited to 'gui/launcher.cpp')
-rw-r--r--gui/launcher.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index 92bc6b0fc8..a68a514b05 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -189,7 +189,9 @@ EditGameDialog::EditGameDialog(const String &domain, const String &desc)
_platformPopUp->appendEntry(p->description, p->id);
}
+ //
// 2) The 'Path' tab
+ //
tab->addTab("Paths");
// These buttons have to be extra wide, or the text will be truncated
@@ -230,6 +232,7 @@ EditGameDialog::EditGameDialog(const String &domain, const String &desc)
_globalAudioOverride = new CheckboxWidget(tab, "gameoptions_audioCheckbox", "Override global audio settings", kCmdGlobalAudioOverride, 0);
addAudioControls(tab, "gameoptions_");
+ addSubtitleControls(tab, "gameoptions_");
//
// 5) The MIDI tab
@@ -249,7 +252,6 @@ EditGameDialog::EditGameDialog(const String &domain, const String &desc)
addVolumeControls(tab, "gameoptions_");
-
// Activate the first tab
tab->setActiveTab(0);
@@ -271,7 +273,8 @@ void EditGameDialog::open() {
_globalGraphicsOverride->setState(e);
e = ConfMan.hasKey("music_driver", _domain) ||
- ConfMan.hasKey("subtitles", _domain);
+ ConfMan.hasKey("subtitles", _domain) ||
+ ConfMan.hasKey("talkspeed", _domain);
_globalAudioOverride->setState(e);
e = ConfMan.hasKey("multi_midi", _domain) ||
@@ -346,6 +349,7 @@ void EditGameDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat
break;
case kCmdGlobalAudioOverride:
setAudioSettingsState(data != 0);
+ setSubtitleSettingsState(data != 0);
draw();
break;
case kCmdGlobalMIDIOverride:
@@ -356,7 +360,6 @@ void EditGameDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat
setVolumeSettingsState(data != 0);
draw();
break;
-
case kCmdChooseSoundFontCmd: {
BrowserDialog browser("Select SoundFont", false);