Re: [Openlp-core] [Merge] lp:~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc into lp:openlp

2016-10-17 Thread Tomas Groth
Review: Approve


-- 
https://code.launchpad.net/~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc/+merge/308660
Your team OpenLP Core is subscribed to branch lp:openlp.

___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help   : https://help.launchpad.net/ListHelp


Re: [Openlp-core] [Merge] lp:~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc into lp:openlp

2016-10-17 Thread Tim Bentley
Review: Approve


-- 
https://code.launchpad.net/~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc/+merge/308660
Your team OpenLP Core is subscribed to branch lp:openlp.

___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help   : https://help.launchpad.net/ListHelp


Re: [Openlp-core] [Merge] lp:~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc into lp:openlp

2016-10-17 Thread Tim Bentley
Review: Needs Fixing

Sorry conflicts with trunk.

-- 
https://code.launchpad.net/~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc/+merge/307572
Your team OpenLP Core is subscribed to branch lp:openlp.

___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help   : https://help.launchpad.net/ListHelp


Re: [Openlp-core] [Merge] lp:~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc into lp:openlp

2016-10-17 Thread Tim Bentley
Review: Approve


-- 
https://code.launchpad.net/~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc/+merge/307572
Your team OpenLP Core is subscribed to branch lp:openlp.

___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help   : https://help.launchpad.net/ListHelp


Re: [Openlp-core] [Merge] lp:~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc into lp:openlp

2016-10-17 Thread Tomas Groth
Review: Approve


-- 
https://code.launchpad.net/~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc/+merge/307572
Your team OpenLP Core is subscribed to branch lp:openlp.

___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help   : https://help.launchpad.net/ListHelp


Re: [Openlp-core] [Merge] lp:~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc into lp:openlp

2016-09-30 Thread Phill
I've spoke to superfly, and he's happy with you adding the \n so looks good to 
me!
-- 
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 : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help   : https://help.launchpad.net/ListHelp


Re: [Openlp-core] [Merge] lp:~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc into lp:openlp

2016-09-28 Thread Phill
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.py2016-05-20 16:22:06 +
> +++ openlp/core/ui/shortcutlistform.py2016-09-12 12:23:36 +
> @@ -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 : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help   : https://help.launchpad.net/ListHelp


Re: [Openlp-core] [Merge] lp:~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc into lp:openlp

2016-09-02 Thread Tomas Groth
A new blank-only shortcut sounds great to me :-) 
-- 
https://code.launchpad.net/~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc/+merge/303995
Your team OpenLP Core is subscribed to branch lp:openlp.

___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help   : https://help.launchpad.net/ListHelp


Re: [Openlp-core] [Merge] lp:~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc into lp:openlp

2016-09-01 Thread Azaziah
> Looks good to me!
> The only thing that nags me is that pressing Esc will also unblank. In my
> perception of the world Esc should only exit something - not bring it back!
> If Tim and Raoul thinks it fine as it is, feel free to ignore me...

Good point which I hadn't thought of before.
Perhaps we should create a new shortkey which would 
only Blank to desktop but not unblank?
-- 
https://code.launchpad.net/~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc/+merge/303995
Your team OpenLP Core is subscribed to branch lp:openlp.

___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help   : https://help.launchpad.net/ListHelp


Re: [Openlp-core] [Merge] lp:~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc into lp:openlp

2016-09-01 Thread Tomas Groth
Review: Needs Information

Looks good to me!
The only thing that nags me is that pressing Esc will also unblank. In my 
perception of the world Esc should only exit something - not bring it back!
If Tim and Raoul thinks it fine as it is, feel free to ignore me...
-- 
https://code.launchpad.net/~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc/+merge/303995
Your team OpenLP Core is subscribed to branch lp:openlp.

___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help   : https://help.launchpad.net/ListHelp


Re: [Openlp-core] [Merge] lp:~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc into lp:openlp

2016-08-14 Thread Tim Bentley
Review: Needs Fixing

See below and tests would be nice.

Diff comments:

> 
> === modified file 'openlp/core/ui/shortcutlistform.py'
> --- openlp/core/ui/shortcutlistform.py2016-05-20 16:22:06 +
> +++ openlp/core/ui/shortcutlistform.py2016-08-14 21:23:25 +
> @@ -430,7 +430,8 @@
>   ' 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)

Please leave this as it is used by Remote to stop error messages being 
displayed.

> + text)
> +for_display = True
>  self.dialog_was_shown = True
>  return is_valid
>  


-- 
https://code.launchpad.net/~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc/+merge/302896
Your team OpenLP Core is subscribed to branch lp:openlp.

___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help   : https://help.launchpad.net/ListHelp