forked from openlp/openlp
Fixes
This commit is contained in:
parent
bc4f31ef93
commit
b9630907a8
@ -110,7 +110,6 @@ class MainDisplay(DisplayWidget):
|
|||||||
self.blankFrame = None
|
self.blankFrame = None
|
||||||
self.frame = None
|
self.frame = None
|
||||||
self.firstTime = True
|
self.firstTime = True
|
||||||
self.mediaLoaded = False
|
|
||||||
self.hasTransition = False
|
self.hasTransition = False
|
||||||
self.mediaBackground = False
|
self.mediaBackground = False
|
||||||
QtCore.QObject.connect(Receiver.get_receiver(),
|
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
@ -185,12 +184,12 @@ class MainDisplay(DisplayWidget):
|
|||||||
|
|
||||||
def hideDisplay(self):
|
def hideDisplay(self):
|
||||||
log.debug(u'hideDisplay')
|
log.debug(u'hideDisplay')
|
||||||
self.mediaLoaded = True
|
self.display_image.setPixmap(self.transparent)
|
||||||
self.setVisible(False)
|
self.display_alert.setPixmap(self.transparent)
|
||||||
|
self.display_text.setPixmap(self.transparent)
|
||||||
|
|
||||||
def showDisplay(self):
|
def showDisplay(self):
|
||||||
log.debug(u'showDisplay')
|
log.debug(u'showDisplay')
|
||||||
self.mediaLoaded = False
|
|
||||||
if not self.primary:
|
if not self.primary:
|
||||||
self.setVisible(True)
|
self.setVisible(True)
|
||||||
self.showFullScreen()
|
self.showFullScreen()
|
||||||
@ -272,9 +271,8 @@ class MainDisplay(DisplayWidget):
|
|||||||
|
|
||||||
def onMediaQueue(self, message):
|
def onMediaQueue(self, message):
|
||||||
log.debug(u'Queue new media message %s' % message)
|
log.debug(u'Queue new media message %s' % message)
|
||||||
self.display_image.setPixmap(self.transparent)
|
self.hideDisplay()
|
||||||
self.display_alert.setPixmap(self.transparent)
|
self.activateWindow()
|
||||||
self.display_text.setPixmap(self.transparent)
|
|
||||||
|
|
||||||
class VideoWidget(QtGui.QWidget):
|
class VideoWidget(QtGui.QWidget):
|
||||||
"""
|
"""
|
||||||
@ -338,6 +336,8 @@ class VideoDisplay(VideoWidget):
|
|||||||
self.setWindowTitle(u'OpenLP Video Display')
|
self.setWindowTitle(u'OpenLP Video Display')
|
||||||
self.parent = parent
|
self.parent = parent
|
||||||
self.screens = screens
|
self.screens = screens
|
||||||
|
self.setAttribute(QtCore.Qt.WA_TranslucentBackground)
|
||||||
|
self.setWindowFlags(QtCore.Qt.FramelessWindowHint)
|
||||||
self.mediaObject = Phonon.MediaObject(self)
|
self.mediaObject = Phonon.MediaObject(self)
|
||||||
self.video = Phonon.VideoWidget()
|
self.video = Phonon.VideoWidget()
|
||||||
self.video.setVisible(False)
|
self.video.setVisible(False)
|
||||||
@ -400,6 +400,5 @@ class VideoDisplay(VideoWidget):
|
|||||||
log.debug(u'VideoDisplay Reached end of media playlist')
|
log.debug(u'VideoDisplay Reached end of media playlist')
|
||||||
self.mediaObject.stop()
|
self.mediaObject.stop()
|
||||||
self.mediaObject.clearQueue()
|
self.mediaObject.clearQueue()
|
||||||
self.mediaLoaded = False
|
|
||||||
self.video.setVisible(False)
|
self.video.setVisible(False)
|
||||||
self.setVisible(False)
|
self.setVisible(False)
|
||||||
|
@ -386,11 +386,10 @@ class SlideController(QtGui.QWidget):
|
|||||||
if str_to_bool(self.songsconfig.get_config(u'show songbar', True)) \
|
if str_to_bool(self.songsconfig.get_config(u'show songbar', True)) \
|
||||||
and len(self.slideList) > 0:
|
and len(self.slideList) > 0:
|
||||||
self.Toolbar.makeWidgetsVisible([u'Song Menu'])
|
self.Toolbar.makeWidgetsVisible([u'Song Menu'])
|
||||||
elif item.is_image():
|
if item.is_capable(ItemCapabilities.AllowsLoop) and \
|
||||||
#Not sensible to allow loops with 1 frame
|
len(item.get_frames()) > 1:
|
||||||
if len(item.get_frames()) > 1:
|
|
||||||
self.Toolbar.makeWidgetsVisible(self.loop_list)
|
self.Toolbar.makeWidgetsVisible(self.loop_list)
|
||||||
elif item.is_media():
|
if item.is_media():
|
||||||
self.Toolbar.setVisible(False)
|
self.Toolbar.setVisible(False)
|
||||||
self.Mediabar.setVisible(True)
|
self.Mediabar.setVisible(True)
|
||||||
self.volumeSlider.setAudioOutput(self.parent.mainDisplay.videoDisplay.audio)
|
self.volumeSlider.setAudioOutput(self.parent.mainDisplay.videoDisplay.audio)
|
||||||
|
@ -81,8 +81,7 @@ class AlertsManager(QtCore.QObject):
|
|||||||
self.screenChanged()
|
self.screenChanged()
|
||||||
self.parent.maindisplay.parent.StatusBar.showMessage(u'')
|
self.parent.maindisplay.parent.StatusBar.showMessage(u'')
|
||||||
self.alertList.append(text)
|
self.alertList.append(text)
|
||||||
if self.timer_id != 0: # or self.parent.maindisplay.mediaLoaded:
|
if self.timer_id != 0:
|
||||||
print self.timer_id, self.alertList, len(self.alertList)
|
|
||||||
self.parent.maindisplay.parent.StatusBar.showMessage(\
|
self.parent.maindisplay.parent.StatusBar.showMessage(\
|
||||||
self.trUtf8(u'Alert message created and delayed'))
|
self.trUtf8(u'Alert message created and delayed'))
|
||||||
return
|
return
|
||||||
@ -92,9 +91,7 @@ class AlertsManager(QtCore.QObject):
|
|||||||
log.debug(u'Generate Alert called')
|
log.debug(u'Generate Alert called')
|
||||||
if len(self.alertList) == 0:
|
if len(self.alertList) == 0:
|
||||||
return
|
return
|
||||||
print len(self.alertList)
|
|
||||||
text = self.alertList.pop(0)
|
text = self.alertList.pop(0)
|
||||||
print text
|
|
||||||
alertTab = self.parent.alertsTab
|
alertTab = self.parent.alertsTab
|
||||||
alertframe = \
|
alertframe = \
|
||||||
QtGui.QPixmap(self.screen[u'size'].width(), self.alertHeight)
|
QtGui.QPixmap(self.screen[u'size'].width(), self.alertHeight)
|
||||||
|
@ -449,6 +449,7 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
raw_footer = []
|
raw_footer = []
|
||||||
bible_text = u''
|
bible_text = u''
|
||||||
service_item.add_capability(ItemCapabilities.AllowsPreview)
|
service_item.add_capability(ItemCapabilities.AllowsPreview)
|
||||||
|
service_item.add_capability(ItemCapabilities.AllowsLoop)
|
||||||
#If we want to use a 2nd translation / version
|
#If we want to use a 2nd translation / version
|
||||||
bible2 = u''
|
bible2 = u''
|
||||||
if self.SearchTabWidget.currentIndex() == 0:
|
if self.SearchTabWidget.currentIndex() == 0:
|
||||||
|
@ -149,6 +149,7 @@ class CustomMediaItem(MediaManagerItem):
|
|||||||
item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
|
item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
|
||||||
service_item.add_capability(ItemCapabilities.AllowsEdit)
|
service_item.add_capability(ItemCapabilities.AllowsEdit)
|
||||||
service_item.add_capability(ItemCapabilities.AllowsPreview)
|
service_item.add_capability(ItemCapabilities.AllowsPreview)
|
||||||
|
service_item.add_capability(ItemCapabilities.AllowsLoop)
|
||||||
customSlide = self.parent.custommanager.get_custom(item_id)
|
customSlide = self.parent.custommanager.get_custom(item_id)
|
||||||
title = customSlide.title
|
title = customSlide.title
|
||||||
credit = customSlide.credits
|
credit = customSlide.credits
|
||||||
|
@ -139,6 +139,7 @@ class ImageMediaItem(MediaManagerItem):
|
|||||||
service_item.title = self.trUtf8('Image(s)')
|
service_item.title = self.trUtf8('Image(s)')
|
||||||
service_item.add_capability(ItemCapabilities.AllowsMaintain)
|
service_item.add_capability(ItemCapabilities.AllowsMaintain)
|
||||||
service_item.add_capability(ItemCapabilities.AllowsPreview)
|
service_item.add_capability(ItemCapabilities.AllowsPreview)
|
||||||
|
service_item.add_capability(ItemCapabilities.AllowsLoop)
|
||||||
for item in items:
|
for item in items:
|
||||||
bitem = self.ListView.item(item.row())
|
bitem = self.ListView.item(item.row())
|
||||||
filename = unicode((bitem.data(QtCore.Qt.UserRole)).toString())
|
filename = unicode((bitem.data(QtCore.Qt.UserRole)).toString())
|
||||||
|
@ -306,6 +306,7 @@ class SongMediaItem(MediaManagerItem):
|
|||||||
item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
|
item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
|
||||||
service_item.add_capability(ItemCapabilities.AllowsEdit)
|
service_item.add_capability(ItemCapabilities.AllowsEdit)
|
||||||
service_item.add_capability(ItemCapabilities.AllowsPreview)
|
service_item.add_capability(ItemCapabilities.AllowsPreview)
|
||||||
|
service_item.add_capability(ItemCapabilities.AllowsLoop)
|
||||||
song = self.parent.songmanager.get_song(item_id)
|
song = self.parent.songmanager.get_song(item_id)
|
||||||
service_item.theme = song.theme_name
|
service_item.theme = song.theme_name
|
||||||
service_item.editId = item_id
|
service_item.editId = item_id
|
||||||
|
Loading…
Reference in New Issue
Block a user