openlp-core team mailing list archive

[Jon Tibble <meths@xxxxxxxxxxxxxx>]

Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/45615

Few more cleanups
Fix BibleGateway xrefs (Bug #700271)
-- 
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/45615
Your team OpenLP Core is requested to review the proposed merge of lp:~meths/openlp/trivialfixes into lp:openlp.

=== modified file 'openlp/core/lib/__init__.py'
--- openlp/core/lib/__init__.py	2010-12-31 02:17:41 +0000
+++ openlp/core/lib/__init__.py	2011-01-08 19:08:13 +0000
@@ -102,7 +102,8 @@
         An identifying string for when the same text is used in different roles
         within the same context.
     """
-    return QtCore.QCoreApplication.translate(context, text, comment, encoding, n)
+    return QtCore.QCoreApplication.translate(context, text, comment, encoding,
+        n)
 
 def get_text_file_string(text_file):
     """

=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py	2011-01-05 16:50:28 +0000
+++ openlp/core/lib/mediamanageritem.py	2011-01-08 19:08:13 +0000
@@ -176,7 +176,8 @@
         # break compatability), but it makes sense for the icon to
         # come before the tooltip (as you have to have an icon, but
         # not neccesarily a tooltip)
-        return self.toolbar.addToolbarButton(title, icon, tooltip, slot, checkable)
+        return self.toolbar.addToolbarButton(title, icon, tooltip, slot,
+            checkable)
 
     def addToolbarSeparator(self):
         """

=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py	2011-01-06 20:34:46 +0000
+++ openlp/core/ui/servicemanager.py	2011-01-08 19:08:13 +0000
@@ -28,7 +28,6 @@
 import logging
 import cPickle
 import zipfile
-from pprint import pformat
 
 log = logging.getLogger(__name__)
 
@@ -986,8 +985,8 @@
                         u'expanded':expand})
                 self.repaintServiceList(len(self.serviceItems) + 1, 0)
             else:
-                self.serviceItems.insert(self.dropPosition, {u'service_item': item,
-                    u'order': self.dropPosition,
+                self.serviceItems.insert(self.dropPosition,
+                    {u'service_item': item, u'order': self.dropPosition,
                     u'expanded':expand})
                 self.repaintServiceList(self.dropPosition, 0)
             # if rebuilding list make sure live is fixed.

=== modified file 'openlp/core/ui/themewizard.py'
--- openlp/core/ui/themewizard.py	2011-01-07 13:43:03 +0000
+++ openlp/core/ui/themewizard.py	2011-01-08 19:08:13 +0000
@@ -249,7 +249,8 @@
         self.footerSizeSpinBox.setMaximum(999)
         self.footerSizeSpinBox.setValue(10)
         self.footerSizeSpinBox.setObjectName(u'FooterSizeSpinBox')
-        self.footerAreaLayout.addRow(self.footerSizeLabel, self.footerSizeSpinBox)
+        self.footerAreaLayout.addRow(self.footerSizeLabel,
+            self.footerSizeSpinBox)
         ThemeWizard.addPage(self.footerAreaPage)
         # Alignment Page
         self.alignmentPage = QtGui.QWizardPage()
@@ -317,9 +318,11 @@
         self.areaPositionLayout.addWidget(self.mainPositionGroupBox)
         self.footerPositionGroupBox = QtGui.QGroupBox(self.areaPositionPage)
         self.footerPositionGroupBox.setObjectName(u'FooterPositionGroupBox')
-        self.footerPositionLayout = QtGui.QFormLayout(self.footerPositionGroupBox)
+        self.footerPositionLayout = QtGui.QFormLayout(
+            self.footerPositionGroupBox)
         self.footerPositionLayout.setObjectName(u'FooterPositionLayout')
-        self.footerPositionCheckBox = QtGui.QCheckBox(self.footerPositionGroupBox)
+        self.footerPositionCheckBox = QtGui.QCheckBox(
+            self.footerPositionGroupBox)
         self.footerPositionCheckBox.setObjectName(u'FooterPositionCheckBox')
         self.footerPositionLayout.addRow(self.footerPositionCheckBox)
         self.footerXLabel = QtGui.QLabel(self.footerPositionGroupBox)

=== modified file 'openlp/plugins/bibles/lib/http.py'
--- openlp/plugins/bibles/lib/http.py	2011-01-06 23:47:28 +0000
+++ openlp/plugins/bibles/lib/http.py	2011-01-08 19:08:13 +0000
@@ -231,6 +231,9 @@
         footnotes = soup.findAll(u'sup', u'footnote')
         if footnotes:
             [footnote.extract() for footnote in footnotes]
+        crossrefs = soup.findAll(u'sup', u'xref')
+        if crossrefs:
+            [crossref.extract() for crossref in crossrefs]
         cleanup = [(re.compile('\s+'), lambda match: ' ')]
         verses = BeautifulSoup(str(soup), markupMassage=cleanup)
         content = verses.find(u'div', u'result-text-style-normal')

=== modified file 'openlp/plugins/bibles/lib/manager.py'
--- openlp/plugins/bibles/lib/manager.py	2011-01-06 23:47:28 +0000
+++ openlp/plugins/bibles/lib/manager.py	2011-01-08 19:08:13 +0000
@@ -273,10 +273,10 @@
             Receiver.send_message(u'openlp_information_message', {
                 u'title': translate('BiblesPlugin.BibleManager',
                 'Scripture Reference Error'),
-                u'message': translate('BiblesPlugin.BibleManager', 'Your scripture '
-                'reference is either not supported by OpenLP or is invalid. '
-                'Please make sure your reference conforms to one of the '
-                'following patterns:\n\n'
+                u'message': translate('BiblesPlugin.BibleManager',
+                'Your scripture reference is either not supported by OpenLP '
+                'or is invalid.  Please make sure your reference conforms to '
+                'one of the following patterns:\n\n'
                 'Book Chapter\n'
                 'Book Chapter-Chapter\n'
                 'Book Chapter:Verse-Verse\n'

=== modified file 'openlp/plugins/presentations/lib/presentationtab.py'
--- openlp/plugins/presentations/lib/presentationtab.py	2011-01-07 11:26:28 +0000
+++ openlp/plugins/presentations/lib/presentationtab.py	2011-01-08 19:08:13 +0000
@@ -116,7 +116,8 @@
             if controller.available:
                 checkbox = self.PresenterCheckboxes[controller.name]
                 setting_key = self.settingsSection + u'/' + controller.name
-                if QtCore.QSettings().value(setting_key) != checkbox.checkState():
+                if QtCore.QSettings().value(setting_key) != \
+                    checkbox.checkState():
                     changed = True
                     QtCore.QSettings().setValue(setting_key,
                         QtCore.QVariant(checkbox.checkState()))