Merge lp:~borim/widelands/economyChart into lp:widelands

Proposed by Borim
Status: Merged
Approved by: Nasenbaer
Approved revision: no longer in the source branch.
Merged at revision: 6161
Proposed branch: lp:~borim/widelands/economyChart
Merge into: lp:widelands
Diff against target: 32 lines (+4/-5)
1 file modified
src/wui/ware_statistics_menu.cc (+4/-5)
To merge this branch: bzr merge lp:~borim/widelands/economyChart
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+85225@code.launchpad.net

Description of the change

* add graphics for the tabs of the ware statistics menu

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added file 'pics/menu_tab_wares_consumption.png'
0Binary 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 differ0Binary 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'
1Binary 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 differ1Binary 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'
2Binary 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 differ2Binary 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 @@
4444
45#define INACTIVE 045#define INACTIVE 0
4646
47//TODO place holder, need to be changed47static const char pic_tab_production[] = "pics/menu_tab_wares_production.png";
48static const char pic_tab_production[] = "pics/menu_tab_wares.png";48static const char pic_tab_consumption[] = "pics/menu_tab_wares_consumption.png";
49static const char pic_tab_consumption[] = "pics/menu_tab_wares.png";49static const char pic_tab_economy[] = "pics/menu_tab_wares_econ_health.png";
50static const char pic_tab_economy[] = "pics/menu_tab_wares.png";
5150
52static const RGBColor colors[] = {51static const RGBColor colors[] = {
53 RGBColor(115, 115, 115), //inactive52 RGBColor(115, 115, 115), //inactive
@@ -201,7 +200,7 @@
201 m_plot_economy->set_plotmode(WUIPlot_Area::PLOTMODE_RELATIVE);200 m_plot_economy->set_plotmode(WUIPlot_Area::PLOTMODE_RELATIVE);
202201
203 tabs->add202 tabs->add
204 ("economy_health", g_gr->get_picture(PicMod_UI, pic_tab_production),203 ("economy_health", g_gr->get_picture(PicMod_UI, pic_tab_economy),
205 m_plot_economy, _("Economy Health"));204 m_plot_economy, _("Economy Health"));
206205
207 tabs->activate(0);206 tabs->activate(0);

Subscribers

People subscribed via source and target branches

to status/vote changes: