Fix mediaPlayer override ComboBox items case.

openlp/core/ui/media/mediacontroller.py

@@ -578,12 +578,13 @@ class MediaController(object):
                         video_list.append(item)
         return video_list
 
-    def override_player(self, override_player):
+    def override_player(self, override_player_index):
         playerSettings = str(QtCore.QSettings().value(u'media/players',
             QtCore.QVariant(u'webkit')).toString())
         usedPlayers = playerSettings.split(u',')
-        if override_player in usedPlayers:
-            self.overridenPlayer = override_player
+        if override_player_index >= 0 and \
+            override_player_index < len(usedPlayers):
+            self.overridenPlayer = usedPlayers[override_player_index]
         else:
             self.overridenPlayer = ''
 

openlp/core/ui/media/phononplayer.py

@@ -31,7 +31,7 @@ from datetime import datetime
 
 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.ui.media import MediaState
 

openlp/core/ui/media/vlcplayer.py

@@ -43,7 +43,7 @@ except OSError, e:
         raise
 
 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.ui.media import MediaState
 

openlp/core/ui/media/webkitplayer.py

@@ -27,7 +27,6 @@
 
 import logging
 
-from openlp.core.lib import translate
 from openlp.core.lib.mediaplayer import MediaPlayer
 from openlp.core.ui.media import MediaState
 

openlp/plugins/media/lib/mediaitem.py

@@ -104,7 +104,7 @@ class MediaMediaItem(MediaManagerItem):
         self.automatic = translate('MediaPlugin.MediaItem',
             'Automatic')
         self.displayTypeLabel.setText(
-            translate('MediaPlugin.MediaItem', 'Use Player:'))
+            translate('MediaPlugin.MediaItem', 'Use &Player:'))
 
     def requiredIcons(self):
         MediaManagerItem.requiredIcons(self)
@@ -142,8 +142,8 @@ class MediaMediaItem(MediaManagerItem):
             self.overridePlayerChanged)
 
     def overridePlayerChanged(self, index):
-        Receiver.send_message(u'media_override_player', \
-            u'%s' % self.displayTypeComboBox.currentText())
+        # index - 1, because the first item is "Automatic".
+        Receiver.send_message(u'media_override_player', index - 1)
 
     def onResetClick(self):
         """
@@ -249,8 +249,10 @@ class MediaMediaItem(MediaManagerItem):
         playerSettings = str(QtCore.QSettings().value(u'media/players',
             QtCore.QVariant(u'webkit')).toString())
         usedPlayers = playerSettings.split(u',')
-        for title in usedPlayers:
+        mediaPlayers = self.plugin.mediaController.mediaPlayers
+        for player in usedPlayers:
             # load the drop down selection
+            title = mediaPlayers[player].original_name
             self.displayTypeComboBox.addItem(title)
         if self.displayTypeComboBox.count() > 1:
             self.displayTypeComboBox.insertItem(0, self.automatic)