widelands

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

  1. economyChart
  2. Merge into trunk
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
1=== added file 'pics/menu_tab_wares_consumption.png'
2Binary 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
3=== added file 'pics/menu_tab_wares_econ_health.png'
4Binary 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
5=== added file 'pics/menu_tab_wares_production.png'
6Binary 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
7=== modified file 'src/wui/ware_statistics_menu.cc'
8--- src/wui/ware_statistics_menu.cc 2011-11-30 21:38:37 +0000
9+++ src/wui/ware_statistics_menu.cc 2011-12-10 15:53:37 +0000
10@@ -44,10 +44,9 @@
11
12 #define INACTIVE 0
13
14-//TODO place holder, need to be changed
15-static const char pic_tab_production[] = "pics/menu_tab_wares.png";
16-static const char pic_tab_consumption[] = "pics/menu_tab_wares.png";
17-static const char pic_tab_economy[] = "pics/menu_tab_wares.png";
18+static const char pic_tab_production[] = "pics/menu_tab_wares_production.png";
19+static const char pic_tab_consumption[] = "pics/menu_tab_wares_consumption.png";
20+static const char pic_tab_economy[] = "pics/menu_tab_wares_econ_health.png";
21
22 static const RGBColor colors[] = {
23 RGBColor(115, 115, 115), //inactive
24@@ -201,7 +200,7 @@
25 m_plot_economy->set_plotmode(WUIPlot_Area::PLOTMODE_RELATIVE);
26
27 tabs->add
28- ("economy_health", g_gr->get_picture(PicMod_UI, pic_tab_production),
29+ ("economy_health", g_gr->get_picture(PicMod_UI, pic_tab_economy),
30 m_plot_economy, _("Economy Health"));
31
32 tabs->activate(0);

Subscribers

People subscribed via source and target branches

to status/vote changes: