Merge lp:~hjd/widelands/checkbox-light into lp:widelands

Proposed by Hans Joachim Desserud
Status: Merged
Merged at revision: 6373
Proposed branch: lp:~hjd/widelands/checkbox-light
Merge into: lp:widelands
Diff against target: 22 lines (+2/-2)
1 file modified
src/ui_basic/checkbox.cc (+2/-2)
To merge this branch: bzr merge lp:~hjd/widelands/checkbox-light
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+104251@code.launchpad.net
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=== renamed file 'pics/checkbox_light_new.png' => 'pics/checkbox_light.png'
2=== modified file 'src/ui_basic/checkbox.cc'
3--- src/ui_basic/checkbox.cc 2012-02-15 21:25:34 +0000
4+++ src/ui_basic/checkbox.cc 2012-05-01 13:48:20 +0000
5@@ -49,7 +49,7 @@
6 m_pic_graphics = picid;
7 } else
8 m_pic_graphics =
9- g_gr->get_picture(PicMod_UI, "pics/checkbox_light_new.png");
10+ g_gr->get_picture(PicMod_UI, "pics/checkbox_light.png");
11 }
12
13
14@@ -74,7 +74,7 @@
15 if (not (m_flags & Has_Custom_Picture)) {
16 m_pic_graphics = g_gr->get_picture
17 (PicMod_UI,
18- enabled ? "pics/checkbox_light_new.png" : "pics/checkbox.png");
19+ enabled ? "pics/checkbox_light.png" : "pics/checkbox.png");
20 set_flags
21 (Is_Highlighted, m_flags & Is_Highlighted and m_flags & Is_Enabled);
22 }

Subscribers

People subscribed via source and target branches

to status/vote changes: