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)


Cleanups
-- 
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/31398
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	2010-07-27 09:32:52 +0000
+++ openlp.pyw	2010-07-30 17:44:45 +0000
@@ -122,7 +122,7 @@
         show_splash = QtCore.QSettings().value(
             u'general/show splash', QtCore.QVariant(True)).toBool()
         if show_splash:
-            self.splash = SplashScreen(self.applicationVersion())
+            self.splash = SplashScreen()
             self.splash.show()
         # make sure Qt really display the splash screen
         self.processEvents()

=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py	2010-07-28 13:15:39 +0000
+++ openlp/core/ui/servicemanager.py	2010-07-30 17:44:45 +0000
@@ -167,39 +167,39 @@
         self.serviceManagerList.__class__.dropEvent = self.dropEvent
         self.layout.addWidget(self.serviceManagerList)
         # Add the bottom toolbar
-        self.OrderToolbar = OpenLPToolbar(self)
-        self.OrderToolbar.addToolbarButton(
+        self.orderToolbar = OpenLPToolbar(self)
+        self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', 'Move to &top'),
             u':/services/service_top.png',
             translate('OpenLP.ServiceManager',
             'Move item to the top of the service.'),
             self.onServiceTop)
-        self.OrderToolbar.addToolbarButton(
+        self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', 'Move &up'),
             u':/services/service_up.png',
             translate('OpenLP.ServiceManager',
             'Move item up one position in the service.'),
             self.onServiceUp)
-        self.OrderToolbar.addToolbarButton(
+        self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', 'Move &down'),
             u':/services/service_down.png',
             translate('OpenLP.ServiceManager',
             'Move item down one position in the service.'),
             self.onServiceDown)
-        self.OrderToolbar.addToolbarButton(
+        self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', 'Move to &bottom'),
             u':/services/service_bottom.png',
             translate('OpenLP.ServiceManager',
             'Move item to the end of the service.'),
             self.onServiceEnd)
-        self.OrderToolbar.addSeparator()
-        self.OrderToolbar.addToolbarButton(
+        self.orderToolbar.addSeparator()
+        self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', '&Delete From Service'),
             u':/general/general_delete.png',
             translate('OpenLP.ServiceManager',
             'Delete the selected item from the service.'),
             self.onDeleteFromService)
-        self.layout.addWidget(self.OrderToolbar)
+        self.layout.addWidget(self.orderToolbar)
         # Connect up our signals and slots
         QtCore.QObject.connect(self.themeComboBox,
             QtCore.SIGNAL(u'activated(int)'), self.onThemeComboBoxSelected)

=== modified file 'openlp/core/ui/splashscreen.py'
--- openlp/core/ui/splashscreen.py	2010-07-27 09:32:52 +0000
+++ openlp/core/ui/splashscreen.py	2010-07-30 17:44:45 +0000
@@ -27,7 +27,7 @@
 from PyQt4 import QtCore, QtGui
 
 class SplashScreen(object):
-    def __init__(self, version):
+    def __init__(self):
         self.splash_screen = QtGui.QSplashScreen()
         self.setupUi()
 

=== modified file 'openlp/plugins/bibles/lib/__init__.py'
--- openlp/plugins/bibles/lib/__init__.py	2010-07-30 12:04:15 +0000
+++ openlp/plugins/bibles/lib/__init__.py	2010-07-30 17:44:45 +0000
@@ -118,11 +118,11 @@
                 unified_ref_list.append((book, chapter, vr1_start, vr1_end))
                 vr2_end = check_end(match.group(6))
                 if int(match.group(4)) > chapter:
-                    for x in range(chapter + 1, int(match.group(4)) + 1):
-                        if x == int(match.group(4)):
-                            unified_ref_list.append((book, x, 1, vr2_end))
+                    for i in range(chapter + 1, int(match.group(4)) + 1):
+                        if i == int(match.group(4)):
+                            unified_ref_list.append((book, i, 1, vr2_end))
                         else:
-                            unified_ref_list.append((book, x, 1, -1))
+                            unified_ref_list.append((book, i, 1, -1))
         elif match.group(4):
             # Chapter range or chapter and verse range
             if match.group(3):
@@ -134,8 +134,8 @@
                     log.debug(u'Ambiguous reference: %s' % reference)
                     return None
             elif match.group(4) != u'end':
-                for x in range(chapter, int(match.group(4)) + 1):
-                    unified_ref_list.append((book, x, 1, -1))
+                for i in range(chapter, int(match.group(4)) + 1):
+                    unified_ref_list.append((book, i, 1, -1))
             else:
                 log.debug(u'Unsupported reference: %s' % reference)
                 return None

=== modified file 'openlp/plugins/custom/forms/editcustomform.py'
--- openlp/plugins/custom/forms/editcustomform.py	2010-07-27 11:21:11 +0000
+++ openlp/plugins/custom/forms/editcustomform.py	2010-07-30 17:44:45 +0000
@@ -158,7 +158,7 @@
         sxml.new_document()
         sxml.add_lyrics_to_song()
         count = 1
-        for i in range (0, self.verseListView.count()):
+        for i in range(0, self.verseListView.count()):
             sxml.add_verse_to_lyrics(u'custom', unicode(count),
                 unicode(self.verseListView.item(i).text()))
             count += 1

=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py	2010-07-27 09:32:52 +0000
+++ openlp/plugins/songs/forms/editsongform.py	2010-07-30 17:44:45 +0000
@@ -663,7 +663,7 @@
             sxml = SongXMLBuilder()
             text = u''
             multiple = []
-            for i in range (0, self.VerseListWidget.rowCount()):
+            for i in range(0, self.VerseListWidget.rowCount()):
                 item = self.VerseListWidget.item(i, 0)
                 verseId = unicode(item.data(QtCore.Qt.UserRole).toString())
                 bits = verseId.split(u':')