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

Fix merge error

Browse Source
This commit is contained in:
Tim Bentley 2009-09-14 20:37:29 +01:00
commit bb6c4b091a
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,6 +136,12 @@ class SlideController(QtGui.QWidget):
u':/slides/slide_close.png', u':/slides/slide_close.png',
translate(u'SlideController', u'Close Screen'), translate(u'SlideController', u'Close Screen'),
self.onBlankScreen) self.onBlankScreen)
if not self.isLive:
self.Toolbar.addToolbarSeparator(u'Close Separator')
self.Toolbar.addToolbarButton(u'Go Live',
u':/system/system_live.png',
translate(u'SlideController', u'Move to live'),
self.onGoLive)
if isLive: if isLive:
self.Toolbar.addToolbarSeparator(u'Loop Separator') self.Toolbar.addToolbarSeparator(u'Loop Separator')
self.Toolbar.addToolbarButton(u'Start Loop', self.Toolbar.addToolbarButton(u'Start Loop',
@ -384,3 +390,8 @@ class SlideController(QtGui.QWidget):
def timerEvent(self, event): def timerEvent(self, event):
if event.timerId() == self.timer_id: if event.timerId() == self.timer_id:
self.onSlideSelectedNext() self.onSlideSelectedNext()
def onGoLive(self):
row = self.PreviewListWidget.currentRow()
if row > -1 and row < self.PreviewListWidget.rowCount():
self.parent.LiveController.addServiceManagerItem(self.commandItem, row)