Merged trunk changes from revision 2618 to 2716 into the 0.1.0 branch.

1 files changed, 26 insertions, 14 deletions

diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index 33813271..d6d8cad5 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -94,6 +94,7 @@ SellDialog::SellDialog():
     mSlider->setEventId("mSlider");
 
     mItemList->addActionListener(this);
+    mItemList->addSelectionListener(this);
     mSlider->addActionListener(this);
 
     add(scrollArea);
@@ -141,7 +142,7 @@ void SellDialog::addItem(Item *item, int price)
 
     ITEM_SHOP item_shop;
 
-    item_shop.name = item->getInfo()->getName() + " " + toString(price) + " GP";
+    item_shop.name = item->getInfo().getName() + " " + toString(price) + " GP";
     item_shop.price = price;
     item_shop.index = item->getInvIndex();
     item_shop.id = item->getId();
@@ -155,7 +156,8 @@ void SellDialog::action(const std::string &eventId, gcn::Widget *widget)
 {
     int selectedItem = mItemList->getSelected();
 
-    if (eventId == "item") {
+    if (eventId == "item")
+    {
         mAmountItems = 0;
         mSlider->setValue(0);
         mDecreaseButton->setEnabled(false);
@@ -188,19 +190,22 @@ void SellDialog::action(const std::string &eventId, gcn::Widget *widget)
 
     bool updateButtonsAndLabels = false;
 
-    if (eventId == "mSlider") {
+    if (eventId == "mSlider")
+    {
         mAmountItems = (int)(mSlider->getValue() * mMaxItems);
 
         updateButtonsAndLabels = true;
     }
-    else if (eventId == "+") {
+    else if (eventId == "+")
+    {
         assert(mAmountItems < mMaxItems);
         mAmountItems++;
         mSlider->setValue(double(mAmountItems)/double(mMaxItems));
 
         updateButtonsAndLabels = true;
     }
-    else if (eventId == "-") {
+    else if (eventId == "-")
+    {
         assert(mAmountItems > 0);
         mAmountItems--;
 
@@ -208,7 +213,8 @@ void SellDialog::action(const std::string &eventId, gcn::Widget *widget)
 
         updateButtonsAndLabels = true;
     }
-    else if (eventId == "sell") {
+    else if (eventId == "sell")
+    {
         // Attempt sell
         assert(mAmountItems > 0 && mAmountItems <= mMaxItems);
 
@@ -234,7 +240,8 @@ void SellDialog::action(const std::string &eventId, gcn::Widget *widget)
     }
 
     // If anything changed, we need to update the buttons and labels
-    if (updateButtonsAndLabels) {
+    if (updateButtonsAndLabels)
+    {
         // Update labels
         mQuantityLabel->setCaption(toString(mAmountItems));
         mQuantityLabel->adjustSize();
@@ -250,16 +257,21 @@ void SellDialog::action(const std::string &eventId, gcn::Widget *widget)
     }
 }
 
-void SellDialog::mouseClick(int x, int y, int button, int count)
+void SellDialog::selectionChanged(const SelectionEvent &event)
 {
-    Window::mouseClick(x, y, button, count);
-
     int selectedItem = mItemList->getSelected();
+
     if (selectedItem > -1)
     {
-        mItemDescLabel->setCaption("Description: " +
-                itemDb->getItemInfo(mShopItems->at(selectedItem).id)->getDescription());
-        mItemEffectLabel->setCaption("Effect: " +
-                itemDb->getItemInfo(mShopItems->at(selectedItem).id)->getEffect());
+        const ItemInfo &info =
+            itemDb->getItemInfo(mShopItems->at(selectedItem).id);
+
+        mItemDescLabel->setCaption("Description: " + info.getDescription());
+        mItemEffectLabel->setCaption("Effect: " + info.getEffect());
+    }
+    else
+    {
+        mItemDescLabel->setCaption("Description");
+        mItemEffectLabel->setCaption("Effect");
     }
 }