Move theme colors enum into separate file.

12 files changed, 37 insertions, 37 deletions

diff --git a/src/gui/widgets/tabs/chat/battletab.cpp b/src/gui/widgets/tabs/chat/battletab.cpp
index cedee0d90..70d9aa44d 100644
--- a/src/gui/widgets/tabs/chat/battletab.cpp
+++ b/src/gui/widgets/tabs/chat/battletab.cpp
@@ -34,7 +34,7 @@ BattleTab::BattleTab(const Widget2 *const widget) :
     // TRANSLATORS: battle chat tab name
     ChatTab(widget, _("Battle"), "", "#Battle", ChatTabType::BATTLE)
 {
-    setTabColors(Theme::BATTLE_CHAT_TAB);
+    setTabColors(ThemeColorId::BATTLE_CHAT_TAB);
     if (config.getBoolValue("showChatHistory"))
         loadFromLogFile("#Battle");
 }
diff --git a/src/gui/widgets/tabs/chat/channeltab.cpp b/src/gui/widgets/tabs/chat/channeltab.cpp
index 7c4b43bf6..1c2c129b3 100644
--- a/src/gui/widgets/tabs/chat/channeltab.cpp
+++ b/src/gui/widgets/tabs/chat/channeltab.cpp
@@ -34,7 +34,7 @@ ChannelTab::ChannelTab(const Widget2 *const widget,
                        const std::string &channel) :
     ChatTab(widget, channel, channel, channel, ChatTabType::CHANNEL)
 {
-    setTabColors(Theme::CHANNEL_CHAT_TAB);
+    setTabColors(ThemeColorId::CHANNEL_CHAT_TAB);
 }
 
 ChannelTab::~ChannelTab()
diff --git a/src/gui/widgets/tabs/chat/emulateguildtab.cpp b/src/gui/widgets/tabs/chat/emulateguildtab.cpp
index ccdf1bd43..e4d0d8dd1 100644
--- a/src/gui/widgets/tabs/chat/emulateguildtab.cpp
+++ b/src/gui/widgets/tabs/chat/emulateguildtab.cpp
@@ -38,7 +38,7 @@ EmulateGuildTab::EmulateGuildTab(const Widget2 *const widget) :
     // TRANSLATORS: guild chat tab name
     ChatTab(widget, _("Guild"), "", "#Guild", ChatTabType::GUILD)
 {
-    setTabColors(Theme::GUILD_CHAT_TAB);
+    setTabColors(ThemeColorId::GUILD_CHAT_TAB);
     mShowOnline = config.getBoolValue("showGuildOnline");
     config.addListener("showGuildOnline", this);
 }
diff --git a/src/gui/widgets/tabs/chat/gmtab.cpp b/src/gui/widgets/tabs/chat/gmtab.cpp
index caa475309..a54798fc5 100644
--- a/src/gui/widgets/tabs/chat/gmtab.cpp
+++ b/src/gui/widgets/tabs/chat/gmtab.cpp
@@ -35,7 +35,7 @@ GmTab::GmTab(const Widget2 *const widget) :
     // TRANSLATORS: gb tab name
     ChatTab(widget, _("GM"), GM_CHANNEL, "#GM", ChatTabType::GM)
 {
-    setTabColors(Theme::GM_CHAT_TAB);
+    setTabColors(ThemeColorId::GM_CHAT_TAB);
 }
 
 GmTab::~GmTab()
diff --git a/src/gui/widgets/tabs/chat/guildtab.cpp b/src/gui/widgets/tabs/chat/guildtab.cpp
index 512104fd5..4d4d7d1d2 100644
--- a/src/gui/widgets/tabs/chat/guildtab.cpp
+++ b/src/gui/widgets/tabs/chat/guildtab.cpp
@@ -43,7 +43,7 @@ GuildTab::GuildTab(const Widget2 *const widget) :
     // TRANSLATORS: guild chat tab name
     ChatTab(widget, _("Guild"), "", "#Guild", ChatTabType::GUILD)
 {
-    setTabColors(Theme::GUILD_CHAT_TAB);
+    setTabColors(ThemeColorId::GUILD_CHAT_TAB);
     mShowOnline = config.getBoolValue("showGuildOnline");
     config.addListener("showGuildOnline", this);
 }
diff --git a/src/gui/widgets/tabs/chat/partytab.cpp b/src/gui/widgets/tabs/chat/partytab.cpp
index 45f420703..489f03c94 100644
--- a/src/gui/widgets/tabs/chat/partytab.cpp
+++ b/src/gui/widgets/tabs/chat/partytab.cpp
@@ -44,7 +44,7 @@ PartyTab::PartyTab(const Widget2 *const widget) :
     // TRANSLATORS: party chat tab name
     ChatTab(widget, _("Party"), "", "#Party", ChatTabType::PARTY)
 {
-    setTabColors(Theme::PARTY_CHAT_TAB);
+    setTabColors(ThemeColorId::PARTY_CHAT_TAB);
     mShowOnline = config.getBoolValue("showPartyOnline");
     config.addListener("showPartyOnline", this);
 }
diff --git a/src/gui/widgets/tabs/chat/whispertab.cpp b/src/gui/widgets/tabs/chat/whispertab.cpp
index 87de80724..8d1c920b3 100644
--- a/src/gui/widgets/tabs/chat/whispertab.cpp
+++ b/src/gui/widgets/tabs/chat/whispertab.cpp
@@ -121,10 +121,10 @@ void WhisperTab::getAutoCompleteCommands(StringVect& commands) const
 
 void WhisperTab::setWhisperTabColors()
 {
-    setTabColors(Theme::WHISPER_TAB);
+    setTabColors(ThemeColorId::WHISPER_TAB);
 }
 
 void WhisperTab::setWhisperTabOfflineColors()
 {
-    setTabColors(Theme::WHISPER_TAB_OFFLINE);
+    setTabColors(ThemeColorId::WHISPER_TAB_OFFLINE);
 }
diff --git a/src/gui/widgets/tabs/setup_relations.cpp b/src/gui/widgets/tabs/setup_relations.cpp
index ffa5e1a66..06d35daf0 100644
--- a/src/gui/widgets/tabs/setup_relations.cpp
+++ b/src/gui/widgets/tabs/setup_relations.cpp
@@ -87,7 +87,7 @@ Setup_Relations::Setup_Relations(const Widget2 *const widget) :
     mPlayerTableTitleModel->fixColumnWidth(RELATION_CHOICE_COLUMN,
                                            RELATION_CHOICE_COLUMN_WIDTH);
     mPlayerTitleTable->setBackgroundColor(getThemeColor(
-        Theme::TABLE_BACKGROUND));
+        ThemeColorId::TABLE_BACKGROUND));
     mPlayerTitleTable->setSelectable(false);
 
     for (int i = 0; i < COLUMNS_NR; i++)
diff --git a/src/gui/widgets/tabs/socialguildtab.h b/src/gui/widgets/tabs/socialguildtab.h
index 8f09f7bde..b51f8bc38 100644
--- a/src/gui/widgets/tabs/socialguildtab.h
+++ b/src/gui/widgets/tabs/socialguildtab.h
@@ -48,14 +48,14 @@ class SocialGuildTab final : public SocialTab,
             // TRANSLATORS: tab in social window
             setCaption(_("Guild"));
 
-            setTabColor(&getThemeColor(Theme::GUILD_SOCIAL_TAB),
-                &getThemeColor(Theme::GUILD_SOCIAL_TAB_OUTLINE));
+            setTabColor(&getThemeColor(ThemeColorId::GUILD_SOCIAL_TAB),
+                &getThemeColor(ThemeColorId::GUILD_SOCIAL_TAB_OUTLINE));
             setHighlightedTabColor(&getThemeColor(
-                Theme::GUILD_SOCIAL_TAB_HIGHLIGHTED), &getThemeColor(
-                Theme::GUILD_SOCIAL_TAB_HIGHLIGHTED_OUTLINE));
+                ThemeColorId::GUILD_SOCIAL_TAB_HIGHLIGHTED), &getThemeColor(
+                ThemeColorId::GUILD_SOCIAL_TAB_HIGHLIGHTED_OUTLINE));
             setSelectedTabColor(&getThemeColor(
-                Theme::GUILD_SOCIAL_TAB_SELECTED),
-                &getThemeColor(Theme::GUILD_SOCIAL_TAB_SELECTED_OUTLINE));
+                ThemeColorId::GUILD_SOCIAL_TAB_SELECTED),
+                &getThemeColor(ThemeColorId::GUILD_SOCIAL_TAB_SELECTED_OUTLINE));
 
             createControls(guild, showBackground);
         }
diff --git a/src/gui/widgets/tabs/socialguildtab2.h b/src/gui/widgets/tabs/socialguildtab2.h
index e17b97466..fb3857214 100644
--- a/src/gui/widgets/tabs/socialguildtab2.h
+++ b/src/gui/widgets/tabs/socialguildtab2.h
@@ -47,14 +47,14 @@ class SocialGuildTab2 final : public SocialTab,
             // TRANSLATORS: tab in social window
             setCaption(_("Guild"));
 
-            setTabColor(&getThemeColor(Theme::GUILD_SOCIAL_TAB),
-                &getThemeColor(Theme::GUILD_SOCIAL_TAB_OUTLINE));
+            setTabColor(&getThemeColor(ThemeColorId::GUILD_SOCIAL_TAB),
+                &getThemeColor(ThemeColorId::GUILD_SOCIAL_TAB_OUTLINE));
             setHighlightedTabColor(&getThemeColor(
-                Theme::GUILD_SOCIAL_TAB_HIGHLIGHTED), &getThemeColor(
-                Theme::GUILD_SOCIAL_TAB_HIGHLIGHTED_OUTLINE));
+                ThemeColorId::GUILD_SOCIAL_TAB_HIGHLIGHTED), &getThemeColor(
+                ThemeColorId::GUILD_SOCIAL_TAB_HIGHLIGHTED_OUTLINE));
             setSelectedTabColor(&getThemeColor(
-                Theme::GUILD_SOCIAL_TAB_SELECTED),
-                &getThemeColor(Theme::GUILD_SOCIAL_TAB_SELECTED_OUTLINE));
+                ThemeColorId::GUILD_SOCIAL_TAB_SELECTED),
+                &getThemeColor(ThemeColorId::GUILD_SOCIAL_TAB_SELECTED_OUTLINE));
 
             createControls(guild, showBackground);
         }
diff --git a/src/gui/widgets/tabs/socialpartytab.h b/src/gui/widgets/tabs/socialpartytab.h
index 83d29ec1b..ff634bf3c 100644
--- a/src/gui/widgets/tabs/socialpartytab.h
+++ b/src/gui/widgets/tabs/socialpartytab.h
@@ -50,14 +50,14 @@ class SocialPartyTab final : public SocialTab,
             // TRANSLATORS: tab in social window
             setCaption(_("Party"));
 
-            setTabColor(&getThemeColor(Theme::PARTY_SOCIAL_TAB),
-                &getThemeColor(Theme::PARTY_SOCIAL_TAB_OUTLINE));
+            setTabColor(&getThemeColor(ThemeColorId::PARTY_SOCIAL_TAB),
+                &getThemeColor(ThemeColorId::PARTY_SOCIAL_TAB_OUTLINE));
             setHighlightedTabColor(&getThemeColor(
-                Theme::PARTY_SOCIAL_TAB_HIGHLIGHTED), &getThemeColor(
-                Theme::PARTY_SOCIAL_TAB_HIGHLIGHTED_OUTLINE));
+                ThemeColorId::PARTY_SOCIAL_TAB_HIGHLIGHTED), &getThemeColor(
+                ThemeColorId::PARTY_SOCIAL_TAB_HIGHLIGHTED_OUTLINE));
             setSelectedTabColor(&getThemeColor(
-                Theme::PARTY_SOCIAL_TAB_SELECTED),
-                &getThemeColor(Theme::PARTY_SOCIAL_TAB_SELECTED_OUTLINE));
+                ThemeColorId::PARTY_SOCIAL_TAB_SELECTED),
+                &getThemeColor(ThemeColorId::PARTY_SOCIAL_TAB_SELECTED_OUTLINE));
 
             createControls(party, showBackground);
         }
diff --git a/src/gui/widgets/tabs/tab.cpp b/src/gui/widgets/tabs/tab.cpp
index ed9d70e30..d8f58bf8d 100644
--- a/src/gui/widgets/tabs/tab.cpp
+++ b/src/gui/widgets/tabs/tab.cpp
@@ -105,17 +105,17 @@ Tab::Tab(const Widget2 *const widget) :
     WidgetListener(),
     mLabel(new Label(this)),
     mTabbedArea(nullptr),
-    mTabColor(&getThemeColor(Theme::TAB)),
-    mTabOutlineColor(&getThemeColor(Theme::TAB_OUTLINE)),
-    mTabHighlightedColor(&getThemeColor(Theme::TAB_HIGHLIGHTED)),
+    mTabColor(&getThemeColor(ThemeColorId::TAB)),
+    mTabOutlineColor(&getThemeColor(ThemeColorId::TAB_OUTLINE)),
+    mTabHighlightedColor(&getThemeColor(ThemeColorId::TAB_HIGHLIGHTED)),
     mTabHighlightedOutlineColor(&getThemeColor(
-        Theme::TAB_HIGHLIGHTED_OUTLINE)),
-    mTabSelectedColor(&getThemeColor(Theme::TAB_SELECTED)),
-    mTabSelectedOutlineColor(&getThemeColor(Theme::TAB_SELECTED_OUTLINE)),
-    mFlashColor(&getThemeColor(Theme::TAB_FLASH)),
-    mFlashOutlineColor(&getThemeColor(Theme::TAB_FLASH_OUTLINE)),
-    mPlayerFlashColor(&getThemeColor(Theme::TAB_PLAYER_FLASH)),
-    mPlayerFlashOutlineColor(&getThemeColor(Theme::TAB_PLAYER_FLASH_OUTLINE)),
+        ThemeColorId::TAB_HIGHLIGHTED_OUTLINE)),
+    mTabSelectedColor(&getThemeColor(ThemeColorId::TAB_SELECTED)),
+    mTabSelectedOutlineColor(&getThemeColor(ThemeColorId::TAB_SELECTED_OUTLINE)),
+    mFlashColor(&getThemeColor(ThemeColorId::TAB_FLASH)),
+    mFlashOutlineColor(&getThemeColor(ThemeColorId::TAB_FLASH_OUTLINE)),
+    mPlayerFlashColor(&getThemeColor(ThemeColorId::TAB_PLAYER_FLASH)),
+    mPlayerFlashOutlineColor(&getThemeColor(ThemeColorId::TAB_PLAYER_FLASH_OUTLINE)),
     mFlash(0),
     mVertexes(new ImageCollection),
     mImage(nullptr),