Merge lp:~widelands-dev/widelands/bug-1395322-tool3 into lp:widelands

[GunChleoc]

Added CTRL as selection key for the 2nd alternative tool and updated help text. Redesigned the Height, Noise and Resources tools to use proper SpinBoxes and Boxes.

Left ALT is causing problems in some OS, so I added the CTRL keys for the 2nd alternative tool. I left the ALT keys in though in order not to frustrate map designers who are used to the Alt key.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 951. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/120451312.
Appveyor build 784. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1395322_tool3-784.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 968. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/120930924.
Appveyor build 801. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1395322_tool3-801.

[kaputtnik (franku)]

Great :-)

review: Approve (testing)

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 969. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/120978837.
Appveyor build 802. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1395322_tool3-802.

[Miroslav Remák (miroslavr256)]

If we're going to be so specific, we should also mention that Shift or Ctrl + Click removes map elements for Immovables, Animals and Port Space tools. Except Ctrl + Click with the Port Space tool does placement instead of removal for some reason. Perhaps we could fix this inconsistency? That would be an easy one-line change in EditorSetPortSpaceTool's constructor.

Also, see diff comments.

[GunChleoc (gunchleoc)]

Yes, I think we should fix the inconsistency. Thanks for flagging it up!

I think the help is getting a bit crowded, too much for the user to remember. So, I'd suggest explaining the general trends in the help function and adding specific help to each tool as a tooltip.

[kaputtnik (franku)]

I don't know the reason why Ctrl is used to remove objects at all. In my opinion there should be only one key for removing objects and use this key for all objects. So for all objects:

Click: Place Objects or Increase (meaning 'add something')
Shift + Click: Remove Objects or Decrease (meaning 'remove something')

This should be consistent for all objects, imho. And the Ctrl key should only work for special things (like "Set Value").

[Miroslav Remák (miroslavr256)]

It's used as a fallback to the first alternative version of the tool if the second one is not available. It makes sense to me, but I'm not against changing this behavior.

[GunChleoc (gunchleoc)]

I don't think that we should go to the trouble to remove the fallbacks - it would only add code. We document the intended keys, and if additional keys work too, I don't see a problem. Basically, if there is no third option, the behavour of the Ctrl key is undefined, so it doesn't matter if it switches to the 1st or 2nd tool.

[kaputtnik (franku)]

Ok, then it would be fine if the CTRL + Click for Portdocks get changed in this branch :-)

And removing the shift key from:

"Shift or Ctrl + Click : Set height to the value selected by ‘Set Value’"

[Miroslav Remák (miroslavr256)]

Sounds good.

[GunChleoc (gunchleoc)]

And another scope creep... since the tooltips wouldn't take, I redesigned the Heigh, Noise and Resources tools to use proper SpinBoxes and Boxes.

review: Needs Resubmitting

[kaputtnik (franku)]

Removing the additional headers for "Height and Resources tool" and "Noise height tool" in the help doesn't fit my taste. A general help should be driven by "Information as clear as it could be", not "Information as short it could be". But if you think it's good, lets leave it. The Tooltips make such help nearly superfluous :-)

The only thing i am wondering is the tooltip for "Noise height -> Set Value" which says "Use Shift + Click or Ctrl + Click ...". I think only "Ctrl + Click" should be shown here?

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 975. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/121219958.
Appveyor build 808. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1395322_tool3-808.

[GunChleoc (gunchleoc)]

> The Tooltips make such help nearly superfluous :-)

Exactly my point - it's there with the tooltips, and the less the user has to read and memorize, the better IMO.

> The only thing i am wondering is the tooltip for "Noise height -> Set Value"
> which says "Use Shift + Click or Ctrl + Click ...". I think only "Ctrl +
> Click" should be shown here?

+1 - will do :)

[kaputtnik (franku)]

I think it's good to go now :-)

review: Approve (testing)

[Miroslav Remák (miroslavr256)]

See diff comments, otherwise LGTM.

[GunChleoc (gunchleoc)]

Thanks for testing & review :)

@bunnybot merge

=== modified file 'data/scripting/editor/editor_controls.lua'
--- data/scripting/editor/editor_controls.lua	2016-04-02 08:09:19 +0000
+++ data/scripting/editor/editor_controls.lua	2016-04-07 14:03:59 +0000
@@ -4,16 +4,17 @@
 include "txts/help/common_helptexts.lua"
 
 return {
-   title = _"Keyboard Shortcuts",
+   title = _"Controls",
    text =
       rt(
+         h2(_"Keyboard Shortcuts") ..
          p(
+            -- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
+            dl(help_format_hotkey("F1"), _"Help") ..
             -- TRANSLATORS: This is an access key combination.
             dl(help_format_hotkey("H"), _"Toggle main menu") ..
             -- TRANSLATORS: This is an access key combination. The hotkey is 't'
             dl(help_format_hotkey("T"), _"Toggle tools menu") ..
-            -- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
-            dl(help_format_hotkey(pgettext("hotkey", "1-0")), _"Change tool size") ..
             help_toggle_minimap_hotkey() ..
             help_toggle_building_spaces_hotkey() ..
             -- TRANSLATORS: This is an access key combination. The hotkey is 'p'
@@ -22,12 +23,6 @@
             dl(help_format_hotkey("Ctrl + Z"), _"Undo") ..
             -- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
             dl(help_format_hotkey("Ctrl + Y"), _"Redo") ..
-            -- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
-            dl(help_format_hotkey("F1"), _"Help") ..
-            -- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
-            dl(help_format_hotkey(pgettext("hotkey", "Shift (Hold)")), _"First alternative tool while pressed") ..
-            -- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
-            dl(help_format_hotkey(pgettext("hotkey", "Alt (Hold)")), _"Second alternative tool while pressed") ..
             -- TRANSLATORS: This is an access key combination. The hotkey is 'i'
             dl(help_format_hotkey("I"), _"Activate information tool") ..
             -- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
@@ -35,6 +30,18 @@
             -- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
             dl(help_format_hotkey(pgettext("hotkey", "Ctrl + S")), _"Save map") ..
             help_toggle_fullscreen_hotkey()
+         ) ..
+
+         h2(_"Tools") ..
+         p(
+            -- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
+            dl(help_format_hotkey(pgettext("hotkey", "1-0")), _"Change tool size") ..
+            -- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
+            dl(help_format_hotkey(pgettext("hotkey", "Click")), _"Place new elements on the map, or increase map elements by the value selected by ‘Increase/Decrease value’") ..
+            -- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
+            dl(help_format_hotkey(pgettext("hotkey", "Shift + Click")), _"Remove elements from the map, or decrease map elements by the value selected by ‘Increase/Decrease value’") ..
+            -- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
+            dl(help_format_hotkey(pgettext("hotkey", "Ctrl + Click")), _"Set map elements to the value selected by ‘Set Value’")
          )
       )
 }
 
=== modified file 'src/editor/editorinteractive.cc'
--- src/editor/editorinteractive.cc	2016-04-06 09:23:04 +0000
+++ src/editor/editorinteractive.cc	2016-04-07 14:03:59 +0000
@@ -441,6 +441,9 @@
 			handled = true;
 			break;
 
+		case SDLK_LCTRL:
+		case SDLK_RCTRL:
+		// TODO(GunChleoc): Keeping ALT and MODE to make the transition easier. Remove for Build 20.
 		case SDLK_LALT:
 		case SDLK_RALT:
 		case SDLK_MODE:
@@ -525,6 +528,9 @@
 		switch (code.sym) {
 		case SDLK_LSHIFT:
 		case SDLK_RSHIFT:
+		case SDLK_LCTRL:
+		case SDLK_RCTRL:
+		// TODO(GunChleoc): Keeping ALT and MODE to make the transition easier. Remove for Build 20.
 		case SDLK_LALT:
 		case SDLK_RALT:
 		case SDLK_MODE:
 
=== modified file 'src/editor/tools/set_port_space_tool.cc'
--- src/editor/tools/set_port_space_tool.cc	2016-04-06 09:23:04 +0000
+++ src/editor/tools/set_port_space_tool.cc	2016-04-07 14:03:59 +0000
@@ -45,7 +45,7 @@
 EditorSetPortSpaceTool::EditorSetPortSpaceTool
 (EditorUnsetPortSpaceTool & the_unset_tool)
 	:
-	EditorTool(the_unset_tool, *this)
+	EditorTool(the_unset_tool, the_unset_tool)
 {}
 
 
 
=== modified file 'src/editor/ui_menus/tool_change_height_options_menu.cc'
--- src/editor/ui_menus/tool_change_height_options_menu.cc	2016-04-06 09:23:04 +0000
+++ src/editor/ui_menus/tool_change_height_options_menu.cc	2016-04-07 14:03:59 +0000
@@ -22,177 +22,74 @@
 #include <cstdio>
 #include <string>
 
+#include <boost/format.hpp>
+
 #include "base/i18n.h"
 #include "editor/editorinteractive.h"
 #include "editor/tools/increase_height_tool.h"
 #include "editor/tools/set_height_tool.h"
 #include "graphic/graphic.h"
 #include "logic/widelands_geometry.h"
-#include "ui_basic/button.h"
 
-#define width  20
-#define height 20
 EditorToolChangeHeightOptionsMenu::EditorToolChangeHeightOptionsMenu
 	(EditorInteractive          & parent,
 	 EditorIncreaseHeightTool & increase_tool,
 	 UI::UniqueWindow::Registry  & registry)
 	:
-	EditorToolOptionsMenu
-		(parent, registry, 250, 135, _("Height Tools Options")),
+	EditorToolOptionsMenu(parent, registry, 350, 100, _("Height Tools Options")),
 	increase_tool_(increase_tool),
-	change_by_label_
-		(this,
-		 hmargin(), vmargin(), get_inner_w() - 2 * hmargin(), height,
-		 _("Increase/Decrease Value"), UI::Align::kBottomCenter),
-	change_by_increase_
-		(this, "incr_change_by",
-		 get_inner_w() - hmargin() - width,
-		 change_by_label_.get_y() + change_by_label_.get_h() + spacing(),
-		 width, height,
-		 g_gr->images().get("images/ui_basic/but1.png"),
-		 g_gr->images().get("images/ui_basic/scrollbar_up.png"),
-		 std::string(),
-		 increase_tool.get_change_by() < MAX_FIELD_HEIGHT_DIFF),
-	change_by_decrease_
-		(this, "decr_change_by",
-		 hmargin(),
-		 change_by_increase_.get_y(),
-		 width, height,
-		 g_gr->images().get("images/ui_basic/but1.png"),
-		 g_gr->images().get("images/ui_basic/scrollbar_down.png"),
-		 std::string(),
-		 1 < increase_tool.get_change_by()),
-	change_by_value_
-		(this,
-		 change_by_increase_.get_x() + change_by_increase_.get_w() +
-		 hspacing(),
-		 change_by_increase_.get_y(),
-		 change_by_decrease_.get_x() - hspacing()
-		 -
-		 (change_by_increase_.get_x() + change_by_increase_.get_w() +
-		  hspacing()),
-		 height,
-		 UI::Align::kBottomCenter),
-	set_to_label_
-		(this,
-		 vmargin(),
-		 change_by_increase_.get_y() + change_by_increase_.get_h() +
-		 vspacing(),
-		 get_inner_w() - 2 * hmargin(), height,
-		 _("Set Value"), UI::Align::kBottomCenter),
-	set_to_increase_
-		(this, "incr_set_to",
-		 change_by_increase_.get_x(),
-		 set_to_label_.get_y() + set_to_label_.get_h() + vspacing(),
-		 width, height,
-		 g_gr->images().get("images/ui_basic/but1.png"),
-		 g_gr->images().get("images/ui_basic/scrollbar_up.png"),
-		 std::string(),
-		 increase_tool.set_tool().get_interval().min < MAX_FIELD_HEIGHT),
-	set_to_decrease_
-		(this, "decr_set_to",
-		 hmargin(),
-		 set_to_increase_.get_y(),
-		 width, height,
-		 g_gr->images().get("images/ui_basic/but1.png"),
-		 g_gr->images().get("images/ui_basic/scrollbar_down.png"),
-		 std::string(),
-		 0 < increase_tool.set_tool().get_interval().min),
-	set_to_value_
-		(this,
-		 change_by_value_.get_x(), set_to_increase_.get_y(),
-		 change_by_value_.get_w(), height,
-		 UI::Align::kBottomCenter)
+	box_(this, hmargin(), vmargin(), UI::Box::Vertical, 0, 0, vspacing()),
+	change_by_(&box_, 0, 0, get_inner_w() - 2 * hmargin(), 80,
+				  increase_tool_.get_change_by(), 1, MAX_FIELD_HEIGHT_DIFF,
+				  _("Increase/Decrease Value:"), UI::SpinBox::Units::kNone,
+				  g_gr->images().get("images/ui_basic/but1.png"),
+				  UI::SpinBox::Type::kSmall),
+	set_to_(&box_, 0, 0, get_inner_w() - 2 * hmargin(), 80,
+			  increase_tool_.set_tool().get_interval().min, 0, MAX_FIELD_HEIGHT,
+			  _("Set Value:"), UI::SpinBox::Units::kNone,
+			  g_gr->images().get("images/ui_basic/but1.png"),
+			  UI::SpinBox::Type::kSmall)
 {
-	change_by_increase_.sigclicked.connect
-		(boost::bind
-		 (&EditorToolChangeHeightOptionsMenu::clicked_change_by_increment, boost::ref(*this)));
-	change_by_decrease_.sigclicked.connect
-		(boost::bind
-		 (&EditorToolChangeHeightOptionsMenu::clicked_change_by_decrement, boost::ref(*this)));
-	set_to_increase_.sigclicked.connect
-		(boost::bind(&EditorToolChangeHeightOptionsMenu::clicked_setto_increment, boost::ref(*this)));
-	set_to_decrease_.sigclicked.connect
-		(boost::bind(&EditorToolChangeHeightOptionsMenu::clicked_setto_decrement, boost::ref(*this)));
-
-	change_by_increase_.set_repeating(true);
-	change_by_decrease_.set_repeating(true);
-	set_to_increase_   .set_repeating(true);
-	set_to_decrease_   .set_repeating(true);
-	update();
-}
-
-
-void EditorToolChangeHeightOptionsMenu::clicked_change_by_decrement() {
-	int32_t change_by = increase_tool_.get_change_by();
-	assert(change_by == increase_tool_.decrease_tool().get_change_by());
-	assert(1 < change_by);
-
-	--change_by;
-
-	increase_tool_                .set_change_by(change_by);
-	increase_tool_.decrease_tool().set_change_by(change_by);
-	change_by_decrease_.set_enabled(1 < change_by);
-	change_by_increase_.set_enabled(true);
-	select_correct_tool();
-	update();
-}
-
-
-void EditorToolChangeHeightOptionsMenu::clicked_change_by_increment() {
-	int32_t change_by = increase_tool_.get_change_by();
-	assert(change_by == increase_tool_.decrease_tool().get_change_by());
-	assert(change_by < MAX_FIELD_HEIGHT_DIFF);
-
-	++change_by;
-
-	increase_tool_                .set_change_by(change_by);
-	increase_tool_.decrease_tool().set_change_by(change_by);
-	change_by_decrease_.set_enabled(true);
-	change_by_increase_.set_enabled(change_by < MAX_FIELD_HEIGHT_DIFF);
-	select_correct_tool();
-	update();
-}
-
-
-void EditorToolChangeHeightOptionsMenu::clicked_setto_decrement() {
-	Widelands::Field::Height setto =
-		increase_tool_.set_tool().get_interval().min;
-	assert(setto == increase_tool_.set_tool().get_interval().max);
-	assert(0 < setto);
-
-	--setto;
-
-	increase_tool_.set_tool().set_interval
-		(Widelands::HeightInterval(setto, setto));
-	set_to_decrease_.set_enabled(0 < setto);
-	set_to_increase_.set_enabled(true);
-	select_correct_tool();
-	update();
-}
-
-
-void EditorToolChangeHeightOptionsMenu::clicked_setto_increment() {
-	Widelands::Field::Height setto =
-		increase_tool_.set_tool().get_interval().min;
-	assert(setto == increase_tool_.set_tool().get_interval().max);
-	assert(setto < MAX_FIELD_HEIGHT);
-
-	++setto;
-
-	increase_tool_.set_tool().set_interval
-		(Widelands::HeightInterval(setto, setto));
-	set_to_decrease_.set_enabled(true);
-	set_to_increase_.set_enabled(setto < MAX_FIELD_HEIGHT);
-	select_correct_tool();
-	update();
-}
-
-
-/// Update all the textareas, so that they represent the correct values.
-void EditorToolChangeHeightOptionsMenu::update() {
-	change_by_value_.set_text(std::to_string(increase_tool_.get_change_by()));
-
-	set_to_value_.set_text(std::to_string(
-										static_cast<unsigned int>(increase_tool_.set_tool().get_interval().min)));
+	change_by_.set_tooltip(
+				/** TRANSLATORS: Editor change height access keys. **/
+				(boost::format(_("Use %s to increase, %s to decrease"))
+				 /** TRANSLATORS: This is an access key combination. Localize, but do not change the key. **/
+				 % _("Click")
+				 /** TRANSLATORS: This is an access key combination. Localize, but do not change the key. **/
+				 % _("Shift + Click")).str());
+	set_to_.set_tooltip(
+				/** TRANSLATORS: Editor set height access key. **/
+				(boost::format(_("Use %s to set to this value"))
+				 /** TRANSLATORS: This is an access key combination. Localize, but do not change the key. **/
+				 % _("Ctrl + Click")).str());
+
+	change_by_.changed.connect
+		(boost::bind
+		 (&EditorToolChangeHeightOptionsMenu::update_change_by, boost::ref(*this)));
+	set_to_.changed.connect
+		(boost::bind
+		 (&EditorToolChangeHeightOptionsMenu::update_set_to, boost::ref(*this)));
+
+	box_.add(&change_by_, UI::Align::kLeft);
+	box_.add(&set_to_, UI::Align::kLeft);
+	box_.set_size(get_inner_w() - 2 * hmargin(), change_by_.get_h() + set_to_.get_h() + vspacing());
+	set_inner_size(box_.get_w() + 2 * hmargin(), box_.get_h() + 2 * vspacing());
+}
+
+void EditorToolChangeHeightOptionsMenu::update_change_by() {
+	int32_t change_by = change_by_.get_value();
+	assert(change_by > 0);
+	assert(change_by <= MAX_FIELD_HEIGHT_DIFF);
+
+	increase_tool_                .set_change_by(change_by);
+	increase_tool_.decrease_tool().set_change_by(change_by);
+	select_correct_tool();
+}
+
+void EditorToolChangeHeightOptionsMenu::update_set_to() {
+	int32_t set_to = set_to_.get_value();
+	assert(set_to >= 0);
+	assert(set_to <= MAX_FIELD_HEIGHT);
+	increase_tool_.set_tool().set_interval(Widelands::HeightInterval(set_to, set_to));
+	select_correct_tool();
 }
 
=== modified file 'src/editor/ui_menus/tool_change_height_options_menu.h'
--- src/editor/ui_menus/tool_change_height_options_menu.h	2016-04-06 09:23:04 +0000
+++ src/editor/ui_menus/tool_change_height_options_menu.h	2016-04-07 14:03:59 +0000
@@ -21,8 +21,8 @@
 #define WL_EDITOR_UI_MENUS_TOOL_CHANGE_HEIGHT_OPTIONS_MENU_H
 
 #include "editor/ui_menus/tool_options_menu.h"
-#include "ui_basic/button.h"
-#include "ui_basic/textarea.h"
+#include "ui_basic/box.h"
+#include "ui_basic/spinbox.h"
 
 class EditorInteractive;
 struct EditorIncreaseHeightTool;
@@ -37,18 +37,12 @@
 
 private:
 	EditorIncreaseHeightTool& increase_tool_;
-	UI::Textarea change_by_label_;
-	UI::Button change_by_increase_, change_by_decrease_;
-	UI::Textarea change_by_value_;
-	UI::Textarea set_to_label_;
-	UI::Button set_to_increase_, set_to_decrease_;
-	UI::Textarea set_to_value_;
+	UI::Box box_;
+	UI::SpinBox change_by_;
+	UI::SpinBox set_to_;
 
-	void clicked_change_by_decrement();
-	void clicked_change_by_increment();
-	void clicked_setto_decrement    ();
-	void clicked_setto_increment    ();
-	void update();
+	void update_change_by();
+	void update_set_to();
 };
 
 #endif  // end of include guard: WL_EDITOR_UI_MENUS_TOOL_CHANGE_HEIGHT_OPTIONS_MENU_H
 
=== modified file 'src/editor/ui_menus/tool_change_resources_options_menu.cc'
--- src/editor/ui_menus/tool_change_resources_options_menu.cc	2016-04-06 09:23:04 +0000
+++ src/editor/ui_menus/tool_change_resources_options_menu.cc	2016-04-07 14:03:59 +0000
@@ -22,6 +22,8 @@
 #include <cstdio>
 #include <string>
 
+#include <boost/format.hpp>
+
 #include "base/i18n.h"
 #include "base/wexception.h"
 #include "editor/editorinteractive.h"
@@ -33,11 +35,9 @@
 #include "logic/map_objects/world/world.h"
 #include "logic/widelands.h"
 #include "logic/widelands_geometry.h"
-#include "ui_basic/button.h"
 #include "wui/field_overlay_manager.h"
 
-const static int BUTTON_WIDTH = 20;
-const static int BUTTON_HEIGHT = 20;
+constexpr int kMaxValue = 63;
 
 inline EditorInteractive & EditorToolChangeResourcesOptionsMenu::eia() {
 	return dynamic_cast<EditorInteractive&>(*get_parent());
@@ -50,178 +50,114 @@
 		 EditorIncreaseResourcesTool & increase_tool,
 		 UI::UniqueWindow::Registry     & registry)
 	:
-	EditorToolOptionsMenu
-		(parent, registry, 250, 120, _("Resources")),
-	change_by_label_
-		(this,
-		 hmargin(), vmargin(), get_inner_w() - 2 * hmargin(), BUTTON_HEIGHT,
-		 _("Increase/Decrease Value"), UI::Align::kBottomCenter),
-	change_by_increase_
-		(this, "incr_change_by",
-		 get_inner_w() - hmargin() - BUTTON_WIDTH,
-		 change_by_label_.get_y() + change_by_label_.get_h() + spacing(),
-		 BUTTON_WIDTH, BUTTON_HEIGHT,
-		 g_gr->images().get("images/ui_basic/but1.png"),
-		 g_gr->images().get("images/ui_basic/scrollbar_up.png")),
-	change_by_decrease_
-		(this, "decr_change_by",
-		 hmargin(),
-		 change_by_increase_.get_y(),
-		 BUTTON_WIDTH, BUTTON_HEIGHT,
-		 g_gr->images().get("images/ui_basic/but1.png"),
-		 g_gr->images().get("images/ui_basic/scrollbar_down.png")),
-	change_by_value_
-		(this,
-		 change_by_increase_.get_x() + change_by_increase_.get_w() +
-		 hspacing(),
-		 change_by_increase_.get_y(),
-		 change_by_decrease_.get_x() - hspacing()
-		 -
-		 (change_by_increase_.get_x() + change_by_increase_.get_w() +
-		  hspacing()),
-		 BUTTON_HEIGHT,
-		 UI::Align::kBottomCenter),
-	set_to_label_
-		(this,
-		 vmargin(),
-		 change_by_increase_.get_y() + change_by_increase_.get_h() + vspacing(),
-		 get_inner_w() - 2 * hmargin(), BUTTON_HEIGHT,
-		 _("Set Value"), UI::Align::kBottomCenter),
-	set_to_increase_
-		(this, "incr_set_to",
-		 change_by_increase_.get_x(),
-		 set_to_label_.get_y() + set_to_label_.get_h() + vspacing(),
-		 BUTTON_WIDTH, BUTTON_HEIGHT,
-		 g_gr->images().get("images/ui_basic/but1.png"),
-		 g_gr->images().get("images/ui_basic/scrollbar_up.png")),
-	set_to_decrease_
-		(this, "decr_set_to",
-		 hmargin(),
-		 set_to_increase_.get_y(), BUTTON_WIDTH, BUTTON_HEIGHT,
-		 g_gr->images().get("images/ui_basic/but1.png"),
-		 g_gr->images().get("images/ui_basic/scrollbar_down.png")),
-	set_to_value_
-		(this,
-		 change_by_value_.get_x(), set_to_increase_.get_y(),
-		 change_by_value_.get_w(), BUTTON_HEIGHT,
-		 UI::Align::kBottomCenter),
-	cur_selection_(this, 0, 0, _("Current Selection"), UI::Align::kBottomCenter),
-	increase_tool_(increase_tool)
+	EditorToolOptionsMenu(parent, registry, 350, 120, _("Resources")),
+	increase_tool_(increase_tool),
+	box_(this, hmargin(), vmargin(), UI::Box::Vertical, 0, 0, vspacing()),
+	change_by_(&box_, 0, 0, get_inner_w() - 2 * hmargin(), 80,
+				  increase_tool_.get_change_by(), 1, kMaxValue,
+				  _("Increase/Decrease Value:"), UI::SpinBox::Units::kNone,
+				  g_gr->images().get("images/ui_basic/but1.png"),
+				  UI::SpinBox::Type::kSmall),
+	set_to_(&box_, 0, 0, get_inner_w() - 2 * hmargin(), 80,
+			  increase_tool_.set_tool().get_set_to(), 0, kMaxValue,
+			  _("Set Value:"), UI::SpinBox::Units::kNone,
+			  g_gr->images().get("images/ui_basic/but1.png"),
+			  UI::SpinBox::Type::kSmall),
+	resources_box_(&box_, 0, 0, UI::Box::Horizontal, 0, 0, 1),
+	cur_selection_(&box_, 0, 0, "", UI::Align::kCenter)
 {
-	change_by_increase_.sigclicked.connect
-		(boost::bind
-			(&EditorToolChangeResourcesOptionsMenu::clicked_button,
-			 boost::ref(*this),
-			 Change_By_Increase));
-	change_by_decrease_.sigclicked.connect
-		(boost::bind
-			(&EditorToolChangeResourcesOptionsMenu::clicked_button,
-			 boost::ref(*this),
-			 Change_By_Decrease));
-	set_to_increase_.sigclicked.connect
-		(boost::bind
-			(&EditorToolChangeResourcesOptionsMenu::clicked_button,
-			 boost::ref(*this),
-			 Set_To_Increase));
-	set_to_decrease_.sigclicked.connect
-		(boost::bind
-			(&EditorToolChangeResourcesOptionsMenu::clicked_button,
-			 boost::ref(*this),
-			 Set_To_Decrease));
-
-	change_by_increase_.set_repeating(true);
-	change_by_decrease_.set_repeating(true);
-	set_to_increase_   .set_repeating(true);
-	set_to_decrease_   .set_repeating(true);
-	const Widelands::World & world = parent.egbase().world();
-	Widelands::DescriptionIndex const nr_resources = world.get_nr_resources();
-
-	//  Find the maximal width and height for the resource pictures.
-	int resource_pic_max_width = 0, resource_pic_max_height = 0;
+	// Configure spin boxes
+	change_by_.set_tooltip(
+				/** TRANSLATORS: Editor change resources access keys. **/
+				(boost::format(_("Use %s to increase, %s to decrease"))
+				 /** TRANSLATORS: This is an access key combination. Localize, but do not change the key. **/
+				 % _("Click")
+				 /** TRANSLATORS: This is an access key combination. Localize, but do not change the key. **/
+				 % _("Shift + Click")).str());
+	set_to_.set_tooltip(
+				/** TRANSLATORS: Editor set resources access key. **/
+				(boost::format(_("Use %s to set to this value"))
+				 /** TRANSLATORS: This is an access key combination. Localize, but do not change the key. **/
+				 % _("Ctrl + Click")).str());
+
+	change_by_.changed.connect
+		(boost::bind
+		 (&EditorToolChangeResourcesOptionsMenu::update_change_by, boost::ref(*this)));
+	set_to_.changed.connect
+		(boost::bind
+		 (&EditorToolChangeResourcesOptionsMenu::update_set_to, boost::ref(*this)));
+
+	box_.add(&change_by_, UI::Align::kLeft);
+	box_.add(&set_to_, UI::Align::kLeft);
+	box_.set_size(get_inner_w() - 2 * hmargin(), change_by_.get_h() + set_to_.get_h() + vspacing());
+
+	// Add resource buttons
+	const Widelands::World& world = parent.egbase().world();
+	const Widelands::DescriptionIndex nr_resources = world.get_nr_resources();
+
 	for (Widelands::DescriptionIndex i = 0; i < nr_resources; ++i) {
-		const Image* pic = g_gr->images().get(world.get_resource(i)->representative_image());
-		resource_pic_max_width  = std::max(resource_pic_max_width,  pic->width());
-		resource_pic_max_height = std::max(resource_pic_max_height, pic->height());
+		const Widelands::ResourceDescription& resource = *world.get_resource(i);
+		radiogroup_.add_button
+				(&resources_box_,
+				 Point(0, 0),
+				 g_gr->images().get(resource.representative_image()),
+				 resource.descname());
+		resources_box_.add(radiogroup_.get_first_button(), UI::Align::kLeft, false, true);
 	}
 
-	const uint16_t resources_in_row =
-		(get_inner_w() - 2 * hmargin() + spacing())
-		/
-		(resource_pic_max_width + spacing());
+	box_.add_space(vspacing());
+	box_.add(&resources_box_, UI::Align::kLeft, true);
+	box_.set_size(box_.get_w(), box_.get_h() + 4 * vspacing() + resources_box_.get_h());
+
+	radiogroup_.set_state(increase_tool_.get_cur_res());
 
 	radiogroup_.changed.connect
-		(boost::bind(&EditorToolChangeResourcesOptionsMenu::selected, this));
+		(boost::bind(&EditorToolChangeResourcesOptionsMenu::change_resource, this));
 	radiogroup_.clicked.connect
-		(boost::bind(&EditorToolChangeResourcesOptionsMenu::selected, this));
-
-	uint16_t cur_x = 0;
-	Point pos
-		(hmargin(), set_to_value_.get_y() + set_to_value_.get_h() + vspacing());
-	for
-		(Widelands::DescriptionIndex i = 0;
-		 i < nr_resources;
-		 pos.x += resource_pic_max_width + hspacing(), ++cur_x, ++i)
-	{
-		if (cur_x == resources_in_row) {
-			cur_x = 0;
-			pos.x = hmargin();
-			pos.y += resource_pic_max_height + vspacing();
-		}
-		radiogroup_.add_button
-			(this,
-			 pos,
-			 g_gr->images().get(world.get_resource(i)->representative_image()));
-	}
-	pos.y += resource_pic_max_height + vspacing();
-
-	set_inner_size(get_inner_w(), pos.y + cur_selection_.get_h() + vmargin());
-	cur_selection_.set_pos(Point(get_inner_w() / 2, pos.y + hspacing()));
-
-	radiogroup_.set_state(increase_tool_.get_cur_res());
-
+		(boost::bind(&EditorToolChangeResourcesOptionsMenu::change_resource, this));
+
+	// Add label
+	cur_selection_.set_fixed_width(box_.get_inner_w());
+	box_.add(&cur_selection_, UI::Align::kLeft);
+
+	box_.set_size(box_.get_w(), box_.get_h() + vspacing() + cur_selection_.get_h());
+	set_inner_size(get_inner_w(), box_.get_h() + 1 * vmargin());
 	update();
 }
 
-
-void EditorToolChangeResourcesOptionsMenu::clicked_button(Button const n)
-{
-	assert
-		(increase_tool_.get_change_by()
-		 ==
-		 increase_tool_.decrease_tool().get_change_by());
-
-	int32_t change_by = increase_tool_.get_change_by();
-	int32_t set_to    = increase_tool_.set_tool().get_set_to();
-
-	switch (n) {
-	case Change_By_Increase: change_by += change_by < 63; break;
-	case Change_By_Decrease: change_by -= 1 < change_by;  break;
-	case    Set_To_Increase: set_to    += set_to    < 63; break;
-	case    Set_To_Decrease: set_to    -= 0 < set_to;
-	}
+void EditorToolChangeResourcesOptionsMenu::update_change_by() {
+	int32_t change_by = change_by_.get_value();
+	assert(change_by > 0);
+	assert(change_by <= kMaxValue);
 	increase_tool_.set_change_by(change_by);
 	increase_tool_.decrease_tool().set_change_by(change_by);
+	select_correct_tool();
+}
+
+void EditorToolChangeResourcesOptionsMenu::update_set_to() {
+	int32_t set_to = set_to_.get_value();
+	assert(set_to >= 0);
+	assert(set_to <= kMaxValue);
 	increase_tool_.set_tool().set_set_to(set_to);
-
 	select_correct_tool();
-	update();
 }
 
+
 /**
  * called when a resource has been selected
  */
-void EditorToolChangeResourcesOptionsMenu::selected() {
-	const int32_t resIx = radiogroup_.get_state();
+void EditorToolChangeResourcesOptionsMenu::change_resource() {
+	const int32_t resource_index = radiogroup_.get_state();
 
-	increase_tool_.set_tool().set_cur_res(resIx);
-	increase_tool_.set_cur_res(resIx);
-	increase_tool_.decrease_tool().set_cur_res(resIx);
+	increase_tool_.set_tool().set_cur_res(resource_index);
+	increase_tool_.set_cur_res(resource_index);
+	increase_tool_.decrease_tool().set_cur_res(resource_index);
 
 	Widelands::EditorGameBase& egbase = eia().egbase();
 	Widelands::Map & map = egbase.map();
 	eia().mutable_field_overlay_manager()->register_overlay_callback_function(
-		[resIx, &map, &egbase](const Widelands::TCoords<Widelands::FCoords>& coords) -> uint32_t {
-			if (map.is_resource_valid(egbase.world(), coords, resIx)) {
+		[resource_index, &map, &egbase](const Widelands::TCoords<Widelands::FCoords>& coords) -> uint32_t {
+			if (map.is_resource_valid(egbase.world(), coords, resource_index)) {
 				return coords.field->nodecaps();
 			}
 			return 0;
@@ -229,7 +165,6 @@
 
 	map.recalc_whole_map(egbase.world());
 	select_correct_tool();
-
 	update();
 }
 
@@ -237,26 +172,7 @@
  * Update all the textareas, so that they represent the correct values
 */
 void EditorToolChangeResourcesOptionsMenu::update() {
-
-	change_by_value_.set_text(std::to_string(increase_tool_.get_change_by()));
-
-	set_to_value_.set_text(std::to_string(
-										static_cast<unsigned int>(increase_tool_.set_tool().get_set_to())));
-
 	cur_selection_.set_text
-		(eia().egbase().world().get_resource(increase_tool_.set_tool().get_cur_res())->descname());
-	cur_selection_.set_pos
-		(Point
-			((get_inner_w() - cur_selection_.get_w()) / 2, get_inner_h() - 20));
-
-	{
-		int32_t const change_by = increase_tool_.get_change_by();
-		change_by_decrease_.set_enabled(1 < change_by);
-		change_by_increase_.set_enabled    (change_by < 63);
-	}
-	{
-		int32_t const set_to   = increase_tool_.set_tool().get_set_to();
-		set_to_decrease_   .set_enabled(0 < set_to);
-		set_to_increase_   .set_enabled    (set_to    < 63);
-	}
+			((boost::format(_("Current: %s"))
+			  % eia().egbase().world().get_resource(increase_tool_.set_tool().get_cur_res())->descname()).str());
 }
 
=== modified file 'src/editor/ui_menus/tool_change_resources_options_menu.h'
--- src/editor/ui_menus/tool_change_resources_options_menu.h	2016-04-06 09:23:04 +0000
+++ src/editor/ui_menus/tool_change_resources_options_menu.h	2016-04-07 14:03:59 +0000
@@ -21,8 +21,9 @@
 #define WL_EDITOR_UI_MENUS_TOOL_CHANGE_RESOURCES_OPTIONS_MENU_H
 
 #include "editor/ui_menus/tool_options_menu.h"
-#include "ui_basic/button.h"
+#include "ui_basic/box.h"
 #include "ui_basic/radiobutton.h"
+#include "ui_basic/spinbox.h"
 #include "ui_basic/textarea.h"
 
 class EditorInteractive;
@@ -38,22 +39,18 @@
 
 private:
 	EditorInteractive & eia();
-	void selected();
-	enum Button {
-		Change_By_Increase, Change_By_Decrease,
-		Set_To_Increase,    Set_To_Decrease
-	};
-	void clicked_button(Button);
+	void change_resource();
+	void update_change_by();
+	void update_set_to();
 	void update();
-	UI::Textarea change_by_label_;
-	UI::Button change_by_increase_, change_by_decrease_;
-	UI::Textarea change_by_value_;
-	UI::Textarea set_to_label_;
-	UI::Button set_to_increase_, set_to_decrease_;
-	UI::Textarea set_to_value_;
+
+	EditorIncreaseResourcesTool& increase_tool_;
+	UI::Box box_;
+	UI::SpinBox change_by_;
+	UI::SpinBox set_to_;
+	UI::Box resources_box_;
+	UI::Radiogroup radiogroup_;
 	UI::Textarea cur_selection_;
-	UI::Radiogroup radiogroup_;
-	EditorIncreaseResourcesTool& increase_tool_;
 };
 
 #endif  // end of include guard: WL_EDITOR_UI_MENUS_TOOL_CHANGE_RESOURCES_OPTIONS_MENU_H
 
=== modified file 'src/editor/ui_menus/tool_noise_height_options_menu.cc'
--- src/editor/ui_menus/tool_noise_height_options_menu.cc	2016-04-06 09:23:04 +0000
+++ src/editor/ui_menus/tool_noise_height_options_menu.cc	2016-04-07 14:03:59 +0000
@@ -30,236 +30,114 @@
 #include "editor/tools/noise_height_tool.h"
 #include "graphic/graphic.h"
 #include "logic/widelands_geometry.h"
+#include "ui_basic/textarea.h"
 
 
 using Widelands::Field;
 
-#define width  20
-#define height 20
 EditorToolNoiseHeightOptionsMenu::EditorToolNoiseHeightOptionsMenu
 	(EditorInteractive         & parent,
 	 EditorNoiseHeightTool   & noise_tool,
 	 UI::UniqueWindow::Registry & registry)
 	:
-	EditorToolOptionsMenu
-		(parent, registry, 250, 3 * height + 4 * vspacing() + 2 * vmargin(), _("Noise Height Options")),
+	EditorToolOptionsMenu(parent, registry, 300, 120, _("Noise Height Options")),
 	noise_tool_(noise_tool),
-	lower_label_
-		(this,
-		 hmargin(),
-		 vmargin(),
-		 width, height,
-		 UI::Align::kLeft),
-	upper_label_
-		(this,
-		 hmargin(),
-		 lower_label_.get_y() + lower_label_.get_h() + 2 * vspacing(),
-		 width, height,
-		 UI::Align::kLeft),
-	lower_decrease_
-		(this, "decr_lower",
-		 get_inner_w() - 2 * width - hspacing(),
-		 lower_label_.get_y(),
-		 width, height,
-		 g_gr->images().get("images/ui_basic/but0.png"),
-		 g_gr->images().get("images/ui_basic/scrollbar_down.png"),
-		 std::string(),
-		 0 < noise_tool.get_interval().min),
-	lower_increase_
-		(this, "incr_lower",
-		 get_inner_w() - width - hspacing(),
-		 lower_label_.get_y(),
-		 width, height,
-		 g_gr->images().get("images/ui_basic/but0.png"),
-		 g_gr->images().get("images/ui_basic/scrollbar_up.png"),
-		 std::string(),
-		 noise_tool.get_interval().min < MAX_FIELD_HEIGHT),
-	upper_decrease_
-		(this, "decr_upper",
-		 get_inner_w() - 2 * width - hspacing(),
-		 upper_label_.get_y(),
-		 width, height,
-		 g_gr->images().get("images/ui_basic/but0.png"),
-		 g_gr->images().get("images/ui_basic/scrollbar_down.png"),
-		 std::string(),
-		 0 < noise_tool.get_interval().max),
-	upper_increase_
-		(this, "incr_upper",
-		 get_inner_w() - width - hspacing(),
-		 upper_label_.get_y(),
-		 width, height,
-		 g_gr->images().get("images/ui_basic/but0.png"),
-		 g_gr->images().get("images/ui_basic/scrollbar_up.png"),
-		 std::string(),
-		 noise_tool.get_interval().max < MAX_FIELD_HEIGHT),
-	set_label_
-		(this,
-		 hmargin(),
-		 upper_label_.get_y() + upper_label_.get_h() + 2 * vspacing(),
-		 width, height,
-		 UI::Align::kLeft),
-	setto_decrease_
-		(this, "decr_set_to",
-		 get_inner_w() - 2 * width - hspacing(),
-		 set_label_.get_y(),
-		 width, height,
-		 g_gr->images().get("images/ui_basic/but1.png"),
-		 g_gr->images().get("images/ui_basic/scrollbar_down.png"),
-		 std::string(),
-		 0 < noise_tool.set_tool().get_interval().min),
-	setto_increase_
-		(this, "incr_set_to",
-		 get_inner_w() - width - hspacing(),
-		 set_label_.get_y(),
-		 width, height,
-		 g_gr->images().get("images/ui_basic/but1.png"),
-		 g_gr->images().get("images/ui_basic/scrollbar_up.png"),
-		 std::string(),
-		 noise_tool.set_tool().get_interval().max < MAX_FIELD_HEIGHT)
+	box_(this, hmargin(), vmargin(), UI::Box::Vertical, 0, 0, vspacing()),
+	lower_(&box_, 0, 0, get_inner_w() - 2 * hmargin(), 80,
+				  noise_tool_.get_interval().min, 1, MAX_FIELD_HEIGHT,
+				  _("Minimum Height:"), UI::SpinBox::Units::kNone,
+				  g_gr->images().get("images/ui_basic/but1.png"),
+				  UI::SpinBox::Type::kSmall),
+	upper_(&box_, 0, 0, get_inner_w() - 2 * hmargin(), 80,
+				  noise_tool_.get_interval().max, 0, MAX_FIELD_HEIGHT,
+				  _("Maximum Height:"), UI::SpinBox::Units::kNone,
+				  g_gr->images().get("images/ui_basic/but1.png"),
+				  UI::SpinBox::Type::kSmall),
+	set_to_(&box_, 0, 0, get_inner_w() - 2 * hmargin(), 80,
+			  noise_tool_.set_tool().get_interval().min, 0, MAX_FIELD_HEIGHT,
+			  _("Set Value:"), UI::SpinBox::Units::kNone,
+			  g_gr->images().get("images/ui_basic/but1.png"),
+			  UI::SpinBox::Type::kSmall)
 {
-	lower_increase_.sigclicked.connect
-		(boost::bind(&EditorToolNoiseHeightOptionsMenu::clicked_lower_increase, boost::ref(*this)));
-	lower_decrease_.sigclicked.connect
-		(boost::bind(&EditorToolNoiseHeightOptionsMenu::clicked_lower_decrease, boost::ref(*this)));
-	upper_increase_.sigclicked.connect
-		(boost::bind(&EditorToolNoiseHeightOptionsMenu::clicked_upper_increase, boost::ref(*this)));
-	upper_decrease_.sigclicked.connect
-		(boost::bind(&EditorToolNoiseHeightOptionsMenu::clicked_upper_decrease, boost::ref(*this)));
-	setto_increase_.sigclicked.connect
-		(boost::bind(&EditorToolNoiseHeightOptionsMenu::clicked_setto_increase, boost::ref(*this)));
-	setto_decrease_.sigclicked.connect
-		(boost::bind(&EditorToolNoiseHeightOptionsMenu::clicked_setto_decrease, boost::ref(*this)));
-
-	lower_increase_.set_repeating(true);
-	lower_decrease_.set_repeating(true);
-	upper_increase_.set_repeating(true);
-	upper_decrease_.set_repeating(true);
-	setto_increase_.set_repeating(true);
-	setto_decrease_.set_repeating(true);
-	update();
-}
-
-/**
- * Update all textareas
-*/
-void EditorToolNoiseHeightOptionsMenu::update() {
-	const Widelands::HeightInterval height_interval = noise_tool_.get_interval();
-
-	lower_label_.set_text((boost::format(_("Minimum: %u"))
-									% static_cast<unsigned int>(height_interval.min)).str());
-
-	upper_label_.set_text((boost::format(_("Maximum: %u"))
-									% static_cast<unsigned int>(height_interval.max)).str());
-
-	set_label_.set_text((boost::format(_("Set value: %u"))
-								 % static_cast<unsigned int>(noise_tool_.set_tool().get_interval().min)).str());
-
-	select_correct_tool();
-}
-
-
-void EditorToolNoiseHeightOptionsMenu::clicked_lower_decrease() {
-	Widelands::HeightInterval height_interval = noise_tool_.get_interval();
-
-	assert(height_interval.valid());
-	assert(0 < height_interval.min);
-
-	--height_interval.min;
-
-	assert(height_interval.valid());
-
-	noise_tool_.set_interval(height_interval);
-	lower_decrease_.set_enabled(0 < height_interval.min);
-	lower_increase_.set_enabled(true);
-	update();
-}
-
-
-void EditorToolNoiseHeightOptionsMenu::clicked_lower_increase() {
-	Widelands::HeightInterval height_interval = noise_tool_.get_interval();
-
-	assert(height_interval.valid());
-	assert(height_interval.min < MAX_FIELD_HEIGHT);
-
-	++height_interval.min;
-	height_interval.max = std::max(height_interval.min, height_interval.max);
-
-	assert(height_interval.valid());
-
-	noise_tool_.set_interval(height_interval);
-	lower_decrease_.set_enabled(true);
-	lower_increase_.set_enabled(height_interval.min < MAX_FIELD_HEIGHT);
-	upper_decrease_.set_enabled(true);
-	upper_increase_.set_enabled(height_interval.max < MAX_FIELD_HEIGHT);
-
-	update();
-}
-
-
-void EditorToolNoiseHeightOptionsMenu::clicked_upper_decrease() {
-	Widelands::HeightInterval height_interval = noise_tool_.get_interval();
-
-	assert(height_interval.valid());
-	assert(0 < noise_tool_.get_interval().max);
-
-	--height_interval.max;
-	height_interval.min = std::min(height_interval.min, height_interval.max);
-
-	assert(height_interval.valid());
-
-	noise_tool_.set_interval(height_interval);
-	lower_decrease_.set_enabled(0 < height_interval.min);
-	lower_increase_.set_enabled(true);
-	upper_decrease_.set_enabled(0 < height_interval.max);
-	upper_increase_.set_enabled(true);
-	update();
-}
-
-
-void EditorToolNoiseHeightOptionsMenu::clicked_upper_increase() {
-	Widelands::HeightInterval height_interval = noise_tool_.get_interval();
-
-	assert(noise_tool_.get_interval().valid());
-	assert(noise_tool_.get_interval().max < MAX_FIELD_HEIGHT);
-
-	++height_interval.max;
-
-	assert(noise_tool_.get_interval().valid());
-
-	noise_tool_.set_interval(height_interval);
-	upper_decrease_.set_enabled(true);
-	upper_increase_.set_enabled(height_interval.max < MAX_FIELD_HEIGHT);
-	update();
-}
-
-
-void EditorToolNoiseHeightOptionsMenu::clicked_setto_decrease() {
-	EditorSetHeightTool & set_tool = noise_tool_.set_tool();
-	Field::Height h = set_tool.get_interval().min;
-
-	assert(h == set_tool.get_interval().max);
-	assert(0 < h);
-
-	--h;
-
-	set_tool.set_interval(Widelands::HeightInterval(h, h));
-	setto_decrease_.set_enabled(0 < h);
-	setto_increase_.set_enabled(true);
-	update();
-}
-
-
-void EditorToolNoiseHeightOptionsMenu::clicked_setto_increase() {
-	EditorSetHeightTool & set_tool = noise_tool_.set_tool();
-	Field::Height h = set_tool.get_interval().min;
-
-	assert(h == set_tool.get_interval().max);
-	assert(h < MAX_FIELD_HEIGHT);
-
-	++h;
-
-	set_tool.set_interval(Widelands::HeightInterval(h, h));
-	setto_decrease_.set_enabled(true);
-	setto_increase_.set_enabled(h < MAX_FIELD_HEIGHT);
-	update();
+	lower_.set_tooltip(
+				/** TRANSLATORS: Editor noise height access keys. **/
+				_("Click to set the height to a random value within the specified range"));
+	upper_.set_tooltip(
+				/** TRANSLATORS: Editor noise height access keys. **/
+				_("Click to set the height to a random value within the specified range"));
+	set_to_.set_tooltip(
+				/** TRANSLATORS: Editor set hoise height access keys. **/
+				(boost::format(_("Use %s to set to this value"))
+				 /** TRANSLATORS: This is an access key combination. Localize, but do not change the key. **/
+				 % _("Ctrl + Click")).str());
+
+	lower_.changed.connect
+		(boost::bind
+		 (&EditorToolNoiseHeightOptionsMenu::update_lower, boost::ref(*this)));
+	upper_.changed.connect
+		(boost::bind
+		 (&EditorToolNoiseHeightOptionsMenu::update_upper, boost::ref(*this)));
+	set_to_.changed.connect
+		(boost::bind
+		 (&EditorToolNoiseHeightOptionsMenu::update_set_to, boost::ref(*this)));
+
+	UI::Textarea* label = new UI::Textarea(&box_, 0, 0, 0, 0, _("Random Height"), UI::Align::kCenter);
+	label->set_fixed_width(get_inner_w() - 2 * hmargin());
+	box_.add(label, UI::Align::kLeft);
+	box_.add(&upper_, UI::Align::kLeft);
+	box_.add(&lower_, UI::Align::kLeft);
+
+	box_.add_space(2 * vspacing());
+	label = new UI::Textarea(&box_, 0, 0, 0, 0, _("Fixed Height"), UI::Align::kCenter);
+	label->set_fixed_width(get_inner_w() - 2 * hmargin());
+	box_.add(label, UI::Align::kLeft);
+	box_.add(&set_to_, UI::Align::kLeft);
+
+	box_.set_size(get_inner_w() - 2 * hmargin(),
+					  upper_.get_h() + lower_.get_h() + set_to_.get_h() + 2 * label->get_h() + 7 * vspacing());
+
+	set_inner_size(box_.get_w() + 2 * hmargin(), box_.get_h() + 2 * vspacing());
+}
+
+
+void EditorToolNoiseHeightOptionsMenu::update_lower() {
+	int32_t upper = upper_.get_value();
+	int32_t lower = lower_.get_value();
+	// Make sure that upper increases if necessary
+	upper = std::max(lower, upper);
+	lower = std::min(lower, upper);
+	update_interval(lower, upper);
+}
+
+
+void EditorToolNoiseHeightOptionsMenu::update_upper() {
+	int32_t upper = upper_.get_value();
+	int32_t lower = lower_.get_value();
+	// Make sure that lower decreases if necessary
+	lower = std::min(lower, upper);
+	upper = std::max(lower, upper);
+	update_interval(lower, upper);
+}
+
+void EditorToolNoiseHeightOptionsMenu::update_interval(int32_t lower, int32_t upper) {
+	assert(lower >= 0);
+	assert(lower <= MAX_FIELD_HEIGHT);
+	assert(upper >= 0);
+	assert(upper <= MAX_FIELD_HEIGHT);
+
+	Widelands::HeightInterval height_interval(lower, upper);
+	assert(height_interval.valid());
+
+	lower_.set_value(height_interval.min);
+	upper_.set_value(height_interval.max);
+	noise_tool_.set_interval(height_interval);
+	select_correct_tool();
+}
+
+void EditorToolNoiseHeightOptionsMenu::update_set_to() {
+	int32_t set_to = set_to_.get_value();
+	assert(set_to >= 0);
+	assert(set_to <= MAX_FIELD_HEIGHT);
+	noise_tool_.set_tool().set_interval(Widelands::HeightInterval(set_to, set_to));
+	select_correct_tool();
 }
 
=== modified file 'src/editor/ui_menus/tool_noise_height_options_menu.h'
--- src/editor/ui_menus/tool_noise_height_options_menu.h	2016-04-06 09:23:04 +0000
+++ src/editor/ui_menus/tool_noise_height_options_menu.h	2016-04-07 14:03:59 +0000
@@ -21,8 +21,8 @@
 #define WL_EDITOR_UI_MENUS_TOOL_NOISE_HEIGHT_OPTIONS_MENU_H
 
 #include "editor/ui_menus/tool_options_menu.h"
-#include "ui_basic/button.h"
-#include "ui_basic/textarea.h"
+#include "ui_basic/box.h"
+#include "ui_basic/spinbox.h"
 
 class EditorInteractive;
 struct EditorNoiseHeightTool;
@@ -34,19 +34,15 @@
 		 UI::UniqueWindow::Registry &);
 
 private:
+	void update_interval(int32_t lower, int32_t upper);
+	void update_upper();
+	void update_lower();
+	void update_set_to();
+
 	EditorNoiseHeightTool& noise_tool_;
-	UI::Textarea lower_label_, upper_label_;
-	UI::Button lower_decrease_, lower_increase_, upper_decrease_, upper_increase_;
-	UI::Textarea set_label_;
-	UI::Button setto_decrease_, setto_increase_;
-
-	void clicked_lower_decrease();
-	void clicked_lower_increase();
-	void clicked_upper_decrease();
-	void clicked_upper_increase();
-	void clicked_setto_decrease();
-	void clicked_setto_increase();
-	void update();
+	UI::Box box_;
+	UI::SpinBox lower_, upper_;
+	UI::SpinBox set_to_;
 };
 
 #endif  // end of include guard: WL_EDITOR_UI_MENUS_TOOL_NOISE_HEIGHT_OPTIONS_MENU_H
 
=== modified file 'src/ui_basic/spinbox.cc'
--- src/ui_basic/spinbox.cc	2016-04-01 12:22:09 +0000
+++ src/ui_basic/spinbox.cc	2016-04-07 14:03:59 +0000
@@ -254,6 +254,7 @@
 void SpinBox::change_value(int32_t const value)
 {
 	set_value(value + sbi_->value);
+	changed();
 }
 
 
 
=== modified file 'src/ui_basic/spinbox.h'
--- src/ui_basic/spinbox.h	2016-03-26 18:57:47 +0000
+++ src/ui_basic/spinbox.h	2016-04-07 14:03:59 +0000
@@ -23,6 +23,8 @@
 #include <cstring>
 #include <list>
 
+#include <boost/signals2.hpp>
+
 #include "graphic/align.h"
 #include "ui_basic/box.h"
 #include "ui_basic/button.h"
@@ -63,6 +65,8 @@
 		 int32_t step_size = 1, int32_t big_step_size = 10);
 	~SpinBox();
 
+	boost::signals2::signal<void ()> changed;
+
 	void set_value(int32_t);
 	// For spinboxes of type kValueList. The vector needs to be sorted in ascending order,
 	// otherwise you will confuse the user.