OpenLP

Merge lp:~meths/openlp/trivialfixes into lp:openlp

  1. trivialfixes
  2. Merge into trunk
Proposed by Jon Tibble
Status: Merged
Merged at revision: not available
Proposed branch: lp:~meths/openlp/trivialfixes
Merge into: lp:openlp
Diff against target: 108 lines
8 files modified
openlp/core/lib/serviceitem.py (+1/-1)
openlp/plugins/bibles/forms/bibleimportform.py (+1/-1)
openlp/plugins/bibles/lib/mediaitem.py (+1/-1)
openlp/plugins/images/lib/mediaitem.py (+0/-1)
openlp/plugins/media/lib/mediaitem.py (+0/-1)
openlp/plugins/presentations/lib/mediaitem.py (+0/-1)
openlp/plugins/remotes/remoteplugin.py (+1/-1)
openlp/plugins/songs/forms/editsongform.py (+2/-3)
To merge this branch: bzr merge lp:~meths/openlp/trivialfixes
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Review via email: mp+13155@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jon Tibble (meths) wrote :

Fix removing a song specific theme

Fix a few unused variables

Revision history for this message
Tim Bentley (trb143) wrote :

Approved and merged

review: Approve
lp:~meths/openlp/trivialfixes updated
593. By Tim Bentley

Apply fixes for Jon

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
180 self.service_item_type = ServiceType.Command180 self.service_item_type = ServiceType.Command
181 self.service_item_path = path181 self.service_item_path = path
182 self.service_frames.append(182 self.service_frames.append(
183 {u'title': frame_title, u'command': None})183 {u'title': frame_title, u'command': None})
184184
185 def get_service_repr(self):185 def get_service_repr(self):
186 """186 """
187187
=== 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 @@
180 self.ProgressBar.setValue(self.barmax)180 self.ProgressBar.setValue(self.barmax)
181 # tell bibleplugin to reload the bibles181 # tell bibleplugin to reload the bibles
182 Receiver().send_message(u'pre_load_bibles')182 Receiver().send_message(u'pre_load_bibles')
183 reply = QtGui.QMessageBox.information(self,183 QtGui.QMessageBox.information(self,
184 translate(u'BibleMediaItem', u'Information'),184 translate(u'BibleMediaItem', u'Information'),
185 translate(u'BibleMediaItem', message))185 translate(u'BibleMediaItem', message))
186186
187187
=== 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 @@
517 self.version = unicode(self.parent.biblemanager.get_meta_data(517 self.version = unicode(self.parent.biblemanager.get_meta_data(
518 bible, u'Version').value)518 bible, u'Version').value)
519 else:519 else:
520 reply = QtGui.QMessageBox.information(self,520 QtGui.QMessageBox.information(self,
521 translate(u'BibleMediaItem', u'Information'),521 translate(u'BibleMediaItem', u'Information'),
522 translate(u'BibleMediaItem', message))522 translate(u'BibleMediaItem', message))
523523
=== 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 @@
115 except:115 except:
116 #if not present do not worry116 #if not present do not worry
117 pass117 pass
118 item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
119 row = self.ListView.row(item)118 row = self.ListView.row(item)
120 self.ListView.takeItem(row)119 self.ListView.takeItem(row)
121 self.parent.config.set_list(self.ConfigSection, self.getFileList())120 self.parent.config.set_list(self.ConfigSection, self.getFileList())
122121
=== 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 @@
104 def onDeleteClick(self):104 def onDeleteClick(self):
105 item = self.ListView.currentItem()105 item = self.ListView.currentItem()
106 if item is not None:106 if item is not None:
107 item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
108 row = self.ListView.row(item)107 row = self.ListView.row(item)
109 self.ListView.takeItem(row)108 self.ListView.takeItem(row)
110 self.parent.config.set_list(109 self.parent.config.set_list(
111110
=== 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 @@
118 def onDeleteClick(self):118 def onDeleteClick(self):
119 item = self.ListView.currentItem()119 item = self.ListView.currentItem()
120 if item is not None:120 if item is not None:
121 item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
122 row = self.ListView.row(item)121 row = self.ListView.row(item)
123 self.ListView.takeItem(row)122 self.ListView.takeItem(row)
124 self.parent.config.set_list(123 self.parent.config.set_list(
125124
=== 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 @@
2121
22from PyQt4 import QtNetwork, QtCore22from PyQt4 import QtNetwork, QtCore
2323
24from openlp.core.lib import Plugin, Receiver, translate24from openlp.core.lib import Plugin, Receiver
25from openlp.plugins.remotes.lib import RemoteTab25from openlp.plugins.remotes.lib import RemoteTab
2626
27class RemotesPlugin(Plugin):27class RemotesPlugin(Plugin):
2828
=== 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 @@
286 def onThemeComboChanged(self, item):286 def onThemeComboChanged(self, item):
287 if item == 0:287 if item == 0:
288 #None means no Theme288 #None means no Theme
289 self.song.song_theme = None289 self.song.theme_name = None
290 else:290 else:
291 them_name = unicode(self.ThemeSelectionComboItem.itemText(item))291 them_name = unicode(self.ThemeSelectionComboItem.itemText(item))
292 self.song.theme_name = them_name292 self.song.theme_name = them_name
@@ -339,8 +339,7 @@
339 self.VerseListWidget.repaint()339 self.VerseListWidget.repaint()
340340
341 def onVerseDeleteButtonClicked(self):341 def onVerseDeleteButtonClicked(self):
342 item = self.VerseListWidget.takeItem(self.VerseListWidget.currentRow())342 self.VerseListWidget.takeItem(self.VerseListWidget.currentRow())
343 item = None
344 self.VerseEditButton.setEnabled(False)343 self.VerseEditButton.setEnabled(False)
345 self.VerseDeleteButton.setEnabled(False)344 self.VerseDeleteButton.setEnabled(False)
346345