diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index b4d36e3e1..645940fe6 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -717,8 +717,8 @@ class SlideController(DisplayController, RegistryProperties): self.play_slides_loop.setChecked(False) self.play_slides_loop.setIcon(build_icon(':/media/media_time.png')) if item.is_text(): - if (Settings().value(self.main_window.songs_settings_section + '/display songbar') - and not self.song_menu.menu().isEmpty()): + if (Settings().value(self.main_window.songs_settings_section + '/display songbar') and + not self.song_menu.menu().isEmpty()): self.toolbar.set_widget_visible(['song_menu'], True) if item.is_capable(ItemCapabilities.CanLoop) and len(item.get_frames()) > 1: self.toolbar.set_widget_visible(LOOP_LIST) diff --git a/openlp/plugins/alerts/lib/alertsmanager.py b/openlp/plugins/alerts/lib/alertsmanager.py index d4089c6c1..8d691c2bb 100644 --- a/openlp/plugins/alerts/lib/alertsmanager.py +++ b/openlp/plugins/alerts/lib/alertsmanager.py @@ -70,8 +70,8 @@ class AlertsManager(OpenLPMixin, RegistryMixin, QtCore.QObject, RegistryProperti """ Format and request the Alert and start the timer. """ - if not self.alert_list or (self.live_controller.display.screens.display_count == 1 - and not Settings().value('core/display on monitor')): + if not self.alert_list or (self.live_controller.display.screens.display_count == 1 and + not Settings().value('core/display on monitor')): return text = self.alert_list.pop(0) alert_tab = self.parent().settings_tab diff --git a/openlp/plugins/bibles/lib/opensong.py b/openlp/plugins/bibles/lib/opensong.py index 255989c34..8e3716435 100644 --- a/openlp/plugins/bibles/lib/opensong.py +++ b/openlp/plugins/bibles/lib/opensong.py @@ -124,7 +124,7 @@ class OpenSongBible(BibleDB): self.create_verse(db_book.id, chapter_number, verse_number, self.get_text(verse)) self.wizard.increment_progress_bar( translate('BiblesPlugin.Opensong', 'Importing %(bookname)s %(chapter)s...') % - {'bookname': db_book.name, 'chapter': chapter_number}) + {'bookname': db_book.name, 'chapter': chapter_number}) self.session.commit() self.application.process_events() except etree.XMLSyntaxError as inst: diff --git a/openlp/plugins/bibles/lib/osis.py b/openlp/plugins/bibles/lib/osis.py index e0d62045c..6bf294ff8 100644 --- a/openlp/plugins/bibles/lib/osis.py +++ b/openlp/plugins/bibles/lib/osis.py @@ -156,7 +156,7 @@ class OSISBible(BibleDB): self.create_verse(db_book.id, chapter_number, verse_number, verse.text.strip()) self.wizard.increment_progress_bar( translate('BiblesPlugin.OsisImport', 'Importing %(bookname)s %(chapter)s...') % - {'bookname': db_book.name, 'chapter': chapter_number}) + {'bookname': db_book.name, 'chapter': chapter_number}) else: # The chapter tags is used as milestones. For now we assume verses is also milestones chapter_number = 0 @@ -166,7 +166,7 @@ class OSISBible(BibleDB): chapter_number = element.get("osisID").split('.')[1] self.wizard.increment_progress_bar( translate('BiblesPlugin.OsisImport', 'Importing %(bookname)s %(chapter)s...') % - {'bookname': db_book.name, 'chapter': chapter_number}) + {'bookname': db_book.name, 'chapter': chapter_number}) elif element.tag == '{http://www.bibletechnologies.net/2003/OSIS/namespace}verse' \ and element.get('sID'): # If this tag marks the start of a verse, the verse text is between this tag and diff --git a/openlp/plugins/bibles/lib/zefania.py b/openlp/plugins/bibles/lib/zefania.py index b7d000c3a..1f79dcfd9 100644 --- a/openlp/plugins/bibles/lib/zefania.py +++ b/openlp/plugins/bibles/lib/zefania.py @@ -104,7 +104,7 @@ class ZefaniaBible(BibleDB): self.create_verse(db_book.id, chapter_number, verse_number, VERS.text.replace('
', '\n')) self.wizard.increment_progress_bar( translate('BiblesPlugin.Zefnia', 'Importing %(bookname)s %(chapter)s...') % - {'bookname': db_book.name, 'chapter': chapter_number}) + {'bookname': db_book.name, 'chapter': chapter_number}) self.session.commit() self.application.process_events() except Exception as e: diff --git a/openlp/plugins/songs/lib/importers/worshipassistant.py b/openlp/plugins/songs/lib/importers/worshipassistant.py index 1d3bec090..f5254be5b 100644 --- a/openlp/plugins/songs/lib/importers/worshipassistant.py +++ b/openlp/plugins/songs/lib/importers/worshipassistant.py @@ -179,6 +179,6 @@ class WorshipAssistantImport(SongImport): cleaned_verse_order_list.append(verse) self.verse_order_list = cleaned_verse_order_list if not self.finish(): - self.log_error(translate('SongsPlugin.WorshipAssistantImport', 'Record %d') % index - + (': "' + self.title + '"' if self.title else '')) + self.log_error(translate('SongsPlugin.WorshipAssistantImport', 'Record %d') % index + + (': "' + self.title + '"' if self.title else '')) songs_file.close() diff --git a/openlp/plugins/songs/lib/importers/zionworx.py b/openlp/plugins/songs/lib/importers/zionworx.py index 95c317eaa..54133974d 100644 --- a/openlp/plugins/songs/lib/importers/zionworx.py +++ b/openlp/plugins/songs/lib/importers/zionworx.py @@ -118,8 +118,8 @@ class ZionWorxImport(SongImport): self.add_verse(verse) title = self.title if not self.finish(): - self.log_error(translate('SongsPlugin.ZionWorxImport', 'Record %d') % index - + (': "' + title + '"' if title else '')) + self.log_error(translate('SongsPlugin.ZionWorxImport', 'Record %d') % index + + (': "' + title + '"' if title else '')) def _decode(self, str): """