widelands-dev team mailing list archive

[Borim <borim7@xxxxxx>]

Borim has proposed merging lp:~borim/widelands/economyChart into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~borim/widelands/economyChart/+merge/85225

* add graphics for the tabs of the ware statistics menu
-- 
https://code.launchpad.net/~borim/widelands/economyChart/+merge/85225
Your team Widelands Developers is requested to review the proposed merge of lp:~borim/widelands/economyChart into lp:widelands.

=== added file 'pics/menu_tab_wares_consumption.png'
Binary files pics/menu_tab_wares_consumption.png	1970-01-01 00:00:00 +0000 and pics/menu_tab_wares_consumption.png	2011-12-10 15:53:37 +0000 differ
=== added file 'pics/menu_tab_wares_econ_health.png'
Binary files pics/menu_tab_wares_econ_health.png	1970-01-01 00:00:00 +0000 and pics/menu_tab_wares_econ_health.png	2011-12-10 15:53:37 +0000 differ
=== added file 'pics/menu_tab_wares_production.png'
Binary files pics/menu_tab_wares_production.png	1970-01-01 00:00:00 +0000 and pics/menu_tab_wares_production.png	2011-12-10 15:53:37 +0000 differ
=== modified file 'src/wui/ware_statistics_menu.cc'
--- src/wui/ware_statistics_menu.cc	2011-11-30 21:38:37 +0000
+++ src/wui/ware_statistics_menu.cc	2011-12-10 15:53:37 +0000
@@ -44,10 +44,9 @@
 
 #define INACTIVE 0
 
-//TODO place holder, need to be changed
-static const char pic_tab_production[] = "pics/menu_tab_wares.png";
-static const char pic_tab_consumption[] = "pics/menu_tab_wares.png";
-static const char pic_tab_economy[] = "pics/menu_tab_wares.png";
+static const char pic_tab_production[] = "pics/menu_tab_wares_production.png";
+static const char pic_tab_consumption[] = "pics/menu_tab_wares_consumption.png";
+static const char pic_tab_economy[] = "pics/menu_tab_wares_econ_health.png";
 
 static const RGBColor colors[] = {
 	RGBColor(115, 115, 115), //inactive
@@ -201,7 +200,7 @@
 	m_plot_economy->set_plotmode(WUIPlot_Area::PLOTMODE_RELATIVE);
 
 	tabs->add
-		("economy_health", g_gr->get_picture(PicMod_UI, pic_tab_production),
+		("economy_health", g_gr->get_picture(PicMod_UI, pic_tab_economy),
 			m_plot_economy, _("Economy Health"));
 
 	tabs->activate(0);