raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Verse tagging - combo complete

This commit is contained in:
Tim Bentley 2009-12-06 16:50:13 +00:00
parent 528004df23
commit 5d79141cfc
1 changed files with 19 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
openlp/core/ui/slidecontroller.py
View File

@ -213,14 +213,6 @@ class SlideController(QtGui.QWidget):
self.SongMenu.setPopupMode(QtGui.QToolButton.InstantPopup) self.SongMenu.setPopupMode(QtGui.QToolButton.InstantPopup)
self.Toolbar.addToolbarWidget(u'Song Menu', self.SongMenu) self.Toolbar.addToolbarWidget(u'Song Menu', self.SongMenu)
self.SongMenu.setMenu(QtGui.QMenu(self.trUtf8('Go to Verse'), self.Toolbar)) self.SongMenu.setMenu(QtGui.QMenu(self.trUtf8('Go to Verse'), self.Toolbar))
self.SongMenu.menu().addAction(self.trUtf8('Intro'), self.onSongBarHandler)
self.SongMenu.menu().addAction(self.trUtf8('Bridge'), self.onSongBarHandler)
self.SongMenu.menu().addAction(self.trUtf8('PreChorus'), self.onSongBarHandler)
self.SongMenu.menu().addAction(self.trUtf8('Chorus'), self.onSongBarHandler)
for i in range(1, 10):
self.SongMenu.menu().addAction(self.trUtf8('V%s'%i), self.onSongBarHandler)
self.SongMenu.menu().addAction(self.trUtf8('Other'), self.onSongBarHandler)
self.SongMenu.menu().addAction(self.trUtf8('End'), self.onSongBarHandler)
self.Toolbar.makeWidgetsInvisible([u'Song Menu']) self.Toolbar.makeWidgetsInvisible([u'Song Menu'])
# Screen preview area # Screen preview area
self.PreviewFrame = QtGui.QFrame(self.Splitter) self.PreviewFrame = QtGui.QFrame(self.Splitter)
@ -310,21 +302,12 @@ class SlideController(QtGui.QWidget):
def onSongBarHandler(self): def onSongBarHandler(self):
request = unicode(self.sender().text()) request = unicode(self.sender().text())
#Remember list is 1 out! #Remember list is 1 out!
slideno = self.slideList[request[1:]] -1 slideno = self.slideList[request]
if slideno > self.PreviewListWidget.rowCount(): if slideno > self.PreviewListWidget.rowCount():
self.PreviewListWidget.selectRow(self.PreviewListWidget.rowCount()) self.PreviewListWidget.selectRow(self.PreviewListWidget.rowCount())
else: else:
self.PreviewListWidget.selectRow(slideno) self.PreviewListWidget.selectRow(slideno)
self.onSlideSelected() self.onSlideSelected()
#=======
# #Remember list is 1 out!
# slideno = int(request[1:]) - 1
# if slideno > self.PreviewListWidget.rowCount():
# self.PreviewListWidget.selectRow(self.PreviewListWidget.rowCount())
# else:
# self.PreviewListWidget.selectRow(slideno)
# self.onSlideSelected()
#>>>>>>> MERGE-SOURCE
def receiveSpinDelay(self, value): def receiveSpinDelay(self, value):
self.DelaySpinBox.setValue(int(value)) self.DelaySpinBox.setValue(int(value))
@ -345,18 +328,13 @@ class SlideController(QtGui.QWidget):
""" """
self.Toolbar.setVisible(True) self.Toolbar.setVisible(True)
self.Mediabar.setVisible(False) self.Mediabar.setVisible(False)
self.Toolbar.makeWidgetsInvisible([u'Song Menu'])
self.Toolbar.makeWidgetsInvisible(self.image_list) self.Toolbar.makeWidgetsInvisible(self.image_list)
if item.is_text(): if item.is_text():
self.Toolbar.makeWidgetsInvisible(self.image_list) self.Toolbar.makeWidgetsInvisible(self.image_list)
if item.is_song() and \ if item.is_song() and \
str_to_bool(self.songsconfig.get_config(u'show songbar', True)): str_to_bool(self.songsconfig.get_config(u'show songbar', True)):
hasButtons = False self.Toolbar.makeWidgetsVisible([u'Song Menu'])
for slide in self.slideList:
# if slide is not None:
# self.SongMenu.actions[slide].setVisible(True)
hasButtons = True
if hasButtons:
self.Toolbar.makeWidgetsVisible([u'Song Menu'])
elif item.is_image(): elif item.is_image():
#Not sensible to allow loops with 1 frame #Not sensible to allow loops with 1 frame
if len(item.get_frames()) > 1: if len(item.get_frames()) > 1:
@ -437,6 +415,8 @@ class SlideController(QtGui.QWidget):
self.PreviewListWidget.clear() self.PreviewListWidget.clear()
self.PreviewListWidget.setRowCount(0) self.PreviewListWidget.setRowCount(0)
self.PreviewListWidget.setColumnWidth(0, width) self.PreviewListWidget.setColumnWidth(0, width)
if self.isLive:
self.SongMenu.menu().clear()
for framenumber, frame in enumerate(self.serviceItem.get_frames()): for framenumber, frame in enumerate(self.serviceItem.get_frames()):
self.PreviewListWidget.setRowCount( self.PreviewListWidget.setRowCount(
self.PreviewListWidget.rowCount() + 1) self.PreviewListWidget.rowCount() + 1)
@ -444,16 +424,20 @@ class SlideController(QtGui.QWidget):
slide_height = 0 slide_height = 0
#It is a based Text Render #It is a based Text Render
if self.serviceItem.is_text(): if self.serviceItem.is_text():
#only load the slot once if self.isLive and frame[u'verseTag'] is not None:
bits = frame[u'verseTag'].split(u':') #only load the slot once
if bits[0] == self.trUtf8('Verse'): bits = frame[u'verseTag'].split(u':')
tag = u'%s%s' % (bits[0][0], bits[1][0] ) tag = None
else: if bits[0] == self.trUtf8('Verse'):
tag = bits[0] tag = u'%s%s' % (bits[0][0], bits[1][0] )
try: else:
test = self.slideList[tag] tag = bits[0]
except: try:
self.slideList[tag] = framenumber test = self.slideList[tag]
except:
self.slideList[tag] = framenumber
self.SongMenu.menu().addAction(self.trUtf8(u'%s'%tag),
self.onSongBarHandler)
item.setText(frame[u'text']) item.setText(frame[u'text'])
else: else:
label = QtGui.QLabel() label = QtGui.QLabel()