diff options
author | Reid <reidyaro@gmail.com> | 2012-03-01 22:03:01 +0100 |
---|---|---|
committer | Reid <reidyaro@gmail.com> | 2012-03-01 22:03:01 +0100 |
commit | 490862919d79369112c75955a9c36ff8a081efd3 (patch) | |
tree | 6fe89466b9c53ba811f298174e6d787bbae71e09 /src/gui/setup_audio.cpp | |
parent | dff814619d63496acd3c4e8730b828b5d4d931fb (diff) | |
parent | d873da3e8e57480016596f714845c1bc7e712e68 (diff) | |
download | plus-490862919d79369112c75955a9c36ff8a081efd3.tar.gz plus-490862919d79369112c75955a9c36ff8a081efd3.tar.bz2 plus-490862919d79369112c75955a9c36ff8a081efd3.tar.xz plus-490862919d79369112c75955a9c36ff8a081efd3.zip |
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/gui/setup_audio.cpp')
-rw-r--r-- | src/gui/setup_audio.cpp | 226 |
1 files changed, 86 insertions, 140 deletions
diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp index bc058faf9..69ca4e759 100644 --- a/src/gui/setup_audio.cpp +++ b/src/gui/setup_audio.cpp @@ -23,179 +23,125 @@ #include "gui/setup_audio.h" #include "configuration.h" -#include "logger.h" #include "sound.h" -#include "gui/okdialog.h" +#include "gui/theme.h" #include "gui/viewport.h" -#include "gui/widgets/checkbox.h" -#include "gui/widgets/label.h" #include "gui/widgets/layouthelper.h" -#include "gui/widgets/slider.h" +#include "gui/widgets/namesmodel.h" +#include "gui/widgets/scrollarea.h" +#include "gui/widgets/setupitem.h" #include "utils/gettext.h" #include "debug.h" -Setup_Audio::Setup_Audio(): - mMusicVolume(config.getIntValue("musicVolume")), - mSfxVolume(config.getIntValue("sfxVolume")), - mAudioEnabled(config.getBoolValue("sound")), - mGameSoundEnabled(config.getBoolValue("playBattleSound")), - mGuiSoundEnabled(config.getBoolValue("playGuiSound")), - mMusicEnabled(config.getBoolValue("playMusic")), - mMumbleEnabled(config.getBoolValue("enableMumble")), - mDownloadEnabled(config.getBoolValue("download-music")), - mAudioCheckBox(new CheckBox(_("Enable Audio"), mAudioEnabled)), - mGameSoundCheckBox(new CheckBox(_("Enable game sfx"), mGameSoundEnabled)), - mGuiSoundCheckBox(new CheckBox(_("Enable gui sfx"), mGuiSoundEnabled)), - mMusicCheckBox(new CheckBox(_("Enable music"), mMusicEnabled)), - mMumbleCheckBox(new CheckBox(_("Enable mumble voice chat"), - mMumbleEnabled)), - mDownloadMusicCheckBox(new CheckBox(_("Download music"), - mDownloadEnabled)), - mSfxSlider(new Slider(0, sound.getMaxVolume())), - mMusicSlider(new Slider(0, sound.getMaxVolume())) +class SoundsModel : public NamesModel +{ +public: + SoundsModel() + { + mNames.push_back(gettext("(no sound)")); + Theme::fillSoundsList(mNames); + } + + virtual ~SoundsModel() + { } +}; + +Setup_Audio::Setup_Audio() { setName(_("Audio")); - setDimension(gcn::Rectangle(0, 0, 250, 200)); - gcn::Label *sfxLabel = new Label(_("Sfx volume")); - gcn::Label *musicLabel = new Label(_("Music volume")); + // Do the layout + LayoutHelper h(this); + ContainerPlacer place = h.getPlacer(0, 0); + place(0, 0, mScroll, 10, 10); + + mSoundModel = new SoundsModel(); - mSfxSlider->setActionEventId("sfx"); - mMusicSlider->setActionEventId("music"); + new SetupItemLabel(_("Basic settings"), "", this); - mSfxSlider->addActionListener(this); - mMusicSlider->addActionListener(this); + new SetupItemCheckBox(_("Enable Audio"), "", "sound", this, "soundEvent"); - mAudioCheckBox->setPosition(10, 10); + new SetupItemCheckBox(_("Enable music"), "", + "playMusic", this, "playMusicEvent"); - mSfxSlider->setValue(mSfxVolume); - mMusicSlider->setValue(mMusicVolume); + new SetupItemCheckBox(_("Enable game sfx"), "", + "playBattleSound", this, "playBattleSoundEvent"); - mSfxSlider->setWidth(90); - mMusicSlider->setWidth(90); + new SetupItemCheckBox(_("Enable gui sfx"), "", + "playGuiSound", this, "playGuiSoundEvent"); - // Do the layout - LayoutHelper h(this); - ContainerPlacer place = h.getPlacer(0, 0); + new SetupItemSlider(_("Sfx volume"), "", "sfxVolume", + this, "sfxVolumeEvent", 0, sound.getMaxVolume(), 150, true); + + new SetupItemSlider(_("Music volume"), "", "musicVolume", + this, "musicVolumeEvent", 0, sound.getMaxVolume(), 150, true); + + new SetupItemLabel(_("Sound effects"), "", this); + + new SetupItemSound(_("Information dialog sound"), "", + "soundinfo", this, "soundinfoEvent", mSoundModel); + + new SetupItemSound(_("Request dialog sound"), "", + "soundrequest", this, "soundrequestEvent", mSoundModel); + + new SetupItemSound(_("Whisper message sound"), "", + "soundwhisper", this, "soundwhisperEvent", mSoundModel); + + new SetupItemSound(_("Guild / Party message sound"), "", + "soundguild", this, "soundguildEvent", mSoundModel); + + new SetupItemSound(_("Highlight message sound"), "", + "soundhighlight", this, "soundhighlightEvent", mSoundModel); + + new SetupItemSound(_("Global message sound"), "", + "soundglobal", this, "soundglobalEvent", mSoundModel); + + new SetupItemSound(_("Error message sound"), "", + "sounderror", this, "sounderrorEvent", mSoundModel); + + new SetupItemSound(_("Trade request sound"), "", + "soundtrade", this, "soundtradeEvent", mSoundModel); + + new SetupItemLabel(_("Other"), "", this); + + new SetupItemCheckBox(_("Enable mumble voice chat"), "", + "enableMumble", this, "enableMumbleEvent"); - place(0, 0, mAudioCheckBox); - place(0, 1, mMusicCheckBox); - place(0, 2, mGameSoundCheckBox); - place(0, 3, mGuiSoundCheckBox); - place(0, 4, mSfxSlider); - place(1, 4, sfxLabel); - place(0, 5, mMusicSlider); - place(1, 5, musicLabel); - place(0, 6, mMumbleCheckBox); - place(0, 7, mDownloadMusicCheckBox); - - setDimension(gcn::Rectangle(0, 0, 365, 280)); + new SetupItemCheckBox(_("Download music"), "", + "download-music", this, "download-musicEvent"); + + setDimension(gcn::Rectangle(0, 0, 550, 350)); } -void Setup_Audio::apply() +Setup_Audio::~Setup_Audio() { - mAudioEnabled = mAudioCheckBox->isSelected(); - mGameSoundEnabled = mGameSoundCheckBox->isSelected(); - mGuiSoundEnabled = mGuiSoundCheckBox->isSelected(); - mMusicEnabled = mMusicCheckBox->isSelected(); - mMumbleEnabled = mMumbleCheckBox->isSelected(); - mDownloadEnabled = mDownloadMusicCheckBox->isSelected(); - mSfxVolume = config.getIntValue("sfxVolume"); - mMusicVolume = config.getIntValue("musicVolume"); - - config.setValue("sound", mAudioEnabled); - config.setValue("playBattleSound", mGameSoundEnabled); - config.setValue("playGuiSound", mGuiSoundEnabled); - - config.setValue("enableMumble", mMumbleEnabled); - - // Display a message if user has selected to download music, - // And if downloadmusic is not already enabled - if (mDownloadEnabled && !config.getBoolValue("download-music")) - { - new OkDialog(_("Notice"), _("You may have to restart your client " - "if you want to download new music")); - } - config.setValue("download-music", mDownloadEnabled); + delete mSoundModel; + mSoundModel = nullptr; +} - if (mAudioEnabled) +void Setup_Audio::apply() +{ + SetupTabScroll::apply(); + if (config.getBoolValue("sound")) { - try - { - sound.init(); - } - catch (const char *err) + sound.init(); + if (viewport && config.getBoolValue("playMusic")) { - new OkDialog(_("Sound Engine"), err); - logger->log("Warning: %s", err); + Map *map = viewport->getMap(); + if (map) + sound.playMusic(map->getMusicFile()); } - if (mMusicEnabled) - { - if (viewport && !config.getBoolValue("playMusic")) - { - Map *map = viewport->getMap(); - if (map) - { - config.setValue("playMusic", mMusicEnabled); - sound.playMusic(map->getMusicFile()); - } - } - } - else if (config.getBoolValue("playMusic")) + else { sound.stopMusic(); } - } else { sound.close(); } - - config.setValue("playMusic", mMusicEnabled); -} - -void Setup_Audio::cancel() -{ - mAudioCheckBox->setSelected(mAudioEnabled); - mGameSoundCheckBox->setSelected(mGameSoundEnabled); - mGuiSoundCheckBox->setSelected(mGuiSoundEnabled); - mMusicCheckBox->setSelected(mMusicEnabled); - mMumbleCheckBox->setSelected(mMumbleEnabled); - mDownloadMusicCheckBox->setSelected(mDownloadEnabled); - - sound.setSfxVolume(mSfxVolume); - mSfxSlider->setValue(mSfxVolume); - - sound.setMusicVolume(mMusicVolume); - mMusicSlider->setValue(mMusicVolume); - - config.setValue("sound", mAudioEnabled); - config.setValue("playBattleSound", mGameSoundEnabled); - config.setValue("playGuiSound", mGuiSoundEnabled); - config.setValue("enableMumble", mMumbleEnabled); - config.setValue("download-music", mDownloadEnabled); - config.setValue("sfxVolume", mSfxVolume); - config.setValue("musicVolume", mMusicVolume); - config.setValue("playMusic", mMusicEnabled); -} - -void Setup_Audio::action(const gcn::ActionEvent &event) -{ - if (event.getId() == "sfx") - { - config.setValueInt("sfxVolume", - static_cast<int>(mSfxSlider->getValue())); - sound.setSfxVolume(static_cast<int>(mSfxSlider->getValue())); - } - else if (event.getId() == "music") - { - config.setValueInt("musicVolume", - static_cast<int>(mMusicSlider->getValue())); - sound.setMusicVolume(static_cast<int>(mMusicSlider->getValue())); - } } |