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)


Fix HTTPBible verse count

Cleanups

Fix service manager DnD (Bug #595671)
-- 
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/27895
Your team OpenLP Core is requested to review the proposed merge of lp:~meths/openlp/trivialfixes into lp:openlp.

=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py	2010-06-15 15:22:26 +0000
+++ openlp/core/ui/mainwindow.py	2010-06-17 23:20:40 +0000
@@ -654,7 +654,8 @@
         settings.beginGroup(self.generalSettingsSection)
         if settings.value(u'screen blank', QtCore.QVariant(False)).toBool():
             self.LiveController.mainDisplaySetBackground()
-            if settings.value(u'blank warning', QtCore.QVariant(False)).toBool():
+            if settings.value(u'blank warning',
+                QtCore.QVariant(False)).toBool():
                 QtGui.QMessageBox.question(self,
                     translate(u'MainWindow', u'OpenLP Main Display Blanked'),
                     translate(u'MainWindow',

=== modified file 'openlp/core/ui/pluginform.py'
--- openlp/core/ui/pluginform.py	2010-06-09 23:08:12 +0000
+++ openlp/core/ui/pluginform.py	2010-06-17 23:20:40 +0000
@@ -67,9 +67,11 @@
             if plugin.status == PluginStatus.Active:
                 status_text = unicode(translate(u'PluginForm', u'%s (Active)'))
             elif plugin.status == PluginStatus.Inactive:
-                status_text = unicode(translate(u'PluginForm', u'%s (Inactive)'))
+                status_text = unicode(
+                    translate(u'PluginForm', u'%s (Inactive)'))
             elif plugin.status == PluginStatus.Disabled:
-                status_text = unicode(translate(u'PluginForm', u'%s (Disabled)'))
+                status_text = unicode(
+                    translate(u'PluginForm', u'%s (Disabled)'))
             item.setText(status_text % plugin.name)
             # If the plugin has an icon, set it!
             if plugin.icon:

=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py	2010-06-15 15:22:26 +0000
+++ openlp/core/ui/servicemanager.py	2010-06-17 23:20:40 +0000
@@ -927,13 +927,9 @@
                     endpos = len(self.serviceItems)
                 else:
                     endpos = self._getParentItemData(item) - 1
-                if endpos < startpos:
-                    newpos = endpos
-                else:
-                    newpos = endpos + 1
                 serviceItem = self.serviceItems[startpos]
                 self.serviceItems.remove(serviceItem)
-                self.serviceItems.insert(newpos, serviceItem)
+                self.serviceItems.insert(endpos, serviceItem)
                 self.repaintServiceList(endpos, startCount)
             else:
                 #we are not over anything so drop

=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py	2010-06-15 15:22:26 +0000
+++ openlp/core/ui/thememanager.py	2010-06-17 23:20:40 +0000
@@ -435,7 +435,8 @@
                 QtGui.QMessageBox.critical(
                     self, translate(u'ThemeManager', u'Error'),
                     translate(u'ThemeManager', u'File is not a valid theme.'))
-                log.exception(u'Theme file dosen\'t contain XML data %s' % filename)
+                log.exception(u'Theme file dosen\'t contain XML data %s' %
+                    filename)
         except (IOError, NameError):
             QtGui.QMessageBox.critical(
                 self, translate(u'ThemeManager', u'Error'),

=== modified file 'openlp/plugins/bibles/lib/http.py'
--- openlp/plugins/bibles/lib/http.py	2010-06-14 17:56:42 +0000
+++ openlp/plugins/bibles/lib/http.py	2010-06-17 23:20:40 +0000
@@ -137,10 +137,10 @@
             u'verses FROM chapters WHERE book_id = ?', (book[u'id'],))
         if chapters:
             return {
-                u'id': chapters[0][0],
-                u'book_id': chapters[0][1],
-                u'chapter': chapters[0][2],
-                u'verses': chapters[0][3]
+                u'id': chapters[chapter][0],
+                u'book_id': chapters[chapter][1],
+                u'chapter': chapters[chapter][2],
+                u'verses': chapters[chapter][3]
             }
         else:
             return None

=== modified file 'openlp/plugins/songs/forms/songimportwizard.py'
--- openlp/plugins/songs/forms/songimportwizard.py	2010-06-06 14:22:00 +0000
+++ openlp/plugins/songs/forms/songimportwizard.py	2010-06-17 23:20:40 +0000
@@ -113,7 +113,8 @@
         self.OpenIcon.addPixmap(QtGui.QPixmap(u':/general/general_open.png'),
             QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.DeleteIcon = QtGui.QIcon()
-        self.DeleteIcon.addPixmap(QtGui.QPixmap(u':/general/general_delete.png'),
+        self.DeleteIcon.addPixmap(
+            QtGui.QPixmap(u':/general/general_delete.png'),
             QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.OpenLyricsAddButton.setIcon(self.OpenIcon)
         self.OpenLyricsAddButton.setObjectName(u'OpenLyricsAddButton')
@@ -185,7 +186,8 @@
         self.CSVLayout.setObjectName(u'CSVLayout')
         self.CSVFilenameLabel = QtGui.QLabel(self.CSVPage)
         self.CSVFilenameLabel.setObjectName(u'CSVFilenameLabel')
-        self.CSVLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.CSVFilenameLabel)
+        self.CSVLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
+            self.CSVFilenameLabel)
         self.CSVFileLayout = QtGui.QHBoxLayout()
         self.CSVFileLayout.setSpacing(8)
         self.CSVFileLayout.setObjectName(u'CSVFileLayout')
@@ -196,7 +198,8 @@
         self.CSVBrowseButton.setIcon(self.OpenIcon)
         self.CSVBrowseButton.setObjectName(u'CSVBrowseButton')
         self.CSVFileLayout.addWidget(self.CSVBrowseButton)
-        self.CSVLayout.setLayout(0, QtGui.QFormLayout.FieldRole, self.CSVFileLayout)
+        self.CSVLayout.setLayout(0, QtGui.QFormLayout.FieldRole,
+            self.CSVFileLayout)
         self.FormatStackedWidget.addWidget(self.CSVPage)
         self.SourceLayout.addWidget(self.FormatStackedWidget)
         SongImportWizard.addPage(self.SourcePage)