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

[Maikel Stuivenberg]

[Tim Bentley (trb143)]

Approved

review: Approve

[Raoul Snyman (raoul-snyman)]

review: Approve

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2009-09-12 17:24:16 +0000
+++ openlp/core/ui/slidecontroller.py	2009-09-14 12:16:04 +0000
@@ -135,6 +135,12 @@
                 u':/slides/slide_close.png',
                 translate(u'SlideController', u'Close Screen'),
                 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:
             self.Toolbar.addToolbarSeparator(u'Loop Separator')
             self.Toolbar.addToolbarButton(u'Start Loop',
@@ -379,6 +385,8 @@
     def timerEvent(self, event):
         if event.timerId() == self.timer_id:
             self.onSlideSelectedNext()
-
-
-
+    
+    def onGoLive(self):
+        row = self.PreviewListWidget.currentRow()
+        if row > -1 and row < self.PreviewListWidget.rowCount():
+            self.parent.LiveController.addServiceManagerItem(self.item, row)