diff options
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/userpalette.cpp | 33 | ||||
-rw-r--r-- | src/gui/widgets/tabs/setup_colors.cpp | 20 |
2 files changed, 27 insertions, 26 deletions
diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp index ca86fbb28..8ad436a60 100644 --- a/src/gui/userpalette.cpp +++ b/src/gui/userpalette.cpp @@ -284,65 +284,66 @@ UserPalette::UserPalette() : addLabel(UserColorId::LABEL_HP, // TRANSLATORS: palette label _("Hp bars")); - addColor(UserColorId::PLAYER_HP, + addColor(UserColorId::PLAYER_HP_FG, 0x00ff00, GradientType::STATIC, // TRANSLATORS: palette color - _("Player HP bar"), 50); - addColor(UserColorId::PLAYER_HP2, + _("Player HP bar"), + 50); + addColor(UserColorId::PLAYER_HP_BG, 0xff0000, GradientType::STATIC, // TRANSLATORS: palette color - _("Player HP bar (second color)"), + _("Player HP bar (background)"), 50); - addColor(UserColorId::MONSTER_HP, + addColor(UserColorId::MONSTER_HP_FG, 0x00ff00, GradientType::STATIC, // TRANSLATORS: palette color _("Monster HP bar"), 50); - addColor(UserColorId::MONSTER_HP2, + addColor(UserColorId::MONSTER_HP_BG, 0xff0000, GradientType::STATIC, // TRANSLATORS: palette color - _("Monster HP bar (second color)"), + _("Monster HP bar (background)"), 50); - addColor(UserColorId::HOMUN_HP, + addColor(UserColorId::HOMUN_HP_FG, 0x00ff00, GradientType::STATIC, // TRANSLATORS: palette color _("Homunculus HP bar"), 50); - addColor(UserColorId::HOMUN_HP2, + addColor(UserColorId::HOMUN_HP_BG, 0xff0000, GradientType::STATIC, // TRANSLATORS: palette color - _("Homunculus HP bar (second color)"), + _("Homunculus HP bar (background)"), 50); - addColor(UserColorId::MERC_HP, + addColor(UserColorId::MERC_HP_FG, 0x00ff00, GradientType::STATIC, // TRANSLATORS: palette color _("Mercenary HP bar"), 50); - addColor(UserColorId::MERC_HP2, + addColor(UserColorId::MERC_HP_BG, 0xff0000, GradientType::STATIC, // TRANSLATORS: palette color - _("Mercenary HP bar (second color)"), + _("Mercenary HP bar (background)"), 50); - addColor(UserColorId::ELEMENTAL_HP, + addColor(UserColorId::ELEMENTAL_HP_FG, 0x00ff00, GradientType::STATIC, // TRANSLATORS: palette color _("Elemental HP bar"), 50); - addColor(UserColorId::ELEMENTAL_HP2, + addColor(UserColorId::ELEMENTAL_HP_BG, 0xff0000, GradientType::STATIC, // TRANSLATORS: palette color - _("Elemental HP bar (second color)"), + _("Elemental HP bar (background)"), 50); addLabel(UserColorId::LABEL_HITS, // TRANSLATORS: palette label diff --git a/src/gui/widgets/tabs/setup_colors.cpp b/src/gui/widgets/tabs/setup_colors.cpp index 8c8e29467..0fde9b1f6 100644 --- a/src/gui/widgets/tabs/setup_colors.cpp +++ b/src/gui/widgets/tabs/setup_colors.cpp @@ -357,16 +357,16 @@ void Setup_Colors::valueChanged(const SelectionEvent &event A_UNUSED) case UserColorId::COLLISION_HIGHLIGHT: case UserColorId::WALKABLE_HIGHLIGHT: case UserColorId::ROAD_POINT: - case UserColorId::MONSTER_HP: - case UserColorId::MONSTER_HP2: - case UserColorId::HOMUN_HP: - case UserColorId::HOMUN_HP2: - case UserColorId::MERC_HP: - case UserColorId::MERC_HP2: - case UserColorId::ELEMENTAL_HP: - case UserColorId::ELEMENTAL_HP2: - case UserColorId::PLAYER_HP: - case UserColorId::PLAYER_HP2: + case UserColorId::MONSTER_HP_FG: + case UserColorId::MONSTER_HP_BG: + case UserColorId::HOMUN_HP_FG: + case UserColorId::HOMUN_HP_BG: + case UserColorId::MERC_HP_FG: + case UserColorId::MERC_HP_BG: + case UserColorId::ELEMENTAL_HP_FG: + case UserColorId::ELEMENTAL_HP_BG: + case UserColorId::PLAYER_HP_FG: + case UserColorId::PLAYER_HP_BG: case UserColorId::FLOOR_ITEM_TEXT: case UserColorId::NET: // TRANSLATORS: colors tab. label. |