From 1333d13327a6211b5197dd0bad3523d89124d97f Mon Sep 17 00:00:00 2001
From: moomarc <moomarc@cardforge.org>
Date: Thu, 20 Sep 2012 11:03:28 +0000
Subject: [PATCH] - Added keyboard shortcut for End Turn. (you still have to
 pass priority as though you pushed the button)

---
 src/main/java/forge/control/KeyboardShortcuts.java   | 10 ++++++++++
 src/main/java/forge/properties/ForgePreferences.java |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/forge/control/KeyboardShortcuts.java b/src/main/java/forge/control/KeyboardShortcuts.java
index 3c3bd328386..5de45e03c21 100644
--- a/src/main/java/forge/control/KeyboardShortcuts.java
+++ b/src/main/java/forge/control/KeyboardShortcuts.java
@@ -104,6 +104,15 @@ public class KeyboardShortcuts {
             }
         };
 
+        /** End turn. */
+        final Action actEndTurn = new AbstractAction() {
+            @Override
+            public void actionPerformed(final ActionEvent e) {
+                if (Singletons.getControl().getState() != 1) { return; }
+                CDock.SINGLETON_INSTANCE.endTurn();
+            }
+        };
+
         //========== Instantiate shortcut objects and add to list.
         list.add(new Shortcut(FPref.SHORTCUT_SHOWSTACK, "Match: show stack panel", actShowStack, am, im));
         list.add(new Shortcut(FPref.SHORTCUT_SHOWCOMBAT, "Match: show combat panel", actShowCombat, am, im));
@@ -111,6 +120,7 @@ public class KeyboardShortcuts {
         list.add(new Shortcut(FPref.SHORTCUT_SHOWPLAYERS, "Match: show players panel", actShowPlayers, am, im));
         list.add(new Shortcut(FPref.SHORTCUT_SHOWDEV, "Match: show dev panel", actShowDev, am, im));
         list.add(new Shortcut(FPref.SHORTCUT_CONCEDE, "Match: concede game", actConcede, am, im));
+        list.add(new Shortcut(FPref.SHORTCUT_ENDTURN, "Match: pass priority until EOT or next stack event", actEndTurn, am, im));
         return list;
     } // End initMatchShortcuts()
 
diff --git a/src/main/java/forge/properties/ForgePreferences.java b/src/main/java/forge/properties/ForgePreferences.java
index 4b7fe5a247c..82a036002a0 100644
--- a/src/main/java/forge/properties/ForgePreferences.java
+++ b/src/main/java/forge/properties/ForgePreferences.java
@@ -113,7 +113,8 @@ public class ForgePreferences {
         SHORTCUT_SHOWCONSOLE ("76"), /** */
         SHORTCUT_SHOWPLAYERS ("80"), /** */
         SHORTCUT_SHOWDEV ("68"), /** */
-        SHORTCUT_CONCEDE ("17");
+        SHORTCUT_CONCEDE ("17"), /** */
+        SHORTCUT_ENDTURN ("69");
 
         private final String strDefaultVal;