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/45467

Cleanups from recent merges
-- 
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/45467
Your team OpenLP Core is requested to review the proposed merge of lp:~meths/openlp/trivialfixes into lp:openlp.

=== modified file 'openlp.pyw'
--- openlp.pyw	2011-01-01 12:49:38 +0000
+++ openlp.pyw	2011-01-07 00:10:50 +0000
@@ -182,7 +182,7 @@
         screens = ScreenList()
         # Decide how many screens we have and their size
         for screen in xrange(0, self.desktop().numScreens()):
-            size = self.desktop().screenGeometry(screen);
+            size = self.desktop().screenGeometry(screen)
             screens.add_screen({u'number': screen,
                 u'size': size,
                 u'primary': (self.desktop().primaryScreen() == screen)})

=== modified file 'openlp/core/lib/searchedit.py'
--- openlp/core/lib/searchedit.py	2011-01-05 10:48:47 +0000
+++ openlp/core/lib/searchedit.py	2011-01-07 00:10:50 +0000
@@ -78,7 +78,7 @@
         else:
             self.setStyleSheet(u'QLineEdit { padding-right: %spx; } ' % \
                 rightPadding)
-        msz = self.minimumSizeHint();
+        msz = self.minimumSizeHint()
         self.setMinimumSize(
             max(msz.width(),
                 self.clearButton.width() + (frameWidth * 2) + 2),

=== modified file 'openlp/plugins/alerts/forms/alertform.py'
--- openlp/plugins/alerts/forms/alertform.py	2011-01-05 17:13:57 +0000
+++ openlp/plugins/alerts/forms/alertform.py	2011-01-07 00:10:50 +0000
@@ -177,8 +177,8 @@
                 'parameter to be replaced.\nDo you want to continue anyway?'),
                 QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No |
                 QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.No:
-                    self.parameterEdit.setFocus()
-                    return False
+                self.parameterEdit.setFocus()
+                return False
             # The ParameterEdit field is not empty, but we have not found '<>'
             # in the alert text.
             elif text.find(u'<>') == -1 and self.parameterEdit.text() and \
@@ -188,8 +188,8 @@
                 ' contain \'<>\'.\nDo want to continue anyway?'),
                 QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No |
                 QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.No:
-                    self.parameterEdit.setFocus()
-                    return False
+                self.parameterEdit.setFocus()
+                return False
             text = text.replace(u'<>', unicode(self.parameterEdit.text()))
             self.parent.alertsmanager.displayAlert(text)
             return True

=== modified file 'openlp/plugins/bibles/lib/db.py'
--- openlp/plugins/bibles/lib/db.py	2011-01-01 10:33:14 +0000
+++ openlp/plugins/bibles/lib/db.py	2011-01-07 00:10:50 +0000
@@ -28,7 +28,7 @@
 import chardet
 import re
 
-from PyQt4 import QtCore, QtGui
+from PyQt4 import QtCore
 from sqlalchemy import Column, ForeignKey, or_, Table, types
 from sqlalchemy.orm import class_mapper, mapper, relation
 from sqlalchemy.orm.exc import UnmappedClassError

=== modified file 'openlp/plugins/bibles/lib/http.py'
--- openlp/plugins/bibles/lib/http.py	2011-01-05 19:48:01 +0000
+++ openlp/plugins/bibles/lib/http.py	2011-01-07 00:10:50 +0000
@@ -230,7 +230,7 @@
         Receiver.send_message(u'openlp_process_events')
         footnotes = soup.findAll(u'sup', u'footnote')
         if footnotes:
-        	[footnote.extract() for footnote in footnotes]
+            [footnote.extract() for footnote in footnotes]
         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-05 21:31:22 +0000
+++ openlp/plugins/bibles/lib/manager.py	2011-01-07 00:10:50 +0000
@@ -26,7 +26,7 @@
 
 import logging
 
-from PyQt4 import QtCore, QtGui
+from PyQt4 import QtCore
 
 from openlp.core.lib import Receiver, SettingsManager, translate
 from openlp.core.utils import AppLocation

=== modified file 'openlp/plugins/images/lib/mediaitem.py'
--- openlp/plugins/images/lib/mediaitem.py	2011-01-05 21:31:22 +0000
+++ openlp/plugins/images/lib/mediaitem.py	2011-01-07 00:10:50 +0000
@@ -30,8 +30,7 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import MediaManagerItem, BaseListWithDnD, build_icon, \
-    context_menu_action, ItemCapabilities, SettingsManager, translate, \
-    check_item_selected, Receiver
+    ItemCapabilities, SettingsManager, translate, check_item_selected, Receiver
 from openlp.core.utils import AppLocation, get_images_filter
 
 log = logging.getLogger(__name__)

=== modified file 'openlp/plugins/media/lib/mediaitem.py'
--- openlp/plugins/media/lib/mediaitem.py	2011-01-05 21:31:22 +0000
+++ openlp/plugins/media/lib/mediaitem.py	2011-01-07 00:10:50 +0000
@@ -31,7 +31,7 @@
 
 from openlp.core.lib import MediaManagerItem, BaseListWithDnD, build_icon, \
     ItemCapabilities, SettingsManager, translate, check_item_selected, \
-    context_menu_action, Receiver
+    Receiver
 
 log = logging.getLogger(__name__)