diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-09-19 17:28:33 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-09-19 17:28:33 +0000 |
| commit | 1a9320fafb23940d0463e6f384713d0f99fc0c61 (patch) | |
| tree | d152680dbdc8febf0b5a445ba760255068d72f04 /src/gui/setup.cpp | |
| parent | 2f027ebcf8f0ad78f7edf58af7dda94d89034c85 (diff) | |
| download | mana-client-1a9320fafb23940d0463e6f384713d0f99fc0c61.tar.gz mana-client-1a9320fafb23940d0463e6f384713d0f99fc0c61.tar.bz2 mana-client-1a9320fafb23940d0463e6f384713d0f99fc0c61.tar.xz mana-client-1a9320fafb23940d0463e6f384713d0f99fc0c61.zip | |
Merged 0.0 changes from revision 3362 to 3580 to trunk.
Diffstat (limited to 'src/gui/setup.cpp')
| -rw-r--r-- | src/gui/setup.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp index 3ea19059..6a13232a 100644 --- a/src/gui/setup.cpp +++ b/src/gui/setup.cpp @@ -27,6 +27,7 @@ #include "setup_audio.h" #include "setup_joystick.h" #include "setup_video.h" +#include "setup_keyboard.h" #include "tabbedcontainer.h" #include "../utils/dtor.h" @@ -43,7 +44,8 @@ extern Window *skillDialog; Setup::Setup(): Window(_("Setup")) { - int width = 230; + setCloseButton(true); + int width = 250; int height = 245; setContentSize(width, height); @@ -59,7 +61,7 @@ Setup::Setup(): } TabbedContainer *panel = new TabbedContainer(); - panel->setDimension(gcn::Rectangle(5, 5, 220, 205)); + panel->setDimension(gcn::Rectangle(5, 5, 250, 205)); panel->setOpaque(false); SetupTab *tab; @@ -76,6 +78,10 @@ Setup::Setup(): panel->addTab(tab, _("Joystick")); mTabs.push_back(tab); + tab = new Setup_Keyboard(); + panel->addTab(tab, "Keyboard"); + mTabs.push_back(tab); + add(panel); setLocationRelativeTo(getParent()); |