diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/beingpopup.cpp | 2 | ||||
| -rw-r--r-- | src/gui/equipmentwindow.cpp | 2 | ||||
| -rw-r--r-- | src/gui/theme.cpp | 1 | ||||
| -rw-r--r-- | src/gui/theme.h | 3 | ||||
| -rw-r--r-- | src/gui/tradewindow.cpp | 6 | ||||
| -rw-r--r-- | src/gui/widgets/browserbox.cpp | 2 |
6 files changed, 9 insertions, 7 deletions
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() |