diff options
| author | Reid <reidyaro@gmail.com> | 2011-08-24 22:42:17 +0200 |
|---|---|---|
| committer | Reid <reidyaro@gmail.com> | 2011-08-24 22:42:17 +0200 |
| commit | 43c19a8321bd0c4bcf36655d74e895397aff7eea (patch) | |
| tree | c8f7933367ae1e757a3166a04772274896d58c9c /src/gui/setup_theme.h | |
| parent | c1ec2b921389cb5c44d9ae572ea4851891cf8bc9 (diff) | |
| parent | 9505e3789cc9db6a10a68b9794a586604271b76f (diff) | |
| download | mv-43c19a8321bd0c4bcf36655d74e895397aff7eea.tar.gz mv-43c19a8321bd0c4bcf36655d74e895397aff7eea.tar.bz2 mv-43c19a8321bd0c4bcf36655d74e895397aff7eea.tar.xz mv-43c19a8321bd0c4bcf36655d74e895397aff7eea.zip | |
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/gui/setup_theme.h')
| -rw-r--r-- | src/gui/setup_theme.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/gui/setup_theme.h b/src/gui/setup_theme.h index 0d141c0a5..c803cc296 100644 --- a/src/gui/setup_theme.h +++ b/src/gui/setup_theme.h @@ -1,9 +1,10 @@ /* - * The Mana World + * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 Andrei Karas + * Copyright (C) 2011 ManaPlus developers * - * This file is part of The Mana World. + * This file is part of The ManaPlus Client. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -73,6 +74,10 @@ class Setup_Theme : public SetupTab DropDown *mSecureFontDropDown; std::string mSecureFont; + gcn::Label *mJapanFontLabel; + DropDown *mJapanFontDropDown; + std::string mJapanFont; + FontSizeChoiceListModel *mFontSizeListModel; gcn::Label *fontSizeLabel; int mFontSize; |