From 40de8647cf36dab6c14c8201777cc3a9df44d9b7 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Thu, 28 Feb 2013 21:47:59 +0100
Subject: [PATCH 01/22] renamed general settings to core

Fixes: https://launchpad.net/bugs/1133237
---
 openlp/core/__init__.py                       | 10 +--
 openlp/core/lib/screen.py                     | 12 +--
 openlp/core/lib/settings.py                   | 73 +++++++++++++------
 openlp/core/ui/firsttimeform.py               |  6 +-
 openlp/core/ui/generaltab.py                  |  2 +-
 openlp/core/ui/maindisplay.py                 |  8 +-
 openlp/core/ui/mainwindow.py                  |  2 +-
 openlp/core/ui/media/mediacontroller.py       |  2 +-
 openlp/core/utils/languagemanager.py          |  4 +-
 openlp/plugins/songs/lib/mediaitem.py         |  4 +-
 .../openlp_core_lib/test_settings.py          |  6 +-
 11 files changed, 78 insertions(+), 51 deletions(-)

diff --git a/openlp/core/__init__.py b/openlp/core/__init__.py
index 3ad0e1348..176fa059a 100644
--- a/openlp/core/__init__.py
+++ b/openlp/core/__init__.py
@@ -113,10 +113,10 @@ class OpenLP(QtGui.QApplication):
         # Decide how many screens we have and their size
         screens = ScreenList.create(self.desktop())
         # First time checks in settings
-        has_run_wizard = Settings().value(u'general/has run wizard')
+        has_run_wizard = Settings().value(u'core/has run wizard')
         if not has_run_wizard:
             if FirstTimeForm(screens).exec_() == QtGui.QDialog.Accepted:
-                Settings().setValue(u'general/has run wizard', True)
+                Settings().setValue(u'core/has run wizard', True)
         # Correct stylesheet bugs
         application_stylesheet = u''
         if not Settings().value(u'advanced/alternate rows'):
@@ -128,7 +128,7 @@ class OpenLP(QtGui.QApplication):
             application_stylesheet += nt_repair_stylesheet
         if application_stylesheet:
             self.setStyleSheet(application_stylesheet)
-        show_splash = Settings().value(u'general/show splash')
+        show_splash = Settings().value(u'core/show splash')
         if show_splash:
             self.splash = SplashScreen()
             self.splash.show()
@@ -147,7 +147,7 @@ class OpenLP(QtGui.QApplication):
         self.processEvents()
         if not has_run_wizard:
             self.main_window.first_time()
-        update_check = Settings().value(u'general/update check')
+        update_check = Settings().value(u'core/update check')
         if update_check:
             VersionThread(self.main_window).start()
         self.main_window.is_display_blank()
@@ -309,7 +309,7 @@ def main(args=None):
     if application.is_already_running():
         sys.exit()
     # First time checks in settings
-    if not Settings().value(u'general/has run wizard'):
+    if not Settings().value(u'core/has run wizard'):
         if not FirstTimeLanguageForm().exec_():
             # if cancel then stop processing
             sys.exit()
diff --git a/openlp/core/lib/screen.py b/openlp/core/lib/screen.py
index 913ad539c..149f07ce1 100644
--- a/openlp/core/lib/screen.py
+++ b/openlp/core/lib/screen.py
@@ -247,15 +247,15 @@ class ScreenList(object):
         # Add the screen settings to the settings dict. This has to be done here due to cyclic dependency.
         # Do not do this anywhere else.
         screen_settings = {
-            u'general/x position': self.current[u'size'].x(),
-            u'general/y position': self.current[u'size'].y(),
-            u'general/monitor': self.display_count - 1,
-            u'general/height': self.current[u'size'].height(),
-            u'general/width': self.current[u'size'].width()
+            u'core/x position': self.current[u'size'].x(),
+            u'core/y position': self.current[u'size'].y(),
+            u'core/monitor': self.display_count - 1,
+            u'core/height': self.current[u'size'].height(),
+            u'core/width': self.current[u'size'].width()
         }
         Settings.extend_default_settings(screen_settings)
         settings = Settings()
-        settings.beginGroup(u'general')
+        settings.beginGroup(u'core')
         monitor = settings.value(u'monitor')
         self.set_current_display(monitor)
         self.display = settings.value(u'display on monitor')
diff --git a/openlp/core/lib/settings.py b/openlp/core/lib/settings.py
index be869ade6..e067242dc 100644
--- a/openlp/core/lib/settings.py
+++ b/openlp/core/lib/settings.py
@@ -116,30 +116,30 @@ class Settings(QtCore.QSettings):
         u'advanced/x11 bypass wm': X11_BYPASS_DEFAULT,
         u'crashreport/last directory': u'',
         u'displayTags/html_tags': u'',
-        u'general/audio repeat list': False,
-        u'general/auto open': False,
-        u'general/auto preview': False,
-        u'general/audio start paused': True,
-        u'general/auto unblank': False,
-        u'general/blank warning': False,
-        u'general/ccli number': u'',
-        u'general/has run wizard': False,
-        u'general/language': u'[en]',
+        u'core/audio repeat list': False,
+        u'core/auto open': False,
+        u'core/auto preview': False,
+        u'core/audio start paused': True,
+        u'core/auto unblank': False,
+        u'core/blank warning': False,
+        u'core/ccli number': u'',
+        u'core/has run wizard': False,
+        u'core/language': u'[en]',
         # This defaults to yesterday in order to force the update check to run when you've never run it before.
-        u'general/last version test': datetime.datetime.now().date() - datetime.timedelta(days=1),
-        u'general/loop delay': 5,
-        u'general/recent files': [],
-        u'general/save prompt': False,
-        u'general/screen blank': False,
-        u'general/show splash': True,
-        u'general/songselect password': u'',
-        u'general/songselect username': u'',
-        u'general/update check': True,
-        u'general/view mode': u'default',
+        u'core/last version test': datetime.datetime.now().date() - datetime.timedelta(days=1),
+        u'core/loop delay': 5,
+        u'core/recent files': [],
+        u'core/save prompt': False,
+        u'core/screen blank': False,
+        u'core/show splash': True,
+        u'core/songselect password': u'',
+        u'core/songselect username': u'',
+        u'core/update check': True,
+        u'core/view mode': u'default',
         # The other display settings (display position and dimensions) are defined in the ScreenList class due to a
         # circular dependency.
-        u'general/display on monitor': True,
-        u'general/override position': False,
+        u'core/display on monitor': True,
+        u'core/override position': False,
         u'images/background color': u'#000000',
         u'media/players': u'webkit',
         u'media/override player': QtCore.Qt.Unchecked,
@@ -304,7 +304,7 @@ class Settings(QtCore.QSettings):
         # Changed during 1.9.x development.
         (u'bibles/bookname language', u'bibles/book name language', []),
         (u'general/enable slide loop', u'advanced/slide limits', [(SlideLimits.Wrap, True), (SlideLimits.End, False)]),
-        (u'songs/ccli number', u'general/ccli number', []),
+        (u'songs/ccli number', u'core/ccli number', []),
         # Changed during 2.1.x development.
         (u'advanced/stylesheet fix', u'', []),
         (u'bibles/last directory 1', u'bibles/last directory import', []),
@@ -314,7 +314,34 @@ class Settings(QtCore.QSettings):
         (u'songs/last directory 1', u'songs/last directory import', []),
         (u'songusage/last directory 1', u'songusage/last directory export', []),
         (u'user interface/mainwindow splitter geometry', u'user interface/main window splitter geometry', []),
-        (u'shortcuts/makeLive', u'shortcuts/make_live', [])
+        (u'shortcuts/makeLive', u'shortcuts/make_live', []),
+        (u'general/audio repeat list', u'core/audio repeat list', []),
+        (u'general/auto open', u'core/auto open', []),
+        (u'general/auto preview', u'core/auto preview', []),
+        (u'general/audio start paused', u'core/audio start paused', []),
+        (u'general/auto unblank', u'core/auto unblank', []),
+        (u'general/blank warning', u'core/blank warning', []),
+        (u'general/ccli number', u'core/ccli number', []),
+        (u'general/has run wizard', u'core/has run wizard', []),
+        (u'general/language', u'core/language', []),
+        (u'general/last version test', u'core/last version test', []),
+        (u'general/loop delay', u'core/loop delay', []),
+        (u'general/recent files', u'core/recent files', []),
+        (u'general/save prompt', u'core/save prompt', []),
+        (u'general/screen blank', u'core/screen blank', []),
+        (u'general/show splash', u'core/show splash', []),
+        (u'general/songselect password', u'core/songselect password', []),
+        (u'general/songselect username', u'core/songselect username', []),
+        (u'general/update check', u'core/update check', []),
+        (u'general/view mode', u'core/view mode', []),
+        (u'general/display on monitor', u'core/display on monitor', []),
+        (u'general/override position', u'core/override position', []),
+        (u'general/x position', u'core/x position', []),
+        (u'general/y position', u'core/y position', []),
+        (u'general/monitor', u'core/monitor', []),
+        (u'general/height', u'core/height', []),
+        (u'general/monitor', u'core/monitor', []),
+        (u'general/width', u'core/width', [])
     ]
 
     @staticmethod
diff --git a/openlp/core/ui/firsttimeform.py b/openlp/core/ui/firsttimeform.py
index 188bc3c02..0d749176b 100644
--- a/openlp/core/ui/firsttimeform.py
+++ b/openlp/core/ui/firsttimeform.py
@@ -120,7 +120,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
         check_directory_exists(os.path.join(unicode(gettempdir(), get_filesystem_encoding()), u'openlp'))
         self.noInternetFinishButton.setVisible(False)
         # Check if this is a re-run of the wizard.
-        self.hasRunWizard = Settings().value(u'general/has run wizard')
+        self.hasRunWizard = Settings().value(u'core/has run wizard')
         # Sort out internet access for downloads
         if self.web_access:
             songs = self.config.get(u'songs', u'languages')
@@ -254,7 +254,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
         self.application.set_busy_cursor()
         self._performWizard()
         self.application.set_normal_cursor()
-        Settings().setValue(u'general/has run wizard', True)
+        Settings().setValue(u'core/has run wizard', True)
         self.close()
 
     def urlGetFile(self, url, fpath):
@@ -461,7 +461,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
                     self.urlGetFile(u'%s%s' % (self.web, theme), os.path.join(themes_destination, theme))
         # Set Default Display
         if self.displayComboBox.currentIndex() != -1:
-            Settings().setValue(u'General/monitor', self.displayComboBox.currentIndex())
+            Settings().setValue(u'core/monitor', self.displayComboBox.currentIndex())
             self.screens.set_current_display(self.displayComboBox.currentIndex())
         # Set Global Theme
         if self.themeComboBox.currentIndex() != -1:
diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py
index a20206f9b..af99c3271 100644
--- a/openlp/core/ui/generaltab.py
+++ b/openlp/core/ui/generaltab.py
@@ -49,7 +49,7 @@ class GeneralTab(SettingsTab):
         self.screens = ScreenList()
         self.iconPath = u':/icon/openlp-logo-16x16.png'
         generalTranslated = translate('OpenLP.GeneralTab', 'General')
-        SettingsTab.__init__(self, parent, u'General', generalTranslated)
+        SettingsTab.__init__(self, parent, u'Core', generalTranslated)
 
     def setupUi(self):
         """
diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index 58d832101..41413b503 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -367,7 +367,7 @@ class MainDisplay(Display):
                 # Single screen active
                 if self.screens.display_count == 1:
                     # Only make visible if setting enabled.
-                    if Settings().value(u'general/display on monitor'):
+                    if Settings().value(u'core/display on monitor'):
                         self.setVisible(True)
                 else:
                     self.setVisible(True)
@@ -416,7 +416,7 @@ class MainDisplay(Display):
             self.footer(serviceItem.foot_text)
         # if was hidden keep it hidden
         if self.hideMode and self.isLive and not serviceItem.is_media():
-            if Settings().value(u'general/auto unblank'):
+            if Settings().value(u'core/auto unblank'):
                 Registry().execute(u'slidecontroller_live_unblank')
             else:
                 self.hide_display(self.hideMode)
@@ -438,7 +438,7 @@ class MainDisplay(Display):
         log.debug(u'hide_display mode = %d', mode)
         if self.screens.display_count == 1:
             # Only make visible if setting enabled.
-            if not Settings().value(u'general/display on monitor'):
+            if not Settings().value(u'core/display on monitor'):
                 return
         if mode == HideMode.Screen:
             self.frame.evaluateJavaScript(u'show_blank("desktop");')
@@ -462,7 +462,7 @@ class MainDisplay(Display):
         log.debug(u'show_display')
         if self.screens.display_count == 1:
             # Only make visible if setting enabled.
-            if not Settings().value(u'general/display on monitor'):
+            if not Settings().value(u'core/display on monitor'):
                 return
         self.frame.evaluateJavaScript('show_blank("show");')
         if self.isHidden():
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 14186cf78..0d77da403 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -469,7 +469,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         self.arguments = self.application.args
         # Set up settings sections for the main application (not for use by plugins).
         self.uiSettingsSection = u'user interface'
-        self.generalSettingsSection = u'general'
+        self.generalSettingsSection = u'core'
         self.advancedSettingsSection = u'advanced'
         self.shortcutsSettingsSection = u'shortcuts'
         self.serviceManagerSettingsSection = u'servicemanager'
diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py
index 048fb5f4d..60c09ca21 100644
--- a/openlp/core/ui/media/mediacontroller.py
+++ b/openlp/core/ui/media/mediacontroller.py
@@ -417,7 +417,7 @@ class MediaController(object):
         elif not hidden or controller.media_info.is_background or serviceItem.will_auto_start:
             autoplay = True
         # Unblank on load set
-        elif Settings().value(u'general/auto unblank'):
+        elif Settings().value(u'core/auto unblank'):
             autoplay = True
         if autoplay:
             if not self.media_play(controller):
diff --git a/openlp/core/utils/languagemanager.py b/openlp/core/utils/languagemanager.py
index 00a0d0079..6dc18c1ad 100644
--- a/openlp/core/utils/languagemanager.py
+++ b/openlp/core/utils/languagemanager.py
@@ -98,7 +98,7 @@ class LanguageManager(object):
         """
         Retrieve a saved language to use from settings
         """
-        language = Settings().value(u'general/language')
+        language = Settings().value(u'core/language')
         language = str(language)
         log.info(u'Language file: \'%s\' Loaded from conf file' % language)
         if re.match(r'[[].*[]]', language):
@@ -128,7 +128,7 @@ class LanguageManager(object):
                 language = unicode(qm_list[action_name])
         if LanguageManager.auto_language:
             language = u'[%s]' % language
-        Settings().setValue(u'general/language', language)
+        Settings().setValue(u'core/language', language)
         log.info(u'Language file: \'%s\' written to conf file' % language)
         if message:
             QtGui.QMessageBox.information(None,
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index da706bdcb..e3860aeda 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -457,9 +457,9 @@ class SongMediaItem(MediaManagerItem):
         service_item.raw_footer.append(song.title)
         service_item.raw_footer.append(create_separated_list(author_list))
         service_item.raw_footer.append(song.copyright)
-        if Settings().value(u'general/ccli number'):
+        if Settings().value(u'core/ccli number'):
             service_item.raw_footer.append(translate('SongsPlugin.MediaItem', 'CCLI License: ') +
-                Settings().value(u'general/ccli number'))
+                Settings().value(u'core/ccli number'))
         service_item.audit = [
             song.title, author_list, song.copyright, unicode(song.ccli_number)
         ]
diff --git a/tests/functional/openlp_core_lib/test_settings.py b/tests/functional/openlp_core_lib/test_settings.py
index 827bfa156..2cd15a16f 100644
--- a/tests/functional/openlp_core_lib/test_settings.py
+++ b/tests/functional/openlp_core_lib/test_settings.py
@@ -35,16 +35,16 @@ class TestSettings(TestCase):
         # GIVEN: A new Settings setup
 
         # WHEN reading a setting for the first time
-        default_value = Settings().value(u'general/has run wizard')
+        default_value = Settings().value(u'core/has run wizard')
 
         # THEN the default value is returned
         assert default_value is False, u'The default value should be False'
 
         # WHEN a new value is saved into config
-        Settings().setValue(u'general/has run wizard', True)
+        Settings().setValue(u'core/has run wizard', True)
 
         # THEN the new value is returned when re-read
-        assert Settings().value(u'general/has run wizard') is True, u'The saved value should have been returned'
+        assert Settings().value(u'core/has run wizard') is True, u'The saved value should have been returned'
 
     def settings_override_test(self):
         """

From 3fef841bb27afcd3e7c4c4dfb2015be9fa3e0324 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Tue, 26 Mar 2013 12:45:18 +0100
Subject: [PATCH 02/22] fixed FTW shown again

---
 openlp/core/__init__.py      | 2 ++
 openlp/core/ui/mainwindow.py | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/openlp/core/__init__.py b/openlp/core/__init__.py
index dd2a3d18c..23986ffc4 100644
--- a/openlp/core/__init__.py
+++ b/openlp/core/__init__.py
@@ -305,6 +305,8 @@ def main(args=None):
     # Instance check
     if application.is_already_running():
         sys.exit()
+    # Remove/convert obsolete settings.
+    Settings().remove_obsolete_settings()
     # First time checks in settings
     if not Settings().value(u'core/has run wizard'):
         if not FirstTimeLanguageForm().exec_():
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 8f61d595c..6bcad24c9 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -491,7 +491,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         self.new_data_path = None
         self.copy_data = False
         Settings().set_up_default_values()
-        Settings().remove_obsolete_settings()
         self.service_not_saved = False
         self.about_form = AboutForm(self)
         self.media_controller = MediaController()

From f715810ce99c0848c5af4c3f751576152aff2bfa Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sat, 30 Mar 2013 09:46:34 +0100
Subject: [PATCH 03/22] added test

---
 tests/functional/openlp_core_lib/test_lib.py  |   4 ++--
 tests/interfaces/openlp_plugins/__init__.pyc  | Bin 184 -> 172 bytes
 .../custom/forms/test_customform.py           |  18 ++++++++++++++++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/tests/functional/openlp_core_lib/test_lib.py b/tests/functional/openlp_core_lib/test_lib.py
index 66cb834f1..c03a11265 100644
--- a/tests/functional/openlp_core_lib/test_lib.py
+++ b/tests/functional/openlp_core_lib/test_lib.py
@@ -15,7 +15,7 @@ class TestLib(TestCase):
         """
         Test the str_to_bool function with boolean input
         """
-        #GIVEN: A boolean value set to true
+        # GIVEN: A boolean value set to true
         true_boolean = True
 
         # WHEN: We "convert" it to a bool
@@ -25,7 +25,7 @@ class TestLib(TestCase):
         assert isinstance(true_result, bool), u'The result should be a boolean'
         assert true_result is True, u'The result should be True'
 
-        #GIVEN: A boolean value set to false
+        # GIVEN: A boolean value set to false
         false_boolean = False
 
         # WHEN: We "convert" it to a bool
diff --git a/tests/interfaces/openlp_plugins/__init__.pyc b/tests/interfaces/openlp_plugins/__init__.pyc
index 0d24c9eff54ac7d86f14523ef46194c4bbc24cad..c96ac5c5cba376cfa02ce1fb8f8faeb228d39122 100644
GIT binary patch
delta 35
rcmdnNxQ3CP`7<vU)6%es>}HIi6YUhalS<Qd4GoQrjf~AFmN@|cuU!eR

delta 47
zcmZ3(xPy_M`7<xqxBGSz+07UeC)z2B7bWJU<mc)ZrKT6978hsc=jo<pR-_hB%yI$%
DjI0qo

diff --git a/tests/interfaces/openlp_plugins/custom/forms/test_customform.py b/tests/interfaces/openlp_plugins/custom/forms/test_customform.py
index ebd12f49d..d5de9bff9 100644
--- a/tests/interfaces/openlp_plugins/custom/forms/test_customform.py
+++ b/tests/interfaces/openlp_plugins/custom/forms/test_customform.py
@@ -46,7 +46,7 @@ class TestCustomFrom(TestCase):
             self.form.exec_()
             self.form.load_custom(0)
 
-            #THEN: The line edits should not contain any text.
+            # THEN: The line edits should not contain any text.
             self.assertEqual(self.form.title_edit.text(), u'', u'The title edit should be empty')
             self.assertEqual(self.form.credit_edit.text(), u'', u'The credit edit should be empty')
 
@@ -60,5 +60,19 @@ class TestCustomFrom(TestCase):
             # WHEN: Show the dialog and add a new slide.
             self.form.exec_()
             QtTest.QTest.mouseClick(self.form.add_button, QtCore.Qt.LeftButton)
-            #THEN: One slide should be added.
+            # THEN: One slide should be added.
             assert self.form.slide_list_view.count() == 1, u'There should be one slide added.'
+
+    def load_themes_test(self):
+        """
+        Test the load_themes() method.
+        """
+        # GIVEN: A mocked QDialog.exec_() method
+        with patch(u'PyQt4.QtGui.QDialog.exec_') as mocked_exec:
+            theme_list = [u'First Theme', u'Second Theme']
+            # WHEN: Show the dialog and add pass a theme list.
+            self.form.exec_()
+            self.form.load_themes(theme_list)
+
+            # THEN: There should be three items in the combo box.
+            assert self.form.theme_combo_box.count() == 3, u'There should be three items (themes) in the combo box.'

From 85f64ddae66ca7ea5a62f23ad791a37e459d01be Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sat, 30 Mar 2013 10:46:32 +0100
Subject: [PATCH 04/22] fixed test order

---
 .../custom/forms/test_customform.py           | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/tests/interfaces/openlp_plugins/custom/forms/test_customform.py b/tests/interfaces/openlp_plugins/custom/forms/test_customform.py
index d5de9bff9..417e52875 100644
--- a/tests/interfaces/openlp_plugins/custom/forms/test_customform.py
+++ b/tests/interfaces/openlp_plugins/custom/forms/test_customform.py
@@ -36,6 +36,20 @@ class TestCustomFrom(TestCase):
         del self.main_window
         del self.app
 
+    def load_themes_test(self):
+        """
+        Test the load_themes() method.
+        """
+        # GIVEN: A mocked QDialog.exec_() method
+        with patch(u'PyQt4.QtGui.QDialog.exec_') as mocked_exec:
+            theme_list = [u'First Theme', u'Second Theme']
+            # WHEN: Show the dialog and add pass a theme list.
+            self.form.exec_()
+            self.form.load_themes(theme_list)
+
+            # THEN: There should be three items in the combo box.
+            assert self.form.theme_combo_box.count() == 3, u'There should be three items (themes) in the combo box.'
+
     def load_custom_test(self):
         """
         Test the load_custom() method.
@@ -63,16 +77,3 @@ class TestCustomFrom(TestCase):
             # THEN: One slide should be added.
             assert self.form.slide_list_view.count() == 1, u'There should be one slide added.'
 
-    def load_themes_test(self):
-        """
-        Test the load_themes() method.
-        """
-        # GIVEN: A mocked QDialog.exec_() method
-        with patch(u'PyQt4.QtGui.QDialog.exec_') as mocked_exec:
-            theme_list = [u'First Theme', u'Second Theme']
-            # WHEN: Show the dialog and add pass a theme list.
-            self.form.exec_()
-            self.form.load_themes(theme_list)
-
-            # THEN: There should be three items in the combo box.
-            assert self.form.theme_combo_box.count() == 3, u'There should be three items (themes) in the combo box.'

From c732a70fb23ae83ae1a02dee8acb3141a5b31dff Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sat, 30 Mar 2013 10:50:04 +0100
Subject: [PATCH 05/22] removed extra line

---
 tests/interfaces/openlp_plugins/custom/forms/test_customform.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/interfaces/openlp_plugins/custom/forms/test_customform.py b/tests/interfaces/openlp_plugins/custom/forms/test_customform.py
index 417e52875..5b15688ac 100644
--- a/tests/interfaces/openlp_plugins/custom/forms/test_customform.py
+++ b/tests/interfaces/openlp_plugins/custom/forms/test_customform.py
@@ -76,4 +76,3 @@ class TestCustomFrom(TestCase):
             QtTest.QTest.mouseClick(self.form.add_button, QtCore.Qt.LeftButton)
             # THEN: One slide should be added.
             assert self.form.slide_list_view.count() == 1, u'There should be one slide added.'
-

From a0eed25c6450b314a295bb4b7f167121610c9bd7 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sun, 31 Mar 2013 19:20:53 +0200
Subject: [PATCH 06/22]  remove pyc

---
 tests/interfaces/openlp_plugins/__init__.pyc | Bin 172 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 tests/interfaces/openlp_plugins/__init__.pyc

diff --git a/tests/interfaces/openlp_plugins/__init__.pyc b/tests/interfaces/openlp_plugins/__init__.pyc
deleted file mode 100644
index c96ac5c5cba376cfa02ce1fb8f8faeb228d39122..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 172
zcmZSn%*(~JG%PTg0SXv_v;z<qvjB+{28Lh_kcgiKkYGR~ibH{7`WgATsrrd|DMhJ?
z#rgq7`B|ySCB^#w1*v&H0s2X$>AHr7#>Pg*=K3Y6#XyP7ypq(Sw8Z4pV*Pxenw*08
pf}GOy%)Da#`1s7c%#!$cy@JXT4xq_4x%nxjIjMFa`-_2?0RVP?DE|Ne


From e3afbefd27de25b73ef411e5b8ec2471d0f55116 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Tue, 2 Apr 2013 16:42:33 +0200
Subject: [PATCH 07/22] use QDate instead of python datetime object

---
 openlp/core/lib/settings.py   | 2 +-
 openlp/core/utils/__init__.py | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/openlp/core/lib/settings.py b/openlp/core/lib/settings.py
index 30a8b25d8..d55e386d6 100644
--- a/openlp/core/lib/settings.py
+++ b/openlp/core/lib/settings.py
@@ -126,7 +126,7 @@ class Settings(QtCore.QSettings):
         u'general/has run wizard': False,
         u'general/language': u'[en]',
         # This defaults to yesterday in order to force the update check to run when you've never run it before.
-        u'general/last version test': datetime.datetime.now().date() - datetime.timedelta(days=1),
+        u'general/last version test': QtCore.QDate.currentDate().addDays(-1),
         u'general/loop delay': 5,
         u'general/recent files': [],
         u'general/save prompt': False,
diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py
index d32729699..efe623405 100644
--- a/openlp/core/utils/__init__.py
+++ b/openlp/core/utils/__init__.py
@@ -29,7 +29,6 @@
 """
 The :mod:`openlp.core.utils` module provides the utility libraries for OpenLP.
 """
-from datetime import datetime
 from distutils.version import LooseVersion
 import logging
 import locale
@@ -184,7 +183,7 @@ def check_latest_version(current_version):
     settings = Settings()
     settings.beginGroup(u'general')
     last_test = settings.value(u'last version test')
-    this_test = datetime.now().date()
+    this_test = QtCore.QDate.currentDate()
     settings.setValue(u'last version test', this_test)
     settings.endGroup()
     # Tell the main window whether there will ever be data to display

From 5e3563ceda08f60380b68019d566bbe883ddc2e7 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Tue, 2 Apr 2013 17:08:46 +0200
Subject: [PATCH 08/22] added two tests

---
 openlp/core/utils/__init__.py                 |  3 +-
 .../openlp_core_utils/test_utils.py           | 49 ++++++++++++++++++-
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py
index efe623405..81716a9c9 100644
--- a/openlp/core/utils/__init__.py
+++ b/openlp/core/utils/__init__.py
@@ -243,8 +243,7 @@ def get_images_filter():
     global IMAGES_FILTER
     if not IMAGES_FILTER:
         log.debug(u'Generating images filter.')
-        formats = [unicode(fmt)
-            for fmt in QtGui.QImageReader.supportedImageFormats()]
+        formats == QtGui.QImageReader.supportedImageFormats()
         visible_formats = u'(*.%s)' % u'; *.'.join(formats)
         actual_formats = u'(*.%s)' % u' *.'.join(formats)
         IMAGES_FILTER = u'%s %s %s' % (translate('OpenLP', 'Image Files'), visible_formats, actual_formats)
diff --git a/tests/functional/openlp_core_utils/test_utils.py b/tests/functional/openlp_core_utils/test_utils.py
index 2e826bc61..71922beec 100644
--- a/tests/functional/openlp_core_utils/test_utils.py
+++ b/tests/functional/openlp_core_utils/test_utils.py
@@ -5,7 +5,7 @@ from unittest import TestCase
 
 from mock import patch
 
-from openlp.core.utils import get_filesystem_encoding, _get_frozen_path
+from openlp.core.utils import get_filesystem_encoding, _get_frozen_path, clean_filename, split_filename
 
 class TestUtils(TestCase):
     """
@@ -56,3 +56,50 @@ class TestUtils(TestCase):
             # THEN: The frozen parameter is returned
             assert _get_frozen_path(u'frozen', u'not frozen') == u'frozen', u'Should return "frozen"'
 
+    def split_filename_with_file_path_test(self):
+        """
+        Test the split_filename() function with a path to a file
+        """
+        # GIVEN: A path to a file.
+        file_path = u'/home/user/myfile.txt'
+        wanted_result = (u'/home/user', u'myfile.txt')
+        with patch(u'openlp.core.utils.os.path.isfile') as mocked_is_file:
+            mocked_is_file.return_value = True
+
+            # WHEN: Split the file name.
+            result = split_filename(file_path)
+
+            # THEN: A tuple should be returned.
+            assert result == wanted_result, u'A tuple with the directory and file should have been returned.'
+
+    def split_filename_with_dir_path_test(self):
+        """
+        Test the split_filename() function with a path to a directory.
+        """
+        # GIVEN: A path to a dir.
+        file_path = u'/home/user/mydir'
+        wanted_result = (u'/home/user/mydir', u'')
+        with patch(u'openlp.core.utils.os.path.isfile') as mocked_is_file:
+            mocked_is_file.return_value = False
+
+            # WHEN: Split the file name.
+            result = split_filename(file_path)
+
+            # THEN: A tuple should be returned.
+            assert result == wanted_result, \
+                u'A two-entry tuple with the directory and file (empty) should have been returned.'
+
+
+    def clean_filename_test(self):
+        """
+        Test the clean_filename() function
+        """
+        # GIVEN: A invalid file name and the valid file name.
+        invalid_name = u'A_file_with_invalid_characters_[\\/:\*\?"<>\|\+\[\]%].py'
+        wanted_name = u'A_file_with_invalid_characters______________________.py'
+
+        # WHEN: Clean the name.
+        result = clean_filename(invalid_name)
+
+        # THEN: The file name should be cleaned.
+        assert result == wanted_name, u'The file name should be valid.'

From 0d621f86991f42df0474d4e39fdf5708a8bcb803 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Tue, 2 Apr 2013 17:14:27 +0200
Subject: [PATCH 09/22] changed assertion message

---
 tests/functional/openlp_core_utils/test_utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/functional/openlp_core_utils/test_utils.py b/tests/functional/openlp_core_utils/test_utils.py
index 71922beec..fd1aaa84e 100644
--- a/tests/functional/openlp_core_utils/test_utils.py
+++ b/tests/functional/openlp_core_utils/test_utils.py
@@ -102,4 +102,4 @@ class TestUtils(TestCase):
         result = clean_filename(invalid_name)
 
         # THEN: The file name should be cleaned.
-        assert result == wanted_name, u'The file name should be valid.'
+        assert result == wanted_name, u'The file name should not contain any special characters.'

From 7f111b31a7058f13afe9ddaba826397fbab4072d Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Tue, 2 Apr 2013 17:24:27 +0200
Subject: [PATCH 10/22] use unicode instead of QDateTime

---
 openlp/core/lib/settings.py   | 3 +--
 openlp/core/utils/__init__.py | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/openlp/core/lib/settings.py b/openlp/core/lib/settings.py
index d55e386d6..50b1318b6 100644
--- a/openlp/core/lib/settings.py
+++ b/openlp/core/lib/settings.py
@@ -125,8 +125,7 @@ class Settings(QtCore.QSettings):
         u'general/ccli number': u'',
         u'general/has run wizard': False,
         u'general/language': u'[en]',
-        # This defaults to yesterday in order to force the update check to run when you've never run it before.
-        u'general/last version test': QtCore.QDate.currentDate().addDays(-1),
+        u'general/last version test': u'',
         u'general/loop delay': 5,
         u'general/recent files': [],
         u'general/save prompt': False,
diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py
index 81716a9c9..ba3e06e58 100644
--- a/openlp/core/utils/__init__.py
+++ b/openlp/core/utils/__init__.py
@@ -29,6 +29,7 @@
 """
 The :mod:`openlp.core.utils` module provides the utility libraries for OpenLP.
 """
+from datetime import datetime
 from distutils.version import LooseVersion
 import logging
 import locale
@@ -183,7 +184,7 @@ def check_latest_version(current_version):
     settings = Settings()
     settings.beginGroup(u'general')
     last_test = settings.value(u'last version test')
-    this_test = QtCore.QDate.currentDate()
+    this_test = unicode(datetime.now().date())
     settings.setValue(u'last version test', this_test)
     settings.endGroup()
     # Tell the main window whether there will ever be data to display

From ffb2350f62f4c9ce33973b202101ab75588b3b4f Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Tue, 2 Apr 2013 19:42:01 +0200
Subject: [PATCH 11/22] fix *cough*

---
 openlp/core/utils/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py
index ba3e06e58..9cd8f8c81 100644
--- a/openlp/core/utils/__init__.py
+++ b/openlp/core/utils/__init__.py
@@ -244,7 +244,7 @@ def get_images_filter():
     global IMAGES_FILTER
     if not IMAGES_FILTER:
         log.debug(u'Generating images filter.')
-        formats == QtGui.QImageReader.supportedImageFormats()
+        formats = QtGui.QImageReader.supportedImageFormats()
         visible_formats = u'(*.%s)' % u'; *.'.join(formats)
         actual_formats = u'(*.%s)' % u' *.'.join(formats)
         IMAGES_FILTER = u'%s %s %s' % (translate('OpenLP', 'Image Files'), visible_formats, actual_formats)

From 03eaa91a08776671ea4358524ade159fd761c79f Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Tue, 2 Apr 2013 23:03:07 +0200
Subject: [PATCH 12/22] fixed assertion message and method doc string

---
 tests/functional/openlp_core_utils/test_utils.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/functional/openlp_core_utils/test_utils.py b/tests/functional/openlp_core_utils/test_utils.py
index fd1aaa84e..6d95c6583 100644
--- a/tests/functional/openlp_core_utils/test_utils.py
+++ b/tests/functional/openlp_core_utils/test_utils.py
@@ -70,11 +70,11 @@ class TestUtils(TestCase):
             result = split_filename(file_path)
 
             # THEN: A tuple should be returned.
-            assert result == wanted_result, u'A tuple with the directory and file should have been returned.'
+            assert result == wanted_result, u'A tuple with the directory and file name should have been returned.'
 
     def split_filename_with_dir_path_test(self):
         """
-        Test the split_filename() function with a path to a directory.
+        Test the split_filename() function with a path to a directory
         """
         # GIVEN: A path to a dir.
         file_path = u'/home/user/mydir'
@@ -87,7 +87,7 @@ class TestUtils(TestCase):
 
             # THEN: A tuple should be returned.
             assert result == wanted_result, \
-                u'A two-entry tuple with the directory and file (empty) should have been returned.'
+                u'A two-entry tuple with the directory and file name (empty) should have been returned.'
 
 
     def clean_filename_test(self):

From d504b314ef4f316d510cf162ffacd2d3af68d16d Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 8 Apr 2013 20:30:11 +0200
Subject: [PATCH 13/22] removed not needed mocks and calls

---
 .../custom/forms/test_customform.py           | 32 ++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/tests/interfaces/openlp_plugins/custom/forms/test_customform.py b/tests/interfaces/openlp_plugins/custom/forms/test_customform.py
index d6e69946f..95b7d7ffa 100644
--- a/tests/interfaces/openlp_plugins/custom/forms/test_customform.py
+++ b/tests/interfaces/openlp_plugins/custom/forms/test_customform.py
@@ -40,29 +40,25 @@ class TestEditCustomForm(TestCase):
         """
         Test the load_themes() method.
         """
-        # GIVEN: A mocked QDialog.exec_() method
-        with patch(u'PyQt4.QtGui.QDialog.exec_') as mocked_exec:
-            theme_list = [u'First Theme', u'Second Theme']
-            # WHEN: Show the dialog and add pass a theme list.
-            self.form.exec_()
-            self.form.load_themes(theme_list)
+        # GIVEN: A theme list.
+        theme_list = [u'First Theme', u'Second Theme']
 
-            # THEN: There should be three items in the combo box.
-            assert self.form.theme_combo_box.count() == 3, u'There should be three items (themes) in the combo box.'
+        # WHEN: Show the dialog and add pass a theme list.
+        self.form.load_themes(theme_list)
+
+        # THEN: There should be three items in the combo box.
+        assert self.form.theme_combo_box.count() == 3, u'There should be three items (themes) in the combo box.'
 
     def load_custom_test(self):
         """
         Test the load_custom() method.
         """
-        # GIVEN: A mocked QDialog.exec_() method
-        with patch(u'PyQt4.QtGui.QDialog.exec_') as mocked_exec:
-            # WHEN: Show the dialog and create a new custom item.
-            self.form.exec_()
-            self.form.load_custom(0)
+        # WHEN: Create a new custom item.
+        self.form.load_custom(0)
 
-            # THEN: The line edits should not contain any text.
-            self.assertEqual(self.form.title_edit.text(), u'', u'The title edit should be empty')
-            self.assertEqual(self.form.credit_edit.text(), u'', u'The credit edit should be empty')
+        # THEN: The line edits should not contain any text.
+        self.assertEqual(self.form.title_edit.text(), u'', u'The title edit should be empty')
+        self.assertEqual(self.form.credit_edit.text(), u'', u'The credit edit should be empty')
 
 
     def on_add_button_clicked_test(self):
@@ -71,8 +67,8 @@ class TestEditCustomForm(TestCase):
         """
         # GIVEN: A mocked QDialog.exec_() method
         with patch(u'PyQt4.QtGui.QDialog.exec_') as mocked_exec:
-            # WHEN: Show the dialog and add a new slide.
-            self.form.exec_()
+            # WHEN: Add a new slide.
             QtTest.QTest.mouseClick(self.form.add_button, QtCore.Qt.LeftButton)
+
             # THEN: One slide should be added.
             assert self.form.slide_list_view.count() == 1, u'There should be one slide added.'

From db00c5049a012912e47fd1457009fcd1403311f3 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 15 Apr 2013 17:50:59 +0200
Subject: [PATCH 14/22] fixed missing unicode

---
 openlp/core/utils/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py
index 9a03c2b0e..d4ee8039c 100644
--- a/openlp/core/utils/__init__.py
+++ b/openlp/core/utils/__init__.py
@@ -247,7 +247,7 @@ def get_images_filter():
     global IMAGES_FILTER
     if not IMAGES_FILTER:
         log.debug(u'Generating images filter.')
-        formats = QtGui.QImageReader.supportedImageFormats()
+        formats = map(unicode, QtGui.QImageReader.supportedImageFormats())
         visible_formats = u'(*.%s)' % u'; *.'.join(formats)
         actual_formats = u'(*.%s)' % u' *.'.join(formats)
         IMAGES_FILTER = u'%s %s %s' % (translate('OpenLP', 'Image Files'), visible_formats, actual_formats)
@@ -405,7 +405,7 @@ def get_natural_key(string):
     key = [int(part) if part.isdigit() else get_locale_key(part) for part in key]
     # Python 3 does not support comparision of different types anymore. So make sure, that we do not compare str and int.
     #if string[0].isdigit():
-    #    return [''] + key 
+    #    return [''] + key
     return key
 
 

From dad243dd743835acb79c80e2f5a753406b916a2e Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Fri, 19 Apr 2013 20:52:39 +0200
Subject: [PATCH 15/22] songusage and presentation code standards

---
 openlp/plugins/presentations/__init__.py      |   4 +-
 .../presentations/lib/impresscontroller.py    | 127 ++++++++----------
 openlp/plugins/presentations/lib/mediaitem.py | 117 ++++++++--------
 .../presentations/lib/messagelistener.py      |  67 +++++----
 .../presentations/lib/powerpointcontroller.py |  55 ++++----
 .../presentations/lib/pptviewcontroller.py    |  96 +++++++------
 .../lib/presentationcontroller.py             |  84 +++++-------
 .../presentations/lib/presentationtab.py      |   7 +-
 .../presentations/presentationplugin.py       |  50 ++++---
 openlp/plugins/songusage/__init__.py          |   5 +-
 .../songusage/forms/songusagedeletedialog.py  |   3 +-
 .../songusage/forms/songusagedetaildialog.py  |   3 +-
 openlp/plugins/songusage/lib/db.py            |   2 +
 openlp/plugins/songusage/songusageplugin.py   |  20 ++-
 14 files changed, 301 insertions(+), 339 deletions(-)

diff --git a/openlp/plugins/presentations/__init__.py b/openlp/plugins/presentations/__init__.py
index f147ea524..d600d3793 100644
--- a/openlp/plugins/presentations/__init__.py
+++ b/openlp/plugins/presentations/__init__.py
@@ -27,6 +27,6 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 """
-The :mod:`presentations` module provides the Presentations plugin which allows
-OpenLP to show presentations from most popular presentation packages.
+The :mod:`presentations` module provides the Presentations plugin which allows OpenLP to show presentations from most
+popular presentation packages.
 """
diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py
index d4c933d33..e5df6685e 100644
--- a/openlp/plugins/presentations/lib/impresscontroller.py
+++ b/openlp/plugins/presentations/lib/impresscontroller.py
@@ -62,13 +62,14 @@ from openlp.core.lib import ScreenList
 from openlp.core.utils import delete_file, get_uno_command, get_uno_instance
 from presentationcontroller import PresentationController, PresentationDocument
 
+
 log = logging.getLogger(__name__)
 
+
 class ImpressController(PresentationController):
     """
-    Class to control interactions with Impress presentations.
-    It creates the runtime environment, loads and closes the presentation as
-    well as triggering the correct activities based on the users input
+    Class to control interactions with Impress presentations. It creates the runtime environment, loads and closes the
+    presentation as well as triggering the correct activities based on the users input.
     """
     log.info(u'ImpressController loaded')
 
@@ -79,14 +80,14 @@ class ImpressController(PresentationController):
         log.debug(u'Initialising')
         PresentationController.__init__(self, plugin, u'Impress', ImpressDocument)
         self.supports = [u'odp']
-        self.alsosupports = [u'ppt', u'pps', u'pptx', u'ppsx']
+        self.also_supports = [u'ppt', u'pps', u'pptx', u'ppsx']
         self.process = None
         self.desktop = None
         self.manager = None
 
     def check_available(self):
         """
-        Impress is able to run on this machine
+        Impress is able to run on this machine.
         """
         log.debug(u'check_available')
         if os.name == u'nt':
@@ -96,9 +97,8 @@ class ImpressController(PresentationController):
 
     def start_process(self):
         """
-        Loads a running version of OpenOffice in the background.
-        It is not displayed to the user but is available to the UNO interface
-        when required.
+        Loads a running version of OpenOffice in the background. It is not displayed to the user but is available to the
+        UNO interface when required.
         """
         log.debug(u'start process Openoffice')
         if os.name == u'nt':
@@ -113,8 +113,7 @@ class ImpressController(PresentationController):
 
     def get_uno_desktop(self):
         """
-        On non-Windows platforms, use Uno. Get the OpenOffice desktop
-        which will be used to manage impress
+        On non-Windows platforms, use Uno. Get the OpenOffice desktop which will be used to manage impress.
         """
         log.debug(u'get UNO Desktop Openoffice')
         uno_instance = None
@@ -132,8 +131,7 @@ class ImpressController(PresentationController):
                 loop += 1
         try:
             self.manager = uno_instance.ServiceManager
-            log.debug(u'get UNO Desktop Openoffice - createInstanceWithContext'
-                u' - Desktop')
+            log.debug(u'get UNO Desktop Openoffice - createInstanceWithContext - Desktop')
             desktop = self.manager.createInstanceWithContext("com.sun.star.frame.Desktop", uno_instance)
             return desktop
         except:
@@ -142,8 +140,7 @@ class ImpressController(PresentationController):
 
     def get_com_desktop(self):
         """
-        On Windows platforms, use COM. Return the desktop object which
-        will be used to manage Impress
+        On Windows platforms, use COM. Return the desktop object which will be used to manage Impress.
         """
         log.debug(u'get COM Desktop OpenOffice')
         if not self.manager:
@@ -157,7 +154,7 @@ class ImpressController(PresentationController):
 
     def get_com_servicemanager(self):
         """
-        Return the OOo service manager for windows
+        Return the OOo service manager for windows.
         """
         log.debug(u'get_com_servicemanager openoffice')
         try:
@@ -168,7 +165,7 @@ class ImpressController(PresentationController):
 
     def kill(self):
         """
-        Called at system exit to clean up any running presentations
+        Called at system exit to clean up any running presentations.
         """
         log.debug(u'Kill OpenOffice')
         while self.docs:
@@ -203,12 +200,12 @@ class ImpressController(PresentationController):
 
 class ImpressDocument(PresentationDocument):
     """
-    Class which holds information and controls a single presentation
+    Class which holds information and controls a single presentation.
     """
 
     def __init__(self, controller, presentation):
         """
-        Constructor, store information about the file and initialise
+        Constructor, store information about the file and initialise.
         """
         log.debug(u'Init Presentation OpenOffice')
         PresentationDocument.__init__(self, controller, presentation)
@@ -218,11 +215,9 @@ class ImpressDocument(PresentationDocument):
 
     def load_presentation(self):
         """
-        Called when a presentation is added to the SlideController.
-        It builds the environment, starts communcations with the background
-        OpenOffice task started earlier. If OpenOffice is not present is is
-        started. Once the environment is available the presentation is loaded
-        and started.
+        Called when a presentation is added to the SlideController. It builds the environment, starts communcations with
+        the background OpenOffice task started earlier. If OpenOffice is not present is is started. Once the environment
+        is available the presentation is loaded and started.
         """
         log.debug(u'Load Presentation OpenOffice')
         if os.name == u'nt':
@@ -239,13 +234,12 @@ class ImpressDocument(PresentationDocument):
         self.desktop = desktop
         properties = []
         if os.name != u'nt':
-            # Recent versions of Impress on Windows won't start the presentation
-            # if it starts as minimized. It seems OK on Linux though.
+            # Recent versions of Impress on Windows won't start the presentation if it starts as minimized. It seems OK
+            # on Linux though.
             properties.append(self.create_property(u'Minimized', True))
         properties = tuple(properties)
         try:
-            self.document = desktop.loadComponentFromURL(url, u'_blank',
-                0, properties)
+            self.document = desktop.loadComponentFromURL(url, u'_blank', 0, properties)
         except:
             log.warn(u'Failed to load presentation %s' % url)
             return False
@@ -262,33 +256,33 @@ class ImpressDocument(PresentationDocument):
 
     def create_thumbnails(self):
         """
-        Create thumbnail images for presentation
+        Create thumbnail images for presentation.
         """
         log.debug(u'create thumbnails OpenOffice')
         if self.check_thumbnails():
             return
         if os.name == u'nt':
-            thumbdirurl = u'file:///' + self.get_temp_folder().replace(u'\\', u'/') \
+            thumb_dir_url = u'file:///' + self.get_temp_folder().replace(u'\\', u'/') \
                 .replace(u':', u'|').replace(u' ', u'%20')
         else:
-            thumbdirurl = uno.systemPathToFileUrl(self.get_temp_folder())
-        props = []
-        props.append(self.create_property(u'FilterName', u'impress_png_Export'))
-        props = tuple(props)
+            thumb_dir_url = uno.systemPathToFileUrl(self.get_temp_folder())
+        properties = []
+        properties.append(self.create_property(u'FilterName', u'impress_png_Export'))
+        properties = tuple(properties)
         doc = self.document
         pages = doc.getDrawPages()
         if not pages:
             return
         if not os.path.isdir(self.get_temp_folder()):
             os.makedirs(self.get_temp_folder())
-        for idx in range(pages.getCount()):
-            page = pages.getByIndex(idx)
+        for index in range(pages.getCount()):
+            page = pages.getByIndex(index)
             doc.getCurrentController().setCurrentPage(page)
-            urlpath = u'%s/%s.png' % (thumbdirurl, unicode(idx + 1))
-            path = os.path.join(self.get_temp_folder(), unicode(idx + 1) + u'.png')
+            url_path = u'%s/%s.png' % (thumb_dir_url, unicode(index + 1))
+            path = os.path.join(self.get_temp_folder(), unicode(index + 1) + u'.png')
             try:
-                doc.storeToURL(urlpath, props)
-                self.convert_thumbnail(path, idx + 1)
+                doc.storeToURL(url_path, properties)
+                self.convert_thumbnail(path, index + 1)
                 delete_file(path)
             except ErrorCodeIOException, exception:
                 log.exception(u'ERROR! ErrorCodeIOException %d' % exception.ErrCode)
@@ -297,23 +291,21 @@ class ImpressDocument(PresentationDocument):
 
     def create_property(self, name, value):
         """
-        Create an OOo style property object which are passed into some
-        Uno methods
+        Create an OOo style property object which are passed into some Uno methods.
         """
         log.debug(u'create property OpenOffice')
         if os.name == u'nt':
-            prop = self.controller.manager.Bridge_GetStruct(u'com.sun.star.beans.PropertyValue')
+            property = self.controller.manager.Bridge_GetStruct(u'com.sun.star.beans.PropertyValue')
         else:
-            prop = PropertyValue()
-        prop.Name = name
-        prop.Value = value
-        return prop
+            property = PropertyValue()
+        property.Name = name
+        property.Value = value
+        return property
 
     def close_presentation(self):
         """
-        Close presentation and clean up objects
-        Triggered by new object being added to SlideController or OpenLP
-        being shutdown
+        Close presentation and clean up objects. Triggered by new object being added to SlideController or OpenLP being
+        shutdown.
         """
         log.debug(u'close Presentation OpenOffice')
         if self.document:
@@ -329,7 +321,7 @@ class ImpressDocument(PresentationDocument):
 
     def is_loaded(self):
         """
-        Returns true if a presentation is loaded
+        Returns true if a presentation is loaded.
         """
         log.debug(u'is loaded OpenOffice')
         if self.presentation is None or self.document is None:
@@ -346,7 +338,7 @@ class ImpressDocument(PresentationDocument):
 
     def is_active(self):
         """
-        Returns true if a presentation is active and running
+        Returns true if a presentation is active and running.
         """
         log.debug(u'is active OpenOffice')
         if not self.is_loaded():
@@ -355,21 +347,21 @@ class ImpressDocument(PresentationDocument):
 
     def unblank_screen(self):
         """
-        Unblanks the screen
+        Unblanks the screen.
         """
         log.debug(u'unblank screen OpenOffice')
         return self.control.resume()
 
     def blank_screen(self):
         """
-        Blanks the screen
+        Blanks the screen.
         """
         log.debug(u'blank screen OpenOffice')
         self.control.blankScreen(0)
 
     def is_blank(self):
         """
-        Returns true if screen is blank
+        Returns true if screen is blank.
         """
         log.debug(u'is blank OpenOffice')
         if self.control and self.control.isRunning():
@@ -379,7 +371,7 @@ class ImpressDocument(PresentationDocument):
 
     def stop_presentation(self):
         """
-        Stop the presentation, remove from screen
+        Stop the presentation, remove from screen.
         """
         log.debug(u'stop presentation OpenOffice')
         # deactivate should hide the screen according to docs, but doesn't
@@ -389,18 +381,17 @@ class ImpressDocument(PresentationDocument):
 
     def start_presentation(self):
         """
-        Start the presentation from the beginning
+        Start the presentation from the beginning.
         """
         log.debug(u'start presentation OpenOffice')
         if self.control is None or not self.control.isRunning():
             self.presentation.start()
             self.control = self.presentation.getController()
-            # start() returns before the Component is ready.
-            # Try for 15 seconds
-            i = 1
-            while not self.control and i < 150:
+            # start() returns before the Component is ready. Try for 15 seconds.
+            sleep_count = 1
+            while not self.control and sleep_count < 150:
                 time.sleep(0.1)
-                i += 1
+                sleep_count += 1
                 self.control = self.presentation.getController()
         else:
             self.control.activate()
@@ -408,25 +399,25 @@ class ImpressDocument(PresentationDocument):
 
     def get_slide_number(self):
         """
-        Return the current slide number on the screen, from 1
+        Return the current slide number on the screen, from 1.
         """
         return self.control.getCurrentSlideIndex() + 1
 
     def get_slide_count(self):
         """
-        Return the total number of slides
+        Return the total number of slides.
         """
         return self.document.getDrawPages().getCount()
 
     def goto_slide(self, slideno):
         """
-        Go to a specific slide (from 1)
+        Go to a specific slide (from 1).
         """
         self.control.gotoSlideIndex(slideno-1)
 
     def next_step(self):
         """
-        Triggers the next effect of slide on the running presentation
+        Triggers the next effect of slide on the running presentation.
         """
         is_paused = self.control.isPaused()
         self.control.gotoNextEffect()
@@ -436,7 +427,7 @@ class ImpressDocument(PresentationDocument):
 
     def previous_step(self):
         """
-        Triggers the previous slide on the running presentation
+        Triggers the previous slide on the running presentation.
         """
         self.control.gotoPreviousSlide()
 
@@ -470,8 +461,8 @@ class ImpressDocument(PresentationDocument):
         page = pages.getByIndex(slide_no - 1)
         if notes:
             page = page.getNotesPage()
-        for idx in range(page.getCount()):
-            shape = page.getByIndex(idx)
+        for index in range(page.getCount()):
+            shape = page.getByIndex(index)
             if shape.supportsService("com.sun.star.drawing.Text"):
                 text += shape.getString() + '\n'
         return text
diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py
index 52dcd891f..9664fcf2f 100644
--- a/openlp/plugins/presentations/lib/mediaitem.py
+++ b/openlp/plugins/presentations/lib/mediaitem.py
@@ -38,14 +38,17 @@ from openlp.core.lib.ui import critical_error_message_box, create_horizontal_adj
 from openlp.core.utils import get_locale_key
 from openlp.plugins.presentations.lib import MessageListener
 
+
 log = logging.getLogger(__name__)
 
-ERROR = QtGui.QImage(u':/general/general_delete.png')
+
+ERROR_IMAGE = QtGui.QImage(u':/general/general_delete.png')
+
 
 class PresentationMediaItem(MediaManagerItem):
     """
-    This is the Presentation media manager item for Presentation Items.
-    It can present files using Openoffice and Powerpoint
+    This is the Presentation media manager item for Presentation Items. It can present files using Openoffice and
+    Powerpoint
     """
     log.info(u'Presentations Media Item loaded')
 
@@ -71,25 +74,25 @@ class PresentationMediaItem(MediaManagerItem):
         """
         self.on_new_prompt = translate('PresentationPlugin.MediaItem', 'Select Presentation(s)')
         self.Automatic = translate('PresentationPlugin.MediaItem', 'Automatic')
-        self.displayTypeLabel.setText(translate('PresentationPlugin.MediaItem', 'Present using:'))
+        self.display_type_label.setText(translate('PresentationPlugin.MediaItem', 'Present using:'))
 
     def build_file_mask_string(self):
         """
-        Build the list of file extensions to be used in the Open file dialog
+        Build the list of file extensions to be used in the Open file dialog.
         """
-        fileType = u''
+        file_type = u''
         for controller in self.controllers:
             if self.controllers[controller].enabled():
-                types = self.controllers[controller].supports + self.controllers[controller].alsosupports
-                for type in types:
-                    if fileType.find(type) == -1:
-                        fileType += u'*.%s ' % type
-                        self.service_manager.supported_suffixes(type)
-        self.on_new_file_masks = translate('PresentationPlugin.MediaItem', 'Presentations (%s)') % fileType
+                file_types = self.controllers[controller].supports + self.controllers[controller].also_supports
+                for file_type in file_types:
+                    if file_type.find(file_type) == -1:
+                        file_type += u'*.%s ' % file_type
+                        self.service_manager.supported_suffixes(file_type)
+        self.on_new_file_masks = translate('PresentationPlugin.MediaItem', 'Presentations (%s)') % file_type
 
     def required_icons(self):
         """
-        Set which icons the media manager tab should show
+        Set which icons the media manager tab should show.
         """
         MediaManagerItem.required_icons(self)
         self.has_file_icon = True
@@ -98,21 +101,21 @@ class PresentationMediaItem(MediaManagerItem):
 
     def add_end_header_bar(self):
         """
-        Display custom media manager items for presentations
+        Display custom media manager items for presentations.
         """
-        self.presentationWidget = QtGui.QWidget(self)
-        self.presentationWidget.setObjectName(u'presentationWidget')
-        self.displayLayout = QtGui.QFormLayout(self.presentationWidget)
-        self.displayLayout.setMargin(self.displayLayout.spacing())
-        self.displayLayout.setObjectName(u'displayLayout')
-        self.displayTypeLabel = QtGui.QLabel(self.presentationWidget)
-        self.displayTypeLabel.setObjectName(u'displayTypeLabel')
-        self.displayTypeComboBox = create_horizontal_adjusting_combo_box(self.presentationWidget,
+        self.presentation_widget = QtGui.QWidget(self)
+        self.presentation_widget.setObjectName(u'presentation_widget')
+        self.display_layout = QtGui.QFormLayout(self.presentation_widget)
+        self.display_layout.setMargin(self.display_layout.spacing())
+        self.display_layout.setObjectName(u'display_layout')
+        self.display_type_label = QtGui.QLabel(self.presentation_widget)
+        self.display_type_label.setObjectName(u'display_type_label')
+        self.displayTypeComboBox = create_horizontal_adjusting_combo_box(self.presentation_widget,
             u'displayTypeComboBox')
-        self.displayTypeLabel.setBuddy(self.displayTypeComboBox)
-        self.displayLayout.addRow(self.displayTypeLabel, self.displayTypeComboBox)
+        self.display_type_label.setBuddy(self.displayTypeComboBox)
+        self.display_layout.addRow(self.display_type_label, self.displayTypeComboBox)
         # Add the Presentation widget to the page layout
-        self.page_layout.addWidget(self.presentationWidget)
+        self.page_layout.addWidget(self.presentation_widget)
 
     def initialise(self):
         """
@@ -120,13 +123,13 @@ class PresentationMediaItem(MediaManagerItem):
         """
         self.list_view.setIconSize(QtCore.QSize(88, 50))
         files = Settings().value(self.settings_section + u'/presentations files')
-        self.load_list(files, initialLoad=True)
+        self.load_list(files, initial_load=True)
         self.populate_display_types()
 
     def populate_display_types(self):
         """
-        Load the combobox with the enabled presentation controllers,
-        allowing user to select a specific app if settings allow
+        Load the combobox with the enabled presentation controllers, allowing user to select a specific app if settings
+        allow.
         """
         self.displayTypeComboBox.clear()
         for item in self.controllers:
@@ -137,38 +140,37 @@ class PresentationMediaItem(MediaManagerItem):
             self.displayTypeComboBox.insertItem(0, self.Automatic)
             self.displayTypeComboBox.setCurrentIndex(0)
         if Settings().value(self.settings_section + u'/override app') == QtCore.Qt.Checked:
-            self.presentationWidget.show()
+            self.presentation_widget.show()
         else:
-            self.presentationWidget.hide()
+            self.presentation_widget.hide()
 
-    def load_list(self, files, target_group=None, initialLoad=False):
+    def load_list(self, files, target_group=None, initial_load=False):
         """
-        Add presentations into the media manager
-        This is called both on initial load of the plugin to populate with
-        existing files, and when the user adds new files via the media manager
+        Add presentations into the media manager. This is called both on initial load of the plugin to populate with
+        existing files, and when the user adds new files via the media manager.
         """
-        currlist = self.get_file_list()
-        titles = [os.path.split(file)[1] for file in currlist]
+        current_list = self.get_file_list()
+        titles = [os.path.split(file)[1] for file in current_list]
         self.application.set_busy_cursor()
-        if not initialLoad:
+        if not initial_load:
             self.main_window.display_progress_bar(len(files))
         # Sort the presentations by its filename considering language specific characters.
         files.sort(key=lambda filename: get_locale_key(os.path.split(unicode(filename))[1]))
         for file in files:
-            if not initialLoad:
+            if not initial_load:
                 self.main_window.increment_progress_bar()
-            if currlist.count(file) > 0:
+            if current_list.count(file) > 0:
                 continue
             filename = os.path.split(unicode(file))[1]
             if not os.path.exists(file):
                 item_name = QtGui.QListWidgetItem(filename)
-                item_name.setIcon(build_icon(ERROR))
+                item_name.setIcon(build_icon(ERROR_IMAGE))
                 item_name.setData(QtCore.Qt.UserRole, file)
                 item_name.setToolTip(file)
                 self.list_view.addItem(item_name)
             else:
                 if titles.count(filename) > 0:
-                    if not initialLoad:
+                    if not initial_load:
                         critical_error_message_box(translate('PresentationPlugin.MediaItem', 'File Exists'),
                             translate('PresentationPlugin.MediaItem',
                                 'A presentation with that filename already exists.')
@@ -180,7 +182,7 @@ class PresentationMediaItem(MediaManagerItem):
                     doc = controller.add_document(unicode(file))
                     thumb = os.path.join(doc.get_thumbnail_folder(), u'icon.png')
                     preview = doc.get_thumbnail_path(1, True)
-                    if not preview and not initialLoad:
+                    if not preview and not initial_load:
                         doc.load_presentation()
                         preview = doc.get_thumbnail_path(1, True)
                     doc.close_presentation()
@@ -192,7 +194,7 @@ class PresentationMediaItem(MediaManagerItem):
                         else:
                             icon = create_thumb(preview, thumb)
                 else:
-                    if initialLoad:
+                    if initial_load:
                         icon = build_icon(u':/general/general_delete.png')
                     else:
                         critical_error_message_box(UiStrings().UnsupportedFile,
@@ -203,13 +205,13 @@ class PresentationMediaItem(MediaManagerItem):
                 item_name.setIcon(icon)
                 item_name.setToolTip(file)
                 self.list_view.addItem(item_name)
-        if not initialLoad:
+        if not initial_load:
             self.main_window.finished_progress_bar()
         self.application.set_normal_cursor()
 
     def on_delete_click(self):
         """
-        Remove a presentation item from the list
+        Remove a presentation item from the list.
         """
         if check_item_selected(self.list_view, UiStrings().SelectDelete):
             items = self.list_view.selectedIndexes()
@@ -230,12 +232,11 @@ class PresentationMediaItem(MediaManagerItem):
                 self.list_view.takeItem(row)
             Settings().setValue(self.settings_section + u'/presentations files', self.get_file_list())
 
-    def generate_slide_data(self, service_item, item=None, xmlVersion=False,
+    def generate_slide_data(self, service_item, item=None, xml_version=False,
         remote=False, context=ServiceItemContext.Service):
         """
-        Load the relevant information for displaying the presentation
-        in the slidecontroller. In the case of powerpoints, an image
-        for each slide
+        Load the relevant information for displaying the presentation in the slidecontroller. In the case of
+        powerpoints, an image for each slide.
         """
         if item:
             items = [item]
@@ -287,26 +288,24 @@ class PresentationMediaItem(MediaManagerItem):
 
     def findControllerByType(self, filename):
         """
-        Determine the default application controller to use for the selected
-        file type. This is used if "Automatic" is set as the preferred
-        controller. Find the first (alphabetic) enabled controller which
-        "supports" the extension. If none found, then look for a controller
-        which "also supports" it instead.
+        Determine the default application controller to use for the selected file type. This is used if "Automatic" is
+        set as the preferred controller. Find the first (alphabetic) enabled controller which "supports" the extension.
+        If none found, then look for a controller which "also supports" it instead.
         """
-        filetype = os.path.splitext(filename)[1][1:]
-        if not filetype:
+        file_type = os.path.splitext(filename)[1][1:]
+        if not file_type:
             return None
         for controller in self.controllers:
             if self.controllers[controller].enabled():
-                if filetype in self.controllers[controller].supports:
+                if file_type in self.controllers[controller].supports:
                     return controller
         for controller in self.controllers:
             if self.controllers[controller].enabled():
-                if filetype in self.controllers[controller].alsosupports:
+                if file_type in self.controllers[controller].also_supports:
                     return controller
         return None
 
-    def search(self, string, showError):
+    def search(self, string, show_error):
         files = Settings().value(self.settings_section + u'/presentations files')
         results = []
         string = string.lower()
diff --git a/openlp/plugins/presentations/lib/messagelistener.py b/openlp/plugins/presentations/lib/messagelistener.py
index d87e7e5dc..330c36f5c 100644
--- a/openlp/plugins/presentations/lib/messagelistener.py
+++ b/openlp/plugins/presentations/lib/messagelistener.py
@@ -38,8 +38,8 @@ log = logging.getLogger(__name__)
 
 class Controller(object):
     """
-    This is the Presentation listener who acts on events from the slide
-    controller and passes the messages on the the correct presentation handlers
+    This is the Presentation listener who acts on events from the slide controller and passes the messages on the the
+    correct presentation handlers.
     """
     log.info(u'Controller loaded')
 
@@ -54,9 +54,8 @@ class Controller(object):
 
     def add_handler(self, controller, file, hide_mode, slide_no):
         """
-        Add a handler, which is an instance of a presentation and
-        slidecontroller combination. If the slidecontroller has a display
-        then load the presentation.
+        Add a handler, which is an instance of a presentation and slidecontroller combination. If the slidecontroller
+        has a display then load the presentation.
         """
         log.debug(u'Live = %s, add_handler %s' % (self.is_live, file))
         self.controller = controller
@@ -86,8 +85,7 @@ class Controller(object):
 
     def activate(self):
         """
-        Active the presentation, and show it on the screen.
-        Use the last slide number.
+        Active the presentation, and show it on the screen. Use the last slide number.
         """
         log.debug(u'Live = %s, activate' % self.is_live)
         if not self.doc:
@@ -130,7 +128,7 @@ class Controller(object):
 
     def first(self):
         """
-        Based on the handler passed at startup triggers the first slide
+        Based on the handler passed at startup triggers the first slide.
         """
         log.debug(u'Live = %s, first' % self.is_live)
         if not self.doc:
@@ -148,7 +146,7 @@ class Controller(object):
 
     def last(self):
         """
-        Based on the handler passed at startup triggers the last slide
+        Based on the handler passed at startup triggers the last slide.
         """
         log.debug(u'Live = %s, last' % self.is_live)
         if not self.doc:
@@ -166,7 +164,7 @@ class Controller(object):
 
     def next(self):
         """
-        Based on the handler passed at startup triggers the next slide event
+        Based on the handler passed at startup triggers the next slide event.
         """
         log.debug(u'Live = %s, next' % self.is_live)
         if not self.doc:
@@ -182,9 +180,8 @@ class Controller(object):
             return
         if not self.activate():
             return
-        # The "End of slideshow" screen is after the last slide
-        # Note, we can't just stop on the last slide, since it may
-        # contain animations that need to be stepped through.
+        # The "End of slideshow" screen is after the last slide. Note, we can't just stop on the last slide, since it
+        # may contain animations that need to be stepped through.
         if self.doc.slidenumber > self.doc.get_slide_count():
             return
         self.doc.next_step()
@@ -192,7 +189,7 @@ class Controller(object):
 
     def previous(self):
         """
-        Based on the handler passed at startup triggers the previous slide event
+        Based on the handler passed at startup triggers the previous slide event.
         """
         log.debug(u'Live = %s, previous' % self.is_live)
         if not self.doc:
@@ -213,7 +210,7 @@ class Controller(object):
 
     def shutdown(self):
         """
-        Based on the handler passed at startup triggers slide show to shut down
+        Based on the handler passed at startup triggers slide show to shut down.
         """
         log.debug(u'Live = %s, shutdown' % self.is_live)
         if not self.doc:
@@ -223,7 +220,7 @@ class Controller(object):
 
     def blank(self, hide_mode):
         """
-        Instruct the controller to blank the presentation
+        Instruct the controller to blank the presentation.
         """
         log.debug(u'Live = %s, blank' % self.is_live)
         self.hide_mode = hide_mode
@@ -244,7 +241,7 @@ class Controller(object):
 
     def stop(self):
         """
-        Instruct the controller to stop and hide the presentation
+        Instruct the controller to stop and hide the presentation.
         """
         log.debug(u'Live = %s, stop' % self.is_live)
         self.hide_mode = HideMode.Screen
@@ -260,7 +257,7 @@ class Controller(object):
 
     def unblank(self):
         """
-        Instruct the controller to unblank the presentation
+        Instruct the controller to unblank the presentation.
         """
         log.debug(u'Live = %s, unblank' % self.is_live)
         self.hide_mode = None
@@ -283,8 +280,8 @@ class Controller(object):
 
 class MessageListener(object):
     """
-    This is the Presentation listener who acts on events from the slide
-    controller and passes the messages on the the correct presentation handlers
+    This is the Presentation listener who acts on events from the slide controller and passes the messages on the the
+    correct presentation handlers
     """
     log.info(u'Message Listener loaded')
 
@@ -310,12 +307,11 @@ class MessageListener(object):
 
     def startup(self, message):
         """
-        Start of new presentation
-        Save the handler as any new presentations start here
+        Start of new presentation. Save the handler as any new presentations start here
         """
+        log.debug(u'Startup called with message %s' % message)
         is_live = message[1]
         item = message[0]
-        log.debug(u'Startup called with message %s' % message)
         hide_mode = message[2]
         file = item.get_frame_path()
         self.handler = item.title
@@ -331,7 +327,7 @@ class MessageListener(object):
 
     def slide(self, message):
         """
-        React to the message to move to a specific slide
+        React to the message to move to a specific slide.
         """
         is_live = message[1]
         slide = message[2]
@@ -342,7 +338,7 @@ class MessageListener(object):
 
     def first(self, message):
         """
-        React to the message to move to the first slide
+        React to the message to move to the first slide.
         """
         is_live = message[1]
         if is_live:
@@ -352,7 +348,7 @@ class MessageListener(object):
 
     def last(self, message):
         """
-        React to the message to move to the last slide
+        React to the message to move to the last slide.
         """
         is_live = message[1]
         if is_live:
@@ -362,7 +358,7 @@ class MessageListener(object):
 
     def next(self, message):
         """
-        React to the message to move to the next animation/slide
+        React to the message to move to the next animation/slide.
         """
         is_live = message[1]
         if is_live:
@@ -372,7 +368,7 @@ class MessageListener(object):
 
     def previous(self, message):
         """
-        React to the message to move to the previous animation/slide
+        React to the message to move to the previous animation/slide.
         """
         is_live = message[1]
         if is_live:
@@ -382,8 +378,7 @@ class MessageListener(object):
 
     def shutdown(self, message):
         """
-        React to message to shutdown the presentation. I.e. end the show
-        and close the file
+        React to message to shutdown the presentation. I.e. end the show and close the file.
         """
         is_live = message[1]
         if is_live:
@@ -393,7 +388,7 @@ class MessageListener(object):
 
     def hide(self, message):
         """
-        React to the message to show the desktop
+        React to the message to show the desktop.
         """
         is_live = message[1]
         if is_live:
@@ -401,7 +396,7 @@ class MessageListener(object):
 
     def blank(self, message):
         """
-        React to the message to blank the display
+        React to the message to blank the display.
         """
         is_live = message[1]
         hide_mode = message[2]
@@ -410,7 +405,7 @@ class MessageListener(object):
 
     def unblank(self, message):
         """
-        React to the message to unblank the display
+        React to the message to unblank the display.
         """
         is_live = message[1]
         if is_live:
@@ -418,9 +413,7 @@ class MessageListener(object):
 
     def timeout(self):
         """
-        The presentation may be timed or might be controlled by the
-        application directly, rather than through OpenLP. Poll occasionally
-        to check which slide is currently displayed so the slidecontroller
-        view can be updated
+        The presentation may be timed or might be controlled by the application directly, rather than through OpenLP.
+        Poll occasionally to check which slide is currently displayed so the slidecontroller view can be updated.
         """
         self.live_handler.poll()
diff --git a/openlp/plugins/presentations/lib/powerpointcontroller.py b/openlp/plugins/presentations/lib/powerpointcontroller.py
index 7a9f548ee..6895fda19 100644
--- a/openlp/plugins/presentations/lib/powerpointcontroller.py
+++ b/openlp/plugins/presentations/lib/powerpointcontroller.py
@@ -26,7 +26,10 @@
 # with this program; if not, write to the Free Software Foundation, Inc., 59  #
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
-
+"""
+This modul is for controlling powerpiont. PPT API documentation:
+`http://msdn.microsoft.com/en-us/library/aa269321(office.10).aspx`_
+"""
 import os
 import logging
 
@@ -39,16 +42,14 @@ if os.name == u'nt':
 from openlp.core.lib import ScreenList
 from presentationcontroller import PresentationController, PresentationDocument
 
+
 log = logging.getLogger(__name__)
 
-# PPT API documentation:
-# http://msdn.microsoft.com/en-us/library/aa269321(office.10).aspx
 
 class PowerpointController(PresentationController):
     """
-    Class to control interactions with PowerPoint Presentations
-    It creates the runtime Environment , Loads the and Closes the Presentation
-    As well as triggering the correct activities based on the users input
+    Class to control interactions with PowerPoint Presentations. It creates the runtime Environment , Loads the and
+    Closes the Presentation. As well as triggering the correct activities based on the users input.
     """
     log.info(u'PowerpointController loaded')
 
@@ -63,7 +64,7 @@ class PowerpointController(PresentationController):
 
     def check_available(self):
         """
-        PowerPoint is able to run on this machine
+        PowerPoint is able to run on this machine.
         """
         log.debug(u'check_available')
         if os.name == u'nt':
@@ -77,7 +78,7 @@ class PowerpointController(PresentationController):
     if os.name == u'nt':
         def start_process(self):
             """
-            Loads PowerPoint process
+            Loads PowerPoint process.
             """
             log.debug(u'start_process')
             if not self.process:
@@ -87,7 +88,7 @@ class PowerpointController(PresentationController):
 
         def kill(self):
             """
-            Called at system exit to clean up any running presentations
+            Called at system exit to clean up any running presentations.
             """
             log.debug(u'Kill powerpoint')
             while self.docs:
@@ -105,12 +106,12 @@ class PowerpointController(PresentationController):
 
 class PowerpointDocument(PresentationDocument):
     """
-    Class which holds information and controls a single presentation
+    Class which holds information and controls a single presentation.
     """
 
     def __init__(self, controller, presentation):
         """
-        Constructor, store information about the file and initialise
+        Constructor, store information about the file and initialise.
         """
         log.debug(u'Init Presentation Powerpoint')
         PresentationDocument.__init__(self, controller, presentation)
@@ -118,8 +119,8 @@ class PowerpointDocument(PresentationDocument):
 
     def load_presentation(self):
         """
-        Called when a presentation is added to the SlideController.
-        Opens the PowerPoint file using the process created earlier.
+        Called when a presentation is added to the SlideController. Opens the PowerPoint file using the process created
+        earlier.
         """
         log.debug(u'load_presentation')
         if not self.controller.process or not self.controller.process.Visible:
@@ -142,20 +143,19 @@ class PowerpointDocument(PresentationDocument):
             self.presentation.Slides[n].Copy()
             thumbnail = QApplication.clipboard.image()
 
-        However, for the moment, we want a physical file since it makes life
-        easier elsewhere.
+        However, for the moment, we want a physical file since it makes life easier elsewhere.
         """
         log.debug(u'create_thumbnails')
         if self.check_thumbnails():
             return
         for num in range(self.presentation.Slides.Count):
-            self.presentation.Slides(num + 1).Export(os.path.join(
-                self.get_thumbnail_folder(), 'slide%d.png' % (num + 1)), 'png', 320, 240)
+            self.presentation.Slides(num + 1).Export(
+                os.path.join(self.get_thumbnail_folder(), 'slide%d.png' % (num + 1)), 'png', 320, 240)
 
     def close_presentation(self):
         """
-        Close presentation and clean up objects. This is triggered by a new
-        object being added to SlideController or OpenLP being shut down.
+        Close presentation and clean up objects. This is triggered by a new object being added to SlideController or
+        OpenLP being shut down.
         """
         log.debug(u'ClosePresentation')
         if self.presentation:
@@ -182,7 +182,6 @@ class PowerpointDocument(PresentationDocument):
             return False
         return True
 
-
     def is_active(self):
         """
         Returns ``True`` if a presentation is currently active.
@@ -253,15 +252,14 @@ class PowerpointDocument(PresentationDocument):
                     dpi = win32ui.GetForegroundWindow().GetDC().GetDeviceCaps(88)
                 except win32ui.error:
                     dpi = 96
-            rect = ScreenList().current[u'size']
+            size = ScreenList().current[u'size']
             ppt_window = self.presentation.SlideShowSettings.Run()
             if not ppt_window:
                 return
-            ppt_window.Top = rect.y() * 72 / dpi
-            ppt_window.Height = rect.height() * 72 / dpi
-            ppt_window.Left = rect.x() * 72 / dpi
-            ppt_window.Width = rect.width() * 72 / dpi
-
+            ppt_window.Top = size.y() * 72 / dpi
+            ppt_window.Height = size.height() * 72 / dpi
+            ppt_window.Left = size.x() * 72 / dpi
+            ppt_window.Width = size.width() * 72 / dpi
 
     def get_slide_number(self):
         """
@@ -318,6 +316,7 @@ class PowerpointDocument(PresentationDocument):
         """
         return _get_text_from_shapes(self.presentation.Slides(slide_no).NotesPage.Shapes)
 
+
 def _get_text_from_shapes(shapes):
     """
     Returns any text extracted from the shapes on a presentation slide.
@@ -326,8 +325,8 @@ def _get_text_from_shapes(shapes):
         A set of shapes to search for text.
     """
     text = ''
-    for idx in range(shapes.Count):
-        shape = shapes(idx + 1)
+    for index in range(shapes.Count):
+        shape = shapes(index + 1)
         if shape.HasTextFrame:
             text += shape.TextFrame.TextRange.Text + '\n'
     return text
diff --git a/openlp/plugins/presentations/lib/pptviewcontroller.py b/openlp/plugins/presentations/lib/pptviewcontroller.py
index a2dc56f52..abb9fd11e 100644
--- a/openlp/plugins/presentations/lib/pptviewcontroller.py
+++ b/openlp/plugins/presentations/lib/pptviewcontroller.py
@@ -37,13 +37,14 @@ if os.name == u'nt':
 from openlp.core.lib import ScreenList
 from presentationcontroller import PresentationController, PresentationDocument
 
+
 log = logging.getLogger(__name__)
 
+
 class PptviewController(PresentationController):
     """
-    Class to control interactions with PowerPoint Viewer Presentations
-    It creates the runtime Environment , Loads the and Closes the Presentation
-    As well as triggering the correct activities based on the users input
+    Class to control interactions with PowerPoint Viewer Presentations. It creates the runtime Environment , Loads the
+    and Closes the Presentation. As well as triggering the correct activities based on the users input
     """
     log.info(u'PPTViewController loaded')
 
@@ -58,7 +59,7 @@ class PptviewController(PresentationController):
 
     def check_available(self):
         """
-        PPT Viewer is able to run on this machine
+        PPT Viewer is able to run on this machine.
         """
         log.debug(u'check_available')
         if os.name != u'nt':
@@ -68,7 +69,7 @@ class PptviewController(PresentationController):
     if os.name == u'nt':
         def check_installed(self):
             """
-            Check the viewer is installed
+            Check the viewer is installed.
             """
             log.debug(u'Check installed')
             try:
@@ -79,14 +80,14 @@ class PptviewController(PresentationController):
 
         def start_process(self):
             """
-            Loads the PPTVIEWLIB library
+            Loads the PPTVIEWLIB library.
             """
             if self.process:
                 return
             log.debug(u'start PPTView')
-            dllpath = os.path.join(self.plugin_manager.base_path, u'presentations', u'lib', u'pptviewlib',
-                u'pptviewlib.dll')
-            self.process = cdll.LoadLibrary(dllpath)
+            dll_path = os.path.join(
+                self.plugin_manager.base_path, u'presentations', u'lib', u'pptviewlib', u'pptviewlib.dll')
+            self.process = cdll.LoadLibrary(dll_path)
             if log.isEnabledFor(logging.DEBUG):
                 self.process.SetDebug(1)
 
@@ -101,33 +102,32 @@ class PptviewController(PresentationController):
 
 class PptviewDocument(PresentationDocument):
     """
-    Class which holds information and controls a single presentation
+    Class which holds information and controls a single presentation.
     """
     def __init__(self, controller, presentation):
         """
-        Constructor, store information about the file and initialise
+        Constructor, store information about the file and initialise.
         """
         log.debug(u'Init Presentation PowerPoint')
         PresentationDocument.__init__(self, controller, presentation)
         self.presentation = None
-        self.pptid = None
+        self.ppt_id = None
         self.blanked = False
         self.hidden = False
 
     def load_presentation(self):
         """
-        Called when a presentation is added to the SlideController.
-        It builds the environment, starts communication with the background
-        PptView task started earlier.
+        Called when a presentation is added to the SlideController. It builds the environment, starts communication with
+        the background PptView task started earlier.
         """
         log.debug(u'LoadPresentation')
-        rect = ScreenList().current[u'size']
-        rect = RECT(rect.x(), rect.y(), rect.right(), rect.bottom())
+        size = ScreenList().current[u'size']
+        rect = RECT(size.x(), size.y(), size.right(), size.bottom())
         filepath = str(self.filepath.replace(u'/', u'\\'))
         if not os.path.isdir(self.get_temp_folder()):
             os.makedirs(self.get_temp_folder())
-        self.pptid = self.controller.process.OpenPPT(filepath, None, rect, str(self.get_temp_folder()) + '\\slide')
-        if self.pptid >= 0:
+        self.ppt_id = self.controller.process.OpenPPT(filepath, None, rect, str(self.get_temp_folder()) + '\\slide')
+        if self.ppt_id >= 0:
             self.create_thumbnails()
             self.stop_presentation()
             return True
@@ -136,8 +136,7 @@ class PptviewDocument(PresentationDocument):
 
     def create_thumbnails(self):
         """
-        PPTviewLib creates large BMP's, but we want small PNG's for consistency.
-        Convert them here.
+        PPTviewLib creates large BMP's, but we want small PNG's for consistency. Convert them here.
         """
         log.debug(u'create_thumbnails')
         if self.check_thumbnails():
@@ -149,21 +148,20 @@ class PptviewDocument(PresentationDocument):
 
     def close_presentation(self):
         """
-        Close presentation and clean up objects
-        Triggered by new object being added to SlideController orOpenLP
-        being shut down
+        Close presentation and clean up objects. Triggered by new object being added to SlideController or OpenLP being
+        shut down.
         """
         log.debug(u'ClosePresentation')
         if self.controller.process:
-            self.controller.process.ClosePPT(self.pptid)
-            self.pptid = -1
+            self.controller.process.ClosePPT(self.ppt_id)
+            self.ppt_id = -1
         self.controller.remove_doc(self)
 
     def is_loaded(self):
         """
-        Returns true if a presentation is loaded
+        Returns true if a presentation is loaded.
         """
-        if self.pptid < 0:
+        if self.ppt_id < 0:
             return False
         if self.get_slide_count() < 0:
             return False
@@ -171,74 +169,74 @@ class PptviewDocument(PresentationDocument):
 
     def is_active(self):
         """
-        Returns true if a presentation is currently active
+        Returns true if a presentation is currently active.
         """
         return self.is_loaded() and not self.hidden
 
     def blank_screen(self):
         """
-        Blanks the screen
+        Blanks the screen.
         """
-        self.controller.process.Blank(self.pptid)
+        self.controller.process.Blank(self.ppt_id)
         self.blanked = True
 
     def unblank_screen(self):
         """
-        Unblanks (restores) the presentation
+        Unblanks (restores) the presentation.
         """
-        self.controller.process.Unblank(self.pptid)
+        self.controller.process.Unblank(self.ppt_id)
         self.blanked = False
 
     def is_blank(self):
         """
-        Returns true if screen is blank
+        Returns true if screen is blank.
         """
         log.debug(u'is blank OpenOffice')
         return self.blanked
 
     def stop_presentation(self):
         """
-        Stops the current presentation and hides the output
+        Stops the current presentation and hides the output.
         """
         self.hidden = True
-        self.controller.process.Stop(self.pptid)
+        self.controller.process.Stop(self.ppt_id)
 
     def start_presentation(self):
         """
-        Starts a presentation from the beginning
+        Starts a presentation from the beginning.
         """
         if self.hidden:
             self.hidden = False
-            self.controller.process.Resume(self.pptid)
+            self.controller.process.Resume(self.ppt_id)
         else:
-            self.controller.process.RestartShow(self.pptid)
+            self.controller.process.RestartShow(self.ppt_id)
 
     def get_slide_number(self):
         """
-        Returns the current slide number
+        Returns the current slide number.
         """
-        return self.controller.process.GetCurrentSlide(self.pptid)
+        return self.controller.process.GetCurrentSlide(self.ppt_id)
 
     def get_slide_count(self):
         """
-        Returns total number of slides
+        Returns total number of slides.
         """
-        return self.controller.process.GetSlideCount(self.pptid)
+        return self.controller.process.GetSlideCount(self.ppt_id)
 
     def goto_slide(self, slideno):
         """
-        Moves to a specific slide in the presentation
+        Moves to a specific slide in the presentation.
         """
-        self.controller.process.GotoSlide(self.pptid, slideno)
+        self.controller.process.GotoSlide(self.ppt_id, slideno)
 
     def next_step(self):
         """
-        Triggers the next effect of slide on the running presentation
+        Triggers the next effect of slide on the running presentation.
         """
-        self.controller.process.NextStep(self.pptid)
+        self.controller.process.NextStep(self.ppt_id)
 
     def previous_step(self):
         """
-        Triggers the previous slide on the running presentation
+        Triggers the previous slide on the running presentation.
         """
-        self.controller.process.PrevStep(self.pptid)
+        self.controller.process.PrevStep(self.ppt_id)
diff --git a/openlp/plugins/presentations/lib/presentationcontroller.py b/openlp/plugins/presentations/lib/presentationcontroller.py
index 48955ebb2..7501fd6df 100644
--- a/openlp/plugins/presentations/lib/presentationcontroller.py
+++ b/openlp/plugins/presentations/lib/presentationcontroller.py
@@ -40,9 +40,8 @@ log = logging.getLogger(__name__)
 
 class PresentationDocument(object):
     """
-    Base class for presentation documents to inherit from.
-    Loads and closes the presentation as well as triggering the correct
-    activities based on the users input
+    Base class for presentation documents to inherit from. Loads and closes the presentation as well as triggering the
+    correct activities based on the users input
 
     **Hook Functions**
 
@@ -131,20 +130,17 @@ class PresentationDocument(object):
         """
         The location where thumbnail images will be stored
         """
-        return os.path.join(
-            self.controller.thumbnail_folder, self.get_file_name())
+        return os.path.join(self.controller.thumbnail_folder, self.get_file_name())
 
     def get_temp_folder(self):
         """
         The location where thumbnail images will be stored
         """
-        return os.path.join(
-            self.controller.temp_folder, self.get_file_name())
+        return os.path.join(self.controller.temp_folder, self.get_file_name())
 
     def check_thumbnails(self):
         """
-        Returns ``True`` if the thumbnail images exist and are more recent than
-        the powerpoint file.
+        Returns ``True`` if the thumbnail images exist and are more recent than the powerpoint file.
         """
         lastimage = self.get_thumbnail_path(self.get_slide_count(), True)
         if not (lastimage and os.path.isfile(lastimage)):
@@ -153,8 +149,7 @@ class PresentationDocument(object):
 
     def close_presentation(self):
         """
-        Close presentation and clean up objects
-        Triggered by new object being added to SlideController
+        Close presentation and clean up objects. Triggered by new object being added to SlideController
         """
         self.controller.close_presentation()
 
@@ -223,8 +218,8 @@ class PresentationDocument(object):
 
     def next_step(self):
         """
-        Triggers the next effect of slide on the running presentation
-        This might be the next animation on the current slide, or the next slide
+        Triggers the next effect of slide on the running presentation. This might be the next animation on the current
+        slide, or the next slide
         """
         pass
 
@@ -236,8 +231,7 @@ class PresentationDocument(object):
 
     def convert_thumbnail(self, file, idx):
         """
-        Convert the slide image the application made to a standard 320x240
-        .png image.
+        Convert the slide image the application made to a standard 320x240 .png image.
         """
         if self.check_thumbnails():
             return
@@ -281,7 +275,7 @@ class PresentationDocument(object):
         Returns the text on the slide
 
         ``slide_no``
-        The slide the text is required for, starting at 1
+            The slide the text is required for, starting at 1
         """
         return ''
 
@@ -290,24 +284,21 @@ class PresentationDocument(object):
         Returns the text on the slide
 
         ``slide_no``
-        The slide the notes are required for, starting at 1
+            The slide the notes are required for, starting at 1
         """
         return ''
 
 
 class PresentationController(object):
     """
-    This class is used to control interactions with presentation applications
-    by creating a runtime environment. This is a base class for presentation
-    controllers to inherit from.
+    This class is used to control interactions with presentation applications by creating a runtime environment. This is
+    a base class for presentation controllers to inherit from.
 
-    To create a new controller, take a copy of this file and name it so it ends
-    with ``controller.py``, i.e. ``foobarcontroller.py``. Make sure it inherits
-    :class:`~openlp.plugins.presentations.lib.presentationcontroller.PresentationController`,
-    and then fill in the blanks. If possible try to make sure it loads on all
-    platforms, usually by using :mod:``os.name`` checks, although
-    ``__init__``, ``check_available`` and ``presentation_deleted`` should
-    always be implemented.
+    To create a new controller, take a copy of this file and name it so it ends with ``controller.py``, i.e.
+    ``foobarcontroller.py``. Make sure it inherits
+    :class:`~openlp.plugins.presentations.lib.presentationcontroller.PresentationController`, and then fill in the
+    blanks. If possible try to make sure it loads on all platforms, usually by using :mod:``os.name`` checks, although
+    ``__init__``, ``check_available`` and ``presentation_deleted`` should always be implemented.
 
     See :class:`~openlp.plugins.presentations.lib.impresscontroller.ImpressController`,
     :class:`~openlp.plugins.presentations.lib.powerpointcontroller.PowerpointController` or
@@ -317,36 +308,34 @@ class PresentationController(object):
     **Basic Attributes**
 
     ``name``
-        The name that appears in the options and the media manager
+        The name that appears in the options and the media manager.
 
     ``enabled``
-        The controller is enabled
+        The controller is enabled.
 
     ``available``
-        The controller is available on this machine. Set by init via
-        call to check_available
+        The controller is available on this machine. Set by init via call to check_available.
 
     ``plugin``
-        The presentationplugin object
+        The presentationplugin object.
 
     ``supports``
-        The primary native file types this application supports
+        The primary native file types this application supports.
 
     ``alsosupports``
-        Other file types the application can import, although not necessarily
-        the first choice due to potential incompatibilities
+        Other file types the application can import, although not necessarily the first choice due to potential
+        incompatibilities.
 
     **Hook Functions**
 
     ``kill()``
-        Called at system exit to clean up any running presentations
+        Called at system exit to clean up any running presentations.
 
     ``check_available()``
-        Returns True if presentation application is installed/can run on this
-        machine
+        Returns True if presentation application is installed/can run on this machine.
 
     ``presentation_deleted()``
-        Deletes presentation specific files, e.g. thumbnails
+        Deletes presentation specific files, e.g. thumbnails.
 
     """
     log.info(u'PresentationController loaded')
@@ -354,9 +343,8 @@ class PresentationController(object):
     def __init__(self, plugin=None, name=u'PresentationController',
         document_class=PresentationDocument):
         """
-        This is the constructor for the presentationcontroller object. This
-        provides an easy way for descendent plugins to populate common data.
-        This method *must* be overridden, like so::
+        This is the constructor for the presentationcontroller object. This provides an easy way for descendent plugins
+        to populate common data. This method *must* be overridden, like so::
 
             class MyPresentationController(PresentationController):
                 def __init__(self, plugin):
@@ -399,28 +387,26 @@ class PresentationController(object):
 
     def check_available(self):
         """
-        Presentation app is able to run on this machine
+        Presentation app is able to run on this machine.
         """
         return False
 
     def start_process(self):
         """
-        Loads a running version of the presentation application in the
-        background.
+        Loads a running version of the presentation application in the background.
         """
         pass
 
     def kill(self):
         """
-        Called at system exit to clean up any running presentations and
-        close the application
+        Called at system exit to clean up any running presentations and close the application.
         """
         log.debug(u'Kill')
         self.close_presentation()
 
     def add_document(self, name):
         """
-        Called when a new presentation document is opened
+        Called when a new presentation document is opened.
         """
         document = self.document_class(self, name)
         self.docs.append(document)
@@ -428,7 +414,7 @@ class PresentationController(object):
 
     def remove_doc(self, doc=None):
         """
-        Called to remove an open document from the collection
+        Called to remove an open document from the collection.
         """
         log.debug(u'remove_doc Presentation')
         if doc is None:
diff --git a/openlp/plugins/presentations/lib/presentationtab.py b/openlp/plugins/presentations/lib/presentationtab.py
index cecec53b5..e46467403 100644
--- a/openlp/plugins/presentations/lib/presentationtab.py
+++ b/openlp/plugins/presentations/lib/presentationtab.py
@@ -91,8 +91,7 @@ class PresentationTab(SettingsTab):
         if checkbox.isEnabled():
             checkbox.setText(controller.name)
         else:
-            checkbox.setText(
-                translate('PresentationPlugin.PresentationTab', '%s (unavailable)') % controller.name)
+            checkbox.setText(translate('PresentationPlugin.PresentationTab', '%s (unavailable)') % controller.name)
 
     def load(self):
         """
@@ -106,8 +105,8 @@ class PresentationTab(SettingsTab):
 
     def save(self):
         """
-        Save the settings. If the tab hasn't been made visible to the user then there is nothing to do, 
-        so exit. This removes the need to start presentation applications unnecessarily.
+        Save the settings. If the tab hasn't been made visible to the user then there is nothing to do, so exit. This
+        removes the need to start presentation applications unnecessarily.
         """
         if not self.activated:
             return
diff --git a/openlp/plugins/presentations/presentationplugin.py b/openlp/plugins/presentations/presentationplugin.py
index 5bc95e388..08f16fa12 100644
--- a/openlp/plugins/presentations/presentationplugin.py
+++ b/openlp/plugins/presentations/presentationplugin.py
@@ -27,8 +27,8 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 """
-The :mod:`presentationplugin` module provides the ability for OpenLP to display
-presentations from a variety of document formats.
+The :mod:`presentationplugin` module provides the ability for OpenLP to display presentations from a variety of document
+formats.
 """
 import os
 import logging
@@ -39,22 +39,23 @@ from openlp.core.lib import Plugin, StringContent, build_icon, translate
 from openlp.core.utils import AppLocation
 from openlp.plugins.presentations.lib import PresentationController, PresentationMediaItem, PresentationTab
 
+
 log = logging.getLogger(__name__)
 
+
 __default_settings__ = {
-        u'presentations/override app': QtCore.Qt.Unchecked,
-        u'presentations/Impress': QtCore.Qt.Checked,
-        u'presentations/Powerpoint': QtCore.Qt.Checked,
-        u'presentations/Powerpoint Viewer': QtCore.Qt.Checked,
-        u'presentations/presentations files': []
-    }
+    u'presentations/override app': QtCore.Qt.Unchecked,
+    u'presentations/Impress': QtCore.Qt.Checked,
+    u'presentations/Powerpoint': QtCore.Qt.Checked,
+    u'presentations/Powerpoint Viewer': QtCore.Qt.Checked,
+    u'presentations/presentations files': []
+}
 
 
 class PresentationPlugin(Plugin):
     """
-    This plugin allowed a Presentation to be opened, controlled and displayed
-    on the output display. The plugin controls third party applications such
-    as OpenOffice.org Impress, Microsoft PowerPoint and the PowerPoint viewer
+    This plugin allowed a Presentation to be opened, controlled and displayed on the output display. The plugin controls
+    third party applications such as OpenOffice.org Impress, Microsoft PowerPoint and the PowerPoint viewer.
     """
     log = logging.getLogger(u'PresentationPlugin')
 
@@ -71,16 +72,14 @@ class PresentationPlugin(Plugin):
 
     def create_settings_tab(self, parent):
         """
-        Create the settings Tab
+        Create the settings Tab.
         """
         visible_name = self.get_string(StringContent.VisibleName)
-        self.settings_tab = PresentationTab(parent, self.name, visible_name[u'title'], self.controllers,
-                                             self.icon_path)
+        self.settings_tab = PresentationTab(parent, self.name, visible_name[u'title'], self.controllers, self.icon_path)
 
     def initialise(self):
         """
-        Initialise the plugin. Determine which controllers are enabled
-        are start their processes.
+        Initialise the plugin. Determine which controllers are enabled are start their processes.
         """
         log.info(u'Presentations Initialising')
         Plugin.initialise(self)
@@ -95,8 +94,8 @@ class PresentationPlugin(Plugin):
 
     def finalise(self):
         """
-        Finalise the plugin. Ask all the enabled presentation applications
-        to close down their applications and release resources.
+        Finalise the plugin. Ask all the enabled presentation applications to close down their applications and release
+        resources.
         """
         log.info(u'Plugin Finalise')
         # Ask each controller to tidy up.
@@ -108,26 +107,23 @@ class PresentationPlugin(Plugin):
 
     def create_media_manager_item(self):
         """
-        Create the Media Manager List
+        Create the Media Manager List.
         """
         self.media_item = PresentationMediaItem(
             self.main_window.media_dock_manager.media_dock, self, self.icon, self.controllers)
 
     def register_controllers(self, controller):
         """
-        Register each presentation controller (Impress, PPT etc) and store for later use
+        Register each presentation controller (Impress, PPT etc) and store for later use.
         """
         self.controllers[controller.name] = controller
 
     def check_pre_conditions(self):
         """
-        Check to see if we have any presentation software available
-        If Not do not install the plugin.
+        Check to see if we have any presentation software available. If not do not install the plugin.
         """
         log.debug(u'check_pre_conditions')
-        controller_dir = os.path.join(
-            AppLocation.get_directory(AppLocation.PluginsDir),
-            u'presentations', u'lib')
+        controller_dir = os.path.join(AppLocation.get_directory(AppLocation.PluginsDir), u'presentations', u'lib')
         for filename in os.listdir(controller_dir):
             if filename.endswith(u'controller.py') and not filename == 'presentationcontroller.py':
                 path = os.path.join(controller_dir, filename)
@@ -146,7 +142,7 @@ class PresentationPlugin(Plugin):
 
     def about(self):
         """
-        Return information about this plugin
+        Return information about this plugin.
         """
         about_text = translate('PresentationPlugin', '<strong>Presentation '
             'Plugin</strong><br />The presentation plugin provides the '
@@ -157,7 +153,7 @@ class PresentationPlugin(Plugin):
 
     def set_plugin_text_strings(self):
         """
-        Called to define all translatable texts of the plugin
+        Called to define all translatable texts of the plugin.
         """
         ## Name PluginList ##
         self.text_strings[StringContent.Name] = {
diff --git a/openlp/plugins/songusage/__init__.py b/openlp/plugins/songusage/__init__.py
index d18c787f0..b0d3ecc12 100644
--- a/openlp/plugins/songusage/__init__.py
+++ b/openlp/plugins/songusage/__init__.py
@@ -27,7 +27,6 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 """
-The :mod:`songusage` module contains the Song Usage plugin.  The Song Usage
-plugin provides auditing capabilities for reporting the songs you are using to
-copyright license organisations.
+The :mod:`songusage` module contains the Song Usage plugin.  The Song Usage plugin provides auditing capabilities for
+reporting the songs you are using to copyright license organisations.
 """
diff --git a/openlp/plugins/songusage/forms/songusagedeletedialog.py b/openlp/plugins/songusage/forms/songusagedeletedialog.py
index a1ad701b2..cffbdf733 100644
--- a/openlp/plugins/songusage/forms/songusagedeletedialog.py
+++ b/openlp/plugins/songusage/forms/songusagedeletedialog.py
@@ -55,7 +55,8 @@ class Ui_SongUsageDeleteDialog(object):
         self.retranslateUi(song_usage_delete_dialog)
 
     def retranslateUi(self, song_usage_delete_dialog):
-        song_usage_delete_dialog.setWindowTitle(translate('SongUsagePlugin.SongUsageDeleteForm', 'Delete Song Usage Data'))
+        song_usage_delete_dialog.setWindowTitle(
+            translate('SongUsagePlugin.SongUsageDeleteForm', 'Delete Song Usage Data'))
         self.delete_label.setText(
             translate('SongUsagePlugin.SongUsageDeleteForm', 'Select the date up to which the song usage data '
                 'should be deleted. All data recorded before this date will be permanently deleted.'))
diff --git a/openlp/plugins/songusage/forms/songusagedetaildialog.py b/openlp/plugins/songusage/forms/songusagedetaildialog.py
index 47fc9bf27..1922d261a 100644
--- a/openlp/plugins/songusage/forms/songusagedetaildialog.py
+++ b/openlp/plugins/songusage/forms/songusagedetaildialog.py
@@ -81,7 +81,8 @@ class Ui_SongUsageDetailDialog(object):
         self.save_file_push_button.clicked.connect(song_usage_detail_dialog.define_output_location)
 
     def retranslateUi(self, song_usage_detail_dialog):
-        song_usage_detail_dialog.setWindowTitle(translate('SongUsagePlugin.SongUsageDetailForm', 'Song Usage Extraction'))
+        song_usage_detail_dialog.setWindowTitle(
+            translate('SongUsagePlugin.SongUsageDetailForm', 'Song Usage Extraction'))
         self.date_range_group_box.setTitle(translate('SongUsagePlugin.SongUsageDetailForm', 'Select Date Range'))
         self.to_label.setText(translate('SongUsagePlugin.SongUsageDetailForm', 'to'))
         self.file_group_box.setTitle(translate('SongUsagePlugin.SongUsageDetailForm', 'Report Location'))
diff --git a/openlp/plugins/songusage/lib/db.py b/openlp/plugins/songusage/lib/db.py
index 048b75542..5d3da7559 100644
--- a/openlp/plugins/songusage/lib/db.py
+++ b/openlp/plugins/songusage/lib/db.py
@@ -36,12 +36,14 @@ from sqlalchemy.orm import mapper
 
 from openlp.core.lib.db import BaseModel, init_db
 
+
 class SongUsageItem(BaseModel):
     """
     SongUsageItem model
     """
     pass
 
+
 def init_schema(url):
     """
     Setup the songusage database connection and initialise the database schema
diff --git a/openlp/plugins/songusage/songusageplugin.py b/openlp/plugins/songusage/songusageplugin.py
index 7ca056184..7a730c992 100644
--- a/openlp/plugins/songusage/songusageplugin.py
+++ b/openlp/plugins/songusage/songusageplugin.py
@@ -48,11 +48,11 @@ if QtCore.QDate().currentDate().month() < 9:
 
 
 __default_settings__ = {
-        u'songusage/db type': u'sqlite',
-        u'songusage/active': False,
-        u'songusage/to date': QtCore.QDate(YEAR, 8, 31),
-        u'songusage/from date': QtCore.QDate(YEAR - 1, 9, 1),
-        u'songusage/last directory export': u''
+    u'songusage/db type': u'sqlite',
+    u'songusage/active': False,
+    u'songusage/to date': QtCore.QDate(YEAR, 8, 31),
+    u'songusage/from date': QtCore.QDate(YEAR - 1, 9, 1),
+    u'songusage/last directory export': u''
 }
 
 
@@ -76,12 +76,10 @@ class SongUsagePlugin(Plugin):
 
     def add_tools_menu_item(self, tools_menu):
         """
-        Give the SongUsage plugin the opportunity to add items to the
-        **Tools** menu.
+        Give the SongUsage plugin the opportunity to add items to the **Tools** menu.
 
         ``tools_menu``
-            The actual **Tools** menu item, so that your actions can
-            use it as their parent.
+            The actual **Tools** menu item, so that your actions can use it as their parent.
         """
         log.info(u'add tools menu')
         self.toolsMenu = tools_menu
@@ -218,8 +216,8 @@ class SongUsagePlugin(Plugin):
         self.song_usage_detail_form.exec_()
 
     def about(self):
-        about_text = translate('SongUsagePlugin', '<strong>SongUsage Plugin'
-            '</strong><br />This plugin tracks the usage of songs in services.')
+        about_text = translate('SongUsagePlugin',
+            '<strong>SongUsage Plugin</strong><br />This plugin tracks the usage of songs in services.')
         return about_text
 
     def set_plugin_text_strings(self):

From b03c3c6f4fc4701dc693147947f2cf6492b9bcff Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Fri, 19 Apr 2013 21:03:16 +0200
Subject: [PATCH 16/22] code standards

---
 openlp/plugins/images/__init__.py             |  4 +-
 openlp/plugins/images/forms/__init__.py       | 25 ++++----
 openlp/plugins/images/forms/addgroupform.py   | 10 ++--
 .../plugins/images/forms/choosegroupform.py   |  8 +--
 openlp/plugins/images/imageplugin.py          | 10 ++--
 openlp/plugins/images/lib/db.py               |  6 +-
 openlp/plugins/images/lib/mediaitem.py        | 59 +++++++++----------
 openlp/plugins/media/lib/mediaitem.py         |  3 +
 8 files changed, 60 insertions(+), 65 deletions(-)

diff --git a/openlp/plugins/images/__init__.py b/openlp/plugins/images/__init__.py
index 12e0cc9e4..9830af231 100644
--- a/openlp/plugins/images/__init__.py
+++ b/openlp/plugins/images/__init__.py
@@ -27,6 +27,6 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 """
-The :mod:`images` module provides the Images plugin.  The Images plugin
-provides the facility to display images from OpenLP.
+The :mod:`images` module provides the Images plugin.  The Images plugin provides the facility to display images from
+OpenLP.
 """
diff --git a/openlp/plugins/images/forms/__init__.py b/openlp/plugins/images/forms/__init__.py
index d308a1471..8bb8e966f 100644
--- a/openlp/plugins/images/forms/__init__.py
+++ b/openlp/plugins/images/forms/__init__.py
@@ -27,20 +27,16 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 """
-Forms in OpenLP are made up of two classes. One class holds all the graphical
-elements, like buttons and lists, and the other class holds all the functional
-code, like slots and loading and saving.
+Forms in OpenLP are made up of two classes. One class holds all the graphical elements, like buttons and lists, and the
+other class holds all the functional code, like slots and loading and saving.
 
-The first class, commonly known as the **Dialog** class, is typically named
-``Ui_<name>Dialog``. It is a slightly modified version of the class that the
-``pyuic4`` command produces from Qt4's .ui file. Typical modifications will be
-converting most strings from "" to u'' and using OpenLP's ``translate()``
-function for translating strings.
+The first class, commonly known as the **Dialog** class, is typically named ``Ui_<name>Dialog``. It is a slightly
+modified version of the class that the ``pyuic4`` command produces from Qt4's .ui file. Typical modifications will be
+converting most strings from "" to u'' and using OpenLP's ``translate()`` function for translating strings.
 
-The second class, commonly known as the **Form** class, is typically named
-``<name>Form``. This class is the one which is instantiated and used. It uses
-dual inheritance to inherit from (usually) QtGui.QDialog and the Ui class
-mentioned above, like so::
+The second class, commonly known as the **Form** class, is typically named ``<name>Form``. This class is the one which
+is instantiated and used. It uses dual inheritance to inherit from (usually) QtGui.QDialog and the Ui class mentioned
+above, like so::
 
     class AuthorsForm(QtGui.QDialog, Ui_AuthorsDialog):
 
@@ -48,9 +44,8 @@ mentioned above, like so::
             QtGui.QDialog.__init__(self, parent)
             self.setupUi(self)
 
-This allows OpenLP to use ``self.object`` for all the GUI elements while keeping
-them separate from the functionality, so that it is easier to recreate the GUI
-from the .ui files later if necessary.
+This allows OpenLP to use ``self.object`` for all the GUI elements while keeping them separate from the functionality,
+so that it is easier to recreate the GUI from the .ui files later if necessary.
 """
 
 from addgroupform import AddGroupForm
diff --git a/openlp/plugins/images/forms/addgroupform.py b/openlp/plugins/images/forms/addgroupform.py
index 7f7986499..f891969c6 100644
--- a/openlp/plugins/images/forms/addgroupform.py
+++ b/openlp/plugins/images/forms/addgroupform.py
@@ -47,16 +47,16 @@ class AddGroupForm(QtGui.QDialog, Ui_AddGroupDialog):
 
     def exec_(self, clear=True, show_top_level_group=False, selected_group=None):
         """
-        Show the form
+        Show the form,
 
         ``clear``
-            Set to False if the text input box should not be cleared when showing the dialog (default: True)
+            Set to False if the text input box should not be cleared when showing the dialog (default: True),
 
         ``show_top_level_group``
-            Set to True when "-- Top level group --" should be showed as first item (default: False)
+            Set to True when "-- Top level group --" should be showed as first item (default: False),
 
         ``selected_group``
-            The ID of the group that should be selected by default when showing the dialog
+            The ID of the group that should be selected by default when showing the dialog,
         """
         if clear:
             self.name_edit.clear()
@@ -72,7 +72,7 @@ class AddGroupForm(QtGui.QDialog, Ui_AddGroupDialog):
 
     def accept(self):
         """
-        Override the accept() method from QDialog to make sure something is entered in the text input box
+        Override the accept() method from QDialog to make sure something is entered in the text input box.
         """
         if not self.name_edit.text():
             critical_error_message_box(message=translate('ImagePlugin.AddGroupForm',
diff --git a/openlp/plugins/images/forms/choosegroupform.py b/openlp/plugins/images/forms/choosegroupform.py
index bbb57255c..f11c8324c 100644
--- a/openlp/plugins/images/forms/choosegroupform.py
+++ b/openlp/plugins/images/forms/choosegroupform.py
@@ -48,10 +48,10 @@ class ChooseGroupForm(QtGui.QDialog, Ui_ChooseGroupDialog):
         Show the form
 
         ``selected_group``
-            The ID of the group that should be selected by default when showing the dialog
+            The ID of the group that should be selected by default when showing the dialog.
         """
         if selected_group is not None:
-            for i in range(self.group_combobox.count()):
-                if self.group_combobox.itemData(i) == selected_group:
-                    self.group_combobox.setCurrentIndex(i)
+            for index in range(self.group_combobox.count()):
+                if self.group_combobox.itemData(index) == selected_group:
+                    self.group_combobox.setCurrentIndex(index)
         return QtGui.QDialog.exec_(self)
diff --git a/openlp/plugins/images/imageplugin.py b/openlp/plugins/images/imageplugin.py
index cb25dc375..dfe927a7b 100644
--- a/openlp/plugins/images/imageplugin.py
+++ b/openlp/plugins/images/imageplugin.py
@@ -70,10 +70,10 @@ class ImagePlugin(Plugin):
 
     def app_startup(self):
         """
-        Perform tasks on application startup
+        Perform tasks on application startup.
         """
         Plugin.app_startup(self)
-        # Convert old settings-based image list to the database
+        # Convert old settings-based image list to the database.
         files_from_config = Settings().get_files_from_config(self)
         if files_from_config:
             log.debug(u'Importing images list from old config: %s' % files_from_config)
@@ -93,7 +93,7 @@ class ImagePlugin(Plugin):
 
     def set_plugin_text_strings(self):
         """
-        Called to define all translatable texts of the plugin
+        Called to define all translatable texts of the plugin.
         """
         ## Name PluginList ##
         self.text_strings[StringContent.Name] = {
@@ -117,8 +117,8 @@ class ImagePlugin(Plugin):
 
     def config_update(self):
         """
-        Triggered by saving and changing the image border.  Sets the images in image manager to require updates.
-        Actual update is triggered by the last part of saving the config.
+        Triggered by saving and changing the image border.  Sets the images in image manager to require updates. Actual
+        update is triggered by the last part of saving the config.
         """
         log.info(u'Images config_update')
         background = QtGui.QColor(Settings().value(self.settings_section + u'/background color'))
diff --git a/openlp/plugins/images/lib/db.py b/openlp/plugins/images/lib/db.py
index bc4a94f15..1d8f473d8 100644
--- a/openlp/plugins/images/lib/db.py
+++ b/openlp/plugins/images/lib/db.py
@@ -27,7 +27,7 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 """
-The :mod:`db` module provides the database and schema that is the backend for the Images plugin
+The :mod:`db` module provides the database and schema that is the backend for the Images plugin.
 """
 
 from sqlalchemy import Column, ForeignKey, Table, types
@@ -38,14 +38,14 @@ from openlp.core.lib.db import BaseModel, init_db
 
 class ImageGroups(BaseModel):
     """
-    ImageGroups model
+    ImageGroups model.
     """
     pass
 
 
 class ImageFilenames(BaseModel):
     """
-    ImageFilenames model
+    ImageFilenames model.
     """
     pass
 
diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py
index fc575ec0a..5281070fb 100644
--- a/openlp/plugins/images/lib/mediaitem.py
+++ b/openlp/plugins/images/lib/mediaitem.py
@@ -40,6 +40,7 @@ from openlp.core.utils import AppLocation, delete_file, get_locale_key, get_imag
 from openlp.plugins.images.forms import AddGroupForm, ChooseGroupForm
 from openlp.plugins.images.lib.db import ImageFilenames, ImageGroups
 
+
 log = logging.getLogger(__name__)
 
 
@@ -60,12 +61,11 @@ class ImageMediaItem(MediaManagerItem):
         self.fill_groups_combobox(self.choose_group_form.group_combobox)
         self.fill_groups_combobox(self.add_group_form.parent_group_combobox)
         Registry().register_function(u'live_theme_changed', self.live_theme_changed)
-        # Allow DnD from the desktop
+        # Allow DnD from the desktop.
         self.list_view.activateDnD()
 
     def retranslateUi(self):
-        self.on_new_prompt = translate('ImagePlugin.MediaItem',
-            'Select Image(s)')
+        self.on_new_prompt = translate('ImagePlugin.MediaItem', 'Select Image(s)')
         file_formats = get_images_filter()
         self.on_new_file_masks = u'%s;;%s (*.*) (*)' % (file_formats, UiStrings().AllFiles)
         self.addGroupAction.setText(UiStrings().AddGroup)
@@ -77,7 +77,7 @@ class ImageMediaItem(MediaManagerItem):
 
     def required_icons(self):
         """
-        Set which icons the media manager tab should show
+        Set which icons the media manager tab should show.
         """
         MediaManagerItem.required_icons(self)
         self.has_file_icon = True
@@ -99,8 +99,8 @@ class ImageMediaItem(MediaManagerItem):
 
     def add_list_view_to_toolbar(self):
         """
-        Creates the main widget for listing items the media item is tracking.
-        This method overloads MediaManagerItem.add_list_view_to_toolbar
+        Creates the main widget for listing items the media item is tracking. This method overloads
+        MediaManagerItem.add_list_view_to_toolbar.
         """
         # Add the List widget
         self.list_view = TreeWidgetWithDnD(self, self.plugin.name)
@@ -159,21 +159,18 @@ class ImageMediaItem(MediaManagerItem):
 
     def add_custom_context_actions(self):
         """
-        Add custom actions to the context menu
+        Add custom actions to the context menu.
         """
         create_widget_action(self.list_view, separator=True)
         create_widget_action(self.list_view,
-            text=UiStrings().AddGroup,
-            icon=u':/images/image_new_group.png',
-            triggers=self.onAddGroupClick)
+            text=UiStrings().AddGroup, icon=u':/images/image_new_group.png', triggers=self.onAddGroupClick)
         create_widget_action(self.list_view,
             text=self.plugin.get_string(StringContent.Load)[u'tooltip'],
-            icon=u':/general/general_open.png',
-            triggers=self.on_file_click)
+            icon=u':/general/general_open.png', triggers=self.on_file_click)
 
     def add_start_header_bar(self):
         """
-        Add custom buttons to the start of the toolbar
+        Add custom buttons to the start of the toolbar.
         """
         self.addGroupAction = self.toolbar.add_toolbar_action(u'addGroupAction',
             icon=u':/images/image_new_group.png', triggers=self.onAddGroupClick)
@@ -189,10 +186,10 @@ class ImageMediaItem(MediaManagerItem):
 
     def recursively_delete_group(self, image_group):
         """
-        Recursively deletes a group and all groups and images in it
+        Recursively deletes a group and all groups and images in it.
 
         ``image_group``
-            The ImageGroups instance of the group that will be deleted
+            The ImageGroups instance of the group that will be deleted.
         """
         images = self.manager.get_all_objects(ImageFilenames, ImageFilenames.group_id == image_group.id)
         for image in images:
@@ -205,7 +202,7 @@ class ImageMediaItem(MediaManagerItem):
 
     def on_delete_click(self):
         """
-        Remove an image item from the list
+        Remove an image item from the list.
         """
         # Turn off auto preview triggers.
         self.list_view.blockSignals(True)
@@ -226,11 +223,11 @@ class ImageMediaItem(MediaManagerItem):
                         self.manager.delete_object(ImageFilenames, row_item.data(0, QtCore.Qt.UserRole).id)
                     elif isinstance(item_data, ImageGroups):
                         if QtGui.QMessageBox.question(self.list_view.parent(),
-                            translate('ImagePlugin.MediaItem', 'Remove group'),
-                            translate('ImagePlugin.MediaItem',
-                            'Are you sure you want to remove "%s" and everything in it?') % item_data.group_name,
-                            QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes |
-                            QtGui.QMessageBox.No)) == QtGui.QMessageBox.Yes:
+                                translate('ImagePlugin.MediaItem', 'Remove group'),
+                                translate('ImagePlugin.MediaItem',
+                                'Are you sure you want to remove "%s" and everything in it?') % item_data.group_name,
+                                QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes |
+                                QtGui.QMessageBox.No)) == QtGui.QMessageBox.Yes:
                             self.recursively_delete_group(item_data)
                             self.manager.delete_object(ImageGroups, row_item.data(0, QtCore.Qt.UserRole).id)
                             if item_data.parent_id == 0:
@@ -246,13 +243,13 @@ class ImageMediaItem(MediaManagerItem):
 
     def add_sub_groups(self, group_list, parent_group_id):
         """
-        Recursively add subgroups to the given parent group in a QTreeWidget
+        Recursively add subgroups to the given parent group in a QTreeWidget.
 
         ``group_list``
-            The List object that contains all QTreeWidgetItems
+            The List object that contains all QTreeWidgetItems.
 
         ``parent_group_id``
-            The ID of the group that will be added recursively
+            The ID of the group that will be added recursively.
         """
         image_groups = self.manager.get_all_objects(ImageGroups, ImageGroups.parent_id == parent_group_id)
         image_groups.sort(key=lambda group_object: get_locale_key(group_object.group_name))
@@ -271,16 +268,16 @@ class ImageMediaItem(MediaManagerItem):
 
     def fill_groups_combobox(self, combobox, parent_group_id=0, prefix=''):
         """
-        Recursively add groups to the combobox in the 'Add group' dialog
+        Recursively add groups to the combobox in the 'Add group' dialog.
 
         ``combobox``
-            The QComboBox to add the options to
+            The QComboBox to add the options to.
 
         ``parent_group_id``
-            The ID of the group that will be added
+            The ID of the group that will be added.
 
         ``prefix``
-            A string containing the prefix that will be added in front of the groupname for each level of the tree
+            A string containing the prefix that will be added in front of the groupname for each level of the tree.
         """
         if parent_group_id == 0:
             combobox.clear()
@@ -293,13 +290,13 @@ class ImageMediaItem(MediaManagerItem):
 
     def expand_group(self, group_id, root_item=None):
         """
-        Expand groups in the widget recursively
+        Expand groups in the widget recursively.
 
         ``group_id``
-            The ID of the group that will be expanded
+            The ID of the group that will be expanded.
 
         ``root_item``
-            This option is only used for recursion purposes
+            This option is only used for recursion purposes.
         """
         return_value = False
         if root_item is None:
diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py
index 7d492bc69..751d7a202 100644
--- a/openlp/plugins/media/lib/mediaitem.py
+++ b/openlp/plugins/media/lib/mediaitem.py
@@ -39,14 +39,17 @@ from openlp.core.ui import DisplayController, Display, DisplayControllerType
 from openlp.core.ui.media import get_media_players, set_media_players
 from openlp.core.utils import AppLocation, get_locale_key
 
+
 log = logging.getLogger(__name__)
 
+
 CLAPPERBOARD = u':/media/slidecontroller_multimedia.png'
 VIDEO = build_icon(QtGui.QImage(u':/media/media_video.png'))
 AUDIO = build_icon(QtGui.QImage(u':/media/media_audio.png'))
 DVDICON = build_icon(QtGui.QImage(u':/media/media_video.png'))
 ERROR = build_icon(QtGui.QImage(u':/general/general_delete.png'))
 
+
 class MediaMediaItem(MediaManagerItem):
     """
     This is the custom media manager item for Media Slides.

From 582f1aa003b4c1efde5732d3c72bd10ef1ceb8eb Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Fri, 19 Apr 2013 21:07:25 +0200
Subject: [PATCH 17/22] code standards

---
 openlp/plugins/images/lib/mediaitem.py        | 45 +++++++++----------
 .../openlp_plugins/images/test_lib.py         | 30 ++++++-------
 2 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py
index 5281070fb..716db6c8a 100644
--- a/openlp/plugins/images/lib/mediaitem.py
+++ b/openlp/plugins/images/lib/mediaitem.py
@@ -94,7 +94,7 @@ class ImageMediaItem(MediaManagerItem):
         self.servicePath = os.path.join(AppLocation.get_section_data_path(self.settings_section), u'thumbnails')
         check_directory_exists(self.servicePath)
         # Load images from the database
-        self.loadFullList(
+        self.load_full_list(
             self.manager.get_all_objects(ImageFilenames, order_by_ref=ImageFilenames.filename), initial_load=True)
 
     def add_list_view_to_toolbar(self):
@@ -163,7 +163,7 @@ class ImageMediaItem(MediaManagerItem):
         """
         create_widget_action(self.list_view, separator=True)
         create_widget_action(self.list_view,
-            text=UiStrings().AddGroup, icon=u':/images/image_new_group.png', triggers=self.onAddGroupClick)
+            text=UiStrings().AddGroup, icon=u':/images/image_new_group.png', triggers=self.on_add_group_click)
         create_widget_action(self.list_view,
             text=self.plugin.get_string(StringContent.Load)[u'tooltip'],
             icon=u':/general/general_open.png', triggers=self.on_file_click)
@@ -173,16 +173,16 @@ class ImageMediaItem(MediaManagerItem):
         Add custom buttons to the start of the toolbar.
         """
         self.addGroupAction = self.toolbar.add_toolbar_action(u'addGroupAction',
-            icon=u':/images/image_new_group.png', triggers=self.onAddGroupClick)
+            icon=u':/images/image_new_group.png', triggers=self.on_add_group_click)
 
     def add_end_header_bar(self):
         """
         Add custom buttons to the end of the toolbar
         """
         self.replaceAction = self.toolbar.add_toolbar_action(u'replaceAction',
-            icon=u':/slides/slide_blank.png', triggers=self.onReplaceClick)
+            icon=u':/slides/slide_blank.png', triggers=self.on_replace_click)
         self.resetAction = self.toolbar.add_toolbar_action(u'resetAction',
-            icon=u':/system/system_close.png', visible=False, triggers=self.onResetClick)
+            icon=u':/system/system_close.png', visible=False, triggers=self.on_reset_click)
 
     def recursively_delete_group(self, image_group):
         """
@@ -311,29 +311,29 @@ class ImageMediaItem(MediaManagerItem):
                 return True
         return return_value
 
-    def loadFullList(self, images, initial_load=False, open_group=None):
+    def load_full_list(self, images, initial_load=False, open_group=None):
         """
         Replace the list of images and groups in the interface.
 
         ``images``
-            A List of ImageFilenames objects that will be used to reload the mediamanager list
+            A List of ImageFilenames objects that will be used to reload the mediamanager list.
 
         ``initial_load``
-            When set to False, the busy cursor and progressbar will be shown while loading images
+            When set to False, the busy cursor and progressbar will be shown while loading images.
 
         ``open_group``
-            ImageGroups object of the group that must be expanded after reloading the list in the interface
+            ImageGroups object of the group that must be expanded after reloading the list in the interface.
         """
         if not initial_load:
             self.application.set_busy_cursor()
             self.main_window.display_progress_bar(len(images))
         self.list_view.clear()
-        # Load the list of groups and add them to the treeView
+        # Load the list of groups and add them to the treeView.
         group_items = {}
         self.add_sub_groups(group_items, parent_group_id=0)
         if open_group is not None:
             self.expand_group(open_group.id)
-        # Sort the images by its filename considering language specific
+        # Sort the images by its filename considering language specific.
         # characters.
         images.sort(key=lambda image_object: get_locale_key(os.path.split(unicode(image_object.filename))[1]))
         for imageFile in images:
@@ -452,7 +452,7 @@ class ImageMediaItem(MediaManagerItem):
         self.main_window.display_progress_bar(len(images))
         # Save the new images in the database
         self.save_new_images_list(images, group_id=parent_group.id, reload_list=False)
-        self.loadFullList(self.manager.get_all_objects(ImageFilenames, order_by_ref=ImageFilenames.filename),
+        self.load_full_list(self.manager.get_all_objects(ImageFilenames, order_by_ref=ImageFilenames.filename),
             initial_load=initial_load, open_group=parent_group)
         self.application.set_normal_cursor()
 
@@ -479,7 +479,7 @@ class ImageMediaItem(MediaManagerItem):
             self.manager.save_object(imageFile)
             self.main_window.increment_progress_bar()
         if reload_list and images_list:
-            self.loadFullList(self.manager.get_all_objects(ImageFilenames, order_by_ref=ImageFilenames.filename))
+            self.load_full_list(self.manager.get_all_objects(ImageFilenames, order_by_ref=ImageFilenames.filename))
 
     def dnd_move_internal(self, target):
         """
@@ -527,7 +527,7 @@ class ImageMediaItem(MediaManagerItem):
         image_items.sort(key=lambda item: get_locale_key(item.text(0)))
         target_group.addChildren(image_items)
 
-    def generate_slide_data(self, service_item, item=None, xmlVersion=False,
+    def generate_slide_data(self, service_item, item=None, xml_version=False,
         remote=False, context=ServiceItemContext.Service):
         """
         Generate the slide data. Needs to be implemented by the plugin.
@@ -605,7 +605,7 @@ class ImageMediaItem(MediaManagerItem):
         else:
             return False
 
-    def onAddGroupClick(self):
+    def on_add_group_click(self):
         """
         Called to add a new group
         """
@@ -626,7 +626,7 @@ class ImageMediaItem(MediaManagerItem):
                 group_name=self.add_group_form.name_edit.text())
             if not self.check_group_exists(new_group):
                 if self.manager.save_object(new_group):
-                    self.loadFullList(self.manager.get_all_objects(ImageFilenames,
+                    self.load_full_list(self.manager.get_all_objects(ImageFilenames,
                         order_by_ref=ImageFilenames.filename))
                     self.expand_group(new_group.id)
                     self.fill_groups_combobox(self.choose_group_form.group_combobox)
@@ -635,23 +635,22 @@ class ImageMediaItem(MediaManagerItem):
                     critical_error_message_box(
                         message=translate('ImagePlugin.AddGroupForm', 'Could not add the new group.'))
             else:
-                critical_error_message_box(
-                    message=translate('ImagePlugin.AddGroupForm', 'This group already exists.'))
+                critical_error_message_box(message=translate('ImagePlugin.AddGroupForm', 'This group already exists.'))
 
-    def onResetClick(self):
+    def on_reset_click(self):
         """
-        Called to reset the Live background with the image selected,
+        Called to reset the Live background with the image selected.
         """
         self.resetAction.setVisible(False)
         self.live_controller.display.reset_image()
 
     def live_theme_changed(self):
         """
-        Triggered by the change of theme in the slide controller
+        Triggered by the change of theme in the slide controller.
         """
         self.resetAction.setVisible(False)
 
-    def onReplaceClick(self):
+    def on_replace_click(self):
         """
         Called to replace Live backgound with the image selected.
         """
@@ -660,7 +659,7 @@ class ImageMediaItem(MediaManagerItem):
             background = QtGui.QColor(Settings().value(self.settings_section + u'/background color'))
             bitem = self.list_view.selectedItems()[0]
             if not isinstance(bitem.data(0, QtCore.Qt.UserRole), ImageFilenames):
-                # Only continue when an image is selected
+                # Only continue when an image is selected.
                 return
             filename = bitem.data(0, QtCore.Qt.UserRole).filename
             if os.path.exists(filename):
diff --git a/tests/functional/openlp_plugins/images/test_lib.py b/tests/functional/openlp_plugins/images/test_lib.py
index a355e956b..5033f0645 100644
--- a/tests/functional/openlp_plugins/images/test_lib.py
+++ b/tests/functional/openlp_plugins/images/test_lib.py
@@ -35,7 +35,7 @@ class TestImageMediaItem(TestCase):
         """
         # GIVEN: An empty image_list
         image_list = []
-        with patch(u'openlp.plugins.images.lib.mediaitem.ImageMediaItem.loadFullList') as mocked_loadFullList:
+        with patch(u'openlp.plugins.images.lib.mediaitem.ImageMediaItem.load_full_list') as mocked_loadFullList:
             self.media_item.manager = MagicMock()
 
             # WHEN: We run save_new_images_list with the empty list
@@ -47,37 +47,37 @@ class TestImageMediaItem(TestCase):
 
     def save_new_images_list_single_image_with_reload_test(self):
         """
-        Test that the save_new_images_list() calls loadFullList() when reload_list is set to True
+        Test that the save_new_images_list() calls load_full_list() when reload_list is set to True
         """
         # GIVEN: A list with 1 image
         image_list = [ u'test_image.jpg' ]
-        with patch(u'openlp.plugins.images.lib.mediaitem.ImageMediaItem.loadFullList') as mocked_loadFullList:
+        with patch(u'openlp.plugins.images.lib.mediaitem.ImageMediaItem.load_full_list') as mocked_loadFullList:
             ImageFilenames.filename = ''
             self.media_item.manager = MagicMock()
 
             # WHEN: We run save_new_images_list with reload_list=True
             self.media_item.save_new_images_list(image_list, reload_list=True)
 
-            # THEN: loadFullList() should have been called
-            assert mocked_loadFullList.call_count == 1, u'loadFullList() should have been called'
+            # THEN: load_full_list() should have been called
+            assert mocked_loadFullList.call_count == 1, u'load_full_list() should have been called'
 
             # CLEANUP: Remove added attribute from ImageFilenames
             delattr(ImageFilenames, 'filename')
 
     def save_new_images_list_single_image_without_reload_test(self):
         """
-        Test that the save_new_images_list() doesn't call loadFullList() when reload_list is set to False
+        Test that the save_new_images_list() doesn't call load_full_list() when reload_list is set to False
         """
         # GIVEN: A list with 1 image
         image_list = [ u'test_image.jpg' ]
-        with patch(u'openlp.plugins.images.lib.mediaitem.ImageMediaItem.loadFullList') as mocked_loadFullList:
+        with patch(u'openlp.plugins.images.lib.mediaitem.ImageMediaItem.load_full_list') as mocked_loadFullList:
             self.media_item.manager = MagicMock()
 
             # WHEN: We run save_new_images_list with reload_list=False
             self.media_item.save_new_images_list(image_list, reload_list=False)
 
-            # THEN: loadFullList() should not have been called
-            assert mocked_loadFullList.call_count == 0, u'loadFullList() should not have been called'
+            # THEN: load_full_list() should not have been called
+            assert mocked_loadFullList.call_count == 0, u'load_full_list() should not have been called'
 
     def save_new_images_list_multiple_images_test(self):
         """
@@ -85,15 +85,15 @@ class TestImageMediaItem(TestCase):
         """
         # GIVEN: A list with 3 images
         image_list = [ u'test_image_1.jpg', u'test_image_2.jpg', u'test_image_3.jpg' ]
-        with patch(u'openlp.plugins.images.lib.mediaitem.ImageMediaItem.loadFullList') as mocked_loadFullList:
+        with patch(u'openlp.plugins.images.lib.mediaitem.ImageMediaItem.load_full_list') as mocked_loadFullList:
             self.media_item.manager = MagicMock()
 
             # WHEN: We run save_new_images_list with the list of 3 images
             self.media_item.save_new_images_list(image_list, reload_list=False)
 
-            # THEN: loadFullList() should not have been called
+            # THEN: load_full_list() should not have been called
             assert self.media_item.manager.save_object.call_count == 3, \
-                u'loadFullList() should have been called three times'
+                u'load_full_list() should have been called three times'
 
     def save_new_images_list_other_objects_in_list_test(self):
         """
@@ -101,12 +101,12 @@ class TestImageMediaItem(TestCase):
         """
         # GIVEN: A list with images and objects
         image_list = [ u'test_image_1.jpg', None, True, ImageFilenames(), 'test_image_2.jpg' ]
-        with patch(u'openlp.plugins.images.lib.mediaitem.ImageMediaItem.loadFullList') as mocked_loadFullList:
+        with patch(u'openlp.plugins.images.lib.mediaitem.ImageMediaItem.load_full_list') as mocked_loadFullList:
             self.media_item.manager = MagicMock()
 
             # WHEN: We run save_new_images_list with the list of images and objects
             self.media_item.save_new_images_list(image_list, reload_list=False)
 
-            # THEN: loadFullList() should not have been called
+            # THEN: load_full_list() should not have been called
             assert self.media_item.manager.save_object.call_count == 2, \
-                u'loadFullList() should have been called only once'
+                u'load_full_list() should have been called only once'

From 7682698cf1b6742e29137903466a407eabe47f9b Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Fri, 19 Apr 2013 21:15:12 +0200
Subject: [PATCH 18/22] media code standards

---
 openlp/plugins/images/lib/mediaitem.py        |  20 ++--
 openlp/plugins/media/__init__.py              |   7 +-
 openlp/plugins/media/lib/mediaitem.py         | 110 +++++++++---------
 openlp/plugins/media/mediaplugin.py           |  14 ++-
 openlp/plugins/presentations/lib/mediaitem.py |  24 ++--
 openlp/plugins/songs/forms/editsongform.py    |   2 +-
 6 files changed, 88 insertions(+), 89 deletions(-)

diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py
index 716db6c8a..95f0971fd 100644
--- a/openlp/plugins/images/lib/mediaitem.py
+++ b/openlp/plugins/images/lib/mediaitem.py
@@ -70,10 +70,10 @@ class ImageMediaItem(MediaManagerItem):
         self.on_new_file_masks = u'%s;;%s (*.*) (*)' % (file_formats, UiStrings().AllFiles)
         self.addGroupAction.setText(UiStrings().AddGroup)
         self.addGroupAction.setToolTip(UiStrings().AddGroup)
-        self.replaceAction.setText(UiStrings().ReplaceBG)
-        self.replaceAction.setToolTip(UiStrings().ReplaceLiveBG)
-        self.resetAction.setText(UiStrings().ResetBG)
-        self.resetAction.setToolTip(UiStrings().ResetLiveBG)
+        self.replace_action.setText(UiStrings().ReplaceBG)
+        self.replace_action.setToolTip(UiStrings().ReplaceLiveBG)
+        self.reset_action.setText(UiStrings().ResetBG)
+        self.reset_action.setToolTip(UiStrings().ResetLiveBG)
 
     def required_icons(self):
         """
@@ -155,7 +155,7 @@ class ImageMediaItem(MediaManagerItem):
         self.list_view.doubleClicked.connect(self.on_double_clicked)
         self.list_view.itemSelectionChanged.connect(self.on_selection_change)
         self.list_view.customContextMenuRequested.connect(self.context_menu)
-        self.list_view.addAction(self.replaceAction)
+        self.list_view.addAction(self.replace_action)
 
     def add_custom_context_actions(self):
         """
@@ -179,9 +179,9 @@ class ImageMediaItem(MediaManagerItem):
         """
         Add custom buttons to the end of the toolbar
         """
-        self.replaceAction = self.toolbar.add_toolbar_action(u'replaceAction',
+        self.replace_action = self.toolbar.add_toolbar_action(u'replace_action',
             icon=u':/slides/slide_blank.png', triggers=self.on_replace_click)
-        self.resetAction = self.toolbar.add_toolbar_action(u'resetAction',
+        self.reset_action = self.toolbar.add_toolbar_action(u'reset_action',
             icon=u':/system/system_close.png', visible=False, triggers=self.on_reset_click)
 
     def recursively_delete_group(self, image_group):
@@ -641,14 +641,14 @@ class ImageMediaItem(MediaManagerItem):
         """
         Called to reset the Live background with the image selected.
         """
-        self.resetAction.setVisible(False)
+        self.reset_action.setVisible(False)
         self.live_controller.display.reset_image()
 
     def live_theme_changed(self):
         """
         Triggered by the change of theme in the slide controller.
         """
-        self.resetAction.setVisible(False)
+        self.reset_action.setVisible(False)
 
     def on_replace_click(self):
         """
@@ -664,7 +664,7 @@ class ImageMediaItem(MediaManagerItem):
             filename = bitem.data(0, QtCore.Qt.UserRole).filename
             if os.path.exists(filename):
                 if self.live_controller.display.direct_image(filename, background):
-                    self.resetAction.setVisible(True)
+                    self.reset_action.setVisible(True)
                 else:
                     critical_error_message_box(UiStrings().LiveBGError,
                         translate('ImagePlugin.MediaItem', 'There was no display item to amend.'))
diff --git a/openlp/plugins/media/__init__.py b/openlp/plugins/media/__init__.py
index deb4cbeac..2a2e9f5aa 100644
--- a/openlp/plugins/media/__init__.py
+++ b/openlp/plugins/media/__init__.py
@@ -27,8 +27,7 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 """
-The :mod:`media` module provides the Media plugin which allows OpenLP to
-display videos.  The media supported depends not only on the Python support
-but also extensively on the codecs installed on the underlying operating system
-being picked up and usable by Python.
+The :mod:`media` module provides the Media plugin which allows OpenLP to display videos. The media supported depends not
+only on the Python support but also extensively on the codecs installed on the underlying operating system being picked
+up and usable by Python.
 """
diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py
index 751d7a202..2037346ad 100644
--- a/openlp/plugins/media/lib/mediaitem.py
+++ b/openlp/plugins/media/lib/mediaitem.py
@@ -44,10 +44,10 @@ log = logging.getLogger(__name__)
 
 
 CLAPPERBOARD = u':/media/slidecontroller_multimedia.png'
-VIDEO = build_icon(QtGui.QImage(u':/media/media_video.png'))
-AUDIO = build_icon(QtGui.QImage(u':/media/media_audio.png'))
-DVDICON = build_icon(QtGui.QImage(u':/media/media_video.png'))
-ERROR = build_icon(QtGui.QImage(u':/general/general_delete.png'))
+VIDEO_ICON = build_icon(QtGui.QImage(u':/media/media_video.png'))
+AUDIO_ICON = build_icon(QtGui.QImage(u':/media/media_audio.png'))
+DVD_ICON = build_icon(QtGui.QImage(u':/media/media_video.png'))
+ERROR_ICON = build_icon(QtGui.QImage(u':/general/general_delete.png'))
 
 
 class MediaMediaItem(MediaManagerItem):
@@ -82,12 +82,12 @@ class MediaMediaItem(MediaManagerItem):
 
     def retranslateUi(self):
         self.on_new_prompt = translate('MediaPlugin.MediaItem', 'Select Media')
-        self.replaceAction.setText(UiStrings().ReplaceBG)
-        self.replaceAction.setToolTip(UiStrings().ReplaceLiveBG)
-        self.resetAction.setText(UiStrings().ResetBG)
-        self.resetAction.setToolTip(UiStrings().ResetLiveBG)
+        self.replace_action.setText(UiStrings().ReplaceBG)
+        self.replace_action.setToolTip(UiStrings().ReplaceLiveBG)
+        self.reset_action.setText(UiStrings().ResetBG)
+        self.reset_action.setToolTip(UiStrings().ResetLiveBG)
         self.automatic = UiStrings().Automatic
-        self.displayTypeLabel.setText(translate('MediaPlugin.MediaItem', 'Use Player:'))
+        self.display_type_label.setText(translate('MediaPlugin.MediaItem', 'Use Player:'))
         self.rebuild_players()
 
     def required_icons(self):
@@ -101,27 +101,28 @@ class MediaMediaItem(MediaManagerItem):
 
     def add_list_view_to_toolbar(self):
         MediaManagerItem.add_list_view_to_toolbar(self)
-        self.list_view.addAction(self.replaceAction)
+        self.list_view.addAction(self.replace_action)
 
     def add_end_header_bar(self):
         # Replace backgrounds do not work at present so remove functionality.
-        self.replaceAction = self.toolbar.add_toolbar_action(u'replaceAction', icon=u':/slides/slide_blank.png',
+        self.replace_action = self.toolbar.add_toolbar_action(u'replace_action', icon=u':/slides/slide_blank.png',
             triggers=self.onReplaceClick)
-        self.resetAction = self.toolbar.add_toolbar_action(u'resetAction', icon=u':/system/system_close.png',
+        self.reset_action = self.toolbar.add_toolbar_action(u'reset_action', icon=u':/system/system_close.png',
             visible=False, triggers=self.onResetClick)
-        self.mediaWidget = QtGui.QWidget(self)
-        self.mediaWidget.setObjectName(u'mediaWidget')
-        self.displayLayout = QtGui.QFormLayout(self.mediaWidget)
-        self.displayLayout.setMargin(self.displayLayout.spacing())
-        self.displayLayout.setObjectName(u'displayLayout')
-        self.displayTypeLabel = QtGui.QLabel(self.mediaWidget)
-        self.displayTypeLabel.setObjectName(u'displayTypeLabel')
-        self.displayTypeComboBox = create_horizontal_adjusting_combo_box(self.mediaWidget, u'displayTypeComboBox')
-        self.displayTypeLabel.setBuddy(self.displayTypeComboBox)
-        self.displayLayout.addRow(self.displayTypeLabel, self.displayTypeComboBox)
-        # Add the Media widget to the page layout
-        self.page_layout.addWidget(self.mediaWidget)
-        self.displayTypeComboBox.currentIndexChanged.connect(self.overridePlayerChanged)
+        self.media_widget = QtGui.QWidget(self)
+        self.media_widget.setObjectName(u'media_widget')
+        self.display_layout = QtGui.QFormLayout(self.media_widget)
+        self.display_layout.setMargin(self.display_layout.spacing())
+        self.display_layout.setObjectName(u'display_layout')
+        self.display_type_label = QtGui.QLabel(self.media_widget)
+        self.display_type_label.setObjectName(u'display_type_label')
+        self.display_type_combo_box = create_horizontal_adjusting_combo_box(
+            self.media_widget, u'display_type_combo_box')
+        self.display_type_label.setBuddy(self.display_type_combo_box)
+        self.display_layout.addRow(self.display_type_label, self.display_type_combo_box)
+        # Add the Media widget to the page layout.
+        self.page_layout.addWidget(self.media_widget)
+        self.display_type_combo_box.currentIndexChanged.connect(self.overridePlayerChanged)
 
     def overridePlayerChanged(self, index):
         player = get_media_players()[0]
@@ -135,13 +136,13 @@ class MediaMediaItem(MediaManagerItem):
         Called to reset the Live background with the media selected,
         """
         self.media_controller.media_reset(self.live_controller)
-        self.resetAction.setVisible(False)
+        self.reset_action.setVisible(False)
 
     def video_background_replaced(self):
         """
         Triggered by main display on change of serviceitem.
         """
-        self.resetAction.setVisible(False)
+        self.reset_action.setVisible(False)
 
     def onReplaceClick(self):
         """
@@ -158,7 +159,7 @@ class MediaMediaItem(MediaManagerItem):
                 (path, name) = os.path.split(filename)
                 service_item.add_from_command(path, name,CLAPPERBOARD)
                 if self.media_controller.video(DisplayControllerType.Live, service_item, video_behind_text=True):
-                    self.resetAction.setVisible(True)
+                    self.reset_action.setVisible(True)
                 else:
                     critical_error_message_box(UiStrings().LiveBGError,
                         translate('MediaPlugin.MediaItem', 'There was no display item to amend.'))
@@ -167,7 +168,7 @@ class MediaMediaItem(MediaManagerItem):
                     translate('MediaPlugin.MediaItem',
                     'There was a problem replacing your background, the media file "%s" no longer exists.') % filename)
 
-    def generate_slide_data(self, service_item, item=None, xmlVersion=False, remote=False,
+    def generate_slide_data(self, service_item, item=None, xml_version=False, remote=False,
             context=ServiceItemContext.Live):
         """
         Generate the slide data. Needs to be implemented by the plugin.
@@ -184,7 +185,7 @@ class MediaMediaItem(MediaManagerItem):
                     translate('MediaPlugin.MediaItem', 'Missing Media File'),
                     translate('MediaPlugin.MediaItem', 'The file %s no longer exists.') % filename)
             return False
-        service_item.title = self.displayTypeComboBox.currentText()
+        service_item.title = self.display_type_combo_box.currentText()
         service_item.shortname = service_item.title
         (path, name) = os.path.split(filename)
         service_item.add_from_command(path, name, CLAPPERBOARD)
@@ -212,8 +213,7 @@ class MediaMediaItem(MediaManagerItem):
 
     def rebuild_players(self):
         """
-        Rebuild the tab in the media manager when changes are made in
-        the settings
+        Rebuild the tab in the media manager when changes are made in the settings.
         """
         self.populateDisplayTypes()
         self.on_new_file_masks = translate('MediaPlugin.MediaItem', 'Videos (%s);;Audio (%s);;%s (*)') % (
@@ -225,29 +225,27 @@ class MediaMediaItem(MediaManagerItem):
 
     def populateDisplayTypes(self):
         """
-        Load the combobox with the enabled media players,
-        allowing user to select a specific player if settings allow
+        Load the combobox with the enabled media players,  allowing user to select a specific player if settings allow.
         """
-        # block signals to avoid unnecessary overridePlayerChanged Signals
-        # while combo box creation
-        self.displayTypeComboBox.blockSignals(True)
-        self.displayTypeComboBox.clear()
+        # block signals to avoid unnecessary overridePlayerChanged Signals while combo box creation
+        self.display_type_combo_box.blockSignals(True)
+        self.display_type_combo_box.clear()
         usedPlayers, overridePlayer = get_media_players()
         media_players = self.media_controller.media_players
         currentIndex = 0
         for player in usedPlayers:
             # load the drop down selection
-            self.displayTypeComboBox.addItem(media_players[player].original_name)
+            self.display_type_combo_box.addItem(media_players[player].original_name)
             if overridePlayer == player:
-                currentIndex = len(self.displayTypeComboBox)
-        if self.displayTypeComboBox.count() > 1:
-            self.displayTypeComboBox.insertItem(0, self.automatic)
-            self.displayTypeComboBox.setCurrentIndex(currentIndex)
+                currentIndex = len(self.display_type_combo_box)
+        if self.display_type_combo_box.count() > 1:
+            self.display_type_combo_box.insertItem(0, self.automatic)
+            self.display_type_combo_box.setCurrentIndex(currentIndex)
         if overridePlayer:
-            self.mediaWidget.show()
+            self.media_widget.show()
         else:
-            self.mediaWidget.hide()
-        self.displayTypeComboBox.blockSignals(False)
+            self.media_widget.hide()
+        self.display_type_combo_box.blockSignals(False)
 
     def on_delete_click(self):
         """
@@ -270,34 +268,34 @@ class MediaMediaItem(MediaManagerItem):
             if not os.path.exists(track):
                 filename = os.path.split(unicode(track))[1]
                 item_name = QtGui.QListWidgetItem(filename)
-                item_name.setIcon(ERROR)
+                item_name.setIcon(ERROR_ICON)
                 item_name.setData(QtCore.Qt.UserRole, track)
             elif track_info.isFile():
                 filename = os.path.split(unicode(track))[1]
                 item_name = QtGui.QListWidgetItem(filename)
                 if u'*.%s' % (filename.split(u'.')[-1].lower()) in self.media_controller.audio_extensions_list:
-                    item_name.setIcon(AUDIO)
+                    item_name.setIcon(AUDIO_ICON)
                 else:
-                    item_name.setIcon(VIDEO)
+                    item_name.setIcon(VIDEO_ICON)
                 item_name.setData(QtCore.Qt.UserRole, track)
             else:
                 filename = os.path.split(unicode(track))[1]
                 item_name = QtGui.QListWidgetItem(filename)
-                item_name.setIcon(build_icon(DVDICON))
+                item_name.setIcon(build_icon(DVD_ICON))
                 item_name.setData(QtCore.Qt.UserRole, track)
             item_name.setToolTip(track)
             self.list_view.addItem(item_name)
 
-    def getList(self, type=MediaType.Audio):
+    def get_list(self, type=MediaType.Audio):
         media = Settings().value(self.settings_section + u'/media files')
         media.sort(key=lambda filename: get_locale_key(os.path.split(unicode(filename))[1]))
-        ext = []
+        extension = []
         if type == MediaType.Audio:
-            ext = self.media_controller.audio_extensions_list
+            extension = self.media_controller.audio_extensions_list
         else:
-            ext = self.media_controller.video_extensions_list
-        ext = map(lambda x: x[1:], ext)
-        media = filter(lambda x: os.path.splitext(x)[1] in ext, media)
+            extension = self.media_controller.video_extensions_list
+        extension = map(lambda x: x[1:], extension)
+        media = filter(lambda x: os.path.splitext(x)[1] in extension, media)
         return media
 
     def search(self, string, showError):
diff --git a/openlp/plugins/media/mediaplugin.py b/openlp/plugins/media/mediaplugin.py
index 0bd95a26b..38cd9bb69 100644
--- a/openlp/plugins/media/mediaplugin.py
+++ b/openlp/plugins/media/mediaplugin.py
@@ -34,12 +34,14 @@ from PyQt4 import QtCore
 from openlp.core.lib import Plugin, Registry, StringContent, Settings, build_icon, translate
 from openlp.plugins.media.lib import MediaMediaItem, MediaTab
 
+
 log = logging.getLogger(__name__)
 
+
 # Some settings starting with "media" are in core, because they are needed for core functionality.
 __default_settings__ = {
-        u'media/media auto start': QtCore.Qt.Unchecked,
-        u'media/media files': []
+    u'media/media auto start': QtCore.Qt.Unchecked,
+    u'media/media files': []
 }
 
 
@@ -94,7 +96,7 @@ class MediaPlugin(Plugin):
 
     def finalise(self):
         """
-        Time to tidy up on exit
+        Time to tidy up on exit.
         """
         log.info(u'Media Finalising')
         self.media_controller.finalise()
@@ -102,19 +104,19 @@ class MediaPlugin(Plugin):
 
     def get_display_css(self):
         """
-        Add css style sheets to htmlbuilder
+        Add css style sheets to htmlbuilder.
         """
         return self.media_controller.get_media_display_css()
 
     def get_display_javascript(self):
         """
-        Add javascript functions to htmlbuilder
+        Add javascript functions to htmlbuilder.
         """
         return self.media_controller.get_media_display_javascript()
 
     def get_display_html(self):
         """
-        Add html code to htmlbuilder
+        Add html code to htmlbuilder.
         """
         return self.media_controller.get_media_display_html()
 
diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py
index 9664fcf2f..2f48b99c1 100644
--- a/openlp/plugins/presentations/lib/mediaitem.py
+++ b/openlp/plugins/presentations/lib/mediaitem.py
@@ -110,11 +110,11 @@ class PresentationMediaItem(MediaManagerItem):
         self.display_layout.setObjectName(u'display_layout')
         self.display_type_label = QtGui.QLabel(self.presentation_widget)
         self.display_type_label.setObjectName(u'display_type_label')
-        self.displayTypeComboBox = create_horizontal_adjusting_combo_box(self.presentation_widget,
-            u'displayTypeComboBox')
-        self.display_type_label.setBuddy(self.displayTypeComboBox)
-        self.display_layout.addRow(self.display_type_label, self.displayTypeComboBox)
-        # Add the Presentation widget to the page layout
+        self.display_type_combo_box = create_horizontal_adjusting_combo_box(self.presentation_widget,
+            u'display_type_combo_box')
+        self.display_type_label.setBuddy(self.display_type_combo_box)
+        self.display_layout.addRow(self.display_type_label, self.display_type_combo_box)
+        # Add the Presentation widget to the page layout.
         self.page_layout.addWidget(self.presentation_widget)
 
     def initialise(self):
@@ -131,14 +131,14 @@ class PresentationMediaItem(MediaManagerItem):
         Load the combobox with the enabled presentation controllers, allowing user to select a specific app if settings
         allow.
         """
-        self.displayTypeComboBox.clear()
+        self.display_type_combo_box.clear()
         for item in self.controllers:
             # load the drop down selection
             if self.controllers[item].enabled():
-                self.displayTypeComboBox.addItem(item)
-        if self.displayTypeComboBox.count() > 1:
-            self.displayTypeComboBox.insertItem(0, self.Automatic)
-            self.displayTypeComboBox.setCurrentIndex(0)
+                self.display_type_combo_box.addItem(item)
+        if self.display_type_combo_box.count() > 1:
+            self.display_type_combo_box.insertItem(0, self.Automatic)
+            self.display_type_combo_box.setCurrentIndex(0)
         if Settings().value(self.settings_section + u'/override app') == QtCore.Qt.Checked:
             self.presentation_widget.show()
         else:
@@ -244,8 +244,8 @@ class PresentationMediaItem(MediaManagerItem):
             items = self.list_view.selectedItems()
             if len(items) > 1:
                 return False
-        service_item.title = self.displayTypeComboBox.currentText()
-        service_item.shortname = self.displayTypeComboBox.currentText()
+        service_item.title = self.display_type_combo_box.currentText()
+        service_item.shortname = self.display_type_combo_box.currentText()
         service_item.add_capability(ItemCapabilities.ProvidesOwnDisplay)
         service_item.add_capability(ItemCapabilities.HasDetailedTitleDisplay)
         shortname = service_item.shortname
diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py
index 49a20762a..fcc7f4f21 100644
--- a/openlp/plugins/songs/forms/editsongform.py
+++ b/openlp/plugins/songs/forms/editsongform.py
@@ -320,7 +320,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
         for plugin in self.plugin_manager.plugins:
             if plugin.name == u'media' and plugin.status == PluginStatus.Active:
                 self.from_media_button.setVisible(True)
-                self.media_form.populateFiles(plugin.media_item.getList(MediaType.Audio))
+                self.media_form.populateFiles(plugin.media_item.get_list(MediaType.Audio))
                 break
 
     def new_song(self):

From a2fddbb57c65c42280bd67d9fa3c4947da287536 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Fri, 19 Apr 2013 21:43:17 +0200
Subject: [PATCH 19/22] fixed fullstop

---
 openlp/plugins/images/forms/addgroupform.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/openlp/plugins/images/forms/addgroupform.py b/openlp/plugins/images/forms/addgroupform.py
index f891969c6..4cdc6a73b 100644
--- a/openlp/plugins/images/forms/addgroupform.py
+++ b/openlp/plugins/images/forms/addgroupform.py
@@ -47,16 +47,16 @@ class AddGroupForm(QtGui.QDialog, Ui_AddGroupDialog):
 
     def exec_(self, clear=True, show_top_level_group=False, selected_group=None):
         """
-        Show the form,
+        Show the form.
 
         ``clear``
-            Set to False if the text input box should not be cleared when showing the dialog (default: True),
+            Set to False if the text input box should not be cleared when showing the dialog (default: True).
 
         ``show_top_level_group``
-            Set to True when "-- Top level group --" should be showed as first item (default: False),
+            Set to True when "-- Top level group --" should be showed as first item (default: False).
 
         ``selected_group``
-            The ID of the group that should be selected by default when showing the dialog,
+            The ID of the group that should be selected by default when showing the dialog.
         """
         if clear:
             self.name_edit.clear()

From 465fc7bff17f6f4cd1dcaa5d853f0588f6c71c27 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sat, 20 Apr 2013 11:02:45 +0200
Subject: [PATCH 20/22] do not overrie build-ins

---
 openlp/plugins/presentations/lib/impresscontroller.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py
index e5df6685e..d30c71078 100644
--- a/openlp/plugins/presentations/lib/impresscontroller.py
+++ b/openlp/plugins/presentations/lib/impresscontroller.py
@@ -295,12 +295,12 @@ class ImpressDocument(PresentationDocument):
         """
         log.debug(u'create property OpenOffice')
         if os.name == u'nt':
-            property = self.controller.manager.Bridge_GetStruct(u'com.sun.star.beans.PropertyValue')
+            property_object = self.controller.manager.Bridge_GetStruct(u'com.sun.star.beans.PropertyValue')
         else:
-            property = PropertyValue()
-        property.Name = name
-        property.Value = value
-        return property
+            property_object = PropertyValue()
+        property_object.Name = name
+        property_object.Value = value
+        return property_object
 
     def close_presentation(self):
         """

From f82000eaa25580b13181ded45170e90ea487f28b Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sat, 20 Apr 2013 11:06:26 +0200
Subject: [PATCH 21/22] reverted change to avoid conflict

---
 openlp/plugins/presentations/presentationplugin.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/openlp/plugins/presentations/presentationplugin.py b/openlp/plugins/presentations/presentationplugin.py
index 08f16fa12..1cb966aa5 100644
--- a/openlp/plugins/presentations/presentationplugin.py
+++ b/openlp/plugins/presentations/presentationplugin.py
@@ -44,12 +44,12 @@ log = logging.getLogger(__name__)
 
 
 __default_settings__ = {
-    u'presentations/override app': QtCore.Qt.Unchecked,
-    u'presentations/Impress': QtCore.Qt.Checked,
-    u'presentations/Powerpoint': QtCore.Qt.Checked,
-    u'presentations/Powerpoint Viewer': QtCore.Qt.Checked,
-    u'presentations/presentations files': []
-}
+        u'presentations/override app': QtCore.Qt.Unchecked,
+        u'presentations/Impress': QtCore.Qt.Checked,
+        u'presentations/Powerpoint': QtCore.Qt.Checked,
+        u'presentations/Powerpoint Viewer': QtCore.Qt.Checked,
+        u'presentations/presentations files': []
+    }
 
 
 class PresentationPlugin(Plugin):

From 401d4d268875b78858114e2c9165149ad15a29f4 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sat, 20 Apr 2013 20:39:10 +0200
Subject: [PATCH 22/22] close file

---
 tests/functional/openlp_core_lib/test_serviceitem.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/functional/openlp_core_lib/test_serviceitem.py b/tests/functional/openlp_core_lib/test_serviceitem.py
index d50ddc978..26e9e7d44 100644
--- a/tests/functional/openlp_core_lib/test_serviceitem.py
+++ b/tests/functional/openlp_core_lib/test_serviceitem.py
@@ -276,5 +276,7 @@ class TestServiceItem(TestCase):
             first_line = items[0]
         except IOError:
             first_line = u''
+        finally:
+            open_file.close()
         return first_line