← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~j-corwin/openlp/present into lp:openlp

 

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

    Requested reviews:
    OpenLP Core (openlp-core)


A couple of small changes to get powerpoint+viewer working
-- 
https://code.launchpad.net/~j-corwin/openlp/present/+merge/19450
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/plugins/presentations/lib/powerpointcontroller.py'
--- openlp/plugins/presentations/lib/powerpointcontroller.py	2010-01-29 11:59:13 +0000
+++ openlp/plugins/presentations/lib/powerpointcontroller.py	2010-02-16 22:39:14 +0000
@@ -208,7 +208,7 @@
             self.presentation.SlideShowSettings.Run()
             self.presentation.SlideShowWindow.View.GotoSlide(1)
             rendermanager = self.plugin.render_manager
-            rect = rendermanager.screen_list[rendermanager.current_display][u'size']
+            rect = rendermanager.screens.current[u'size']
             self.presentation.SlideShowWindow.Top = rect.y() * 72 / dpi
             self.presentation.SlideShowWindow.Height = rect.height() * 72 / dpi
             self.presentation.SlideShowWindow.Left = rect.x() * 72 / dpi

=== modified file 'openlp/plugins/presentations/lib/pptviewcontroller.py'
--- openlp/plugins/presentations/lib/pptviewcontroller.py	2010-01-29 11:59:13 +0000
+++ openlp/plugins/presentations/lib/pptviewcontroller.py	2010-02-16 22:39:14 +0000
@@ -108,7 +108,7 @@
             if self.pptid >= 0:
                 self.close_presentation()
             rendermanager = self.plugin.render_manager
-            rect = rendermanager.screen_list[rendermanager.current_display][u'size']
+            rect = rendermanager.screens.current[u'size']
             rect = RECT(rect.x(), rect.y(), rect.right(), rect.bottom())
             filepath = str(presentation.replace(u'/', u'\\'));
             try:


Follow ups