diff --git a/openlp/core/ui/media/mediaplayer.py b/openlp/core/ui/media/mediaplayer.py
index 75f2c71d3..3a45aeb55 100644
--- a/openlp/core/ui/media/mediaplayer.py
+++ b/openlp/core/ui/media/mediaplayer.py
@@ -30,8 +30,8 @@ from openlp.core.ui.media import MediaState
class MediaPlayer(object):
"""
- This is the base class media Player class to provide OpenLP with a pluggable media display
- framework.
+ This is the base class media Player class to provide OpenLP with a
+ pluggable media display framework.
"""
def __init__(self, parent, name=u'media_player'):
@@ -136,3 +136,9 @@ class MediaPlayer(object):
Add html code to htmlbuilder
"""
return u''
+
+ def get_info(self):
+ """
+ Returns Information about the player
+ """
+ return u''
diff --git a/openlp/core/ui/media/phononplayer.py b/openlp/core/ui/media/phononplayer.py
index 1ab68e96a..4834e3e6f 100644
--- a/openlp/core/ui/media/phononplayer.py
+++ b/openlp/core/ui/media/phononplayer.py
@@ -33,7 +33,7 @@ from datetime import datetime
from PyQt4 import QtCore, QtGui
from PyQt4.phonon import Phonon
-from openlp.core.lib import Receiver
+from openlp.core.lib import Receiver, translate
from openlp.core.lib.settings import Settings
from openlp.core.ui.media import MediaState
@@ -230,3 +230,12 @@ class PhononPlayer(MediaPlayer):
background = unicode(QtGui.QColor(Settings().value(
u'players/background color', QtCore.QVariant(u'#000000'))).name())
return VIDEO_CSS % (background,background,background)
+
+ def get_info(self):
+ return(translate('Media.player', 'Phonon is a media player which '
+ 'interacts with the operating system to provide media capabilities'
+ '.') +
+ u'
' + translate('Media.player', 'Audio') +
+ u'
' + unicode(self.audio_extensions_list) +
+ u'
' + translate('Media.player', 'Video') +
+ u'
' + unicode(self.video_extensions_list) + u'
')
\ No newline at end of file
diff --git a/openlp/core/ui/media/playertab.py b/openlp/core/ui/media/playertab.py
index 7fb7c64f0..a688298bd 100644
--- a/openlp/core/ui/media/playertab.py
+++ b/openlp/core/ui/media/playertab.py
@@ -32,6 +32,7 @@ from openlp.core.lib import SettingsTab, translate, Receiver
from openlp.core.lib.ui import UiStrings, create_button
from openlp.core.lib.settings import Settings
from openlp.core.ui.media import get_media_players, set_media_players
+
class MediaQCheckBox(QtGui.QCheckBox):
"""
MediaQCheckBox adds an extra property, playerName to the QCheckBox class.
@@ -229,6 +230,7 @@ class PlayerTab(SettingsTab):
checkbox = MediaQCheckBox(self.mediaPlayerGroupBox)
checkbox.setEnabled(player.available)
checkbox.setObjectName(player.name + u'CheckBox')
+ checkbox.setToolTip(player.get_info())
self.playerCheckBoxes[player.name] = checkbox
QtCore.QObject.connect(checkbox,QtCore.SIGNAL(u'stateChanged(int)'),
self.onPlayerCheckBoxChanged)
diff --git a/openlp/core/ui/media/vlcplayer.py b/openlp/core/ui/media/vlcplayer.py
index 879bfca82..f7242b0a5 100644
--- a/openlp/core/ui/media/vlcplayer.py
+++ b/openlp/core/ui/media/vlcplayer.py
@@ -34,7 +34,7 @@ import sys
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import Receiver
+from openlp.core.lib import Receiver, translate
from openlp.core.lib.settings import Settings
from openlp.core.ui.media import MediaState
from openlp.core.ui.media.mediaplayer import MediaPlayer
@@ -231,3 +231,10 @@ class VlcPlayer(MediaPlayer):
controller.seekSlider.setSliderPosition( \
display.vlcMediaPlayer.get_time())
+ def get_info(self):
+ return(translate('Media.player', 'VLC is an external player which '
+ 'supports a number of different formats.') +
+ u'
' + translate('Media.player', 'Audio') +
+ u'
' + unicode(AUDIO_EXT) + u'
' +
+ translate('Media.player', 'Video') + u'
' +
+ unicode(VIDEO_EXT) + u'
')
\ No newline at end of file
diff --git a/openlp/core/ui/media/webkitplayer.py b/openlp/core/ui/media/webkitplayer.py
index d8abb994d..f0299fb9c 100644
--- a/openlp/core/ui/media/webkitplayer.py
+++ b/openlp/core/ui/media/webkitplayer.py
@@ -30,6 +30,7 @@ from PyQt4 import QtCore, QtGui
import logging
+from openlp.core.lib import translate
from openlp.core.ui.media import MediaState
from openlp.core.ui.media.mediaplayer import MediaPlayer
from openlp.core.lib.settings import Settings
@@ -438,3 +439,12 @@ class WebkitPlayer(MediaPlayer):
controller.seekSlider.setMaximum(length)
if not controller.seekSlider.isSliderDown():
controller.seekSlider.setSliderPosition(currentTime)
+
+ def get_info(self):
+ return(translate('Media.player', 'Webkit is a media player which runs '
+ 'inside a web browser. This player allows text over video to be '
+ 'rendered.') +
+ u'
' + translate('Media.player', 'Audio') +
+ u'
' + unicode(AUDIO_EXT) + u'
' +
+ translate('Media.player', 'Video') + u'
' +
+ unicode(VIDEO_EXT) + u'
')
\ No newline at end of file