Add browserbox own color.

Parameter "BROWSERBOX" in colors.xml
Also fix colors for some derived controls.

14 files changed, 17 insertions, 7 deletions

diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml
index e0f2fc169..2ddf9c7fd 100644
--- a/data/graphics/gui/colors.xml
+++ b/data/graphics/gui/colors.xml
@@ -1,4 +1,5 @@
 <colors>
+	<color id="BROWSERBOX" color="#000000" />
 	<color id="TEXT" color="#000000" />
 	<color id="SHADOW" color="#000000" />
 	<color id="OUTLINE" color="#000000" />
diff --git a/data/themes/blacknblack/colors.xml b/data/themes/blacknblack/colors.xml
index 03d726e5d..7bc5fd8a5 100644
--- a/data/themes/blacknblack/colors.xml
+++ b/data/themes/blacknblack/colors.xml
@@ -1,4 +1,5 @@
 <colors>
+	<color id="BROWSERBOX" color="#ffffff" />
 	<color id="TEXT" color="#ffffff" />
 	<color id="SHADOW" color="#000000" />
 	<color id="OUTLINE" color="#555555" />
diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml
index 30fe6ccac..0f1a16cd8 100644
--- a/data/themes/blackwood/colors.xml
+++ b/data/themes/blackwood/colors.xml
@@ -1,4 +1,5 @@
 <colors>
+	<color id="BROWSERBOX" color="#7a7972" />
 	<color id="TEXT" color="#7a7972" />
 	<color id="SHADOW" color="#000000" />
 	<color id="OUTLINE" color="#000000" />
diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml
index 6f31137f1..4b44470a0 100644
--- a/data/themes/enchilado/colors.xml
+++ b/data/themes/enchilado/colors.xml
@@ -1,4 +1,5 @@
 <colors>
+	<color id="BROWSERBOX" color="#000000" />
 	<color id="TEXT" color="#000000" />
 	<color id="SHADOW" color="#000000" />
 	<color id="OUTLINE" color="#000000" />
diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml
index 5c2ff83bc..be4522b8a 100644
--- a/data/themes/mana/colors.xml
+++ b/data/themes/mana/colors.xml
@@ -1,4 +1,5 @@
 <colors>
+	<color id="BROWSERBOX" color="#000000" />
 	<color id="TEXT" color="#000000" />
 	<color id="SHADOW" color="#000000" />
 	<color id="OUTLINE" color="#000000" />
diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml
index 5750d9131..2aaae8a58 100644
--- a/data/themes/pink/colors.xml
+++ b/data/themes/pink/colors.xml
@@ -1,4 +1,5 @@
 <colors>
+	<color id="BROWSERBOX" color="#FF00FF" />
 	<color id="TEXT" color="#FF00FF" />
 	<color id="SHADOW" color="#000000" />
 	<color id="OUTLINE" color="#000000" />
diff --git a/data/themes/unity/colors.xml b/data/themes/unity/colors.xml
index 14ebc191d..6ce7468dd 100644
--- a/data/themes/unity/colors.xml
+++ b/data/themes/unity/colors.xml
@@ -1,4 +1,5 @@
 <colors>
+	<color id="BROWSERBOX" color="#E0E0E0" />
 	<color id="TEXT" color="#E0E0E0" />
 	<color id="SHADOW" color="#000000" />
 	<color id="OUTLINE" color="#000000" />
diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml
index 14d28b2de..4d7f0a083 100644
--- a/data/themes/wood/colors.xml
+++ b/data/themes/wood/colors.xml
@@ -1,4 +1,5 @@
 <colors>
+	<color id="BROWSERBOX" color="#000000" />
 	<color id="TEXT" color="#000000" />
 	<color id="SHADOW" color="#000000" />
 	<color id="OUTLINE" color="#000000" />
diff --git a/src/gui/beingpopup.cpp b/src/gui/beingpopup.cpp
index 19c2e0d03..f7118d48c 100644
--- a/src/gui/beingpopup.cpp
+++ b/src/gui/beingpopup.cpp
@@ -110,7 +110,7 @@ void BeingPopup::show(const int x, const int y, Being *const b)
     }
     else
     {
-        mBeingName->setForegroundColor(Theme::getThemeColor(Theme::TEXT));
+        mBeingName->setForegroundColor(Theme::getThemeColor(Theme::LABEL));
     }
 
     mBeingName->adjustSize();
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 2eea0b3be..147dde9ff 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -103,7 +103,7 @@ EquipmentWindow::EquipmentWindow(Equipment *const equipment,
 
     mHighlightColor = Theme::getThemeColor(Theme::HIGHLIGHT);
     mBorderColor = Theme::getThemeColor(Theme::BORDER);
-    setForegroundColor(Theme::getThemeColor(Theme::TEXT));
+    setForegroundColor(Theme::getThemeColor(Theme::LABEL));
 }
 
 EquipmentWindow::~EquipmentWindow()
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 93dfd17c3..a21c5a860 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -655,6 +655,7 @@ static int readColorType(const std::string &type)
 {
     static std::string colors[] =
     {
+        "BROWSERBOX",
         "TEXT",
         "SHADOW",
         "OUTLINE",
diff --git a/src/gui/theme.h b/src/gui/theme.h
index 259da1a66..79569808f 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -163,7 +163,8 @@ class Theme : public Palette, public ConfigListener
                                           int w, int h);
         enum ThemePalette
         {
-            TEXT = 0,
+            BROWSERBOX = 0,
+            TEXT,
             SHADOW,
             OUTLINE,
             BORDER,
diff --git a/src/gui/tradewindow.cpp b/src/gui/tradewindow.cpp
index 82dff1dd8..56ba3aa7b 100644
--- a/src/gui/tradewindow.cpp
+++ b/src/gui/tradewindow.cpp
@@ -161,7 +161,7 @@ void TradeWindow::setMoney(const int amount)
     else
     {
         mMoneyLabel->setForegroundColor(Theme::getThemeColor(
-            static_cast<int>(Theme::TEXT)));
+            static_cast<int>(Theme::LABEL)));
         mGotMaxMoney = amount;
     }
 
@@ -230,7 +230,7 @@ void TradeWindow::reset()
     mMoneyField->setEnabled(true);
     mMoneyField->setText("");
     mMoneyLabel->setForegroundColor(Theme::getThemeColor(
-        static_cast<int>(Theme::TEXT)));
+        static_cast<int>(Theme::LABEL)));
     mAddButton->setEnabled(true);
     mMoneyChangeButton->setEnabled(true);
     mGotMoney = 0;
@@ -404,7 +404,7 @@ void TradeWindow::clear()
     mGotMoney = 0;
     mGotMaxMoney = 0;
     mMoneyLabel->setForegroundColor(Theme::getThemeColor(
-        static_cast<int>(Theme::TEXT)));
+        static_cast<int>(Theme::LABEL)));
 }
 
 void TradeWindow::addAutoItem(const std::string nick, Item* const item,
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index 387e96da4..f61851e1f 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -77,7 +77,7 @@ BrowserBox::BrowserBox(unsigned int mode, bool opaque):
     mColors[PURPLE] = Theme::getThemeColor(Theme::PURPLE);
     mColors[GRAY] = Theme::getThemeColor(Theme::GRAY);
     mColors[BROWN] = Theme::getThemeColor(Theme::BROWN);
-    setForegroundColor(Theme::getThemeColor(Theme::TEXT));
+    setForegroundColor(Theme::getThemeColor(Theme::BROWSERBOX));
 }
 
 BrowserBox::~BrowserBox()