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

added a placeholder to show the topics of a song

Browse Source 
- and included the empty-description for lists always
This commit is contained in:
Johannes Thomas Meyer 2017-06-04 02:53:33 +02:00 committed by Samuel Mehrbrodt
parent 88642395ee
commit 0f3d86f0d1
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openlp/plugins/songs/lib/mediaitem.py
View File

@ -681,7 +681,8 @@ class SongMediaItem(MediaManagerItem):
'copyright': song.copyright, 'copyright': song.copyright,
'songbook_entries': make_list(songbooks), 'songbook_entries': make_list(songbooks),
'ccli_license': Settings().value('core/ccli number'), 'ccli_license': Settings().value('core/ccli number'),
'ccli_license_label': translate('SongsPlugin.MediaItem', 'CCLI License') 'ccli_license_label': translate('SongsPlugin.MediaItem', 'CCLI License'),
'topics': make_list([topic.name for topic in song.topics])
}) })
return authors_all return authors_all

15
openlp/plugins/songs/lib/songstab.py
View File

@ -138,19 +138,20 @@ class SongsTab(SettingsTab):
['title', translate('SongsPlugin.SongsTab', 'Song Title'), False, False], ['title', translate('SongsPlugin.SongsTab', 'Song Title'), False, False],
['alternate_title', translate('SongsPlugin.SongsTab', 'Alternate Title'), False, False], ['alternate_title', translate('SongsPlugin.SongsTab', 'Alternate Title'), False, False],
['written_by', const.format(translate('SongsPlugin.SongsTab', 'Written By')), True, False], ['written_by', const.format(translate('SongsPlugin.SongsTab', 'Written By')), True, False],
['authors_none', translate('SongsPlugin.SongsTab', 'Authors when type is not set'), True, True], ['authors_none', translate('SongsPlugin.SongsTab', 'Authors when type is not set'), False, True],
['authors_words_label', const.format(AuthorType.Types[AuthorType.Words]), False, False], ['authors_words_label', const.format(AuthorType.Types[AuthorType.Words]), False, False],
['authors_words', translate('SongsPlugin.SongsTab', 'Authors (Type Words)'), True, True], ['authors_words', translate('SongsPlugin.SongsTab', 'Authors (Type Words)'), False, True],
['authors_music_label', const.format(AuthorType.Types[AuthorType.Music]), False, False], ['authors_music_label', const.format(AuthorType.Types[AuthorType.Music]), False, False],
['authors_music', translate('SongsPlugin.SongsTab', 'Authors (Type Music)'), True, True], ['authors_music', translate('SongsPlugin.SongsTab', 'Authors (Type Music)'), False, True],
['authors_words_music_label', const.format(AuthorType.Types[AuthorType.WordsAndMusic]), False, False], ['authors_words_music_label', const.format(AuthorType.Types[AuthorType.WordsAndMusic]), False, False],
['authors_words_music', translate('SongsPlugin.SongsTab', 'Authors (Type Words and Music)'), True, True], ['authors_words_music', translate('SongsPlugin.SongsTab', 'Authors (Type Words and Music)'), False, True],
['authors_translation_label', const.format(AuthorType.Types[AuthorType.Translation]), False, False], ['authors_translation_label', const.format(AuthorType.Types[AuthorType.Translation]), False, False],
['authors_translation', translate('SongsPlugin.SongsTab', 'Authors (Type Translation)'), True, True], ['authors_translation', translate('SongsPlugin.SongsTab', 'Authors (Type Translation)'), False, True],
['copyright', translate('SongsPlugin.SongsTab', 'Copyright information'), True, False], ['copyright', translate('SongsPlugin.SongsTab', 'Copyright information'), True, False],
['songbook_entries', translate('SongsPlugin.SongsTab', 'Songbook Entries'), True, True], ['songbook_entries', translate('SongsPlugin.SongsTab', 'Songbook Entries'), False, True],
['ccli_license', translate('SongsPlugin.SongsTab', 'CCLI License'), True, False], ['ccli_license', translate('SongsPlugin.SongsTab', 'CCLI License'), True, False],
['ccli_license_label', const.format(translate('SongsPlugin.SongsTab', 'CCLI License')), False, False], ['ccli_license_label', const.format(translate('SongsPlugin.SongsTab', 'CCLI License')), False, False],
['topics', translate('SongsPlugin.SongsTab', 'Topics'), False, True],
] ]
placeholder_info = '<table style="background: #eee">\n<tr><th><b>{ph}</b></th><th><b>{desc}</b></th></tr>\n'\ placeholder_info = '<table style="background: #eee">\n<tr><th><b>{ph}</b></th><th><b>{desc}</b></th></tr>\n'\
@ -164,7 +165,7 @@ class SongsTab(SettingsTab):
placeholder_info += '\n<br/>¹ {}'.format(translate('SongsPlugin.SongsTab', 'can be empty')) placeholder_info += '\n<br/>¹ {}'.format(translate('SongsPlugin.SongsTab', 'can be empty'))
placeholder_info += '\n<br/>² {}:<pre>{{#first}} <i>True</i> {}<br/>{{entry}} {}<br/>' \ placeholder_info += '\n<br/>² {}:<pre>{{#first}} <i>True</i> {}<br/>{{entry}} {}<br/>' \
'{{#last}} <i>True</i> {}</pre>'\ '{{#last}} <i>True</i> {}</pre>'\
.format(translate('SongsPlugin.SongsTab', 'list of entries'), .format(translate('SongsPlugin.SongsTab', 'list of entries, can be empty'),
translate('SongsPlugin.SongsTab', 'for first element of list'), translate('SongsPlugin.SongsTab', 'for first element of list'),
translate('SongsPlugin.SongsTab', 'iterates over all entries'), translate('SongsPlugin.SongsTab', 'iterates over all entries'),
translate('SongsPlugin.SongsTab', 'for last element')) translate('SongsPlugin.SongsTab', 'for last element'))