raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
Tim Bentley 2019-08-04 14:13:33 +01:00
parent a8af8a8d18
commit 24ab4f2cb1
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/core/ui/mainwindow.py
View File

@ -635,7 +635,9 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, LogMixin, RegistryPropert
# if self.live_controller.display.isVisible(): # if self.live_controller.display.isVisible():
# self.live_controller.display.setFocus() # self.live_controller.display.setFocus()
self.activateWindow() self.activateWindow()
# We will always have 1 but more need to be processed # We have -disable-web-security added by our code.
# If a file is passed in we will have that as well so count of 2
# If not we need to see if we want to use the previous file.so count of 1
if self.application.args and len(self.application.args) > 1: if self.application.args and len(self.application.args) > 1:
self.open_cmd_line_files(self.application.args) self.open_cmd_line_files(self.application.args)
elif Settings().value(self.general_settings_section + '/auto open'): elif Settings().value(self.general_settings_section + '/auto open'):

2
openlp/core/ui/servicemanager.py
View File

@ -829,7 +829,7 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi
self.auto_start_action.setIcon(UiIcons().inactive) self.auto_start_action.setIcon(UiIcons().inactive)
self.auto_start_action.setText(translate('OpenLP.ServiceManager', '&Auto Start - inactive')) self.auto_start_action.setText(translate('OpenLP.ServiceManager', '&Auto Start - inactive'))
if service_item['service_item'].is_text(): if service_item['service_item'].is_text():
for plugin in State().list_plugins(): for plugin in State().list_plugins():
if plugin.name == 'custom' and plugin.status == PluginStatus.Active: if plugin.name == 'custom' and plugin.status == PluginStatus.Active:
self.create_custom_action.setVisible(True) self.create_custom_action.setVisible(True)
break break

2
openlp/plugins/songs/forms/editsongform.py
View File

@ -417,7 +417,7 @@ class EditSongForm(QtWidgets.QDialog, Ui_EditSongDialog, RegistryProperties):
Load the media files into a combobox. Load the media files into a combobox.
""" """
self.from_media_button.setVisible(False) self.from_media_button.setVisible(False)
for plugin in State().list_plugins(): for plugin in State().list_plugins():
if plugin.name == 'media' and plugin.status == PluginStatus.Active: if plugin.name == 'media' and plugin.status == PluginStatus.Active:
self.from_media_button.setVisible(True) self.from_media_button.setVisible(True)
self.media_form.populate_files(plugin.media_item.get_list(MediaType.Audio)) self.media_form.populate_files(plugin.media_item.get_list(MediaType.Audio))