From 464480fc341facaab40ecf69c9d675c2558c7173 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Thu, 18 Oct 2012 21:38:01 +0100 Subject: [PATCH] fix up settings tab --- openlp/core/lib/mediamanageritem.py | 2 ++ openlp/core/ui/media/playertab.py | 2 +- openlp/plugins/media/lib/mediaitem.py | 5 +++-- openlp/plugins/media/lib/mediatab.py | 3 ++- openlp/plugins/presentations/lib/presentationtab.py | 4 ++-- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py index 40c11ddb7..d0c64f497 100644 --- a/openlp/core/lib/mediamanageritem.py +++ b/openlp/core/lib/mediamanageritem.py @@ -519,6 +519,8 @@ class MediaManagerItem(QtGui.QWidget): if serviceItem: if not item_id: serviceItem.from_plugin = True + if remote: + serviceItem.will_auto_start = True self.plugin.liveController.addServiceItem(serviceItem) def createItemFromId(self, item_id): diff --git a/openlp/core/ui/media/playertab.py b/openlp/core/ui/media/playertab.py index a688298bd..85d3daa1c 100644 --- a/openlp/core/ui/media/playertab.py +++ b/openlp/core/ui/media/playertab.py @@ -216,7 +216,7 @@ class PlayerTab(SettingsTab): set_media_players(self.usedPlayers, override_player) player_string_changed = True if player_string_changed: - self.settingsForm.resetSupportedSuffixes() + self.parent.resetSupportedSuffixes() Receiver.send_message(u'mediaitem_media_rebuild') Receiver.send_message(u'config_screen_changed') diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index 0d4da5fbe..6cf46cd6e 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -245,8 +245,9 @@ class MediaMediaItem(MediaManagerItem): self.populateDisplayTypes() self.onNewFileMasks = unicode(translate('MediaPlugin.MediaItem', 'Videos (%s);;Audio (%s);;%s (*)')) % ( - u' '.join(self.plugin.video_extensions_list), - u' '.join(self.plugin.audio_extensions_list), UiStrings().AllFiles) + u' '.join(self.plugin.mediaController.video_extensions_list), + u' '.join(self.plugin.mediaController.audio_extensions_list), + UiStrings().AllFiles) def displaySetup(self): self.plugin.mediaController.setup_display( diff --git a/openlp/plugins/media/lib/mediatab.py b/openlp/plugins/media/lib/mediatab.py index 52fdef4bb..7ad70e595 100644 --- a/openlp/plugins/media/lib/mediatab.py +++ b/openlp/plugins/media/lib/mediatab.py @@ -46,6 +46,7 @@ class MediaTab(SettingsTab): MediaTab is the Media settings tab in the settings dialog. """ def __init__(self, parent, title, visible_title, icon_path): + self.parent = parent SettingsTab.__init__(self, parent, title, visible_title, icon_path) def setupUi(self): @@ -96,6 +97,6 @@ class MediaTab(SettingsTab): Settings().setValue(setting_key, QtCore.QVariant(self.autoStartCheckBox.checkState())) if override_changed: - self.settingsForm.resetSupportedSuffixes() + self.parent.resetSupportedSuffixes() Receiver.send_message(u'mediaitem_media_rebuild') Receiver.send_message(u'mediaitem_suffexes') \ No newline at end of file diff --git a/openlp/plugins/presentations/lib/presentationtab.py b/openlp/plugins/presentations/lib/presentationtab.py index bf6d020f9..51829861e 100644 --- a/openlp/plugins/presentations/lib/presentationtab.py +++ b/openlp/plugins/presentations/lib/presentationtab.py @@ -40,7 +40,7 @@ class PresentationTab(SettingsTab): """ Constructor """ - self.settingsForm = parent + self.parent = parent self.controllers = controllers SettingsTab.__init__(self, parent, title, visible_title, icon_path) self.activated = False @@ -142,7 +142,7 @@ class PresentationTab(SettingsTab): QtCore.QVariant(self.OverrideAppCheckBox.checkState())) changed = True if changed: - self.settingsForm.resetSupportedSuffixes() + self.parent.resetSupportedSuffixes() Receiver.send_message(u'mediaitem_presentation_rebuild') Receiver.send_message(u'mediaitem_suffexes')