This commit is contained in:
Andreas Preikschat 2011-04-18 19:15:41 +02:00
parent a530851124
commit 16fa78bbe3
2 changed files with 2 additions and 2 deletions

View File

@ -741,13 +741,12 @@ class SongImportForm(OpenLPWizard):
filenames=self.getListOfFiles(self.foilPresenterFileListWidget)
)
test = importer.do_import()
importer.write_error_report()
if isinstance(test, bool):
raise received_boolean
if importer.stop_import_flag:
self.progressLabel.setText(translate('SongsPlugin.SongImportForm',
'Song import has been cancelled.'))
elif importer.import_error_log:
elif importer.error_log:
error_path = importer.write_error_report()
self.progressLabel.setTextInteractionFlags(
QtCore.Qt.TextSelectableByMouse)

View File

@ -237,6 +237,7 @@ class FoilPresenter(object):
self._process_topics(foilpresenterfolie, song)
clean_song(self.manager, song)
self.manager.save_object(song)
return song.id
def _child(self, element):
"""