Merge lp:~widelands-dev/widelands/bug-1392406 into lp:widelands

[GunChleoc]

When leaving the editor after the map has changed, the confirmation dialog can now be skipped by pressing CTRL.

[SirVer (sirver)]

Do we not have this code all over the place in the code base already? It maybe makes more sense to pull this out and reuse some code.

[GunChleoc (gunchleoc)]

The common code is:

if (get_key_state(SDL_SCANCODE_LCTRL) || get_key_state(SDL_SCANCODE_RCTRL)) {
    do_something_arbitrary();
} else {
   do_something_else_arbitrary();
}

There is an ActionConfirm object for Buildings and Ships.

For end_modal, we have 2 occurrences only: Here and in the game options window. There is no quick fix for making them the same, because the game options window needs m_gb.end_modal(0) and the editor needs end_modal(0) - they are different object types. So, the change would need to be bigger than I want to get into right now.

[SirVer (sirver)]

Makes sense. lgtm.

review: Approve

=== modified file 'src/editor/editorinteractive.cc'
--- src/editor/editorinteractive.cc	2014-11-13 08:25:45 +0000
+++ src/editor/editorinteractive.cc	2014-11-13 18:52:58 +0000
@@ -251,13 +251,17 @@
 
 void EditorInteractive::exit() {
 	if (m_need_save) {
-		UI::WLMessageBox mmb
-		(this,
-		 _("Unsaved Map"),
-		 _("The map has not been saved, do you really want to quit?"),
-		 UI::WLMessageBox::YESNO);
-		if (mmb.run() == 0)
-			return;
+		if (get_key_state(SDL_SCANCODE_LCTRL) || get_key_state(SDL_SCANCODE_RCTRL)) {
+			end_modal(0);
+		} else {
+			UI::WLMessageBox mmb
+			(this,
+			 _("Unsaved Map"),
+			 _("The map has not been saved, do you really want to quit?"),
+			 UI::WLMessageBox::YESNO);
+			if (mmb.run() == 0)
+				return;
+		}
 	}
 	end_modal(0);
 }