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

fixes

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openlp/plugins/songs/forms/songimportform.py
View File

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

1
openlp/plugins/songs/lib/foilpresenterimport.py
View File

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