diff options
| author | David Athay <ko2fan@gmail.com> | 2009-02-11 09:30:26 +0000 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2009-02-11 09:30:26 +0000 |
| commit | 91111ca5d13072ea3b834e23835df9c077329e39 (patch) | |
| tree | f0af8dd08b766164835cf9b5412a9aa3267dbad7 /src/gui/setup.cpp | |
| parent | 8046bb2626b30fecdcea54eb0aa3349cdb7d277b (diff) | |
| parent | 63ac001daa7dfc0735dfefd9c2829c8786b4edaf (diff) | |
| download | mana-client-91111ca5d13072ea3b834e23835df9c077329e39.tar.gz mana-client-91111ca5d13072ea3b834e23835df9c077329e39.tar.bz2 mana-client-91111ca5d13072ea3b834e23835df9c077329e39.tar.xz mana-client-91111ca5d13072ea3b834e23835df9c077329e39.zip | |
Merge branch 'master' of git@gitorious.org:tmw/eathena
Diffstat (limited to 'src/gui/setup.cpp')
| -rw-r--r-- | src/gui/setup.cpp | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp index d38fb2e3..09eaeff0 100644 --- a/src/gui/setup.cpp +++ b/src/gui/setup.cpp @@ -19,31 +19,30 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "setup.h" - #include "button.h" +#include "setup.h" #include "setup_audio.h" +#include "setup_colors.h" #include "setup_joystick.h" -#include "setup_video.h" #include "setup_keyboard.h" #include "setup_players.h" +#include "setup_video.h" #include "widgets/tabbedarea.h" #include "../utils/dtor.h" #include "../utils/gettext.h" -#include <algorithm> -#include <iostream> - -extern Window *statusWindow; -extern Window *minimap; extern Window *chatWindow; -extern Window *inventoryWindow; extern Window *equipmentWindow; extern Window *helpWindow; +extern Window *inventoryWindow; +extern Window *minimap; extern Window *skillDialog; +extern Window *statusWindow; extern Window *itemShortcutWindow; +extern Window *emoteShortcutWindow; +extern Window *emoteWindow; extern Window *tradeWindow; Setup::Setup(): @@ -58,7 +57,8 @@ Setup::Setup(): N_("Apply"), N_("Cancel"), N_("Reset Windows"), 0 }; int x = width; - for (const char **curBtn = buttonNames; *curBtn; ++curBtn) { + for (const char **curBtn = buttonNames; *curBtn; ++curBtn) + { Button *btn = new Button(gettext(*curBtn), *curBtn, this); x -= btn->getWidth() + 5; btn->setPosition(x, height - btn->getHeight() - 5); @@ -90,6 +90,10 @@ Setup::Setup(): panel->addTab(_("Keyboard"), tab); mTabs.push_back(tab); + tab = new Setup_Colors(); + panel->addTab(_("Colors"), tab); + mTabs.push_back(tab); + tab = new Setup_Players(); panel->addTab(_("Players"), tab); mTabs.push_back(tab); @@ -131,6 +135,8 @@ void Setup::action(const gcn::ActionEvent &event) helpWindow->resetToDefaultSize(); skillDialog->resetToDefaultSize(); itemShortcutWindow->resetToDefaultSize(); + emoteShortcutWindow->resetToDefaultSize(); + emoteWindow->resetToDefaultSize(); tradeWindow->resetToDefaultSize(); } } |