From 788e8a2b5570ffe1117ca940c165baa89171ffbd Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Tue, 24 Aug 2010 10:08:07 +0200 Subject: [PATCH] Fixed a problem with the getListOfFiles function which was returning a list of repr'd QListWidgetItems instead of a list of strings. Made a SongFormat.ccli -> SongFormat.CCLI after renaming some fields caught this too. --- openlp/plugins/songs/forms/songimportform.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/songs/forms/songimportform.py b/openlp/plugins/songs/forms/songimportform.py index e310a2509..5bf0af06c 100644 --- a/openlp/plugins/songs/forms/songimportform.py +++ b/openlp/plugins/songs/forms/songimportform.py @@ -177,7 +177,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_SongImportWizard): 'file to import from.')) self.wordsOfWorshipAddButton.setFocus() return False - elif source_format == SongFormat.ccli: + elif source_format == SongFormat.CCLI: if self.ccliFileListWidget.count() == 0: QtGui.QMessageBox.critical(self, translate('SongsPlugin.ImportWizardForm', @@ -233,7 +233,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_SongImportWizard): def getListOfFiles(self, listbox): files = [] for row in range(0, listbox.count()): - files.append(unicode(listbox.item(row))) + files.append(unicode(listbox.item(row).text())) return files def removeSelectedItems(self, listbox):