From 445c63ce8b848712e16efc72d444192e6971fab5 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sun, 12 Jun 2011 20:38:04 +0200
Subject: [PATCH 01/29]

---
 openlp/core/lib/renderer.py    | 162 ++++++++++++++++++---------------
 openlp/core/lib/serviceitem.py |   4 +
 2 files changed, 95 insertions(+), 71 deletions(-)

diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index f9af00f6e..decf30435 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -324,34 +324,28 @@ class Renderer(object):
 
         """
         log.debug(u'_paginate_slide - Start')
-        line_end = u''
+        line_end = u' '
         if line_break:
             line_end = u'<br>'
         formatted = []
+        raw_text = u''
         html_text = u''
-        styled_text = u''
-        line_count = 0
-        for line in lines:
-            if line_count != -1:
-                line_count += 1
-            styled_line = expand_tags(line) + line_end
-            styled_text += styled_line
-            html = self.page_shell + styled_text + HTML_END
-            self.web.setHtml(html)
-            # Text too long so go to next page.
-            if self.web_frame.contentsSize().height() > self.page_height:
-                if force_page and line_count > 0:
-                    Receiver.send_message(u'theme_line_count', line_count - 1)
-                line_count = -1
-                while html_text.endswith(u'<br>'):
-                    html_text = html_text[:-4]
-                formatted.append(html_text)
-                html_text = u''
-                styled_text = styled_line
-            html_text += line + line_end
-        while html_text.endswith(u'<br>'):
-            html_text = html_text[:-4]
-        formatted.append(html_text)
+        html_words = map(expand_tags, lines)
+        html = self.page_shell + u''.join(html_words) + HTML_END
+        self.web.setHtml(html)
+        # Text too long so go to next page.
+        if self.web_frame.contentsSize().height() > self.page_height:
+            lines = [u'%s<br>' % line for line in lines]
+            html_text, raw_text, index = self._binary_chop(
+                formatted, html_text, raw_text, lines, line_end)
+            if force_page:
+                Receiver.send_message(u'theme_line_count', index + 1)
+        else:
+            formatted.append(line_end.join(html_words))
+        while raw_text.endswith(u'<br>'):
+            raw_text = raw_text[:-4]
+        if raw_text:
+            formatted.append(raw_text)
         log.debug(u'_paginate_slide - End')
         return formatted
 
@@ -408,53 +402,8 @@ class Renderer(object):
                 # Figure out how many words of the line will fit on screen by
                 # using the algorithm known as "binary chop".
                 raw_words = self._words_split(line)
-                html_words = [expand_tags(word) for word in raw_words]
-                smallest_index = 0
-                highest_index = len(html_words) - 1
-                index = int(highest_index / 2)
-                while True:
-                    html = self.page_shell + previous_html + \
-                        u''.join(html_words[:index + 1]).strip() + HTML_END
-                    self.web.setHtml(html)
-                    if self.web_frame.contentsSize().height() > \
-                        self.page_height:
-                        # We know that it does not fit, so change/calculate the
-                        # new index and highest_index accordingly.
-                        highest_index = index
-                        index = int(index - (index - smallest_index) / 2)
-                    else:
-                        smallest_index = index
-                        index = int(index + (highest_index - index) / 2)
-                    # We found the number of words which will fit.
-                    if smallest_index == index or highest_index == index:
-                        index = smallest_index
-                        formatted.append(previous_raw.rstrip(u'<br>') +
-                            u''.join(raw_words[:index + 1]))
-                        previous_html = u''
-                        previous_raw = u''
-                    else:
-                        continue
-                    # Check if the rest of the line fits on the slide. If it
-                    # does we do not have to do the much more intensive "word by
-                    # word" checking.
-                    html = self.page_shell + \
-                        u''.join(html_words[index + 1:]).strip() + HTML_END
-                    self.web.setHtml(html)
-                    if self.web_frame.contentsSize().height() <= \
-                        self.page_height:
-                        previous_html = \
-                            u''.join(html_words[index + 1:]).strip() + line_end
-                        previous_raw = \
-                            u''.join(raw_words[index + 1:]).strip() + line_end
-                        break
-                    else:
-                        # The other words do not fit, thus reset the indexes,
-                        # create a new list and continue with "word by word".
-                        raw_words = raw_words[index + 1:]
-                        html_words = html_words[index + 1:]
-                        smallest_index = 0
-                        highest_index = len(html_words) - 1
-                        index = int(highest_index / 2)
+                previous_html, previous_raw, index = self._binary_chop(
+                    formatted, previous_html, previous_raw, raw_words, line_end, u'<br>')
             else:
                 previous_html += styled_line + line_end
                 previous_raw += line + line_end
@@ -464,6 +413,77 @@ class Renderer(object):
         log.debug(u'_paginate_slide_words - End')
         return formatted
 
+    def _binary_chop(self, formatted, previous_html, previous_raw, raw_text,
+        line_end):
+        """
+        This implements the binary chop algorithm for faster rendering. However,
+        it is assumed that this method is **only** called, when the text to be
+        rendered does not fit as a whole.
+
+        ``formatted``
+            The list of slides.
+
+        ``previous_html``
+            The html text which is know to fit on a slide, but is not yet added
+            to the list of slides.
+
+        ``previous_raw``
+            The raw text (with display tags) which is know to fit on a slide,
+            but is not yet added to the list of slides.
+
+        ``raw_text``
+            The text which does not fit on a slide and needs to be processed
+            using the binary chop. The text can contain display tags.
+
+        ``line_end``
+            The
+        """
+        html_words = map(expand_tags, raw_text)
+        smallest_index = 0
+        highest_index = len(html_words) - 1
+        index = int(highest_index / 2)
+        while True:
+            html = self.page_shell + previous_html + \
+                separator.join(html_words[:index + 1]).strip() + HTML_END
+            self.web.setHtml(html)
+            if self.web_frame.contentsSize().height() > self.page_height:
+                # We know that it does not fit, so change/calculate the
+                # new index and highest_index accordingly.
+                highest_index = index
+                index = int(index - (index - smallest_index) / 2)
+            else:
+                smallest_index = index
+                index = int(index + (highest_index - index) / 2)
+            # We found the number of words which will fit.
+            if smallest_index == index or highest_index == index:
+                index = smallest_index
+                formatted.append(previous_raw.rstrip(u'<br>') +
+                    u''.join(raw_text[:index + 1]))
+                previous_html = u''
+                previous_raw = u''
+            else:
+                continue
+            # Check if the rest of the line fits on the slide. If it
+            # does we do not have to do the much more intensive "word by
+            # word" checking.
+            html = self.page_shell + \
+                u''.join(html_words[index + 1:]).strip() + HTML_END
+            self.web.setHtml(html)
+            if self.web_frame.contentsSize().height() <= self.page_height:
+                previous_html = \
+                    u''.join(html_words[index + 1:]).strip() + line_end
+                previous_raw = u''.join(raw_text[index + 1:]).strip() + line_end
+                break
+            else:
+                # The other words do not fit, thus reset the indexes,
+                # create a new list and continue with "word by word".
+                raw_text = raw_text[index + 1:]
+                html_words = html_words[index + 1:]
+                smallest_index = 0
+                highest_index = len(html_words) - 1
+                index = int(highest_index / 2)
+        return previous_html, previous_raw, index
+
     def _words_split(self, line):
         """
         Split the slide up by word so can wrap better
diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index cf682abc6..62d29d8be 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -172,6 +172,9 @@ class ServiceItem(object):
         self.themedata = self.renderer.theme_data
         if self.service_item_type == ServiceItemType.Text:
             log.debug(u'Formatting slides')
+            import time
+            import datetime
+            start = time.time()
             for slide in self._raw_frames:
                 formatted = self.renderer \
                     .format_slide(slide[u'raw_slide'], line_break, self)
@@ -184,6 +187,7 @@ class ServiceItem(object):
                         u'html': html.replace(u'&amp;nbsp;', u'&nbsp;'),
                         u'verseTag': slide[u'verseTag']
                     })
+            print unicode(datetime.timedelta(seconds=time.time() - start))
         elif self.service_item_type == ServiceItemType.Image or \
             self.service_item_type == ServiceItemType.Command:
             pass

From d7ea2183426fc5e437312a41014cf224412ffeac Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 13 Jun 2011 10:16:50 +0200
Subject: [PATCH 02/29] clean ups

---
 openlp/core/lib/renderer.py    | 55 ++++++++++++++++------------------
 openlp/core/lib/serviceitem.py |  6 ++--
 2 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 6d921f509..d25fb0aae 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -206,20 +206,24 @@ class Renderer(object):
             self._calculate_default(self.screens.current[u'size'])
             return preview
 
-    def format_slide(self, text, line_break, item):
+    def format_slide(self, text, item):
         """
         Calculate how much text can fit on a slide.
 
         ``text``
             The words to go on the slides.
 
-        ``line_break``
-            Add line endings after each line of text used for bibles.
+        ``item``
+            The service item object.
         """
         log.debug(u'format slide')
+        # Add line endings after each line of text used for bibles.
+        line_end = u'<br>'
+        if item.is_capable(ItemCapabilities.NoLineBreaks):
+            line_end = u' '
         # clean up line endings
         lines = self._lines_split(text)
-        pages = self._paginate_slide(lines, line_break, self.force_page)
+        pages = self._paginate_slide(lines, line_end)
         if len(pages) > 1:
             # Songs and Custom
             if item.is_capable(ItemCapabilities.AllowsVirtualSplit):
@@ -228,12 +232,11 @@ class Renderer(object):
                 pages = []
                 for slide in slides:
                     lines = slide.strip(u'\n').split(u'\n')
-                    new_pages = self._paginate_slide(lines, line_break,
-                        self.force_page)
+                    new_pages = self._paginate_slide(lines, line_end)
                     pages.extend(new_pages)
             # Bibles
             elif item.is_capable(ItemCapabilities.AllowsWordSplit):
-                pages = self._paginate_slide_words(text, line_break)
+                pages = self._paginate_slide_words(text, line_end)
         return pages
 
     def _calculate_default(self, screen):
@@ -241,7 +244,7 @@ class Renderer(object):
         Calculate the default dimentions of the screen.
 
         ``screen``
-            The QSize of the screen.
+            The screen to calculate the default of.
         """
         log.debug(u'_calculate default %s', screen)
         self.width = screen.width()
@@ -308,25 +311,19 @@ class Renderer(object):
             (build_lyrics_format_css(self.theme_data, self.page_width,
             self.page_height), build_lyrics_outline_css(self.theme_data))
 
-    def _paginate_slide(self, lines, line_break, force_page=False):
+    def _paginate_slide(self, lines, line_end):
         """
         Figure out how much text can appear on a slide, using the current
         theme settings.
 
         ``lines``
-            The words to be fitted on the slide split into lines.
+            The text to be fitted on the slide split into lines.
 
-        ``line_break``
+        ``line_end``
             Add line endings after each line of text (used for bibles).
-
-        ``force_page``
-            Flag to tell message lines in page.
-
         """
         log.debug(u'_paginate_slide - Start')
-        line_end = u''
-        if line_break:
-            line_end = u'<br>'
+        #print line_end
         formatted = []
         previous_html = u''
         previous_raw = u''
@@ -336,11 +333,8 @@ class Renderer(object):
         self.web.setHtml(html)
         # Text too long so go to next page.
         if self.web_frame.contentsSize().height() > self.page_height:
-            html_text, previous_raw, index = self._binary_chop(
-                formatted, previous_html, previous_raw, html_lines, lines,
-                line_end)
-            if force_page:
-                Receiver.send_message(u'theme_line_count', index + 1)
+            html_text, previous_raw = self._binary_chop(formatted,
+                previous_html, previous_raw, html_lines, lines, line_end)
         else:
             previous_raw = u''.join(lines)
         while previous_raw.endswith(u'<br>'):
@@ -350,7 +344,7 @@ class Renderer(object):
         log.debug(u'_paginate_slide - End')
         return formatted
 
-    def _paginate_slide_words(self, text, line_break):
+    def _paginate_slide_words(self, text, line_end):
         """
         Figure out how much text can appear on a slide, using the current
         theme settings. This version is to handle text which needs to be split
@@ -359,14 +353,11 @@ class Renderer(object):
         ``text``
             The words to be fitted on the slide split into lines.
 
-        ``line_break``
+        ``line_end``
             Add line endings after each line of text used for bibles.
 
         """
         log.debug(u'_paginate_slide_words - Start')
-        line_end = u' '
-        if line_break:
-            line_end = u'<br>'
         formatted = []
         previous_html = u''
         previous_raw = u''
@@ -404,7 +395,7 @@ class Renderer(object):
                 # using the algorithm known as "binary chop".
                 raw_words = self._words_split(line)
                 html_words = map(expand_tags, raw_text)
-                previous_html, previous_raw, index = self._binary_chop(
+                previous_html, previous_raw = self._binary_chop(
                     formatted, previous_html, previous_raw, html_words,
                     raw_words, line_end)
             else:
@@ -466,6 +457,10 @@ class Renderer(object):
                     u''.join(raw_list[:index + 1]))
                 previous_html = u''
                 previous_raw = u''
+                # Stop here as the theme line count was requested.
+                if self.force_page:
+                    Receiver.send_message(u'theme_line_count', index + 1)
+                    break
             else:
                 continue
             # Check if the rest of the line fits on the slide. If it
@@ -487,7 +482,7 @@ class Renderer(object):
                 smallest_index = 0
                 highest_index = len(html_list) - 1
                 index = int(highest_index / 2)
-        return previous_html, previous_raw, index
+        return previous_html, previous_raw
 
     def _words_split(self, line):
         """
diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index 1eb1a908b..6a8ba81c4 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -165,7 +165,6 @@ class ServiceItem(object):
         log.debug(u'Render called')
         self._display_frames = []
         self.bg_image_bytes = None
-        line_break = not self.is_capable(ItemCapabilities.NoLineBreaks)
         theme = self.theme if self.theme else None
         self.main, self.footer = \
             self.renderer.set_override_theme(theme, use_override)
@@ -176,9 +175,8 @@ class ServiceItem(object):
             import datetime
             start = time.time()
             for slide in self._raw_frames:
-                formatted = self.renderer \
-                    .format_slide(slide[u'raw_slide'], line_break, self)
-                for page in formatted:
+                pages = self.renderer.format_slide(slide[u'raw_slide'], self)
+                for page in pages:
                     page = page.replace(u'<br>', u'{br}')
                     html = expand_tags(cgi.escape(page.rstrip()))
                     self._display_frames.append({

From ded49f74a3e7951a77e01460b17068ebd5919842 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 13 Jun 2011 11:05:22 +0200
Subject: [PATCH 03/29] clean ups

---
 openlp/core/lib/renderer.py | 39 +++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index d25fb0aae..b6061d474 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -214,7 +214,7 @@ class Renderer(object):
             The words to go on the slides.
 
         ``item``
-            The service item object.
+            The :class:`~openlp.core.lib.serviceitem` item object.
         """
         log.debug(u'format slide')
         # Add line endings after each line of text used for bibles.
@@ -232,12 +232,16 @@ class Renderer(object):
                 pages = []
                 for slide in slides:
                     lines = slide.strip(u'\n').split(u'\n')
-                    new_pages = self._paginate_slide(lines, line_end)
-                    pages.extend(new_pages)
+                    pages.extend(self._paginate_slide(lines, line_end))
             # Bibles
             elif item.is_capable(ItemCapabilities.AllowsWordSplit):
                 pages = self._paginate_slide_words(text, line_end)
-        return pages
+        new_pages = []
+        for page in pages:
+            while page.endswith(u'<br>'):
+                page = page[:-4]
+            new_pages.append(page)
+        return new_pages
 
     def _calculate_default(self, screen):
         """
@@ -320,10 +324,9 @@ class Renderer(object):
             The text to be fitted on the slide split into lines.
 
         ``line_end``
-            Add line endings after each line of text (used for bibles).
+            The text added after each line. Either ``u' '`` or ``u'<br>``.
         """
         log.debug(u'_paginate_slide - Start')
-        #print line_end
         formatted = []
         previous_html = u''
         previous_raw = u''
@@ -337,8 +340,6 @@ class Renderer(object):
                 previous_html, previous_raw, html_lines, lines, line_end)
         else:
             previous_raw = u''.join(lines)
-        while previous_raw.endswith(u'<br>'):
-            previous_raw = previous_raw[:-4]
         if previous_raw:
             formatted.append(previous_raw)
         log.debug(u'_paginate_slide - End')
@@ -354,8 +355,8 @@ class Renderer(object):
             The words to be fitted on the slide split into lines.
 
         ``line_end``
-            Add line endings after each line of text used for bibles.
-
+            The text added after each line. Either ``u' '`` or ``u'<br>``. This
+            is needed for bibles.
         """
         log.debug(u'_paginate_slide_words - Start')
         formatted = []
@@ -364,8 +365,8 @@ class Renderer(object):
         lines = text.split(u'\n')
         for line in lines:
             line = line.strip()
-            styled_line = expand_tags(line)
-            html = self.page_shell + previous_html + styled_line + HTML_END
+            html_line = expand_tags(line)
+            html = self.page_shell + previous_html + html_line + HTML_END
             self.web.setHtml(html)
             # Text too long so go to next page.
             if self.web_frame.contentsSize().height() > self.page_height:
@@ -376,33 +377,29 @@ class Renderer(object):
                     self.web.setHtml(html)
                     if self.web_frame.contentsSize().height() <= \
                         self.page_height:
-                        while previous_raw.endswith(u'<br>'):
-                            previous_raw = previous_raw[:-4]
                         formatted.append(previous_raw)
                         previous_html = u''
                         previous_raw = u''
-                        html = self.page_shell + styled_line + HTML_END
+                        html = self.page_shell + html_line + HTML_END
                         self.web.setHtml(html)
                         # Now check if the current verse will fit, if it does
                         # not we have to start to process the verse word by
                         # word.
                         if self.web_frame.contentsSize().height() <= \
                             self.page_height:
-                            previous_html = styled_line + line_end
+                            previous_html = html_line + line_end
                             previous_raw = line + line_end
                             continue
-                # Figure out how many words of the line will fit on screen by
-                # using the algorithm known as "binary chop".
+                # Figure out how many words of the line will fit on screen as
+                # the line will not fit as a whole.
                 raw_words = self._words_split(line)
                 html_words = map(expand_tags, raw_text)
                 previous_html, previous_raw = self._binary_chop(
                     formatted, previous_html, previous_raw, html_words,
                     raw_words, line_end)
             else:
-                previous_html += styled_line + line_end
+                previous_html += html_line + line_end
                 previous_raw += line + line_end
-        while previous_raw.endswith(u'<br>'):
-            previous_raw = previous_raw[:-4]
         formatted.append(previous_raw)
         log.debug(u'_paginate_slide_words - End')
         return formatted

From 772c36ed19a0b26ae79fbf42987875b04be059ac Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 13 Jun 2011 11:47:18 +0200
Subject: [PATCH 04/29] more clean ups, doc

---
 openlp/core/lib/renderer.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index b6061d474..28bd8c513 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -101,7 +101,7 @@ class Renderer(object):
             The global-level theme to be set.
 
         ``theme_level``
-            Defaults to *``ThemeLevel.Global``*. The theme level, can be
+            Defaults to ``ThemeLevel.Global``. The theme level, can be
             ``ThemeLevel.Global``, ``ThemeLevel.Service`` or
             ``ThemeLevel.Song``.
         """
@@ -205,6 +205,7 @@ class Renderer(object):
             # Reset the real screen size for subsequent render requests
             self._calculate_default(self.screens.current[u'size'])
             return preview
+        self.force_page = False
 
     def format_slide(self, text, item):
         """
@@ -214,7 +215,7 @@ class Renderer(object):
             The words to go on the slides.
 
         ``item``
-            The :class:`~openlp.core.lib.serviceitem` item object.
+            The :class:`~openlp.core.lib.serviceitem.ServiceItem` item object.
         """
         log.debug(u'format slide')
         # Add line endings after each line of text used for bibles.
@@ -423,14 +424,16 @@ class Renderer(object):
             but is not yet added to the list of slides. (unicode string)
 
         ``html_list``
-
+            The text which does not fit on a slide and needs to be processed
+            using the binary chop. The text contains html.
 
         ``raw_list``
             The text which does not fit on a slide and needs to be processed
             using the binary chop. The text can contain display tags.
 
         ``line_end``
-            The
+            The text added after each line. Either ``u' '`` or ``u'<br>``. This
+            is needed for bibles.
         """
         smallest_index = 0
         highest_index = len(html_list) - 1

From f4c00009ed7da61375a903d3831909f0c2e9d0b2 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 13 Jun 2011 13:20:47 +0200
Subject: [PATCH 05/29] made _binary_shop less 'word by word' specific

---
 openlp/core/lib/renderer.py | 38 ++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 28bd8c513..5c80ce71c 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -331,16 +331,16 @@ class Renderer(object):
         formatted = []
         previous_html = u''
         previous_raw = u''
-        lines = [u'%s<br>' % line for line in lines]
+        separator = u'<br>'
         html_lines = map(expand_tags, lines)
-        html = self.page_shell + u''.join(html_lines) + HTML_END
+        html = self.page_shell + separator.join(html_lines) + HTML_END
         self.web.setHtml(html)
         # Text too long so go to next page.
         if self.web_frame.contentsSize().height() > self.page_height:
             html_text, previous_raw = self._binary_chop(formatted,
-                previous_html, previous_raw, html_lines, lines, line_end)
+                previous_html, previous_raw, html_lines, lines, separator, u'')
         else:
-            previous_raw = u''.join(lines)
+            previous_raw = separator.join(lines)
         if previous_raw:
             formatted.append(previous_raw)
         log.debug(u'_paginate_slide - End')
@@ -394,10 +394,10 @@ class Renderer(object):
                 # Figure out how many words of the line will fit on screen as
                 # the line will not fit as a whole.
                 raw_words = self._words_split(line)
-                html_words = map(expand_tags, raw_text)
+                html_words = map(expand_tags, raw_words)
                 previous_html, previous_raw = self._binary_chop(
                     formatted, previous_html, previous_raw, html_words,
-                    raw_words, line_end)
+                    raw_words, u' ', line_end)
             else:
                 previous_html += html_line + line_end
                 previous_raw += line + line_end
@@ -406,7 +406,7 @@ class Renderer(object):
         return formatted
 
     def _binary_chop(self, formatted, previous_html, previous_raw, html_list,
-        raw_list, line_end):
+        raw_list, separator, line_end):
         """
         This implements the binary chop algorithm for faster rendering. However,
         it is assumed that this method is **only** called, when the text to be
@@ -431,16 +431,20 @@ class Renderer(object):
             The text which does not fit on a slide and needs to be processed
             using the binary chop. The text can contain display tags.
 
+        ``separator``
+            The separator for the elements. For lines this is `u'<br>'`` and for
+            words this is u' '.
+
         ``line_end``
-            The text added after each line. Either ``u' '`` or ``u'<br>``. This
-            is needed for bibles.
+            The text added after each "element line". Either ``u' '`` or
+            ``u'<br>``. This is needed for bibles.
         """
         smallest_index = 0
         highest_index = len(html_list) - 1
         index = int(highest_index / 2)
         while True:
             html = self.page_shell + previous_html + \
-                u''.join(html_list[:index + 1]).strip() + HTML_END
+                separator.join(html_list[:index + 1]).strip() + HTML_END
             self.web.setHtml(html)
             if self.web_frame.contentsSize().height() > self.page_height:
                 # We know that it does not fit, so change/calculate the
@@ -454,7 +458,7 @@ class Renderer(object):
             if smallest_index == index or highest_index == index:
                 index = smallest_index
                 formatted.append(previous_raw.rstrip(u'<br>') +
-                    u''.join(raw_list[:index + 1]))
+                    separator.join(raw_list[:index + 1]))
                 previous_html = u''
                 previous_raw = u''
                 # Stop here as the theme line count was requested.
@@ -467,12 +471,13 @@ class Renderer(object):
             # does we do not have to do the much more intensive "word by
             # word" checking.
             html = self.page_shell + \
-                u''.join(html_list[index + 1:]).strip() + HTML_END
+                separator.join(html_list[index + 1:]).strip() + HTML_END
             self.web.setHtml(html)
             if self.web_frame.contentsSize().height() <= self.page_height:
-                previous_html = \
-                    u''.join(html_list[index + 1:]).strip() + line_end
-                previous_raw = u''.join(raw_list[index + 1:]).strip() + line_end
+                previous_html = separator.join(
+                    html_list[index + 1:]).strip() + line_end
+                previous_raw = separator.join(
+                    raw_list[index + 1:]).strip() + line_end
                 break
             else:
                 # The other words do not fit, thus reset the indexes,
@@ -490,8 +495,7 @@ class Renderer(object):
         """
         # this parse we are to be wordy
         line = line.replace(u'\n', u' ')
-        words = line.split(u' ')
-        return [word + u' ' for word in words]
+        return line.split(u' ')
 
     def _lines_split(self, text):
         """

From f22e1385be9422e8178a6590d612522431f00a8d Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 13 Jun 2011 13:26:06 +0200
Subject: [PATCH 06/29] _paginate_slide_words detects long verses itself

---
 openlp/core/lib/renderer.py | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 5c80ce71c..a6db56614 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -222,21 +222,23 @@ class Renderer(object):
         line_end = u'<br>'
         if item.is_capable(ItemCapabilities.NoLineBreaks):
             line_end = u' '
-        # clean up line endings
-        lines = self._lines_split(text)
-        pages = self._paginate_slide(lines, line_end)
-        if len(pages) > 1:
-            # Songs and Custom
-            if item.is_capable(ItemCapabilities.AllowsVirtualSplit):
-                # Do not forget the line breaks !
-                slides = text.split(u'[---]')
-                pages = []
-                for slide in slides:
-                    lines = slide.strip(u'\n').split(u'\n')
-                    pages.extend(self._paginate_slide(lines, line_end))
-            # Bibles
-            elif item.is_capable(ItemCapabilities.AllowsWordSplit):
-                pages = self._paginate_slide_words(text, line_end)
+        # Bibles
+        if item.is_capable(ItemCapabilities.AllowsWordSplit):
+            pages = self._paginate_slide_words(text, line_end)
+        else:
+            # Clean up line endings.
+            lines = self._lines_split(text)
+            pages = self._paginate_slide(lines, line_end)
+            #TODO: Maybe move the detection to _paginate_slide.
+            if len(pages) > 1:
+                # Songs and Custom
+                if item.is_capable(ItemCapabilities.AllowsVirtualSplit):
+                    # Do not forget the line breaks!
+                    slides = text.split(u'[---]')
+                    pages = []
+                    for slide in slides:
+                        lines = slide.strip(u'\n').split(u'\n')
+                        pages.extend(self._paginate_slide(lines, line_end))
         new_pages = []
         for page in pages:
             while page.endswith(u'<br>'):

From 9b10c81e7b7afac4c17105f93fe8ea3dee2f0d78 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 13 Jun 2011 14:59:52 +0200
Subject: [PATCH 07/29] comments

---
 openlp/core/lib/renderer.py | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index a6db56614..04f8f0404 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -229,7 +229,6 @@ class Renderer(object):
             # Clean up line endings.
             lines = self._lines_split(text)
             pages = self._paginate_slide(lines, line_end)
-            #TODO: Maybe move the detection to _paginate_slide.
             if len(pages) > 1:
                 # Songs and Custom
                 if item.is_capable(ItemCapabilities.AllowsVirtualSplit):
@@ -410,12 +409,13 @@ class Renderer(object):
     def _binary_chop(self, formatted, previous_html, previous_raw, html_list,
         raw_list, separator, line_end):
         """
-        This implements the binary chop algorithm for faster rendering. However,
-        it is assumed that this method is **only** called, when the text to be
-        rendered does not fit as a whole.
+        This implements the binary chop algorithm for faster rendering. This
+        algorithm works line based (line by line) and word based (word by word).
+        It is assumed that this method is **only** called, when the lines/words to be
+        rendered do not fit as a whole.
 
         ``formatted``
-            The list of slides.
+            The list to append any slides.
 
         ``previous_html``
             The html text which is know to fit on a slide, but is not yet added
@@ -426,12 +426,12 @@ class Renderer(object):
             but is not yet added to the list of slides. (unicode string)
 
         ``html_list``
-            The text which does not fit on a slide and needs to be processed
+            The elements which do not fit on a slide and needs to be processed
             using the binary chop. The text contains html.
 
         ``raw_list``
-            The text which does not fit on a slide and needs to be processed
-            using the binary chop. The text can contain display tags.
+            The elements which do not fit on a slide and needs to be processed
+            using the binary chop. The elements can contain display tags.
 
         ``separator``
             The separator for the elements. For lines this is `u'<br>'`` and for
@@ -469,9 +469,7 @@ class Renderer(object):
                     break
             else:
                 continue
-            # Check if the rest of the line fits on the slide. If it
-            # does we do not have to do the much more intensive "word by
-            # word" checking.
+            # Check if the remaining elements fit on the slide.
             html = self.page_shell + \
                 separator.join(html_list[index + 1:]).strip() + HTML_END
             self.web.setHtml(html)
@@ -482,8 +480,8 @@ class Renderer(object):
                     raw_list[index + 1:]).strip() + line_end
                 break
             else:
-                # The other words do not fit, thus reset the indexes,
-                # create a new list and continue with "word by word".
+                # The remaining elements do not fit, thus reset the indexes,
+                # create a new list and continue.
                 raw_list = raw_list[index + 1:]
                 html_list = html_list[index + 1:]
                 smallest_index = 0

From 24e737fa99d2d078c6154f15f2756d9983dbca0d Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 13 Jun 2011 16:36:18 +0200
Subject: [PATCH 08/29] fixed long line

---
 openlp/core/lib/renderer.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 04f8f0404..1ec6edfa6 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -73,6 +73,8 @@ class Renderer(object):
         self.screens = ScreenList.get_instance()
         self.service_theme = u''
         self.theme_level = u''
+        self._binary_chop(
+        )
         self.override_background = None
         self.theme_data = None
         self.bg_frame = None
@@ -411,8 +413,8 @@ class Renderer(object):
         """
         This implements the binary chop algorithm for faster rendering. This
         algorithm works line based (line by line) and word based (word by word).
-        It is assumed that this method is **only** called, when the lines/words to be
-        rendered do not fit as a whole.
+        It is assumed that this method is **only** called, when the lines/words
+        to be rendered do not fit as a whole.
 
         ``formatted``
             The list to append any slides.

From 254cf20b9fbed6814b7e3eb11e08581e1429e64e Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 13 Jun 2011 16:41:52 +0200
Subject: [PATCH 09/29] fixed non sense

---
 openlp/core/lib/renderer.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 1ec6edfa6..696d49095 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -73,8 +73,6 @@ class Renderer(object):
         self.screens = ScreenList.get_instance()
         self.service_theme = u''
         self.theme_level = u''
-        self._binary_chop(
-        )
         self.override_background = None
         self.theme_data = None
         self.bg_frame = None

From 7d5e349602727d8ccfb9a3b47b37e2ada46a7cf5 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 13 Jun 2011 17:19:49 +0200
Subject: [PATCH 10/29] removed test lines

---
 openlp/core/lib/serviceitem.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index 6a8ba81c4..fa1b4b92b 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -171,9 +171,6 @@ class ServiceItem(object):
         self.themedata = self.renderer.theme_data
         if self.service_item_type == ServiceItemType.Text:
             log.debug(u'Formatting slides')
-            import time
-            import datetime
-            start = time.time()
             for slide in self._raw_frames:
                 pages = self.renderer.format_slide(slide[u'raw_slide'], self)
                 for page in pages:
@@ -185,7 +182,6 @@ class ServiceItem(object):
                         u'html': html.replace(u'&amp;nbsp;', u'&nbsp;'),
                         u'verseTag': slide[u'verseTag']
                     })
-            print unicode(datetime.timedelta(seconds=time.time() - start))
         elif self.service_item_type == ServiceItemType.Image or \
             self.service_item_type == ServiceItemType.Command:
             pass

From bd6733eef13f63e0d6a82aced981051ae0942cb5 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Tue, 14 Jun 2011 08:58:49 +0200
Subject: [PATCH 11/29] we can replace before splitting

---
 openlp/core/lib/renderer.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 696d49095..a8f4e842f 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -503,5 +503,5 @@ class Renderer(object):
         """
         # this parse we do not want to use this so remove it
         text = text.replace(u'\n[---]', u'')
-        lines = text.split(u'\n')
-        return [line.replace(u'[---]', u'') for line in lines]
+        text = text.replace(u'[---]', u'')
+        return text.split(u'\n')

From 4d20334cce1d24d65732c5fb4178c12962badbed Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Thu, 23 Jun 2011 15:32:32 +0200
Subject: [PATCH 12/29] changed instance variable to camelCase as the class is
 Qt based

---
 openlp/core/lib/renderer.py    | 14 +++++++-------
 openlp/core/lib/serviceitem.py |  2 +-
 openlp/core/ui/maindisplay.py  | 14 +++++++-------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index a8f4e842f..7c3189789 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -56,11 +56,11 @@ class Renderer(object):
     """
     log.info(u'Renderer Loaded')
 
-    def __init__(self, image_manager, theme_manager):
+    def __init__(self, imageManager, theme_manager):
         """
         Initialise the render manager.
 
-    ``image_manager``
+    ``imageManager``
         A ImageManager instance which takes care of e. g. caching and resizing
         images.
 
@@ -69,7 +69,7 @@ class Renderer(object):
         """
         log.debug(u'Initialisation started')
         self.theme_manager = theme_manager
-        self.image_manager = image_manager
+        self.imageManager = imageManager
         self.screens = ScreenList.get_instance()
         self.service_theme = u''
         self.theme_level = u''
@@ -77,7 +77,7 @@ class Renderer(object):
         self.theme_data = None
         self.bg_frame = None
         self.force_page = False
-        self.display = MainDisplay(None, self.image_manager, False)
+        self.display = MainDisplay(None, self.imageManager, False)
         self.display.setup()
 
     def update_display(self):
@@ -88,7 +88,7 @@ class Renderer(object):
         self._calculate_default(self.screens.current[u'size'])
         if self.display:
             self.display.close()
-        self.display = MainDisplay(None, self.image_manager, False)
+        self.display = MainDisplay(None, self.imageManager, False)
         self.display.setup()
         self.bg_frame = None
         self.theme_data = None
@@ -167,7 +167,7 @@ class Renderer(object):
         self._build_text_rectangle(self.theme_data)
         # if No file do not update cache
         if self.theme_data.background_filename:
-            self.image_manager.add_image(self.theme_data.theme_name,
+            self.imageManager.add_image(self.theme_data.theme_name,
                 self.theme_data.background_filename)
         return self._rect, self._rect_footer
 
@@ -193,7 +193,7 @@ class Renderer(object):
             # make big page for theme edit dialog to get line count
             serviceItem.add_from_text(u'', VERSE + VERSE + VERSE)
         else:
-            self.image_manager.del_image(theme_data.theme_name)
+            self.imageManager.del_image(theme_data.theme_name)
             serviceItem.add_from_text(u'', VERSE)
         serviceItem.renderer = self
         serviceItem.raw_footer = FOOTER
diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index ced78ad68..2ab09dbeb 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -208,7 +208,7 @@ class ServiceItem(object):
         """
         self.service_item_type = ServiceItemType.Image
         self._raw_frames.append({u'title': title, u'path': path})
-        self.renderer.image_manager.add_image(title, path)
+        self.renderer.imageManager.add_image(title, path)
         self._new_item()
 
     def add_from_text(self, title, raw_slide, verse_tag=None):
diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index b661b1e49..1b9098816 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -48,13 +48,13 @@ class MainDisplay(QtGui.QGraphicsView):
     """
     This is the display screen.
     """
-    def __init__(self, parent, image_manager, live):
+    def __init__(self, parent, imageManager, live):
         if live:
             QtGui.QGraphicsView.__init__(self)
         else:
             QtGui.QGraphicsView.__init__(self, parent)
         self.isLive = live
-        self.image_manager = image_manager
+        self.imageManager = imageManager
         self.screens = ScreenList.get_instance()
         self.alertTab = None
         self.hideMode = None
@@ -232,7 +232,7 @@ class MainDisplay(QtGui.QGraphicsView):
         """
         API for replacement backgrounds so Images are added directly to cache
         """
-        self.image_manager.add_image(name, path)
+        self.imageManager.add_image(name, path)
         self.image(name)
         if hasattr(self, u'serviceItem'):
             self.override[u'image'] = name
@@ -247,7 +247,7 @@ class MainDisplay(QtGui.QGraphicsView):
             The name of the image to be displayed
         """
         log.debug(u'image to display')
-        image = self.image_manager.get_image_bytes(name)
+        image = self.imageManager.get_image_bytes(name)
         self.resetVideo()
         self.displayImage(image)
         return self.preview()
@@ -477,13 +477,13 @@ class MainDisplay(QtGui.QGraphicsView):
                 self.override = {}
             else:
                 # replace the background
-                background = self.image_manager. \
+                background = self.imageManager. \
                     get_image_bytes(self.override[u'image'])
         if self.serviceItem.themedata.background_filename:
-            self.serviceItem.bg_image_bytes = self.image_manager. \
+            self.serviceItem.bg_image_bytes = self.imageManager. \
                 get_image_bytes(self.serviceItem.themedata.theme_name)
         if image:
-            image_bytes = self.image_manager.get_image_bytes(image)
+            image_bytes = self.imageManager.get_image_bytes(image)
         else:
             image_bytes = None
         html = build_html(self.serviceItem, self.screen, self.alertTab,

From 39caaca8d95e10feb86a69ac37171e41664583f8 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Thu, 23 Jun 2011 16:34:43 +0200
Subject: [PATCH 13/29] comment fixes

---
 openlp/core/lib/renderer.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 7c3189789..11653533c 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -412,7 +412,7 @@ class Renderer(object):
         This implements the binary chop algorithm for faster rendering. This
         algorithm works line based (line by line) and word based (word by word).
         It is assumed that this method is **only** called, when the lines/words
-        to be rendered do not fit as a whole.
+        to be rendered do **not** fit as a whole.
 
         ``formatted``
             The list to append any slides.
@@ -434,8 +434,8 @@ class Renderer(object):
             using the binary chop. The elements can contain display tags.
 
         ``separator``
-            The separator for the elements. For lines this is `u'<br>'`` and for
-            words this is u' '.
+            The separator for the elements. For lines this is ``u'<br>'`` and
+            for words this is ``u' '``.
 
         ``line_end``
             The text added after each "element line". Either ``u' '`` or

From 74d2b2d25c7d43dd84dc16383b114bef0726855f Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 27 Jun 2011 13:44:57 +0200
Subject: [PATCH 14/29] replaced <br> by <br />

---
 openlp/core/lib/__init__.py    |  2 +-
 openlp/core/lib/renderer.py    | 16 ++++++++--------
 openlp/core/lib/serviceitem.py |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py
index 7fbd5243c..187226272 100644
--- a/openlp/core/lib/__init__.py
+++ b/openlp/core/lib/__init__.py
@@ -202,7 +202,7 @@ def clean_tags(text):
     """
     Remove Tags from text for display
     """
-    text = text.replace(u'<br>', u'\n')
+    text = text.replace(u'<br />', u'\n')
     text = text.replace(u'{br}', u'\n')
     text = text.replace(u'&nbsp;', u' ')
     for tag in DisplayTags.get_html_tags():
diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 11653533c..3832cb75c 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -219,7 +219,7 @@ class Renderer(object):
         """
         log.debug(u'format slide')
         # Add line endings after each line of text used for bibles.
-        line_end = u'<br>'
+        line_end = u'<br />'
         if item.is_capable(ItemCapabilities.NoLineBreaks):
             line_end = u' '
         # Bibles
@@ -240,7 +240,7 @@ class Renderer(object):
                         pages.extend(self._paginate_slide(lines, line_end))
         new_pages = []
         for page in pages:
-            while page.endswith(u'<br>'):
+            while page.endswith(u'<br />'):
                 page = page[:-4]
             new_pages.append(page)
         return new_pages
@@ -326,13 +326,13 @@ class Renderer(object):
             The text to be fitted on the slide split into lines.
 
         ``line_end``
-            The text added after each line. Either ``u' '`` or ``u'<br>``.
+            The text added after each line. Either ``u' '`` or ``u'<br />``.
         """
         log.debug(u'_paginate_slide - Start')
         formatted = []
         previous_html = u''
         previous_raw = u''
-        separator = u'<br>'
+        separator = u'<br />'
         html_lines = map(expand_tags, lines)
         html = self.page_shell + separator.join(html_lines) + HTML_END
         self.web.setHtml(html)
@@ -357,7 +357,7 @@ class Renderer(object):
             The words to be fitted on the slide split into lines.
 
         ``line_end``
-            The text added after each line. Either ``u' '`` or ``u'<br>``. This
+            The text added after each line. Either ``u' '`` or ``u'<br />``. This
             is needed for bibles.
         """
         log.debug(u'_paginate_slide_words - Start')
@@ -434,12 +434,12 @@ class Renderer(object):
             using the binary chop. The elements can contain display tags.
 
         ``separator``
-            The separator for the elements. For lines this is ``u'<br>'`` and
+            The separator for the elements. For lines this is ``u'<br />'`` and
             for words this is ``u' '``.
 
         ``line_end``
             The text added after each "element line". Either ``u' '`` or
-            ``u'<br>``. This is needed for bibles.
+            ``u'<br />``. This is needed for bibles.
         """
         smallest_index = 0
         highest_index = len(html_list) - 1
@@ -459,7 +459,7 @@ class Renderer(object):
             # We found the number of words which will fit.
             if smallest_index == index or highest_index == index:
                 index = smallest_index
-                formatted.append(previous_raw.rstrip(u'<br>') +
+                formatted.append(previous_raw.rstrip(u'<br />') +
                     separator.join(raw_list[:index + 1]))
                 previous_html = u''
                 previous_raw = u''
diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index 2ab09dbeb..e5a6c4033 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -174,7 +174,7 @@ class ServiceItem(object):
             for slide in self._raw_frames:
                 pages = self.renderer.format_slide(slide[u'raw_slide'], self)
                 for page in pages:
-                    page = page.replace(u'<br>', u'{br}')
+                    page = page.replace(u'<br />', u'{br}')
                     html = expand_tags(cgi.escape(page.rstrip()))
                     self._display_frames.append({
                         u'title': clean_tags(page),
@@ -194,7 +194,7 @@ class ServiceItem(object):
         if self.raw_footer is None:
             self.raw_footer = []
         self.foot_text = \
-            u'<br>'.join([footer for footer in self.raw_footer if footer])
+            u'<br />'.join([footer for footer in self.raw_footer if footer])
 
     def add_from_image(self, path, title):
         """

From 86c0eea4733fdd2d79f92fa38c1cd93e58d0f263 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 27 Jun 2011 13:51:25 +0200
Subject: [PATCH 15/29] changed theme_manager to themeManager as it is Qt based

---
 openlp/core/lib/renderer.py                | 10 +++++-----
 openlp/plugins/songs/forms/editsongform.py |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 3832cb75c..2b20900a9 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -56,7 +56,7 @@ class Renderer(object):
     """
     log.info(u'Renderer Loaded')
 
-    def __init__(self, imageManager, theme_manager):
+    def __init__(self, imageManager, themeManager):
         """
         Initialise the render manager.
 
@@ -64,11 +64,11 @@ class Renderer(object):
         A ImageManager instance which takes care of e. g. caching and resizing
         images.
 
-    ``theme_manager``
+    ``themeManager``
         The ThemeManager instance, used to get the current theme details.
         """
         log.debug(u'Initialisation started')
-        self.theme_manager = theme_manager
+        self.themeManager = themeManager
         self.imageManager = imageManager
         self.screens = ScreenList.get_instance()
         self.service_theme = u''
@@ -108,7 +108,7 @@ class Renderer(object):
         self.global_theme = global_theme
         self.theme_level = theme_level
         self.global_theme_data = \
-            self.theme_manager.getThemeData(self.global_theme)
+            self.themeManager.getThemeData(self.global_theme)
         self.theme_data = None
 
     def set_service_theme(self, service_theme):
@@ -162,7 +162,7 @@ class Renderer(object):
         if override_levels:
             self.theme_data = override_theme
         else:
-            self.theme_data = self.theme_manager.getThemeData(theme)
+            self.theme_data = self.themeManager.getThemeData(theme)
         self._calculate_default(self.screens.current[u'size'])
         self._build_text_rectangle(self.theme_data)
         # if No file do not update cache
diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py
index 05c891a55..171564b24 100644
--- a/openlp/plugins/songs/forms/editsongform.py
+++ b/openlp/plugins/songs/forms/editsongform.py
@@ -90,7 +90,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
             self.onVerseListViewPressed)
         QtCore.QObject.connect(self.themeAddButton,
             QtCore.SIGNAL(u'clicked()'),
-            self.mediaitem.plugin.renderer.theme_manager.onAddTheme)
+            self.mediaitem.plugin.renderer.themeManager.onAddTheme)
         QtCore.QObject.connect(self.maintenanceButton,
             QtCore.SIGNAL(u'clicked()'), self.onMaintenanceButtonClicked)
         QtCore.QObject.connect(Receiver.get_receiver(),

From 95743de19f5a76196ae36b396dc1b53a69b26e0f Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Wed, 29 Jun 2011 09:38:04 +0200
Subject: [PATCH 16/29] more html fixes

---
 openlp/core/lib/displaytags.py | 2 +-
 openlp/core/lib/renderer.py    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/openlp/core/lib/displaytags.py b/openlp/core/lib/displaytags.py
index 95ce13bda..addab4d75 100644
--- a/openlp/core/lib/displaytags.py
+++ b/openlp/core/lib/displaytags.py
@@ -111,7 +111,7 @@ class DisplayTags(object):
             u'start html': u'<span style="text-decoration: underline;">',
             u'end tag': u'{/u}', u'end html': u'</span>', u'protected': True})
         base_tags.append({u'desc': translate('OpenLP.DisplayTags', 'Break'),
-            u'start tag': u'{br}', u'start html': u'<br>', u'end tag': u'',
+            u'start tag': u'{br}', u'start html': u'<br />', u'end tag': u'',
             u'end html': u'', u'protected': True})
         DisplayTags.add_html_tags(base_tags)
 
diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 2b20900a9..4f4a3e4c9 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -241,7 +241,7 @@ class Renderer(object):
         new_pages = []
         for page in pages:
             while page.endswith(u'<br />'):
-                page = page[:-4]
+                page = page[:-6]
             new_pages.append(page)
         return new_pages
 
@@ -357,8 +357,8 @@ class Renderer(object):
             The words to be fitted on the slide split into lines.
 
         ``line_end``
-            The text added after each line. Either ``u' '`` or ``u'<br />``. This
-            is needed for bibles.
+            The text added after each line. Either ``u' '`` or ``u'<br />``.
+            This is needed for bibles.
         """
         log.debug(u'_paginate_slide_words - Start')
         formatted = []

From 47e43404aaab2684f0fe2cfb19db01784289df28 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sat, 16 Jul 2011 11:00:30 +0200
Subject: [PATCH 17/29] - added doctype to html - added encoding to html -
 changed <br /> to <br> - removed obsolete language attribute

---
 openlp/core/lib/__init__.py        |  2 +-
 openlp/core/lib/displaytags.py     |  2 +-
 openlp/core/lib/htmlbuilder.py     |  8 ++++--
 openlp/core/lib/renderer.py        | 45 +++++++++++++++++++++---------
 openlp/core/lib/serviceitem.py     |  6 ++--
 openlp/core/ui/printserviceform.py |  2 +-
 openlp/core/ui/servicemanager.py   |  2 +-
 7 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py
index 187226272..7fbd5243c 100644
--- a/openlp/core/lib/__init__.py
+++ b/openlp/core/lib/__init__.py
@@ -202,7 +202,7 @@ def clean_tags(text):
     """
     Remove Tags from text for display
     """
-    text = text.replace(u'<br />', u'\n')
+    text = text.replace(u'<br>', u'\n')
     text = text.replace(u'{br}', u'\n')
     text = text.replace(u'&nbsp;', u' ')
     for tag in DisplayTags.get_html_tags():
diff --git a/openlp/core/lib/displaytags.py b/openlp/core/lib/displaytags.py
index addab4d75..95ce13bda 100644
--- a/openlp/core/lib/displaytags.py
+++ b/openlp/core/lib/displaytags.py
@@ -111,7 +111,7 @@ class DisplayTags(object):
             u'start html': u'<span style="text-decoration: underline;">',
             u'end tag': u'{/u}', u'end html': u'</span>', u'protected': True})
         base_tags.append({u'desc': translate('OpenLP.DisplayTags', 'Break'),
-            u'start tag': u'{br}', u'start html': u'<br />', u'end tag': u'',
+            u'start tag': u'{br}', u'start html': u'<br>', u'end tag': u'',
             u'end html': u'', u'protected': True})
         DisplayTags.add_html_tags(base_tags)
 
diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py
index 1f50e0d65..295a6c1ad 100644
--- a/openlp/core/lib/htmlbuilder.py
+++ b/openlp/core/lib/htmlbuilder.py
@@ -35,8 +35,10 @@ from openlp.core.lib.theme import BackgroundType, BackgroundGradientType, \
 log = logging.getLogger(__name__)
 
 HTMLSRC = u"""
+<!DOCTYPE html>
 <html>
 <head>
+<meta charset="UTF-8">
 <title>OpenLP Display</title>
 <style>
 *{
@@ -93,7 +95,7 @@ sup {
     top:-0.3em;
 }
 </style>
-<script language="javascript">
+<script>
     var timer = null;
     var video_timer = null;
     var current_video = '1';
@@ -317,10 +319,10 @@ sup {
 %s
 <div id="footer" class="footer"></div>
 <div id="black" class="size"></div>
-<div id="alert" style="visibility:hidden;"></div>
+<div id="alert" style="visibility:hidden"></div>
 </body>
 </html>
-    """
+"""
 
 def build_html(item, screen, alert, islive, background, image=None):
     """
diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 4f4a3e4c9..c6cfa2717 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -46,6 +46,28 @@ VERSE = u'The Lord said to {r}Noah{/r}: \n' \
     'r{/pk}{o}e{/o}{pp}n{/pp} of the Lord\n'
 FOOTER = [u'Arky Arky (Unknown)', u'Public Domain', u'CCLI 123456']
 
+HTML_START = u"""
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <style>
+        *{
+            margin: 0;
+            padding: 0;
+            border: 0;
+        }
+        #main {
+            position: absolute;
+            top: 0px;
+            %s %s
+        }
+    </style>
+</head>
+<body>
+    <div id="main">
+"""
+
 HTML_END = u'</div></body></html>'
 
 class Renderer(object):
@@ -219,7 +241,7 @@ class Renderer(object):
         """
         log.debug(u'format slide')
         # Add line endings after each line of text used for bibles.
-        line_end = u'<br />'
+        line_end = u'<br>'
         if item.is_capable(ItemCapabilities.NoLineBreaks):
             line_end = u' '
         # Bibles
@@ -240,8 +262,8 @@ class Renderer(object):
                         pages.extend(self._paginate_slide(lines, line_end))
         new_pages = []
         for page in pages:
-            while page.endswith(u'<br />'):
-                page = page[:-6]
+            while page.endswith(u'<br>'):
+                page = page[:-4]
             new_pages.append(page)
         return new_pages
 
@@ -310,10 +332,7 @@ class Renderer(object):
         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
-        self.page_shell = u'<html><head><style>' \
-            u'*{margin: 0; padding: 0; border: 0;} '\
-            u'#main {position:absolute; top:0px; %s %s}</style></head><body>' \
-            u'<div id="main">' % \
+        self.page_shell = HTML_START % \
             (build_lyrics_format_css(self.theme_data, self.page_width,
             self.page_height), build_lyrics_outline_css(self.theme_data))
 
@@ -326,13 +345,13 @@ class Renderer(object):
             The text to be fitted on the slide split into lines.
 
         ``line_end``
-            The text added after each line. Either ``u' '`` or ``u'<br />``.
+            The text added after each line. Either ``u' '`` or ``u'<br>``.
         """
         log.debug(u'_paginate_slide - Start')
         formatted = []
         previous_html = u''
         previous_raw = u''
-        separator = u'<br />'
+        separator = u'<br>'
         html_lines = map(expand_tags, lines)
         html = self.page_shell + separator.join(html_lines) + HTML_END
         self.web.setHtml(html)
@@ -357,7 +376,7 @@ class Renderer(object):
             The words to be fitted on the slide split into lines.
 
         ``line_end``
-            The text added after each line. Either ``u' '`` or ``u'<br />``.
+            The text added after each line. Either ``u' '`` or ``u'<br>``.
             This is needed for bibles.
         """
         log.debug(u'_paginate_slide_words - Start')
@@ -434,12 +453,12 @@ class Renderer(object):
             using the binary chop. The elements can contain display tags.
 
         ``separator``
-            The separator for the elements. For lines this is ``u'<br />'`` and
+            The separator for the elements. For lines this is ``u'<br>'`` and
             for words this is ``u' '``.
 
         ``line_end``
             The text added after each "element line". Either ``u' '`` or
-            ``u'<br />``. This is needed for bibles.
+            ``u'<br>``. This is needed for bibles.
         """
         smallest_index = 0
         highest_index = len(html_list) - 1
@@ -459,7 +478,7 @@ class Renderer(object):
             # We found the number of words which will fit.
             if smallest_index == index or highest_index == index:
                 index = smallest_index
-                formatted.append(previous_raw.rstrip(u'<br />') +
+                formatted.append(previous_raw.rstrip(u'<br>') +
                     separator.join(raw_list[:index + 1]))
                 previous_html = u''
                 previous_raw = u''
diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index 52d5e8e13..e8131cada 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -174,7 +174,7 @@ class ServiceItem(object):
             for slide in self._raw_frames:
                 pages = self.renderer.format_slide(slide[u'raw_slide'], self)
                 for page in pages:
-                    page = page.replace(u'<br />', u'{br}')
+                    page = page.replace(u'<br>', u'{br}')
                     html = expand_tags(cgi.escape(page.rstrip()))
                     self._display_frames.append({
                         u'title': clean_tags(page),
@@ -194,7 +194,7 @@ class ServiceItem(object):
         if self.raw_footer is None:
             self.raw_footer = []
         self.foot_text = \
-            u'<br />'.join([footer for footer in self.raw_footer if footer])
+            u'<br>'.join([footer for footer in self.raw_footer if footer])
 
     def add_from_image(self, path, title):
         """
@@ -462,7 +462,7 @@ class ServiceItem(object):
         elif not start and end:
             return end
         else:
-            return u'%s <br />%s' % (start, end)
+            return u'%s <br>%s' % (start, end)
 
     def update_theme(self, theme):
         """
diff --git a/openlp/core/ui/printserviceform.py b/openlp/core/ui/printserviceform.py
index 2bbf2ab56..f50237619 100644
--- a/openlp/core/ui/printserviceform.py
+++ b/openlp/core/ui/printserviceform.py
@@ -240,7 +240,7 @@ class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog):
                     translate('OpenLP.ServiceManager', 'Notes: '), p,
                     classId=u'itemNotesTitle')
                 notes = self._addElement(u'span',
-                    item.notes.replace(u'\n', u'<br />'), p,
+                    item.notes.replace(u'\n', u'<br>'), p,
                     classId=u'itemNotesText')
         # Add play length of media files.
         if item.is_media() and self.metaDataCheckBox.isChecked():
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index f6c069525..2d695c852 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -968,7 +968,7 @@ class ServiceManager(QtGui.QWidget):
             if item[u'service_item'] \
                 .is_capable(ItemCapabilities.AllowsVariableStartTime):
                 tips.append(item[u'service_item'].get_media_time())
-            treewidgetitem.setToolTip(0, u'<br />'.join(tips))
+            treewidgetitem.setToolTip(0, u'<br>'.join(tips))
             treewidgetitem.setData(0, QtCore.Qt.UserRole,
                 QtCore.QVariant(item[u'order']))
             treewidgetitem.setSelected(item[u'selected'])

From 46fa64b43de8705433ea1e5c0f8ebc34b835d328 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sun, 17 Jul 2011 15:01:28 +0200
Subject: [PATCH 18/29] reverted some changes

---
 openlp/core/lib/htmlbuilder.py |  1 -
 openlp/core/lib/renderer.py    | 27 ++++-----------------------
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py
index 295a6c1ad..d133cb035 100644
--- a/openlp/core/lib/htmlbuilder.py
+++ b/openlp/core/lib/htmlbuilder.py
@@ -38,7 +38,6 @@ HTMLSRC = u"""
 <!DOCTYPE html>
 <html>
 <head>
-<meta charset="UTF-8">
 <title>OpenLP Display</title>
 <style>
 *{
diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index c6cfa2717..51fafb731 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -46,28 +46,6 @@ VERSE = u'The Lord said to {r}Noah{/r}: \n' \
     'r{/pk}{o}e{/o}{pp}n{/pp} of the Lord\n'
 FOOTER = [u'Arky Arky (Unknown)', u'Public Domain', u'CCLI 123456']
 
-HTML_START = u"""
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <style>
-        *{
-            margin: 0;
-            padding: 0;
-            border: 0;
-        }
-        #main {
-            position: absolute;
-            top: 0px;
-            %s %s
-        }
-    </style>
-</head>
-<body>
-    <div id="main">
-"""
-
 HTML_END = u'</div></body></html>'
 
 class Renderer(object):
@@ -332,7 +310,10 @@ class Renderer(object):
         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
-        self.page_shell = HTML_START % \
+        self.page_shell = u'<!DOCTYPE html><html><head><style>' \
+            u'*{margin: 0; padding: 0; border: 0;} '\
+            u'#main {position: absolute;top: 0px;%s %s}</style></head><body>' \
+            u'<div id="main">' % \
             (build_lyrics_format_css(self.theme_data, self.page_width,
             self.page_height), build_lyrics_outline_css(self.theme_data))
 

From f869b047adf224e905e8b87d336181d08fa08180 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sun, 17 Jul 2011 15:15:13 +0200
Subject: [PATCH 19/29] changed spaces

---
 openlp/core/lib/renderer.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 51fafb731..e9e28bcf6 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -311,8 +311,8 @@ class Renderer(object):
         self.web_frame = self.web.page().mainFrame()
         # Adjust width and height to account for shadow. outline done in css
         self.page_shell = u'<!DOCTYPE html><html><head><style>' \
-            u'*{margin: 0; padding: 0; border: 0;} '\
-            u'#main {position: absolute;top: 0px;%s %s}</style></head><body>' \
+            u'*{margin:0; padding:0; border:0;} '\
+            u'#main {position:absolute; top:0px; %s %s}</style></head><body>' \
             u'<div id="main">' % \
             (build_lyrics_format_css(self.theme_data, self.page_width,
             self.page_height), build_lyrics_outline_css(self.theme_data))

From 988e6326761438c9148732f6025ffa063d2a78f8 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 18 Jul 2011 17:34:38 +0200
Subject: [PATCH 20/29] possible fix for not working gradient

---
 openlp/core/lib/htmlbuilder.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py
index d133cb035..e766e0330 100644
--- a/openlp/core/lib/htmlbuilder.py
+++ b/openlp/core/lib/htmlbuilder.py
@@ -41,7 +41,6 @@ HTMLSRC = u"""
 <title>OpenLP Display</title>
 <style>
 *{
-    margin: 0;
     padding: 0;
     border: 0;
     overflow: hidden;

From baec0f5c69a39a400d83b7603c33ed54d233fc79 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 18 Jul 2011 18:01:42 +0200
Subject: [PATCH 21/29] added margin back; added missing spaces

---
 openlp/core/lib/htmlbuilder.py | 39 +++++++++++++++++-----------------
 openlp/core/ui/maindisplay.py  |  1 +
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py
index e766e0330..21f2a81e6 100644
--- a/openlp/core/lib/htmlbuilder.py
+++ b/openlp/core/lib/htmlbuilder.py
@@ -41,6 +41,7 @@ HTMLSRC = u"""
 <title>OpenLP Display</title>
 <style>
 *{
+    margin: 0;
     padding: 0;
     border: 0;
     overflow: hidden;
@@ -56,41 +57,41 @@ body {
     height: %spx;
 }
 #black {
-    z-index:8;
+    z-index: 8;
     background-color: black;
     display: none;
 }
 #bgimage {
-    z-index:1;
+    z-index: 1;
 }
 #image {
-    z-index:2;
+    z-index: 2;
 }
 #video1 {
-    z-index:3;
+    z-index: 3;
 }
 #video2 {
-    z-index:3;
+    z-index: 3;
 }
 #alert {
     position: absolute;
     left: 0px;
     top: 0px;
-    z-index:10;
+    z-index: 10;
     %s
 }
 #footer {
     position: absolute;
-    z-index:6;
+    z-index: 6;
     %s
 }
 /* lyric css */
 %s
 sup {
-    font-size:0.6em;
-    vertical-align:top;
-    position:relative;
-    top:-0.3em;
+    font-size: 0.6em;
+    vertical-align: top;
+    position: relative;
+    top: -0.3em;
 }
 </style>
 <script>
@@ -446,15 +447,15 @@ def build_lyrics_css(item, webkitvers):
         The version of qtwebkit we're using
 
     """
-    style = """
+    style = u"""
 .lyricstable {
-    z-index:5;
+    z-index: 5;
     position: absolute;
     display: table;
     %s
 }
 .lyricscell {
-    display:table-cell;
+    display: table-cell;
     word-wrap: break-word;
     %s
 }
@@ -558,8 +559,8 @@ def build_lyrics_format_css(theme, width, height):
         left_margin = 0
     lyrics = u'white-space:pre-wrap; word-wrap: break-word; ' \
         'text-align: %s; vertical-align: %s; font-family: %s; ' \
-        'font-size: %spt; color: %s; line-height: %d%%; margin:0;' \
-        'padding:0; padding-left:%spx; width: %spx; height: %spx; ' % \
+        'font-size: %spt; color: %s; line-height: %d%%; margin: 0;' \
+        'padding: 0; padding-left: %spx; width: %spx; height: %spx; ' % \
         (align, valign, theme.font_main_name, theme.font_main_size,
         theme.font_main_color, 100 + int(theme.font_main_line_adjustment),
         left_margin, width, height)
@@ -608,7 +609,7 @@ def build_footer_css(item, height):
     ``item``
         Service Item to be processed.
     """
-    style = """
+    style = u"""
     left: %spx;
     bottom: %spx;
     width: %spx;
@@ -616,7 +617,7 @@ def build_footer_css(item, height):
     font-size: %spt;
     color: %s;
     text-align: left;
-    white-space:nowrap;
+    white-space: nowrap;
     """
     theme = item.themedata
     if not theme or not item.footer:
@@ -634,7 +635,7 @@ def build_alert_css(alertTab, width):
     ``alertTab``
         Details from the Alert tab for fonts etc
     """
-    style = """
+    style = u"""
     width: %spx;
     vertical-align: %s;
     font-family: %s;
diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index d5603c31f..04594de1b 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -495,6 +495,7 @@ class MainDisplay(QtGui.QGraphicsView):
             self.isLive, background, image_bytes)
         log.debug(u'buildHtml - pre setHtml')
         self.webView.setHtml(html)
+        open(u'/tmp/branch.html', u'w').write(html)
         log.debug(u'buildHtml - post setHtml')
         if serviceItem.foot_text:
             self.footer(serviceItem.foot_text)

From 1214706d2a768892202cde7cefd8c65a8f7b7969 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 18 Jul 2011 18:20:40 +0200
Subject: [PATCH 22/29] removed debug help

---
 openlp/core/ui/maindisplay.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index 04594de1b..d5603c31f 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -495,7 +495,6 @@ class MainDisplay(QtGui.QGraphicsView):
             self.isLive, background, image_bytes)
         log.debug(u'buildHtml - pre setHtml')
         self.webView.setHtml(html)
-        open(u'/tmp/branch.html', u'w').write(html)
         log.debug(u'buildHtml - post setHtml')
         if serviceItem.foot_text:
             self.footer(serviceItem.foot_text)

From 823831e07594aa9e6a3e691eba8ec85c88d6c65d Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Wed, 20 Jul 2011 15:05:30 +0200
Subject: [PATCH 23/29] removed doctype for now

---
 openlp/core/lib/htmlbuilder.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py
index 21f2a81e6..6f56cf8b2 100644
--- a/openlp/core/lib/htmlbuilder.py
+++ b/openlp/core/lib/htmlbuilder.py
@@ -34,8 +34,8 @@ from openlp.core.lib.theme import BackgroundType, BackgroundGradientType, \
 
 log = logging.getLogger(__name__)
 
+# FIXME: Add html5 doctype. However, do not break theme gradients.
 HTMLSRC = u"""
-<!DOCTYPE html>
 <html>
 <head>
 <title>OpenLP Display</title>

From 36ccd4a2caaf3a9fef0e80af0a9a8b5d81412615 Mon Sep 17 00:00:00 2001
From: Stevan Pettit <smpettit@casinternet.net>
Date: Fri, 22 Jul 2011 18:58:42 -0400
Subject: [PATCH 24/29] modified windows build script to add --noupx option to
 pyinstaller

---
 scripts/windows-builder.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/windows-builder.py b/scripts/windows-builder.py
index 9c96fe251..9c7d27106 100644
--- a/scripts/windows-builder.py
+++ b/scripts/windows-builder.py
@@ -179,6 +179,7 @@ def run_pyinstaller():
     pyinstaller = Popen((python_exe, pyi_build,
         u'--noconfirm',
         u'--windowed',
+        u'--noupx', 
         u'-o', branch_path,
         u'-i', win32_icon,
         u'-p', branch_path,

From c813b3142765bbaf90ced09f402220fd38c5dadb Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sat, 23 Jul 2011 06:48:55 +0100
Subject: [PATCH 25/29] Correct up and down selection for service manage panel

Fixes: https://launchpad.net/bugs/805084
---
 openlp/core/ui/servicemanager.py | 51 +++++++++-----------------------
 1 file changed, 14 insertions(+), 37 deletions(-)

diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index c6dfe77aa..dd7720331 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -781,48 +781,25 @@ class ServiceManager(QtGui.QWidget):
 
     def onMoveSelectionUp(self):
         """
-        Moves the selection up the window. Called by the up arrow.
+        Moves the cursor selection up the window.
+        Called by the up arrow.
         """
-        serviceIterator = QtGui.QTreeWidgetItemIterator(self.serviceManagerList)
-        tempItem = None
-        setLastItem = False
-        while serviceIterator.value():
-            if serviceIterator.value().isSelected() and tempItem is None:
-                setLastItem = True
-                serviceIterator.value().setSelected(False)
-            if serviceIterator.value().isSelected():
-                # We are on the first record
-                if tempItem:
-                    tempItem.setSelected(True)
-                    serviceIterator.value().setSelected(False)
-            else:
-                tempItem = serviceIterator.value()
-            lastItem = serviceIterator.value()
-            serviceIterator += 1
-        # Top Item was selected so set the last one
-        if setLastItem:
-            lastItem.setSelected(True)
+        item = self.serviceManagerList.currentItem()
+        itemBefore = self.serviceManagerList.itemAbove(item)
+        if itemBefore is None:
+            return
+        self.serviceManagerList.setCurrentItem(itemBefore)
 
     def onMoveSelectionDown(self):
         """
-        Moves the selection down the window. Called by the down arrow.
+        Moves the cursor selection down the window.
+        Called by the down arrow.
         """
-        serviceIterator = QtGui.QTreeWidgetItemIterator(self.serviceManagerList)
-        firstItem = None
-        setSelected = False
-        while serviceIterator.value():
-            if not firstItem:
-                firstItem = serviceIterator.value()
-            if setSelected:
-                setSelected = False
-                serviceIterator.value().setSelected(True)
-            elif serviceIterator.value() and \
-                serviceIterator.value().isSelected():
-                serviceIterator.value().setSelected(False)
-                setSelected = True
-            serviceIterator += 1
-        if setSelected:
-            firstItem.setSelected(True)
+        item = self.serviceManagerList.currentItem()
+        itemAfter = self.serviceManagerList.itemBelow(item)
+        if itemAfter is None:
+            return
+        self.serviceManagerList.setCurrentItem(itemAfter)
 
     def onCollapseAll(self):
         """

From 5448e6ae7985346ddacb63d9298fd055aea0f75e Mon Sep 17 00:00:00 2001
From: Stevan Pettit <smpettit@casinternet.net>
Date: Sat, 23 Jul 2011 08:11:11 -0400
Subject: [PATCH 26/29] Removed documentation references to UPX from
 windos=builder.py

---
 scripts/windows-builder.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/scripts/windows-builder.py b/scripts/windows-builder.py
index 9c7d27106..b7bf70472 100644
--- a/scripts/windows-builder.py
+++ b/scripts/windows-builder.py
@@ -46,12 +46,6 @@ PyEnchant
 Inno Setup 5
     Inno Setup should be installed into "C:\%PROGRAMFILES%\Inno Setup 5"
 
-UPX
-    This is used to compress DLLs and EXEs so that they take up less space, but
-    still function exactly the same. To install UPX, download it from
-    http://upx.sourceforge.net/, extract it into C:\%PROGRAMFILES%\UPX, and then
-    add that directory to your PATH environment variable.
-
 Sphinx
     This is used to build the documentation.  The documentation trunk must be at
     the same directory level as Openlp trunk and named "documentation"

From 90c18b6bfd42a4fa512cb68f1a52f77d7d5bdbba Mon Sep 17 00:00:00 2001
From: Stevan Pettit <smpettit@casinternet.net>
Date: Sat, 23 Jul 2011 17:29:24 -0400
Subject: [PATCH 27/29] changed plugin names to lowercase, removed .lower()
 from appropriate code

---
 openlp/core/lib/mediamanageritem.py                | 6 +++---
 openlp/core/lib/plugin.py                          | 2 +-
 openlp/core/ui/mediadockmanager.py                 | 4 ++--
 openlp/plugins/alerts/alertsplugin.py              | 2 +-
 openlp/plugins/bibles/bibleplugin.py               | 2 +-
 openlp/plugins/custom/customplugin.py              | 2 +-
 openlp/plugins/images/imageplugin.py               | 2 +-
 openlp/plugins/media/mediaplugin.py                | 2 +-
 openlp/plugins/presentations/presentationplugin.py | 2 +-
 openlp/plugins/remotes/remoteplugin.py             | 2 +-
 openlp/plugins/songs/songsplugin.py                | 2 +-
 openlp/plugins/songusage/songusageplugin.py        | 2 +-
 12 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py
index 0cc25717c..66bf89f49 100644
--- a/openlp/core/lib/mediamanageritem.py
+++ b/openlp/core/lib/mediamanageritem.py
@@ -96,7 +96,7 @@ class MediaManagerItem(QtGui.QWidget):
         self.plugin = plugin
         visible_title = self.plugin.getString(StringContent.VisibleName)
         self.title = unicode(visible_title[u'title'])
-        self.settingsSection = self.plugin.name.lower()
+        self.settingsSection = self.plugin.name
         self.icon = None
         if icon:
             self.icon = build_icon(icon)
@@ -113,7 +113,7 @@ class MediaManagerItem(QtGui.QWidget):
         self.retranslateUi()
         self.auto_select_id = -1
         QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'%s_service_load' % self.plugin.name.lower()),
+            QtCore.SIGNAL(u'%s_service_load' % self.plugin.name),
             self.serviceLoad)
 
     def requiredIcons(self):
@@ -558,7 +558,7 @@ class MediaManagerItem(QtGui.QWidget):
                 QtGui.QMessageBox.information(self, UiStrings().NISs,
                     translate('OpenLP.MediaManagerItem',
                         'You must select an existing service item to add to.'))
-            elif self.plugin.name.lower() == serviceItem.name.lower():
+            elif self.plugin.name == serviceItem.name:
                 self.generateSlideData(serviceItem)
                 self.plugin.serviceManager.addServiceItem(serviceItem,
                     replace=True)
diff --git a/openlp/core/lib/plugin.py b/openlp/core/lib/plugin.py
index ec5e44f8e..5b9f2185e 100644
--- a/openlp/core/lib/plugin.py
+++ b/openlp/core/lib/plugin.py
@@ -152,7 +152,7 @@ class Plugin(QtCore.QObject):
             self.version = version
         else:
             self.version = get_application_version()[u'version']
-        self.settingsSection = self.name.lower()
+        self.settingsSection = self.name
         self.icon = None
         self.media_item_class = media_item_class
         self.settings_tab_class = settings_tab_class
diff --git a/openlp/core/ui/mediadockmanager.py b/openlp/core/ui/mediadockmanager.py
index 3eb5a899c..cc6cc92bc 100644
--- a/openlp/core/ui/mediadockmanager.py
+++ b/openlp/core/ui/mediadockmanager.py
@@ -66,7 +66,7 @@ class MediaDockManager(object):
         match = False
         for dock_index in range(0, self.media_dock.count()):
             if self.media_dock.widget(dock_index).settingsSection == \
-                media_item.plugin.name.lower():
+                media_item.plugin.name:
                 match = True
                 break
         if not match:
@@ -84,6 +84,6 @@ class MediaDockManager(object):
         for dock_index in range(0, self.media_dock.count()):
             if self.media_dock.widget(dock_index):
                 if self.media_dock.widget(dock_index).settingsSection == \
-                    media_item.plugin.name.lower():
+                    media_item.plugin.name:
                     self.media_dock.widget(dock_index).setVisible(False)
                     self.media_dock.removeItem(dock_index)
diff --git a/openlp/plugins/alerts/alertsplugin.py b/openlp/plugins/alerts/alertsplugin.py
index 228031842..21db1972a 100644
--- a/openlp/plugins/alerts/alertsplugin.py
+++ b/openlp/plugins/alerts/alertsplugin.py
@@ -43,7 +43,7 @@ class AlertsPlugin(Plugin):
     log.info(u'Alerts Plugin loaded')
 
     def __init__(self, plugin_helpers):
-        Plugin.__init__(self, u'Alerts', plugin_helpers,
+        Plugin.__init__(self, u'alerts', plugin_helpers,
             settings_tab_class=AlertsTab)
         self.weight = -3
         self.icon_path = u':/plugins/plugin_alerts.png'
diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py
index da7658c12..619581b17 100644
--- a/openlp/plugins/bibles/bibleplugin.py
+++ b/openlp/plugins/bibles/bibleplugin.py
@@ -41,7 +41,7 @@ class BiblePlugin(Plugin):
     log.info(u'Bible Plugin loaded')
 
     def __init__(self, plugin_helpers):
-        Plugin.__init__(self, u'Bibles', plugin_helpers,
+        Plugin.__init__(self, u'bibles', plugin_helpers,
             BibleMediaItem, BiblesTab)
         self.weight = -9
         self.icon_path = u':/plugins/plugin_bibles.png'
diff --git a/openlp/plugins/custom/customplugin.py b/openlp/plugins/custom/customplugin.py
index 7b7c939b1..e9260f926 100644
--- a/openlp/plugins/custom/customplugin.py
+++ b/openlp/plugins/custom/customplugin.py
@@ -46,7 +46,7 @@ class CustomPlugin(Plugin):
     log.info(u'Custom Plugin loaded')
 
     def __init__(self, plugin_helpers):
-        Plugin.__init__(self, u'Custom', plugin_helpers,
+        Plugin.__init__(self, u'custom', plugin_helpers,
             CustomMediaItem, CustomTab)
         self.weight = -5
         self.manager = Manager(u'custom', init_schema)
diff --git a/openlp/plugins/images/imageplugin.py b/openlp/plugins/images/imageplugin.py
index b92a804fd..1ddbe8357 100644
--- a/openlp/plugins/images/imageplugin.py
+++ b/openlp/plugins/images/imageplugin.py
@@ -36,7 +36,7 @@ class ImagePlugin(Plugin):
     log.info(u'Image Plugin loaded')
 
     def __init__(self, plugin_helpers):
-        Plugin.__init__(self, u'Images', plugin_helpers, ImageMediaItem)
+        Plugin.__init__(self, u'images', plugin_helpers, ImageMediaItem)
         self.weight = -7
         self.icon_path = u':/plugins/plugin_images.png'
         self.icon = build_icon(self.icon_path)
diff --git a/openlp/plugins/media/mediaplugin.py b/openlp/plugins/media/mediaplugin.py
index 308ebd959..c215b1be0 100644
--- a/openlp/plugins/media/mediaplugin.py
+++ b/openlp/plugins/media/mediaplugin.py
@@ -39,7 +39,7 @@ class MediaPlugin(Plugin):
     log.info(u'%s MediaPlugin loaded', __name__)
 
     def __init__(self, plugin_helpers):
-        Plugin.__init__(self, u'Media', plugin_helpers,
+        Plugin.__init__(self, u'media', plugin_helpers,
             MediaMediaItem, MediaTab)
         self.weight = -6
         self.icon_path = u':/plugins/plugin_media.png'
diff --git a/openlp/plugins/presentations/presentationplugin.py b/openlp/plugins/presentations/presentationplugin.py
index 2990862e1..a97f82159 100644
--- a/openlp/plugins/presentations/presentationplugin.py
+++ b/openlp/plugins/presentations/presentationplugin.py
@@ -52,7 +52,7 @@ class PresentationPlugin(Plugin):
         """
         log.debug(u'Initialised')
         self.controllers = {}
-        Plugin.__init__(self, u'Presentations', plugin_helpers)
+        Plugin.__init__(self, u'presentations', plugin_helpers)
         self.weight = -8
         self.icon_path = u':/plugins/plugin_presentations.png'
         self.icon = build_icon(self.icon_path)
diff --git a/openlp/plugins/remotes/remoteplugin.py b/openlp/plugins/remotes/remoteplugin.py
index a120becba..dfaff9675 100644
--- a/openlp/plugins/remotes/remoteplugin.py
+++ b/openlp/plugins/remotes/remoteplugin.py
@@ -39,7 +39,7 @@ class RemotesPlugin(Plugin):
         """
         remotes constructor
         """
-        Plugin.__init__(self, u'Remotes', plugin_helpers,
+        Plugin.__init__(self, u'remotes', plugin_helpers,
             settings_tab_class=RemoteTab)
         self.icon_path = u':/plugins/plugin_remote.png'
         self.icon = build_icon(self.icon_path)
diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py
index e514b2937..8a773be90 100644
--- a/openlp/plugins/songs/songsplugin.py
+++ b/openlp/plugins/songs/songsplugin.py
@@ -57,7 +57,7 @@ class SongsPlugin(Plugin):
         """
         Create and set up the Songs plugin.
         """
-        Plugin.__init__(self, u'Songs', plugin_helpers, SongMediaItem, SongsTab)
+        Plugin.__init__(self, u'songs', plugin_helpers, SongMediaItem, SongsTab)
         self.weight = -10
         self.manager = Manager(u'songs', init_schema)
         self.icon_path = u':/plugins/plugin_songs.png'
diff --git a/openlp/plugins/songusage/songusageplugin.py b/openlp/plugins/songusage/songusageplugin.py
index cc143b986..a657d700d 100644
--- a/openlp/plugins/songusage/songusageplugin.py
+++ b/openlp/plugins/songusage/songusageplugin.py
@@ -45,7 +45,7 @@ class SongUsagePlugin(Plugin):
     log.info(u'SongUsage Plugin loaded')
 
     def __init__(self, plugin_helpers):
-        Plugin.__init__(self, u'SongUsage', plugin_helpers)
+        Plugin.__init__(self, u'songusage', plugin_helpers)
         self.weight = -4
         self.icon = build_icon(u':/plugins/plugin_songusage.png')
         self.activeIcon = build_icon(u':/songusage/song_usage_active.png')

From 0d9f6a946e94925d572e1629d692726938233ada Mon Sep 17 00:00:00 2001
From: Stevan Pettit <smpettit@casinternet.net>
Date: Sun, 24 Jul 2011 15:41:33 -0400
Subject: [PATCH 28/29] modified slidecontroller to "reset" the loop button
 when new item is sent live

---
 openlp/core/ui/slidecontroller.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index 9d35c1166..0f83cbc30 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -508,6 +508,11 @@ class SlideController(QtGui.QWidget):
         self.mediabar.setVisible(False)
         self.toolbar.makeWidgetsInvisible([u'Song Menu'])
         self.toolbar.makeWidgetsInvisible(self.loopList)
+        # Reset the button
+        self.playSlidesOnce.setChecked(False)
+        self.playSlidesOnce.setIcon(build_icon(u':/media/media_time.png'))
+        self.playSlidesLoop.setChecked(False)
+        self.playSlidesLoop.setIcon(build_icon(u':/media/media_time.png'))       
         if item.is_text():
             if QtCore.QSettings().value(
                 self.parent().songsSettingsSection + u'/display songbar',

From 1c63ef3ea1b88d3170b5739d1e58f0708683fea8 Mon Sep 17 00:00:00 2001
From: "rimach crichter@web.de" <crichter@web.de>
Date: Mon, 25 Jul 2011 22:56:39 +0200
Subject: [PATCH 29/29] add starttime for python and vlc

---
 openlp/core/ui/__init__.py            |  2 +-
 openlp/core/ui/media/mediamanager.py  |  6 ++++--
 openlp/core/ui/media/phononapi.py     | 24 ++++++++++++++----------
 openlp/core/ui/media/vlcapi.py        | 23 ++++++++++++++++++-----
 openlp/core/ui/media/webkitapi.py     |  4 ++++
 openlp/plugins/media/lib/mediaitem.py | 22 +++++++++++++++++++---
 6 files changed, 60 insertions(+), 21 deletions(-)

diff --git a/openlp/core/ui/__init__.py b/openlp/core/ui/__init__.py
index 543adaa77..0d0813a9b 100644
--- a/openlp/core/ui/__init__.py
+++ b/openlp/core/ui/__init__.py
@@ -61,7 +61,7 @@ from screen import ScreenList
 from maindisplay import MainDisplay, Display
 from servicenoteform import ServiceNoteForm
 from serviceitemeditform import ServiceItemEditForm
-from slidecontroller import SlideController
+from slidecontroller import SlideController, Controller
 from splashscreen import SplashScreen
 from generaltab import GeneralTab
 from themestab import ThemesTab
diff --git a/openlp/core/ui/media/mediamanager.py b/openlp/core/ui/media/mediamanager.py
index f83b62cd6..8a2bca04c 100644
--- a/openlp/core/ui/media/mediamanager.py
+++ b/openlp/core/ui/media/mediamanager.py
@@ -268,14 +268,16 @@ class MediaManager(object):
         controller.media_info.file_info = QtCore.QFileInfo(file)
         controller.media_info.is_background = isBackground
         if controller.isLive:
-            if self.withLivePreview:
+            if self.withLivePreview and controller.previewDisplay:
                 display = controller.previewDisplay
                 isValid = self.check_file_type(controller, display)
             display = controller.display
             isValid = self.check_file_type(controller, display)
             display.override[u'theme'] = u''
             display.override[u'video'] = True
-        else:
+            controller.media_info.start_time = display.serviceItem.start_time
+            controller.media_info.end_time = display.serviceItem.end_time
+        elif controller.previewDisplay:
             display = controller.previewDisplay
             isValid = self.check_file_type(controller, display)
         if not isValid:
diff --git a/openlp/core/ui/media/phononapi.py b/openlp/core/ui/media/phononapi.py
index df3f4cc5f..78c44e946 100644
--- a/openlp/core/ui/media/phononapi.py
+++ b/openlp/core/ui/media/phononapi.py
@@ -155,12 +155,22 @@ class PhononAPI(MediaAPI):
         display.phononWidget.resize(display.size())
 
     def play(self, display):
-        self.set_visible(display, True)
         controller = display.controller
+        start_time = 0
         vol = float(controller.media_info.volume) / float(10)
-        display.audio.setVolume(vol)
+        if display.mediaObject.state() != Phonon.PausedState and \
+            controller.media_info.start_time > 0:
+            start_time = controller.media_info.start_time
         display.mediaObject.play()
-        self.state = MediaState.Playing
+        if self.mediaStateWait(display, Phonon.PlayingState):
+            if start_time > 0:
+                self.seek(display, controller.media_info.start_time*1000)
+            display.audio.setVolume(vol)
+            controller.media_info.length = \
+                int(display.mediaObject.totalTime()/1000)
+            controller.seekSlider.setMaximum(controller.media_info.length*1000)
+            self.state = MediaState.Playing
+            self.set_visible(display, True)
 
     def pause(self, display):
         display.mediaObject.pause()
@@ -193,15 +203,9 @@ class PhononAPI(MediaAPI):
 
     def update_ui(self, display):
         controller = display.controller
-        controller.media_info.length = display.mediaObject.totalTime()
-        controller.seekSlider.setMaximum(controller.media_info.length)
-        if controller.media_info.start_time > 0:
-            if display.mediaObject.currentTime() < \
-                controller.media_info.start_time:
-                self.seek(display, controller.media_info.start_time)
         if controller.media_info.end_time > 0:
             if display.mediaObject.currentTime() > \
-                controller.media_info.end_time:
+                controller.media_info.end_time*1000:
                 self.stop(display)
                 self.set_visible(display, False)
         if not controller.seekSlider.isSliderDown():
diff --git a/openlp/core/ui/media/vlcapi.py b/openlp/core/ui/media/vlcapi.py
index 41dff39e8..0af89438d 100644
--- a/openlp/core/ui/media/vlcapi.py
+++ b/openlp/core/ui/media/vlcapi.py
@@ -138,10 +138,19 @@ class VlcAPI(MediaAPI):
         display.vlcWidget.resize(display.size())
 
     def play(self, display):
-        self.set_visible(display, True)
+        controller = display.controller
+        start_time = 0
+        if controller.media_info.start_time > 0:
+            start_time = controller.media_info.start_time
         display.vlcMediaPlayer.play()
         if self.mediaStateWait(display, vlc.State.Playing):
+            if start_time > 0:
+                self.seek(display, controller.media_info.start_time*1000)
+            controller.media_info.length = \
+                int(display.vlcMediaPlayer.get_media().get_duration()/1000)
+            controller.seekSlider.setMaximum(controller.media_info.length*1000)
             self.state = MediaState.Playing
+            self.set_visible(display, True)
 
     def pause(self, display):
         if display.vlcMedia.get_state() != vlc.State.Playing:
@@ -160,7 +169,7 @@ class VlcAPI(MediaAPI):
 
     def seek(self, display, seekVal):
         if display.vlcMediaPlayer.is_seekable():
-            display.vlcMediaPlayer.set_position(seekVal/1000.0)
+            display.vlcMediaPlayer.set_time(seekVal)
 
     def reset(self, display):
         display.vlcMediaPlayer.stop()
@@ -173,7 +182,11 @@ class VlcAPI(MediaAPI):
 
     def update_ui(self, display):
         controller = display.controller
-        controller.seekSlider.setMaximum(1000)
+        if controller.media_info.end_time > 0:
+            if display.vlcMediaPlayer.get_time() > \
+                controller.media_info.end_time*1000:
+                self.stop(display)
+                self.set_visible(display, False)
         if not controller.seekSlider.isSliderDown():
-            currentPos = display.vlcMediaPlayer.get_position() * 1000
-            controller.seekSlider.setSliderPosition(currentPos)
+            controller.seekSlider.setSliderPosition( \
+                display.vlcMediaPlayer.get_time())
diff --git a/openlp/core/ui/media/webkitapi.py b/openlp/core/ui/media/webkitapi.py
index e8cd40054..74f52380d 100644
--- a/openlp/core/ui/media/webkitapi.py
+++ b/openlp/core/ui/media/webkitapi.py
@@ -300,11 +300,14 @@ class WebkitAPI(MediaAPI):
     def play(self, display):
         controller = display.controller
         display.webLoaded = True
+        length = 0
         self.set_visible(display, True)
         if controller.media_info.isFlash:
             display.frame.evaluateJavaScript(u'show_flash("play");')
         else:
             display.frame.evaluateJavaScript(u'show_video("play");')
+        #TODO add playing check and get the correct media length
+        controller.media_info.length = length
         self.state = MediaState.Playing
 
     def pause(self, display):
@@ -374,6 +377,7 @@ class WebkitAPI(MediaAPI):
             if ok and length == length:
                 length = int(length*1000)
         if currentTime > 0:
+            controller.media_info.length = length
             controller.seekSlider.setMaximum(length)
             if not controller.seekSlider.isSliderDown():
                 controller.seekSlider.setSliderPosition(currentTime)
diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py
index 3e56aa537..217b4e553 100644
--- a/openlp/plugins/media/lib/mediaitem.py
+++ b/openlp/plugins/media/lib/mediaitem.py
@@ -34,6 +34,7 @@ from PyQt4 import QtCore, QtGui
 from openlp.core.lib import MediaManagerItem, build_icon, ItemCapabilities, \
     SettingsManager, translate, check_item_selected, Receiver
 from openlp.core.lib.ui import UiStrings, critical_error_message_box
+from openlp.core.ui import Controller, Display
 
 log = logging.getLogger(__name__)
 
@@ -52,6 +53,15 @@ class MediaMediaItem(MediaManagerItem):
         self.singleServiceItem = False
         self.hasSearch = True
         self.mediaObject = None
+        self.mediaController = Controller(parent)
+        self.mediaController.controllerLayout = QtGui.QVBoxLayout()
+        self.plugin.mediaManager.addControllerItems(self.mediaController, self.mediaController.controllerLayout)
+        self.plugin.mediaManager.set_controls_visible(self.mediaController, False)
+        self.mediaController.previewDisplay = Display(self.mediaController, False, self.mediaController, self.plugin.pluginManager.plugins)
+        self.mediaController.previewDisplay.setup()
+        self.plugin.mediaManager.setup_display(self.mediaController.previewDisplay)
+        self.mediaController.previewDisplay.hide()
+
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'video_background_replaced'),
             self.videobackgroundReplaced)
@@ -137,10 +147,16 @@ class MediaMediaItem(MediaManagerItem):
                 'The file %s no longer exists.')) % filename)
             return False
         self.mediaLength = 0
+        if self.plugin.mediaManager.video( \
+                    self.mediaController, filename, False, False):
+            self.mediaLength = self.mediaController.media_info.length
+            service_item.media_length = self.mediaLength
+            self.plugin.mediaManager.video_reset(self.mediaController)
+            if self.mediaLength > 0:
+                service_item.add_capability(
+                    ItemCapabilities.AllowsVariableStartTime)
+        print self.mediaLength
         service_item.media_length = self.mediaLength
-        #TODO
-        #service_item.add_capability(
-        #        ItemCapabilities.AllowsVariableStartTime)
         service_item.title = unicode(self.plugin.nameStrings[u'singular'])
         service_item.add_capability(ItemCapabilities.RequiresMedia)
         # force a non-existent theme