Merge from trunk

openlp/core/lib/renderer.py

@@ -505,7 +505,7 @@ class Renderer(object):
         self.mainFont.setPixelSize(self._theme.font_main_proportion)
 
     def _get_extent_and_render(self, line, footer, tlcorner=(0, 0), draw=False,
-        color=None, outline_size=None, outline_color=None):
+        color=None, outline_size=0, outline_color=None):
         """
         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
@@ -544,21 +544,23 @@ class Renderer(object):
             else:
                 pen = QtGui.QColor(color)
             x, y = tlcorner
-            if outline_size:
+            if self._theme.display_outline:
                 path = QtGui.QPainterPath()
                 path.addText(QtCore.QPointF(x, y + metrics.ascent()), font, line)
                 self.painter.setBrush(self.painter.pen().brush())
-                self.painter.setPen(QtGui.QPen(QtGui.QColor(outline_color), outline_size))
+                self.painter.setPen(QtGui.QPen(
+                        QtGui.QColor(self._theme.display_outline_color), outline_size))
                 self.painter.drawPath(path)
             self.painter.setPen(pen)
             self.painter.drawText(x, y + metrics.ascent(), line)
             if self._theme.display_slideTransition:
                 # Print 2nd image with 70% weight
-                if outline_size:
+                if self._theme.display_outline:
                     path = QtGui.QPainterPath()
                     path.addText(QtCore.QPointF(x, y + metrics.ascent()), font, line)
                     self.painter2.setBrush(self.painter2.pen().brush())
-                    self.painter2.setPen(QtGui.QPen(QtGui.QColor(outline_color), outline_size))
+                    self.painter2.setPen(QtGui.QPen(
+                            QtGui.QColor(self._theme.display_outline_color), outline_size))
                     self.painter2.drawPath(path)
                 self.painter2.setFont(font)
                 self.painter2.setPen(pen)

openlp/core/ui/aboutdialog.py

@@ -146,13 +146,21 @@ class Ui_AboutDialog(object):
             '    Jon "Meths" Tibble\n'
             '\n'
             'Contributors\n'
+            '    Meinert "m2j" Jordan\n'
             '    Christian "crichter" Richter\n'
             '    Maikel Stuivenberg\n'
             '    Carsten "catini" Tingaard\n'
             '\n'
             'Testers\n'
-            '    Wesley "wrst" Stout\n'
+            '    Philip "Phill" Ridout\n'
-            '    Philip "Phill" Ridout'
+            '    Wesley "wrst" Stout (lead)\n'
+            '\n'
+            'Packagers\n'
+            '    Thomas "tabthorpe" Abthorpe (FreeBSD)\n'
+            '    Tim "TRB143" Bentley (Fedora)\n'
+            '    Michael "cocooncrash" Gorven (Ubuntu)\n'
+            '    Matthias "matthub" Hub (Mac OS X)\n'
+            '    Raoul "superfly" Snyman (Windows)\n'
         ))
         self.AboutNotebook.setTabText(
             self.AboutNotebook.indexOf(self.CreditsTab),

openlp/core/ui/servicemanager.py

@@ -148,7 +148,8 @@ class ServiceManager(QtGui.QWidget):
         self.ServiceManagerList.setHeaderHidden(True)
         self.ServiceManagerList.setExpandsOnDoubleClick(False)
         self.ServiceManagerList.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
-        self.ServiceManagerList.customContextMenuRequested.connect(self.contextMenu)
+        QtCore.QObject.connect(self.ServiceManagerList,
+            QtCore.SIGNAL('customContextMenuRequested(QPoint)'), self.contextMenu)
         self.ServiceManagerList.setObjectName(u'ServiceManagerList')
         # enable drop
         self.ServiceManagerList.__class__.dragEnterEvent = self.dragEnterEvent

openlp/plugins/bibles/lib/mediaitem.py

@@ -253,6 +253,8 @@ class BibleMediaItem(MediaManagerItem):
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'config_updated'), self.configUpdated)
         # Other stuff
+        QtCore.QObject.connect(self.QuickSearchEdit,
+            QtCore.SIGNAL(u'returnPressed()'), self.onQuickSearchButton)
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'bible_showprogress'), self.onSearchProgressShow)
         QtCore.QObject.connect(Receiver.get_receiver(),

openlp/plugins/presentations/presentationplugin.py

@@ -57,6 +57,8 @@ class PresentationPlugin(Plugin):
         for controller in self.controllers:
             if self.controllers[controller].enabled:
                 presentation_types.append({u'%s' % controller : self.controllers[controller].supports})
+                self.controllers[controller].start_process()
+
         Receiver.send_message(
                     u'presentation types', presentation_types)
 
@@ -104,8 +106,6 @@ class PresentationPlugin(Plugin):
         for controller_class in controller_classes:
             controller = controller_class(self)
             self.registerControllers(controller)
-            if controller.enabled:
-                controller.start_process()
         if self.controllers:
             return True
         else:

resources/openlp.desktop

@@ -5,6 +5,6 @@ GenericName=Church lyrics projection
 Exec=openlp
 Icon=openlp
 StartupNotify=true
-Terminal=False
+Terminal=false
 Type=Application
-Categories=AudioVideo
+Categories=AudioVideo;