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, 3 insertions, 23 deletions

diff --git a/src/gui/setup.h b/src/gui/setup.h
index fa870489..611633c5 100644
--- a/src/gui/setup.h
+++ b/src/gui/setup.h
@@ -24,14 +24,13 @@
 #ifndef _TMW_SETUP_H
 #define _TMW_SETUP_H
 
-#include <vector>
+#include <list>
 
 #include <guichan/actionlistener.hpp>
-#include <guichan/listmodel.hpp>
 
 #include "window.h"
 
-#include "../guichanfwd.h"
+class SetupTab;
 
 /**
  * The setup dialog.
@@ -58,26 +57,7 @@ class Setup : public Window, public gcn::ActionListener
         action(const std::string& eventId);
 
     private:
-        class ModeListModel *mModeListModel;
-
-        // Dialog widgets
-        gcn::ListBox *mModeList;
-        gcn::CheckBox *mFsCheckBox;
-        gcn::CheckBox *mOpenGLCheckBox;
-        gcn::CheckBox *mSoundCheckBox;
-        gcn::CheckBox *mCustomCursorCheckBox;
-        gcn::Slider *mAlphaSlider;
-        gcn::Slider *mSfxSlider, *mMusicSlider;
-        gcn::Label *mCalibrateLabel;
-        gcn::Button *mCalibrateButton;
-
-        // Variables that keeps old settings until the user "apply" them...
-        int mMusicVolume, mSfxVolume;
-        double mOpacity;
-        bool mFullScreenEnabled;
-        bool mOpenGLEnabled;
-        bool mCustomCursorEnabled;
-        bool mSoundEnabled;
+        std::list<SetupTab*> mTabs;
 };
 
 #endif