summaryrefslogtreecommitdiff
path: root/src/gui/windows/inventorywindow.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-30 15:18:19 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-30 15:18:19 +0300
commitaa86dbe6a7c966a4bfa7aa6c81218fe58f0bf92d (patch)
treed67adc2c432802949a4c43b6f1f476f878c8e6d4 /src/gui/windows/inventorywindow.cpp
parent07121956f882dce22235868a25e0c2df96fb828a (diff)
downloadmv-aa86dbe6a7c966a4bfa7aa6c81218fe58f0bf92d.tar.gz
mv-aa86dbe6a7c966a4bfa7aa6c81218fe58f0bf92d.tar.bz2
mv-aa86dbe6a7c966a4bfa7aa6c81218fe58f0bf92d.tar.xz
mv-aa86dbe6a7c966a4bfa7aa6c81218fe58f0bf92d.zip
Move theme progress colors enum into separate file.
Diffstat (limited to 'src/gui/windows/inventorywindow.cpp')
-rw-r--r--src/gui/windows/inventorywindow.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index 8b46f5e55..ed3742c9b 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -26,10 +26,12 @@
#include "item.h"
#include "units.h"
-#include "being/playerinfo.h"
-
#include "enums/being/attributes.h"
+#include "enums/gui/progresscolorid.h"
+
+#include "being/playerinfo.h"
+
#include "input/inputmanager.h"
#include "gui/gui.h"
@@ -92,7 +94,7 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) :
mRetrieveButton(nullptr),
mInvCloseButton(nullptr),
mWeightBar(nullptr),
- mSlotsBar(new ProgressBar(this, 0.0F, 100, 0, Theme::PROG_INVY_SLOTS,
+ mSlotsBar(new ProgressBar(this, 0.0F, 100, 0, ProgressColorId::PROG_INVY_SLOTS,
"slotsprogressbar.xml", "slotsprogressbar_fill.xml")),
mFilter(nullptr),
mSortModel(new SortListModelInv),
@@ -215,7 +217,7 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) :
// TRANSLATORS: inventory equipment button
mEquipmentButton = new Button(this, _("E"), "equipment", this);
mWeightBar = new ProgressBar(this, 0.0F, 100, 0,
- Theme::PROG_WEIGHT,
+ ProgressColorId::PROG_WEIGHT,
"weightprogressbar.xml", "weightprogressbar_fill.xml");
mWeightBar->setColor(getThemeColor(ThemeColorId::WEIGHT_BAR),
getThemeColor(ThemeColorId::WEIGHT_BAR_OUTLINE));
@@ -284,7 +286,7 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) :
mInvCloseButton = new Button(this, _("Close"), "close", this);
mWeightBar = new ProgressBar(this, 0.0F, 100, 0,
- Theme::PROG_WEIGHT,
+ ProgressColorId::PROG_WEIGHT,
"weightprogressbar.xml", "weightprogressbar_fill.xml");
mWeightBar->setColor(getThemeColor(ThemeColorId::WEIGHT_BAR),
getThemeColor(ThemeColorId::WEIGHT_BAR_OUTLINE));