openlp-core team mailing list archive

[Jon Tibble <meths@xxxxxxxxxxxxxx>]

Jon Tibble has proposed merging lp:~meths/openlp/newrenderer into lp:~trb143/openlp/renderer.

Requested reviews:
  OpenLP Core (openlp-core)


Few cleanups
-- 
https://code.launchpad.net/~meths/openlp/newrenderer/+merge/31399
Your team OpenLP Core is requested to review the proposed merge of lp:~meths/openlp/newrenderer into lp:~trb143/openlp/renderer.

=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py	2010-07-30 17:49:46 +0000
+++ openlp/core/lib/serviceitem.py	2010-07-30 17:51:43 +0000
@@ -30,6 +30,7 @@
 
 import logging
 import os
+import re
 import time
 import uuid
 
@@ -152,9 +153,15 @@
                 formated = self.render_manager.format_slide(slide[u'raw_slide'])
                 for format in formated:
                     self._display_frames.append(
+<<<<<<< TREE
                         {u'title': self.render_manager.clean(format),
                         u'text': self.render_manager.clean(format.rstrip()),
                         u'html': self.render_manager.expand(format.rstrip()),
+=======
+                        {u'title': re.sub(r'(<p>|</p>|<sup>|</sup>)', u'',
+                        format).replace(u'<br>', u' '),
+                        u'text': format.rstrip(),
+>>>>>>> MERGE-SOURCE
                         u'verseTag': slide[u'verseTag'] })
                 log.log(15, u'Formatting took %4s' % (time.time() - before))
         elif self.service_item_type == ServiceItemType.Image:

=== modified file 'openlp/core/ui/__init__.py'
--- openlp/core/ui/__init__.py	2010-07-27 18:54:53 +0000
+++ openlp/core/ui/__init__.py	2010-07-30 17:51:43 +0000
@@ -55,6 +55,6 @@
 from servicemanager import ServiceManager
 from thememanager import ThemeManager
 
-__all__ = ['SplashScreen', 'AboutForm', 'SettingsForm', 'MainWindow',
+__all__ = ['SplashScreen', 'AboutForm', 'SettingsForm',
     'MainDisplay', 'SlideController', 'ServiceManager', 'ThemeManager',
     'AmendThemeForm', 'MediaDockManager', 'ServiceItemEditForm']

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2010-07-29 05:05:04 +0000
+++ openlp/core/ui/slidecontroller.py	2010-07-30 17:51:43 +0000
@@ -25,7 +25,6 @@
 ###############################################################################
 
 import logging
-import time
 import os
 
 from PyQt4 import QtCore, QtGui

=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py	2010-07-30 17:49:55 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py	2010-07-30 17:51:43 +0000
@@ -554,7 +554,7 @@
                     raw_slides.append(bible_text)
                     bible_text = u''
             if not service_item.title:
-                service_item.title = u'%s %s' % (book, verse_text)
+                service_item.title = u'%s %s:%s' % (book, chapter, verse)
             elif service_item.title.find(
                 translate('BiblesPlugin.MediaItem', 'etc')) == -1:
                 service_item.title = u'%s, %s' % (service_item.title,