|
@ -85,9 +85,15 @@ class SlideController(QtGui.QWidget):
|
||||||
u'Media Stop',
|
u'Media Stop',
|
||||||
u'Media Pause'
|
u'Media Pause'
|
||||||
]
|
]
|
||||||
self.song_list = [
|
self.song_edit_list = [
|
||||||
u'Edit Song',
|
u'Edit Song',
|
||||||
]
|
]
|
||||||
|
self.song_list = [
|
||||||
|
u'First Slide',
|
||||||
|
u'Previous Slide',
|
||||||
|
u'Next Slide',
|
||||||
|
u'Last Slide',
|
||||||
|
]
|
||||||
self.timer_id = 0
|
self.timer_id = 0
|
||||||
self.commandItem = None
|
self.commandItem = None
|
||||||
self.songEdit = False
|
self.songEdit = False
|
||||||
|
@ -195,16 +201,16 @@ class SlideController(QtGui.QWidget):
|
||||||
if isLive:
|
if isLive:
|
||||||
self.Songbar = OpenLPToolbar(self)
|
self.Songbar = OpenLPToolbar(self)
|
||||||
self.Songbar.addToolbarButton(
|
self.Songbar.addToolbarButton(
|
||||||
u'Bridge', u':/slides/slide_close.png',
|
u'Bridge', u':/pages/page_bridge.png',
|
||||||
self.trUtf8(u'Bridge'),
|
self.trUtf8(u'Bridge'),
|
||||||
self.onSongBarHandler)
|
self.onSongBarHandler)
|
||||||
self.Songbar.addToolbarButton(
|
self.Songbar.addToolbarButton(
|
||||||
u'Chorus', u':/slides/slide_close.png',
|
u'Chorus', u':/pages/page_chorus.png',
|
||||||
self.trUtf8(u'Chorus'),
|
self.trUtf8(u'Chorus'),
|
||||||
self.onSongBarHandler)
|
self.onSongBarHandler)
|
||||||
for verse in range(1, 20):
|
for verse in range(1, 12):
|
||||||
self.Songbar.addToolbarButton(
|
self.Songbar.addToolbarButton(
|
||||||
unicode(verse), u':/slides/slide_close.png',
|
unicode(verse), u':/pages/page_%s.png' % verse,
|
||||||
unicode(self.trUtf8(u'Verse %s'))%verse,
|
unicode(self.trUtf8(u'Verse %s'))%verse,
|
||||||
self.onSongBarHandler)
|
self.onSongBarHandler)
|
||||||
self.ControllerLayout.addWidget(self.Songbar)
|
self.ControllerLayout.addWidget(self.Songbar)
|
||||||
|
@ -252,7 +258,7 @@ class SlideController(QtGui.QWidget):
|
||||||
self.Toolbar.makeWidgetsInvisible(self.image_list)
|
self.Toolbar.makeWidgetsInvisible(self.image_list)
|
||||||
self.Toolbar.makeWidgetsInvisible(self.media_list)
|
self.Toolbar.makeWidgetsInvisible(self.media_list)
|
||||||
else:
|
else:
|
||||||
self.Toolbar.makeWidgetsInvisible(self.song_list)
|
self.Toolbar.makeWidgetsInvisible(self.song_edit_list)
|
||||||
if isLive:
|
if isLive:
|
||||||
prefix = u'live_slidecontroller'
|
prefix = u'live_slidecontroller'
|
||||||
else:
|
else:
|
||||||
|
@ -303,6 +309,7 @@ class SlideController(QtGui.QWidget):
|
||||||
self.Songbar.setVisible(False)
|
self.Songbar.setVisible(False)
|
||||||
self.Toolbar.makeWidgetsInvisible(self.image_list)
|
self.Toolbar.makeWidgetsInvisible(self.image_list)
|
||||||
self.Toolbar.makeWidgetsInvisible(self.media_list)
|
self.Toolbar.makeWidgetsInvisible(self.media_list)
|
||||||
|
self.Toolbar.makeWidgetsVisible(self.song_list)
|
||||||
if item.service_item_type == ServiceItemType.Text:
|
if item.service_item_type == ServiceItemType.Text:
|
||||||
self.Toolbar.makeWidgetsInvisible(self.image_list)
|
self.Toolbar.makeWidgetsInvisible(self.image_list)
|
||||||
if item.name == u'Songs' and \
|
if item.name == u'Songs' and \
|
||||||
|
@ -312,6 +319,8 @@ class SlideController(QtGui.QWidget):
|
||||||
if item.verse_order:
|
if item.verse_order:
|
||||||
verses = item.verse_order.split(u' ')
|
verses = item.verse_order.split(u' ')
|
||||||
for verse in verses:
|
for verse in verses:
|
||||||
|
if int(verse) > 12:
|
||||||
|
break
|
||||||
try:
|
try:
|
||||||
self.Songbar.actions[verse].setVisible(True)
|
self.Songbar.actions[verse].setVisible(True)
|
||||||
except:
|
except:
|
||||||
|
@ -324,6 +333,7 @@ class SlideController(QtGui.QWidget):
|
||||||
self.Toolbar.makeWidgetsVisible(self.image_list)
|
self.Toolbar.makeWidgetsVisible(self.image_list)
|
||||||
elif item.service_item_type == ServiceItemType.Command and \
|
elif item.service_item_type == ServiceItemType.Command and \
|
||||||
item.name == u'Media':
|
item.name == u'Media':
|
||||||
|
self.Toolbar.makeWidgetsInvisible(self.song_list)
|
||||||
self.Toolbar.makeWidgetsVisible(self.media_list)
|
self.Toolbar.makeWidgetsVisible(self.media_list)
|
||||||
|
|
||||||
def enablePreviewToolBar(self, item):
|
def enablePreviewToolBar(self, item):
|
||||||
|
@ -331,9 +341,9 @@ class SlideController(QtGui.QWidget):
|
||||||
Allows the Preview toolbar to be customised
|
Allows the Preview toolbar to be customised
|
||||||
"""
|
"""
|
||||||
if (item.name == u'Songs' or item.name == u'Custom') and item.fromPlugin:
|
if (item.name == u'Songs' or item.name == u'Custom') and item.fromPlugin:
|
||||||
self.Toolbar.makeWidgetsVisible(self.song_list)
|
self.Toolbar.makeWidgetsVisible(self.song_edit_list)
|
||||||
else:
|
else:
|
||||||
self.Toolbar.makeWidgetsInvisible(self.song_list)
|
self.Toolbar.makeWidgetsInvisible(self.song_edit_list)
|
||||||
|
|
||||||
def addServiceItem(self, item):
|
def addServiceItem(self, item):
|
||||||
"""
|
"""
|
||||||
|
@ -393,6 +403,8 @@ class SlideController(QtGui.QWidget):
|
||||||
Display the slide number passed
|
Display the slide number passed
|
||||||
"""
|
"""
|
||||||
log.debug(u'displayServiceManagerItems Start')
|
log.debug(u'displayServiceManagerItems Start')
|
||||||
|
#Set pointing cursor when we have somthing to point at
|
||||||
|
self.PreviewListWidget.setCursor(QtCore.Qt.PointingHandCursor)
|
||||||
before = time.time()
|
before = time.time()
|
||||||
self.serviceitem = serviceitem
|
self.serviceitem = serviceitem
|
||||||
self.PreviewListWidget.clear()
|
self.PreviewListWidget.clear()
|
||||||
|
|
|
@ -126,4 +126,20 @@
|
||||||
<file>theme_export.png</file>
|
<file>theme_export.png</file>
|
||||||
<file>theme_import.png</file>
|
<file>theme_import.png</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
|
<qresource prefix="pages" >
|
||||||
|
<file>page_chorus.png</file>
|
||||||
|
<file>page_bridge.png</file>
|
||||||
|
<file>page_1.png</file>
|
||||||
|
<file>page_2.png</file>
|
||||||
|
<file>page_3.png</file>
|
||||||
|
<file>page_4.png</file>
|
||||||
|
<file>page_5.png</file>
|
||||||
|
<file>page_6.png</file>
|
||||||
|
<file>page_7.png</file>
|
||||||
|
<file>page_8.png</file>
|
||||||
|
<file>page_9.png</file>
|
||||||
|
<file>page_10.png</file>
|
||||||
|
<file>page_11.png</file>
|
||||||
|
<file>page_12.png</file>
|
||||||
|
</qresource>
|
||||||
</RCC>
|
</RCC>
|
||||||
|
|
After Width: | Height: | Size: 409 B |
After Width: | Height: | Size: 357 B |
After Width: | Height: | Size: 357 B |
After Width: | Height: | Size: 357 B |
After Width: | Height: | Size: 396 B |
After Width: | Height: | Size: 388 B |
After Width: | Height: | Size: 390 B |
After Width: | Height: | Size: 400 B |
After Width: | Height: | Size: 357 B |
After Width: | Height: | Size: 357 B |
After Width: | Height: | Size: 357 B |
After Width: | Height: | Size: 357 B |
After Width: | Height: | Size: 406 B |
After Width: | Height: | Size: 402 B |
|
@ -1 +1 @@
|
||||||
1.9.0-662
|
1.9.0-663
|
||||||
|
|