diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-12-09 16:43:45 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-12-09 16:43:45 +0300 |
commit | 0677e4c9777eaad3dacbd4079939c501fec6f58b (patch) | |
tree | a998ca0b0ae848c7dbc80f10c7e2ef712951726e | |
parent | 848d757b0d801780253d34bf11ebd88c26254ff0 (diff) | |
download | manaplus-0677e4c9777eaad3dacbd4079939c501fec6f58b.tar.gz manaplus-0677e4c9777eaad3dacbd4079939c501fec6f58b.tar.bz2 manaplus-0677e4c9777eaad3dacbd4079939c501fec6f58b.tar.xz manaplus-0677e4c9777eaad3dacbd4079939c501fec6f58b.zip |
Add text colors for arrows bar.
New theme colors: ARROWS_BAR, ARROWS_BAR_OUTLINE
-rw-r--r-- | data/graphics/gui/colors.xml | 2 | ||||
-rw-r--r-- | data/themes/blacknblack/colors.xml | 2 | ||||
-rw-r--r-- | data/themes/blackwood/colors.xml | 2 | ||||
-rw-r--r-- | data/themes/enchilado/colors.xml | 2 | ||||
-rw-r--r-- | data/themes/jewelry/colors.xml | 6 | ||||
-rw-r--r-- | data/themes/mana/colors.xml | 2 | ||||
-rw-r--r-- | data/themes/pink/colors.xml | 2 | ||||
-rw-r--r-- | data/themes/unity/colors.xml | 2 | ||||
-rw-r--r-- | data/themes/wood/colors.xml | 2 | ||||
-rw-r--r-- | src/gui/theme.cpp | 4 | ||||
-rw-r--r-- | src/gui/theme.h | 2 | ||||
-rw-r--r-- | src/gui/windows/ministatuswindow.cpp | 2 |
12 files changed, 28 insertions, 2 deletions
diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml index 567db112c..216197dc5 100644 --- a/data/graphics/gui/colors.xml +++ b/data/graphics/gui/colors.xml @@ -113,6 +113,8 @@ <color id="WEIGHT_BAR_OUTLINE" color="#000000" /> <color id="MONEY_BAR" color="#ffffff" /> <color id="MONEY_BAR_OUTLINE" color="#000000" /> + <color id="ARROWS_BAR" color="#ffffff" /> + <color id="ARROWS_BAR_OUTLINE" color="#000000" /> </palette> <progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" /> diff --git a/data/themes/blacknblack/colors.xml b/data/themes/blacknblack/colors.xml index 08eda2504..15e753947 100644 --- a/data/themes/blacknblack/colors.xml +++ b/data/themes/blacknblack/colors.xml @@ -103,6 +103,8 @@ <color id="WEIGHT_BAR_OUTLINE" color="#555555" /> <color id="MONEY_BAR" color="#ffffff" /> <color id="MONEY_BAR_OUTLINE" color="#555555" /> + <color id="ARROWS_BAR" color="#ffffff" /> + <color id="ARROWS_BAR_OUTLINE" color="#555555" /> <color id="BLACK" color="#ffffff" /> <color id="RED" color="#ffffff" /> diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml index 7d848a908..5e422d59a 100644 --- a/data/themes/blackwood/colors.xml +++ b/data/themes/blackwood/colors.xml @@ -102,6 +102,8 @@ <color id="WEIGHT_BAR_OUTLINE" color="#000000" /> <color id="MONEY_BAR" color="#ffffff" /> <color id="MONEY_BAR_OUTLINE" color="#000000" /> + <color id="ARROWS_BAR" color="#ffffff" /> + <color id="ARROWS_BAR_OUTLINE" color="#000000" /> <color id="BLACK" color="#7a7972" /> <color id="RED" color="#ff0000" /> diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml index 6efc2eb8b..0dcd1495e 100644 --- a/data/themes/enchilado/colors.xml +++ b/data/themes/enchilado/colors.xml @@ -103,6 +103,8 @@ <color id="WEIGHT_BAR_OUTLINE" color="#000000" /> <color id="MONEY_BAR" color="#ffffff" /> <color id="MONEY_BAR_OUTLINE" color="#000000" /> + <color id="ARROWS_BAR" color="#ffffff" /> + <color id="ARROWS_BAR_OUTLINE" color="#000000" /> <color id="BLACK" color="#000000" /> <color id="RED" color="#ff0000" /> diff --git a/data/themes/jewelry/colors.xml b/data/themes/jewelry/colors.xml index 7fda5b66f..07ad91f01 100644 --- a/data/themes/jewelry/colors.xml +++ b/data/themes/jewelry/colors.xml @@ -100,6 +100,8 @@ <color id="WEIGHT_BAR_OUTLINE" color="#000000" /> <color id="MONEY_BAR" color="#ffffff" /> <color id="MONEY_BAR_OUTLINE" color="#000000" /> + <color id="ARROWS_BAR" color="#ffffff" /> + <color id="ARROWS_BAR_OUTLINE" color="#000000" /> </palette> <palette id="1"> @@ -277,6 +279,8 @@ <color id="WEIGHT_BAR_OUTLINE" color="#000000" /> <color id="MONEY_BAR" color="#ffffff" /> <color id="MONEY_BAR_OUTLINE" color="#000000" /> + <color id="ARROWS_BAR" color="#ffffff" /> + <color id="ARROWS_BAR_OUTLINE" color="#000000" /> </palette> <palette id="2"> @@ -378,6 +382,8 @@ <color id="WEIGHT_BAR_OUTLINE" color="#000000" /> <color id="MONEY_BAR" color="#ffffff" /> <color id="MONEY_BAR_OUTLINE" color="#000000" /> + <color id="ARROWS_BAR" color="#ffffff" /> + <color id="ARROWS_BAR_OUTLINE" color="#000000" /> </palette> <progressbar id="HP" color="#b80000" /> diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml index 81ec67d5c..4dfbb9a89 100644 --- a/data/themes/mana/colors.xml +++ b/data/themes/mana/colors.xml @@ -103,6 +103,8 @@ <color id="WEIGHT_BAR_OUTLINE" color="#000000" /> <color id="MONEY_BAR" color="#ffffff" /> <color id="MONEY_BAR_OUTLINE" color="#000000" /> + <color id="ARROWS_BAR" color="#ffffff" /> + <color id="ARROWS_BAR_OUTLINE" color="#000000" /> <color id="BLACK" color="#000000" /> <color id="RED" color="#ff0000" /> diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml index 028c79ced..a411620db 100644 --- a/data/themes/pink/colors.xml +++ b/data/themes/pink/colors.xml @@ -103,6 +103,8 @@ <color id="WEIGHT_BAR_OUTLINE" color="#000000" /> <color id="MONEY_BAR" color="#ffffff" /> <color id="MONEY_BAR_OUTLINE" color="#000000" /> + <color id="ARROWS_BAR" color="#ffffff" /> + <color id="ARROWS_BAR_OUTLINE" color="#000000" /> <color id="BLACK" color="#000000" /> <color id="RED" color="#ff0000" /> diff --git a/data/themes/unity/colors.xml b/data/themes/unity/colors.xml index 49e48d529..0d6205759 100644 --- a/data/themes/unity/colors.xml +++ b/data/themes/unity/colors.xml @@ -102,6 +102,8 @@ <color id="WEIGHT_BAR_OUTLINE" color="#000000" /> <color id="MONEY_BAR" color="#ffffff" /> <color id="MONEY_BAR_OUTLINE" color="#000000" /> + <color id="ARROWS_BAR" color="#ffffff" /> + <color id="ARROWS_BAR_OUTLINE" color="#000000" /> <color id="BLACK" color="#0E0E0E" /> <color id="RED" color="#FFA8A8" /> diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml index f9985e4f8..a546e593f 100644 --- a/data/themes/wood/colors.xml +++ b/data/themes/wood/colors.xml @@ -103,6 +103,8 @@ <color id="WEIGHT_BAR_OUTLINE" color="#000000" /> <color id="MONEY_BAR" color="#ffffff" /> <color id="MONEY_BAR_OUTLINE" color="#000000" /> + <color id="ARROWS_BAR" color="#ffffff" /> + <color id="ARROWS_BAR_OUTLINE" color="#000000" /> <color id="BLACK" color="#000000" /> <color id="RED" color="#ff0000" /> diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index ff2d66c67..816fdcaa5 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -964,7 +964,9 @@ static int readColorType(const std::string &type) "WEIGHT_BAR", "WEIGHT_BAR_OUTLINE", "MONEY_BAR", - "MONEY_BAR_OUTLINE" + "MONEY_BAR_OUTLINE", + "ARROWS_BAR", + "ARROWS_BAR_OUTLINE" }; if (type.empty()) diff --git a/src/gui/theme.h b/src/gui/theme.h index 1a94bdb53..85062a3e7 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -408,6 +408,8 @@ class Theme final : public Palette, public ConfigListener WEIGHT_BAR_OUTLINE, MONEY_BAR, MONEY_BAR_OUTLINE, + ARROWS_BAR, + ARROWS_BAR_OUTLINE, THEME_COLORS_END }; diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp index 14508b334..f21e53d42 100644 --- a/src/gui/windows/ministatuswindow.cpp +++ b/src/gui/windows/ministatuswindow.cpp @@ -85,7 +85,7 @@ MiniStatusWindow::MiniStatusWindow() : mMoneyBar(createBar(0, 130, 0, Theme::MONEY_BAR, Theme::PROG_MONEY, // TRANSLATORS: status bar name "money bar", _("money bar"))), - mArrowsBar(createBar(0, 50, 0, Theme::SLOTS_BAR, Theme::PROG_ARROWS, + mArrowsBar(createBar(0, 50, 0, Theme::ARROWS_BAR, Theme::PROG_ARROWS, // TRANSLATORS: status bar name "arrows bar", _("arrows bar"))), mStatusBar(createBar(100, (config.getIntValue("fontSize") > 16 |