widelands-dev team mailing list archive

[Angelo Locritani <angelo.locritani@xxxxxxxxx>]

Angelo Locritani has proposed merging lp:~alocritani/widelands/switch_-+_position_editor into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~alocritani/widelands/switch_-+_position_editor/+merge/86901

simply switch position of raise/lower buttons in editor too
-- 
https://code.launchpad.net/~alocritani/widelands/switch_-+_position_editor/+merge/86901
Your team Widelands Developers is requested to review the proposed merge of lp:~alocritani/widelands/switch_-+_position_editor into lp:widelands.

=== modified file 'src/editor/ui_menus/editor_player_menu.cc'
--- src/editor/ui_menus/editor_player_menu.cc	2011-11-30 21:38:37 +0000
+++ src/editor/ui_menus/editor_player_menu.cc	2011-12-26 13:08:32 +0000
@@ -42,14 +42,14 @@
 		(&parent, "players_menu", &registry, 340, 400, _("Player Options")),
 	m_add_player
 		(this, "add_player",
-		 5, 5, 20, 20,
+		 get_inner_w() - 5 - 20, 5, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"),
 		 _("Add player"),
 		 parent.egbase().map().get_nrplayers() < MAX_PLAYERS),
 	m_remove_last_player
 		(this, "remove_last_player",
-		 get_inner_w() - 5 - 20, 5, 20, 20,
+		 5, 5, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"),
 		 _("Remove last player"),

=== modified file 'src/editor/ui_menus/editor_tool_change_height_options_menu.cc'
--- src/editor/ui_menus/editor_tool_change_height_options_menu.cc	2011-11-30 21:38:37 +0000
+++ src/editor/ui_menus/editor_tool_change_height_options_menu.cc	2011-12-26 13:08:32 +0000
@@ -45,7 +45,7 @@
 		 _("In-/Decrease Value"), UI::Align_BottomCenter),
 	m_change_by_increase
 		(this, "incr_change_by",
-		 hmargin(),
+		 get_inner_w() - hmargin() - width,
 		 m_change_by_label.get_y() + m_change_by_label.get_h() + spacing(),
 		 width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
@@ -54,7 +54,8 @@
 		 increase_tool.get_change_by() < MAX_FIELD_HEIGHT_DIFF),
 	m_change_by_decrease
 		(this, "decr_change_by",
-		 get_inner_w() - hmargin() - width, m_change_by_increase.get_y(),
+		 hmargin(),
+		 m_change_by_increase.get_y(),
 		 width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"),
@@ -80,7 +81,8 @@
 		 _("Set Value"), UI::Align_BottomCenter),
 	m_set_to_increase
 		(this, "incr_set_to",
-		 hmargin(), m_set_to_label.get_y() + m_set_to_label.get_h() + vspacing(),
+		 m_change_by_increase.get_x(),
+		 m_set_to_label.get_y() + m_set_to_label.get_h() + vspacing(),
 		 width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"),
@@ -88,7 +90,9 @@
 		 increase_tool.set_tool().get_interval().min < MAX_FIELD_HEIGHT),
 	m_set_to_decrease
 		(this, "decr_set_to",
-		 m_change_by_decrease.get_x(), m_set_to_increase.get_y(), width, height,
+		 hmargin(),
+		 m_set_to_increase.get_y(),
+		 width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"),
 		 std::string(),

=== modified file 'src/editor/ui_menus/editor_tool_change_resources_options_menu.cc'
--- src/editor/ui_menus/editor_tool_change_resources_options_menu.cc	2011-12-18 21:11:30 +0000
+++ src/editor/ui_menus/editor_tool_change_resources_options_menu.cc	2011-12-26 13:08:32 +0000
@@ -48,14 +48,15 @@
 		 _("In-/Decrease Value"), UI::Align_BottomCenter),
 	m_change_by_increase
 		(this, "incr_change_by",
-		 hmargin(),
+		 get_inner_w() - hmargin() - width,
 		 m_change_by_label.get_y() + m_change_by_label.get_h() + spacing(),
 		 width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_Game, "pics/scrollbar_up.png")),
 	m_change_by_decrease
 		(this, "decr_change_by",
-		 get_inner_w() - hmargin() - width, m_change_by_increase.get_y(),
+		 hmargin(),
+		 m_change_by_increase.get_y(),
 		 width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_Game, "pics/scrollbar_down.png")),
@@ -78,13 +79,15 @@
 		 _("Set Value"), UI::Align_BottomCenter),
 	m_set_to_increase
 		(this, "incr_set_to",
-		 hmargin(), m_set_to_label.get_y() + m_set_to_label.get_h() + vspacing(),
+		 m_change_by_increase.get_x(),
+		 m_set_to_label.get_y() + m_set_to_label.get_h() + vspacing(),
 		 width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_Game, "pics/scrollbar_up.png")),
 	m_set_to_decrease
 		(this, "decr_set_to",
-		 m_change_by_decrease.get_x(), m_set_to_increase.get_y(), width, height,
+		 hmargin(),
+		 m_set_to_increase.get_y(), width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_Game, "pics/scrollbar_down.png")),
 	m_set_to_value

=== modified file 'src/editor/ui_menus/editor_tool_noise_height_options_menu.cc'
--- src/editor/ui_menus/editor_tool_noise_height_options_menu.cc	2011-12-17 18:31:14 +0000
+++ src/editor/ui_menus/editor_tool_noise_height_options_menu.cc	2011-12-26 13:08:32 +0000
@@ -50,27 +50,27 @@
 		 get_inner_w() / 2,
 		 vmargin(), m_lower_label.get_w(), height,
 		 UI::Align_BottomLeft),
-	m_lower_increase
-		(this, "incr_lower",
+	m_lower_decrease
+		(this, "decr_lower",
 		 hmargin() +
 		 (get_inner_w() - 2 * hmargin() - hspacing() - 4 * width) / 4,
 		 m_lower_label.get_y() + m_lower_label.get_h() + vspacing(),
 		 width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"),
-		 std::string(),
-		 noise_tool.get_interval().min < MAX_FIELD_HEIGHT),
-	m_lower_decrease
-		(this, "decr_lower",
-		 m_lower_increase.get_x() + m_lower_increase.get_w(),
-		 m_lower_increase.get_y(),
-		 width, height,
-		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"),
 		 std::string(),
 		 0 < noise_tool.get_interval().min),
-	m_upper_increase
-		(this, "incr_upper",
+	m_lower_increase
+		(this, "incr_lower",
+		 m_lower_decrease.get_x() + m_lower_decrease.get_w(),
+		 m_lower_decrease.get_y(),
+		 width, height,
+		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
+		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"),
+		 std::string(),
+		 noise_tool.get_interval().min < MAX_FIELD_HEIGHT),
+	m_upper_decrease
+		(this, "decr_upper",
 		 m_lower_decrease.get_x() + width
 		 +
 		 (get_inner_w() - 2 * hmargin() - hspacing() - 4 * width) / 2 +
@@ -78,40 +78,42 @@
 		 m_lower_decrease.get_y(),
 		 width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
+		 g_gr->get_picture(PicMod_Game, "pics/scrollbar_down.png"),
+		 std::string(),
+		 0 < noise_tool.get_interval().max),
+	m_upper_increase
+		(this, "incr_upper",
+		 m_upper_decrease.get_x() + m_upper_decrease.get_w(),
+		 m_upper_decrease.get_y(),
+		 width, height,
+		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"),
 		 std::string(),
 		 noise_tool.get_interval().max < MAX_FIELD_HEIGHT),
-	m_upper_decrease
-		(this, "decr_upper",
-		 m_upper_increase.get_x() + m_upper_increase.get_w(),
-		 m_upper_increase.get_y(),
-		 width, height,
-		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-		 g_gr->get_picture(PicMod_Game, "pics/scrollbar_down.png"),
-		 std::string(),
-		 0 < noise_tool.get_interval().max),
 	m_set_label
 		(this,
 		 hspacing(),
 		 m_upper_decrease.get_y() + m_upper_decrease.get_h() + vspacing(),
 		 get_inner_w() - 2 * hspacing(), height,
 		 UI::Align_BottomCenter),
+	m_setto_decrease
+		(this, "decr_set_to",
+		 get_inner_w() / 2 - width,
+		 m_set_label.get_y() + m_set_label.get_h() + vspacing(),
+		 width, height,
+		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
+		 g_gr->get_picture(PicMod_Game, "pics/scrollbar_down.png"),
+		 std::string(),
+		 0 < noise_tool.set_tool().get_interval().min),
 	m_setto_increase
 		(this, "incr_set_to",
-		 get_inner_w() / 2 - width,
-		 m_set_label.get_y() + m_set_label.get_h() + vspacing(),
+		 get_inner_w() / 2,
+		 m_setto_decrease.get_y(),
 		 width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_Game, "pics/scrollbar_up.png"),
 		 std::string(),
-		 noise_tool.set_tool().get_interval().max < MAX_FIELD_HEIGHT),
-	m_setto_decrease
-		(this, "decr_set_to",
-		 get_inner_w() / 2, m_setto_increase.get_y(), width, height,
-		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 g_gr->get_picture(PicMod_Game, "pics/scrollbar_down.png"),
-		 std::string(),
-		 0 < noise_tool.set_tool().get_interval().min)
+		 noise_tool.set_tool().get_interval().max < MAX_FIELD_HEIGHT)
 {
 	m_lower_increase.sigclicked.connect
 		(boost::bind(&Editor_Tool_Noise_Height_Options_Menu::clicked_lower_increase, boost::ref(*this)));

=== modified file 'src/editor/ui_menus/editor_tool_noise_height_options_menu.h'
--- src/editor/ui_menus/editor_tool_noise_height_options_menu.h	2011-12-17 18:31:14 +0000
+++ src/editor/ui_menus/editor_tool_noise_height_options_menu.h	2011-12-26 13:08:32 +0000
@@ -37,9 +37,9 @@
 private:
 	Editor_Noise_Height_Tool & m_noise_tool;
 	UI::Textarea m_lower_label, m_upper_label;
-	UI::Button m_lower_increase, m_lower_decrease, m_upper_increase, m_upper_decrease;
+	UI::Button m_lower_decrease, m_lower_increase, m_upper_decrease, m_upper_increase;
 	UI::Textarea m_set_label;
-	UI::Button m_setto_increase, m_setto_decrease;
+	UI::Button m_setto_decrease, m_setto_increase;
 
 	void clicked_lower_decrease();
 	void clicked_lower_increase();

=== modified file 'src/editor/ui_menus/editor_toolsize_menu.cc'
--- src/editor/ui_menus/editor_toolsize_menu.cc	2011-11-30 21:38:37 +0000
+++ src/editor/ui_menus/editor_toolsize_menu.cc	2011-12-26 13:08:32 +0000
@@ -41,14 +41,14 @@
 	m_textarea(this, 5, 5, 150, 10, std::string(), UI::Align_HCenter),
 	m_increase
 		(this, "incr",
-		 60, 25, 20, 20,
+		 80, 25, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
 		 g_gr->get_picture(PicMod_Game, "pics/scrollbar_up.png"),
 		 std::string(),
 		 parent.get_sel_radius() < MAX_TOOL_AREA),
 	m_decrease
 		(this, "decr",
-		 80, 25, 20, 20,
+		 60, 25, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
 		 g_gr->get_picture(PicMod_Game, "pics/scrollbar_down.png"),
 		 std::string(),