[Scummvm-cvs-logs] scummvm master -> e8ee551e997cc3a12d5a824deb038d6f554a1858
lordhoto
lordhoto at gmail.com
Fri Nov 18 00:36:07 CET 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e8ee551e99 GUI: Disable speech volume slider in subtitle only mode.
Commit: e8ee551e997cc3a12d5a824deb038d6f554a1858
https://github.com/scummvm/scummvm/commit/e8ee551e997cc3a12d5a824deb038d6f554a1858
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-11-17T15:33:30-08:00
Commit Message:
GUI: Disable speech volume slider in subtitle only mode.
Changed paths:
gui/options.cpp
diff --git a/gui/options.cpp b/gui/options.cpp
index 4ded2ed..dfa30d1 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -570,6 +570,12 @@ void OptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data
// 'true' because if control is disabled then event do not pass
setVolumeSettingsState(true);
break;
+ case kSubtitleToggle:
+ // We update the slider settings here, when there are sliders, to
+ // disable the speech volume in case we are in subtitle only mode.
+ if (_musicVolumeSlider)
+ setVolumeSettingsState(true);
+ break;
case kSubtitleSpeedChanged:
_subSpeedLabel->setValue(_subSpeedSlider->getValue());
_subSpeedLabel->draw();
@@ -691,6 +697,9 @@ void OptionsDialog::setVolumeSettingsState(bool enabled) {
_sfxVolumeLabel->setEnabled(ena);
ena = enabled && !_muteCheckbox->getState();
+ // Disable speech volume slider, when we are in subtitle only mode.
+ if (_subToggleGroup)
+ ena = ena && _subToggleGroup->getValue() != kSubtitlesSubs;
if (_guioptions.contains(GUIO_NOSPEECH))
ena = false;
More information about the Scummvm-git-logs
mailing list