Merge lp:~gamag/widelands/buildcostTooltip into lp:widelands

[Gabriel Margiani]

Moved the build/return costs preview into a tooltip using the nice new rt engine.
(by the way, why can't I use 000000 as black background in richtext [will be fully transparent]?)

[SirVer (sirver)]

Cool contribution! Thanks a lot. It looks really nice in the game as well and feels very natural. I am also glad that somebody did something new and cool with the rich text system :). I feel the text can be a few pts smaller in the preview.

The think you mention with the black sounds like a bug. Can you provide a minimal example for reproduction?

On to the code review:
- please move the const in front where applicable: string const & -> const string&. same void * const -> const void * or in this case likely rather void *.
- std::string const & descr = std::string()); use "" instead of string().
- _("Buildcosts:") sounds strange for a user facing string. How about "Construction cost"? This appears twice in the code.
- std::string ret(""); - Initialization is not needed.
- nice touch renaming the structs to classes :)
- rt string -> richtext. similar i'd rename the function to waremap_to_richtext. The string is already implicit in the return type.

Very, very nice work! Thanks.

review: Needs Fixing

[Gabriel Margiani (gamag)]

Moved some const's around and fixed other things.

>I feel the text can be a few pts smaller in the preview.
I'm not sure if I did wath you mean... I like it as it is now.

>The think you mention with the black sounds like a bug. Can you provide a minimal example for >reproduction?
It's not really minimal, but a changed the background of the numbers in preview form 010101to 000000.

Hope I didn't forget something..

review: Needs Resubmitting

[SirVer (sirver)]

Great! I am completely fine to merge it as is now. There's only one minor point I missed the last time:

- passing const bool (int, int32_t...) into a function makes no sense - in fact, it makes little sense to pass anything by value as const. It is not your code, but could you fix this whenever you see it?

Please let me know if you want to fix this or not. If not, I will merge the change as is. If yes - Year!

review: Needs Information

[Gabriel Margiani (gamag)]

I think it's fixed now.

[Gabriel Margiani (gamag)]

Only the numbers in preview have no black background....

[SirVer (sirver)]

Cool. I merged this now. Thanks for working on this :).

I found the bug why black was considered transparent and fixed it after I merged your changes - so if you feel like full black is better, just go ahead and change it to black now.

[Gabriel Margiani (gamag)]

I changed it already after your first review. Thanks.

=== modified file 'src/logic/item_ware_descr.h'
--- src/logic/item_ware_descr.h	2012-11-24 16:22:10 +0000
+++ src/logic/item_ware_descr.h	2013-01-23 21:09:25 +0000
@@ -69,6 +69,7 @@
 
 	/// \return index to ware's icon inside picture stack
 	const IPicture* icon() const throw () {return m_icon;}
+	std::string icon_name() const throw () {return m_icon_fname;}
 
 	/// \return ware's localized descriptive text
 	std::string const & helptext() const throw () {return m_helptext;}

=== modified file 'src/ui_basic/icongrid.cc'
--- src/ui_basic/icongrid.cc	2012-12-14 20:09:35 +0000
+++ src/ui_basic/icongrid.cc	2013-01-23 21:09:25 +0000
@@ -33,34 +33,30 @@
 struct IconGridButton : public Button {
 	IconGridButton
 		(Icon_Grid         & parent,
-		 std::string const & name,
-		 const int32_t x, const int32_t y, const uint32_t w, const uint32_t h,
+		 const std::string & name,
+		 int32_t x, int32_t y, uint32_t w, uint32_t h,
 		 const IPicture* background_pictute_id,
 		 const IPicture* foreground_picture_id,
-		 const uint32_t callback_argument_id,
-		 Textarea          & ta, std::string const & descr)
+		 uint32_t callback_argument_id,
+		 const std::string & tooltip_text)
 		:
 		Button
 			(&parent, name, x, y, w, h, background_pictute_id,
 			 foreground_picture_id,
-			 "", true, true),
-			 m_icongrid(parent), m_ta(ta), m_descr(descr),
+			 tooltip_text, true, true),
+			 m_icongrid(parent),
 			 _callback_argument_id(callback_argument_id)
 		{}
 
 private:
 	Icon_Grid & m_icongrid;
-	Textarea  & m_ta;
-	std::string m_descr;
 	const uint32_t _callback_argument_id;
 
-	void handle_mousein(bool const inside) {
+	void handle_mousein(bool inside) {
 		if (inside) {
 			m_icongrid.mousein(_callback_argument_id);
-			m_ta.set_text(m_descr);
 		} else {
 			m_icongrid.mouseout(_callback_argument_id);
-			m_ta.set_text("");
 		}
 		Button::handle_mousein(inside);
 	}
@@ -71,14 +67,13 @@
 */
 Icon_Grid::Icon_Grid
 	(Panel  * const parent,
-	 int32_t const x, int32_t const y, int32_t const cellw, int32_t const cellh,
-	 int32_t  const cols)
+	 int32_t x, int32_t y, int32_t cellw, int32_t cellh,
+	 int32_t cols)
 	:
 	Panel            (parent, x, y, 0, 0),
 	m_columns        (cols),
 	m_cell_width     (cellw),
-	m_cell_height    (cellh),
-	m_ta         (this, 0, 0, 0, g_fh->get_fontheight(UI_FONT_SMALL) + 2)
+	m_cell_height    (cellh)
 {}
 
 
@@ -87,8 +82,8 @@
  * Returns the index of the newly added icon.
 */
 int32_t Icon_Grid::add
-	(std::string const & name, const IPicture* pic,
-	 void * const data, std::string const & descr)
+	(const std::string & name, const IPicture* pic,
+	 void * data, const std::string & tooltip_text)
 {
 	Item it;
 
@@ -97,17 +92,13 @@
 	m_items.push_back(it);
 
 	// resize
-	int32_t const rows = (m_items.size() + m_columns - 1) / m_columns;
+	const int32_t rows = (m_items.size() + m_columns - 1) / m_columns;
 
 	if (rows <= 1) {
-		set_desired_size(m_cell_width * m_columns, m_cell_height + m_ta.get_h());
-		m_ta.set_size(get_inner_w(), m_ta.get_h());
-		m_ta.set_pos(Point(0, m_cell_height));
+		set_desired_size(m_cell_width * m_columns, m_cell_height);
 	} else {
 		set_desired_size
-			(m_cell_width * m_columns, m_cell_height * rows + m_ta.get_h());
-		m_ta.set_size(get_inner_w(), m_ta.get_h());
-		m_ta.set_pos(Point(0, m_cell_height * rows));
+			(m_cell_width * m_columns, m_cell_height * rows);
 	}
 
 	uint32_t idx = m_items.size() - 1;
@@ -118,7 +109,7 @@
 		(*this, name,
 		 x, y, m_cell_width, m_cell_height,
 		 NULL, pic,
-		 idx, m_ta, descr);
+		 idx, tooltip_text);
 	btn->sigclicked.connect(boost::bind(&Icon_Grid::clicked_button, this, idx));
 
 	return idx;
@@ -132,7 +123,7 @@
 /**
  * Returns the user-defined data of the icon with the given index.
 */
-void * Icon_Grid::get_data(int32_t const idx)
+void * Icon_Grid::get_data(int32_t idx)
 {
 	assert(static_cast<uint32_t>(idx) < m_items.size());
 

=== modified file 'src/ui_basic/icongrid.h'
--- src/ui_basic/icongrid.h	2012-12-14 20:09:35 +0000
+++ src/ui_basic/icongrid.h	2013-01-23 21:09:25 +0000
@@ -49,7 +49,7 @@
 		(std::string const & name,
 		 const IPicture* pic,
 		 void              * data,
-		 std::string const & descr = std::string());
+		 const std::string & tooltip_text = "");
 	void * get_data(int32_t idx);
 
 private:
@@ -64,7 +64,6 @@
 	int32_t m_cell_width; ///< size of one cell
 	int32_t m_cell_height;
 
-	Textarea          m_ta;
 	std::vector<Item> m_items;
 };
 

=== modified file 'src/wui/buildingwindow.cc'
--- src/wui/buildingwindow.cc	2012-12-30 03:24:39 +0000
+++ src/wui/buildingwindow.cc	2013-01-23 21:09:25 +0000
@@ -35,9 +35,9 @@
 
 #include "buildingwindow.h"
 
-static char const * pic_bulldoze           = "pics/menu_bld_bulldoze.png";
-static char const * pic_dismantle          = "pics/menu_bld_dismantle.png";
-static char const * pic_debug              = "pics/menu_debug.png";
+static const char * pic_bulldoze           = "pics/menu_bld_bulldoze.png";
+static const char * pic_dismantle          = "pics/menu_bld_dismantle.png";
+static const char * pic_debug              = "pics/menu_debug.png";
 
 
 Building_Window::Building_Window
@@ -72,17 +72,6 @@
 	// actually create buttons on the first call to think(),
 	// so that overriding create_capsbuttons() works
 
-	UI::Box * prevbox = new UI::Box(vbox, 0, 0, UI::Box::Vertical);
-
-	m_prevtext = new UI::Textarea(prevbox);
-	m_prevtext->set_desired_size(0, 0);
-	prevbox->add(m_prevtext, UI::Box::AlignLeft);
-
-	m_enhancecostPrev = new WaresMapDisplay(prevbox, 0, 0, 10, m_building.tribe(), NULL);
-	prevbox->add(m_enhancecostPrev, UI::Box::AlignLeft);
-
-	vbox->add(prevbox, UI::Box::AlignLeft);
-
 	set_center_panel(vbox);
 	set_think(true);
 
@@ -167,16 +156,16 @@
 	m_capscache = building().get_playercaps();
 	m_capscache_player_number = igbase().player_number();
 
-	Widelands::Player const & owner = building().owner();
-	Widelands::Player_Number const owner_number = owner.player_number();
-	bool const can_see = igbase().can_see(owner_number);
-	bool const can_act = igbase().can_act(owner_number);
+	const Widelands::Player & owner = building().owner();
+	const Widelands::Player_Number owner_number = owner.player_number();
+	const bool can_see = igbase().can_see(owner_number);
+	const bool can_act = igbase().can_act(owner_number);
 
 	bool requires_destruction_separator = false;
 	if (can_act) {
-		if (upcast(Widelands::ProductionSite const, productionsite, &m_building))
-			if (not dynamic_cast<Widelands::MilitarySite const *>(productionsite)) {
-				bool const is_stopped = productionsite->is_stopped();
+		if (upcast(const Widelands::ProductionSite, productionsite, &m_building))
+			if (not dynamic_cast<const Widelands::MilitarySite *>(productionsite)) {
+				const bool is_stopped = productionsite->is_stopped();
 				UI::Button * stopbtn =
 					new UI::Button
 						(capsbuttons, is_stopped ? "continue" : "stop", 0, 0, 34, 34,
@@ -199,12 +188,12 @@
 			}
 
 		if (m_capscache & Widelands::Building::PCap_Enhancable) {
-			std::set<Widelands::Building_Index> const & enhancements =
+			const std::set<Widelands::Building_Index> & enhancements =
 				m_building.enhancements();
-			Widelands::Tribe_Descr const & tribe  = owner.tribe();
+			const Widelands::Tribe_Descr & tribe  = owner.tribe();
 			container_iterate_const(std::set<Widelands::Building_Index>, enhancements, i)
 				if (owner.is_building_type_allowed(*i.current)) {
-					Widelands::Building_Descr const & building_descr =
+					const Widelands::Building_Descr & building_descr =
 						*tribe.get_building_descr(*i.current);
 					char buffer[128];
 					snprintf
@@ -214,22 +203,14 @@
 						new UI::Button
 							(capsbuttons, "enhance", 0, 0, 34, 34,
 							 g_gr->imgcache().load(PicMod_UI, "pics/but4.png"),
-							 building_descr.get_buildicon()); //  button id = building id)
+							 building_descr.get_buildicon(),
+							 std::string(buffer) + "<br><font size=11>" + _("Construction costs:") + "</font><br>" +
+								 waremap_to_richtext(tribe, building_descr.buildcost())); //  button id = building id
 					enhancebtn->sigclicked.connect
 						(boost::bind
 							(&Building_Window::act_enhance,
 							 boost::ref(*this),
 							 boost::ref(*i.current)));
-					enhancebtn->sigmousein.connect
-						(boost::bind
-							(&Building_Window::show_costPrev,
-							 boost::ref(*this),
-							 boost::ref
-								(*reinterpret_cast<WaresMapDisplay::maptype const *>
-									(&building_descr.buildcost())),
-							 std::string(buffer)));
-					enhancebtn->sigmouseout.connect
-						(boost::bind(&Building_Window::hide_costPrev, boost::ref(*this)));
 					capsbuttons->add
 						(enhancebtn,
 						 UI::Box::AlignCenter);
@@ -254,22 +235,16 @@
 		}
 
 		if (m_capscache & Widelands::Building::PCap_Dismantle) {
-			WaresMapDisplay::maptype wares;
+			std::map<Widelands::Ware_Index, uint8_t> wares;
 			Widelands::DismantleSite::count_returned_wares(m_building.descr(), wares);
 			UI::Button * dismantlebtn =
 				new UI::Button
 					(capsbuttons, "dismantle", 0, 0, 34, 34,
 					 g_gr->imgcache().load(PicMod_UI, "pics/but4.png"),
-					 g_gr->imgcache().load(PicMod_Game, pic_dismantle));
+					 g_gr->imgcache().load(PicMod_Game, pic_dismantle),
+					 std::string(_("Dismantle")) + "<br><font size=11>" + _("Returns:") + "</font><br>" +
+						 waremap_to_richtext(owner.tribe(), wares));
 			dismantlebtn->sigclicked.connect(boost::bind(&Building_Window::act_dismantle, boost::ref(*this)));
-			dismantlebtn->sigmousein.connect
-				(boost::bind
-					(&Building_Window::show_costPrev,
-					 boost::ref(*this),
-					 wares,
-					 _("Dismantle")));
-			dismantlebtn->sigmouseout.connect
-				(boost::bind(&Building_Window::hide_costPrev, boost::ref(*this)));
 			capsbuttons->add
 				(dismantlebtn,
 				 UI::Box::AlignCenter);
@@ -397,7 +372,7 @@
 }
 
 void Building_Window::act_start_stop() {
-	if (dynamic_cast<Widelands::ProductionSite const *>(&m_building))
+	if (dynamic_cast<const Widelands::ProductionSite *>(&m_building))
 		igbase().game().send_player_start_stop_building (m_building);
 
 	die();
@@ -408,7 +383,7 @@
 Callback for enhancement request
 ===============
 */
-void Building_Window::act_enhance(Widelands::Building_Index const id)
+void Building_Window::act_enhance(Widelands::Building_Index id)
 {
 	if (get_key_state(SDLK_LCTRL) or get_key_state(SDLK_RCTRL)) {
 		if (m_building.get_playercaps() & Widelands::Building::PCap_Enhancable)
@@ -434,29 +409,6 @@
 		 igbase().game().map().get_fcoords(m_building.get_position()));
 }
 
-/*
-===============
-Show the enhancecosts / dismanteleresults preview
-===============
-*/
-void Building_Window::show_costPrev(WaresMapDisplay::maptype const & cost, std::string text)
-{
-	m_enhancecostPrev->set_map(&cost);
-	m_prevtext->set_text(text);
-}
-
-/*
-===============
-Hide the Preview
-===============
-*/
-void Building_Window::hide_costPrev()
-{
-	m_enhancecostPrev->set_map(NULL);
-	m_prevtext->set_text("");
-	m_prevtext->set_desired_size(0, 0);
-}
-
 /**
  * Show the building's workarea (if it has one).
  */
@@ -465,12 +417,12 @@
 	if (m_workarea_job_id)
 		return; // already shown, nothing to be done
 
-	Workarea_Info const & workarea_info = m_building.descr().m_workarea_info;
+	const Workarea_Info & workarea_info = m_building.descr().m_workarea_info;
 	if (workarea_info.size() == 0)
 		return; // building has no workarea
 
 	Widelands::Map & map =
-		ref_cast<Interactive_GameBase const, UI::Panel>(*get_parent()).egbase()
+		ref_cast<const Interactive_GameBase, UI::Panel>(*get_parent()).egbase()
 		.map();
 	Overlay_Manager & overlay_manager = map.overlay_manager();
 	m_workarea_job_id = overlay_manager.get_a_job_id();
@@ -508,7 +460,7 @@
 {
 	if (m_workarea_job_id) {
 		Widelands::Map & map =
-			ref_cast<Interactive_GameBase const, UI::Panel>(*get_parent()).egbase()
+			ref_cast<const Interactive_GameBase, UI::Panel>(*get_parent()).egbase()
 			.map();
 		Overlay_Manager & overlay_manager = map.overlay_manager();
 		overlay_manager.remove_overlay(m_workarea_job_id);

=== modified file 'src/wui/buildingwindow.h'
--- src/wui/buildingwindow.h	2012-12-14 20:09:35 +0000
+++ src/wui/buildingwindow.h	2013-01-23 21:09:25 +0000
@@ -67,8 +67,6 @@
 	void act_start_stop();
 	void act_enhance(Widelands::Building_Index);
 	void clicked_goto();
-	void show_costPrev(WaresMapDisplay::maptype const & cost, std::string text);
-	void hide_costPrev();
 
 	void create_ware_queue_panel
 		(UI::Box *, Widelands::Building &, Widelands::WaresQueue *, bool = false);
@@ -83,9 +81,6 @@
 
 	UI::Tab_Panel * m_tabs;
 
-	UI::Textarea * m_prevtext;
-	WaresMapDisplay * m_enhancecostPrev;
-
 	UI::Box * m_capsbuttons; ///< \ref UI::Box that contains capabilities buttons
 	UI::Button * m_toggle_workarea;
 

=== modified file 'src/wui/fieldaction.cc'
--- src/wui/fieldaction.cc	2013-01-16 21:53:42 +0000
+++ src/wui/fieldaction.cc	2013-01-23 21:09:25 +0000
@@ -63,8 +63,8 @@
 struct BuildGrid : public UI::Icon_Grid {
 	BuildGrid
 		(UI::Panel                    * parent,
-		 Widelands::Tribe_Descr const & tribe,
-		 const int32_t x, const int32_t y,
+		 const Widelands::Tribe_Descr & tribe,
+		 int32_t x, int32_t y,
 		 int32_t cols);
 
 	boost::signal<void (Widelands::Building_Index::value_t)> buildclicked;
@@ -79,14 +79,14 @@
 	void mouseinslot(int32_t idx);
 
 private:
-	Widelands::Tribe_Descr const & m_tribe;
+	const Widelands::Tribe_Descr & m_tribe;
 };
 
 
 BuildGrid::BuildGrid
 	(UI::Panel                    * parent,
-	 Widelands::Tribe_Descr const & tribe,
-	 int32_t const x, int32_t const y,
+	 const Widelands::Tribe_Descr & tribe,
+	 int32_t x, int32_t y,
 	 int32_t                        cols)
 :
 	UI::Icon_Grid
@@ -104,13 +104,16 @@
 Add a new building to the list of buildable buildings
 ===============
 */
-void BuildGrid::add(Widelands::Building_Index::value_t const id)
+void BuildGrid::add(Widelands::Building_Index::value_t id)
 {
-	Widelands::Building_Descr const & descr =
+	const Widelands::Building_Descr & descr =
 		*m_tribe.get_building_descr(Widelands::Building_Index(id));
 	UI::Icon_Grid::add
 		(descr.name(), descr.get_buildicon(),
-		 reinterpret_cast<void *>(id), descr.descname());
+		 reinterpret_cast<void *>(id),
+		 descr.descname() + "<br><font size=11>" + _("Construction costs:") + "</font><br>" +
+			waremap_to_richtext(m_tribe, descr.buildcost()));
+;
 }
 
 
@@ -122,7 +125,7 @@
 belongs to and trigger signal buildclicked.
 ===============
 */
-void BuildGrid::clickslot(int32_t const idx)
+void BuildGrid::clickslot(int32_t idx)
 {
 	buildclicked(static_cast<int32_t>(reinterpret_cast<intptr_t>(get_data(idx))));
 }
@@ -208,13 +211,13 @@
 		(const std::string & name,
 		 const char * picname,
 		 UI::Panel * panel,
-		 const std::string & tooltip_text = std::string());
+		 const std::string & tooltip_text = "");
 	UI::Button & add_button
 		(UI::Box *,
-		 char const * name,
-		 char const * picname,
+		 const char * name,
+		 const char * picname,
 		 void (FieldActionWindow::*fn)(),
-		 std::string const & tooltip_text,
+		 const std::string & tooltip_text,
 		 bool repeating = false);
 	void okdialog();
 
@@ -224,8 +227,6 @@
 
 	Widelands::FCoords  m_node;
 
-	UI::Box m_box;
-	WaresMapDisplay * m_buildcostPrev;
 	UI::Tab_Panel      m_tabpanel;
 	bool m_fastclick; // if true, put the mouse over first button in first tab
 	uint32_t m_best_tab;
@@ -236,10 +237,10 @@
 	AttackBox * m_attack_box;
 };
 
-static char const * const pic_tab_buildroad  = "pics/menu_tab_buildroad.png";
-static char const * const pic_tab_watch      = "pics/menu_tab_watch.png";
-static char const * const pic_tab_military   = "pics/menu_tab_military.png";
-static char const * const pic_tab_buildhouse[] = {
+static const char * const pic_tab_buildroad  = "pics/menu_tab_buildroad.png";
+static const char * const pic_tab_watch      = "pics/menu_tab_watch.png";
+static const char * const pic_tab_military   = "pics/menu_tab_military.png";
+static const char * const pic_tab_buildhouse[] = {
 	"pics/menu_tab_buildsmall.png",
 	"pics/menu_tab_buildmedium.png",
 	"pics/menu_tab_buildbig.png",
@@ -254,21 +255,21 @@
 static const std::string name_tab_build[] = {"small", "medium", "big", "port"};
 
 
-static char const * const pic_tab_buildmine  = "pics/menu_tab_buildmine.png";
-
-static char const * const pic_buildroad      = "pics/menu_build_way.png";
-static char const * const pic_remroad        = "pics/menu_rem_way.png";
-static char const * const pic_buildflag      = "pics/menu_build_flag.png";
-static char const * const pic_ripflag        = "pics/menu_rip_flag.png";
-static char const * const pic_watchfield     = "pics/menu_watch_field.png";
-static char const * const pic_showcensus     = "pics/menu_show_census.png";
-static char const * const pic_showstatistics = "pics/menu_show_statistics.png";
-static char const * const pic_debug          = "pics/menu_debug.png";
-static char const * const pic_abort          = "pics/menu_abort.png";
-static char const * const pic_geologist      = "pics/menu_geologist.png";
-
-static char const * const pic_tab_attack     = "pics/menu_tab_attack.png";
-static char const * const pic_attack         = "pics/menu_attack.png";
+static const char * const pic_tab_buildmine  = "pics/menu_tab_buildmine.png";
+
+static const char * const pic_buildroad      = "pics/menu_build_way.png";
+static const char * const pic_remroad        = "pics/menu_rem_way.png";
+static const char * const pic_buildflag      = "pics/menu_build_flag.png";
+static const char * const pic_ripflag        = "pics/menu_rip_flag.png";
+static const char * const pic_watchfield     = "pics/menu_watch_field.png";
+static const char * const pic_showcensus     = "pics/menu_show_census.png";
+static const char * const pic_showstatistics = "pics/menu_show_statistics.png";
+static const char * const pic_debug          = "pics/menu_debug.png";
+static const char * const pic_abort          = "pics/menu_abort.png";
+static const char * const pic_geologist      = "pics/menu_geologist.png";
+
+static const char * const pic_tab_attack     = "pics/menu_tab_attack.png";
+static const char * const pic_attack         = "pics/menu_attack.png";
 
 
 /*
@@ -286,9 +287,7 @@
 	m_map(&ib->egbase().map()),
 	m_overlay_manager(*m_map->get_overlay_manager()),
 	m_node(ib->get_sel_pos().node, &(*m_map)[ib->get_sel_pos().node]),
-	m_box(this, 0, 0, UI::Box::Vertical),
-	m_buildcostPrev(0),
-	m_tabpanel(&m_box, 0, 0, g_gr->imgcache().load(PicMod_UI, "pics/but1.png")),
+	m_tabpanel(this, 0, 0, g_gr->imgcache().load(PicMod_UI, "pics/but1.png")),
 	m_fastclick(true),
 	m_best_tab(0),
 	m_workarea_preview_job_id(Overlay_Manager::Job_Id::Null()),
@@ -297,13 +296,7 @@
 	ib->set_sel_freeze(true);
 
 
-	m_box.add(&m_tabpanel, UI::Box::AlignCenter);
-	if (m_plr) {
-		m_buildcostPrev = new WaresMapDisplay(&m_box, 0, 0, 6, m_plr->tribe(), NULL);
-		m_box.add(m_buildcostPrev, UI::Box::AlignLeft);
-	}
-
-	set_center_panel(&m_box);
+	set_center_panel(&m_tabpanel);
 
 	char filename[] = "pics/workarea0cumulative.png";
 	compile_assert(NUMBER_OF_WORKAREA_PICS <= 9);
@@ -320,7 +313,6 @@
 		m_overlay_manager.remove_overlay(m_workarea_preview_job_id);
 	ibase().set_sel_freeze(false);
 	delete m_attack_box;
-	delete m_buildcostPrev;
 }
 
 
@@ -366,11 +358,11 @@
 	// Add road-building actions
 	upcast(Interactive_GameBase, igbase, &ibase());
 
-	Widelands::Player_Number const owner = m_node.field->get_owned_by();
+	const Widelands::Player_Number owner = m_node.field->get_owned_by();
 
 	if (not igbase or igbase->can_see(owner)) {
 		Widelands::BaseImmovable * const imm = m_map->get_immovable(m_node);
-		bool const can_act = igbase ? igbase->can_act(owner) : true;
+		const bool can_act = igbase ? igbase->can_act(owner) : true;
 
 		// The box with road-building buttons
 		buildbox = new UI::Box(&m_tabpanel, 0, 0, UI::Box::Horizontal);
@@ -411,7 +403,7 @@
 						 _("Send geologist to explore site"));
 			}
 		} else {
-			int32_t const buildcaps = m_plr ? m_plr->get_buildcaps(m_node) : 0;
+			const int32_t buildcaps = m_plr ? m_plr->get_buildcaps(m_node) : 0;
 
 			// Add house building
 			if
@@ -428,7 +420,7 @@
 					 &FieldActionWindow::act_buildflag,
 					 _("Put a flag"));
 
-			if (can_act && dynamic_cast<Widelands::Road const *>(imm))
+			if (can_act && dynamic_cast<const Widelands::Road *>(imm))
 				add_button
 					(buildbox, "destroy_road",
 					 pic_remroad,
@@ -446,7 +438,7 @@
 
 	//  Watch actions, only when game (no use in editor) same for statistics.
 	//  census is ok
-	if (dynamic_cast<Game const *>(&ibase().egbase())) {
+	if (dynamic_cast<const Game *>(&ibase().egbase())) {
 		add_button
 			(&watchbox, "watch",
 			 pic_watchfield,
@@ -526,29 +518,29 @@
 Add buttons for house building.
 ===============
 */
-void FieldActionWindow::add_buttons_build(int32_t const buildcaps)
+void FieldActionWindow::add_buttons_build(int32_t buildcaps)
 {
 	if (not m_plr)
 		return;
 	BuildGrid * bbg_house[4] = {0, 0, 0, 0};
 	BuildGrid * bbg_mine = 0;
 
-	Widelands::Tribe_Descr const & tribe = m_plr->tribe();
+	const Widelands::Tribe_Descr & tribe = m_plr->tribe();
 
 	m_fastclick = false;
 
-	Widelands::Building_Index const nr_buildings = tribe.get_nrbuildings();
+	const Widelands::Building_Index nr_buildings = tribe.get_nrbuildings();
 	for
 		(Widelands::Building_Index id = Widelands::Building_Index::First();
 		 id < nr_buildings;
 		 ++id)
 	{
-		Widelands::Building_Descr const & descr = *tribe.get_building_descr(id);
+		const Widelands::Building_Descr & descr = *tribe.get_building_descr(id);
 		BuildGrid * * ppgrid;
 
 		//  Some building types cannot be built (i.e. construction site) and not
 		//  allowed buildings.
-		if (dynamic_cast<Game const *>(&ibase().egbase())) {
+		if (dynamic_cast<const Game *>(&ibase().egbase())) {
 			if (!descr.is_buildable() || !m_plr->is_building_type_allowed(id))
 				continue;
 		} else if (!descr.is_buildable() && !descr.is_enhanced())
@@ -610,7 +602,7 @@
 Buttons used during road building: Set flag here and Abort
 ===============
 */
-void FieldActionWindow::add_buttons_road(bool const flag)
+void FieldActionWindow::add_buttons_road(bool flag)
 {
 	UI::Box & buildbox = *new UI::Box(&m_tabpanel, 0, 0, UI::Box::Horizontal);
 
@@ -634,8 +626,8 @@
 ===============
 */
 uint32_t FieldActionWindow::add_tab
-	(std::string const & name, char const * picname,
-	 UI::Panel * panel, std::string const & tooltip_text)
+	(const std::string & name, const char * picname,
+	 UI::Panel * panel, const std::string & tooltip_text)
 {
 	return
 		m_tabpanel.add
@@ -645,11 +637,11 @@
 
 UI::Button & FieldActionWindow::add_button
 	(UI::Box           * const box,
-	 char        const * const name,
-	 char        const * const picname,
+	 const char        * const name,
+	 const char        * const picname,
 	 void (FieldActionWindow::*fn)(),
-	 std::string const & tooltip_text,
-	 bool                const repeating)
+	 const std::string & tooltip_text,
+	 bool                repeating)
 {
 	UI::Button & button =
 		*new UI::Button
@@ -749,7 +741,7 @@
 
 void FieldActionWindow::act_configure_economy()
 {
-	if (upcast(Widelands::Flag const, flag, m_node.field->get_immovable()))
+	if (upcast(const Widelands::Flag, flag, m_node.field->get_immovable()))
 		flag->get_economy()->show_options_window();
 }
 
@@ -835,7 +827,7 @@
 Start construction of the building with the give description index
 ===============
 */
-void FieldActionWindow::act_build(Widelands::Building_Index::value_t const idx)
+void FieldActionWindow::act_build(Widelands::Building_Index::value_t idx)
 {
 	Widelands::Game & game = ref_cast<Game, Editor_Game_Base>(ibase().egbase());
 	game.send_player_build
@@ -853,7 +845,6 @@
 void FieldActionWindow::building_icon_mouse_out
 	(Widelands::Building_Index::value_t)
 {
-	m_buildcostPrev->set_map(NULL);
 	if (m_workarea_preview_job_id) {
 		m_overlay_manager.remove_overlay(m_workarea_preview_job_id);
 		m_workarea_preview_job_id = Overlay_Manager::Job_Id::Null();
@@ -862,11 +853,8 @@
 
 
 void FieldActionWindow::building_icon_mouse_in
-	(Widelands::Building_Index::value_t const idx)
+	(const Widelands::Building_Index::value_t idx)
 {
-	m_buildcostPrev->set_map
-		(&m_plr->tribe().get_building_descr(Widelands::Building_Index(idx))->buildcost());
-
 	if (ibase().m_show_workarea_preview and not m_workarea_preview_job_id) {
 		m_workarea_preview_job_id = m_overlay_manager.get_a_job_id();
 		Widelands::HollowArea<> hollow_area(Widelands::Area<>(m_node, 0), 0);
@@ -939,7 +927,7 @@
 		if (m_attack_box->soldiers() > 0)
 			game.send_player_enemyflagaction
 				(building->base_flag(),
-				 ref_cast<Interactive_Player const, Interactive_Base const>
+				 ref_cast<const Interactive_Player, const Interactive_Base>
 				 	(ibase())
 				 .player_number(),
 				 m_attack_box->soldiers(), //  number of soldiers
@@ -972,10 +960,10 @@
 		return w.init();
 	}
 
-	Widelands::Map const & map = player->egbase().map();
+	const Widelands::Map & map = player->egbase().map();
 
 	// we're building a road right now
-	Widelands::FCoords const target =
+	const Widelands::FCoords target =
 		map.get_fcoords(ibase->get_sel_pos().node);
 
 	// if user clicked on the same field again, build a flag
@@ -998,12 +986,12 @@
 
 	// did he click on a flag or a road where a flag can be built?
 
-	if (upcast(Widelands::PlayerImmovable const, i, map.get_immovable(target)))
+	if (upcast(const Widelands::PlayerImmovable, i, map.get_immovable(target)))
 	{
 		bool finish = false;
-		if      (dynamic_cast<Widelands::Flag const *>(i))
+		if      (dynamic_cast<const Widelands::Flag *>(i))
 			finish = true;
-		else if (dynamic_cast<Widelands::Road const *>(i))
+		else if (dynamic_cast<const Widelands::Road *>(i))
 			if (player->get_buildcaps(target) & Widelands::BUILDCAPS_FLAG) {
 				ref_cast<Game, Editor_Game_Base>(player->egbase())
 					.send_player_build_flag(player->player_number(), target);

=== modified file 'src/wui/waresdisplay.cc'
--- src/wui/waresdisplay.cc	2013-01-05 18:52:13 +0000
+++ src/wui/waresdisplay.cc	2013-01-23 21:09:25 +0000
@@ -40,8 +40,8 @@
 
 AbstractWaresDisplay::AbstractWaresDisplay
 	(UI::Panel * const parent,
-	 int32_t const x, int32_t const y,
-	 Widelands::Tribe_Descr const & tribe,
+	 int32_t x, int32_t y,
+	 const Widelands::Tribe_Descr & tribe,
 	 Widelands::WareWorker type,
 	 bool selectable,
 	 boost::function<void(Widelands::Ware_Index, bool)> callback_function,
@@ -91,9 +91,9 @@
 
 
 bool AbstractWaresDisplay::handle_mousemove
-	(Uint8, int32_t const x, int32_t const y, int32_t, int32_t)
+	(uint8_t, int32_t x, int32_t y, int32_t, int32_t)
 {
-	Widelands::Ware_Index const index = ware_at_point(x, y);
+	const Widelands::Ware_Index index = ware_at_point(x, y);
 
 	m_curware.set_text
 		(index ?
@@ -108,7 +108,7 @@
 }
 
 bool AbstractWaresDisplay::handle_mousepress
-	(Uint8 btn, int32_t const x, int32_t const y)
+	(uint8_t btn, int32_t x, int32_t y)
 {
 	if (btn == SDL_BUTTON_LEFT) {
 		Widelands::Ware_Index ware = ware_at_point(x, y);
@@ -186,7 +186,7 @@
 	}
 }
 
-Widelands::Tribe_Descr::WaresOrder const & AbstractWaresDisplay::icons_order() const
+const Widelands::Tribe_Descr::WaresOrder & AbstractWaresDisplay::icons_order() const
 {
 	switch (m_type) {
 		case Widelands::wwWARE:
@@ -199,7 +199,7 @@
 	throw wexception("Invalid m_type %d", m_type);
 }
 
-Widelands::Tribe_Descr::WaresOrderCoords const & AbstractWaresDisplay::icons_order_coords() const
+const Widelands::Tribe_Descr::WaresOrderCoords & AbstractWaresDisplay::icons_order_coords() const
 {
 	switch (m_type) {
 		case Widelands::wwWARE:
@@ -313,14 +313,14 @@
 
 WaresDisplay::WaresDisplay
 	(UI::Panel * const parent,
-	 int32_t const x, int32_t const y,
-	 Widelands::Tribe_Descr const & tribe,
+	 int32_t x, int32_t y,
+	 const Widelands::Tribe_Descr & tribe,
 	 Widelands::WareWorker type,
 	 bool selectable)
 : AbstractWaresDisplay(parent, x, y, tribe, type, selectable)
 {}
 
-RGBColor AbstractWaresDisplay::info_color_for_ware(Widelands::Ware_Index const /* ware */) {
+RGBColor AbstractWaresDisplay::info_color_for_ware(Widelands::Ware_Index /* ware */) {
 	return RGBColor(0, 0, 0);
 }
 
@@ -345,7 +345,7 @@
 ===============
 */
 void WaresDisplay::add_warelist
-	(Widelands::WareList const & wares)
+	(const Widelands::WareList & wares)
 {
 	//  If you register something twice, it is counted twice. Not my problem.
 	m_warelists.push_back(&wares);
@@ -355,85 +355,27 @@
 }
 
 
-/*
-====================================================
-struct BuildcostDisplay
-====================================================
-*/
-
-WaresMapDisplay::WaresMapDisplay
-	(UI::Panel * const parent,
-	 const int32_t x, const int32_t y,
-	 int32_t columns,
-	 Widelands::Tribe_Descr const & tribe,
-	 maptype const * map)
-	:
-	UI::Panel (parent, x, y, 0, 0), m_tribe(tribe), m_columns(columns)
-{
-	set_map(map);
-}
-
-WaresMapDisplay::~WaresMapDisplay()
-{}
-
-void WaresMapDisplay::set_map(maptype const * map) {
-	m_map = map;
-	if (m_map) {
-		int32_t c = m_map->size();
-		set_desired_size
-			((c < m_columns ? c : m_columns) * (WARE_MENU_PIC_WIDTH + 4) + 1,
-			 ((c / m_columns) + (c % m_columns != 0)) * (WARE_MENU_PIC_HEIGHT + 3 + WARE_MENU_INFO_SIZE) + 1);
-		set_visible(true);
-	} else {
-		set_desired_size(0, 0);
-		set_visible(false);
-	}
-}
-
-void WaresMapDisplay::draw(RenderTarget & dst)
-{
-	if (not m_map)
-		return;
-
-	Point p = Point(2, 2);
-
-	maptype::const_iterator c;
+std::string waremap_to_richtext
+		(const Widelands::Tribe_Descr & tribe,
+		 const std::map<Widelands::Ware_Index, uint8_t> & map)
+{
+	std::string ret;
+
+	std::map<Widelands::Ware_Index, uint8_t>::const_iterator c;
 
 	Widelands::Tribe_Descr::WaresOrder::iterator i;
 	std::vector<Widelands::Ware_Index>::iterator j;
-	Widelands::Tribe_Descr::WaresOrder order = m_tribe.wares_order();
+	Widelands::Tribe_Descr::WaresOrder order = tribe.wares_order();
 
 	for (i = order.begin(); i != order.end(); i++)
 		for (j = i->begin(); j != i->end(); ++j)
-			if ((c = m_map->find(*j)) != m_map->end()) {
-				//  draw a background
-				const IPicture* pic = g_gr->imgcache().load (PicMod_Game, "pics/ware_list_bg.png");
-				uint32_t w = pic->get_w();
-
-				dst.blit(p, pic);
-
-				const Point pos = p + Point((w - WARE_MENU_PIC_WIDTH) / 2, 1);
-				// Draw it
-				dst.blit
-				(pos,
-				 m_tribe.get_ware_descr(c->first)->icon());
-				dst.fill_rect
-				(Rect(pos + Point(0, WARE_MENU_PIC_HEIGHT), WARE_MENU_PIC_WIDTH, WARE_MENU_INFO_SIZE),
-				 RGBColor(0, 0, 0));
-
-				UI::g_fh->draw_text
-				(dst, UI::TextStyle::ui_ultrasmall(),
-				 p + Point(WARE_MENU_PIC_WIDTH, WARE_MENU_PIC_HEIGHT - 4),
-				 boost::lexical_cast<std::string, uint32_t>(c->second),
-				 UI::Align_Right);
-
-				p.x += (WARE_MENU_PIC_WIDTH + 4);
-				if (p.x >= (m_columns * (WARE_MENU_PIC_WIDTH + 4))) {
-					p.x = 2;
-					p.y += (WARE_MENU_PIC_HEIGHT + 3 + WARE_MENU_INFO_SIZE);
-				}
+			if ((c = map.find(*j)) != map.end()) {
+				ret += "<sub width=30 padding=2><p align=center>"
+						 "<sub width=26 background=454545><p align=center><img src=\""
+						+ tribe.get_ware_descr(c->first)->icon_name()
+						+ "\"></p></sub><sub width=26 background=000000><p><font size=9>"
+						+ boost::lexical_cast<std::string>(static_cast<int32_t>(c->second))
+						+ "</font></p></sub></p></sub>";
 			}
+	return ret;
 }
-
-
-

=== modified file 'src/wui/waresdisplay.h'
--- src/wui/waresdisplay.h	2012-12-16 21:02:00 +0000
+++ src/wui/waresdisplay.h	2013-01-23 21:09:25 +0000
@@ -45,20 +45,21 @@
  *
  * For practical purposes, use one of the derived classes, e.g. @ref WaresDisplay.
  */
-struct AbstractWaresDisplay : public UI::Panel {
+class AbstractWaresDisplay : public UI::Panel {
+public:
 	AbstractWaresDisplay
 		(UI::Panel * const parent,
-		 int32_t const x, int32_t const y,
-		 Widelands::Tribe_Descr const &,
+		 int32_t x, int32_t y,
+		 const Widelands::Tribe_Descr &,
 		 Widelands::WareWorker type,
 		 bool selectable,
 		 boost::function<void(Widelands::Ware_Index, bool)> callback_function = NULL,
 		 bool horizontal = true);
 
 	bool handle_mousemove
-		(Uint8 state, int32_t x, int32_t y, int32_t xdiff, int32_t ydiff);
+		(uint8_t state, int32_t x, int32_t y, int32_t xdiff, int32_t ydiff);
 
-	bool handle_mousepress(Uint8 btn, int32_t x, int32_t y);
+	bool handle_mousepress(uint8_t btn, int32_t x, int32_t y);
 
 
 	// Wares may be selected (highlighted)
@@ -85,12 +86,12 @@
 protected:
 	virtual void layout();
 
-	virtual std::string info_for_ware(Widelands::Ware_Index const) = 0;
+	virtual std::string info_for_ware(Widelands::Ware_Index) = 0;
 
 	virtual RGBColor info_color_for_ware(Widelands::Ware_Index);
 
-	Widelands::Tribe_Descr::WaresOrder const & icons_order() const;
-	Widelands::Tribe_Descr::WaresOrderCoords const & icons_order_coords() const;
+	const Widelands::Tribe_Descr::WaresOrder & icons_order() const;
+	const Widelands::Tribe_Descr::WaresOrderCoords & icons_order_coords() const;
 	virtual Point ware_position(Widelands::Ware_Index) const;
 	virtual void draw(RenderTarget &);
 	virtual void draw_ware
@@ -98,10 +99,10 @@
 		 Widelands::Ware_Index);
 
 private:
-	typedef std::vector<Widelands::WareList const *> vector_type;
+	typedef std::vector<const Widelands::WareList *> vector_type;
 	typedef std::vector<bool> selection_type;
 
-	Widelands::Tribe_Descr const & m_tribe;
+	const Widelands::Tribe_Descr & m_tribe;
 	Widelands::WareWorker m_type;
 	UI::Textarea        m_curware;
 	selection_type      m_selected;
@@ -112,59 +113,36 @@
 };
 
 /*
-struct WaresDisplay
+class WaresDisplay
 ------------------
 Panel that displays the contents of many WareLists. The ware_lists
 must be valid while they are registered with this class.
 */
-struct WaresDisplay : public AbstractWaresDisplay {
+class WaresDisplay : public AbstractWaresDisplay {
+public:
 	WaresDisplay
 		(UI::Panel * const parent,
-		 int32_t const x, int32_t const y,
-		 Widelands::Tribe_Descr const &,
+		 int32_t x, int32_t y,
+		 const Widelands::Tribe_Descr &,
 		 Widelands::WareWorker type,
 		 bool selectable);
 
 	virtual ~WaresDisplay();
 
-	void add_warelist(Widelands::WareList const &);
+	void add_warelist(const Widelands::WareList &);
 	void remove_all_warelists();
 
 protected:
 	virtual std::string info_for_ware(Widelands::Ware_Index);
 
 private:
-	typedef std::vector<Widelands::WareList const *> vector_type;
+	typedef std::vector<const Widelands::WareList *> vector_type;
 	vector_type         m_warelists;
 	std::vector<boost::signals::connection> connections_;
 };
 
-
-/**
- * Displays the build costs of a given building
- */
-
-struct WaresMapDisplay : public UI::Panel {
-	typedef std::map<Widelands::Ware_Index, uint8_t> maptype;
-
-	WaresMapDisplay
-		(UI::Panel * const parent,
-		 int32_t const x, int32_t const y,
-		 int32_t columns,
-		 Widelands::Tribe_Descr const & tribe,
-		 maptype const * map = NULL);
-
-	virtual ~WaresMapDisplay();
-
-	void set_map(maptype const * map);
-
-private:
-	virtual void draw(RenderTarget &);
-
-private:
-	Widelands::Tribe_Descr const & m_tribe;
-	maptype const * m_map;
-	int32_t m_columns;
-};
+std::string waremap_to_richtext
+		(const Widelands::Tribe_Descr & tribe,
+		 const std::map<Widelands::Ware_Index, uint8_t> & map);
 
 #endif