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)


Not only can Presentations be opened again now, but they can also be seen without the need for x-ray vision!
-- 
https://code.launchpad.net/~j-corwin/openlp/present/+merge/27775
Your team OpenLP Core is requested to review the proposed merge of lp:~j-corwin/openlp/present into lp:openlp.

=== modified file 'openlp/plugins/presentations/lib/impresscontroller.py'
--- openlp/plugins/presentations/lib/impresscontroller.py	2010-06-10 16:36:49 +0000
+++ openlp/plugins/presentations/lib/impresscontroller.py	2010-06-16 21:27:26 +0000
@@ -181,7 +181,7 @@
 class ImpressDocument(PresentationDocument):
     def __init__(self, controller, presentation):
         log.debug(u'Init Presentation OpenOffice')
-        PresentationDocument.__init__(controller, presentation)
+        PresentationDocument.__init__(self, controller, presentation)
         self.document = None
         self.presentation = None
         self.control = None

=== modified file 'openlp/plugins/presentations/lib/messagelistener.py'
--- openlp/plugins/presentations/lib/messagelistener.py	2010-05-27 14:41:47 +0000
+++ openlp/plugins/presentations/lib/messagelistener.py	2010-06-16 21:27:26 +0000
@@ -29,6 +29,7 @@
 from PyQt4 import QtCore
 
 from openlp.core.lib import Receiver
+from openlp.core.ui import HideMode
 
 log = logging.getLogger(__name__)
 
@@ -55,7 +56,7 @@
             self.doc.start_presentation()
             if isBlank:
                 self.blank()
-            Receiver.send_message(u'maindisplay_hide')
+            Receiver.send_message(u'maindisplay_hide', HideMode.Screen)
         self.doc.slidenumber = 0
 
     def activate(self):
@@ -179,6 +180,7 @@
             self.doc.slidenumber != self.doc.get_slide_number():
             self.doc.goto_slide(self.doc.slidenumber)
         self.doc.unblank_screen()
+        Receiver.send_message(u'maindisplay_hide', HideMode.Screen)
 
     def poll(self):
         self.doc.poll_slidenumber(self.isLive)

=== modified file 'openlp/plugins/presentations/lib/powerpointcontroller.py'
--- openlp/plugins/presentations/lib/powerpointcontroller.py	2010-06-10 16:36:49 +0000
+++ openlp/plugins/presentations/lib/powerpointcontroller.py	2010-06-16 21:27:26 +0000
@@ -104,7 +104,7 @@
 class PowerpointDocument(PresentationDocument):
     def __init__(self, controller, presentation):
         log.debug(u'Init Presentation Powerpoint')
-        PresentationDocument.__init__(controller, presentation)
+        PresentationDocument.__init__(self, controller, presentation)
         self.presentation = None
 
     def load_presentation(self):
@@ -142,7 +142,7 @@
         if self.check_thumbnails():
             return
         self.presentation.Export(os.path.join(self.thumbnailpath, ''), 'png',
-            640, 480)
+            320, 240)
 
     def close_presentation(self):
         """

=== modified file 'openlp/plugins/presentations/lib/pptviewcontroller.py'
--- openlp/plugins/presentations/lib/pptviewcontroller.py	2010-06-08 15:38:09 +0000
+++ openlp/plugins/presentations/lib/pptviewcontroller.py	2010-06-16 21:27:26 +0000
@@ -102,7 +102,7 @@
 class PptviewDocument(PresentationDocument):
     def __init__(self, controller, presentation):
         log.debug(u'Init Presentation PowerPoint')
-        PresentationDocument.__init__(controller, presentation)
+        PresentationDocument.__init__(self, controller, presentation)
         self.presentation = None
         self.pptid = None
         self.blanked = False