From 4cb3debb655c5ccf01b743d691d45fb86e1af936 Mon Sep 17 00:00:00 2001
From: Olli Suutari <suutari.olli@gmail.com>
Date: Thu, 11 Aug 2016 14:32:44 +0300
Subject: [PATCH] - Fixed bug: https://bugs.launchpad.net/openlp/+bug/1612187 -
 Changed the default hotkey for "Blank to Desktop" to "Esc", added "D" as an
 alternative shortcut. - Removed the default shortcut for "Escape item".

---
 openlp/core/common/settings.py     | 5 +++--
 openlp/core/ui/shortcutlistform.py | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/openlp/core/common/settings.py b/openlp/core/common/settings.py
index 2caf04dab..a53c55244 100644
--- a/openlp/core/common/settings.py
+++ b/openlp/core/common/settings.py
@@ -260,11 +260,12 @@ class Settings(QtCore.QSettings):
             'shortcuts/displayTagItem': [],
             'shortcuts/blankScreen': [QtGui.QKeySequence(QtCore.Qt.Key_Period)],
             'shortcuts/collapse': [QtGui.QKeySequence(QtCore.Qt.Key_Minus)],
-            'shortcuts/desktopScreen': [QtGui.QKeySequence(QtCore.Qt.Key_D)],
+            'shortcuts/desktopScreen': [QtGui.QKeySequence(QtCore.Qt.Key_Escape),
+                                           QtGui.QKeySequence(QtCore.Qt.Key_D)],
             'shortcuts/delete': [QtGui.QKeySequence(QtGui.QKeySequence.Delete)],
             'shortcuts/down': [QtGui.QKeySequence(QtCore.Qt.Key_Down)],
             'shortcuts/editSong': [],
-            'shortcuts/escapeItem': [QtGui.QKeySequence(QtCore.Qt.Key_Escape)],
+            'shortcuts/escapeItem': [],
             'shortcuts/expand': [QtGui.QKeySequence(QtCore.Qt.Key_Plus)],
             'shortcuts/exportThemeItem': [],
             'shortcuts/fileNewItem': [QtGui.QKeySequence(QtGui.QKeySequence.New)],
diff --git a/openlp/core/ui/shortcutlistform.py b/openlp/core/ui/shortcutlistform.py
index 1266d1cc4..e23fa0a27 100644
--- a/openlp/core/ui/shortcutlistform.py
+++ b/openlp/core/ui/shortcutlistform.py
@@ -430,7 +430,8 @@ class ShortcutListForm(QtWidgets.QDialog, Ui_ShortcutListDialog, RegistryPropert
                              ' use a different shortcut.'
                              ).format(key=self.get_shortcut_string(key_sequence))
             self.main_window.warning_message(translate('OpenLP.ShortcutListDialog', 'Duplicate Shortcut'),
-                                             text, for_display=True)
+                                             text)
+            for_display = True
             self.dialog_was_shown = True
         return is_valid