widelands-dev team mailing list archive

[SirVer <SirVer@xxxxxx>]

Review: Approve



Diff comments:

> 
> === modified file 'src/ui_basic/messagebox.cc'
> --- src/ui_basic/messagebox.cc	2015-08-06 17:14:34 +0000
> +++ src/ui_basic/messagebox.cc	2015-09-09 18:54:54 +0000
> @@ -20,7 +20,6 @@
>  #include "ui_basic/messagebox.h"
>  
>  #include "base/i18n.h"
> -#include "base/log.h" // NOCOM

uups...

>  #include "graphic/font_handler.h"
>  #include "graphic/graphic.h"
>  #include "ui_basic/button.h"
> 
> === modified file 'src/wui/minimap.cc'
> --- src/wui/minimap.cc	2014-12-07 20:52:55 +0000
> +++ src/wui/minimap.cc	2015-09-09 18:54:54 +0000
> @@ -143,37 +143,43 @@
>  		 but_w() * 0, m_view.get_h() + but_h() * 0, but_w(), but_h(),
>  		 g_gr->images().get("pics/but0.png"),
>  		 g_gr->images().get("pics/button_terrn.png"),
> -		 _("Terrain")),
> +		 _("Terrain"),
> +		 true, false, true),

true false true is unreadable. Introduce enum classes for the bools? If that is too much work, add appropriate todos

>  	button_owner
>  		(this, "owner",
>  		 but_w() * 1, m_view.get_h() + but_h() * 0, but_w(), but_h(),
>  		 g_gr->images().get("pics/but0.png"),
>  		 g_gr->images().get("pics/button_owner.png"),
> -		 _("Owner")),
> +		 _("Owner"),
> +		 true, false, true),
>  	button_flags
>  		(this, "flags",
>  		 but_w() * 2, m_view.get_h() + but_h() * 0, but_w(), but_h(),
>  		 g_gr->images().get("pics/but0.png"),
>  		 g_gr->images().get("pics/button_flags.png"),
> -		 _("Flags")),
> +		 _("Flags"),
> +		 true, false, true),
>  	button_roads
>  		(this, "roads",
>  		 but_w() * 0, m_view.get_h() + but_h() * 1, but_w(), but_h(),
>  		 g_gr->images().get("pics/but0.png"),
>  		 g_gr->images().get("pics/button_roads.png"),
> -		 _("Roads")),
> +		 _("Roads"),
> +		 true, false, true),
>  	button_bldns
>  		(this, "buildings",
>  		 but_w() * 1, m_view.get_h() + but_h() * 1, but_w(), but_h(),
>  		 g_gr->images().get("pics/but0.png"),
>  		 g_gr->images().get("pics/button_bldns.png"),
> -		 _("Buildings")),
> +		 _("Buildings"),
> +		 true, false, true),
>  	button_zoom
>  		(this, "zoom",
>  		 but_w() * 2, m_view.get_h() + but_h() * 1, but_w(), but_h(),
>  		 g_gr->images().get("pics/but0.png"),
>  		 g_gr->images().get("pics/button_zoom.png"),
> -		 _("Zoom"))
> +		 _("Zoom"),
> +		 true, false, true)
>  {
>  	button_terrn.sigclicked.connect(boost::bind(&MiniMap::toggle, boost::ref(*this), MiniMapLayer::Terrain));
>  	button_owner.sigclicked.connect(boost::bind(&MiniMap::toggle, boost::ref(*this), MiniMapLayer::Owner));


-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1401479/+merge/270582
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1401479.