Looks good, just one question (see my in line comment).
Also don't forget to regenerate the resource file and submit it in a separate
merge request (after this one has gone in)
Diff comments:
>
> === modified file 'openlp/core/ui/shortcutlistform.py'
> --- openlp/core/ui/shortcutlistform.py 2016-05-20 16:22:06 +0000
> +++ openlp/core/ui/shortcutlistform.py 2016-09-12 12:23:36 +0000
> @@ -426,11 +426,11 @@
> is_valid = False
> if not is_valid:
> text = translate('OpenLP.ShortcutListDialog',
> - 'The shortcut "{key}" is already assigned to
> another action, please'
> - ' use a different shortcut.'
> + 'The shortcut "{key}" is already assigned to
> another action,\n'
Whats the reason for this newline? It should wrap to fit the dialog!
> + 'please 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)
> self.dialog_was_shown = True
> return is_valid
>
--
https://code.launchpad.net/~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc/+merge/305465
Your team OpenLP Core is subscribed to branch lp:openlp.
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
