summaryrefslogtreecommitdiff
path: root/src/gui/setup.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-01-13 22:07:29 +0100
committerIra Rice <irarice@gmail.com>2009-01-15 15:06:47 -0700
commit731dcee8bec7e32d576b0e6a9d98b9a21050362e (patch)
treeb2e289fbe90553f44d289565d46065fa5c41d6f0 /src/gui/setup.cpp
parent10a9dbacd9334caede10f1b21d42cdf7e1efcd03 (diff)
downloadmana-client-731dcee8bec7e32d576b0e6a9d98b9a21050362e.tar.gz
mana-client-731dcee8bec7e32d576b0e6a9d98b9a21050362e.tar.bz2
mana-client-731dcee8bec7e32d576b0e6a9d98b9a21050362e.tar.xz
mana-client-731dcee8bec7e32d576b0e6a9d98b9a21050362e.zip
Merged Tab and TabbedArea from mainline
Changes mostly done by David Athay. Currently these widgets are only used in the setup window, where they replace the previously used TabbedContainer.
Diffstat (limited to 'src/gui/setup.cpp')
-rw-r--r--src/gui/setup.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 551fe5bb..bd5a25f9 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -30,7 +30,8 @@
#include "setup_keyboard.h"
#include "setup_players.h"
#include "setup_video.h"
-#include "tabbedcontainer.h"
+
+#include "widgets/tabbedarea.h"
#include "../utils/dtor.h"
#include "../utils/gettext.h"
@@ -48,7 +49,7 @@ extern Window *emoteWindow;
extern Window *tradeWindow;
Setup::Setup():
- Window("Setup")
+ Window(_("Setup"))
{
setCloseButton(true);
int width = 310;
@@ -71,34 +72,33 @@ Setup::Setup():
btn->setEnabled(statusWindow != NULL);
}
- TabbedContainer *panel = new TabbedContainer(width, 5, 20, 45, 5, 3);
- panel->setDimension(gcn::Rectangle(5, 5, width, height - 40));
- panel->setOpaque(false);
+ TabbedArea *panel = new TabbedArea();
+ panel->setDimension(gcn::Rectangle(5, 5, width - 10, height - 40));
SetupTab *tab;
tab = new Setup_Video();
- panel->addTab(tab, _("Video"));
+ panel->addTab(_("Video"), tab);
mTabs.push_back(tab);
tab = new Setup_Audio();
- panel->addTab(tab, _("Audio"));
+ panel->addTab(_("Audio"), tab);
mTabs.push_back(tab);
tab = new Setup_Joystick();
- panel->addTab(tab, _("Joystick"));
+ panel->addTab(_("Joystick"), tab);
mTabs.push_back(tab);
tab = new Setup_Keyboard();
- panel->addTab(tab, _("Keyboard"));
+ panel->addTab(_("Keyboard"), tab);
mTabs.push_back(tab);
tab = new Setup_Colours();
- panel->addTab(tab, _("Colors"));
+ panel->addTab(_("Colors"), tab);
mTabs.push_back(tab);
tab = new Setup_Players();
- panel->addTab(tab, _("Players"));
+ panel->addTab(_("Players"), tab);
mTabs.push_back(tab);
add(panel);