Merge lp:~meths/openlp/trivialfixes into lp:openlp

[Jon Tibble]

[Tim Bentley (trb143)]

Approved

review: Approve

[lp:~meths/openlp/trivialfixes]

558. By Jon Tibble on 2009-09-20

Cleanup code and fixes

=== modified file 'openlp/core/lib/pluginmanager.py'
--- openlp/core/lib/pluginmanager.py	2009-09-18 17:37:11 +0000
+++ openlp/core/lib/pluginmanager.py	2009-09-19 23:05:30 +0000
@@ -85,7 +85,8 @@
                     modulename = modulename[len(prefix) + 1:]
                     modulename = modulename.replace(os.path.sep, '.')
                     # import the modules
-                    log.debug(u'Importing %s from %s. Depth %d', modulename, path, thisdepth)
+                    log.debug(u'Importing %s from %s. Depth %d',
+                        modulename, path, thisdepth)
                     try:
                         __import__(modulename, globals(), locals(), [])
                     except ImportError, e:
@@ -131,8 +132,10 @@
             if plugin.status == PluginStatus.Active:
                 media_manager_item = plugin.get_media_manager_item()
                 if media_manager_item is not None:
-                    log.debug(u'Inserting media manager item from %s' % plugin.name)
-                    mediatoolbox.addItem(media_manager_item, plugin.icon, media_manager_item.title)
+                    log.debug(u'Inserting media manager item from %s' % \
+                        plugin.name)
+                    mediatoolbox.addItem(media_manager_item, plugin.icon,
+                        media_manager_item.title)
 
     def hook_settings_tabs(self, settingsform=None):
         """
 
=== modified file 'openlp/core/lib/renderer.py'
--- openlp/core/lib/renderer.py	2009-09-15 19:06:40 +0000
+++ openlp/core/lib/renderer.py	2009-09-19 23:05:30 +0000
@@ -31,7 +31,7 @@
 class Renderer(object):
     """
     Genarates a pixmap image of a array of text. The Text is formatted to
-    make sure it fits on the screen and if not extra frames a generated.
+    make sure it fits on the screen and if not extra frames are generated.
     """
     global log
     log = logging.getLogger(u'Renderer')
 
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py	2009-09-19 21:45:50 +0000
+++ openlp/core/ui/mainwindow.py	2009-09-19 23:05:30 +0000
@@ -629,23 +629,25 @@
             if ret == QtGui.QMessageBox.Save:
                 self.ServiceManagerContents.onSaveService()
                 self.mainDisplay.close()
-                self.ServiceManagerContents.cleanUp()
                 self.cleanUp()
                 event.accept()
             elif ret == QtGui.QMessageBox.Discard:
                 self.mainDisplay.close()
-                self.ServiceManagerContents.cleanUp()
                 self.cleanUp()
                 event.accept()
             else:
                 event.ignore()
         else:
             self.mainDisplay.close()
-            self.ServiceManagerContents.cleanUp()
             self.cleanUp()
             event.accept()
 
     def cleanUp(self):
+        """
+        Runs all the cleanup code before OpenLP shuts down
+        """
+        # Clean temporary files used by services
+        self.ServiceManagerContents.cleanUp()
         # Call the cleanup method to shutdown plugins.
         log.info(u'cleanup plugins')
         self.plugin_manager.finalise_plugins()
 
=== modified file 'openlp/plugins/plugin.txt'
--- openlp/plugins/plugin.txt	2009-09-19 21:45:50 +0000
+++ openlp/plugins/plugin.txt	2009-09-19 23:05:30 +0000
@@ -21,7 +21,7 @@
 * Render their display (on the projection screen and in a "shrunken form"
   for preview purposes)
 
-These plugins need to be part of an service.  This means they need to 
+These plugins need to be part of a service.  This means they need to 
 * Be able to tell the service manager code what to put in the service for their
   "bit"
 * Have a "tab" in the media manager, which they can render on request
@@ -47,7 +47,7 @@
 actually form a plugin...
 
 Each service entry may be made up of multiple plugins (to do text on video), so
-each plugin that contributes to an service item will need a "layering"
+each plugin that contributes to a service item will need a "layering"
 priority.
 
 Plugin management
@@ -62,7 +62,7 @@
 spaces made in the prefs UI as required, and in the media manager.
 
 The service manager can find out what plugins it has available (we need to
-report missing plugins when an service is loaded).
+report missing plugins when a service is loaded).
 
 The display manager will get a ref to a/some plugin(s) from the service
 manager when each service item is made live, and can then call on each to