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

fix up settings tab

Browse Source
This commit is contained in:
Tim Bentley 2012-10-18 21:38:01 +01:00
parent 057a1fe415
commit 464480fc34
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/lib/mediamanageritem.py
View File

@ -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):

2
openlp/core/ui/media/playertab.py
View File

@ -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')

5
openlp/plugins/media/lib/mediaitem.py
View File

@ -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(

3
openlp/plugins/media/lib/mediatab.py
View File

@ -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')

4
openlp/plugins/presentations/lib/presentationtab.py
View File

@ -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')