updated inventory window, listview seletion sounds, modelview zoom factor

1 files changed, 18 insertions, 2 deletions

diff --git a/src/client/inventory.h b/src/client/inventory.h
index f66ec56..00b3b51 100644
--- a/src/client/inventory.h
+++ b/src/client/inventory.h
@@ -9,7 +9,10 @@
 
 #include "core/info.h"
 #include "core/inventory.h"
+#include "ui/iconbutton.h"
 #include "ui/listview.h"
+#include "ui/modelview.h"
+#include "ui/scrollpane.h"
 #include "ui/plaintext.h"
 #include "ui/window.h"
 
@@ -25,6 +28,8 @@ public:
 	~Inventory();
 
 	void toggle();
+	
+	virtual void show();
 protected:
 	/// resize event handler
 	virtual void resize();
@@ -41,15 +46,26 @@ protected:
 private:
 	void update_inventory();
 	
-	void update_selection();
+	void set_info(const core::Info *info, const int amount);
 	
 	bool verify() const;
 	
 	unsigned long 		menu_inventorytimestamp;
 	unsigned long 		menu_infotimestamp;
-	ui::ListView		*menu_listview;
+	
+	int			menu_amount;
+
+	ui::Text		menu_infotext;
+	
+	const core::Info	*menu_inforecord;
+	
+	ui::ModelView		*menu_modelview;
+	
 	ui::Label		*menu_namelabel;
+	ui::ListView		*menu_listview;
 	ui::PlainText		*menu_inventorytext;
+	ui::ScrollPane		*menu_scrollpane;
+	ui::IconButton		*menu_shipbutton;
 	
 }; // class Inventory