OpenLP

Merge lp:~maikels/openlp/LiveBtn into lp:openlp

  1. LiveBtn
  2. Merge into trunk
Proposed by Maikel Stuivenberg
Status: Merged
Merged at revision: not available
Proposed branch: lp:~maikels/openlp/LiveBtn
Merge into: lp:openlp
Diff against target: None lines
To merge this branch: bzr merge lp:~maikels/openlp/LiveBtn
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Tim Bentley Approve
Review via email: mp+11694@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote :

Approved

review: Approve
Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openlp/core/ui/slidecontroller.py'
2--- openlp/core/ui/slidecontroller.py 2009-09-12 17:24:16 +0000
3+++ openlp/core/ui/slidecontroller.py 2009-09-14 12:16:04 +0000
4@@ -135,6 +135,12 @@
5 u':/slides/slide_close.png',
6 translate(u'SlideController', u'Close Screen'),
7 self.onBlankScreen)
8+ if not self.isLive:
9+ self.Toolbar.addToolbarSeparator(u'Close Separator')
10+ self.Toolbar.addToolbarButton(u'Go Live',
11+ u':/system/system_live.png',
12+ translate(u'SlideController', u'Move to live'),
13+ self.onGoLive)
14 if isLive:
15 self.Toolbar.addToolbarSeparator(u'Loop Separator')
16 self.Toolbar.addToolbarButton(u'Start Loop',
17@@ -379,6 +385,8 @@
18 def timerEvent(self, event):
19 if event.timerId() == self.timer_id:
20 self.onSlideSelectedNext()
21-
22-
23-
24+
25+ def onGoLive(self):
26+ row = self.PreviewListWidget.currentRow()
27+ if row > -1 and row < self.PreviewListWidget.rowCount():
28+ self.parent.LiveController.addServiceManagerItem(self.item, row)