openlp-core team mailing list archive

[Phill <phill.ridout@xxxxxxxxx>]

Review: Needs Fixing

See inlines

Diff comments:

> 
> === modified file 'openlp/core/ui/mainwindow.py'
> --- openlp/core/ui/mainwindow.py	2019-07-01 22:36:14 +0000
> +++ openlp/core/ui/mainwindow.py	2019-08-04 08:10:26 +0000
> @@ -635,7 +635,8 @@
>          # if self.live_controller.display.isVisible():
>          #     self.live_controller.display.setFocus()
>          self.activateWindow()
> -        if self.application.args:
> +        # We will always have 1 but more need to be processed

are you sure about this? Cause it looks like we're removing the application name https://bazaar.launchpad.net/~openlp-core/openlp/trunk/view/head:/openlp/core/app.py#L96

> +        if self.application.args and len(self.application.args) > 1:
>              self.open_cmd_line_files(self.application.args)
>          elif Settings().value(self.general_settings_section + '/auto open'):
>              self.service_manager_contents.load_last_file()
> 
> === modified file 'openlp/core/ui/servicemanager.py'
> --- openlp/core/ui/servicemanager.py	2019-06-11 18:40:20 +0000
> +++ openlp/core/ui/servicemanager.py	2019-08-04 08:10:26 +0000
> @@ -828,7 +829,7 @@
>                  self.auto_start_action.setIcon(UiIcons().inactive)
>                  self.auto_start_action.setText(translate('OpenLP.ServiceManager', '&Auto Start - inactive'))
>          if service_item['service_item'].is_text():
> -            for plugin in self.plugin_manager.plugins:
> +            for plugin in  State().list_plugins():

extra space between "in  State()"

>                  if plugin.name == 'custom' and plugin.status == PluginStatus.Active:
>                      self.create_custom_action.setVisible(True)
>                      break
> 
> === modified file 'openlp/plugins/songs/forms/editsongform.py'
> --- openlp/plugins/songs/forms/editsongform.py	2019-05-22 06:47:00 +0000
> +++ openlp/plugins/songs/forms/editsongform.py	2019-08-04 08:10:26 +0000
> @@ -416,7 +417,7 @@
>          Load the media files into a combobox.
>          """
>          self.from_media_button.setVisible(False)
> -        for plugin in self.plugin_manager.plugins:
> +        for plugin in  State().list_plugins():

extra space here too "in  State()"

>              if plugin.name == 'media' and plugin.status == PluginStatus.Active:
>                  self.from_media_button.setVisible(True)
>                  self.media_form.populate_files(plugin.media_item.get_list(MediaType.Audio))


-- 
https://code.launchpad.net/~trb143/openlp/alpha_fixes/+merge/370934
Your team OpenLP Core is subscribed to branch lp:openlp.