forked from openlp/openlp
Remove blank lines
This commit is contained in:
parent
cf8feead1b
commit
99f0d37253
|
@ -697,7 +697,6 @@ class SongMediaItem(MediaManagerItem):
|
||||||
if Settings().value('core/ccli number'):
|
if Settings().value('core/ccli number'):
|
||||||
item.raw_footer.append(translate('SongsPlugin.MediaItem', 'CCLI License: ') +
|
item.raw_footer.append(translate('SongsPlugin.MediaItem', 'CCLI License: ') +
|
||||||
Settings().value('core/ccli number'))
|
Settings().value('core/ccli number'))
|
||||||
|
|
||||||
footer_template = Settings().value('songs/footer template')
|
footer_template = Settings().value('songs/footer template')
|
||||||
# Keep this in sync with the list in songstab.py
|
# Keep this in sync with the list in songstab.py
|
||||||
vars = {
|
vars = {
|
||||||
|
@ -722,14 +721,12 @@ class SongMediaItem(MediaManagerItem):
|
||||||
'ccli_number': song.ccli_number,
|
'ccli_number': song.ccli_number,
|
||||||
'topics': [topic.name for topic in song.topics]
|
'topics': [topic.name for topic in song.topics]
|
||||||
}
|
}
|
||||||
|
|
||||||
try:
|
try:
|
||||||
item.footer_html = mako.template.Template(footer_template).render_unicode(**vars).replace('\n', '')
|
item.footer_html = mako.template.Template(footer_template).render_unicode(**vars).replace('\n', '')
|
||||||
except mako.exceptions.SyntaxException:
|
except mako.exceptions.SyntaxException:
|
||||||
log.error('Failed to render Song footer html:\n' + mako.exceptions.text_error_template().render())
|
log.error('Failed to render Song footer html:\n' + mako.exceptions.text_error_template().render())
|
||||||
critical_error_message_box(message=translate('SongsPlugin.MediaItem',
|
critical_error_message_box(message=translate('SongsPlugin.MediaItem',
|
||||||
'Failed to render Song footer html.\nSee log for details'))
|
'Failed to render Song footer html.\nSee log for details'))
|
||||||
|
|
||||||
return authors_all
|
return authors_all
|
||||||
|
|
||||||
def service_load(self, item):
|
def service_load(self, item):
|
||||||
|
|
|
@ -84,7 +84,6 @@ class SongsTab(SettingsTab):
|
||||||
self.neolatin_notation_radio_button.setObjectName('neolatin_notation_radio_button')
|
self.neolatin_notation_radio_button.setObjectName('neolatin_notation_radio_button')
|
||||||
self.chords_layout.addWidget(self.neolatin_notation_radio_button)
|
self.chords_layout.addWidget(self.neolatin_notation_radio_button)
|
||||||
self.left_layout.addWidget(self.chords_group_box)
|
self.left_layout.addWidget(self.chords_group_box)
|
||||||
|
|
||||||
# Footer group box
|
# Footer group box
|
||||||
self.footer_group_box = QtWidgets.QGroupBox(self.left_column)
|
self.footer_group_box = QtWidgets.QGroupBox(self.left_column)
|
||||||
self.footer_group_box.setObjectName('footer_group_box')
|
self.footer_group_box.setObjectName('footer_group_box')
|
||||||
|
@ -101,7 +100,6 @@ class SongsTab(SettingsTab):
|
||||||
self.footer_reset_button = QtWidgets.QPushButton(self.footer_group_box)
|
self.footer_reset_button = QtWidgets.QPushButton(self.footer_group_box)
|
||||||
self.footer_layout.addWidget(self.footer_reset_button, alignment=QtCore.Qt.AlignRight)
|
self.footer_layout.addWidget(self.footer_reset_button, alignment=QtCore.Qt.AlignRight)
|
||||||
self.right_layout.addWidget(self.footer_group_box)
|
self.right_layout.addWidget(self.footer_group_box)
|
||||||
|
|
||||||
self.left_layout.addStretch()
|
self.left_layout.addStretch()
|
||||||
self.right_layout.addStretch()
|
self.right_layout.addStretch()
|
||||||
self.tool_bar_active_check_box.stateChanged.connect(self.on_tool_bar_active_check_box_changed)
|
self.tool_bar_active_check_box.stateChanged.connect(self.on_tool_bar_active_check_box_changed)
|
||||||
|
|
Loading…
Reference in New Issue