Better exiting from windows (Escape and Enter) and 'q' for exit, fixes #35 and #60

2 files changed, 23 insertions, 0 deletions

diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp
index f58b145..5773be2 100644
--- a/src/game/GameView.cpp
+++ b/src/game/GameView.cpp
@@ -12,6 +12,7 @@
 #include "interface/Slider.h"
 #include "search/Thumbnail.h"
 #include "simulation/SaveRenderer.h"
+#include "dialogues/ConfirmPrompt.h"
 #include "Format.h"
 #include "QuickOption.h"
 
@@ -888,6 +889,22 @@ void GameView::OnMouseUp(int x, int y, unsigned button)
 	}
 }
 
+void GameView::ExitPrompt()
+{
+	class ExitConfirmation: public ConfirmDialogueCallback {
+	public:
+		ExitConfirmation() {}
+		virtual void ConfirmCallback(ConfirmPrompt::DialogueResult result) {
+			if (result == ConfirmPrompt::ResultOkay)
+			{
+				ui::Engine::Ref().Exit();
+			}
+		}
+		virtual ~ExitConfirmation() { }
+	};
+	new ConfirmPrompt("You are about to quit", "Are you sure you want to exit the game?", new ExitConfirmation());
+}
+
 void GameView::ToolTip(ui::Component * sender, ui::Point mousePosition, std::string toolTip)
 {
 	this->toolTip = toolTip;
@@ -1024,6 +1041,10 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
 	case 'y':
 		c->SwitchAir();
 		break;
+	case KEY_ESCAPE:
+	case 'q':
+		ExitPrompt();
+		break;
 	case 'u':
 		c->ToggleAHeat();
 		break;
diff --git a/src/game/GameView.h b/src/game/GameView.h
index 15bf0dc..7cb8d6b 100644
--- a/src/game/GameView.h
+++ b/src/game/GameView.h
@@ -142,6 +142,8 @@ public:
 	void NotifyInfoTipChanged(GameModel * sender);
 	void NotifyQuickOptionsChanged(GameModel * sender);
 
+	void ExitPrompt();
+
 	virtual void ToolTip(ui::Component * sender, ui::Point mousePosition, std::string toolTip);
 
 	virtual void OnMouseMove(int x, int y, int dx, int dy);