Add galactic map, make it possible to other zones on the map.

1 files changed, 18 insertions, 6 deletions

diff --git a/src/client/mapwindow.h b/src/client/mapwindow.h
index 66f8f45..d667ca4 100644
--- a/src/client/mapwindow.h
+++ b/src/client/mapwindow.h
@@ -15,6 +15,7 @@
 #include "ui/scrollpane.h"
 #include "ui/window.h"
 #include "client/mapwidget.h"
+#include "client/galaxymapwidget.h"
 
 namespace client
 {
@@ -22,6 +23,8 @@ namespace client
 class MapWindow : public ui::Window
 {
 public:
+	enum Mode { ShowZone = 0, ShowWorld = 1 };
+	
 	MapWindow(ui::Widget *parent = 0);
 	virtual ~MapWindow();
 
@@ -47,26 +50,35 @@ protected:
 	virtual void draw();
 
 private:
-	/// set the map target
-	void set_target(const core::Entity *entity);
+	/// show zone information
+	void show_zone_info(const core::Zone *zone);
+	
+	/// show target entity information
+	void show_entity_info(const core::Entity *entity);
+	
+	/// update inforecord textpane
+	void set_info(const core::Info *info);
 	
 
 	ui::Label		*mapwindow_titlelabel;
 	
 	MapWidget		*mapwindow_mapwidget;
+	GalaxyMapWidget		*mapwindow_galaxymapwidget;
 	ui::Label		*mapwindow_maplabel;
 	
 	ui::ModelView		*mapwindow_modelview;
 	ui::Label		*mapwindow_targetlabel;
 	ui::ScrollPane		*mapwindow_scrollpane;
 	ui::IconButton		*mapwindow_closebutton;
+	ui::IconButton		*mapwindow_zonebutton;
+	ui::IconButton		*mapwindow_galaxybutton;
 	
-
-	const core::Entity	*mapwindow_target;
-	const core::Info	*mapwindow_inforecord;	
-	unsigned long		mapwindow_infotimestamp;	
+	const core::Info	*mapwindow_inforecord;
+	unsigned long		mapwindow_infotimestamp;
 	ui::Text		mapwindow_infotext;
 	
+	Mode			mapwindow_mode;
+	
 }; // class MapWindow