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