Merge lp:~raoul-snyman/openlp/songmaintenance into lp:openlp

Proposed by Raoul Snyman
Status: Merged
Merged at revision: not available
Proposed branch: lp:~raoul-snyman/openlp/songmaintenance
Merge into: lp:openlp
Diff against target: None lines
To merge this branch: bzr merge lp:~raoul-snyman/openlp/songmaintenance
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Review via email: mp+11216@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Make the "Edit All" button work.

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

Approved.
May have fund with blank lines though!

review: Approve
520. By Raoul Snyman

Merge from lp:~raoul-snyman/openlp/songmaintenance

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openlp/plugins/songs/forms/editsongform.py'
2--- openlp/plugins/songs/forms/editsongform.py 2009-09-02 01:44:09 +0000
3+++ openlp/plugins/songs/forms/editsongform.py 2009-09-04 17:19:54 +0000
4@@ -22,8 +22,8 @@
5
6 from PyQt4 import Qt, QtCore, QtGui
7
8-from openlp.core.lib import SongXMLBuilder, SongXMLParser, \
9- translate, Receiver
10+from openlp.core.lib import SongXMLBuilder, SongXMLParser, Receiver, \
11+ translate
12 from openlp.plugins.songs.forms import EditVerseForm
13 from openlp.plugins.songs.lib.models import Song
14 from editsongdialog import Ui_EditSongDialog
15@@ -61,6 +61,8 @@
16 QtCore.SIGNAL(u'clicked()'), self.onVerseAddButtonClicked)
17 QtCore.QObject.connect(self.VerseEditButton,
18 QtCore.SIGNAL(u'clicked()'), self.onVerseEditButtonClicked)
19+ QtCore.QObject.connect(self.VerseEditAllButton,
20+ QtCore.SIGNAL(u'clicked()'), self.onVerseEditAllButtonClicked)
21 QtCore.QObject.connect(self.VerseDeleteButton,
22 QtCore.SIGNAL(u'clicked()'), self.onVerseDeleteButtonClicked)
23 QtCore.QObject.connect(self.VerseListWidget,
24@@ -287,6 +289,24 @@
25 self.VerseEditButton.setEnabled(False)
26 self.VerseDeleteButton.setEnabled(False)
27
28+ def onVerseEditAllButtonClicked(self):
29+ verse_list = u''
30+ if self.VerseListWidget.count() > 0:
31+ for row in range(0, self.VerseListWidget.count()):
32+ item = self.VerseListWidget.item(row)
33+ verse_list += item.text()
34+ verse_list += u'\n\n'
35+ self.verse_form.setVerse(verse_list)
36+ else:
37+ self.verse_form.setVerse(u'')
38+ if self.verse_form.exec_():
39+ verse_list = self.verse_form.getVerse()
40+ verse_list = verse_list.replace(u'\r\n', u'\n')
41+ self.VerseListWidget.clear()
42+ for row in verse_list.split(u'\n\n'):
43+ self.VerseListWidget.addItem(row)
44+ self.VerseListWidget.repaint()
45+
46 def onVerseDeleteButtonClicked(self):
47 item = self.VerseListWidget.takeItem(self.VerseListWidget.currentRow())
48 item = None