Merge lp:~widelands-dev/widelands/revise-map-descr into lp:widelands

[GunChleoc]

Revised map details in map loading screens. Localized map tags everywhere.

It became impossible to scroll through some map descriptions, so I put it all into one big richtext area. This means that I could also add some more info like map size and tags.

[kaputtnik (franku)]

Good ideas :-)

Some things:
1. The slider of the scrollbar does not change his size if there is less to scroll (the slider is always small) Good to see in screen resolution 1280x720 and map Four Mountains.
2. There are obsolete information: "Map size" and "2/3/4/... Player map". These information is always in the table, so why should we have it in the description again?
3. Having non bold text for normal descriptions is fine, but for me it is hard to read in the first time. Maybe we could have another color for the text or a different background?

Showing the tags is a good idea :-)

Just a side note:
For a longer time i thought of a rework of the menus (especially in regard to my point 3), but i had no good ideas until today... and of course i do not know which possibilities there are. F.e. the checkboxes in "New game" looks a bit unordered and i guess some of them aren't used at all. Maybe we could make a poll on the website to determine what is really needed here. But creating a good, useful ui is a long and not easy task ... So nothing against your work :-)

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1016. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/123413309.
Appveyor build 848. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_revise_map_descr-848.

[GunChleoc (gunchleoc)]

1. Fixed

> 2. There are obsolete information: "Map size" and "2/3/4/... Player map".
> These information is always in the table, so why should we have it in the
> description again?

We also use this in Editor-> Save Map. Do you think the information is useless there as well? There are 3 ways we could go:

a. leave the info in
b. remove the info
c. distinguish between loading and saving contexts

3. How is it now?

> Just a side note:

Good idea, but not for Build 19 ;)

[kaputtnik (franku)]

Got a crash when trying to access a folder in 'editor load map' and 'New game':

terminate called after throwing an instance of 'RT::SyntaxErrorImpl'
  what(): Syntax error at 1:65: expected an allowed tag, got 'parent'. String continues with: '<parent></font></p></rt>'

> 1. Fixed
Yeah :-)

> > 2. There are obsolete information: "Map size" and "2/3/4/... Player map".
> > These information is always in the table, so why should we have it in the
> > description again?
>
> We also use this in Editor-> Save Map. Do you think the information is useless
> there as well?
Yes, i think so. A mapmaker normally knows how much players he has placed on the map. The size of the map is mostly interesting when creating a new map because it has influence to max. number of players or shaping the terrain (how much unbuildable areas). And if a map is saved once, the size is shown in table. The size of the map is also shown in the Map options menu and as explained earlier i would prefer to make the Map Options be a part of the whole Map save process (i create a bug report for this idea).
So i would say:

> b. remove the info

> 3. How is it now?
Hm, maybe better but now there is a mix of coloring headers: Mapname, yellow; String "Author", white; Name of author yellow. If we think of Headers as static strings (Name of map, "Author", "Tags"...) and other texts as variable strings (Name of Author, List of tags, Text of description,...) i think all static texts should have the same color (f.e. yellow) and all variable texts should have the same color (f.e. white). The Name of the menu is also a static text and therefor should have the same color as other static texts. I believe making a distinction like this (static/variable texts) would bring some visual order to the menu. Having two colors is really good :-)

> > Just a side note:
>
> Good idea, but not for Build 19 ;)

Yes, of course ;)

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1018. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/123520813.
Appveyor build 850. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_revise_map_descr-850.

[GunChleoc (gunchleoc)]

> b. remove the info

Done

3. A consistent color scheme is always good, but I don't think we can pull this off easily without doing a bigger overhaul. The colors have to fit for both dark and light backgrounds. So, I have removed the color from the headers and used some italic texts instead. How does it look to you now?

[kaputtnik (franku)]

Hm, i don't know really. The two colored texts are better in my opinion. I have made some screenshots for a comparison and changed the code to use the bright gray color for "txt as_content": http://home.arcor.de/frank.ue/menu_shots.jpg

Above left: Current trunk
Above right: This branch with italic
Middle left: Bright gray for "as_content"
Middle right: For comparison of bright gray with wooden background
Bottom: Load save game menu

I believe the main problematic thing is to visual distinguish between headers and the text. Currently this is made by having a colon after each header and indentation of content texts, which i like very much. Regarding the colon: "Suggested Teams" has it, and putting it after the other headers would help to distinguish, IMHO.

One other thing is disturbing: The second line. This shows either "Map", "Scenario" or "Directory" after the Name of the map/directory. The second line is not "self explaining". If one chooses different maps from the list there is always "Map" shown. So he/she may ask him/her self what does this "Map" mean? In current trunk this is better solved by having the strings "Map:", "Scenario:" and "Directory:" (with colon) as first line and the second line contains then the name of the map or the name of directory. This explains the second line instead in this branch there is no explaining.

I think the main problem for doing this branch is the suggested teams area, which needs a lot of space. Maybe we find another solution for this issue later on. F.e i could imagine to place suggested teams in the Launch Game menu... Just because it is then shown when the teams could be made. Currently the suggested teams could not be seen anymore where one has to make them. Future talk...

[GunChleoc (gunchleoc)]

How is it now? We can't do indents at this time, so I'm using a color scheme again. I made separate layouts for the fullscreen and the editor menus.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1025. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/124406264.
Appveyor build 857. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_revise_map_descr-857.

[kaputtnik (franku)]

I think it's good now... maybe decrease the font size a bit in the load game menu?

There is now different coloring for headers in editor and load game, but the color scheme in editor is the same as for the help, so there is a consistent coloring "white headers on wooden background".

But my opinion is not the only valid one. Maybe someone else should tell his opinion? Asking in forum?

No crash discovered :-)

review: Approve (testing)

[GunChleoc (gunchleoc)]

Decreasing the font size makes it harder to read, so I'd rather not.

[Miroslav Remák (miroslavr256)]

Codecheck complains:
src/wui/mapdetails.cc:153: Line is too long! Keep it < 110 chars (with tab width of 3)

LGTM otherwise.

review: Approve (code)

[bunnybot (widelandsofficial)]

Bunnybot encountered an error while working on this merge proposal:

The read operation timed out

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1025. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/124406264.
Appveyor build 857. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_revise_map_descr-857.

[GunChleoc (gunchleoc)]

Thanks!

@bunnybot merge

=== modified file 'src/editor/ui_menus/main_menu_load_or_save_map.cc'
--- src/editor/ui_menus/main_menu_load_or_save_map.cc	2016-04-06 09:23:04 +0000
+++ src/editor/ui_menus/main_menu_load_or_save_map.cc	2016-05-06 08:30:33 +0000
@@ -48,7 +48,8 @@
 
 	  table_(this, tablex_, tabley_, tablew_, tableh_, false),
 	  map_details_(
-		  this, right_column_x_, tabley_, get_inner_w() - right_column_x_ - padding_, tableh_),
+		  this, right_column_x_, tabley_, get_inner_w() - right_column_x_ - padding_, tableh_,
+		  MapDetails::Style::kWui),
      ok_(this,
          "ok",
 			UI::g_fh1->fontset()->is_rtl() ? get_inner_w() / 2 - butw_ - padding_ : get_inner_w() / 2 + padding_,

=== modified file 'src/editor/ui_menus/main_menu_map_options.cc'
--- src/editor/ui_menus/main_menu_map_options.cc	2016-04-23 13:33:53 +0000
+++ src/editor/ui_menus/main_menu_map_options.cc	2016-05-06 08:30:33 +0000
@@ -33,6 +33,7 @@
 #include "ui_basic/multilineeditbox.h"
 #include "ui_basic/multilinetextarea.h"
 #include "ui_basic/textarea.h"
+#include "wui/map_tags.h"
 
 inline EditorInteractive & MainMenuMapOptions::eia() {
 	return dynamic_cast<EditorInteractive&>(*get_parent());
@@ -122,12 +123,12 @@
 
 
 	tags_box_.add(new UI::Textarea(&tags_box_, 0, 0, max_w_, labelh_, _("Tags:")), UI::Align::kLeft);
-	add_tag_checkbox(&tags_box_, "unbalanced", _("Unbalanced"));
-	add_tag_checkbox(&tags_box_, "ffa", _("Free for all"));
-	add_tag_checkbox(&tags_box_, "1v1", _("1v1"));
-	add_tag_checkbox(&tags_box_, "2teams", _("Teams of 2"));
-	add_tag_checkbox(&tags_box_, "3teams", _("Teams of 3"));
-	add_tag_checkbox(&tags_box_, "4teams", _("Teams of 4"));
+	add_tag_checkbox(&tags_box_, "unbalanced", localize_tag("unbalanced"));
+	add_tag_checkbox(&tags_box_, "ffa", localize_tag("ffa"));
+	add_tag_checkbox(&tags_box_, "1v1", localize_tag("1v1"));
+	add_tag_checkbox(&tags_box_, "2teams", localize_tag("2teams"));
+	add_tag_checkbox(&tags_box_, "3teams", localize_tag("3teams"));
+	add_tag_checkbox(&tags_box_, "4teams", localize_tag("4teams"));
 
 	teams_box_.add(new UI::Textarea(&teams_box_, 0, 0, max_w_, labelh_, _("Suggested Teams:")),
 						UI::Align::kLeft);

=== modified file 'src/graphic/text/rt_parse.cc'
--- src/graphic/text/rt_parse.cc	2016-03-14 19:49:52 +0000
+++ src/graphic/text/rt_parse.cc	2016-05-06 08:30:33 +0000
@@ -274,6 +274,7 @@
 
 		tc.allowed_children.insert("br");
 		tc.allowed_children.insert("space");
+		tc.allowed_children.insert("vspace");
 		tc.allowed_children.insert("p");
 		tc.allowed_children.insert("font");
 		tc.allowed_children.insert("sub");

=== modified file 'src/ui_basic/multilinetextarea.cc'
--- src/ui_basic/multilinetextarea.cc	2016-04-01 09:29:17 +0000
+++ src/ui_basic/multilinetextarea.cc	2016-05-06 08:30:33 +0000
@@ -41,7 +41,8 @@
 	Panel       (parent, x, y, w, h),
 	text_      (text),
 	color_(UI_FONT_CLR_FG),
-	isrichtext(false),
+	force_new_renderer_(false),
+	use_old_renderer_(false),
 	scrollbar_ (this, get_w() - Scrollbar::kSize, 0, Scrollbar::kSize, h, false),
 	scrollmode_(scroll_mode)
 {
@@ -56,14 +57,11 @@
 	scrollbar_.set_singlestepsize(UI::g_fh1->render(as_uifont(
 																		UI::g_fh1->fontset()->representative_character(),
 																		UI_FONT_SIZE_SMALL))->height());
-	scrollbar_.set_pagesize(h - 2 * UI::g_fh1->render(as_uifont(
-																		  UI::g_fh1->fontset()->representative_character(),
-																		  UI_FONT_SIZE_BIG))->height());
 	scrollbar_.set_steps(1);
 	scrollbar_.set_force_draw(scrollmode_ == ScrollMode::kScrollNormalForced ||
 										scrollmode_ == ScrollMode::kScrollLogForced);
 
-	recompute();
+	layout();
 }
 
 
@@ -88,12 +86,16 @@
 	// We wrap the text twice. We need to do this to account for the presence/absence of the scollbar.
 	bool scrollbar_was_enabled = scrollbar_.is_enabled();
 	for (int i = 0; i < 2; ++i) {
-		if (text_.compare(0, 3, "<rt")) {
-			isrichtext = false;
+		if (!is_richtext(text_)) {
+			use_old_renderer_ = false;
 			const Image* text_im = UI::g_fh1->render(make_richtext(), get_eff_w() - 2 * RICHTEXT_MARGIN);
 			height = text_im->height();
+		} else if (force_new_renderer_) {
+			use_old_renderer_ = false;
+			const Image* text_im = UI::g_fh1->render(text_, get_eff_w() - 2 * RICHTEXT_MARGIN);
+			height = text_im->height();
 		} else {
-			isrichtext = true;
+			use_old_renderer_ = true;
 			rt.set_width(get_eff_w() - 2 * RICHTEXT_MARGIN);
 			rt.parse(text_);
 			height = rt.height() + 2 * RICHTEXT_MARGIN;
@@ -128,14 +130,15 @@
 {
 }
 
-/// Take care about scrollbar on resize
+/// Take care of the scrollbar on resize
 void MultilineTextarea::layout()
 {
 	recompute();
 
-	// Take care about the scrollbar
+	// Take care of the scrollbar
 	scrollbar_.set_pos(Point(get_w() - Scrollbar::kSize, 0));
 	scrollbar_.set_size(Scrollbar::kSize, get_h());
+	scrollbar_.set_pagesize(get_h() - 2 * UI_FONT_SIZE_BIG);
 }
 
 /**
@@ -143,10 +146,15 @@
  */
 void MultilineTextarea::draw(RenderTarget& dst)
 {
-	if (isrichtext) {
+	if (use_old_renderer_) {
 		rt.draw(dst, Point(RICHTEXT_MARGIN, RICHTEXT_MARGIN - scrollbar_.get_scrollpos()));
 	} else {
-		const Image* text_im = UI::g_fh1->render(make_richtext(), get_eff_w() - 2 * RICHTEXT_MARGIN);
+		const Image* text_im;
+		if (!is_richtext(text_)) {
+			text_im = UI::g_fh1->render(make_richtext(), get_eff_w() - 2 * RICHTEXT_MARGIN);
+		} else {
+			text_im = UI::g_fh1->render(text_, get_eff_w() - 2 * RICHTEXT_MARGIN);
+		}
 
 		uint32_t blit_width = std::min(text_im->width(), static_cast<int>(get_eff_w()));
 		uint32_t blit_height = std::min(text_im->height(), static_cast<int>(get_inner_h()));

=== modified file 'src/ui_basic/multilinetextarea.h'
--- src/ui_basic/multilinetextarea.h	2016-04-01 12:22:09 +0000
+++ src/ui_basic/multilinetextarea.h	2016-05-06 08:30:33 +0000
@@ -58,6 +58,7 @@
 	uint32_t get_eff_w() const {return scrollbar_.is_enabled() ? get_w() - Scrollbar::kSize : get_w();}
 
 	void set_color(RGBColor fg) {color_ = fg;}
+	void force_new_renderer() {force_new_renderer_ = true;}
 
 	// Drawing and event handlers
 	void draw(RenderTarget&) override;
@@ -82,7 +83,8 @@
 	RGBColor color_;
 	Align align_;
 
-	bool isrichtext;
+	bool force_new_renderer_;
+	bool use_old_renderer_;
 	RichText rt;
 
 	Scrollbar   scrollbar_;

=== modified file 'src/ui_basic/scrollbar.cc'
--- src/ui_basic/scrollbar.cc	2016-03-25 17:01:05 +0000
+++ src/ui_basic/scrollbar.cc	2016-05-06 08:30:33 +0000
@@ -85,6 +85,7 @@
 		set_scrollpos(steps - 1);
 
 	steps_ = steps;
+	layout();
 }
 
 
@@ -111,6 +112,7 @@
 		singlestepsize = 1;
 
 	singlestepsize_ = singlestepsize;
+	layout();
 }
 
 
@@ -120,6 +122,7 @@
 void Scrollbar::set_pagesize(int32_t const pagesize)
 {
 	pagesize_ = pagesize < 1 ? 1 : pagesize;
+	layout();
 }
 
 

=== modified file 'src/ui_fsmenu/launch_mpg.cc'
--- src/ui_fsmenu/launch_mpg.cc	2016-04-05 07:51:48 +0000
+++ src/ui_fsmenu/launch_mpg.cc	2016-05-06 08:30:33 +0000
@@ -234,7 +234,7 @@
 	// Y coordinate will be set later, when we know how high this box will get.
 	suggested_teams_box_ = new UI::SuggestedTeamsBox
 									(this, right_column_x_, 0, UI::Box::Vertical,
-									 padding_, indent_, label_height_,
+									 padding_, indent_,
 									 get_w() - right_column_x_, 4 * label_height_);
 }
 

=== modified file 'src/ui_fsmenu/mapselect.cc'
--- src/ui_fsmenu/mapselect.cc	2016-03-25 17:40:51 +0000
+++ src/ui_fsmenu/mapselect.cc	2016-05-06 08:30:33 +0000
@@ -31,6 +31,7 @@
 #include "logic/game_controller.h"
 #include "logic/game_settings.h"
 #include "map_io/widelands_map_loader.h"
+#include "wui/map_tags.h"
 
 // TODO(GunChleoc): Arabic: line height broken for descriptions for Arabic.
 // Fix align for table headings & entries and for wordwrap.
@@ -52,7 +53,7 @@
 	table_(this, tablex_, tabley_, tablew_, tableh_, false),
 	map_details_(this, right_column_x_, tabley_,
 					 get_right_column_w(right_column_x_),
-					 tableh_ - buth_ - 4 * padding_),
+					 tableh_ - buth_ - 4 * padding_, MapDetails::Style::kFsMenu),
 
 	basedir_("maps"),
 	settings_(settings),
@@ -94,27 +95,27 @@
 	vbox = new UI::Box(this,
 							 tablex_, vbox->get_y() + vbox->get_h() + padding_,
 							 UI::Box::Horizontal, checkbox_space_, get_w());
-	add_tag_checkbox(vbox, "official", _("Official"));
-	add_tag_checkbox(vbox, "unbalanced", _("Unbalanced"));
-	add_tag_checkbox(vbox, "seafaring", _("Seafaring"));
-	add_tag_checkbox(vbox, "artifacts", _("Artifacts"));
-	add_tag_checkbox(vbox, "scenario", _("Scenario"));
-	vbox->set_size(get_w() - 2 * tablex_, checkbox_space_);
-
-	vbox = new UI::Box(this,
-							 tablex_, vbox->get_y() + vbox->get_h() + padding_,
-							 UI::Box::Horizontal, checkbox_space_, get_w());
-	add_tag_checkbox(vbox, "ffa", _("Free for all"));
-	add_tag_checkbox(vbox, "1v1", _("1v1"));
-
-	vbox->set_size(get_w() - 2 * tablex_, checkbox_space_);
-
-	vbox = new UI::Box(this,
-							 tablex_, vbox->get_y() + vbox->get_h() + padding_,
-							 UI::Box::Horizontal, checkbox_space_, get_w());
-	add_tag_checkbox(vbox, "2teams", _("Teams of 2"));
-	add_tag_checkbox(vbox, "3teams", _("Teams of 3"));
-	add_tag_checkbox(vbox, "4teams", _("Teams of 4"));
+	add_tag_checkbox(vbox, "official", localize_tag("official"));
+	add_tag_checkbox(vbox, "unbalanced", localize_tag("unbalanced"));
+	add_tag_checkbox(vbox, "seafaring", localize_tag("seafaring"));
+	add_tag_checkbox(vbox, "artifacts", localize_tag("artifacts"));
+	add_tag_checkbox(vbox, "scenario", localize_tag("scenario"));
+	vbox->set_size(get_w() - 2 * tablex_, checkbox_space_);
+
+	vbox = new UI::Box(this,
+							 tablex_, vbox->get_y() + vbox->get_h() + padding_,
+							 UI::Box::Horizontal, checkbox_space_, get_w());
+	add_tag_checkbox(vbox, "ffa", localize_tag("ffa"));
+	add_tag_checkbox(vbox, "1v1", localize_tag("1v1"));
+
+	vbox->set_size(get_w() - 2 * tablex_, checkbox_space_);
+
+	vbox = new UI::Box(this,
+							 tablex_, vbox->get_y() + vbox->get_h() + padding_,
+							 UI::Box::Horizontal, checkbox_space_, get_w());
+	add_tag_checkbox(vbox, "2teams", localize_tag("2teams"));
+	add_tag_checkbox(vbox, "3teams", localize_tag("3teams"));
+	add_tag_checkbox(vbox, "4teams", localize_tag("4teams"));
 	vbox->set_size(get_w() - 2 * tablex_, checkbox_space_);
 
 	scenario_types_ = settings_->settings().multiplayer ? Map::MP_SCENARIO : Map::SP_SCENARIO;

=== modified file 'src/wui/CMakeLists.txt'
--- src/wui/CMakeLists.txt	2016-04-02 16:45:53 +0000
+++ src/wui/CMakeLists.txt	2016-05-06 08:30:33 +0000
@@ -63,6 +63,8 @@
     mapdata.h
     maptable.cc
     maptable.h
+    map_tags.cc
+    map_tags.h
     suggested_teams_box.cc
     suggested_teams_box.h
   DEPENDS

=== added file 'src/wui/map_tags.cc'
--- src/wui/map_tags.cc	1970-01-01 00:00:00 +0000
+++ src/wui/map_tags.cc	2016-05-06 08:30:33 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2016 by the Widelands Development Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include "wui/map_tags.h"
+
+#include "base/i18n.h"
+
+namespace {
+
+const std::map<std::string, std::string> kMapTags = {
+	/** TRANSLATORS: This is a map tag */
+	{"official", _("Official")},
+	/** TRANSLATORS: This is a map tag */
+	{"unbalanced", _("Unbalanced")},
+	/** TRANSLATORS: This is a map tag */
+	{"seafaring", _("Seafaring")},
+	/** TRANSLATORS: This is a map tag */
+	{"artifacts", _("Artifacts")},
+	/** TRANSLATORS: This is a map tag */
+	{"scenario", _("Scenario")},
+	/** TRANSLATORS: This is a map tag */
+	{"ffa", _("Free for all")},
+	/** TRANSLATORS: This is a map tag. One versus one. */
+	{"1v1", _("1v1")},
+	/** TRANSLATORS: This is a map tag */
+	{"2teams", _("Teams of 2")},
+	/** TRANSLATORS: This is a map tag */
+	{"3teams", _("Teams of 3")},
+	/** TRANSLATORS: This is a map tag */
+	{"4teams", _("Teams of 4")},
+};
+
+} // namespace
+
+bool tag_exists(const std::string& tag) {
+	return kMapTags.count(tag) == 1;
+}
+
+const std::string localize_tag(const std::string& tag) {
+	if (tag_exists(tag)) {
+		return _((*kMapTags.find(tag)).second);
+	}
+	return tag;
+}

=== added file 'src/wui/map_tags.h'
--- src/wui/map_tags.h	1970-01-01 00:00:00 +0000
+++ src/wui/map_tags.h	2016-05-06 08:30:33 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2016 by the Widelands Development Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifndef WL_WUI_MAP_TAGS_H
+#define WL_WUI_MAP_TAGS_H
+
+#include <map>
+#include <string>
+
+/// Functions for localizing the known map tags.
+
+/// Returns true if this tag is known.
+bool tag_exists(const std::string& tag);
+
+/// If tag_exists, returns the localized tag.
+/// Otherwise, returns 'tag'
+const std::string localize_tag(const std::string& tag);
+
+#endif  // end of include guard: WL_WUI_MAP_TAGS_H

=== modified file 'src/wui/mapdata.cc'
--- src/wui/mapdata.cc	2016-04-03 13:00:14 +0000
+++ src/wui/mapdata.cc	2016-05-06 08:30:33 +0000
@@ -30,10 +30,11 @@
 		MapData() {
 		i18n::Textdomain td("maps");
 		filename = init_filename;
-		name = map.get_name();
-		localized_name = name.empty() ? "" : _(name);
+		name = map.get_name().empty() ? _("No Name") : map.get_name();
+		localized_name = _(name);
 		// Localizing this, because some author fields now have "edited by" text.
-		authors = MapAuthorData(_(map.get_author()));
+		const std::string& author = map.get_author();
+		authors = MapAuthorData(author.empty() ? _("No Author") : _(author));
 		description = map.get_description().empty() ? "" : _(map.get_description());
 		hint = map.get_hint().empty() ? "" : _(map.get_hint());
 		nrplayers = map.get_nrplayers();

=== modified file 'src/wui/mapdetails.cc'
--- src/wui/mapdetails.cc	2016-04-01 18:05:40 +0000
+++ src/wui/mapdetails.cc	2016-05-06 08:30:33 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2006-2015 by the Widelands Development Team
+ * Copyright (C) 2002-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -18,6 +18,7 @@
 
 #include "wui/mapdetails.h"
 
+#include <algorithm>
 #include <cstdio>
 #include <memory>
 
@@ -33,74 +34,72 @@
 #include "logic/game_settings.h"
 #include "map_io/widelands_map_loader.h"
 #include "ui_basic/box.h"
+#include "wui/map_tags.h"
+
+namespace {
+std::string as_header(const std::string& txt, MapDetails::Style style, bool is_first = false) {
+	switch (style) {
+	case MapDetails::Style::kFsMenu:
+		return (boost::format("<p><font size=%i bold=1 shadow=1>%s%s</font></p>")
+				  % UI_FONT_SIZE_SMALL
+				  % (is_first ? "" : "<vspace gap=9>")
+				  % richtext_escape(txt)).str();
+	case MapDetails::Style::kWui:
+		return (boost::format("<p><font size=%i bold=1 color=D1D1D1>%s%s</font></p>")
+				  % UI_FONT_SIZE_SMALL
+				  % (is_first ? "" : "<vspace gap=6>")
+				  % richtext_escape(txt)).str();
+	default:
+		NEVER_HERE();
+	}
+}
+std::string as_content(const std::string& txt, MapDetails::Style style) {
+	switch (style) {
+	case MapDetails::Style::kFsMenu:
+		return (boost::format("<p><font size=%i bold=1 color=D1D1D1 shadow=1><vspace gap=2>%s</font></p>")
+				  % UI_FONT_SIZE_SMALL
+				  % richtext_escape(txt)).str();
+	case MapDetails::Style::kWui:
+		return (boost::format("<p><font size=%i><vspace gap=2>%s</font></p>")
+				  % (UI_FONT_SIZE_SMALL - 2)
+				  % richtext_escape(txt)).str();
+	default:
+		NEVER_HERE();
+	}
+}
+} // namespace
 
 MapDetails::MapDetails
-		(Panel* parent, int32_t x, int32_t y, int32_t max_x, int32_t max_y) :
-	UI::Panel(parent, x, y, max_x, max_y),
+		(Panel* parent, int32_t x, int32_t y, int32_t max_w, int32_t max_h, Style style) :
+	UI::Panel(parent, x, y, max_w, max_h),
 
+	style_(style),
 	padding_(4),
-	indent_(10),
-	labelh_(20),
-	max_w_(max_x),
-	max_h_(max_y),
-	// Subtract for main box and author box
-	descr_box_height_(max_y - 4 * labelh_ - 5 * padding_),
-
-	main_box_(this, 0, 0, UI::Box::Vertical,
-		  max_w_, max_h_, 0),
-
-	name_box_(&main_box_, 0, 0, UI::Box::Horizontal,
-		  max_w_, 3 * labelh_ + padding_, padding_ / 2),
-	name_label_(&main_box_, 0, 0, max_w_ - padding_, labelh_, ""),
-	name_(&name_box_, 0, 0, max_w_ - indent_, 2 * labelh_, ""),
-
-	author_box_(&main_box_, 0, 0, UI::Box::Horizontal,
-		  max_w_, 3 * labelh_ + padding_, padding_ / 2),
-	author_label_(&main_box_, 0, 0, max_w_ - padding_, labelh_, ""),
-	author_(&author_box_, 0, 0, max_w_ - indent_, labelh_, ""),
-
-	descr_box_(&main_box_, 0, 0, UI::Box::Horizontal,
-		  max_w_, descr_box_height_, padding_ / 2),
-	descr_label_(&main_box_, 0, 0, max_w_, labelh_, ""),
-	 // -1 to prevent cropping of scrollbar
-	descr_(&descr_box_, 0, 0, max_w_ - indent_ - 1, descr_box_height_ - labelh_ - padding_, "")
+	main_box_(this, 0, 0, UI::Box::Vertical, max_w, max_h, 0),
+	name_label_(&main_box_, 0, 0, max_w - padding_, 20, "", UI::Align::kLeft,
+					UI::MultilineTextarea::ScrollMode::kNoScrolling),
+	descr_(&main_box_, 0, 0, max_w, 20, ""),
+	suggested_teams_box_(new UI::SuggestedTeamsBox(this, 0, 0, UI::Box::Vertical, padding_, 0, max_w))
 {
-	suggested_teams_box_ = new UI::SuggestedTeamsBox(this, 0, 0, UI::Box::Vertical,
-																	 padding_, indent_, labelh_, max_w_, 4 * labelh_);
+	name_label_.force_new_renderer();
+	descr_.force_new_renderer();
 
 	main_box_.add(&name_label_, UI::Align::kLeft);
-	name_box_.add_space(indent_);
-	name_box_.add(&name_, UI::Align::kLeft);
-	main_box_.add(&name_box_, UI::Align::kLeft);
-	main_box_.add_space(padding_);
-
-	main_box_.add(&author_label_, UI::Align::kLeft);
-	author_box_.add_space(indent_);
-	author_box_.add(&author_, UI::Align::kLeft);
-	main_box_.add(&author_box_, UI::Align::kLeft);
-	main_box_.add_space(padding_);
-
-	main_box_.add(&descr_label_, UI::Align::kLeft);
-	descr_box_.add_space(indent_);
-	descr_box_.add(&descr_, UI::Align::kLeft);
-	main_box_.add(&descr_box_, UI::Align::kLeft);
-	main_box_.add_space(padding_);
+	main_box_.add_space(padding_);
+	main_box_.add(&descr_, UI::Align::kLeft);
+	main_box_.set_size(max_w, max_h); // We need to initialize the width, set_max_height will set the height
+	set_max_height(max_h);
 }
 
 
 void MapDetails::clear() {
 	name_label_.set_text("");
-	author_label_.set_text("");
-	descr_label_.set_text("");
-	name_.set_text("");
-	author_.set_text("");
 	descr_.set_text("");
 	suggested_teams_box_->hide();
 }
 
 void MapDetails::set_max_height(int new_height) {
 	max_h_ = new_height;
-	descr_box_height_ = max_h_ - 4 * labelh_ - 5 * padding_;
 	update_layout();
 }
 
@@ -108,58 +107,75 @@
 	// Adjust sizes for show / hide suggested teams
 	if (suggested_teams_box_->is_visible()) {
 		suggested_teams_box_->set_pos(Point(0, max_h_ - suggested_teams_box_->get_h()));
-		main_box_.set_size(max_w_, max_h_ - suggested_teams_box_->get_h());
-		descr_box_.set_size(
-					descr_box_.get_w(),
-					descr_box_height_ - suggested_teams_box_->get_h() - padding_);
+		main_box_.set_size(main_box_.get_w(), max_h_ - suggested_teams_box_->get_h() - padding_);
 	} else {
-		main_box_.set_size(max_w_, max_h_);
-		descr_box_.set_size(descr_box_.get_w(), descr_box_height_);
+		main_box_.set_size(main_box_.get_w(), max_h_);
 	}
-	descr_.set_size(descr_.get_w(), descr_box_.get_h() - descr_label_.get_h() - padding_);
+	descr_.set_size(descr_.get_w(), main_box_.get_h() - name_label_.get_h() - padding_);
 	descr_.scroll_to_top();
 }
 
 void MapDetails::update(const MapData& mapdata, bool localize_mapname) {
 	clear();
+	// Show directory information
 	if (mapdata.maptype == MapData::MapType::kDirectory) {
-		// Show directory information
-		name_label_.set_text(_("Directory:"));
-		name_.set_text(mapdata.localized_name);
-		name_.set_tooltip(_("The name of this directory"));
-		main_box_.set_size(max_w_, max_h_);
-	} else {
-		// Show map information
-		if (mapdata.maptype == MapData::MapType::kScenario) {
-			name_label_.set_text(_("Scenario:"));
-		} else {
-			name_label_.set_text(_("Map:"));
-		}
-		name_.set_text(localize_mapname ? mapdata.localized_name : mapdata.name);
+		name_label_.set_text((boost::format("<rt>%s%s</rt>")
+									 % as_header(_("Directory:"), style_, true)
+									 % as_content(mapdata.localized_name, style_)).str());
+		main_box_.set_size(main_box_.get_w(), max_h_);
+
+	} else { // Show map information
+		name_label_.set_text(
+					(boost::format("<rt>%s%s</rt>")
+					 % as_header(mapdata.maptype == MapData::MapType::kScenario ?
+										 _("Scenario:") : _("Map:"), style_, true)
+					 % as_content(localize_mapname ? mapdata.localized_name : mapdata.name, style_)).str());
+
 		if (mapdata.localized_name != mapdata.name) {
 			if (localize_mapname) {
-				name_.set_tooltip
+				name_label_.set_tooltip
 				/** TRANSLATORS: Tooltip in map description when translated map names are being displayed. */
 				/** TRANSLATORS: %s is the English name of the map. */
 						((boost::format(_("The original name of this map: %s"))
 						  % mapdata.name).str());
 			} else {
-				name_.set_tooltip
+				name_label_.set_tooltip
 				/** TRANSLATORS: Tooltip in map description when map names are being displayed in English. */
 				/** TRANSLATORS: %s is the localized name of the map. */
 						((boost::format(_("The name of this map in your language: %s"))
 						  % mapdata.localized_name).str());
 			}
-		} else {
-			name_.set_tooltip(_("The name of this map"));
-		}
-		author_label_.set_text(ngettext("Author:", "Authors:", mapdata.authors.get_number()));
-		author_.set_text(mapdata.authors.get_names());
-		descr_label_.set_text(_("Description:"));
-		descr_.set_text(
-					mapdata.description +
-					/** TRANSLATORS: Map hint header when selecting a map. */
-					(mapdata.hint.empty() ? "" : (std::string("\n\n") + _("HINT:") + "\n" + mapdata.hint)));
+		}
+
+		// Show map information
+		std::string description =
+				as_header(ngettext("Author:", "Authors:", mapdata.authors.get_number()), style_);
+		description = (boost::format("%s%s")
+		               % description
+		               % as_content(mapdata.authors.get_names(), style_)).str();
+
+		std::vector<std::string> tags;
+		for (const auto& tag : mapdata.tags) {
+			tags.push_back(localize_tag(tag));
+		}
+		std::sort(tags.begin(), tags.end());
+		description = (boost::format("%s%s") % description % as_header(_("Tags:"), style_)).str();
+		description = (boost::format("%s%s")
+							% description %
+							as_content(i18n::localize_list(tags, i18n::ConcatenateWith::COMMA), style_))
+						  .str();
+
+		description = (boost::format("%s%s") % description % as_header(_("Description:"), style_)).str();
+		description = (boost::format("%s%s") % description % as_content(mapdata.description, style_)).str();
+
+		if (!mapdata.hint.empty()) {
+			/** TRANSLATORS: Map hint header when selecting a map. */
+			description = (boost::format("%s%s") % description % as_header(_("Hint:"), style_)).str();
+			description = (boost::format("%s%s") % description % as_content(mapdata.hint, style_)).str();
+		}
+
+		description = (boost::format("<rt>%s</rt>") % description).str();
+		descr_.set_text(description);
 
 		// Show / hide suggested teams
 		if (mapdata.suggested_teams.empty()) {

=== modified file 'src/wui/mapdetails.h'
--- src/wui/mapdetails.h	2016-03-23 08:47:27 +0000
+++ src/wui/mapdetails.h	2016-05-06 08:30:33 +0000
@@ -23,7 +23,6 @@
 #include "ui_basic/box.h"
 #include "ui_basic/multilinetextarea.h"
 #include "ui_basic/panel.h"
-#include "ui_basic/textarea.h"
 #include "wui/mapdata.h"
 #include "wui/suggested_teams_box.h"
 
@@ -33,9 +32,12 @@
  */
 class MapDetails : public UI::Panel {
 public:
-	MapDetails(Panel * parent,
-				  int32_t x, int32_t y,
-				  int32_t max_x, int32_t max_y);
+	enum class Style {
+		kFsMenu,
+		kWui
+	};
+
+	MapDetails(Panel* parent, int32_t x, int32_t y, int32_t max_w, int32_t max_h, Style style);
 
 	void clear();
 	void set_max_height(int new_height);
@@ -43,23 +45,13 @@
 	void update(const MapData& mapdata, bool localize_mapname);
 
 private:
-	const int padding_, indent_, labelh_, max_w_;
-	int max_h_, descr_box_height_;
+	const Style style_;
+	const int padding_;
+	int max_h_;
 
 	UI::Box main_box_;
-
-	UI::Box name_box_;
-	UI::Textarea name_label_;
-	UI::MultilineTextarea name_;
-
-	UI::Box author_box_;
-	UI::Textarea author_label_;
-	UI::MultilineTextarea author_;
-
-	UI::Box descr_box_;
-	UI::Textarea descr_label_;
+	UI::MultilineTextarea name_label_;
 	UI::MultilineTextarea descr_;
-
 	UI::SuggestedTeamsBox* suggested_teams_box_;
 };
 

=== modified file 'src/wui/suggested_teams_box.cc'
--- src/wui/suggested_teams_box.cc	2016-02-10 20:39:02 +0000
+++ src/wui/suggested_teams_box.cc	2016-05-06 08:30:33 +0000
@@ -42,13 +42,12 @@
 SuggestedTeamsBox::SuggestedTeamsBox(Panel * parent,
 							int32_t x, int32_t y,
 							uint32_t orientation,
-							int32_t padding, int32_t indent, int32_t label_height,
-							int32_t max_x, int32_t max_y,
-							uint32_t inner_spacing) :
-	UI::Box(parent, x, y, orientation, max_x, max_y, inner_spacing),
+							int32_t padding, int32_t indent,
+							int32_t max_x, int32_t max_y) :
+	UI::Box(parent, x, y, orientation, max_x, max_y, g_gr->images().get(player_pictures_small[0])->height()),
 	padding_(padding),
 	indent_(indent),
-	label_height_(label_height)
+	label_height_(g_gr->images().get(player_pictures_small[0])->height() + padding)
 {
 	player_icons_.clear();
 	suggested_teams_.clear();
@@ -105,10 +104,10 @@
 		for (const Widelands::Map::SuggestedTeamLineup& lineup : suggested_teams_) {
 
 			lineup_box_ =
-					new UI::Box(this, indent_, teamlist_offset + lineup_counter * (label_height_ + padding_),
+					new UI::Box(this, indent_, teamlist_offset + lineup_counter * (label_height_),
 									UI::Box::Horizontal, get_w() - indent_);
 
-			lineup_box_->set_size(get_w(), label_height_ + padding_);
+			lineup_box_->set_size(get_w(), label_height_);
 
 			bool is_first = true;
 			for (const Widelands::Map::SuggestedTeam& team : lineup) {
@@ -127,7 +126,8 @@
 					assert(player < MAX_PLAYERS);
 					const Image* player_image = g_gr->images().get(player_pictures_small[player]);
 					assert(player_image);
-					player_icon = new UI::Icon(lineup_box_, 0, 0, 20, 20, player_image);
+					player_icon = new UI::Icon(lineup_box_, 0, 0,
+														player_image->width(), player_image->height(), player_image);
 					player_icon->set_visible(true);
 					player_icon->set_no_frame();
 					lineup_box_->add(player_icon, UI::Align::kLeft);
@@ -138,7 +138,7 @@
 		} // All lineups
 
 		// Adjust size to content
-		set_size(get_w(), teamlist_offset + lineup_counter * (label_height_ + padding_));
+		set_size(get_w(), teamlist_offset + lineup_counter * (label_height_));
 	}
 }
 

=== modified file 'src/wui/suggested_teams_box.h'
--- src/wui/suggested_teams_box.h	2016-01-24 20:11:53 +0000
+++ src/wui/suggested_teams_box.h	2016-05-06 08:30:33 +0000
@@ -36,9 +36,8 @@
 	SuggestedTeamsBox(Panel * parent,
 							int32_t x, int32_t y,
 							uint32_t orientation,
-							int32_t padding, int32_t indent, int32_t label_height,
-							int32_t max_x = 0, int32_t max_y = 0,
-							uint32_t inner_spacing = 0);
+							int32_t padding, int32_t indent,
+							int32_t max_x = 0, int32_t max_y = 0);
 	~SuggestedTeamsBox();
 
 	void hide();