forked from openlp/openlp
Fix mediaPlayer override ComboBox items case.
This commit is contained in:
parent
67cd90d5bf
commit
f188e21391
|
@ -578,12 +578,13 @@ class MediaController(object):
|
||||||
video_list.append(item)
|
video_list.append(item)
|
||||||
return video_list
|
return video_list
|
||||||
|
|
||||||
def override_player(self, override_player):
|
def override_player(self, override_player_index):
|
||||||
playerSettings = str(QtCore.QSettings().value(u'media/players',
|
playerSettings = str(QtCore.QSettings().value(u'media/players',
|
||||||
QtCore.QVariant(u'webkit')).toString())
|
QtCore.QVariant(u'webkit')).toString())
|
||||||
usedPlayers = playerSettings.split(u',')
|
usedPlayers = playerSettings.split(u',')
|
||||||
if override_player in usedPlayers:
|
if override_player_index >= 0 and \
|
||||||
self.overridenPlayer = override_player
|
override_player_index < len(usedPlayers):
|
||||||
|
self.overridenPlayer = usedPlayers[override_player_index]
|
||||||
else:
|
else:
|
||||||
self.overridenPlayer = ''
|
self.overridenPlayer = ''
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ from datetime import datetime
|
||||||
|
|
||||||
from PyQt4.phonon import Phonon
|
from PyQt4.phonon import Phonon
|
||||||
|
|
||||||
from openlp.core.lib import Receiver, Translate
|
from openlp.core.lib import Receiver
|
||||||
from openlp.core.lib.mediaplayer import MediaPlayer
|
from openlp.core.lib.mediaplayer import MediaPlayer
|
||||||
from openlp.core.ui.media import MediaState
|
from openlp.core.ui.media import MediaState
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,7 @@ except OSError, e:
|
||||||
raise
|
raise
|
||||||
|
|
||||||
from PyQt4 import QtCore, QtGui
|
from PyQt4 import QtCore, QtGui
|
||||||
from openlp.core.lib import Receiver, translate
|
from openlp.core.lib import Receiver
|
||||||
from openlp.core.lib.mediaplayer import MediaPlayer
|
from openlp.core.lib.mediaplayer import MediaPlayer
|
||||||
from openlp.core.ui.media import MediaState
|
from openlp.core.ui.media import MediaState
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,6 @@
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
from openlp.core.lib import translate
|
|
||||||
from openlp.core.lib.mediaplayer import MediaPlayer
|
from openlp.core.lib.mediaplayer import MediaPlayer
|
||||||
from openlp.core.ui.media import MediaState
|
from openlp.core.ui.media import MediaState
|
||||||
|
|
||||||
|
|
|
@ -104,7 +104,7 @@ class MediaMediaItem(MediaManagerItem):
|
||||||
self.automatic = translate('MediaPlugin.MediaItem',
|
self.automatic = translate('MediaPlugin.MediaItem',
|
||||||
'Automatic')
|
'Automatic')
|
||||||
self.displayTypeLabel.setText(
|
self.displayTypeLabel.setText(
|
||||||
translate('MediaPlugin.MediaItem', 'Use Player:'))
|
translate('MediaPlugin.MediaItem', 'Use &Player:'))
|
||||||
|
|
||||||
def requiredIcons(self):
|
def requiredIcons(self):
|
||||||
MediaManagerItem.requiredIcons(self)
|
MediaManagerItem.requiredIcons(self)
|
||||||
|
@ -142,8 +142,8 @@ class MediaMediaItem(MediaManagerItem):
|
||||||
self.overridePlayerChanged)
|
self.overridePlayerChanged)
|
||||||
|
|
||||||
def overridePlayerChanged(self, index):
|
def overridePlayerChanged(self, index):
|
||||||
Receiver.send_message(u'media_override_player', \
|
# index - 1, because the first item is "Automatic".
|
||||||
u'%s' % self.displayTypeComboBox.currentText())
|
Receiver.send_message(u'media_override_player', index - 1)
|
||||||
|
|
||||||
def onResetClick(self):
|
def onResetClick(self):
|
||||||
"""
|
"""
|
||||||
|
@ -249,8 +249,10 @@ class MediaMediaItem(MediaManagerItem):
|
||||||
playerSettings = str(QtCore.QSettings().value(u'media/players',
|
playerSettings = str(QtCore.QSettings().value(u'media/players',
|
||||||
QtCore.QVariant(u'webkit')).toString())
|
QtCore.QVariant(u'webkit')).toString())
|
||||||
usedPlayers = playerSettings.split(u',')
|
usedPlayers = playerSettings.split(u',')
|
||||||
for title in usedPlayers:
|
mediaPlayers = self.plugin.mediaController.mediaPlayers
|
||||||
|
for player in usedPlayers:
|
||||||
# load the drop down selection
|
# load the drop down selection
|
||||||
|
title = mediaPlayers[player].original_name
|
||||||
self.displayTypeComboBox.addItem(title)
|
self.displayTypeComboBox.addItem(title)
|
||||||
if self.displayTypeComboBox.count() > 1:
|
if self.displayTypeComboBox.count() > 1:
|
||||||
self.displayTypeComboBox.insertItem(0, self.automatic)
|
self.displayTypeComboBox.insertItem(0, self.automatic)
|
||||||
|
|
Loading…
Reference in New Issue