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 removing a song specific theme

Fix a few unused variables
-- 
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/13155
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py	2009-09-29 04:58:26 +0000
+++ openlp/core/lib/serviceitem.py	2009-10-09 23:10:31 +0000
@@ -180,7 +180,7 @@
         self.service_item_type = ServiceType.Command
         self.service_item_path = path
         self.service_frames.append(
-            {u'title': frame_title, u'command':  None})
+            {u'title': frame_title, u'command': None})
 
     def get_service_repr(self):
         """

=== modified file 'openlp/plugins/bibles/forms/bibleimportform.py'
--- openlp/plugins/bibles/forms/bibleimportform.py	2009-09-25 23:06:54 +0000
+++ openlp/plugins/bibles/forms/bibleimportform.py	2009-10-09 23:10:31 +0000
@@ -180,7 +180,7 @@
                 self.ProgressBar.setValue(self.barmax)
                 # tell bibleplugin to reload the bibles
                 Receiver().send_message(u'pre_load_bibles')
-                reply = QtGui.QMessageBox.information(self,
+                QtGui.QMessageBox.information(self,
                     translate(u'BibleMediaItem', u'Information'),
                     translate(u'BibleMediaItem', message))
 

=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py	2009-10-09 12:48:22 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py	2009-10-09 23:10:31 +0000
@@ -517,6 +517,6 @@
             self.version = unicode(self.parent.biblemanager.get_meta_data(
                 bible, u'Version').value)
         else:
-            reply = QtGui.QMessageBox.information(self,
+            QtGui.QMessageBox.information(self,
                 translate(u'BibleMediaItem', u'Information'),
                 translate(u'BibleMediaItem', message))

=== modified file 'openlp/plugins/images/lib/mediaitem.py'
--- openlp/plugins/images/lib/mediaitem.py	2009-10-03 18:39:44 +0000
+++ openlp/plugins/images/lib/mediaitem.py	2009-10-09 23:10:31 +0000
@@ -115,7 +115,6 @@
             except:
                 #if not present do not worry
                 pass
-            item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
             row = self.ListView.row(item)
             self.ListView.takeItem(row)
             self.parent.config.set_list(self.ConfigSection, self.getFileList())

=== modified file 'openlp/plugins/media/lib/mediaitem.py'
--- openlp/plugins/media/lib/mediaitem.py	2009-10-07 16:16:21 +0000
+++ openlp/plugins/media/lib/mediaitem.py	2009-10-09 23:10:31 +0000
@@ -104,7 +104,6 @@
     def onDeleteClick(self):
         item = self.ListView.currentItem()
         if item is not None:
-            item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
             row = self.ListView.row(item)
             self.ListView.takeItem(row)
             self.parent.config.set_list(

=== modified file 'openlp/plugins/presentations/lib/mediaitem.py'
--- openlp/plugins/presentations/lib/mediaitem.py	2009-10-08 23:24:26 +0000
+++ openlp/plugins/presentations/lib/mediaitem.py	2009-10-09 23:10:31 +0000
@@ -118,7 +118,6 @@
     def onDeleteClick(self):
         item = self.ListView.currentItem()
         if item is not None:
-            item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
             row = self.ListView.row(item)
             self.ListView.takeItem(row)
             self.parent.config.set_list(

=== modified file 'openlp/plugins/remotes/remoteplugin.py'
--- openlp/plugins/remotes/remoteplugin.py	2009-10-07 05:09:35 +0000
+++ openlp/plugins/remotes/remoteplugin.py	2009-10-09 23:10:31 +0000
@@ -21,7 +21,7 @@
 
 from PyQt4 import QtNetwork, QtCore
 
-from openlp.core.lib import Plugin, Receiver, translate
+from openlp.core.lib import Plugin, Receiver
 from openlp.plugins.remotes.lib import RemoteTab
 
 class RemotesPlugin(Plugin):

=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py	2009-09-25 15:49:00 +0000
+++ openlp/plugins/songs/forms/editsongform.py	2009-10-09 23:10:31 +0000
@@ -286,7 +286,7 @@
     def onThemeComboChanged(self, item):
         if item == 0:
             #None means no Theme
-            self.song.song_theme = None
+            self.song.theme_name = None
         else:
             them_name = unicode(self.ThemeSelectionComboItem.itemText(item))
             self.song.theme_name = them_name
@@ -339,8 +339,7 @@
         self.VerseListWidget.repaint()
 
     def onVerseDeleteButtonClicked(self):
-        item = self.VerseListWidget.takeItem(self.VerseListWidget.currentRow())
-        item = None
+        self.VerseListWidget.takeItem(self.VerseListWidget.currentRow())
         self.VerseEditButton.setEnabled(False)
         self.VerseDeleteButton.setEnabled(False)