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
1=== modified file 'openlp/core/lib/serviceitem.py'
2--- openlp/core/lib/serviceitem.py 2009-09-29 04:58:26 +0000
3+++ openlp/core/lib/serviceitem.py 2009-10-09 23:10:31 +0000
4@@ -180,7 +180,7 @@
5 self.service_item_type = ServiceType.Command
6 self.service_item_path = path
7 self.service_frames.append(
8- {u'title': frame_title, u'command': None})
9+ {u'title': frame_title, u'command': None})
10
11 def get_service_repr(self):
12 """
13
14=== modified file 'openlp/plugins/bibles/forms/bibleimportform.py'
15--- openlp/plugins/bibles/forms/bibleimportform.py 2009-09-25 23:06:54 +0000
16+++ openlp/plugins/bibles/forms/bibleimportform.py 2009-10-09 23:10:31 +0000
17@@ -180,7 +180,7 @@
18 self.ProgressBar.setValue(self.barmax)
19 # tell bibleplugin to reload the bibles
20 Receiver().send_message(u'pre_load_bibles')
21- reply = QtGui.QMessageBox.information(self,
22+ QtGui.QMessageBox.information(self,
23 translate(u'BibleMediaItem', u'Information'),
24 translate(u'BibleMediaItem', message))
25
26
27=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
28--- openlp/plugins/bibles/lib/mediaitem.py 2009-10-09 12:48:22 +0000
29+++ openlp/plugins/bibles/lib/mediaitem.py 2009-10-09 23:10:31 +0000
30@@ -517,6 +517,6 @@
31 self.version = unicode(self.parent.biblemanager.get_meta_data(
32 bible, u'Version').value)
33 else:
34- reply = QtGui.QMessageBox.information(self,
35+ QtGui.QMessageBox.information(self,
36 translate(u'BibleMediaItem', u'Information'),
37 translate(u'BibleMediaItem', message))
38
39=== modified file 'openlp/plugins/images/lib/mediaitem.py'
40--- openlp/plugins/images/lib/mediaitem.py 2009-10-03 18:39:44 +0000
41+++ openlp/plugins/images/lib/mediaitem.py 2009-10-09 23:10:31 +0000
42@@ -115,7 +115,6 @@
43 except:
44 #if not present do not worry
45 pass
46- item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
47 row = self.ListView.row(item)
48 self.ListView.takeItem(row)
49 self.parent.config.set_list(self.ConfigSection, self.getFileList())
50
51=== modified file 'openlp/plugins/media/lib/mediaitem.py'
52--- openlp/plugins/media/lib/mediaitem.py 2009-10-07 16:16:21 +0000
53+++ openlp/plugins/media/lib/mediaitem.py 2009-10-09 23:10:31 +0000
54@@ -104,7 +104,6 @@
55 def onDeleteClick(self):
56 item = self.ListView.currentItem()
57 if item is not None:
58- item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
59 row = self.ListView.row(item)
60 self.ListView.takeItem(row)
61 self.parent.config.set_list(
62
63=== modified file 'openlp/plugins/presentations/lib/mediaitem.py'
64--- openlp/plugins/presentations/lib/mediaitem.py 2009-10-08 23:24:26 +0000
65+++ openlp/plugins/presentations/lib/mediaitem.py 2009-10-09 23:10:31 +0000
66@@ -118,7 +118,6 @@
67 def onDeleteClick(self):
68 item = self.ListView.currentItem()
69 if item is not None:
70- item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
71 row = self.ListView.row(item)
72 self.ListView.takeItem(row)
73 self.parent.config.set_list(
74
75=== modified file 'openlp/plugins/remotes/remoteplugin.py'
76--- openlp/plugins/remotes/remoteplugin.py 2009-10-07 05:09:35 +0000
77+++ openlp/plugins/remotes/remoteplugin.py 2009-10-09 23:10:31 +0000
78@@ -21,7 +21,7 @@
79
80 from PyQt4 import QtNetwork, QtCore
81
82-from openlp.core.lib import Plugin, Receiver, translate
83+from openlp.core.lib import Plugin, Receiver
84 from openlp.plugins.remotes.lib import RemoteTab
85
86 class RemotesPlugin(Plugin):
87
88=== modified file 'openlp/plugins/songs/forms/editsongform.py'
89--- openlp/plugins/songs/forms/editsongform.py 2009-09-25 15:49:00 +0000
90+++ openlp/plugins/songs/forms/editsongform.py 2009-10-09 23:10:31 +0000
91@@ -286,7 +286,7 @@
92 def onThemeComboChanged(self, item):
93 if item == 0:
94 #None means no Theme
95- self.song.song_theme = None
96+ self.song.theme_name = None
97 else:
98 them_name = unicode(self.ThemeSelectionComboItem.itemText(item))
99 self.song.theme_name = them_name
100@@ -339,8 +339,7 @@
101 self.VerseListWidget.repaint()
102
103 def onVerseDeleteButtonClicked(self):
104- item = self.VerseListWidget.takeItem(self.VerseListWidget.currentRow())
105- item = None
106+ self.VerseListWidget.takeItem(self.VerseListWidget.currentRow())
107 self.VerseEditButton.setEnabled(False)
108 self.VerseDeleteButton.setEnabled(False)
109