Splitted setup window into manageable pieces according to their tabs in the window. Fixed some memory leaks along the way. Also fixed two settings not being stored on "apply".

1 files changed, 124 insertions, 0 deletions

diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
new file mode 100644
index 00000000..a640887b
--- /dev/null
+++ b/src/gui/setup_audio.cpp
@@ -0,0 +1,124 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include "setup_audio.h"
+
+#include <guichan/widgets/label.hpp>
+
+#include "checkbox.h"
+#include "ok_dialog.h"
+#include "slider.h"
+
+#include "../configuration.h"
+#include "../log.h"
+#include "../sound.h"
+
+Setup_Audio::Setup_Audio():
+    mSoundCheckBox(new CheckBox("Sound", false)),
+    mSfxSlider(new Slider(0, 128)),
+    mMusicSlider(new Slider(0, 128)),
+    mMusicVolume((int)config.getValue("musicVolume", 60)),
+    mSfxVolume((int)config.getValue("sfxVolume", 100)),
+    mSoundEnabled(config.getValue("sound", 0))
+{
+    setOpaque(false);
+
+    gcn::Label *sfxLabel = new gcn::Label("Sfx volume");
+    gcn::Label *musicLabel = new gcn::Label("Music volume");
+
+    mSfxSlider->setEventId("sfx");
+    mMusicSlider->setEventId("music");
+
+    mSfxSlider->addActionListener(this);
+    mMusicSlider->addActionListener(this);
+
+    mSoundCheckBox->setPosition(10, 10);
+    mSfxSlider->setDimension(gcn::Rectangle(10, 30, 100, 10));
+    mMusicSlider->setDimension(gcn::Rectangle(10, 50, 100, 10));
+    sfxLabel->setPosition(20 + mSfxSlider->getWidth(), 27);
+    musicLabel->setPosition(20 + mMusicSlider->getWidth(), 47);
+
+    mSoundCheckBox->setMarked(mSoundEnabled);
+    mSfxSlider->setValue(mSfxVolume);
+    mMusicSlider->setValue(mMusicVolume);
+
+    add(mSoundCheckBox);
+    add(mSfxSlider);
+    add(mMusicSlider);
+    add(sfxLabel);
+    add(musicLabel);
+}
+
+void Setup_Audio::apply()
+{
+    if (mSoundCheckBox->isMarked())
+    {
+        config.setValue("sound", 1);
+        try {
+            sound.init();
+        }
+        catch (const char *err)
+        {
+            new OkDialog("Sound Engine", err);
+            logger->log("Warning: %s", err);
+        }
+    }
+    else
+    {
+        config.setValue("sound", 0);
+        sound.close();
+    }
+
+    mSoundEnabled = config.getValue("sound", 0);
+    mSfxVolume = (int)config.getValue("sfxVolume", 100);
+    mMusicVolume = (int)config.getValue("musicVolume", 60);
+}
+
+void Setup_Audio::cancel()
+{
+    mSoundCheckBox->setMarked(mSoundEnabled);
+
+    sound.setSfxVolume(mSfxVolume);
+    mSfxSlider->setValue(mSfxVolume);
+
+    sound.setMusicVolume(mMusicVolume);
+    mMusicSlider->setValue(mMusicVolume);
+
+    config.setValue("sound", mSoundEnabled ? 1 : 0);
+    config.setValue("sfxVolume", mSfxVolume ? 1 : 0);
+    config.setValue("musicVolume", mMusicVolume);
+}
+
+void Setup_Audio::action(const std::string &event)
+{
+    if (event == "sfx")
+    {
+        config.setValue("sfxVolume", (int)mSfxSlider->getValue());
+        sound.setSfxVolume((int)mSfxSlider->getValue());
+    }
+    else if (event == "music")
+    {
+        config.setValue("musicVolume", (int)mMusicSlider->getValue());
+        sound.setMusicVolume((int)mMusicSlider->getValue());
+    }
+}