Merge branch 'shortcut' into 'master'

Configure Custom shortcut error fix

Closes #321

See merge request openlp/openlp!65
This commit is contained in:
Tim Bentley 2019-11-01 11:04:44 +00:00
commit 0c6c457a45

View File

@ -323,6 +323,13 @@ class ShortcutListForm(QtWidgets.QDialog, Ui_ShortcutListDialog, RegistryPropert
if not toggled:
return
action = self._current_item_action()
if action is None:
QtWidgets.QMessageBox.information(self, translate('OpenLP.ShortcutListForm', 'Select an Action'),
translate('OpenLP.ShortcutListForm', 'Select an action and click one '
'of the buttons below to start '
'capturing a new primary or alternate shortcut, respectively.'))
else:
shortcuts = self._action_shortcuts(action)
self.refresh_shortcut_list()
primary_button_text = ''