openlp-core team mailing list archive

[Jonathan Corwin <j@xxxxxxxxxxxx>]

Jonathan Corwin has proposed merging lp:~j-corwin/openlp/present into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  #598361 AttributeError: 'NoneType' object has no attribute 'isPaused'
  https://bugs.launchpad.net/bugs/598361
  #608149 Presentations are not intuitive
  https://bugs.launchpad.net/bugs/608149


Presentations no longer startup blanked if blank button not pressed
-- 
https://code.launchpad.net/~j-corwin/openlp/present/+merge/30614
Your team OpenLP Core is requested to review the proposed merge of lp:~j-corwin/openlp/present into lp:openlp.

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2010-07-13 16:31:19 +0000
+++ openlp/core/ui/slidecontroller.py	2010-07-22 07:36:54 +0000
@@ -532,12 +532,12 @@
                 self.onMediaStop()
         if serviceItem.is_media():
             self.onMediaStart(serviceItem)
-#        if self.isLive:
-#            blanked = self.blankButton.isChecked()
-#        else:
-#            blanked = False
+        if self.isLive:
+            blanked = self.BlankScreen.isChecked()
+        else:
+            blanked = False
         Receiver.send_message(u'%s_start' % serviceItem.name.lower(),
-            [serviceItem, self.isLive, True, slideno])
+            [serviceItem, self.isLive, blanked, slideno])
         self.slideList = {}
         width = self.parent.ControlSplitter.sizes()[self.split]
         #Set pointing cursor when we have somthing to point at

=== modified file 'openlp/plugins/presentations/lib/mediaitem.py'
--- openlp/plugins/presentations/lib/mediaitem.py	2010-07-22 07:00:32 +0000
+++ openlp/plugins/presentations/lib/mediaitem.py	2010-07-22 07:36:54 +0000
@@ -81,6 +81,9 @@
         self.buildFileMaskString()
 
     def buildFileMaskString(self):
+        """
+        Build the list of file extensions to be used in the Open file dialog
+        """
         fileType = u''
         for controller in self.controllers:
             if self.controllers[controller].enabled():
@@ -139,10 +142,18 @@
         self.populateDisplayTypes()
 
     def rebuild(self):
+        """
+        Rebuild the tab in the media manager when changes are made in
+        the settings
+        """
         self.populateDisplayTypes()
         self.buildFileMaskString()
 
     def populateDisplayTypes(self):
+        """
+        Load the combobox with the enabled presentation controllers,
+        allowing user to select a specific app if settings allow
+        """
         self.DisplayTypeComboBox.clear()
         for item in self.controllers:
             #load the drop down selection