Close display window on exit

Performance improvements in renderer
Performance improvements in Thememanager
Fix review comments from last few reviews
Add new media types to media plugin_helpers
Code format cleanups.

openlp/core/lib/renderer.py

@@ -41,143 +41,161 @@ class Renderer:
     tell it to render a particular screenfull with render_screen(n)
 
     """
-    def __init__(self, path=None):
+    def __init__(self):
-        self._rect=None
+        self._rect = None
-        self._debug=0
+        self._debug = 0
-        self.words=None
+        self.words = None
         self._right_margin = 64 # the amount of right indent
-        self._shadow_offset=5
+        self._shadow_offset = 5
-        self._outline_offset=2
+        self._outline_offset = 2
-        self._theme=None
+        self.theme_name = None
-        self._bg_image_filename=None
+        self._theme = None
-        self._paint=None
+        self._bg_image_filename = None
-        self._path = path
+        self._frame = None
-        self.img = None
+        self._bg_frame = None
+        self.bg_image = None
 
     def set_debug(self, debug):
         self._debug=debug
 
     def set_theme(self, theme):
-        self._theme=theme
+        """
+        External API to pass in the theme to be used
+        """
+        log.debug(u'set theme')
+        self._theme = theme
+        self._bg_frame = None
+        self.theme_name = theme.theme_name
         if theme.background_type == u'image':
-            if self._path is not None:
+            if theme.background_filename is not None:
                 self.set_bg_image(theme.background_filename)
 
     def set_bg_image(self, filename):
         log.debug(u'set bg image %s', filename)
-
+        #self._bg_image_filename=os.path.join(self._path, self._theme.theme_name,  filename)
-        self._bg_image_filename=os.path.join(self._path, self._theme.theme_name,  filename)
+        self._bg_image_filename = filename
-        print self._bg_image_filename
+        if self._frame is not None:
-        if self._paint is not None:
             self.scale_bg_image()
 
     def scale_bg_image(self):
-        assert self._paint
+        assert self._frame
-        i=QtGui.QImage(self._bg_image_filename)
+        image = QtGui.QImage(self._bg_image_filename)
         # rescale and offset
-        imw=i.width()
+        imw = image.width()
-        imh=i.height()
+        imh = image.height()
-        print imw, imh
+        dcw = self._frame.width()+1
-        dcw=self._paint.width()+1
+        dch = self._frame.height()
-        dch=self._paint.height()
+        imratio = imw/float(imh)
-        imratio=imw/float(imh)
+        dcratio = dcw/float(dch)
-        dcratio=dcw/float(dch)
         log.debug(u'Image scaling params %s %s %s %s %s %s', imw, imh, imratio, dcw, dch, dcratio)
         if imratio > dcratio:
-            scale=dcw/float(imw)
+            scale = dcw/float(imw)
         elif imratio < dcratio:
-            scale=dch/float(imh)
+            scale = dch/float(imh)
         else:
-            scale=dcw/float(imw) # either will do
+            scale = dcw/float(imw) # either will do
-        neww=int(round(imw*scale))
+        neww = int(round(imw*scale))
-        newh=int(round(imh*scale))
+        newh = int(round(imh*scale))
         self.background_offsetx=(dcw-neww)/2
         self.background_offsety=(dch-newh)/2
-        self.img=QtGui.QPixmap.fromImage(i.scaled(QtCore.QSize(neww, newh), Qt.Qt.KeepAspectRatio))
+        self.bg_image=QtGui.QPixmap.fromImage(image.scaled(QtCore.QSize(neww, newh), Qt.Qt.KeepAspectRatio))
 
-    def set_paint_dest(self, p):
+    def set_frame_dest(self, frame_width, frame_height, preview=False):
-        log.debug(u'set paint dest (frame) w %d h %d',p.width(), p.height())
+        """
-        self._paint=p
+        External API to pass the frame size to be painted
+        """
+        if preview == True:
+            self._bg_frame = None
+        log.debug(u'set frame dest (frame) w %d h %d',frame_width, frame_height)
+        self._frame = QtGui.QPixmap(frame_width, frame_height)
         if self._bg_image_filename is not None:
             self.scale_bg_image()
+        if self._bg_frame is None:
+            self._render_background()
 
     def format_slide(self, words, footer):
+        """
+        External API to sort out the text to pe placed on the frame
+        """
         log.debug(u'format_slide %s', words)
-        verses=[]
+        verses = []
         verses_text = words.splitlines()
-        for v in verses_text:
+        for verse in verses_text:
-            lines=v.split(u'\n')
+            lines = verse.split(u'\n')
             verses.append(self.split_set_of_lines(lines, footer)[0])
         self.words = verses
-        verses_text=[]
+        verses_text = []
         for v in verses:
             verses_text.append(u'\n'.join(v).lstrip()) # remove first \n
         return verses_text
 
     def render_screen(self, screennum):
         log.debug(u'render screen\n %s %s ', screennum, self.words[screennum])
-        t=0.0
+        t = 0.0
-        words=self.words[screennum]
+        words = self.words[screennum]
-        retval=self._render_lines(words)
+        retval = self._render_lines(words)
         return retval
 
     def set_text_rectangle(self, rect_main, rect_footer):
         """ Sets the rectangle within which text should be rendered"""
-        self._rect=rect_main
+        self._rect = rect_main
-        self._rect_footer=rect_footer
+        self._rect_footer = rect_footer
 
     def _render_background(self):
+        """
+        Generate a background frame to the same size as the frame to be used
+        Results cached for performance reasons.
+        """
         assert(self._theme)
-        assert(self._paint)
+        self._bg_frame = QtGui.QPixmap(self._frame.width(), self._frame.height())
         log.debug(u'render background %s ', self._theme.background_type)
         bef = datetime.now()
-        p=QtGui.QPainter()
+        painter = QtGui.QPainter()
-        p.begin(self._paint)
+        painter.begin(self._bg_frame)
         if self._theme.background_type == u'solid':
-            p.fillRect(self._paint.rect(), QtGui.QColor(self._theme.background_color))
+            painter.fillRect(self._frame.rect(), QtGui.QColor(self._theme.background_color))
         elif self._theme.background_type == u'gradient' : # gradient
             gradient = None
             if self._theme.background_direction == u'horizontal':
-                w = int(self._paint.width())/2
+                w = int(self._frame.width())/2
-                gradient = QtGui.QLinearGradient(w, 0, w, self._paint.height()) # vertical
+                gradient = QtGui.QLinearGradient(w, 0, w, self._frame.height()) # vertical
             elif self._theme.background_direction == u'vertical':
-                h = int(self._paint.height())/2
+                h = int(self._frame.height())/2
-                gradient = QtGui.QLinearGradient(0, h, self._paint.width(), h)   # Horizontal
+                gradient = QtGui.QLinearGradient(0, h, self._frame.width(), h)   # Horizontal
             else:
-                w = int(self._paint.width())/2
+                w = int(self._frame.width())/2
-                h = int(self._paint.height())/2
+                h = int(self._frame.height())/2
                 gradient = QtGui.QRadialGradient(w, h, w) # Circular
 
             gradient.setColorAt(0, QtGui.QColor(self._theme.background_startColor))
             gradient.setColorAt(1, QtGui.QColor(self._theme.background_endColor))
 
-            p.setBrush(QtGui.QBrush(gradient))
+            painter.setBrush(QtGui.QBrush(gradient))
             rectPath = QtGui.QPainterPath()
 
-            max_x = self._paint.width()
+            max_x = self._frame.width()
-            max_y = self._paint.height()
+            max_y = self._frame.height()
             rectPath.moveTo(0, 0)
             rectPath.lineTo(0, max_y)
             rectPath.lineTo(max_x, max_y)
             rectPath.lineTo(max_x, 0)
 
             rectPath.closeSubpath()
-            p.drawPath(rectPath)
+            painter.drawPath(rectPath)
 
         elif self._theme.background_type== u'image': # image
-            r=self._paint.rect()
+            r = self._frame.rect()
             log.debug(u'Image size details %d %d %d %d ', r.x(), r.y(), r.width(),r.height())
             #log.debug(u' Background Parameter %d ', self._theme.background_color1)
             #if self._theme.background_color1 is not None:
-            #    p.fillRect(self._paint.rect(), self._theme.background_borderColor)
+            #    p.fillRect(self._frame.rect(), self._theme.background_borderColor)
-            if self.img is not None:
+            if self.bg_image is not None:
-                p.drawPixmap(self.background_offsetx,self.background_offsety, self.img)
+                painter.drawPixmap(self.background_offsetx,self.background_offsety, self.bg_image)
             else:
-                p.fillRect(self._paint.rect(), QtGui.QColor(u'#000000'))
+                painter.fillRect(self._frame.rect(), QtGui.QColor(u'#000000'))
-        p.end()
+        painter.end()
         aft = datetime.now()
         print "background time", bef, aft, aft-bef
-
         log.debug(u'render background finish')
 
     def split_set_of_lines(self, lines, footer):
@@ -186,71 +204,73 @@ class Renderer:
          - this is done by splitting at 1/2, 1/3 or 1/4 of the set
          If it doesn't fit, even at this size, just split at each opportunity
 
-         We'll do this by getting the bounding box of each lline, and then summing them appropriately
+         We'll do this by getting the bounding box of each line, and then summing them appropriately
-
          Returns a list of [lists of lines], one set for each screenful
          """
         log.debug(u'Split set of lines')
-        # Probably ought to save the rendering results to a pseudoDC for redrawing efficiency.  But let's not optimse prematurely!
-
         bboxes = []
         for line in lines:
             bboxes.append(self._render_single_line(line, footer))
-        numlines=len(lines)
+
-        bottom=self._rect.bottom()
+        print "-------------"
+        print bboxes
+        print "------------"
+        numlines = len(lines)
+        bottom = self._rect.bottom()
         for ratio in (numlines, numlines/2, numlines/3, numlines/4):
-            good=1
+            good = 1
-            startline=0
+            startline = 0
-            endline=startline+ratio
+            endline = startline + ratio
-            while (endline<=numlines):
+            while (endline <= numlines):
-                by=0
+                by = 0
                 for (x, y) in bboxes[startline:endline]:
-                    by+=y
+                    by += y
+                print "A ", by, bottom
                 if by > bottom:
                     good=0
                     break
-                startline+=ratio
+                startline += ratio
-                endline=startline+ratio
+                endline = startline+ratio
-            if good==1:
+            if good == 1:
                 break
 
-        retval=[]
+        retval = []
-        numlines_per_page=ratio
+        numlines_per_page = ratio
         if good:
-            c=0
+            c = 0
-            thislines=[]
+            thislines = []
             while c < numlines:
                 thislines.append(lines[c])
-                c+=1
+                c += 1
                 if len(thislines) == numlines_per_page:
                     retval.append(thislines)
-                    thislines=[]
+                    thislines = []
         else:
 #             log.debug(u" "Just split where you can"
-            retval=[]
+            retval = []
-            startline=0
+            startline = 0
-            endline=startline+1
+            endline = startline+1
-            while (endline<=numlines):
+            while (endline <= numlines):
-                by=0
+                by = 0
                 for (x, y) in bboxes[startline:endline]:
-                    by+=y
+                    by += y
                 if by > bottom:
                     retval.append(lines[startline:endline-1])
-                    startline=endline-1
+                    startline = endline-1
-                    endline=startline # gets incremented below
+                    endline = startline # gets incremented below
-                    by=0
+                    by = 0
-                endline+=1
+                endline += 1
-
+        print retval
         return retval
 
     def _correctAlignment(self, rect, bbox):
-        x=rect.left()
+        x = rect.left()
         if int(self._theme.display_verticalAlign) == 0: # top align
             y = rect.top()
         elif int(self._theme.display_verticalAlign) == 2: # bottom align
-            y=rect.bottom()-bbox.height()
+            y = rect.bottom()-bbox.height()
         elif int(self._theme.display_verticalAlign) == 1: # centre align
-            y=rect.top()+(rect.height()-bbox.height())/2
+            y = rect.top()+(rect.height()-bbox.height())/2
         else:
             assert(0, u'Invalid value for theme.VerticalAlign:%s' % self._theme.display_verticalAlign)
         return x, y
@@ -259,45 +279,51 @@ class Renderer:
         """render a set of lines according to the theme, return bounding box"""
         log.debug(u'render_lines - Start')
 
-        bbox=self._render_lines_unaligned(lines, False) # Main font
+        bbox = self._render_lines_unaligned(lines, False) # Main font
         if footer_lines is not None:
-            bbox1=self._render_lines_unaligned(footer_lines, True) # Footer Font
+            bbox1 = self._render_lines_unaligned(footer_lines, True) # Footer Font
 
         # put stuff on background so need to reset before doing the job properly.
-        self._render_background()
+        #self._render_background()
+
+        self._frame = QtGui.QPixmap(self._bg_frame)
+
         x, y = self._correctAlignment(self._rect, bbox)
-        bbox=self._render_lines_unaligned(lines, False,  (x, y))
+        bbox = self._render_lines_unaligned(lines, False,  (x, y))
 
         if footer_lines is not None:
-            bbox=self._render_lines_unaligned(footer_lines, True, (self._rect_footer.left(), self._rect_footer.top()) )
+            bbox = self._render_lines_unaligned(footer_lines, True, (self._rect_footer.left(), self._rect_footer.top()) )
         log.debug(u'render_lines- Finish')
-        return bbox
+
+        return self._frame
 
     def _render_lines_unaligned(self, lines,  footer,  tlcorner=(0,0)):
 
-        """Given a list of lines to render, render each one in turn
+        """
+        Given a list of lines to render, render each one in turn
         (using the _render_single_line fn - which may result in going
         off the bottom) They are expected to be pre-arranged to less
         than a screenful (eg. by using split_set_of_lines)
 
-        Returns the bounding box of the text as QRect"""
+        Returns the bounding box of the text as QRect
+        """
         log.debug(u'render lines unaligned Start')
-        x, y=tlcorner
+        x, y = tlcorner
-        brx=x
+        brx = x
-        bry=y
+        bry = y
         for line in lines:
             # render after current bottom, but at original left edge
             # keep track of right edge to see which is biggest
             (thisx, bry) = self._render_single_line(line, footer, (x,bry))
             if (thisx > brx):
                 brx=thisx
-        retval=QtCore.QRect(x, y,brx-x, bry-y)
+        retval = QtCore.QRect(x, y,brx-x, bry-y)
         if self._debug:
-            p=QtGui.QPainter()
+            painter = QtGui.QPainter()
-            p.begin(self._paint)
+            painter.begin(self._frame)
-            p.setPen(QtGui.QPen(QtGui.QColor(0,0,255)))
+            painter.setPen(QtGui.QPen(QtGui.QColor(0,0,255)))
-            p.drawRect(retval)
+            painter.drawRect(retval)
-            p.end()
+            painter.end()
         log.debug(u'render lines unaligned Finish')
         return  retval
 
@@ -319,63 +345,62 @@ class Renderer:
 
         # get the words
 #         log.debug(u" "Getting the words split right"
-        words=line.split(u' ')
+
-        thisline=u' '.join(words)
+        print "before ", line
-        lastword=len(words)
+        words = line.split(u' ')
-        lines=[]
+        thisline = u' '.join(words)
-        maxx=self._rect.width(); maxy=self._rect.height();
+        lastword = len(words)
+        lines = []
+        maxx = self._rect.width(); maxy=self._rect.height();
         while (len(words)>0):
-            w,h=self._get_extent_and_render(thisline, footer)
+            w , h = self._get_extent_and_render(thisline, footer)
-            rhs=w+x
+            rhs = w + x
             if rhs < maxx-self._right_margin:
                 lines.append(thisline)
-                words=words[lastword:]
+                words = words[lastword:]
-                thisline=' '.join(words)
+                thisline = ' '.join(words)
-                lastword=len(words)
+                lastword = len(words)
             else:
-                lastword-=1
+                lastword -= 1
-                thisline=' '.join(words[:lastword])
+                thisline = ' '.join(words[:lastword])
-        startx=x
+        startx = x
-        starty=y
+        starty = y
-        rightextent=None
+        rightextent = None
-        t=self._theme
         if footer: # dont allow alignment messing with footers
             align = 0
         else:
-            align=t.display_horizontalAlign
+            align = self._theme .display_horizontalAlign
-
-        wrapstyle=t.display_wrapStyle
 
         for linenum in range(len(lines)):
-            line=lines[linenum]
+            line = lines[linenum]
             #find out how wide line is
-            w,h=self._get_extent_and_render(line, footer,  tlcorner=(x, y), draw=False)
+            w , h = self._get_extent_and_render(line, footer,  tlcorner=(x, y), draw=False)
 
-            if t.display_shadow:
+            if self._theme.display_shadow:
                 w+=self._shadow_offset
                 h+=self._shadow_offset
-            if t.display_outline:
+            if self._theme.display_outline:
                 w+=2*self._outline_offset # pixels either side
                 h+=2*self._outline_offset #  pixels top/bottom
             if align==0: # left align
                 rightextent=x+w
-                if wrapstyle==1 and linenum != 0: # shift right from last line's rh edge
+                if self._theme.display_wrapStyle == 1 and linenum != 0: # shift right from last line's rh edge
                     rightextent=self._first_line_right_extent + self._right_margin
                     if rightextent > maxx:
                         rightextent = maxx
                     x = rightextent-w
 
-            elif align==1: # right align
+            elif align == 1: # right align
-                rightextent=maxx
+                rightextent = maxx
-                x=maxx-w
+                x = maxx-w
-            elif align==2: # centre
+            elif align == 2: # centre
-                x=(maxx-w)/2;
+                x = (maxx-w)/2;
-                rightextent=x+w
+                rightextent = x+w
             # now draw the text, and any outlines/shadows
-            if t.display_shadow:
+            if self._theme.display_shadow:
                 self._get_extent_and_render(line, footer,tlcorner=(x+self._shadow_offset,y+self._shadow_offset),
                     draw=True, color = t.display_shadow_color)
-            if t.display_outline:
+            if self._theme.display_outline:
                 self._get_extent_and_render(line, footer,(x+self._outline_offset,y), draw=True, color = t.display_outline_color)
                 self._get_extent_and_render(line, footer,(x, y+self._outline_offset), draw=True, color = t.display_outline_color)
                 self._get_extent_and_render(line, footer,(x, y-self._outline_offset), draw=True, color = t.display_outline_color)
@@ -390,61 +415,69 @@ class Renderer:
 #             log.debug(u'Line %2d: Render '%s' at (%d, %d) wh=(%d,%d)' % ( linenum, line, x, y,w,h)
             y += h
             if linenum == 0:
-                self._first_line_right_extent=rightextent
+                self._first_line_right_extent = rightextent
         # draw a box around the text - debug only
         if self._debug:
-            p=QtGui.QPainter()
+            painter = QtGui.QPainter()
-            p.begin(self._paint)
+            painter.begin(self._frame)
-            p.setPen(QtGui.QPen(QtGui.QColor(0,255,0)))
+            painter.setPen(QtGui.QPen(QtGui.QColor(0,255,0)))
-            p.drawRect(startx,starty,rightextent-startx, y-starty)
+            painter.drawRect(startx,starty,rightextent-startx, y-starty)
-            p.end()
+            painter.end()
 
-        brcorner=(rightextent,y)
+        brcorner = (rightextent,y)
         log.debug(u'Render single line Finish')
         return brcorner
 
     # xxx this is what to override for an SDL version
     def _get_extent_and_render(self, line, footer,  tlcorner=(0,0), draw=False, color=None):
-        """Find bounding box of text  - as render_single_line.
+        """
+        Find bounding box of text  - as render_single_line.
         If draw is set, actually draw the text to the current DC as well
-        return width and height of text as a tuple (w,h)"""
+        return width and height of text as a tuple (w,h)
+        """
         # setup defaults
         #log.debug(u'_get_extent_and_render %s %s %s ', [line], tlcorner, draw)
-        p=QtGui.QPainter()
+        painter = QtGui.QPainter()
-        p.begin(self._paint)
+        painter.begin(self._frame)
         # 'twould be more efficient to set this once when theme changes
         # or p changes
         if footer :
-           font=QtGui.QFont(self._theme.font_footer_name,
+            font = QtGui.QFont(self._theme.font_footer_name,
                          int(self._theme.font_footer_proportion), # size
                          QtGui.QFont.Normal, # weight
                          0)# italic
+            font.setPixelSize(int(self._theme.font_footer_proportion))
         else:
-            font=QtGui.QFont(self._theme.font_main_name,
+            font = QtGui.QFont(self._theme.font_main_name,
                          int(self._theme.font_main_proportion), # size
                          QtGui.QFont.Normal, # weight
                          0)# italic
-        # to make the unit tests monitor independent, we have to be able to
-        # specify whether a font proportion is in pixels or points
-        if footer:
-            font.setPixelSize(int(self._theme.font_footer_proportion))
-        else:
             font.setPixelSize(int(self._theme.font_main_proportion))
         #log.debug(u'Font details %s %s %s %d', self._theme.font_main_name, self._theme.font_main_proportion,  font.family(), font.pointSize())
-        p.setFont(font)
+        painter.setFont(font)
         if color == None:
             if footer:
-                p.setPen(QtGui.QColor(self._theme.font_footer_color))
+                painter.setPen(QtGui.QColor(self._theme.font_footer_color))
             else:
-                p.setPen(QtGui.QColor(self._theme.font_main_color))
+                painter.setPen(QtGui.QColor(self._theme.font_main_color))
         else:
-            p.setPen(QtGui.QColor(color))
+            painter.setPen(QtGui.QColor(color))
-        x, y=tlcorner
+        x, y = tlcorner
         metrics=QtGui.QFontMetrics(font)
         # xxx some fudges to make it exactly like wx!  Take 'em out later
-        w=metrics.width(line)
+        w = metrics.width(line)
-        h=metrics.height()-2
+        h = metrics.height()-2
         if draw:
-            p.drawText(x, y+metrics.height()-metrics.descent()-1, line)
+            painter.drawText(x, y+metrics.height()-metrics.descent()-1, line)
-        p.end()
+        painter.end()
         return (w, h)
+
+    def snoop_Image(self, image, image2=None):
+        """
+        Debugging method to allow images to be viewed
+        """
+        im = image.toImage()
+        im.save("renderer.png", "png")
+        if image2 is not None:
+            im = image2.toImage()
+            im.save("renderer2.png", "png")

openlp/core/lib/rendermanager.py

@@ -59,7 +59,7 @@ class RenderManager:
         self.theme_manager = theme_manager
         self.displays = len(screen_list)
         self.current_display = 0
-        self.renderer = Renderer(None)
+        self.renderer = Renderer()
         self.calculate_default(self.screen_list[self.current_display]['size'])
 
     def set_override_theme(self, theme):
@@ -68,11 +68,12 @@ class RenderManager:
             self.theme = theme
         else:
             self.theme = self.default_theme
-        log.debug(u'theme is now %s',  self.theme)
+        if self.theme != self.renderer.theme_name:
-        self.themedata = self.theme_manager.getThemeData(self.theme)
+            log.debug(u'theme is now %s',  self.theme)
-        self.calculate_default(self.screen_list[self.current_display]['size'])
+            self.themedata = self.theme_manager.getThemeData(self.theme)
-        self.renderer.set_theme(self.themedata)
+            self.calculate_default(self.screen_list[self.current_display]['size'])
-        self.build_text_rectangle(self.themedata)
+            self.renderer.set_theme(self.themedata)
+            self.build_text_rectangle(self.themedata)
 
     def build_text_rectangle(self, theme):
         log.debug(u'build_text_rectangle ')
@@ -99,8 +100,7 @@ class RenderManager:
         self.renderer.set_theme(themedata)
         self.build_text_rectangle(themedata)
 
-        frame = QtGui.QPixmap(self.width, self.height)
+        self.renderer.set_frame_dest(self.width, self.height, True)
-        self.renderer.set_paint_dest(frame)
 
         lines=[]
         lines.append(u'Amazing Grace!')
@@ -111,30 +111,20 @@ class RenderManager:
         lines1=[]
         lines1.append(u'Amazing Grace (John Newton)' )
         lines1.append(u'CCLI xxx (c)Openlp.org')
-        answer=self.renderer.render_lines(lines, lines1)
+        return self.renderer.render_lines(lines, lines1)
-        return frame
+
 
     def format_slide(self, words, footer):
         log.debug(u'format slide')
         self.calculate_default(self.screen_list[self.current_display]['size'])
-        self.renderer.set_paint_dest(QtGui.QPixmap(self.width, self.height))
+        self.renderer.set_frame_dest(self.width, self.height)
         return self.renderer.format_slide(words, footer)
 
     def generate_slide(self,main_text, footer_text):
         log.debug(u'generate slide')
-        #sys.settrace(traceit)
-
         self.calculate_default(self.screen_list[self.current_display]['size'])
-
+        self.renderer.set_frame_dest(self.width, self.height)
-        bef = datetime.now()
+        return self.renderer.render_lines(main_text, footer_text)
-        frame = QtGui.QPixmap(self.width, self.height)
-        aft = datetime.now()
-        print "framebuild time", bef, aft, aft-bef
-
-        self.renderer.set_paint_dest(frame)
-        answer=self.renderer.render_lines(main_text, footer_text)
-        #sys.settrace()
-        return frame
 
     def calculate_default(self, screen):
         log.debug(u'calculate default %s' , screen)
@@ -142,3 +132,13 @@ class RenderManager:
         self.height = screen.height()
         log.debug(u'calculate default %d,%d' , self.width, self.height)
         self.footer_start = int(self.height*0.95) # 95% is start of footer
+
+    def snoop_Image(self, image, image2=None):
+        """
+        Debugging method to allow images to be viewed
+        """
+        im = image.toImage()
+        im.save("renderer.png", "png")
+        if image2 is not None:
+            im = image2.toImage()
+            im.save("renderer2.png", "png")

openlp/core/lib/themexmlhandler.py

@@ -40,7 +40,7 @@ blankthemexml=\
       <direction>vertical</direction>
    </background>
    <background type="image" mode="opaque">
-      <filename>fred.bmp</filename>
+      <filename></filename>
    </background>
    <font type="main">
       <name>Arial</name>

openlp/core/ui/amendthemeform.py

@@ -53,6 +53,8 @@ class AmendThemeForm(QtGui.QDialog,  Ui_AmendThemeDialog):
             QtCore.SIGNAL("pressed()"), self.onOutlineColorPushButtonClicked)
         QtCore.QObject.connect(self.ShadowColorPushButton,
             QtCore.SIGNAL("pressed()"), self.onShadowColorPushButtonClicked)
+        QtCore.QObject.connect(self.ImageToolButton,
+            QtCore.SIGNAL("pressed()"), self.onImageToolButtonClicked)
 
         #Combo boxes
         QtCore.QObject.connect(self.BackgroundComboBox,
@@ -99,7 +101,6 @@ class AmendThemeForm(QtGui.QDialog,  Ui_AmendThemeDialog):
         QtCore.QObject.connect(self.ShadowCheckBox,
             QtCore.SIGNAL("stateChanged(int)"), self.onShadowCheckBoxChanged)
 
-
     def accept(self):
         new_theme = ThemeXML()
         theme_name = str(self.ThemeNameEdit.displayText())
@@ -140,9 +141,17 @@ class AmendThemeForm(QtGui.QDialog,  Ui_AmendThemeDialog):
             xml_file = os.path.join(self.path, theme, theme+u'.xml')
             xml = fileToXML(xml_file)
             self.theme.parse(xml)
+        self.allowPreview = False
         self.paintUi(self.theme)
+        self.allowPreview = True
         self.previewTheme(self.theme)
 
+    def onImageToolButtonClicked(self):
+        filename = QtGui.QFileDialog.getOpenFileName(self, 'Open file')
+        if filename != "":
+            self.ImageLineEdit.setText(filename)
+            self.theme.background_filename = filename
+            self.previewTheme(self.theme)
     #
     #Main Font Tab
     #
@@ -196,8 +205,6 @@ class AmendThemeForm(QtGui.QDialog,  Ui_AmendThemeDialog):
     def onFontMainHeightSpinBoxChanged(self, value):
         self.theme.font_main_height = value
         self.previewTheme(self.theme)
-
-
     #
     #Footer Font Tab
     #
@@ -217,7 +224,6 @@ class AmendThemeForm(QtGui.QDialog,  Ui_AmendThemeDialog):
         self.theme.font_footer_proportion = value
         self.previewTheme(self.theme)
 
-
     def onFontFooterDefaultCheckBoxChanged(self, value):
         if value == 2:  # checked
             self.theme.font_footer_override = False
@@ -516,5 +522,6 @@ class AmendThemeForm(QtGui.QDialog,  Ui_AmendThemeDialog):
 
 
     def previewTheme(self, theme):
-        frame = self.thememanager.generateImage(theme)
+        if self.allowPreview:
-        self.ThemePreview.setPixmap(frame)
+            frame = self.thememanager.generateImage(theme)
+            self.ThemePreview.setPixmap(frame)

openlp/core/ui/maindisplay.py

@@ -71,7 +71,3 @@ class MainDisplay(QtGui.QWidget):
         else:
             self.displayBlank = False
             self.frameView(self.frame)
-
-
-    def kill(self):
-        pass

openlp/core/ui/mainwindow.py

@@ -37,6 +37,7 @@ class MainWindow(object):
 
     def __init__(self, screens):
         self.main_window = QtGui.QMainWindow()
+        self.main_window.__class__.closeEvent = self.onCloseEvent
         self.main_display = MainDisplay(None, screens)
         self.screen_list = screens
         self.EventManager = EventManager()
@@ -89,9 +90,7 @@ class MainWindow(object):
 
         # Once all components are initialised load the Themes
         log.info(u'Load Themes and Managers')
-        self.PreviewController.eventManager = self.EventManager
         self.PreviewController.serviceManager = self.ServiceManagerContents
-        self.LiveController.eventManager = self.EventManager
         self.LiveController.serviceManager = self.ServiceManagerContents
         self.ThemeManagerContents.eventManager = self.EventManager
         self.ThemeManagerContents.renderManager = self.RenderManager
@@ -106,6 +105,13 @@ class MainWindow(object):
         log.info(u'Set Up SlideControllers')
         self.LiveController.mainDisplay = self.main_display
 
+    def onCloseEvent(self, event):
+        """
+        Hook to close the main window and display windows on exit
+        """
+        self.main_display.close()
+        event.accept()
+
     def setupUi(self):
         self.main_window.setObjectName(u'main_window')
         self.main_window.resize(1087, 847)

openlp/core/ui/slidecontroller.py

@@ -24,7 +24,6 @@ from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import OpenLPToolbar
 from openlp.core import translate
-from openlp.core.lib import Event, EventType, EventManager
 
 class SlideData(QtCore.QAbstractListModel):
     """
@@ -37,17 +36,13 @@ class SlideData(QtCore.QAbstractListModel):
 
     def __init__(self):
         QtCore.QAbstractListModel.__init__(self)
-        self.items=[]
+        self.items = []
-        self.rowheight=50
+        self.rowheight = 50
-        self.maximagewidth=self.rowheight*16/9.0;
+        self.maximagewidth = self.rowheight * 16/9.0;
         log.info(u'Starting')
 
-    def eventFilter(self, obj, event):
-        print obj, event
-        return false
-
     def clear(self):
-        self.items=[]
+        self.items = []
 
     def columnCount(self, parent):
         return 1

openlp/plugins/bibles/bibleplugin.py

@@ -90,8 +90,8 @@ class BiblePlugin(Plugin):
             log.debug(u'Load Service Item received')
             self.media_item.onBibleAddClick()
         if event.event_type == EventType.PreviewShow and event.payload == 'Bibles':
-            log.debug(u'Load Service Item received')
+            log.debug(u'Load Preview Item received')
             self.media_item.onBiblePreviewClick()
         if event.event_type == EventType.LiveShow and event.payload == 'Bibles':
-            log.debug(u'Load Service Item received')
+            log.debug(u'Load Live Show Item received')
             self.media_item.onBibleLiveClick()

openlp/plugins/custom/customplugin.py

@@ -64,8 +64,8 @@ class CustomPlugin(Plugin):
             log.debug(u'Load Service Item received')
             self.media_item.onCustomAddClick()
         if event.event_type == EventType.PreviewShow and event.payload == 'Custom':
-            log.debug(u'Load Service Item received ')
+            log.debug(u'Load Preview Item received ')
             self.media_item.onCustomPreviewClick()
         if event.event_type == EventType.LiveShow and event.payload == 'Custom':
-            log.debug(u'Load Service Item received')
+            log.debug(u'Load Live Show Item received')
             self.media_item.onCustomLiveClick()

openlp/plugins/images/imageplugin.py

@@ -60,10 +60,10 @@ class ImagePlugin(Plugin):
             log.debug(u'Load Service Item received')
             self.media_item.onImageAddClick()
         if event.event_type == EventType.PreviewShow and event.payload == 'Image':
-            log.debug(u'Load Service Item received')
+            log.debug(u'Load Preview Item received')
             self.media_item.onImagePreviewClick()
         if event.event_type == EventType.LiveShow and event.payload == 'Image':
-            log.debug(u'Load Service Item received')
+            log.debug(u'Load Live Show Item received')
             self.media_item.onImageLiveClick()
 
 

openlp/plugins/images/lib/mediaitem.py

@@ -175,7 +175,7 @@ class ImageMediaItem(MediaManagerItem):
         self.parent.live_controller.addServiceItem(service_item)
 
     def onImageAddClick(self):
-        log.debug(u'Image Live Requested')
+        log.debug(u'Image Add Requested')
         service_item = ServiceItem(self.parent)
         service_item.addIcon( ":/media/media_image.png")
         service_item.render_manager = self.parent.render_manager

openlp/plugins/media/lib/mediaitem.py

@@ -30,7 +30,7 @@ from openlp.plugins.media.lib import FileListData
 
 class MediaMediaItem(MediaManagerItem):
     """
-    This is the custom media manager item for Custom Slides.
+    This is the custom media manager item for Media Slides.
     """
     global log
     log=logging.getLogger(u'MediaMediaItem')
@@ -99,7 +99,8 @@ class MediaMediaItem(MediaManagerItem):
     def onMediaNewClick(self):
         files = QtGui.QFileDialog.getOpenFileNames(None,
             translate('MediaMediaItem', u'Select Media(s) items'),
-            self.parent.config.get_last_dir(), u'Images (*.avi *.mpeg)')
+            self.parent.config.get_last_dir(),
+            u'Images (*.avi *.mpeg);;Audio (*.mp3 *.ogg *.wma);;All files (*)')
         if len(files) > 0:
             self.loadMediaList(files)
             dir, filename = os.path.split(str(files[0]))