diff options
author | Andrei Karas <akaras@inbox.ru> | 2018-02-19 18:18:16 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2018-02-19 18:18:16 +0300 |
commit | 4f3dca2f9338402005c1bc5b6043d583f58390f0 (patch) | |
tree | 6d6477c11f46f7e16afbc0425ab4b5cb30e1d716 /src/gui | |
parent | 428746384072d9f8bd9320c880430bbb68815f3e (diff) | |
download | mv-4f3dca2f9338402005c1bc5b6043d583f58390f0.tar.gz mv-4f3dca2f9338402005c1bc5b6043d583f58390f0.tar.bz2 mv-4f3dca2f9338402005c1bc5b6043d583f58390f0.tar.xz mv-4f3dca2f9338402005c1bc5b6043d583f58390f0.zip |
Move theme colors enums and strings into combined file.
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/theme.cpp | 240 | ||||
-rw-r--r-- | src/gui/themecolortype.h | 255 |
2 files changed, 267 insertions, 228 deletions
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 4829b6789..4211fb2be 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -662,239 +662,16 @@ ImageSet *Theme::getImageSetFromTheme(const std::string &path, return Loader::getImageSet(resolveThemePath(path), w, h); } +#define themeEnumStart(name) #name, +#define themeEnum(name) #name, +#define themeEnumEnd(name) + static int readColorType(const std::string &type) { static const std::string colors[CAST_SIZE( ThemeColorId::THEME_COLORS_END)] = { - "BROWSERBOX", - "BROWSERBOX_OUTLINE", - "SELFNICK", - "SELFNICK_OUTLINE", - "TEXT", - "TEXT_OUTLINE", - "CARET", - "SHADOW", - "OUTLINE", - "BORDER", - "PROGRESS_BAR", - "PROGRESS_BAR_OUTLINE", - "BUTTON", - "BUTTON_OUTLINE", - "BUTTON_DISABLED", - "BUTTON_DISABLED_OUTLINE", - "BUTTON_HIGHLIGHTED", - "BUTTON_HIGHLIGHTED_OUTLINE", - "BUTTON_PRESSED", - "BUTTON_PRESSED_OUTLINE", - "CHECKBOX", - "CHECKBOX_OUTLINE", - "DROPDOWN", - "DROPDOWN_OUTLINE", - "LABEL", - "LABEL_OUTLINE", - "LISTBOX", - "LISTBOX_OUTLINE", - "LISTBOX_SELECTED", - "LISTBOX_SELECTED_OUTLINE", - "RADIOBUTTON", - "RADIOBUTTON_OUTLINE", - "POPUP", - "POPUP_OUTLINE", - "TAB", - "TAB_OUTLINE", - "TAB_HIGHLIGHTED", - "TAB_HIGHLIGHTED_OUTLINE", - "TAB_SELECTED", - "TAB_SELECTED_OUTLINE", - "TEXTBOX", - "TEXTFIELD", - "TEXTFIELD_OUTLINE", - "WINDOW", - "WINDOW_OUTLINE", - "BATTLE_CHAT_TAB", - "BATTLE_CHAT_TAB_OUTLINE", - "CHANNEL_CHAT_TAB", - "CHANNEL_CHAT_TAB_OUTLINE", - "PARTY_CHAT_TAB", - "PARTY_CHAT_TAB_OUTLINE", - "PARTY_SOCIAL_TAB", - "PARTY_SOCIAL_TAB_OUTLINE", - "GUILD_CHAT_TAB", - "GUILD_CHAT_TAB_OUTLINE", - "GUILD_SOCIAL_TAB", - "GUILD_SOCIAL_TAB_OUTLINE", - "GM_CHAT_TAB", - "GM_CHAT_TAB_OUTLINE", - "CLAN_CHAT_TAB", - "CLAN_CHAT_TAB_OUTLINE", - "BATTLE_CHAT_TAB_HIGHLIGHTED", - "BATTLE_CHAT_TAB_HIGHLIGHTED_OUTLINE", - "CHANNEL_CHAT_TAB_HIGHLIGHTED", - "CHANNEL_CHAT_TAB_HIGHLIGHTED_OUTLINE", - "PARTY_CHAT_TAB_HIGHLIGHTED", - "PARTY_CHAT_TAB_HIGHLIGHTED_OUTLINE", - "PARTY_SOCIAL_TAB_HIGHLIGHTED", - "PARTY_SOCIAL_TAB_HIGHLIGHTED_OUTLINE", - "GUILD_CHAT_TAB_HIGHLIGHTED", - "GUILD_CHAT_TAB_HIGHLIGHTED_OUTLINE", - "GUILD_SOCIAL_TAB_HIGHLIGHTED", - "GUILD_SOCIAL_TAB_HIGHLIGHTED_OUTLINE", - "GM_CHAT_TAB_HIGHLIGHTED", - "GM_CHAT_TAB_HIGHLIGHTED_OUTLINE", - "CLAN_CHAT_TAB_HIGHLIGHTED", - "CLAN_CHAT_TAB_HIGHLIGHTED_OUTLINE", - "BATTLE_CHAT_TAB_SELECTED", - "BATTLE_CHAT_TAB_SELECTED_OUTLINE", - "CHANNEL_CHAT_TAB_SELECTED", - "CHANNEL_CHAT_TAB_SELECTED_OUTLINE", - "PARTY_CHAT_TAB_SELECTED", - "PARTY_CHAT_TAB_SELECTED_OUTLINE", - "PARTY_SOCIAL_TAB_SELECTED", - "PARTY_SOCIAL_TAB_SELECTED_OUTLINE", - "GUILD_CHAT_TAB_SELECTED", - "GUILD_CHAT_TAB_SELECTED_OUTLINE", - "GUILD_SOCIAL_TAB_SELECTED", - "GUILD_SOCIAL_TAB_SELECTED_OUTLINE", - "GM_CHAT_TAB_SELECTED", - "GM_CHAT_TAB_SELECTED_OUTLINE", - "CLAN_CHAT_TAB_SELECTED", - "CLAN_CHAT_TAB_SELECTED_OUTLINE", - "BACKGROUND", - "BACKGROUND_GRAY", - "SCROLLBAR_GRAY", - "DROPDOWN_SHADOW", - "HIGHLIGHT", - "HIGHLIGHT_OUTLINE", - "TAB_FLASH", - "TAB_FLASH_OUTLINE", - "TAB_PLAYER_FLASH", - "TAB_PLAYER_FLASH_OUTLINE", - "SHOP_WARNING", - "ITEM_EQUIPPED", - "ITEM_EQUIPPED_OUTLINE", - "ITEM_NOT_EQUIPPED", - "ITEM_NOT_EQUIPPED_OUTLINE", - "CHAT", - "CHAT_OUTLINE", - "GM", - "GM_OUTLINE", - "GLOBAL", - "GLOBAL_OUTLINE", - "PLAYER", - "PLAYER_OUTLINE", - "WHISPER_TAB", - "WHISPER_TAB_OUTLINE", - "WHISPER_TAB_OFFLINE", - "WHISPER_TAB_OFFLINE_OUTLINE", - "WHISPER_TAB_HIGHLIGHTED", - "WHISPER_TAB_HIGHLIGHTED_OUTLINE", - "WHISPER_TAB_OFFLINE_HIGHLIGHTED", - "WHISPER_TAB_OFFLINE_HIGHLIGHTED_OUTLINE", - "WHISPER_TAB_SELECTED", - "WHISPER_TAB_SELECTED_OUTLINE", - "WHISPER_TAB_OFFLINE_SELECTED", - "WHISPER_TAB_OFFLINE_SELECTED_OUTLINE", - "IS", - "IS_OUTLINE", - "SERVER", - "SERVER_OUTLINE", - "LOGGER", - "LOGGER_OUTLINE", - "HYPERLINK", - "HYPERLINK_OUTLINE", - "UNKNOWN_ITEM", - "UNKNOWN_ITEM_OUTLINE", - "GENERIC", - "GENERIC_OUTLINE", - "HEAD", - "HEAD_OUTLINE", - "USABLE", - "USABLE_OUTLINE", - "TORSO", - "TORSO_OUTLINE", - "ONEHAND", - "ONEHAND_OUTLINE", - "LEGS", - "LEGS_OUTLINE", - "FEET", - "FEET_OUTLINE", - "TWOHAND", - "TWOHAND_OUTLINE", - "SHIELD", - "SHIELD_OUTLINE", - "RING", - "RING_OUTLINE", - "NECKLACE", - "NECKLACE_OUTLINE", - "ARMS", - "ARMS_OUTLINE", - "AMMO", - "AMMO_OUTLINE", - "SERVER_VERSION_NOT_SUPPORTED", - "SERVER_VERSION_NOT_SUPPORTED_OUTLINE", - "WARNING", - "WARNING_OUTLINE", - "CHARM", - "CHARM_OUTLINE", - "CARD", - "CARD_OUTLINE", - "PLAYER_ADVANCED", - "PLAYER_ADVANCED_OUTLINE", - "BUBBLE_NAME", - "BUBBLE_NAME_OUTLINE", - "BUBBLE_TEXT", - "BUBBLE_TEXT_OUTLINE", - "BLACK", - "BLACK_OUTLINE", - "RED", - "RED_OUTLINE", - "GREEN", - "GREEN_OUTLINE", - "BLUE", - "BLUE_OUTLINE", - "ORANGE", - "ORANGE_OUTLINE", - "YELLOW", - "YELLOW_OUTLINE", - "PINK", - "PINK_OUTLINE", - "PURPLE", - "PURPLE_OUTLINE", - "GRAY", - "GRAY_OUTLINE", - "BROWN", - "BROWN_OUTLINE", - "STATUSBAR_ON", - "STATUSBAR_OFF", - "TABLE_BACKGROUND", - "SLOTS_BAR", - "SLOTS_BAR_OUTLINE", - "HP_BAR", - "HP_BAR_OUTLINE", - "MP_BAR", - "MP_BAR_OUTLINE", - "NO_MP_BAR", - "NO_MP_BAR_OUTLINE", - "XP_BAR", - "XP_BAR_OUTLINE", - "WEIGHT_BAR", - "WEIGHT_BAR_OUTLINE", - "MONEY_BAR", - "MONEY_BAR_OUTLINE", - "ARROWS_BAR", - "ARROWS_BAR_OUTLINE", - "STATUS_BAR", - "STATUS_BAR_OUTLINE", - "JOB_BAR", - "JOB_BAR_OUTLINE", - "OLDCHAT", - "OLDCHAT_OUTLINE", - "AWAYCHAT", - "AWAYCHAT_OUTLINE", - "SKILL_COOLDOWN", - "TEXT_DISABLED", - "TEXT_DISABLED_OUTLINE" +#include "gui/themecolortype.h" }; if (type.empty()) @@ -909,6 +686,13 @@ static int readColorType(const std::string &type) return -1; } +THEMECOLORTYPE_VOID + +#undef themeEnumStart +#undef themeEnum +#undef themeEnumEnd +#undef THEMECOLORTYPE_VOID + static Color readColor(const std::string &description) { const int size = static_cast<int>(description.length()); diff --git a/src/gui/themecolortype.h b/src/gui/themecolortype.h new file mode 100644 index 000000000..666aebbc8 --- /dev/null +++ b/src/gui/themecolortype.h @@ -0,0 +1,255 @@ +/* + * The ManaPlus Client + * Copyright (C) 2008 The Legend of Mazzeroth Development Team + * Copyright (C) 2009 Aethyra Development Team + * Copyright (C) 2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2018 The ManaPlus Developers + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#define THEMECOLORTYPE_VOID + +themeEnumStart(BROWSERBOX) +themeEnum(BROWSERBOX_OUTLINE) +themeEnum(SELFNICK) +themeEnum(SELFNICK_OUTLINE) +themeEnum(TEXT) +themeEnum(TEXT_OUTLINE) +themeEnum(CARET) +themeEnum(SHADOW) +themeEnum(OUTLINE) +themeEnum(BORDER) +themeEnum(PROGRESS_BAR) +themeEnum(PROGRESS_BAR_OUTLINE) +themeEnum(BUTTON) +themeEnum(BUTTON_OUTLINE) +themeEnum(BUTTON_DISABLED) +themeEnum(BUTTON_DISABLED_OUTLINE) +themeEnum(BUTTON_HIGHLIGHTED) +themeEnum(BUTTON_HIGHLIGHTED_OUTLINE) +themeEnum(BUTTON_PRESSED) +themeEnum(BUTTON_PRESSED_OUTLINE) +themeEnum(CHECKBOX) +themeEnum(CHECKBOX_OUTLINE) +themeEnum(DROPDOWN) +themeEnum(DROPDOWN_OUTLINE) +themeEnum(LABEL) +themeEnum(LABEL_OUTLINE) +themeEnum(LISTBOX) +themeEnum(LISTBOX_OUTLINE) +themeEnum(LISTBOX_SELECTED) +themeEnum(LISTBOX_SELECTED_OUTLINE) +themeEnum(RADIOBUTTON) +themeEnum(RADIOBUTTON_OUTLINE) +themeEnum(POPUP) +themeEnum(POPUP_OUTLINE) +themeEnum(TAB) +themeEnum(TAB_OUTLINE) +themeEnum(TAB_HIGHLIGHTED) +themeEnum(TAB_HIGHLIGHTED_OUTLINE) +themeEnum(TAB_SELECTED) +themeEnum(TAB_SELECTED_OUTLINE) +themeEnum(TEXTBOX) +themeEnum(TEXTFIELD) +themeEnum(TEXTFIELD_OUTLINE) +themeEnum(WINDOW) +themeEnum(WINDOW_OUTLINE) +themeEnum(BATTLE_CHAT_TAB) +themeEnum(BATTLE_CHAT_TAB_OUTLINE) +themeEnum(CHANNEL_CHAT_TAB) +themeEnum(CHANNEL_CHAT_TAB_OUTLINE) +themeEnum(PARTY_CHAT_TAB) +themeEnum(PARTY_CHAT_TAB_OUTLINE) +themeEnum(PARTY_SOCIAL_TAB) +themeEnum(PARTY_SOCIAL_TAB_OUTLINE) +themeEnum(GUILD_CHAT_TAB) +themeEnum(GUILD_CHAT_TAB_OUTLINE) +themeEnum(GUILD_SOCIAL_TAB) +themeEnum(GUILD_SOCIAL_TAB_OUTLINE) +themeEnum(GM_CHAT_TAB) +themeEnum(GM_CHAT_TAB_OUTLINE) +themeEnum(CLAN_CHAT_TAB) +themeEnum(CLAN_CHAT_TAB_OUTLINE) +themeEnum(BATTLE_CHAT_TAB_HIGHLIGHTED) +themeEnum(BATTLE_CHAT_TAB_HIGHLIGHTED_OUTLINE) +themeEnum(CHANNEL_CHAT_TAB_HIGHLIGHTED) +themeEnum(CHANNEL_CHAT_TAB_HIGHLIGHTED_OUTLINE) +themeEnum(PARTY_CHAT_TAB_HIGHLIGHTED) +themeEnum(PARTY_CHAT_TAB_HIGHLIGHTED_OUTLINE) +themeEnum(PARTY_SOCIAL_TAB_HIGHLIGHTED) +themeEnum(PARTY_SOCIAL_TAB_HIGHLIGHTED_OUTLINE) +themeEnum(GUILD_CHAT_TAB_HIGHLIGHTED) +themeEnum(GUILD_CHAT_TAB_HIGHLIGHTED_OUTLINE) +themeEnum(GUILD_SOCIAL_TAB_HIGHLIGHTED) +themeEnum(GUILD_SOCIAL_TAB_HIGHLIGHTED_OUTLINE) +themeEnum(GM_CHAT_TAB_HIGHLIGHTED) +themeEnum(GM_CHAT_TAB_HIGHLIGHTED_OUTLINE) +themeEnum(CLAN_CHAT_TAB_HIGHLIGHTED) +themeEnum(CLAN_CHAT_TAB_HIGHLIGHTED_OUTLINE) +themeEnum(BATTLE_CHAT_TAB_SELECTED) +themeEnum(BATTLE_CHAT_TAB_SELECTED_OUTLINE) +themeEnum(CHANNEL_CHAT_TAB_SELECTED) +themeEnum(CHANNEL_CHAT_TAB_SELECTED_OUTLINE) +themeEnum(PARTY_CHAT_TAB_SELECTED) +themeEnum(PARTY_CHAT_TAB_SELECTED_OUTLINE) +themeEnum(PARTY_SOCIAL_TAB_SELECTED) +themeEnum(PARTY_SOCIAL_TAB_SELECTED_OUTLINE) +themeEnum(GUILD_CHAT_TAB_SELECTED) +themeEnum(GUILD_CHAT_TAB_SELECTED_OUTLINE) +themeEnum(GUILD_SOCIAL_TAB_SELECTED) +themeEnum(GUILD_SOCIAL_TAB_SELECTED_OUTLINE) +themeEnum(GM_CHAT_TAB_SELECTED) +themeEnum(GM_CHAT_TAB_SELECTED_OUTLINE) +themeEnum(CLAN_CHAT_TAB_SELECTED) +themeEnum(CLAN_CHAT_TAB_SELECTED_OUTLINE) +themeEnum(BACKGROUND) +themeEnum(BACKGROUND_GRAY) +themeEnum(SCROLLBAR_GRAY) +themeEnum(DROPDOWN_SHADOW) +themeEnum(HIGHLIGHT) +themeEnum(HIGHLIGHT_OUTLINE) +themeEnum(TAB_FLASH) +themeEnum(TAB_FLASH_OUTLINE) +themeEnum(TAB_PLAYER_FLASH) +themeEnum(TAB_PLAYER_FLASH_OUTLINE) +themeEnum(SHOP_WARNING) +themeEnum(ITEM_EQUIPPED) +themeEnum(ITEM_EQUIPPED_OUTLINE) +themeEnum(ITEM_NOT_EQUIPPED) +themeEnum(ITEM_NOT_EQUIPPED_OUTLINE) +themeEnum(CHAT) +themeEnum(CHAT_OUTLINE) +themeEnum(GM) +themeEnum(GM_OUTLINE) +themeEnum(GLOBAL) +themeEnum(GLOBAL_OUTLINE) +themeEnum(PLAYER) +themeEnum(PLAYER_OUTLINE) +themeEnum(WHISPER_TAB) +themeEnum(WHISPER_TAB_OUTLINE) +themeEnum(WHISPER_TAB_OFFLINE) +themeEnum(WHISPER_TAB_OFFLINE_OUTLINE) +themeEnum(WHISPER_TAB_HIGHLIGHTED) +themeEnum(WHISPER_TAB_HIGHLIGHTED_OUTLINE) +themeEnum(WHISPER_TAB_OFFLINE_HIGHLIGHTED) +themeEnum(WHISPER_TAB_OFFLINE_HIGHLIGHTED_OUTLINE) +themeEnum(WHISPER_TAB_SELECTED) +themeEnum(WHISPER_TAB_SELECTED_OUTLINE) +themeEnum(WHISPER_TAB_OFFLINE_SELECTED) +themeEnum(WHISPER_TAB_OFFLINE_SELECTED_OUTLINE) +themeEnum(IS) +themeEnum(IS_OUTLINE) +themeEnum(SERVER) +themeEnum(SERVER_OUTLINE) +themeEnum(LOGGER) +themeEnum(LOGGER_OUTLINE) +themeEnum(HYPERLINK) +themeEnum(HYPERLINK_OUTLINE) +themeEnum(UNKNOWN_ITEM) +themeEnum(UNKNOWN_ITEM_OUTLINE) +themeEnum(GENERIC) +themeEnum(GENERIC_OUTLINE) +themeEnum(HEAD) +themeEnum(HEAD_OUTLINE) +themeEnum(USABLE) +themeEnum(USABLE_OUTLINE) +themeEnum(TORSO) +themeEnum(TORSO_OUTLINE) +themeEnum(ONEHAND) +themeEnum(ONEHAND_OUTLINE) +themeEnum(LEGS) +themeEnum(LEGS_OUTLINE) +themeEnum(FEET) +themeEnum(FEET_OUTLINE) +themeEnum(TWOHAND) +themeEnum(TWOHAND_OUTLINE) +themeEnum(SHIELD) +themeEnum(SHIELD_OUTLINE) +themeEnum(RING) +themeEnum(RING_OUTLINE) +themeEnum(NECKLACE) +themeEnum(NECKLACE_OUTLINE) +themeEnum(ARMS) +themeEnum(ARMS_OUTLINE) +themeEnum(AMMO) +themeEnum(AMMO_OUTLINE) +themeEnum(SERVER_VERSION_NOT_SUPPORTED) +themeEnum(SERVER_VERSION_NOT_SUPPORTED_OUTLINE) +themeEnum(WARNING) +themeEnum(WARNING_OUTLINE) +themeEnum(CHARM) +themeEnum(CHARM_OUTLINE) +themeEnum(CARD) +themeEnum(CARD_OUTLINE) +themeEnum(PLAYER_ADVANCED) +themeEnum(PLAYER_ADVANCED_OUTLINE) +themeEnum(BUBBLE_NAME) +themeEnum(BUBBLE_NAME_OUTLINE) +themeEnum(BUBBLE_TEXT) +themeEnum(BUBBLE_TEXT_OUTLINE) +themeEnum(BLACK) +themeEnum(BLACK_OUTLINE) +themeEnum(RED) +themeEnum(RED_OUTLINE) +themeEnum(GREEN) +themeEnum(GREEN_OUTLINE) +themeEnum(BLUE) +themeEnum(BLUE_OUTLINE) +themeEnum(ORANGE) +themeEnum(ORANGE_OUTLINE) +themeEnum(YELLOW) +themeEnum(YELLOW_OUTLINE) +themeEnum(PINK) +themeEnum(PINK_OUTLINE) +themeEnum(PURPLE) +themeEnum(PURPLE_OUTLINE) +themeEnum(GRAY) +themeEnum(GRAY_OUTLINE) +themeEnum(BROWN) +themeEnum(BROWN_OUTLINE) +themeEnum(STATUSBAR_ON) +themeEnum(STATUSBAR_OFF) +themeEnum(TABLE_BACKGROUND) +themeEnum(SLOTS_BAR) +themeEnum(SLOTS_BAR_OUTLINE) +themeEnum(HP_BAR) +themeEnum(HP_BAR_OUTLINE) +themeEnum(MP_BAR) +themeEnum(MP_BAR_OUTLINE) +themeEnum(NO_MP_BAR) +themeEnum(NO_MP_BAR_OUTLINE) +themeEnum(XP_BAR) +themeEnum(XP_BAR_OUTLINE) +themeEnum(WEIGHT_BAR) +themeEnum(WEIGHT_BAR_OUTLINE) +themeEnum(MONEY_BAR) +themeEnum(MONEY_BAR_OUTLINE) +themeEnum(ARROWS_BAR) +themeEnum(ARROWS_BAR_OUTLINE) +themeEnum(STATUS_BAR) +themeEnum(STATUS_BAR_OUTLINE) +themeEnum(JOB_BAR) +themeEnum(JOB_BAR_OUTLINE) +themeEnum(OLDCHAT) +themeEnum(OLDCHAT_OUTLINE) +themeEnum(AWAYCHAT) +themeEnum(AWAYCHAT_OUTLINE) +themeEnum(SKILL_COOLDOWN) +themeEnum(TEXT_DISABLED) +themeEnum(TEXT_DISABLED_OUTLINE) +themeEnumEnd(THEME_COLORS_END) |