diff --git a/openlp/core/ui/plugindialoglistform.py b/openlp/core/ui/plugindialoglistform.py index 9e052d4c5..595e22cec 100644 --- a/openlp/core/ui/plugindialoglistform.py +++ b/openlp/core/ui/plugindialoglistform.py @@ -58,6 +58,8 @@ class PluginForm(QtGui.QDialog): """ Load the plugin details into the screen """ + #self.PluginViewList.clear() + self.PluginViewList.setRowCount(0) for plugin in self.parent.plugin_manager.plugins: row = self.PluginViewList.rowCount() self.PluginViewList.setRowCount(row + 1) diff --git a/openlp/plugins/presentations/lib/presentationtab.py b/openlp/plugins/presentations/lib/presentationtab.py index b343de0d8..69266c73e 100644 --- a/openlp/plugins/presentations/lib/presentationtab.py +++ b/openlp/plugins/presentations/lib/presentationtab.py @@ -93,4 +93,3 @@ class PresentationTab(SettingsTab): def save(self): self.config.set_config(u'Powerpoint', unicode(self.PowerpointCheckBox.checkState())) self.config.set_config(u'Impress', unicode(self.ImpressCheckBox.checkState())) - print self.PowerpointCheckBox.checkState(), unicode(self.PowerpointCheckBox.checkState()) diff --git a/openlp/plugins/presentations/presentationplugin.py b/openlp/plugins/presentations/presentationplugin.py index 8c78e131f..6bbce4c13 100644 --- a/openlp/plugins/presentations/presentationplugin.py +++ b/openlp/plugins/presentations/presentationplugin.py @@ -67,12 +67,12 @@ class PresentationPlugin(Plugin): """ log.debug('check_pre_conditions') - if int(self.config.get_config(u'Powerpoint', 0)) == 2: + if int(self.config.get_config(u'Impress', 0)) == 2: try: #Check to see if we have uno installed import uno - #openoffice = impressController() - self.registerControllers(u'Impress', None) + openoffice = impressController() + self.registerControllers(u'Impress', openoffice) except: pass #If we have no controllers disable plugin @@ -80,3 +80,10 @@ class PresentationPlugin(Plugin): return True else: return False + + def finalise(self): + log.debug(u'Finalise') + print self.controllers + for controller in self.controllers: + print controller + self.controllers[controller].kill()