diff --git a/openlp/plugins/bibles/lib/__init__.py b/openlp/plugins/bibles/lib/__init__.py index f2797e16d..34e1bf5a5 100644 --- a/openlp/plugins/bibles/lib/__init__.py +++ b/openlp/plugins/bibles/lib/__init__.py @@ -109,7 +109,7 @@ def parse_reference(reference): regular expression looks like this: 1. ``^\s*(?!\s)(?P[\d]*[^\d]+)(?(?:`` + range_string + ``(?:%(sep_l)s|(?=\s*$)))+)\s*$`` @@ -177,7 +177,7 @@ def parse_reference(reference): to_verse = -1 if to_chapter > from_chapter: ref_list.append((book, from_chapter, from_verse, -1)) - for i in range(from_chapter + 1, to_chapter - 1): + for i in range(from_chapter + 1, to_chapter): ref_list.append((book, i, 1, -1)) ref_list.append((book, to_chapter, 1, to_verse)) elif to_verse >= from_verse or to_verse == -1: diff --git a/openlp/plugins/songs/forms/songimportform.py b/openlp/plugins/songs/forms/songimportform.py index e3d7b635e..3de251462 100644 --- a/openlp/plugins/songs/forms/songimportform.py +++ b/openlp/plugins/songs/forms/songimportform.py @@ -784,7 +784,6 @@ class SongImportForm(OpenLPWizard): filenames=self.getListOfFiles(self.songBeamerFileListWidget) ) if importer.do_import(): - # reload songs self.progressLabel.setText( translate('SongsPlugin.SongImportForm', 'Finished import.')) else: diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index 67021616b..625f99f18 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -157,7 +157,6 @@ class SongMediaItem(MediaManagerItem): (5, u':/slides/slide_theme.png', translate('SongsPlugin.MediaItem', 'Themes')) ]) - self.configUpdated() def onSearchTextButtonClick(self): @@ -269,8 +268,8 @@ class SongMediaItem(MediaManagerItem): def onImportClick(self): if not hasattr(self, u'import_wizard'): self.import_wizard = SongImportForm(self, self.parent) - self.import_wizard.exec_() - Receiver.send_message(u'songs_load_list') + if self.import_wizard.exec_() == QtGui.QDialog.Accepted: + Receiver.send_message(u'songs_load_list') def onNewClick(self): log.debug(u'onNewClick')