From 94fa2e912a45ef989e3ea945ff2b4dc280b6fb30 Mon Sep 17 00:00:00 2001 From: Samuel Mehrbrodt Date: Fri, 22 Feb 2019 08:34:40 +0100 Subject: [PATCH] Fix songbook as first slide display --- openlp/plugins/songs/lib/mediaitem.py | 8 +++++--- openlp/plugins/songs/lib/songstab.py | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index 96b94c9f7..ff5c96be7 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -585,9 +585,11 @@ class SongMediaItem(MediaManagerItem): if Settings().value('songs/add songbook slide') and song.songbook_entries: first_slide = '\n' for songbook_entry in song.songbook_entries: - first_slide = first_slide + '{book}/{num}/{pub}\n\n'.format(book=songbook_entry.songbook.name, - num=songbook_entry.entry, - pub=songbook_entry.songbook.publisher) + first_slide += '{book} #{num}'.format(book=songbook_entry.songbook.name, + num=songbook_entry.entry) + if songbook_entry.songbook.publisher: + first_slide += ' ({pub})'.format(pub=songbook_entry.songbook.publisher) + first_slide += '\n\n' service_item.add_from_text(first_slide, 'O1') # no verse list or only 1 space (in error) diff --git a/openlp/plugins/songs/lib/songstab.py b/openlp/plugins/songs/lib/songstab.py index 850ce19a2..0e6cfeca9 100644 --- a/openlp/plugins/songs/lib/songstab.py +++ b/openlp/plugins/songs/lib/songstab.py @@ -116,7 +116,7 @@ class SongsTab(SettingsTab): self.add_from_service_check_box.setText(translate('SongsPlugin.SongsTab', 'Import missing songs from Service files')) self.songbook_slide_check_box.setText(translate('SongsPlugin.SongsTab', - 'Add Songbooks as first side')) + 'Add Songbooks as first slide')) self.display_songbook_check_box.setText(translate('SongsPlugin.SongsTab', 'Display songbook in footer')) self.display_written_by_check_box.setText(translate( 'SongsPlugin.SongsTab', 'Show "Written by:" in footer for unspecified authors'))