Tim Bentley has proposed merging lp:~trb143/openlp/fixes into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Fix Theme errors and sort other bits.
--
https://code.launchpad.net/~trb143/openlp/fixes/+merge/13886
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/lib/renderer.py'
--- openlp/core/lib/renderer.py 2009-10-23 16:10:09 +0000
+++ openlp/core/lib/renderer.py 2009-10-24 10:10:25 +0000
@@ -201,7 +201,7 @@
#if we have more text add up to 10 spaces on the front.
if len(line) > 0 and self._theme.font_main_indentation > 0:
line = u'%s%s' % \
- (u' '[:self._theme.font_main_indentation], line)
+ (u' '[:int(self._theme.font_main_indentation)], line)
#Text fits in a line now
for count, line in enumerate(split_lines):
page.append(line)
=== modified file 'openlp/core/lib/rendermanager.py'
--- openlp/core/lib/rendermanager.py 2009-09-26 06:46:26 +0000
+++ openlp/core/lib/rendermanager.py 2009-10-24 10:10:25 +0000
@@ -65,6 +65,7 @@
self.service_theme = u''
self.global_style = u''
self.override_background = None
+ self.themedata = None
self.save_bg_frame = None
self.override_background_changed = False
@@ -130,7 +131,7 @@
self.theme = self.service_theme
else:
self.theme = self.global_theme
- if self.theme != self.renderer.theme_name:
+ if self.theme != self.renderer.theme_name or self.themedata is None:
log.debug(u'theme is now %s', self.theme)
self.themedata = self.theme_manager.getThemeData(self.theme)
self.calculate_default(
=== modified file 'openlp/core/ui/amendthemeform.py'
--- openlp/core/ui/amendthemeform.py 2009-10-24 09:33:20 +0000
+++ openlp/core/ui/amendthemeform.py 2009-10-24 10:10:25 +0000
@@ -678,6 +678,6 @@
log.debug(u'Page Length area height %s , metrics %s , lines %s' %
(int(self.FontMainHeightSpinBox.value()), metrics.height(), page_length ))
self.FontMainLinesPageLabel.setText(
- self.trUtf8(u'Slide Height is %s rows') % page_length)
+ self.trUtf8((u'Slide Height is %s rows') % page_length))
frame = self.thememanager.generateImage(theme)
self.ThemePreview.setPixmap(QtGui.QPixmap.fromImage(frame))
=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py 2009-10-23 18:48:49 +0000
+++ openlp/core/ui/thememanager.py 2009-10-24 10:10:25 +0000
@@ -371,7 +371,7 @@
newtheme.add_font(unicode(theme.FontName),
unicode(theme.FontColor.name()),
- unicode(theme.FontProportion * 2), u'False')
+ unicode(theme.FontProportion * 3), u'False')
newtheme.add_font(unicode(theme.FontName),
unicode(theme.FontColor.name()),
unicode(12), u'False', u'footer')
=== modified file 'openlp/plugins/bibles/lib/bibleDBimpl.py'
--- openlp/plugins/bibles/lib/bibleDBimpl.py 2009-10-12 10:18:54 +0000
+++ openlp/plugins/bibles/lib/bibleDBimpl.py 2009-10-24 10:10:25 +0000
@@ -158,6 +158,11 @@
def get_bible_text(self, bookname, chapter, sverse, everse):
log.debug(u'get_bible_text %s, %s, %s, %s', bookname, chapter, sverse,
everse)
+ #Look up book name or abbreviation
+ book = self.get_bible_book(bookname)
+ if book is not None:
+ bookname = book.name
+ log.debug(u'bookname corrected to %s' % bookname)
verses = self.session.query(Verse).join(Book).filter(
Book.name == bookname).filter(Verse.chapter == chapter).filter(
Verse.verse>=sverse).filter(Verse.verse<=everse).order_by(
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
