summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Hartmann <hartmann.matthias@gmail.com>2005-08-21 17:28:18 +0000
committerMatthias Hartmann <hartmann.matthias@gmail.com>2005-08-21 17:28:18 +0000
commit8130b3055909c9214d2cd8ccf26560a4e06d82e4 (patch)
treee70367ec101d932d65f69c621983235f7d6ee6f1 /src
parent1be13d8d6e64b4fe08904b2587e40c80ca4b461a (diff)
downloadmana-8130b3055909c9214d2cd8ccf26560a4e06d82e4.tar.gz
mana-8130b3055909c9214d2cd8ccf26560a4e06d82e4.tar.bz2
mana-8130b3055909c9214d2cd8ccf26560a4e06d82e4.tar.xz
mana-8130b3055909c9214d2cd8ccf26560a4e06d82e4.zip
It should be enough of "How can i give you money?????����" while trading now.
Diffstat (limited to 'src')
-rw-r--r--src/gui/trade.cpp16
-rw-r--r--src/gui/trade.h1
2 files changed, 11 insertions, 6 deletions
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index f0810d0a..f42ca1e0 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -68,6 +68,7 @@ TradeWindow::TradeWindow():
partnerScroll->setPosition(8, 64);
moneyLabel = new gcn::Label("You get: 0z");
+ moneyLabel2 = new gcn::Label("You give:");
moneyField = new TextField();
addButton->setEventId("add");
@@ -98,21 +99,23 @@ TradeWindow::TradeWindow():
add(tradeButton);
add(itemNameLabel);
add(itemDescriptionLabel);
+ add(moneyLabel2);
add(moneyField);
add(moneyLabel);
- moneyField->setPosition(8, getHeight() - 20);
+ moneyField->setPosition(8 + 60, getHeight() - 20);
moneyField->setWidth(50);
- moneyLabel->setPosition(8+ 50 + 6, getHeight() - 20);
+ moneyLabel->setPosition(8 + 60 + 50 + 6, getHeight() - 20);
+ moneyLabel2->setPosition(8, getHeight() - 20);
- cancelButton->setPosition(getWidth() - 48, getHeight() - 24);
+ cancelButton->setPosition(getWidth() - 48, getHeight() - 49);
tradeButton->setPosition(cancelButton->getX() - 40
- , getHeight() - 24);
+ , getHeight() - 49);
okButton->setPosition(tradeButton->getX() - 24,
- getHeight() - 24);
+ getHeight() - 49);
addButton->setPosition(okButton->getX() - 32,
- getHeight() - 24);
+ getHeight() - 49);
myItemContainer->setSize(getWidth() - 24 - 12 - 1,
(INVENTORY_SIZE * 24) / (getWidth() / 24) - 1);
@@ -144,6 +147,7 @@ TradeWindow::~TradeWindow()
delete itemDescriptionLabel;
delete moneyField;
delete moneyLabel;
+ delete moneyLabel2;
delete myInventory;
delete partnerInventory;
diff --git a/src/gui/trade.h b/src/gui/trade.h
index 44815d66..6fdfcb92 100644
--- a/src/gui/trade.h
+++ b/src/gui/trade.h
@@ -115,6 +115,7 @@ class TradeWindow : public Window, gcn::ActionListener
gcn::Label *itemNameLabel;
gcn::Label *itemDescriptionLabel;
gcn::Label *moneyLabel;
+ gcn::Label *moneyLabel2;
gcn::Button *addButton, *okButton, *cancelButton, *tradeButton;
ScrollArea *myScroll, *partnerScroll;
gcn::TextField *moneyField;