widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1371905 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1371905 in widelands: "Localized strings doesn'tfit in the available place"
  https://bugs.launchpad.net/widelands/+bug/1371905

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1371905/+merge/235439

Fixed some space issues for translations in the editor.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1371905/+merge/235439
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1371905 into lp:widelands.

=== modified file 'src/editor/ui_menus/editor_main_menu_load_map.cc'
--- src/editor/ui_menus/editor_main_menu_load_map.cc	2014-09-14 11:31:58 +0000
+++ src/editor/ui_menus/editor_main_menu_load_map.cc	2014-09-22 11:06:09 +0000
@@ -49,13 +49,14 @@
  * Create all the buttons etc...
 */
 MainMenuLoadMap::MainMenuLoadMap(EditorInteractive & parent)
-	: UI::Window(&parent, "load_map_menu", 0, 0, 500, 300, _("Load Map"))
+	: UI::Window(&parent, "load_map_menu", 0, 0, 550, 300, _("Load Map"))
 {
 	int32_t const spacing =  5;
 	int32_t const offsx   = spacing;
-	int32_t const offsy   = 30;
+	int32_t const offsy   = 10;
 	int32_t       posx    = offsx;
 	int32_t       posy    = offsy;
+	int32_t descr_label_w = 90;
 
 	m_ls = new UI::Listselect<const char *>
 		(this,
@@ -65,43 +66,42 @@
 	m_ls->double_clicked.connect(boost::bind(&MainMenuLoadMap::double_clicked, this, _1));
 
 	posx = get_inner_w() / 2 + spacing;
-	posy += 20;
 	new UI::Textarea
-		(this, posx, posy, 150, 20, _("Name:"), UI::Align_CenterLeft);
+		(this, posx, posy, descr_label_w, 20, _("Name:"), UI::Align_CenterLeft);
 	m_name =
 		new UI::Textarea
-			(this, posx + 70, posy, 200, 20, "---", UI::Align_CenterLeft);
+			(this, posx + descr_label_w, posy, 200, 20, "---", UI::Align_CenterLeft);
 	posy += 20 + spacing;
 
 	new UI::Textarea
 		(this, posx, posy, 150, 20, _("Author:"), UI::Align_CenterLeft);
 	m_author =
 		new UI::Textarea
-			(this, posx + 70, posy, 200, 20, "---", UI::Align_CenterLeft);
+			(this, posx + descr_label_w, posy, 200, 20, "---", UI::Align_CenterLeft);
 	posy += 20 + spacing;
 
 	new UI::Textarea
-		(this, posx, posy, 70, 20, _("Size:"), UI::Align_CenterLeft);
+		(this, posx, posy, descr_label_w, 20, _("Size:"), UI::Align_CenterLeft);
 	m_size =
 		new UI::Textarea
-			(this, posx + 70, posy, 200, 20, "---", UI::Align_CenterLeft);
+			(this, posx + descr_label_w, posy, 200, 20, "---", UI::Align_CenterLeft);
 	posy += 20 + spacing;
 
 	new UI::Textarea
-		(this, posx, posy, 70, 20, _("Players:"), UI::Align_CenterLeft);
+		(this, posx, posy, descr_label_w, 20, _("Players:"), UI::Align_CenterLeft);
 	m_nrplayers =
 		new UI::Textarea
-			(this, posx + 70, posy, 200, 20, "---", UI::Align_CenterLeft);
+			(this, posx + descr_label_w, posy, 200, 20, "---", UI::Align_CenterLeft);
 	posy += 20 + spacing;
 
 
 	new UI::Textarea
-		(this, posx, posy, 70, 20, _("Descr:"), UI::Align_CenterLeft);
+		(this, posx, posy, descr_label_w, 20, _("Descr:"), UI::Align_CenterLeft);
 	m_descr =
 		new UI::MultilineTextarea
 			(this,
-			 posx + 70, posy,
-			 get_inner_w() - posx - spacing - 70,
+			 posx + descr_label_w, posy,
+			 get_inner_w() - posx - spacing - descr_label_w,
 			 get_inner_h() - posy - spacing - 40,
 			 "---", UI::Align_CenterLeft);
 
@@ -109,7 +109,8 @@
 
 	m_ok_btn = new UI::Button
 		(this, "ok",
-		 get_inner_w() / 2 - spacing - 80, posy, 80, 20,
+		 posx, posy,
+		 get_inner_w() / 4 - 1.5 * spacing, 20,
 		 g_gr->images().get("pics/but0.png"),
 		 _("OK"),
 		 std::string(),
@@ -118,7 +119,8 @@
 
 	UI::Button * cancelbtn = new UI::Button
 		(this, "cancel",
-		 posx, posy, 80, 20,
+		 posx + get_inner_w() / 4 - spacing / 2, posy,
+		 get_inner_w() / 4 - 1.5 * spacing, 20,
 		 g_gr->images().get("pics/but1.png"),
 		 _("Cancel"));
 	cancelbtn->sigclicked.connect(boost::bind(&MainMenuLoadMap::die, this));

=== modified file 'src/editor/ui_menus/editor_main_menu_new_map.cc'
--- src/editor/ui_menus/editor_main_menu_new_map.cc	2014-09-10 14:08:25 +0000
+++ src/editor/ui_menus/editor_main_menu_new_map.cc	2014-09-22 11:06:09 +0000
@@ -42,7 +42,7 @@
 	:
 	UI::Window
 		(&parent, "new_map_menu",
-		 (parent.get_w() - 140) / 2, (parent.get_h() - 150) / 2, 140, 150,
+		 (parent.get_w() - 180) / 2, (parent.get_h() - 150) / 2, 180, 150,
 		 _("New Map"))
 {
 	char buffer[250];

=== modified file 'src/editor/ui_menus/editor_main_menu_save_map.cc'
--- src/editor/ui_menus/editor_main_menu_save_map.cc	2014-09-14 11:31:58 +0000
+++ src/editor/ui_menus/editor_main_menu_save_map.cc	2014-09-22 11:06:09 +0000
@@ -51,13 +51,14 @@
 
 
 MainMenuSaveMap::MainMenuSaveMap(EditorInteractive & parent)
-	: UI::Window(&parent, "save_map_menu", 0, 0, 500, 330, _("Save Map"))
+	: UI::Window(&parent, "save_map_menu", 0, 0, 550, 330, _("Save Map"))
 {
 	int32_t const spacing =  5;
 	int32_t const offsx   = spacing;
-	int32_t const offsy   = 30;
+	int32_t const offsy   = 10;
 	int32_t posx          = offsx;
 	int32_t posy          = offsy;
+	int32_t descr_label_w = 90;
 
 	m_ls =
 		new UI::Listselect<const char *>
@@ -76,42 +77,41 @@
 	m_editbox->changed.connect(boost::bind(&MainMenuSaveMap::edit_box_changed, this));
 
 	posx = get_inner_w() / 2 + spacing;
-	posy += 20;
 	new UI::Textarea
-		(this, posx, posy, 150, 20, _("Name:"), UI::Align_CenterLeft);
+		(this, posx, posy, descr_label_w, 20, _("Name:"), UI::Align_CenterLeft);
 	m_name =
 		new UI::Textarea
-			(this, posx + 70, posy, 200, 20, "---", UI::Align_CenterLeft);
+			(this, posx + descr_label_w, posy, 200, 20, "---", UI::Align_CenterLeft);
 	posy += 20 + spacing;
 
 	new UI::Textarea
-		(this, posx, posy, 150, 20, _("Author:"), UI::Align_CenterLeft);
+		(this, posx, posy, descr_label_w, 20, _("Author:"), UI::Align_CenterLeft);
 	m_author =
 		new UI::Textarea
-			(this, posx + 70, posy, 200, 20, "---", UI::Align_CenterLeft);
+			(this, posx + descr_label_w, posy, 200, 20, "---", UI::Align_CenterLeft);
 	posy += 20 + spacing;
 
 	new UI::Textarea
-		(this, posx, posy, 70, 20, _("Size:"), UI::Align_CenterLeft);
+		(this, posx, posy, descr_label_w, 20, _("Size:"), UI::Align_CenterLeft);
 	m_size =
 		new UI::Textarea
-			(this, posx + 70, posy, 200, 20, "---", UI::Align_CenterLeft);
+			(this, posx + descr_label_w, posy, 200, 20, "---", UI::Align_CenterLeft);
 	posy += 20 + spacing;
 
 	new UI::Textarea
-		(this, posx, posy, 70, 20, _("Players:"), UI::Align_CenterLeft);
+		(this, posx, posy, descr_label_w, 20, _("Players:"), UI::Align_CenterLeft);
 	m_nrplayers =
 		new UI::Textarea
-			(this, posx + 70, posy, 200, 20, "---", UI::Align_CenterLeft);
+			(this, posx + descr_label_w, posy, 200, 20, "---", UI::Align_CenterLeft);
 	posy += 20 + spacing;
 
 	new UI::Textarea
-		(this, posx, posy, 70, 20, _("Descr: "), UI::Align_CenterLeft);
+		(this, posx, posy, descr_label_w, 20, _("Descr: "), UI::Align_CenterLeft);
 	m_descr =
 		new UI::MultilineTextarea
 			(this,
-			 posx + 70, posy,
-			 get_inner_w() - posx - spacing - 70,
+			 posx + descr_label_w, posy,
+			 get_inner_w() - posx - spacing - descr_label_w,
 			 get_inner_h() - posy - spacing - 40,
 			 "---", UI::Align_CenterLeft);
 
@@ -120,21 +120,23 @@
 
 	m_ok_btn = new UI::Button
 		(this, "ok",
-		 get_inner_w() / 2 - spacing - 80, posy, 80, 20,
+		 posx, posy,
+		 get_inner_w() / 4 - 1.5 * spacing, 20,
 		 g_gr->images().get("pics/but0.png"),
 		 _("OK"));
 	m_ok_btn->sigclicked.connect(boost::bind(&MainMenuSaveMap::clicked_ok, boost::ref(*this)));
 
 	UI::Button * cancelbtn = new UI::Button
 		(this, "cancel",
-		 posx, posy, 80, 20,
+		 posx + get_inner_w() / 4 - spacing / 2, posy,
+		 get_inner_w() / 4 - 1.5 * spacing, 20,
 		 g_gr->images().get("pics/but1.png"),
 		 _("Cancel"));
 	cancelbtn->sigclicked.connect(boost::bind(&MainMenuSaveMap::die, boost::ref(*this)));
 
 	UI::Button * make_directorybtn = new UI::Button
 		(this, "make_directory",
-		 spacing, posy, 120, 20,
+		 spacing, posy, 185, 20,
 		 g_gr->images().get("pics/but1.png"),
 		 _("Make Directory"));
 	make_directorybtn->sigclicked.connect