← Back to branch summary

~ubuntu-branches/ubuntu/trusty/manaplus/trusty-proposed

« back to all changes in this revision

Viewing changes to src/gui/equipmentwindow.cpp

  • Committer: Package Import Robot
  • Author(s): Patrick Matthäi, Andrei Karas, Patrick Matthäi
  • Date: 2013-05-18 21:06:29 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20130518210629-3trtowluum0tekob
Tags: 1.3.5.12-1
[ Andrei Karas ]
* Add new files to copyright file.

[ Patrick Matthäi ]
* New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gui/equipmentwindow.cpp
52
52
EquipmentWindow::EquipmentWindow(Equipment *const equipment,
53
53
                                 Being *const being,
54
54
                                 const bool foring):
 
55
    // TRANSLATORS: equipment window name
55
56
    Window(_("Equipment"), false, nullptr, "equipment.xml"),
56
57
    gcn::ActionListener(),
57
58
    mEquipment(equipment),
58
59
    mItemPopup(new ItemPopup),
59
 
    mPlayerBox(new PlayerBox("equipment_playerbox.xml")),
 
60
    mPlayerBox(new PlayerBox("equipment_playerbox.xml",
 
61
        "equipment_selectedplayerbox.xml")),
 
62
    // TRANSLATORS: equipment window button
60
63
    mUnequip(new Button(this, _("Unequip"), "unequip", this)),
61
64
    mSelected(-1),
62
65
    mForing(foring),
66
69
    mHighlightColor(getThemeColor(Theme::HIGHLIGHT)),
67
70
    mBorderColor(getThemeColor(Theme::BORDER)),
68
71
    mLabelsColor(getThemeColor(Theme::LABEL)),
 
72
    mLabelsColor2(getThemeColor(Theme::LABEL_OUTLINE)),
69
73
    mSlotBackground(),
70
74
    mSlotHighlightedBackground(),
71
75
    mVertexes(new ImageCollection),
220
224
                    box->y + mItemPadding);
221
225
                if (i == EQUIP_PROJECTILE_SLOT)
222
226
                {
223
 
                    g->setColor(mLabelsColor);
 
227
                    g->setColorAll(mLabelsColor, mLabelsColor2);
224
228
                    const std::string str = toString(item->getQuantity());
225
229
                    font->drawString(g, str,
226
230
                        box->x + (mBoxSize - font->getWidth(str)) / 2,
397
401
 
398
402
void EquipmentWindow::fillBoxes()
399
403
{
400
 
    XML::Document *doc = new XML::Document("equipmentwindow.xml");
 
404
    XML::Document *const doc = new XML::Document("equipmentwindow.xml");
401
405
    const XmlNodePtr root = doc->rootNode();
402
406
    if (!root)
403
407
    {