mirror of https://gitlab.com/openlp/openlp.git
Head r1276
This commit is contained in:
commit
eccae3f61f
|
@ -72,7 +72,7 @@ class MainDisplay(DisplayWidget):
|
||||||
self.setWindowIcon(mainIcon)
|
self.setWindowIcon(mainIcon)
|
||||||
self.retranslateUi()
|
self.retranslateUi()
|
||||||
self.setStyleSheet(u'border: 0px; margin: 0px; padding: 0px;')
|
self.setStyleSheet(u'border: 0px; margin: 0px; padding: 0px;')
|
||||||
self.setWindowFlags(QtCore.Qt.FramelessWindowHint |
|
self.setWindowFlags(QtCore.Qt.FramelessWindowHint | QtCore.Qt.Tool |
|
||||||
QtCore.Qt.WindowStaysOnTopHint)
|
QtCore.Qt.WindowStaysOnTopHint)
|
||||||
if self.isLive:
|
if self.isLive:
|
||||||
QtCore.QObject.connect(Receiver.get_receiver(),
|
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
|
|
|
@ -378,10 +378,12 @@ class SongMediaItem(MediaManagerItem):
|
||||||
raw_footer.append(song.title)
|
raw_footer.append(song.title)
|
||||||
raw_footer.append(author_list)
|
raw_footer.append(author_list)
|
||||||
raw_footer.append(song.copyright)
|
raw_footer.append(song.copyright)
|
||||||
raw_footer.append(unicode(
|
if QtCore.QSettings().value(u'general/ccli number',
|
||||||
translate('SongsPlugin.MediaItem', 'CCLI License: ') +
|
QtCore.QVariant(u'')).toString():
|
||||||
QtCore.QSettings().value(u'general/ccli number',
|
raw_footer.append(unicode(
|
||||||
QtCore.QVariant(u'')).toString()))
|
translate('SongsPlugin.MediaItem', 'CCLI License: ') +
|
||||||
|
QtCore.QSettings().value(u'general/ccli number',
|
||||||
|
QtCore.QVariant(u'')).toString()))
|
||||||
service_item.raw_footer = raw_footer
|
service_item.raw_footer = raw_footer
|
||||||
service_item.audit = [
|
service_item.audit = [
|
||||||
song.title, author_audit, song.copyright, unicode(song.ccli_number)
|
song.title, author_audit, song.copyright, unicode(song.ccli_number)
|
||||||
|
|
Loading…
Reference in New Issue