openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Review: Needs Fixing

Looks fine and does not show up on my machine (Linux).
Needs a respin as will have a conflict with previous merge.

Diff comments:

> 
> === modified file 'openlp/plugins/media/lib/mediaitem.py'
> --- openlp/plugins/media/lib/mediaitem.py	2016-08-03 21:19:14 +0000
> +++ openlp/plugins/media/lib/mediaitem.py	2016-11-25 23:57:58 +0000
> @@ -150,7 +150,8 @@
>                                                                triggers=self.on_replace_click)
>          if 'webkit' not in get_media_players()[0]:
>              self.replace_action.setDisabled(True)
> -            self.replace_action_context.setDisabled(True)

Clash with head as just merged other code.

> +            if hasattr(self, 'replace_action_context'):
> +                self.replace_action_context.setDisabled(True)
>          self.reset_action = self.toolbar.add_toolbar_action('reset_action', icon=':/system/system_close.png',
>                                                              visible=False, triggers=self.on_reset_click)
>          self.media_widget = QtWidgets.QWidget(self)


-- 
https://code.launchpad.net/~raoul-snyman/openlp/pyro-impress/+merge/311866
Your team OpenLP Core is subscribed to branch lp:openlp.