openlp-core team mailing list archive

[Jonathan Corwin <j@xxxxxxxxxxxx>]

Jonathan Corwin has proposed merging lp:~j-corwin/openlp/general into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #634771 in OpenLP: "OpenLP 1.9.2+bzr1016-0ubuntu1~lucid1 does not start"
  https://bugs.launchpad.net/openlp/+bug/634771
  Bug #646718 in OpenLP: "Songbook, Number will not loaded, Title will not be saved"
  https://bugs.launchpad.net/openlp/+bug/646718
  Bug #696013 in OpenLP: "song import from powerpoint crashes every second time"
  https://bugs.launchpad.net/openlp/+bug/696013
  Bug #696021 in OpenLP: "presentation loader does not work fine in Windows using Powerpoint Viewer 2007"
  https://bugs.launchpad.net/openlp/+bug/696021
  Bug #696637 in OpenLP: "Alert not positioned correctly in single screen"
  https://bugs.launchpad.net/openlp/+bug/696637
  Bug #727732 in OpenLP: "Openlp 1.9.?? crashes on start"
  https://bugs.launchpad.net/openlp/+bug/727732
  Bug #735039 in OpenLP: "Cannot import PowerPoint Presentations with PowerPoint 2010"
  https://bugs.launchpad.net/openlp/+bug/735039

For more details, see:
https://code.launchpad.net/~j-corwin/openlp/general/+merge/63923

Prevent error message appearing on operator screen when searching for Bible text via the remote 
-- 
https://code.launchpad.net/~j-corwin/openlp/general/+merge/63923
Your team OpenLP Core is requested to review the proposed merge of lp:~j-corwin/openlp/general into lp:openlp.

=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py	2011-06-06 06:03:06 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py	2011-06-08 20:21:13 +0000
@@ -683,17 +683,17 @@
                         verse.book.book_reference_id)
                     if not db_book:
                         log.debug(u'Passage "%s %d:%d" not found in Second '
-                            u'Bible' % (verse.book.name, verse.chapter, 
+                            u'Bible' % (verse.book.name, verse.chapter,
                             verse.verse))
                         passage_not_found = True
                         count += 1
                         continue
                     new_search_results.append(verse)
-                    text.append((verse.book.book_reference_id, verse.chapter, 
+                    text.append((verse.book.book_reference_id, verse.chapter,
                         verse.verse, verse.verse))
                 if passage_not_found:
-                    QtGui.QMessageBox.information(self, 
-                        translate('BiblePlugin.MediaItem', 'Information'), 
+                    QtGui.QMessageBox.information(self,
+                        translate('BiblePlugin.MediaItem', 'Information'),
                         unicode(translate('BiblePlugin.MediaItem',
                         'The second Bibles does not contain all the verses '
                         'that are in the main Bible. Only verses found in both '
@@ -983,7 +983,7 @@
         Search for some Bible verses (by reference).
         """
         bible = unicode(self.quickVersionComboBox.currentText())
-        search_results = self.plugin.manager.get_verses(bible, string, False)
+        search_results = self.plugin.manager.get_verses(bible, string, False, False)
         results = []
         if search_results:
             versetext = u' '.join([verse.text for verse in search_results])