raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

verseOrder fix

Browse Source
This commit is contained in:
Andreas Preikschat 2011-01-24 21:01:09 +01:00
parent e7b1f88e53
commit d087bbb53a
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openlp/plugins/songs/forms/songexportform.py
View File

@ -305,16 +305,20 @@ class SongExportForm(OpenLPWizard):
""" """
Adds the double clicked item to the list of selected songs and removes Adds the double clicked item to the list of selected songs and removes
it from the list of availables songs. it from the list of availables songs.
``item``
The *QListWidgetItem* which was double clicked.
""" """
row = self.availableListWidget.row(item) self.availableListWidget.takeItem(self.availableListWidget.row(item))
self.availableListWidget.takeItem(row)
self.selectedListWidget.addItem(item) self.selectedListWidget.addItem(item)
def onSelectedListItemDoubleClicked(self, item): def onSelectedListItemDoubleClicked(self, item):
""" """
Adds the double clicked item back to the list of available songs and Adds the double clicked item back to the list of available songs and
removes it from the list of selected songs. removes it from the list of selected songs.
``ìtem``
The *QListWidgetItem* which was double clicked.
""" """
row = self.selectedListWidget.row(item) self.selectedListWidget.takeItem(self.selectedListWidget.row(item))
self.selectedListWidget.takeItem(row)
self.availableListWidget.addItem(item) self.availableListWidget.addItem(item)

3
openlp/plugins/songs/lib/openlyricsexport.py
View File

@ -30,7 +30,7 @@ songs from the database.
import logging import logging
import os import os
from lxml import etree, objectify from lxml import etree
from openlp.core.lib import Receiver, translate from openlp.core.lib import Receiver, translate
from openlp.plugins.songs.lib import OpenLyrics from openlp.plugins.songs.lib import OpenLyrics
@ -55,6 +55,7 @@ class OpenLyricsExport(object):
""" """
Export the songs. Export the songs.
""" """
log.debug(u'started OpenLyricsExport')
openLyrics = OpenLyrics(self.manager) openLyrics = OpenLyrics(self.manager)
self.parent.progressBar.setMaximum(len(self.songs)) self.parent.progressBar.setMaximum(len(self.songs))
for song in self.songs: for song in self.songs:

4
openlp/plugins/songs/lib/xml.py
View File

@ -486,9 +486,9 @@ class OpenLyrics(object):
for name in temp_verse_order: for name in temp_verse_order:
if name[0] == previous_type: if name[0] == previous_type:
if name[1] != previous_number: if name[1] != previous_number:
verse_order.append(u''.join((name[0], name[1]))) verse_order.append(u''.join((name[0][0], name[1])))
else: else:
verse_order.append(u''.join((name[0], name[1]))) verse_order.append(u''.join((name[0][0], name[1])))
previous_type = name[0] previous_type = name[0]
previous_number = name[1] previous_number = name[1]
previous_part = name[2] previous_part = name[2]