forked from openlp/openlp
tidy ups
This commit is contained in:
parent
9f7725573d
commit
f2ef685cf1
@ -320,7 +320,6 @@ class MediaController(object):
|
|||||||
display.hasAudio = False
|
display.hasAudio = False
|
||||||
for player in self.mediaPlayers.values():
|
for player in self.mediaPlayers.values():
|
||||||
if player.isActive:
|
if player.isActive:
|
||||||
print "z"
|
|
||||||
player.setup(display)
|
player.setup(display)
|
||||||
|
|
||||||
def set_controls_visible(self, controller, value):
|
def set_controls_visible(self, controller, value):
|
||||||
|
@ -103,13 +103,11 @@ class VlcPlayer(MediaPlayer):
|
|||||||
self.original_name = u'VLC'
|
self.original_name = u'VLC'
|
||||||
self.display_name = u'&VLC'
|
self.display_name = u'&VLC'
|
||||||
self.parent = parent
|
self.parent = parent
|
||||||
print "p",parent
|
|
||||||
self.canFolder = True
|
self.canFolder = True
|
||||||
self.audio_extensions_list = AUDIO_EXT
|
self.audio_extensions_list = AUDIO_EXT
|
||||||
self.video_extensions_list = VIDEO_EXT
|
self.video_extensions_list = VIDEO_EXT
|
||||||
|
|
||||||
def setup(self, display):
|
def setup(self, display):
|
||||||
print "D",display
|
|
||||||
display.vlcWidget = QtGui.QFrame(display)
|
display.vlcWidget = QtGui.QFrame(display)
|
||||||
display.vlcWidget.setFrameStyle(QtGui.QFrame.NoFrame)
|
display.vlcWidget.setFrameStyle(QtGui.QFrame.NoFrame)
|
||||||
# creating a basic vlc instance
|
# creating a basic vlc instance
|
||||||
|
@ -53,7 +53,7 @@ class TestServiceItem(TestCase):
|
|||||||
assert len(service_item._display_frames) is 0, u'A blank Service Item'
|
assert len(service_item._display_frames) is 0, u'A blank Service Item'
|
||||||
service_item.render(True)
|
service_item.render(True)
|
||||||
|
|
||||||
#THEN: We should should have a page of output.
|
#THEN: We should have a page of output.
|
||||||
assert len(service_item._display_frames) is 1, u'A valid rendered Service Item has display frames'
|
assert len(service_item._display_frames) is 1, u'A valid rendered Service Item has display frames'
|
||||||
assert service_item.get_rendered_frame(0) == VERSE.split(u'\n')[0], u'A valid render'
|
assert service_item.get_rendered_frame(0) == VERSE.split(u'\n')[0], u'A valid render'
|
||||||
|
|
||||||
@ -74,14 +74,14 @@ class TestServiceItem(TestCase):
|
|||||||
assert service_item.is_valid is True, u'A valid Service Item'
|
assert service_item.is_valid is True, u'A valid Service Item'
|
||||||
assert len(service_item._display_frames) is 0, u'A blank Service Item'
|
assert len(service_item._display_frames) is 0, u'A blank Service Item'
|
||||||
|
|
||||||
#THEN: We should should have a page of output.
|
#THEN: We should have a page of output.
|
||||||
assert len(service_item._raw_frames) is 1, u'A valid rendered Service Item has display frames'
|
assert len(service_item._raw_frames) is 1, u'A valid rendered Service Item has display frames'
|
||||||
assert service_item.get_rendered_frame(0) == u'resources/church.jpg'
|
assert service_item.get_rendered_frame(0) == u'resources/church.jpg'
|
||||||
|
|
||||||
#WHEN: adding a second image to a service item
|
#WHEN: adding a second image to a service item
|
||||||
service_item.add_from_image(u'resources/church.jpg', u'Image1 Title')
|
service_item.add_from_image(u'resources/church.jpg', u'Image1 Title')
|
||||||
|
|
||||||
#THEN: We should should have an increased page of output.
|
#THEN: We should have an increased page of output.
|
||||||
assert len(service_item._raw_frames) is 2, u'A valid rendered Service Item has display frames'
|
assert len(service_item._raw_frames) is 2, u'A valid rendered Service Item has display frames'
|
||||||
assert service_item.get_rendered_frame(0) == u'resources/church.jpg'
|
assert service_item.get_rendered_frame(0) == u'resources/church.jpg'
|
||||||
assert service_item.get_rendered_frame(0) == service_item.get_rendered_frame(1)
|
assert service_item.get_rendered_frame(0) == service_item.get_rendered_frame(1)
|
||||||
@ -89,7 +89,7 @@ class TestServiceItem(TestCase):
|
|||||||
#When requesting a saved service item
|
#When requesting a saved service item
|
||||||
service = service_item.get_service_repr(True)
|
service = service_item.get_service_repr(True)
|
||||||
|
|
||||||
#THEN: We should should have two parts of the service.
|
#THEN: We should have two parts of the service.
|
||||||
assert len(service) is 2, u'A saved service has two parts'
|
assert len(service) is 2, u'A saved service has two parts'
|
||||||
assert service[u'header'][u'name'] == u'test' , u'A test plugin'
|
assert service[u'header'][u'name'] == u'test' , u'A test plugin'
|
||||||
assert service[u'data'][0][u'title'] == u'Image Title' , u'The first title name '
|
assert service[u'data'][0][u'title'] == u'Image Title' , u'The first title name '
|
||||||
@ -129,14 +129,14 @@ class TestServiceItem(TestCase):
|
|||||||
assert service_item.is_valid is True, u'A valid Service Item'
|
assert service_item.is_valid is True, u'A valid Service Item'
|
||||||
assert len(service_item._display_frames) is 0, u'A blank Service Item'
|
assert len(service_item._display_frames) is 0, u'A blank Service Item'
|
||||||
|
|
||||||
#THEN: We should should have a page of output.
|
#THEN: We should have a page of output.
|
||||||
assert len(service_item._raw_frames) is 1, u'A valid rendered Service Item has display frames'
|
assert len(service_item._raw_frames) is 1, u'A valid rendered Service Item has display frames'
|
||||||
assert service_item.get_rendered_frame(0) == u'resources/church.jpg'
|
assert service_item.get_rendered_frame(0) == u'resources/church.jpg'
|
||||||
|
|
||||||
#When requesting a saved service item
|
#When requesting a saved service item
|
||||||
service = service_item.get_service_repr(True)
|
service = service_item.get_service_repr(True)
|
||||||
|
|
||||||
#THEN: We should should have two parts of the service.
|
#THEN: We should have two parts of the service.
|
||||||
assert len(service) is 2, u'A saved service has two parts'
|
assert len(service) is 2, u'A saved service has two parts'
|
||||||
assert service[u'header'][u'name'] == u'test' , u'A test plugin'
|
assert service[u'header'][u'name'] == u'test' , u'A test plugin'
|
||||||
assert service[u'data'][0][u'title'] == u'church.jpg' , u'The first title name '
|
assert service[u'data'][0][u'title'] == u'church.jpg' , u'The first title name '
|
||||||
|
Loading…
Reference in New Issue
Block a user