cosmetic updates in engine list functions, trade menu updates

1 files changed, 15 insertions, 7 deletions

diff --git a/src/client/trademenu.h b/src/client/trademenu.h
index 37823b1..b95ee57 100644
--- a/src/client/trademenu.h
+++ b/src/client/trademenu.h
@@ -10,8 +10,11 @@
 #include "core/info.h"
 #include "ui/container.h"
 #include "ui/label.h"
-#include "ui/listview.h"
+#include "ui/listitem.h"
+#include "ui/scrollpane.h"
+#include "ui/modelview.h"
 #include "ui/widget.h"
+#include "client/inventorylistview.h"
 
 namespace client
 {
@@ -25,7 +28,7 @@ public:
 	~TradeMenu();
 	
 	/// set the item type to trade
-	void set_item_type(std::string const & itemtype);
+	void set_item_type(core::InfoType *item_type);
 
 protected:
 	/// resize event handler
@@ -33,15 +36,20 @@ protected:
 	
 	/// emit event handler
 	virtual bool on_emit(Widget *sender, const Event event, void *data);
-
+	
 private:
+	void set_item(ui::ListItem *item);
+	
 	ui::Window		*menu_tradewindow;
-	ui::ListView		*menu_inventorylistview;
-	ui::ListView		*menu_traderlistview;
 	ui::Button		*menu_closebutton;
-
 	ui::Label		*menu_namelabel;
-
+	ui::ModelView		*menu_modelview;
+	ui::ScrollPane		*menu_scrollpane;
+	
+	InventoryListView	*menu_inventorylistview;
+	InventoryListView	*menu_traderlistview;
+	
+	ui::Text		menu_infotext;
 };
 
 }