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/theme.cpp | |
| parent | c1ec2b921389cb5c44d9ae572ea4851891cf8bc9 (diff) | |
| parent | 9505e3789cc9db6a10a68b9794a586604271b76f (diff) | |
| download | manaplus-43c19a8321bd0c4bcf36655d74e895397aff7eea.tar.gz manaplus-43c19a8321bd0c4bcf36655d74e895397aff7eea.tar.bz2 manaplus-43c19a8321bd0c4bcf36655d74e895397aff7eea.tar.xz manaplus-43c19a8321bd0c4bcf36655d74e895397aff7eea.zip | |
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/gui/theme.cpp')
| -rw-r--r-- | src/gui/theme.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 92613a3b3..15554044d 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -26,7 +26,7 @@ #include "client.h" #include "configuration.h" -#include "log.h" +#include "logger.h" #include "resources/dye.h" #include "resources/image.h" @@ -599,6 +599,7 @@ static int readColorType(const std::string &type) "TEXT", "SHADOW", "OUTLINE", + "BORDER", "PROGRESS_BAR", "BUTTON", "BUTTON_DISABLED", @@ -608,11 +609,15 @@ static int readColorType(const std::string &type) "GUILD_CHAT_TAB", "GUILD_SOCIAL_TAB", "BACKGROUND", + "BACKGROUND_GRAY", + "SCROLLBAR_GRAY", + "DROPDOWN_SHADOW", "HIGHLIGHT", "TAB_FLASH", "TAB_PLAYER_FLASH", "SHOP_WARNING", "ITEM_EQUIPPED", + "ITEM_NOT_EQUIPPED", "CHAT", "GM", "PLAYER", |