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

Added a few comments.

Browse Source
This commit is contained in:
Tomas Groth 2014-08-25 21:52:12 +01:00
parent c50619212d
commit 91f7b2d615
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -288,7 +288,7 @@ class ServiceItem(RegistryProperties):
:param path: The directory in which the image file is located. :param path: The directory in which the image file is located.
:param title: A title for the slide in the service item. :param title: A title for the slide in the service item.
:param background: :param background:
:param thumbnail: Optional alternative thumbnail :param thumbnail: Optional alternative thumbnail, used for remote thumbnails.
""" """
if background: if background:
self.image_border = background self.image_border = background

4
openlp/plugins/remotes/lib/httprouter.py
View File

@ -496,6 +496,7 @@ class HttpRouter(RegistryProperties):
if current_item: if current_item:
for index, frame in enumerate(current_item.get_frames()): for index, frame in enumerate(current_item.get_frames()):
item = {} item = {}
# Handle text (songs, custom)
if current_item.is_text(): if current_item.is_text():
if frame['verseTag']: if frame['verseTag']:
item['tag'] = str(frame['verseTag']) item['tag'] = str(frame['verseTag'])
@ -503,14 +504,15 @@ class HttpRouter(RegistryProperties):
item['tag'] = str(index + 1) item['tag'] = str(index + 1)
item['text'] = str(frame['text']) item['text'] = str(frame['text'])
item['html'] = str(frame['html']) item['html'] = str(frame['html'])
# Handle images, unless a custom thumbnail is given or if thumbnails is disabled
elif current_item.is_image() and not frame['image'] and Settings().value('remotes/thumbnails'): elif current_item.is_image() and not frame['image'] and Settings().value('remotes/thumbnails'):
# and not frame['title'].endswith('pdf') and not frame['title'].endswith('xps'):
item['tag'] = str(index + 1) item['tag'] = str(index + 1)
thumbnail_path = os.path.sep + os.path.join('images', 'thumbnails', frame['title']) thumbnail_path = os.path.sep + os.path.join('images', 'thumbnails', frame['title'])
item['img'] = urllib.request.pathname2url(thumbnail_path) item['img'] = urllib.request.pathname2url(thumbnail_path)
item['text'] = str(frame['title']) item['text'] = str(frame['title'])
item['html'] = str(frame['title']) item['html'] = str(frame['title'])
else: else:
# Handle presentation etc.
item['tag'] = str(index + 1) item['tag'] = str(index + 1)
if current_item.is_capable(ItemCapabilities.HasDisplayTitle): if current_item.is_capable(ItemCapabilities.HasDisplayTitle):
item['title'] = str(frame['display_title']) item['title'] = str(frame['display_title'])