widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

Hans Joachim Desserud has proposed merging lp:~hjd/widelands/checkbox-light into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #986534 in widelands: "Improve in-game checkboxes"
  https://bugs.launchpad.net/widelands/+bug/986534

For more details, see:
https://code.launchpad.net/~hjd/widelands/checkbox-light/+merge/104251
-- 
https://code.launchpad.net/~hjd/widelands/checkbox-light/+merge/104251
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/checkbox-light into lp:widelands.

=== renamed file 'pics/checkbox_light_new.png' => 'pics/checkbox_light.png'
=== modified file 'src/ui_basic/checkbox.cc'
--- src/ui_basic/checkbox.cc	2012-02-15 21:25:34 +0000
+++ src/ui_basic/checkbox.cc	2012-05-01 13:48:20 +0000
@@ -49,7 +49,7 @@
 		m_pic_graphics = picid;
 	} else
 		m_pic_graphics =
-			g_gr->get_picture(PicMod_UI, "pics/checkbox_light_new.png");
+			g_gr->get_picture(PicMod_UI, "pics/checkbox_light.png");
 }
 
 
@@ -74,7 +74,7 @@
 	if (not (m_flags & Has_Custom_Picture)) {
 		m_pic_graphics = g_gr->get_picture
 			(PicMod_UI,
-			 enabled ? "pics/checkbox_light_new.png" : "pics/checkbox.png");
+			 enabled ? "pics/checkbox_light.png" : "pics/checkbox.png");
 		set_flags
 			(Is_Highlighted, m_flags & Is_Highlighted and m_flags & Is_Enabled);
 	}