diff options
| author | Eugene Sandulenko | 2009-08-08 18:01:44 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2009-08-08 18:01:44 +0000 |
| commit | 65a39cc2b0ebb989444330c561743ba0466c1a9c (patch) | |
| tree | e65267963d3b6af2fd0ccd7475257f01d82b9c8d /gui/options.cpp | |
| parent | c455e135b2eb89e9bf250dce2c5765a6afb284e0 (diff) | |
| download | scummvm-rg350-65a39cc2b0ebb989444330c561743ba0466c1a9c.tar.gz scummvm-rg350-65a39cc2b0ebb989444330c561743ba0466c1a9c.tar.bz2 scummvm-rg350-65a39cc2b0ebb989444330c561743ba0466c1a9c.zip | |
Implement FR#2821534: "GUI: Mute All disable volume sliders"
svn-id: r43131
Diffstat (limited to 'gui/options.cpp')
| -rw-r--r-- | gui/options.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/gui/options.cpp b/gui/options.cpp index 0d2d6e0120..e941cd6244 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -48,6 +48,7 @@ enum { kMidiGainChanged = 'mgch', kMusicVolumeChanged = 'muvc', kSfxVolumeChanged = 'sfvc', + kMuteAllChanged = 'mute', kSubtitleToggle = 'sttg', kSubtitleSpeedChanged = 'stsc', kSpeechVolumeChanged = 'vcvc', @@ -454,6 +455,10 @@ void OptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data _speechVolumeLabel->setValue(_speechVolumeSlider->getValue()); _speechVolumeLabel->draw(); break; + case kMuteAllChanged: + // 'true' because if control is disabled then event do not pass + setVolumeSettingsState(true); + break; case kSubtitleToggle: if (_subMode < 2) _subMode++; @@ -535,7 +540,7 @@ void OptionsDialog::setVolumeSettingsState(bool enabled) { _enableVolumeSettings = enabled; - ena = enabled; + ena = enabled && !_muteCheckbox->getState(); if (_guioptions & Common::GUIO_NOMUSIC) ena = false; @@ -543,7 +548,7 @@ void OptionsDialog::setVolumeSettingsState(bool enabled) { _musicVolumeSlider->setEnabled(ena); _musicVolumeLabel->setEnabled(ena); - ena = enabled; + ena = enabled && !_muteCheckbox->getState(); if (_guioptions & Common::GUIO_NOSFX) ena = false; @@ -551,7 +556,7 @@ void OptionsDialog::setVolumeSettingsState(bool enabled) { _sfxVolumeSlider->setEnabled(ena); _sfxVolumeLabel->setEnabled(ena); - ena = enabled; + ena = enabled && !_muteCheckbox->getState(); if (_guioptions & Common::GUIO_NOSPEECH) ena = false; @@ -701,7 +706,7 @@ void OptionsDialog::addVolumeControls(GuiObject *boss, const String &prefix) { _musicVolumeSlider->setMaxValue(Audio::Mixer::kMaxMixerVolume); _musicVolumeLabel->setFlags(WIDGET_CLEARBG); - _muteCheckbox = new CheckboxWidget(boss, prefix + "vcMuteCheckbox", "Mute All", 0, 0); + _muteCheckbox = new CheckboxWidget(boss, prefix + "vcMuteCheckbox", "Mute All", kMuteAllChanged, 0); _sfxVolumeDesc = new StaticTextWidget(boss, prefix + "vcSfxText", "SFX volume:"); |