Merge lp://staging/~widelands-dev/widelands/editor-resize-map into lp://staging/widelands

Continuous integration builds have changed state:

Travis build 4685. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/516924316.
Appveyor build 4471. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_editor_resize_map-4471.

First round of code review done. Not tested yet.

Thanks for the review, implemented your suggestions

Continuous integration builds have changed state:

Travis build 4695. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/517211510.
Appveyor build 4481. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_editor_resize_map-4481.

Changes LGTM :)

Not tested yet.

I have given this a very quick spin.

I don't think that it is obvious to the user that they need to click on the map after selecting the values. Best add a Multilinetextarea with a hint.

I think it would also be good to have dropdown menus for the map size rather than spin boxes - selecting them will be much faster that way. You could put this into a separate class and use it everywhere in the editor where map sized are being set.

OK, added the hint and replaced spinners with dropdowns in the Resize Tool options and the New Map and Random Map menus. The large code blocks for setting the initial values are now shorter and more intuitive, I don´t think we would gain much by making a new class for it.

Continuous integration builds have changed state:

Travis build 4708. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/518246751.
Appveyor build 4494. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_editor_resize_map-4494.

Changes look good. I have done some testing with a few random maps - no issues :)

Transient failure on Travis

@bunnybot merge force

Error merging this proposal:

Output:
stdout:

stderr:
+N data/images/wui/editor/editor_menu_tool_resize.png
+N data/images/wui/editor/fsel_editor_resize.png
+N src/editor/tools/resize_tool.cc
+N src/editor/tools/resize_tool.h
+N src/editor/ui_menus/tool_resize_options_menu.cc
+N src/editor/ui_menus/tool_resize_options_menu.h
 M src/editor/CMakeLists.txt
 M src/editor/editorinteractive.cc
 M src/editor/editorinteractive.h
 M src/editor/tools/action_args.h
 M src/editor/tools/history.cc
 M src/editor/ui_menus/main_menu_new_map.cc
 M src/editor/ui_menus/main_menu_new_map.h
 M src/editor/ui_menus/main_menu_random_map.cc
 M src/editor/ui_menus/main_menu_random_map.h
 M src/editor/ui_menus/tool_menu.cc
 M src/logic/map.cc
 M src/logic/map.h
Text conflict in src/editor/ui_menus/tool_menu.cc
1 conflicts encountered.

Continuous integration builds have changed state:

Travis build 4766. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/523536087.
Appveyor build 4550. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_editor_resize_map-4550.

Transient failure on Travis

@bunnybot merge

@bunnybot merge force

Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways.

Travis build 4766. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/523536087.

@bunnybot merge force