diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index 8da5967a1..39f69dda6 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -236,18 +236,18 @@ class Renderer(object): # the first two slides (and neglect the last for now). if len(slides) == 3: html_text = expand_tags(u'\n'.join(slides[:2])) - # We check both slides to determine if the virtual break is - # needed (there is only one virtual break). + # We check both slides to determine if the optional break is + # needed (there is only one optional break). else: html_text = expand_tags(u'\n'.join(slides)) html_text = html_text.replace(u'\n', u'
') if self._text_fits_on_slide(html_text): - # The first two virtual slides fit (as a whole) on one + # The first two optional slides fit (as a whole) on one # slide. Replace the first occurrence of [---]. text = text.replace(u'\n[---]', u'', 1) else: - # The first virtual slide fits, which means we have to - # render the first virtual slide. + # The first optional slide fits, which means we have to + # render the first optional slide. text_contains_break = u'[---]' in text if text_contains_break: try: @@ -364,7 +364,7 @@ class Renderer(object): self.web.setVisible(False) self.web.resize(self.page_width, self.page_height) self.web_frame = self.web.page().mainFrame() - # Adjust width and height to account for shadow. outline done in css + # Adjust width and height to account for shadow. outline done in css. html = u""" @@ -39,7 +40,7 @@ "go_live": "${go_live}", "add_to_service": "${add_to_service}", "no_results": "${no_results}", - "back": "${back}" + "home": "${home}" } @@ -58,71 +59,79 @@
-
- ${back} +
+ ${home}

${service_manager}

${refresh} -
-
-
- ${blank} - ${show} -
-
- ${prev} - ${next} +
+
-
+
-
- ${back} +
+ ${home}

${slide_controller}

${refresh} -
-
- -
-
+
- ${back} + ${home}

${alerts}

+
+ +
@@ -133,9 +142,17 @@