summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-01-14 01:39:58 +0200
committerAndrei Karas <akaras@inbox.ru>2011-01-14 01:39:58 +0200
commit175027e204d936b2c775fe587e7d3f14e71e1233 (patch)
treead0e56e5da67ef47aa94ff0bc9f4757afc9b57d7
parent0b3368c1675e774954068de6427d0fad282a9293 (diff)
downloadmv-175027e204d936b2c775fe587e7d3f14e71e1233.tar.gz
mv-175027e204d936b2c775fe587e7d3f14e71e1233.tar.bz2
mv-175027e204d936b2c775fe587e7d3f14e71e1233.tar.xz
mv-175027e204d936b2c775fe587e7d3f14e71e1233.zip
Add unification for inventory/storage/cart name.
-rw-r--r--src/gui/inventorywindow.cpp16
-rw-r--r--src/inventory.cpp16
-rw-r--r--src/inventory.h3
3 files changed, 31 insertions, 4 deletions
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 978bfcecf..f63e01d6a 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -61,15 +61,23 @@
InventoryWindow::WindowList InventoryWindow::instances;
InventoryWindow::InventoryWindow(Inventory *inventory):
- Window(inventory ? (inventory->isMainInventory()
- ? _("Inventory") : _("Storage")) : _("Inventory")),
+ Window(),
mInventory(inventory),
mDropButton(0),
mSplit(false)
{
- listen(CHANNEL_ATTRIBUTES);
+ if (inventory)
+ {
+ setCaption(gettext(inventory->getName().c_str()));
+ setWindowName(inventory->getName());
+ }
+ else
+ {
+ setCaption(_("Inventory"));
+ setWindowName("Inventory");
+ }
- setWindowName(isMainInventory() ? "Inventory" : "Storage");
+ listen(CHANNEL_ATTRIBUTES);
if (setupWindow)
setupWindow->registerWindowForReset(this);
diff --git a/src/inventory.cpp b/src/inventory.cpp
index 23387cadb..f9956798f 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -28,6 +28,8 @@
#include "resources/iteminfo.h"
+#include "utils/gettext.h"
+
#include <algorithm>
#include <string>
@@ -223,3 +225,17 @@ Item *Inventory::findItemBySprite(std::string spritePath, Gender gender)
return 0;
}
+
+std::string Inventory::getName()
+{
+ switch (mType)
+ {
+ case INVENTORY:
+ default:
+ return N_("Inventory");
+ case STORAGE:
+ return N_("Storage");
+ case CART:
+ return N_("Cart");
+ }
+}
diff --git a/src/inventory.h b/src/inventory.h
index c09492e22..c40a9bd5b 100644
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -50,6 +50,7 @@ class Inventory
{
INVENTORY = 0,
STORAGE,
+ CART,
TRADE,
TYPE_END
};
@@ -145,6 +146,8 @@ class Inventory
Item *findItemBySprite(std::string spritePath, Gender gender);
+ std::string getName();
+
protected:
typedef std::list<InventoryListener*> InventoryListenerList;
InventoryListenerList mInventoryListeners;