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


Clean up after TRB143's attempts to outclean Meths
Fix pptviewer plugin when running as exe
-- 
https://code.launchpad.net/~j-corwin/openlp/present/+merge/29128
Your team OpenLP Core is requested to review the proposed merge of lp:~j-corwin/openlp/present into lp:openlp.

=== modified file 'openlp/core/lib/plugin.py'
--- openlp/core/lib/plugin.py	2010-07-02 18:21:45 +0000
+++ openlp/core/lib/plugin.py	2010-07-02 22:23:22 +0000
@@ -131,6 +131,7 @@
         self.settingsForm = plugin_helpers[u'settings form']
         self.mediadock = plugin_helpers[u'toolbox']
         self.displayManager = plugin_helpers[u'displaymanager']
+        self.pluginManager = plugin_helpers[u'pluginmanager']
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'%s_add_service_item' % self.name),
             self.process_add_service_event)

=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py	2010-07-02 18:21:45 +0000
+++ openlp/core/ui/mainwindow.py	2010-07-02 22:23:22 +0000
@@ -581,6 +581,7 @@
         self.plugin_helpers[u'settings form'] = self.settingsForm
         self.plugin_helpers[u'toolbox'] = self.mediaDockManager
         self.plugin_helpers[u'displaymanager'] = self.displayManager
+        self.plugin_helpers[u'pluginmanager'] = self.plugin_manager
         self.plugin_manager.find_plugins(pluginpath, self.plugin_helpers)
         # hook methods have to happen after find_plugins. Find plugins needs
         # the controllers hence the hooks have moved from setupUI() to here

=== modified file 'openlp/plugins/presentations/lib/mediaitem.py'
--- openlp/plugins/presentations/lib/mediaitem.py	2010-06-28 20:00:35 +0000
+++ openlp/plugins/presentations/lib/mediaitem.py	2010-07-02 22:23:22 +0000
@@ -77,7 +77,7 @@
                 for type in types:
                     if fileType.find(type) == -1:
                         fileType += u'*%s ' % type
-                        self.parent.service_manager.supportedSuffixes(type)
+                        self.parent.serviceManager.supportedSuffixes(type)
         self.OnNewFileMasks = translate('PresentationPlugin.MediaItem',
             'Presentations (%s)' % fileType)
 

=== modified file 'openlp/plugins/presentations/lib/pptviewcontroller.py'
--- openlp/plugins/presentations/lib/pptviewcontroller.py	2010-07-02 10:29:36 +0000
+++ openlp/plugins/presentations/lib/pptviewcontroller.py	2010-07-02 22:23:22 +0000
@@ -79,8 +79,9 @@
             if self.process:
                 return
             log.debug(u'start PPTView')
-            self.process = cdll.LoadLibrary(
-                r'openlp\plugins\presentations\lib\pptviewlib\pptviewlib.dll')
+            dllpath = os.path.join(self.plugin.pluginManager.basepath,
+                u'presentations', u'lib', u'pptviewlib', u'pptviewlib.dll')
+            self.process = cdll.LoadLibrary(dllpath)
             #self.process.SetDebug(1)
 
         def kill(self):
@@ -118,7 +119,7 @@
         log.debug(u'LoadPresentation')
         #if self.pptid >= 0:
         #    self.close_presentation()
-        rendermanager = self.controller.plugin.render_manager
+        rendermanager = self.controller.plugin.renderManager
         rect = rendermanager.screens.current[u'size']
         rect = RECT(rect.x(), rect.y(), rect.right(), rect.bottom())
         filepath = str(self.filepath.replace(u'/', u'\\'))