head

.bzrignore

@@ -2,6 +2,7 @@
 *.*~
 \#*\#
 *.eric4project
+*.eric5project
 *.ropeproject
 *.e4*
 .eric4project

openlp/__init__.py

@@ -30,7 +30,6 @@
 The :mod:`openlp` module contains all the project produced OpenLP functionality
 """
 
-import openlp.core
-import openlp.plugins
+from openlp import core, plugins
 
 __all__ = ['core', 'plugins']

openlp/core/common/__init__.py

@@ -38,7 +38,7 @@ import traceback
 
 from PyQt4 import QtCore
 
-log = logging.getLogger(__name__+'.__init__')
+log = logging.getLogger(__name__ + '.__init__')
 
 
 FIRST_CAMEL_REGEX = re.compile('(.)([A-Z][a-z]+)')
@@ -51,8 +51,10 @@ def trace_error_handler(logger):
 
     :param logger: logger to use so traceback is logged to correct class
     """
+    log_string = "OpenLP Error trace"
     for tb in traceback.extract_stack():
-        logger.error('Called by ' + tb[3] + ' at line ' + str(tb[1]) + ' in ' + tb[0])
+        log_string = '%s\n   File %s at line %d \n\t called %s' % (log_string, tb[0], tb[1], tb[3])
+    logger.error(log_string)
 
 
 def check_directory_exists(directory, do_not_log=False):
@@ -74,6 +76,9 @@ def check_directory_exists(directory, do_not_log=False):
 def get_frozen_path(frozen_option, non_frozen_option):
     """
     Return a path based on the system status.
+
+    :param frozen_option:
+    :param non_frozen_option:
     """
     if hasattr(sys, 'frozen') and sys.frozen == 1:
         return frozen_option

openlp/core/common/applocation.py

@@ -75,8 +75,8 @@ class AppLocation(object):
             return get_frozen_path(os.path.abspath(os.path.split(sys.argv[0])[0]), os.path.split(openlp.__file__)[0])
         elif dir_type == AppLocation.PluginsDir:
             app_path = os.path.abspath(os.path.split(sys.argv[0])[0])
-            return os.path.normpath(get_frozen_path(os.path.join(app_path, 'plugins'),
-                os.path.join(os.path.split(openlp.__file__)[0], 'plugins')))
+            return get_frozen_path(os.path.join(app_path, 'plugins'),
+                                   os.path.join(os.path.split(openlp.__file__)[0], 'plugins'))
         elif dir_type == AppLocation.VersionDir:
             return get_frozen_path(os.path.abspath(os.path.split(sys.argv[0])[0]), os.path.split(openlp.__file__)[0])
         elif dir_type == AppLocation.LanguageDir:

openlp/core/common/openlpmixin.py

@@ -91,4 +91,4 @@ class OpenLPMixin(object):
         Common log exception handler which prints the calling path
         """
         trace_error_handler(self.logger)
-        self.logger.exception(message)
+        self.logger.exception(message)

openlp/core/common/registry.py

@@ -62,11 +62,9 @@ class Registry(object):
         registry = cls()
         registry.service_list = {}
         registry.functions_list = {}
-        registry.running_under_test = False
-        registry.initialising = True
         # Allow the tests to remove Registry entries but not the live system
-        if 'nose' in sys.argv[0]:
-            registry.running_under_test = True
+        registry.running_under_test = 'nose' in sys.argv[0]
+        registry.initialising = True
         return registry
 
     def get(self, key):
@@ -128,7 +126,7 @@ class Registry(object):
         :param event: The function description..
         :param function: The function to be called when the event happens.
         """
-        if self.running_under_test is False:
+        if not self.running_under_test:
             trace_error_handler(log)
             log.error('Invalid Method call for key %s' % event)
             raise KeyError('Invalid Method call for key %s' % event)

openlp/core/common/registryproperties.py

@@ -149,4 +149,4 @@ class RegistryProperties(object):
         """
         if not hasattr(self, '_alerts_manager') or not self._alerts_manager:
             self._alerts_manager = Registry().get('alerts_manager')
-        return self._alerts_manager
+        return self._alerts_manager

openlp/core/common/uistrings.py

@@ -73,8 +73,9 @@ class UiStrings(object):
         self.Default = translate('OpenLP.Ui', 'Default')
         self.DefaultColor = translate('OpenLP.Ui', 'Default Color:')
         self.DefaultServiceName = translate('OpenLP.Ui', 'Service %Y-%m-%d %H-%M',
-            'This may not contain any of the following characters: /\\?*|<>\[\]":+\n'
-            'See http://docs.python.org/library/datetime.html#strftime-strptime-behavior for more information.')
+                                            'This may not contain any of the following characters: /\\?*|<>\[\]":+\n'
+                                            'See http://docs.python.org/library/datetime'
+                                            '.html#strftime-strptime-behavior for more information.')
         self.Delete = translate('OpenLP.Ui', '&Delete')
         self.DisplayStyle = translate('OpenLP.Ui', 'Display style:')
         self.Duplicate = translate('OpenLP.Ui', 'Duplicate Error')
@@ -132,7 +133,7 @@ class UiStrings(object):
         self.Service = translate('OpenLP.Ui', 'Service')
         self.Split = translate('OpenLP.Ui', 'Optional &Split')
         self.SplitToolTip = translate('OpenLP.Ui',
-            'Split a slide into two only if it does not fit on the screen as one slide.')
+                                      'Split a slide into two only if it does not fit on the screen as one slide.')
         self.StartTimeCode = translate('OpenLP.Ui', 'Start %s')
         self.StopPlaySlidesInLoop = translate('OpenLP.Ui', 'Stop Play Slides in Loop')
         self.StopPlaySlidesToEnd = translate('OpenLP.Ui', 'Stop Play Slides to End')

openlp/core/lib/__init__.py

@@ -39,7 +39,7 @@ from PyQt4 import QtCore, QtGui, Qt
 
 from openlp.core.common import translate
 
-log = logging.getLogger(__name__+'.__init__')
+log = logging.getLogger(__name__ + '.__init__')
 
 
 class ServiceItemContext(object):

openlp/core/lib/db.py

@@ -87,10 +87,11 @@ def upgrade_db(url, upgrade):
         """
         pass
 
-    metadata_table = Table('metadata', metadata,
-                           Column('key', types.Unicode(64), primary_key=True),
-                           Column('value', types.UnicodeText(), default=None)
-                           )
+    metadata_table = Table(
+        'metadata', metadata,
+        Column('key', types.Unicode(64), primary_key=True),
+        Column('value', types.UnicodeText(), default=None)
+    )
     metadata_table.create(checkfirst=True)
     mapper(Metadata, metadata_table)
     version_meta = session.query(Metadata).get('version')
@@ -131,7 +132,6 @@ def delete_database(plugin_name, db_file_name=None):
     :param plugin_name: The name of the plugin to remove the database for
     :param db_file_name: The database file name. Defaults to None resulting in the plugin_name being used.
     """
-    db_file_path = None
     if db_file_name:
         db_file_path = os.path.join(AppLocation.get_section_data_path(plugin_name), db_file_name)
     else:

openlp/core/lib/filedialog.py

@@ -63,4 +63,4 @@ class FileDialog(QtGui.QFileDialog):
                                                   UiStrings().FileNotFoundMessage % file)
                     continue
             file_list.append(file)
-        return file_list
+        return file_list

openlp/core/lib/htmlbuilder.py

@@ -117,7 +117,9 @@ is the function which has to be called from outside. The generated and returned
             display: table-cell;
             word-wrap: break-word;
             -webkit-transition: opacity 0.4s ease;
-            white-space:pre-wrap; word-wrap: break-word; text-align: left; vertical-align: top; font-family: Nimbus Sans L; font-size: 40pt; color: #FFFFFF; line-height: 100%; margin: 0;padding: 0; padding-bottom: 0; padding-left: 4px; width: 1580px; height: 810px;
+            white-space:pre-wrap; word-wrap: break-word; text-align: left; vertical-align: top; font-family: Nimbus
+            Sans L; font-size: 40pt; color: #FFFFFF; line-height: 100%; margin: 0;padding: 0; padding-bottom: 0;
+            padding-left: 4px; width: 1580px; height: 810px;
         }
         .lyricsmain {
              -webkit-text-stroke: 0.125em #000000; -webkit-text-fill-color: #FFFFFF;  text-shadow: #000000 5px 5px;
@@ -720,12 +722,12 @@ def build_lyrics_format_css(theme_data, width, height):
     else:
         padding_bottom = '0'
     lyrics = '%s word-wrap: break-word; ' \
-        'text-align: %s; vertical-align: %s; font-family: %s; ' \
-        'font-size: %spt; color: %s; line-height: %d%%; margin: 0;' \
-        'padding: 0; padding-bottom: %s; padding-left: %spx; width: %spx; height: %spx; ' % \
+             'text-align: %s; vertical-align: %s; font-family: %s; ' \
+             'font-size: %spt; color: %s; line-height: %d%%; margin: 0;' \
+             'padding: 0; padding-bottom: %s; padding-left: %spx; width: %spx; height: %spx; ' % \
         (justify, align, valign, theme_data.font_main_name, theme_data.font_main_size,
-        theme_data.font_main_color, 100 + int(theme_data.font_main_line_adjustment), padding_bottom,
-        left_margin, width, height)
+         theme_data.font_main_color, 100 + int(theme_data.font_main_line_adjustment), padding_bottom,
+         left_margin, width, height)
     if theme_data.font_main_italics:
         lyrics += 'font-style:italic; '
     if theme_data.font_main_bold:

openlp/core/lib/imagemanager.py

@@ -114,8 +114,8 @@ class Image(object):
         :param path: The image's file path. This should be an existing file path.
         :param source: The source describes the image's origin. Possible values are described in the
             :class:`~openlp.core.lib.ImageSource` class.
-        :param background: A ``QtGui.QColor`` object specifying the colour to be used to fill the gabs if the image's ratio does not
-            match with the display ratio.
+        :param background: A ``QtGui.QColor`` object specifying the colour to be used to fill the gabs if the image's
+            ratio does not match with the display ratio.
 
         """
         self.path = path

openlp/core/lib/mediamanageritem.py

@@ -168,29 +168,29 @@ class MediaManagerItem(QtGui.QWidget, RegistryProperties):
         Create buttons for the media item toolbar
         """
         toolbar_actions = []
-        ## Import Button ##
+        # Import Button
         if self.has_import_icon:
             toolbar_actions.append(['Import', StringContent.Import,
                                     ':/general/general_import.png', self.on_import_click])
-        ## Load Button ##
+        # Load Button
         if self.has_file_icon:
             toolbar_actions.append(['Load', StringContent.Load, ':/general/general_open.png', self.on_file_click])
-        ## New Button ##
+        # New Button
         if self.has_new_icon:
             toolbar_actions.append(['New', StringContent.New, ':/general/general_new.png', self.on_new_click])
-        ## Edit Button ##
+        # Edit Button
         if self.has_edit_icon:
             toolbar_actions.append(['Edit', StringContent.Edit, ':/general/general_edit.png', self.on_edit_click])
-        ## Delete Button ##
+        # Delete Button
         if self.has_delete_icon:
             toolbar_actions.append(['Delete', StringContent.Delete,
                                     ':/general/general_delete.png', self.on_delete_click])
-        ## Preview ##
+        # Preview
         toolbar_actions.append(['Preview', StringContent.Preview,
                                 ':/general/general_preview.png', self.on_preview_click])
-        ## Live Button ##
+        # Live Button
         toolbar_actions.append(['Live', StringContent.Live, ':/general/general_live.png', self.on_live_click])
-        ## Add to service Button ##
+        # Add to service Button
         toolbar_actions.append(['Service', StringContent.Service, ':/general/general_add.png', self.on_add_click])
         for action in toolbar_actions:
             if action[0] == StringContent.Preview:

openlp/core/lib/plugin.py

@@ -101,7 +101,7 @@ class Plugin(QtCore.QObject, RegistryProperties):
     ``add_import_menu_item(import_menu)``
         Add an item to the Import menu.
 
-    ``add_export_menu_Item(export_menu)``
+    ``add_export_menu_item(export_menu)``
         Add an item to the Export menu.
 
     ``create_settings_tab()``
@@ -226,7 +226,7 @@ class Plugin(QtCore.QObject, RegistryProperties):
         """
         pass
 
-    def add_export_menu_Item(self, export_menu):
+    def add_export_menu_item(self, export_menu):
         """
         Create a menu item and add it to the "Export" menu.
 
@@ -329,22 +329,24 @@ class Plugin(QtCore.QObject, RegistryProperties):
     def set_plugin_ui_text_strings(self, tooltips):
         """
         Called to define all translatable texts of the plugin
+
+        :param tooltips:
         """
-        ## Load Action ##
+        # Load Action
         self.__set_name_text_string(StringContent.Load, UiStrings().Load, tooltips['load'])
-        ## Import Action ##
+        # Import Action
         self.__set_name_text_string(StringContent.Import, UiStrings().Import, tooltips['import'])
-        ## New Action ##
+        # New Action
         self.__set_name_text_string(StringContent.New, UiStrings().Add, tooltips['new'])
-        ## Edit Action ##
+        # Edit Action
         self.__set_name_text_string(StringContent.Edit, UiStrings().Edit, tooltips['edit'])
-        ## Delete Action ##
+        # Delete Action
         self.__set_name_text_string(StringContent.Delete, UiStrings().Delete, tooltips['delete'])
-        ## Preview Action ##
+        # Preview Action
         self.__set_name_text_string(StringContent.Preview, UiStrings().Preview, tooltips['preview'])
-        ## Send Live Action ##
+        # Send Live Action
         self.__set_name_text_string(StringContent.Live, UiStrings().Live, tooltips['live'])
-        ## Add to Service Action ##
+        # Add to Service Action
         self.__set_name_text_string(StringContent.Service, UiStrings().Service, tooltips['service'])
 
     def __set_name_text_string(self, name, title, tooltip):
@@ -393,4 +395,4 @@ class Plugin(QtCore.QObject, RegistryProperties):
         """
         The plugin's needs to handle a new song creation
         """
-        pass
+        pass

openlp/core/lib/pluginmanager.py

@@ -161,7 +161,7 @@ class PluginManager(RegistryMixin, OpenLPMixin, RegistryProperties):
         """
         for plugin in self.plugins:
             if plugin.status is not PluginStatus.Disabled:
-                plugin.add_export_menu_Item(self.main_window.file_export_menu)
+                plugin.add_export_menu_item(self.main_window.file_export_menu)
 
     def hook_tools_menu(self):
         """

openlp/core/lib/searchedit.py

@@ -120,9 +120,8 @@ class SearchEdit(QtGui.QLineEdit):
         A list of tuples to be used in the search type menu. The first item in the list will be preselected as the
         default.
 
-         :param items:     The list of tuples to use. The tuples should contain an integer identifier, an icon (QIcon instance or
-
-            string) and a title for the item in the menu. In short, they should look like this::
+         :param items:     The list of tuples to use. The tuples should contain an integer identifier, an icon (QIcon
+         instance or string) and a title for the item in the menu. In short, they should look like this::
 
                 (<identifier>, <icon>, <title>, <place holder text>)
 
@@ -179,15 +178,7 @@ class SearchEdit(QtGui.QLineEdit):
         correct action on the button, and set the current search type (using the list of identifiers provided by the
         developer), the ``searchTypeChanged(int)`` signal is emitted with the identifier.
         """
-        sender = self.sender()
         for action in self.menu_button.menu().actions():
+            # Why is this needed?
             action.setChecked(False)
-        self.menu_button.setDefaultAction(sender)
-        self._current_search_type = sender.data()
-        # setplaceholder_text has been implemented in Qt 4.7 and in at least
-        # PyQt 4.9 (I am not sure, if it was implemented in PyQt 4.8).
-        try:
-            self.setPlaceholderText(self.menu_button.defaultAction().placeholder_text)
-        except AttributeError:
-            pass
-        self.emit(QtCore.SIGNAL('searchTypeChanged(int)'), self._current_search_type)
+        self.set_current_search_type(self.sender().data())

openlp/core/lib/serviceitem.py

@@ -108,6 +108,9 @@ class ItemCapabilities(object):
     ``CanAutoStartForLive``
             The capability to ignore the do not play if display blank flag.
 
+    ``CanEditTitle``
+            The capability to edit the title of the item
+
     ``HasDisplayTitle``
             The item contains 'displaytitle' on every frame which should be
             preferred over 'title' when displaying the item
@@ -135,9 +138,10 @@ class ItemCapabilities(object):
     CanWordSplit = 14
     HasBackgroundAudio = 15
     CanAutoStartForLive = 16
-    HasDisplayTitle = 17
-    HasNotes = 18
-    HasThumbnails = 19
+    CanEditTitle = 17
+    HasDisplayTitle = 18
+    HasNotes = 19
+    HasThumbnails = 20
 
 
 class ServiceItem(RegistryProperties):
@@ -398,7 +402,7 @@ class ServiceItem(RegistryProperties):
         self.will_auto_start = header.get('will_auto_start', False)
         self.processor = header.get('processor', None)
         self.has_original_files = True
-        #TODO Remove me in 2,3 build phase
+        # TODO: Remove me in 2,3 build phase
         if self.is_capable(ItemCapabilities.HasDetailedTitleDisplay):
             self.capabilities.remove(ItemCapabilities.HasDetailedTitleDisplay)
             self.processor = self.title
@@ -439,7 +443,7 @@ class ServiceItem(RegistryProperties):
         """
         Returns the title of the service item.
         """
-        if self.is_text():
+        if self.is_text() or ItemCapabilities.CanEditTitle in self.capabilities:
             return self.title
         else:
             if len(self._raw_frames) > 1:

openlp/core/lib/ui.py

@@ -74,11 +74,13 @@ def create_button_box(dialog, name, standard_buttons, custom_buttons=None):
     :param name: A string which is set as object name.
     :param standard_buttons: A list of strings for the used buttons. It might contain: ``ok``, ``save``, ``cancel``,
     ``close``, and ``defaults``.
-    :param custom_buttons: A list of additional buttons. If a item is a instance of QtGui.QAbstractButton it is added
-    with QDialogButtonBox.ActionRole. Other wise the item has to be a tuple of a button and a ButtonRole.
+    :param custom_buttons: A list of additional buttons. If an item is an instance of QtGui.QAbstractButton it is added
+    with QDialogButtonBox.ActionRole. Otherwise the item has to be a tuple of a Button and a ButtonRole.
     """
     if custom_buttons is None:
         custom_buttons = []
+    if standard_buttons is None:
+        standard_buttons = []
     buttons = QtGui.QDialogButtonBox.NoButton
     if 'ok' in standard_buttons:
         buttons |= QtGui.QDialogButtonBox.Ok
@@ -171,7 +173,7 @@ def create_button(parent, name, **kwargs):
             kwargs.setdefault('tooltip', translate('OpenLP.Ui', 'Move selection down one position.'))
         else:
             log.warn('The role "%s" is not defined in create_push_button().', role)
-    if kwargs.pop('class', '') == 'toolbutton':
+    if kwargs.pop('btn_class', '') == 'toolbutton':
         button = QtGui.QToolButton(parent)
     else:
         button = QtGui.QPushButton(parent)

openlp/core/ui/advancedtab.py

@@ -263,7 +263,7 @@ class AdvancedTab(SettingsTab):
         """
         Setup the interface translation strings.
         """
-        self.tabTitleVisible = UiStrings().Advanced
+        self.tab_title_visible = UiStrings().Advanced
         self.ui_group_box.setTitle(translate('OpenLP.AdvancedTab', 'UI Settings'))
         self.data_directory_group_box.setTitle(translate('OpenLP.AdvancedTab', 'Data Location'))
         self.recent_label.setText(translate('OpenLP.AdvancedTab', 'Number of recent files to display:'))
@@ -319,7 +319,7 @@ class AdvancedTab(SettingsTab):
             translate('OpenLP.AdvancedTab', '<strong>WARNING:</strong> New data directory location contains '
                       'OpenLP data files.  These files WILL be replaced during a copy.'))
         self.display_workaround_group_box.setTitle(translate('OpenLP.AdvancedTab', 'Display Workarounds'))
-        self.x11_bypass_check_box.setText(translate('OpenLP.AdvancedTab','Bypass X11 Window Manager'))
+        self.x11_bypass_check_box.setText(translate('OpenLP.AdvancedTab', 'Bypass X11 Window Manager'))
         self.alternate_rows_check_box.setText(translate('OpenLP.AdvancedTab', 'Use alternating row colours in lists'))
         # Slide Limits
         self.slide_group_box.setTitle(translate('OpenLP.GeneralTab', 'Service Item Slide Limits'))
@@ -375,7 +375,8 @@ class AdvancedTab(SettingsTab):
         self.current_data_path = AppLocation.get_data_path()
         if not os.path.exists(self.current_data_path):
             log.error('Data path not found %s' % self.current_data_path)
-            answer = QtGui.QMessageBox.critical(self, translate('OpenLP.AdvancedTab', 'Data Directory Error'),
+            answer = QtGui.QMessageBox.critical(
+                self, translate('OpenLP.AdvancedTab', 'Data Directory Error'),
                 translate('OpenLP.AdvancedTab', 'OpenLP data directory was not found\n\n%s\n\n'
                           'This data directory was previously changed from the OpenLP '
                           'default location.  If the new location was on removable '
@@ -510,7 +511,7 @@ class AdvancedTab(SettingsTab):
         """
         Select an image for the default display screen.
         """
-        file_filters = '%s;;%s (*.*) (*)' % (get_images_filter(), UiStrings().AllFiles)
+        file_filters = '%s;;%s (*.*)' % (get_images_filter(), UiStrings().AllFiles)
         filename = QtGui.QFileDialog.getOpenFileName(self, translate('OpenLP.AdvancedTab', 'Open File'), '',
                                                      file_filters)
         if filename:
@@ -537,8 +538,9 @@ class AdvancedTab(SettingsTab):
         # Make sure they want to change the data.
         answer = QtGui.QMessageBox.question(self, translate('OpenLP.AdvancedTab', 'Confirm Data Directory Change'),
                                             translate('OpenLP.AdvancedTab', 'Are you sure you want to change the '
-                                            'location of the OpenLP data directory to:\n\n%s\n\nThe data directory '
-                                            'will be changed when OpenLP is closed.').replace('%s', new_data_path),
+                                                      'location of the OpenLP data directory to:\n\n%s\n\nThe data '
+                                                      'directory will be changed when OpenLP is closed.').
+                                            replace('%s', new_data_path),
                                             QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes |
                                                                               QtGui.QMessageBox.No),
                                             QtGui.QMessageBox.No)
@@ -561,8 +563,9 @@ class AdvancedTab(SettingsTab):
             # default.
             answer = QtGui.QMessageBox.question(self, translate('OpenLP.AdvancedTab', 'Reset Data Directory'),
                                                 translate('OpenLP.AdvancedTab', 'Are you sure you want to change the '
-                                                'location of the OpenLP data directory to the default location?\n\nThis'
-                                                ' location will be used after OpenLP is closed.'),
+                                                          'location of the OpenLP data directory to the default '
+                                                          'location?\n\nThis location will be used after OpenLP is  '
+                                                          'closed.'),
                                                 QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes |
                                                                                   QtGui.QMessageBox.No),
                                                 QtGui.QMessageBox.No)
@@ -588,7 +591,7 @@ class AdvancedTab(SettingsTab):
             else:
                 self.new_data_directory_has_files_label.hide()
 
-    def check_data_overwrite(self, data_path ):
+    def check_data_overwrite(self, data_path):
         """
         Check if there's already data in the target directory.
         """
@@ -602,8 +605,8 @@ class AdvancedTab(SettingsTab):
                                                translate('OpenLP.AdvancedTab',
                                                          'WARNING: \n\nThe location you have selected \n\n%s\n\n'
                                                          'appears to contain OpenLP data files. Do you wish to '
-                                                         'replace these files with the current data files?').replace
-                                                         ('%s', os.path.abspath(data_path,)),
+                                                         'replace these files with the current data files?').
+                                               replace('%s', os.path.abspath(data_path,)),
                                                QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes |
                                                                                  QtGui.QMessageBox.No),
                                                QtGui.QMessageBox.No)

openlp/core/ui/exceptiondialog.py

@@ -83,9 +83,8 @@ class Ui_ExceptionDialog(object):
         self.attach_tile_button = create_button(exception_dialog, 'attach_tile_button',
                                                 icon=':/general/general_open.png',
                                                 click=self.on_attach_file_button_clicked)
-        self.button_box = create_button_box(exception_dialog, 'button_box',
-                                            ['close'], [self.send_report_button,
-                                            self.save_report_button, self.attach_tile_button])
+        self.button_box = create_button_box(exception_dialog, 'button_box', ['close'],
+                                            [self.send_report_button, self.save_report_button, self.attach_tile_button])
         self.exception_layout.addWidget(self.button_box)
 
         self.retranslateUi(exception_dialog)
@@ -96,15 +95,15 @@ class Ui_ExceptionDialog(object):
         Translate the widgets on the fly.
         """
         exception_dialog.setWindowTitle(translate('OpenLP.ExceptionDialog', 'Error Occurred'))
-        self.description_explanation.setText(translate('OpenLP.ExceptionDialog',
-                                             'Please enter a description of what you were doing to cause this error '
-                                             '\n(Minimum 20 characters)'))
-        self.message_label.setText(translate('OpenLP.ExceptionDialog', 'Oops! '
-                                             'OpenLP hit a problem, and couldn\'t recover. The text in the box '
-                                             'below contains information that might be helpful to the OpenLP '
-                                             'developers, so please e-mail it to bugs@openlp.org, along with a '
-                                             'detailed description of what you were doing when the problem '
-                                             'occurred.'))
+        self.description_explanation.setText(
+            translate('OpenLP.ExceptionDialog', 'Please enter a description of what you were doing to cause this error '
+                                                '\n(Minimum 20 characters)'))
+        self.message_label.setText(
+            translate('OpenLP.ExceptionDialog', 'Oops! OpenLP hit a problem, and couldn\'t recover. The text in the '
+                                                'box below contains information that might be helpful to the OpenLP '
+                                                'developers, so please e-mail it to bugs@openlp.org, along with a '
+                                                'detailed description of what you were doing when the problem '
+                                                'occurred.'))
         self.send_report_button.setText(translate('OpenLP.ExceptionDialog', 'Send E-Mail'))
         self.save_report_button.setText(translate('OpenLP.ExceptionDialog', 'Save to File'))
         self.attach_tile_button.setText(translate('OpenLP.ExceptionDialog', 'Attach File'))

openlp/core/ui/exceptionform.py

@@ -157,7 +157,8 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog, RegistryProperties):
                                 '--- Exception Traceback ---\n%s\n'
                                 '--- System information ---\n%s\n'
                                 '--- Library Versions ---\n%s\n')
-        filename = QtGui.QFileDialog.getSaveFileName(self,
+        filename = QtGui.QFileDialog.getSaveFileName(
+            self,
             translate('OpenLP.ExceptionForm', 'Save Crash Report'),
             Settings().value(self.settings_section + '/last directory'),
             translate('OpenLP.ExceptionForm', 'Text files (*.txt *.log *.text)'))
@@ -185,14 +186,13 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog, RegistryProperties):
         Opening systems default email client and inserting exception log and system information.
         """
         body = translate('OpenLP.ExceptionForm',
-            '*OpenLP Bug Report*\n'
-            'Version: %s\n\n'
-            '--- Details of the Exception. ---\n\n%s\n\n '
-            '--- Exception Traceback ---\n%s\n'
-            '--- System information ---\n%s\n'
-            '--- Library Versions ---\n%s\n',
-            'Please add the information that bug reports are favoured written '
-            'in English.')
+                         '*OpenLP Bug Report*\n'
+                         'Version: %s\n\n'
+                         '--- Details of the Exception. ---\n\n%s\n\n '
+                         '--- Exception Traceback ---\n%s\n'
+                         '--- System information ---\n%s\n'
+                         '--- Library Versions ---\n%s\n',
+                         'Please add the information that bug reports are favoured written in English.')
         content = self._create_report()
         source = ''
         exception = ''
@@ -228,7 +228,7 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog, RegistryProperties):
         """
         files = QtGui.QFileDialog.getOpenFileName(self, translate('ImagePlugin.ExceptionDialog', 'Select Attachment'),
                                                   Settings().value(self.settings_section + '/last directory'),
-                                                  '%s (*.*) (*)' % UiStrings().AllFiles)
+                                                  '%s (*)' % UiStrings().AllFiles)
         log.info('New files(s) %s', str(files))
         if files:
             self.file_attachment = str(files)

openlp/core/ui/filerenameform.py

@@ -57,4 +57,4 @@ class FileRenameForm(QtGui.QDialog, Ui_FileRenameDialog, RegistryProperties):
         else:
             self.setWindowTitle(translate('OpenLP.FileRenameForm', 'File Rename'))
         self.file_name_edit.setFocus()
-        return QtGui.QDialog.exec_(self)
+        return QtGui.QDialog.exec_(self)

openlp/core/ui/firsttimeform.py

@@ -67,7 +67,7 @@ class ThemeScreenshotThread(QtCore.QThread):
             title = config.get('theme_%s' % theme, 'title')
             filename = config.get('theme_%s' % theme, 'filename')
             screenshot = config.get('theme_%s' % theme, 'screenshot')
-            urllib.request.urlretrieve('%s%s' % (self.parent().web, screenshot),
+            urllib.request.urlretrieve('%s%s' % (self.parent().themes_url, screenshot),
                                        os.path.join(gettempdir(), 'openlp', screenshot))
             item = QtGui.QListWidgetItem(title, self.parent().themes_list_widget)
             item.setData(QtCore.Qt.UserRole, filename)
@@ -96,6 +96,10 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard, RegistryProperties):
         if self.web_access:
             files = self.web_access.read()
             self.config.read_string(files.decode())
+            self.web = self.config.get('general', 'base url')
+            self.songs_url = self.web + self.config.get('songs', 'directory') + '/'
+            self.bibles_url = self.web + self.config.get('bibles', 'directory') + '/'
+            self.themes_url = self.web + self.config.get('themes', 'directory') + '/'
         self.update_screen_list_combo()
         self.was_download_cancelled = False
         self.theme_screenshot_thread = None
@@ -341,7 +345,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard, RegistryProperties):
             item = self.songs_list_widget.item(i)
             if item.checkState() == QtCore.Qt.Checked:
                 filename = item.data(QtCore.Qt.UserRole)
-                size = self._get_file_size('%s%s' % (self.web, filename))
+                size = self._get_file_size('%s%s' % (self.songs_url, filename))
                 self.max_progress += size
         # Loop through the Bibles list and increase for each selected item
         iterator = QtGui.QTreeWidgetItemIterator(self.bibles_tree_widget)
@@ -350,7 +354,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard, RegistryProperties):
             item = iterator.value()
             if item.parent() and item.checkState(0) == QtCore.Qt.Checked:
                 filename = item.data(0, QtCore.Qt.UserRole)
-                size = self._get_file_size('%s%s' % (self.web, filename))
+                size = self._get_file_size('%s%s' % (self.bibles_url, filename))
                 self.max_progress += size
             iterator += 1
         # Loop through the themes list and increase for each selected item
@@ -359,7 +363,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard, RegistryProperties):
             item = self.themes_list_widget.item(i)
             if item.checkState() == QtCore.Qt.Checked:
                 filename = item.data(QtCore.Qt.UserRole)
-                size = self._get_file_size('%s%s' % (self.web, filename))
+                size = self._get_file_size('%s%s' % (self.themes_url, filename))
                 self.max_progress += size
         if self.max_progress:
             # Add on 2 for plugins status setting plus a "finished" point.
@@ -435,7 +439,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard, RegistryProperties):
                     self._increment_progress_bar(self.downloading % filename, 0)
                     self.previous_size = 0
                     destination = os.path.join(songs_destination, str(filename))
-                    self.url_get_file('%s%s' % (self.web, filename), destination)
+                    self.url_get_file('%s%s' % (self.songs_url, filename), destination)
             # Download Bibles
             bibles_iterator = QtGui.QTreeWidgetItemIterator(
                 self.bibles_tree_widget)
@@ -445,7 +449,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard, RegistryProperties):
                     bible = item.data(0, QtCore.Qt.UserRole)
                     self._increment_progress_bar(self.downloading % bible, 0)
                     self.previous_size = 0
-                    self.url_get_file('%s%s' % (self.web, bible), os.path.join(bibles_destination, bible))
+                    self.url_get_file('%s%s' % (self.bibles_url, bible), os.path.join(bibles_destination, bible))
                 bibles_iterator += 1
             # Download themes
             for i in range(self.themes_list_widget.count()):
@@ -454,7 +458,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard, RegistryProperties):
                     theme = item.data(QtCore.Qt.UserRole)
                     self._increment_progress_bar(self.downloading % theme, 0)
                     self.previous_size = 0
-                    self.url_get_file('%s%s' % (self.web, theme), os.path.join(themes_destination, theme))
+                    self.url_get_file('%s%s' % (self.themes_url, theme), os.path.join(themes_destination, theme))
         # Set Default Display
         if self.display_combo_box.currentIndex() != -1:
             Settings().setValue('core/monitor', self.display_combo_box.currentIndex())
@@ -468,4 +472,4 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard, RegistryProperties):
         Set the status of a plugin.
         """
         status = PluginStatus.Active if field.checkState() == QtCore.Qt.Checked else PluginStatus.Inactive
-        Settings().setValue(tag, status)
+        Settings().setValue(tag, status)

openlp/core/ui/firsttimewizard.py

@@ -211,9 +211,9 @@ class Ui_FirstTimeWizard(object):
         first_time_wizard.setWindowTitle(translate('OpenLP.FirstTimeWizard', 'First Time Wizard'))
         self.title_label.setText('<span style="font-size:14pt; font-weight:600;">%s</span>' %
                                  translate('OpenLP.FirstTimeWizard', 'Welcome to the First Time Wizard'))
-        self.information_label.setText(translate('OpenLP.FirstTimeWizard',
-                                       'This wizard will help you to configure OpenLP for initial use. '
-                                       'Click the next button below to start.'))
+        self.information_label.setText(
+            translate('OpenLP.FirstTimeWizard', 'This wizard will help you to configure OpenLP for initial use. '
+                                                'Click the next button below to start.'))
         self.plugin_page.setTitle(translate('OpenLP.FirstTimeWizard', 'Activate required Plugins'))
         self.plugin_page.setSubTitle(translate('OpenLP.FirstTimeWizard', 'Select the Plugins you wish to use. '))
         self.songs_check_box.setText(translate('OpenLP.FirstTimeWizard', 'Songs'))

openlp/core/ui/formattingtagcontroller.py

@@ -174,4 +174,4 @@ class FormattingTagController(object):
         if end and end != end_html:
             return translate('OpenLP.FormattingTagForm',
                              'End tag %s does not match end tag for start tag %s' % (end, start_html)), None
-        return None, None
+        return None, None

openlp/core/ui/formattingtagdialog.py

@@ -102,8 +102,7 @@ class Ui_FormattingTagDialog(object):
         self.edit_button_layout.addWidget(self.delete_button)
         self.edit_button_layout.addStretch()
         self.list_data_grid_layout.addLayout(self.edit_button_layout)
-        self.button_box = create_button_box(formatting_tag_dialog, 'button_box',
-            ['cancel', 'save', 'defaults'])
+        self.button_box = create_button_box(formatting_tag_dialog, 'button_box', ['cancel', 'save', 'defaults'])
         self.save_button = self.button_box.button(QtGui.QDialogButtonBox.Save)
         self.save_button.setObjectName('save_button')
         self.restore_button = self.button_box.button(QtGui.QDialogButtonBox.RestoreDefaults)

openlp/core/ui/formattingtagform.py

@@ -63,7 +63,6 @@ class FormattingTagForm(QtGui.QDialog, Ui_FormattingTagDialog, FormattingTagCont
         self.services = FormattingTagController()
         self.tag_table_widget.itemSelectionChanged.connect(self.on_row_selected)
         self.new_button.clicked.connect(self.on_new_clicked)
-        #self.save_button.clicked.connect(self.on_saved_clicked)
         self.delete_button.clicked.connect(self.on_delete_clicked)
         self.tag_table_widget.currentCellChanged.connect(self.on_current_cell_changed)
         self.button_box.rejected.connect(self.close)
@@ -202,6 +201,4 @@ class FormattingTagForm(QtGui.QDialog, Ui_FormattingTagDialog, FormattingTagCont
             if errors:
                 QtGui.QMessageBox.warning(self, translate('OpenLP.FormattingTagForm', 'Validation Error'), errors,
                                           QtGui.QMessageBox.Ok)
-            #self.tag_table_widget.selectRow(pre_row - 1)
             self.tag_table_widget.resizeRowsToContents()
-

openlp/core/ui/generaltab.py

@@ -223,7 +223,8 @@ class GeneralTab(SettingsTab):
         self.save_check_service_check_box.setText(translate('OpenLP.GeneralTab',
                                                   'Prompt to save before starting a new service'))
         self.auto_unblank_check_box.setText(translate('OpenLP.GeneralTab', 'Unblank display when adding new live item'))
-        self.auto_preview_check_box.setText(translate('OpenLP.GeneralTab', 'Automatically preview next item in service'))
+        self.auto_preview_check_box.setText(translate('OpenLP.GeneralTab',
+                                                      'Automatically preview next item in service'))
         self.timeout_label.setText(translate('OpenLP.GeneralTab', 'Timed slide interval:'))
         self.timeout_spin_box.setSuffix(translate('OpenLP.GeneralTab', ' sec'))
         self.ccli_group_box.setTitle(translate('OpenLP.GeneralTab', 'CCLI Details'))

openlp/core/ui/listpreviewwidget.py

@@ -160,4 +160,4 @@ class ListPreviewWidget(QtGui.QTableWidget, RegistryProperties):
         """
         Returns the number of slides this widget holds.
         """
-        return super(ListPreviewWidget, self).rowCount()
+        return super(ListPreviewWidget, self).rowCount()

openlp/core/ui/maindisplay.py

@@ -168,8 +168,10 @@ class MainDisplay(OpenLPMixin, Display, RegistryProperties):
         """
         if enabled:
             self.setAutoFillBackground(False)
+            self.setStyleSheet("QGraphicsView {background: transparent; border: 0px;}")
         else:
             self.setAttribute(QtCore.Qt.WA_NoSystemBackground, False)
+            self.setStyleSheet("QGraphicsView {}")
         self.setAttribute(QtCore.Qt.WA_TranslucentBackground, enabled)
         self.repaint()
 
@@ -350,7 +352,6 @@ class MainDisplay(OpenLPMixin, Display, RegistryProperties):
                 self.hide_display(self.hide_mode)
             # Only continue if the visibility wasn't changed during method call.
             elif was_visible == self.isVisible():
-
                 # Single screen active
                 if self.screens.display_count == 1:
                     # Only make visible if setting enabled.
@@ -601,4 +602,3 @@ class AudioPlayer(OpenLPMixin, QtCore.QObject):
         :param signal: The signal to be fired
         """
         QtCore.QObject.connect(self.media_object, signal, slot)
-

openlp/core/ui/mainwindow.py

@@ -56,29 +56,27 @@ from openlp.core.ui.firsttimeform import FirstTimeForm
 log = logging.getLogger(__name__)
 
 MEDIA_MANAGER_STYLE = """
-  QToolBox {
+QToolBox {
     padding-bottom: 2px;
-  }
-  QToolBox::tab {
+}
+QToolBox::tab {
     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-        stop: 0 palette(button), stop: 0.5 palette(button),
-        stop: 1.0 palette(mid));
-    border: 1px groove palette(mid);
-    border-radius: 5px;
-  }
-  QToolBox::tab:selected {
+        stop: 0 palette(button), stop: 1.0 palette(mid));
+    border: 1px solid palette(mid);
+    border-radius: 3px;
+}
+QToolBox::tab:selected {
     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-        stop: 0 palette(light), stop: 0.5 palette(midlight),
-        stop: 1.0 palette(dark));
-    border: 1px groove palette(dark);
+        stop: 0 palette(light), stop: 1.0 palette(button));
+    border: 1px solid palette(mid);
     font-weight: bold;
-  }
+}
 """
 
 PROGRESSBAR_STYLE = """
-    QProgressBar{
-       height: 10px;
-    }
+QProgressBar{
+    height: 10px;
+}
 """
 
 
@@ -369,7 +367,7 @@ class Ui_MainWindow(object):
         self.settings_menu.setTitle(translate('OpenLP.MainWindow', '&Settings'))
         self.settings_language_menu.setTitle(translate('OpenLP.MainWindow', '&Language'))
         self.help_menu.setTitle(translate('OpenLP.MainWindow', '&Help'))
-        self.media_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Media Manager'))
+        self.media_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Library'))
         self.service_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Service Manager'))
         self.theme_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Theme Manager'))
         self.file_new_item.setText(translate('OpenLP.MainWindow', '&New'))
@@ -396,12 +394,12 @@ class Ui_MainWindow(object):
         self.settings_shortcuts_item.setText(translate('OpenLP.MainWindow', 'Configure &Shortcuts...'))
         self.formatting_tag_item.setText(translate('OpenLP.MainWindow', 'Configure &Formatting Tags...'))
         self.settings_configure_item.setText(translate('OpenLP.MainWindow', '&Configure OpenLP...'))
-        self.settings_export_item.setStatusTip(translate('OpenLP.MainWindow',
-                                               'Export OpenLP settings to a specified *.config file'))
+        self.settings_export_item.setStatusTip(
+            translate('OpenLP.MainWindow', 'Export OpenLP settings to a specified *.config file'))
         self.settings_export_item.setText(translate('OpenLP.MainWindow', 'Settings'))
-        self.settings_import_item.setStatusTip(translate('OpenLP.MainWindow',
-                                               'Import OpenLP settings from a specified *.config file previously '
-                                               'exported on this or another machine'))
+        self.settings_import_item.setStatusTip(
+            translate('OpenLP.MainWindow', 'Import OpenLP settings from a specified *.config file previously '
+                                           'exported on this or another machine'))
         self.settings_import_item.setText(translate('OpenLP.MainWindow', 'Settings'))
         self.view_media_manager_item.setText(translate('OpenLP.MainWindow', '&Media Manager'))
         self.view_media_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Toggle Media Manager'))
@@ -598,13 +596,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow, RegistryProperties):
             self.live_controller.display.setFocus()
         self.activateWindow()
         if self.arguments:
-            args = []
-            for a in self.arguments:
-                args.extend([a])
-            filename = args[0]
-            if not isinstance(filename, str):
-                filename = str(filename, sys.getfilesystemencoding())
-            self.service_manager_contents.load_file(filename)
+            self.open_cmd_line_files()
         elif Settings().value(self.general_settings_section + '/auto open'):
             self.service_manager_contents.load_Last_file()
         self.timer_version_id = self.startTimer(1000)
@@ -652,7 +644,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow, RegistryProperties):
                                            translate('OpenLP.MainWindow', 'Are you sure you want to re-run the First '
                                                      'Time Wizard?\n\nRe-running this wizard may make changes to your '
                                                      'current OpenLP configuration and possibly add songs to your '
-                                                     '#existing songs list and change your default theme.'),
+                                                     'existing songs list and change your default theme.'),
                                            QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes |
                                                                              QtGui.QMessageBox.No),
                                            QtGui.QMessageBox.No)
@@ -868,7 +860,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow, RegistryProperties):
                 section = 'general'
                 section_key = section + "/" + key
             # Make sure it's a valid section for us.
-            if not section in setting_sections:
+            if section not in setting_sections:
                 continue
         # We have a good file, import it.
         for section_key in import_keys:
@@ -887,7 +879,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow, RegistryProperties):
         # application terminates normally.   We need to exit without saving configuration.
         QtGui.QMessageBox.information(self, translate('OpenLP.MainWindow', 'Import settings'),
                                       translate('OpenLP.MainWindow', 'OpenLP will now close.  Imported settings will '
-                                      'be applied the next time you start OpenLP.'),
+                                                'be applied the next time you start OpenLP.'),
                                       QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
         self.settings_imported = True
         self.clean_up()
@@ -1042,8 +1034,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow, RegistryProperties):
                 ret = QtGui.QMessageBox.question(self, translate('OpenLP.MainWindow', 'Close OpenLP'),
                                                  translate('OpenLP.MainWindow', 'Are you sure you want to close '
                                                                                 'OpenLP?'),
-                                                 QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes | QtGui
-                                                 .QMessageBox.No),
+                                                 QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes |
+                                                                                   QtGui.QMessageBox.No),
                                                  QtGui.QMessageBox.Yes)
                 if ret == QtGui.QMessageBox.Yes:
                     self.clean_up()
@@ -1234,16 +1226,15 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow, RegistryProperties):
         self.recent_files_menu.clear()
         for file_id, filename in enumerate(recent_files_to_display):
             log.debug('Recent file name: %s', filename)
-            action = create_action(self, '',
-                                   text='&%d %s' % (file_id + 1,
+            action = create_action(self, '', text='&%d %s' % (file_id + 1,
                                    os.path.splitext(os.path.basename(str(filename)))[0]), data=filename,
                                    triggers=self.service_manager_contents.on_recent_service_clicked)
             self.recent_files_menu.addAction(action)
         clear_recent_files_action = create_action(self, '',
                                                   text=translate('OpenLP.MainWindow', 'Clear List', 'Clear List of '
-                                                                                                   'recent files'),
+                                                                                                    'recent files'),
                                                   statustip=translate('OpenLP.MainWindow', 'Clear the list of recent '
-                                                                                          'files.'),
+                                                                                           'files.'),
                                                   enabled=bool(self.recent_files),
                                                   triggers=self.clear_recent_file_menu)
         add_actions(self.recent_files_menu, (None, clear_recent_files_action))
@@ -1352,8 +1343,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow, RegistryProperties):
                 self.application.set_normal_cursor()
                 log.exception('Data copy failed %s' % str(why))
                 QtGui.QMessageBox.critical(self, translate('OpenLP.MainWindow', 'New Data Directory Error'),
-                                           translate('OpenLP.MainWindow',
-                                           'OpenLP Data directory copy failed\n\n%s').replace('%s', str(why)),
+                                           translate('OpenLP.MainWindow', 'OpenLP Data directory copy failed\n\n%s').
+                                           replace('%s', str(why)),
                                            QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
                 return False
         else:
@@ -1366,4 +1357,16 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow, RegistryProperties):
             settings.remove('advanced/data path')
         self.application.set_normal_cursor()
 
-
+    def open_cmd_line_files(self):
+        """
+        Open files passed in through command line arguments
+        """
+        args = []
+        for a in self.arguments:
+            args.extend([a])
+        for arg in args:
+            filename = arg
+            if not isinstance(filename, str):
+                filename = str(filename, sys.getfilesystemencoding())
+            if filename.endswith(('.osz', '.oszl')):
+                self.service_manager_contents.load_file(filename)

openlp/core/ui/media/__init__.py

@@ -35,7 +35,7 @@ from openlp.core.common import Settings
 
 from PyQt4 import QtCore
 
-log = logging.getLogger(__name__+'.__init__')
+log = logging.getLogger(__name__ + '.__init__')
 
 
 class MediaState(object):
@@ -90,7 +90,7 @@ def get_media_players():
             overridden_player = 'auto'
     else:
         overridden_player = ''
-    saved_players_list = saved_players.replace('[', '').replace(']', '').split(',')
+    saved_players_list = saved_players.replace('[', '').replace(']', '').split(',') if saved_players else []
     return saved_players_list, overridden_player
 
 

openlp/core/ui/media/mediacontroller.py

@@ -137,7 +137,7 @@ class MediaController(RegistryMixin, OpenLPMixin, RegistryProperties):
         for player in list(self.media_players.values()):
             if player.is_active:
                 for item in player.audio_extensions_list:
-                    if not item in self.audio_extensions_list:
+                    if item not in self.audio_extensions_list:
                         self.audio_extensions_list.append(item)
                         suffix_list.append(item[2:])
         self.video_extensions_list = []
@@ -184,8 +184,8 @@ class MediaController(RegistryMixin, OpenLPMixin, RegistryProperties):
             return False
         saved_players, overridden_player = get_media_players()
         invalid_media_players = \
-            [mediaPlayer for mediaPlayer in saved_players if not mediaPlayer in self.media_players or
-                not self.media_players[mediaPlayer].check_available()]
+            [media_player for media_player in saved_players if media_player not in self.media_players or
+                not self.media_players[media_player].check_available()]
         if invalid_media_players:
             for invalidPlayer in invalid_media_players:
                 saved_players.remove(invalidPlayer)
@@ -383,7 +383,7 @@ class MediaController(RegistryMixin, OpenLPMixin, RegistryProperties):
         if not is_valid:
             # Media could not be loaded correctly
             critical_error_message_box(translate('MediaPlugin.MediaItem', 'Unsupported File'),
-                translate('MediaPlugin.MediaItem', 'Unsupported File'))
+                                       translate('MediaPlugin.MediaItem', 'Unsupported File'))
             return False
         # dont care about actual theme, set a black background
         if controller.is_live and not controller.media_info.is_background:
@@ -402,7 +402,7 @@ class MediaController(RegistryMixin, OpenLPMixin, RegistryProperties):
         if autoplay:
             if not self.media_play(controller):
                 critical_error_message_box(translate('MediaPlugin.MediaItem', 'Unsupported File'),
-                    translate('MediaPlugin.MediaItem', 'Unsupported File'))
+                                           translate('MediaPlugin.MediaItem', 'Unsupported File'))
                 return False
         self.set_controls_visible(controller, True)
         log.debug('use %s controller' % self.current_media_players[controller.controller_type])
@@ -506,7 +506,8 @@ class MediaController(RegistryMixin, OpenLPMixin, RegistryProperties):
         else:
             self.media_volume(controller, controller.media_info.volume)
         if status:
-            display.frame.evaluateJavaScript('show_blank("desktop");')
+            if not controller.media_info.is_background:
+                display.frame.evaluateJavaScript('show_blank("desktop");')
             self.current_media_players[controller.controller_type].set_visible(display, True)
             # Flash needs to be played and will not AutoPlay
             if controller.media_info.is_flash:
@@ -517,7 +518,7 @@ class MediaController(RegistryMixin, OpenLPMixin, RegistryProperties):
                 controller.mediabar.actions['playbackPause'].setVisible(True)
             controller.mediabar.actions['playbackStop'].setVisible(True)
             if controller.is_live:
-                if controller.hide_menu.defaultAction().isChecked():
+                if controller.hide_menu.defaultAction().isChecked() and not controller.media_info.is_background:
                     controller.hide_menu.defaultAction().trigger()
         # Start Timer for ui updates
         if not self.timer.isActive():
@@ -644,9 +645,9 @@ class MediaController(RegistryMixin, OpenLPMixin, RegistryProperties):
             return
         display = self._define_display(self.live_controller)
         if self.live_controller.controller_type in self.current_media_players and \
-            self.current_media_players[self.live_controller.controller_type].state == MediaState.Playing:
-            self.current_media_players[self.live_controller.controller_type].pause(display)
-            self.current_media_players[self.live_controller.controller_type].set_visible(display, False)
+                self.current_media_players[self.live_controller.controller_type].state == MediaState.Playing:
+                self.current_media_players[self.live_controller.controller_type].pause(display)
+                self.current_media_players[self.live_controller.controller_type].set_visible(display, False)
 
     def media_blank(self, msg):
         """
@@ -701,4 +702,4 @@ class MediaController(RegistryMixin, OpenLPMixin, RegistryProperties):
         """
         if controller.is_live:
             return controller.display
-        return controller.preview_display
+        return controller.preview_display

openlp/core/ui/media/mediaplayer.py

@@ -150,4 +150,4 @@ class MediaPlayer(RegistryProperties):
         """
         Returns Information about the player
         """
-        return ''
+        return ''

openlp/core/ui/media/phononplayer.py

@@ -105,7 +105,7 @@ class PhononPlayer(MediaPlayer):
                 if ext not in mime_type_list:
                     mime_type_list.append(ext)
             log.info('MediaPlugin: %s additional extensions: %s' %
-                (mimetype, ' '.join(self.additional_extensions[mimetype])))
+                     (mimetype, ' '.join(self.additional_extensions[mimetype])))
 
     def setup(self, display):
         """

openlp/core/ui/media/vendor/vlc.py

@@ -48,13 +48,13 @@ import sys
 from inspect import getargspec
 
 __version__ = "N/A"
-build_date  = "Mon Apr  1 23:47:38 2013"
+build_date  = "Tue Jul  2 10:35:53 2013"
 
 if sys.version_info[0] > 2:
     str = str
-    str = str
+    unicode = str
     bytes = bytes
-    str = (str, bytes)
+    basestring = (str, bytes)
     PYTHON3 = True
     def str_to_bytes(s):
         """Translate string or bytes to bytes.
@@ -73,14 +73,14 @@ if sys.version_info[0] > 2:
             return b
 else:
     str = str
-    str = str
+    unicode = unicode
     bytes = str
-    str = str
+    basestring = basestring
     PYTHON3 = False
     def str_to_bytes(s):
         """Translate string or bytes to bytes.
         """
-        if isinstance(s, str):
+        if isinstance(s, unicode):
             return s.encode(sys.getfilesystemencoding())
         else:
             return s
@@ -89,7 +89,7 @@ else:
         """Translate bytes to unicode string.
         """
         if isinstance(b, str):
-            return str(b, sys.getfilesystemencoding())
+            return unicode(b, sys.getfilesystemencoding())
         else:
             return b
 
@@ -110,7 +110,7 @@ def find_lib():
         p = find_library('libvlc.dll')
         if p is None:
             try:  # some registry settings
-                import winreg as w  # leaner than win32api, win32con
+                import _winreg as w  # leaner than win32api, win32con
                 for r in w.HKEY_LOCAL_MACHINE, w.HKEY_CURRENT_USER:
                     try:
                         r = w.OpenKey(r, 'Software\\VideoLAN\\VLC')
@@ -168,7 +168,7 @@ class VLCException(Exception):
     pass
 
 try:
-    _Ints = (int, int)
+    _Ints = (int, long)
 except NameError:  # no long in Python 3+
     _Ints =  int
 _Seqs = (list, tuple)
@@ -327,6 +327,9 @@ class _Enum(ctypes.c_uint):
         n = self._enum_names_.get(self.value, '') or ('FIXME_(%r)' % (self.value,))
         return '.'.join((self.__class__.__name__, n))
 
+    def __hash__(self):
+        return self.value
+
     def __repr__(self):
         return '.'.join((self.__class__.__module__, self.__str__()))
 
@@ -1294,7 +1297,7 @@ class Instance(_Ctype):
             i = args[0]
             if isinstance(i, _Ints):
                 return _Constructor(cls, i)
-            elif isinstance(i, str):
+            elif isinstance(i, basestring):
                 args = i.strip().split()
             elif isinstance(i, _Seqs):
                 args = i
@@ -2078,7 +2081,7 @@ class MediaList(_Ctype):
         @param mrl: a media instance or a MRL.
         @return: 0 on success, -1 if the media list is read-only.
         """
-        if isinstance(mrl, str):
+        if isinstance(mrl, basestring):
             mrl = (self.get_instance() or get_default_instance()).media_new(mrl)
         return libvlc_media_list_add_media(self, mrl)
 
@@ -3351,6 +3354,39 @@ def libvlc_event_type_name(event_type):
                     ctypes.c_char_p, ctypes.c_uint)
     return f(event_type)
 
+def libvlc_log_get_context(ctx):
+    '''Gets debugging informations about a log message: the name of the VLC module
+    emitting the message and the message location within the source code.
+    The returned module name and file name will be NULL if unknown.
+    The returned line number will similarly be zero if unknown.
+    @param ctx: message context (as passed to the @ref libvlc_log_cb callback).
+    @return: module module name storage (or NULL), file source code file name storage (or NULL), line source code file line number storage (or NULL).
+    @version: LibVLC 2.1.0 or later.
+    '''
+    f = _Cfunctions.get('libvlc_log_get_context', None) or \
+        _Cfunction('libvlc_log_get_context', ((1,), (2,), (2,), (2,),), None,
+                    None, Log_ptr, ListPOINTER(ctypes.c_char_p), ListPOINTER(ctypes.c_char_p), ctypes.POINTER(ctypes.c_uint))
+    return f(ctx)
+
+def libvlc_log_get_object(ctx, id):
+    '''Gets VLC object informations about a log message: the type name of the VLC
+    object emitting the message, the object header if any and a temporaly-unique
+    object identifier. These informations are mainly meant for B{manual}
+    troubleshooting.
+    The returned type name may be "generic" if unknown, but it cannot be NULL.
+    The returned header will be NULL if unset; in current versions, the header
+    is used to distinguish for VLM inputs.
+    The returned object ID will be zero if the message is not associated with
+    any VLC object.
+    @param ctx: message context (as passed to the @ref libvlc_log_cb callback).
+    @return: name object name storage (or NULL), header object header (or NULL), line source code file line number storage (or NULL).
+    @version: LibVLC 2.1.0 or later.
+    '''
+    f = _Cfunctions.get('libvlc_log_get_object', None) or \
+        _Cfunction('libvlc_log_get_object', ((1,), (2,), (2,), (1,),), None,
+                    None, Log_ptr, ListPOINTER(ctypes.c_char_p), ListPOINTER(ctypes.c_char_p), ctypes.POINTER(ctypes.c_uint))
+    return f(ctx, id)
+
 def libvlc_log_unset(p_instance):
     '''Unsets the logging callback for a LibVLC instance. This is rarely needed:
     the callback is implicitly unset when the instance is destroyed.
@@ -5827,7 +5863,7 @@ def libvlc_vlm_get_event_manager(p_instance):
 #  libvlc_printerr
 #  libvlc_set_exit_handler
 
-# 15 function(s) not wrapped as methods:
+# 17 function(s) not wrapped as methods:
 #  libvlc_audio_output_device_list_release
 #  libvlc_audio_output_list_release
 #  libvlc_clearerr
@@ -5838,6 +5874,8 @@ def libvlc_vlm_get_event_manager(p_instance):
 #  libvlc_get_changeset
 #  libvlc_get_compiler
 #  libvlc_get_version
+#  libvlc_log_get_context
+#  libvlc_log_get_object
 #  libvlc_media_tracks_release
 #  libvlc_module_description_list_release
 #  libvlc_new
@@ -5910,9 +5948,9 @@ def debug_callback(event, *args, **kwds):
     '''
     l = ['event %s' % (event.type,)]
     if args:
-        l.extend(list(map(str, args)))
+        l.extend(map(str, args))
     if kwds:
-        l.extend(sorted('%s=%s' % t for t in list(kwds.items())))
+        l.extend(sorted('%s=%s' % t for t in kwds.items()))
     print('Debug callback (%s)' % ', '.join(l))
 
 if __name__ == '__main__':

openlp/core/ui/media/vlcplayer.py

@@ -291,4 +291,4 @@ class VlcPlayer(MediaPlayer):
                '<br/> <strong>' + translate('Media.player', 'Audio') +
                '</strong><br/>' + str(AUDIO_EXT) + '<br/><strong>' +
                translate('Media.player', 'Video') + '</strong><br/>' +
-               str(VIDEO_EXT) + '<br/>')
+               str(VIDEO_EXT) + '<br/>')

openlp/core/ui/media/webkitplayer.py

@@ -174,34 +174,11 @@ FLASH_HTML = """
 <div id="flash" class="size" style="visibility:hidden"></div>
 """
 
-VIDEO_EXT = [
-    '*.3gp',
-    '*.3gpp',
-    '*.3g2',
-    '*.3gpp2',
-    '*.aac',
-    '*.flv',
-    '*.f4a',
-    '*.f4b',
-    '*.f4p',
-    '*.f4v',
-    '*.mov',
-    '*.m4a',
-    '*.m4b',
-    '*.m4p',
-    '*.m4v',
-    '*.mkv',
-    '*.mp4',
-    '*.ogv',
-    '*.webm',
-    '*.mpg', '*.wmv', '*.mpeg', '*.avi',
-    '*.swf'
-]
+VIDEO_EXT = ['*.3gp', '*.3gpp', '*.3g2', '*.3gpp2', '*.aac', '*.flv', '*.f4a', '*.f4b', '*.f4p', '*.f4v', '*.mov',
+             '*.m4a', '*.m4b', '*.m4p', '*.m4v', '*.mkv', '*.mp4', '*.ogv', '*.webm', '*.mpg', '*.wmv', '*.mpeg',
+             '*.avi', '*.swf']
 
-AUDIO_EXT = [
-    '*.mp3',
-    '*.ogg'
-]
+AUDIO_EXT = ['*.mp3', '*.ogg']
 
 
 class WebkitPlayer(MediaPlayer):
@@ -411,10 +388,9 @@ class WebkitPlayer(MediaPlayer):
         """
         Return some information about this player
         """
-        return(translate('Media.player', 'Webkit is a media player which runs '
-               'inside a web browser. This player allows text over video to be '
-               'rendered.') +
-               '<br/> <strong>' + translate('Media.player', 'Audio') +
-               '</strong><br/>' + str(AUDIO_EXT) + '<br/><strong>' +
-               translate('Media.player', 'Video') + '</strong><br/>' +
-               str(VIDEO_EXT) + '<br/>')
+        part1 = translate('Media.player', 'Webkit is a media player which runs inside a web browser. This player '
+                                          'allows text over video to be rendered.')
+        part2 = translate('Media.player', 'Audio')
+        part3 = translate('Media.player', 'Video')
+        return part1 + '<br/> <strong>' + part2 + '</strong><br/>' + str(AUDIO_EXT) + '<br/><strong>' + part3 + \
+            '</strong><br/>' + str(VIDEO_EXT) + '<br/>'

openlp/core/ui/pluginform.py

@@ -154,4 +154,4 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog, RegistryProperties):
         elif self.active_plugin.status == PluginStatus.Disabled:
             status_text = translate('OpenLP.PluginForm', '%s (Disabled)')
         self.plugin_list_widget.currentItem().setText(
-            status_text % self.active_plugin.name_strings['singular'])
+            status_text % self.active_plugin.name_strings['singular'])

openlp/core/ui/printserviceform.py

@@ -394,4 +394,4 @@ class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog, RegistryProperties)
             return
         for item in self.service_manager.service_items:
             # Trigger Audit requests
-            Registry().register_function('print_service_started', [item['service_item']])
+            Registry().register_function('print_service_started', [item['service_item']])

openlp/core/ui/servicemanager.py

@@ -234,6 +234,9 @@ class Ui_ServiceManager(object):
         self.menu = QtGui.QMenu()
         self.edit_action = create_widget_action(self.menu, text=translate('OpenLP.ServiceManager', '&Edit Item'),
                                                 icon=':/general/general_edit.png', triggers=self.remote_edit)
+        self.rename_action = create_widget_action(self.menu, text=translate('OpenLP.ServiceManager', '&Rename...'),
+                                                  icon=':/general/general_edit.png',
+                                                  triggers=self.on_service_item_rename)
         self.maintain_action = create_widget_action(self.menu, text=translate('OpenLP.ServiceManager', '&Reorder Item'),
                                                     icon=':/general/general_edit.png',
                                                     triggers=self.on_service_item_edit_form)
@@ -399,7 +402,7 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ServiceManage
         :param suffix_list: New Suffix's to be supported
         """
         for suffix in suffix_list:
-            if not suffix in self.suffixes:
+            if suffix not in self.suffixes:
                 self.suffixes.append(suffix)
 
     def on_new_service_clicked(self, field=None):
@@ -629,7 +632,7 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ServiceManage
         for item in self.service_items:
             self.main_window.increment_progress_bar()
             service_item = item['service_item'].get_service_repr(self._save_lite)
-            #TODO: check for file item on save.
+            # TODO: check for file item on save.
             service.append({'serviceitem': service_item})
             self.main_window.increment_progress_bar()
         service_content = json.dumps(service)
@@ -689,8 +692,8 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ServiceManage
         if self._file_name.endswith('oszl') or self.service_has_all_original_files:
             file_name = QtGui.QFileDialog.getSaveFileName(self.main_window, UiStrings().SaveService, path,
                                                           translate('OpenLP.ServiceManager',
-                                                          'OpenLP Service Files (*.osz);; OpenLP Service Files - lite '
-                                                          '(*.oszl)'))
+                                                                    'OpenLP Service Files (*.osz);; OpenLP Service '
+                                                                    'Files - lite (*.oszl)'))
         else:
             file_name = QtGui.QFileDialog.getSaveFileName(self.main_window, UiStrings().SaveService, path,
                                                           translate('OpenLP.ServiceManager',
@@ -754,8 +757,9 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ServiceManage
                     items = json.load(file_to)
                 else:
                     critical_error_message_box(message=translate('OpenLP.ServiceManager',
-                                               'The service file you are trying to open is in an old format.\n '
-                                               'Please save it using OpenLP 2.0.2 or greater.'))
+                                                                 'The service file you are trying to open is in an old '
+                                                                 'format.\n Please save it using OpenLP 2.0.2 or '
+                                                                 'greater.'))
                     return
                 file_to.close()
                 self.new_file()
@@ -783,7 +787,8 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ServiceManage
                 self.log_exception('Service file is cannot be extracted as zip: %s' % file_name)
                 QtGui.QMessageBox.information(self, translate('OpenLP.ServiceManager', 'Corrupt File'),
                                               translate('OpenLP.ServiceManager',
-                                              'This file is either corrupt or it is not an OpenLP 2 service file.'))
+                                                        'This file is either corrupt or it is not an OpenLP 2 service '
+                                                        'file.'))
             self.application.set_normal_cursor()
             return
         finally:
@@ -847,6 +852,7 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ServiceManage
             pos = item.data(0, QtCore.Qt.UserRole)
         service_item = self.service_items[pos - 1]
         self.edit_action.setVisible(False)
+        self.rename_action.setVisible(False)
         self.create_custom_action.setVisible(False)
         self.maintain_action.setVisible(False)
         self.notes_action.setVisible(False)
@@ -854,6 +860,8 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ServiceManage
         self.auto_start_action.setVisible(False)
         if service_item['service_item'].is_capable(ItemCapabilities.CanEdit) and service_item['service_item'].edit_id:
             self.edit_action.setVisible(True)
+        if service_item['service_item'].is_capable(ItemCapabilities.CanEditTitle):
+            self.rename_action.setVisible(True)
         if service_item['service_item'].is_capable(ItemCapabilities.CanMaintain):
             self.maintain_action.setVisible(True)
         if item.parent() is None:
@@ -1253,8 +1261,7 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ServiceManage
             tree_widget_item.setText(0, service_item_from_item.get_display_title())
             tips = []
             if service_item_from_item.temporary_edit:
-                tips.append('<strong>%s:</strong> <em>%s</em>' %
-                            (translate('OpenLP.ServiceManager', 'Edit'),
+                tips.append('<strong>%s:</strong> <em>%s</em>' % (translate('OpenLP.ServiceManager', 'Edit'),
                             (translate('OpenLP.ServiceManager', 'Service copy only'))))
             if service_item_from_item.theme and service_item_from_item.theme != -1:
                 tips.append('<strong>%s:</strong> <em>%s</em>' %
@@ -1489,6 +1496,24 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ServiceManage
             if new_item:
                 self.add_service_item(new_item, replace=True)
 
+    def on_service_item_rename(self, field=None):
+        """
+        Opens a dialog to rename the service item.
+
+        :param field: Not used, but PyQt needs this.
+        """
+        item = self.find_service_item()[0]
+        if not self.service_items[item]['service_item'].is_capable(ItemCapabilities.CanEditTitle):
+            return
+        title = self.service_items[item]['service_item'].title
+        title, ok = QtGui.QInputDialog.getText(self, translate('OpenLP.ServiceManager', 'Rename item title'),
+                                               translate('OpenLP.ServiceManager', 'Title:'),
+                                               QtGui.QLineEdit.Normal, self.trUtf8(title))
+        if ok:
+            self.service_items[item]['service_item'].title = title
+            self.repaint_service_list(item, -1)
+            self.set_modified()
+
     def create_custom(self, field=None):
         """
         Saves the current text item as a custom slide
@@ -1499,9 +1524,9 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ServiceManage
 
     def find_service_item(self):
         """
-        Finds the first selected ServiceItem in the list and returns the position of the service_item_from_item and its selected
-        child item. For example, if the third child item (in the Slidecontroller known as slide) in the second service
-        item is selected this will return::
+        Finds the first selected ServiceItem in the list and returns the position of the service_item_from_item and its
+        selected child item. For example, if the third child item (in the Slidecontroller known as slide) in the
+        second service item is selected this will return::
 
             (1, 2)
         """
@@ -1639,4 +1664,4 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ServiceManage
         Print a Service Order Sheet.
         """
         setting_dialog = PrintServiceForm()
-        setting_dialog.exec_()
+        setting_dialog.exec_()

openlp/core/ui/servicenoteform.py

@@ -74,4 +74,4 @@ class ServiceNoteForm(QtGui.QDialog, RegistryProperties):
         """
         Translate the UI on the fly
         """
-        self.setWindowTitle(translate('OpenLP.ServiceNoteForm', 'Service Item Notes'))
+        self.setWindowTitle(translate('OpenLP.ServiceNoteForm', 'Service Item Notes'))

openlp/core/ui/settingsform.py

@@ -150,5 +150,5 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog, RegistryProperties):
 
         :param function:  The function to be called
         """
-        if not function in self.processes:
-            self.processes.append(function)
+        if function not in self.processes:
+            self.processes.append(function)

openlp/core/ui/shortcutlistform.py

@@ -285,7 +285,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog, RegistryProperties)
         if QtGui.QMessageBox.question(self, translate('OpenLP.ShortcutListDialog', 'Restore Default Shortcuts'),
                                       translate('OpenLP.ShortcutListDialog', 'Do you want to restore all '
                                                 'shortcuts to their defaults?'),
-                                      QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes | 
+                                      QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes |
                                                                         QtGui.QMessageBox.No)) == QtGui.QMessageBox.No:
             return
         self._adjust_button(self.primary_push_button, False, text='')

openlp/core/ui/slidecontroller.py

@@ -170,14 +170,14 @@ class SlideController(DisplayController, RegistryProperties):
         size_toolbar_policy.setHeightForWidth(self.toolbar.sizePolicy().hasHeightForWidth())
         self.toolbar.setSizePolicy(size_toolbar_policy)
         self.previous_item = create_action(self, 'previousItem_' + self.type_prefix,
-                                           text=translate('OpenLP.SlideController', 'Previous Slide'), 
+                                           text=translate('OpenLP.SlideController', 'Previous Slide'),
                                            icon=':/slides/slide_previous.png',
                                            tooltip=translate('OpenLP.SlideController', 'Move to previous.'),
                                            can_shortcuts=True, context=QtCore.Qt.WidgetWithChildrenShortcut,
                                            category=self.category, triggers=self.on_slide_selected_previous)
         self.toolbar.addAction(self.previous_item)
         self.next_item = create_action(self, 'nextItem_' + self.type_prefix,
-                                       text=translate('OpenLP.SlideController', 'Next Slide'), 
+                                       text=translate('OpenLP.SlideController', 'Next Slide'),
                                        icon=':/slides/slide_next.png',
                                        tooltip=translate('OpenLP.SlideController', 'Move to next.'),
                                        can_shortcuts=True, context=QtCore.Qt.WidgetWithChildrenShortcut,
@@ -195,17 +195,17 @@ class SlideController(DisplayController, RegistryProperties):
             self.hide_menu.setMenu(QtGui.QMenu(translate('OpenLP.SlideController', 'Hide'), self.toolbar))
             self.toolbar.add_toolbar_widget(self.hide_menu)
             self.blank_screen = create_action(self, 'blankScreen',
-                                              text=translate('OpenLP.SlideController', 'Blank Screen'), 
+                                              text=translate('OpenLP.SlideController', 'Blank Screen'),
                                               icon=':/slides/slide_blank.png',
-                                              checked=False, can_shortcuts=True, category=self.category, 
+                                              checked=False, can_shortcuts=True, category=self.category,
                                               triggers=self.on_blank_display)
             self.theme_screen = create_action(self, 'themeScreen',
-                                              text=translate('OpenLP.SlideController', 'Blank to Theme'), 
+                                              text=translate('OpenLP.SlideController', 'Blank to Theme'),
                                               icon=':/slides/slide_theme.png',
                                               checked=False, can_shortcuts=True, category=self.category,
                                               triggers=self.on_theme_display)
             self.desktop_screen = create_action(self, 'desktopScreen',
-                                                text=translate('OpenLP.SlideController', 'Show Desktop'), 
+                                                text=translate('OpenLP.SlideController', 'Show Desktop'),
                                                 icon=':/slides/slide_desktop.png',
                                                 checked=False, can_shortcuts=True, category=self.category,
                                                 triggers=self.on_hide_display)
@@ -255,15 +255,16 @@ class SlideController(DisplayController, RegistryProperties):
             self.toolbar.add_toolbar_widget(self.delay_spin_box)
         else:
             self.toolbar.add_toolbar_action('goLive', icon=':/general/general_live.png',
-                                            tooltip=translate('OpenLP.SlideController', 'Move to live.'), 
+                                            tooltip=translate('OpenLP.SlideController', 'Move to live.'),
                                             triggers=self.on_go_live)
             self.toolbar.add_toolbar_action('addToService', icon=':/general/general_add.png',
-                                            tooltip=translate('OpenLP.SlideController', 'Add to Service.'), 
+                                            tooltip=translate('OpenLP.SlideController', 'Add to Service.'),
                                             triggers=self.on_preview_add_to_service)
             self.toolbar.addSeparator()
             self.toolbar.add_toolbar_action('editSong', icon=':/general/general_edit.png',
-                                            tooltip=translate('OpenLP.SlideController', 'Edit and reload song preview.')
-                                            , triggers=self.on_edit_song)
+                                            tooltip=translate('OpenLP.SlideController',
+                                                              'Edit and reload song preview.'),
+                                            triggers=self.on_edit_song)
         self.controller_layout.addWidget(self.toolbar)
         # Build the Media Toolbar
         self.media_controller.register_controller(self)
@@ -355,7 +356,7 @@ class SlideController(DisplayController, RegistryProperties):
                 {'key': 'O', 'configurable': True, 'text': translate('OpenLP.SlideController', 'Go to "Other"')}
             ]
             shortcuts.extend([{'key': str(number)} for number in range(10)])
-            self.controller.addActions([create_action(self, 'shortcutAction_%s' % s['key'], 
+            self.controller.addActions([create_action(self, 'shortcutAction_%s' % s['key'],
                                                       text=s.get('text'),
                                                       can_shortcuts=True,
                                                       context=QtCore.Qt.WidgetWithChildrenShortcut,
@@ -394,9 +395,9 @@ class SlideController(DisplayController, RegistryProperties):
         """
         Called, when a shortcut has been activated to jump to a chorus, verse, etc.
 
-        **Note**: This implementation is based on shortcuts. But it rather works like "key sequenes". You have to 
+        **Note**: This implementation is based on shortcuts. But it rather works like "key sequenes". You have to
         press one key after the other and **not** at the same time.
-        For example to jump to "V3" you have to press "V" and afterwards but within a time frame of 350ms 
+        For example to jump to "V3" you have to press "V" and afterwards but within a time frame of 350ms
         you have to press "3".
         """
         try:
@@ -456,21 +457,21 @@ class SlideController(DisplayController, RegistryProperties):
         """
         self.previous_service = create_action(parent, 'previousService',
                                               text=translate('OpenLP.SlideController', 'Previous Service'),
-                                              can_shortcuts=True, context=QtCore.Qt.WidgetWithChildrenShortcut, 
+                                              can_shortcuts=True, context=QtCore.Qt.WidgetWithChildrenShortcut,
                                               category=self.category,
                                               triggers=self.service_previous)
         self.next_service = create_action(parent, 'nextService',
                                           text=translate('OpenLP.SlideController', 'Next Service'),
-                                          can_shortcuts=True, context=QtCore.Qt.WidgetWithChildrenShortcut, 
+                                          can_shortcuts=True, context=QtCore.Qt.WidgetWithChildrenShortcut,
                                           category=self.category,
                                           triggers=self.service_next)
         self.escape_item = create_action(parent, 'escapeItem',
                                          text=translate('OpenLP.SlideController', 'Escape Item'),
-                                         can_shortcuts=True, context=QtCore.Qt.WidgetWithChildrenShortcut, 
+                                         can_shortcuts=True, context=QtCore.Qt.WidgetWithChildrenShortcut,
                                          category=self.category,
                                          triggers=self.live_escape)
 
-    def live_escape(self):
+    def live_escape(self, field=None):
         """
         If you press ESC on the live screen it should close the display temporarily.
         """
@@ -494,14 +495,14 @@ class SlideController(DisplayController, RegistryProperties):
             self.on_theme_display(False)
             self.on_hide_display(False)
 
-    def service_previous(self):
+    def service_previous(self, field=None):
         """
         Live event to select the previous service item from the service manager.
         """
         self.keypress_queue.append(ServiceItemAction.Previous)
         self._process_queue()
 
-    def service_next(self):
+    def service_next(self, field=None):
         """
         Live event to select the next service item from the service manager.
         """
@@ -1249,7 +1250,7 @@ class SlideController(DisplayController, RegistryProperties):
         if self.service_item:
             self.service_manager.add_service_item(self.service_item)
 
-    def on_go_live_click(self):
+    def on_go_live_click(self, field=None):
         """
         triggered by clicking the Preview slide items
         """
@@ -1262,7 +1263,7 @@ class SlideController(DisplayController, RegistryProperties):
                 self.on_media_close()
             self.on_go_live()
 
-    def on_go_live(self):
+    def on_go_live(self, field=None):
         """
         If preview copy slide item to live controller from Preview Controller
         """
@@ -1332,7 +1333,7 @@ class SlideController(DisplayController, RegistryProperties):
         """
         Update how much time is remaining
 
-        :param time: the time remainings
+        :param time: the time remaining
         """
         seconds = self.display.audio_player.media_object.remainingTime() // 1000
         minutes = seconds // 60

openlp/core/ui/starttimeform.py

@@ -74,12 +74,12 @@ class StartTimeForm(QtGui.QDialog, Ui_StartTimeDialog, RegistryProperties):
             self.minute_finish_spin_box.value() * 60 + self.second_finish_spin_box.value()
         if end > self.item['service_item'].media_length:
             critical_error_message_box(title=translate('OpenLP.StartTime_form', 'Time Validation Error'),
-                                       message=translate('OpenLP.StartTime_form', 
+                                       message=translate('OpenLP.StartTime_form',
                                                          'Finish time is set after the end of the media item'))
             return
         elif start > end:
             critical_error_message_box(title=translate('OpenLP.StartTime_form', 'Time Validation Error'),
-                                       message=translate('OpenLP.StartTime_form', 
+                                       message=translate('OpenLP.StartTime_form',
                                                          'Start time is after the finish time of the media item'))
             return
         self.item['service_item'].start_time = start
@@ -94,4 +94,4 @@ class StartTimeForm(QtGui.QDialog, Ui_StartTimeDialog, RegistryProperties):
         seconds -= 3600 * hours
         minutes = seconds // 60
         seconds -= 60 * minutes
-        return hours, minutes, seconds
+        return hours, minutes, seconds

openlp/core/ui/themeform.py

@@ -180,7 +180,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard, RegistryProperties):
                 self.theme.background_type == background_image and is_not_image_file(self.theme.background_filename):
             QtGui.QMessageBox.critical(self, translate('OpenLP.ThemeWizard', 'Background Image Empty'),
                                        translate('OpenLP.ThemeWizard', '_you have not selected a '
-                                       'background image. Please select one before continuing.'))
+                                                 'background image. Please select one before continuing.'))
             return False
         else:
             return True
@@ -432,7 +432,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard, RegistryProperties):
         Background Image button pushed.
         """
         images_filter = get_images_filter()
-        images_filter = '%s;;%s (*.*) (*)' % (images_filter, UiStrings().AllFiles)
+        images_filter = '%s;;%s (*.*)' % (images_filter, UiStrings().AllFiles)
         filename = QtGui.QFileDialog.getOpenFileName(self, translate('OpenLP.ThemeWizard', 'Select Image'), '',
                                                      images_filter)
         if filename:
@@ -540,4 +540,4 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard, RegistryProperties):
         new_color = QtGui.QColorDialog.getColor(QtGui.QColor(field), self)
         if new_color.isValid():
             field = new_color.name()
-        return field
+        return field

openlp/core/ui/themelayoutdialog.py

@@ -44,7 +44,6 @@ class Ui_ThemeLayoutDialog(object):
         Set up the UI
         """
         themeLayoutDialog.setObjectName('themeLayoutDialogDialog')
-        #themeLayoutDialog.resize(300, 200)
         self.preview_layout = QtGui.QVBoxLayout(themeLayoutDialog)
         self.preview_layout.setObjectName('preview_layout')
         self.preview_area = QtGui.QWidget(themeLayoutDialog)

openlp/core/ui/thememanager.py

@@ -517,7 +517,7 @@ class ThemeManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ThemeManager, R
         """
         ret = QtGui.QMessageBox.question(self, translate('OpenLP.ThemeManager', 'Theme Already Exists'),
                                          translate('OpenLP.ThemeManager',
-                                         'Theme %s already exists. Do you want to replace it?')
+                                                   'Theme %s already exists. Do you want to replace it?')
                                          .replace('%s', theme_name),
                                          QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes |
                                                                            QtGui.QMessageBox.No),
@@ -753,4 +753,4 @@ class ThemeManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ThemeManager, R
                                                    % (theme, plugin.name))
                         return False
             return True
-        return False
+        return False

openlp/core/ui/themestab.py

@@ -114,17 +114,19 @@ class ThemesTab(SettingsTab):
         self.global_group_box.setTitle(translate('OpenLP.ThemesTab', 'Global Theme'))
         self.level_group_box.setTitle(translate('OpenLP.ThemesTab', 'Theme Level'))
         self.song_level_radio_button.setText(translate('OpenLP.ThemesTab', 'S&ong Level'))
-        self.song_level_label.setText(translate('OpenLP.ThemesTab', 'Use the theme from each song '
-                                      'in the database. If a song doesn\'t have a theme associated with '
-                                      'it, then use the service\'s theme. If the service doesn\'t have '
-                                      'a theme, then use the global theme.'))
+        self.song_level_label.setText(
+            translate('OpenLP.ThemesTab', 'Use the theme from each song in the database. If a song doesn\'t have a '
+                                          'theme associated with it, then use the service\'s theme. If the service '
+                                          'doesn\'t have a theme, then use the global theme.'))
         self.service_level_radio_button.setText(translate('OpenLP.ThemesTab', '&Service Level'))
-        self.service_level_label.setText(translate('OpenLP.ThemesTab', 'Use the theme from the service, '
-                                         'overriding any of the individual songs\' themes. If the '
-                                         'service doesn\'t have a theme, then use the global theme.'))
+        self.service_level_label.setText(
+            translate('OpenLP.ThemesTab', 'Use the theme from the service, overriding any of the individual '
+                                          'songs\' themes. If the service doesn\'t have a theme, then use the global '
+                                          'theme.'))
         self.global_level_radio_button.setText(translate('OpenLP.ThemesTab', '&Global Level'))
-        self.global_level_label.setText(translate('OpenLP.ThemesTab', 'Use the global theme, overriding '
-                                        'any themes associated with either the service or the songs.'))
+        self.global_level_label.setText(translate('OpenLP.ThemesTab', 'Use the global theme, overriding any themes '
+                                                                      'associated with either the service or the '
+                                                                      'songs.'))
 
     def load(self):
         """

openlp/core/ui/themewizard.py

@@ -385,10 +385,10 @@ class Ui_ThemeWizard(object):
                                QtCore.SLOT('setDisabled(bool)'))
         QtCore.QObject.connect(self.footer_position_check_box, QtCore.SIGNAL('toggled(bool)'), self.footer_y_spin_box,
                                QtCore.SLOT('setDisabled(bool)'))
-        QtCore.QObject.connect(self.footer_position_check_box, QtCore.SIGNAL('toggled(bool)'), self.footer_width_spin_box,
-                               QtCore.SLOT('setDisabled(bool)'))
-        QtCore.QObject.connect(self.footer_position_check_box, QtCore.SIGNAL('toggled(bool)'), self.footer_height_spin_box,
-                               QtCore.SLOT('setDisabled(bool)'))
+        QtCore.QObject.connect(self.footer_position_check_box, QtCore.SIGNAL('toggled(bool)'),
+                               self.footer_width_spin_box, QtCore.SLOT('setDisabled(bool)'))
+        QtCore.QObject.connect(self.footer_position_check_box, QtCore.SIGNAL('toggled(bool)'),
+                               self.footer_height_spin_box, QtCore.SLOT('setDisabled(bool)'))
 
     def retranslateUi(self, themeWizard):
         """
@@ -409,15 +409,18 @@ class Ui_ThemeWizard(object):
         self.background_combo_box.setItemText(BackgroundType.Gradient,
                                               translate('OpenLP.ThemeWizard', 'Gradient'))
         self.background_combo_box.setItemText(BackgroundType.Image, UiStrings().Image)
-        self.background_combo_box.setItemText(BackgroundType.Transparent, translate('OpenLP.ThemeWizard', 'Transparent'))
+        self.background_combo_box.setItemText(BackgroundType.Transparent,
+                                              translate('OpenLP.ThemeWizard', 'Transparent'))
         self.color_label.setText(translate('OpenLP.ThemeWizard', 'color:'))
         self.gradient_start_label.setText(translate('OpenLP.ThemeWizard', 'Starting color:'))
         self.gradient_end_label.setText(translate('OpenLP.ThemeWizard', 'Ending color:'))
         self.gradient_type_label.setText(translate('OpenLP.ThemeWizard', 'Gradient:'))
         self.gradient_combo_box.setItemText(BackgroundGradientType.Horizontal,
                                             translate('OpenLP.ThemeWizard', 'Horizontal'))
-        self.gradient_combo_box.setItemText(BackgroundGradientType.Vertical, translate('OpenLP.ThemeWizard', 'Vertical'))
-        self.gradient_combo_box.setItemText(BackgroundGradientType.Circular, translate('OpenLP.ThemeWizard', 'Circular'))
+        self.gradient_combo_box.setItemText(BackgroundGradientType.Vertical,
+                                            translate('OpenLP.ThemeWizard', 'Vertical'))
+        self.gradient_combo_box.setItemText(BackgroundGradientType.Circular,
+                                            translate('OpenLP.ThemeWizard', 'Circular'))
         self.gradient_combo_box.setItemText(BackgroundGradientType.LeftTop,
                                             translate('OpenLP.ThemeWizard', 'Top Left - Bottom Right'))
         self.gradient_combo_box.setItemText(BackgroundGradientType.LeftBottom,
@@ -486,6 +489,6 @@ class Ui_ThemeWizard(object):
         self.preview_page.setSubTitle(translate('OpenLP.ThemeWizard', 'Preview the theme and save it.'))
         self.theme_name_label.setText(translate('OpenLP.ThemeWizard', 'Theme name:'))
         # Align all QFormLayouts towards each other.
-        label_width = max(self.background_label.minimumSizeHint().width(), 
+        label_width = max(self.background_label.minimumSizeHint().width(),
                           self.horizontal_label.minimumSizeHint().width())
         self.spacer.changeSize(label_width, 0, QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)

openlp/core/ui/wizard.py

@@ -303,4 +303,4 @@ class OpenLPWizard(QtGui.QWizard, RegistryProperties):
             QtGui.QFileDialog.ShowDirsOnly)
         if folder:
             editbox.setText(folder)
-        Settings().setValue(self.plugin.settings_section + '/' + setting_name, folder)
+        Settings().setValue(self.plugin.settings_section + '/' + setting_name, folder)

openlp/core/utils/__init__.py

@@ -56,7 +56,7 @@ if sys.platform != 'win32' and sys.platform != 'darwin':
 
 from openlp.core.common import translate
 
-log = logging.getLogger(__name__+'.__init__')
+log = logging.getLogger(__name__ + '.__init__')
 
 APPLICATION_VERSION = {}
 IMAGES_FILTER = None
@@ -72,13 +72,18 @@ USER_AGENTS = {
         'Mozilla/5.0 (Windows NT 6.2; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.71 Safari/537.36'
     ],
     'darwin': [
-        'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.43 Safari/537.31',
-        'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/536.11 (KHTML, like Gecko) Chrome/20.0.1132.57 Safari/536.11',
-        'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/536.11 (KHTML, like Gecko) Chrome/20.0.1132.47 Safari/536.11',
+        'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) '
+        'Chrome/26.0.1410.43 Safari/537.31',
+        'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/536.11 (KHTML, like Gecko) '
+        'Chrome/20.0.1132.57 Safari/536.11',
+        'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/536.11 (KHTML, like Gecko) '
+        'Chrome/20.0.1132.47 Safari/536.11',
     ],
     'linux2': [
-        'Mozilla/5.0 (X11; Linux i686) AppleWebKit/537.22 (KHTML, like Gecko) Ubuntu Chromium/25.0.1364.160 Chrome/25.0.1364.160 Safari/537.22',
-        'Mozilla/5.0 (X11; CrOS armv7l 2913.260.0) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.99 Safari/537.11',
+        'Mozilla/5.0 (X11; Linux i686) AppleWebKit/537.22 (KHTML, like Gecko) Ubuntu Chromium/25.0.1364.160 '
+        'Chrome/25.0.1364.160 Safari/537.22',
+        'Mozilla/5.0 (X11; CrOS armv7l 2913.260.0) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.99 '
+        'Safari/537.11',
         'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.27 (KHTML, like Gecko) Chrome/26.0.1389.0 Safari/537.27'
     ],
     'default': [
@@ -144,9 +149,9 @@ def get_application_version():
         # If they are equal, then this tree is tarball with the source for the release. We do not want the revision
         # number in the full version.
         if tree_revision == tag_revision:
-            full_version =  tag_version
+            full_version = tag_version
         else:
-            full_version =  '%s-bzr%s' % (tag_version, tree_revision)
+            full_version = '%s-bzr%s' % (tag_version, tree_revision)
     else:
         # We're not running the development version, let's use the file.
         filepath = AppLocation.get_directory(AppLocation.VersionDir)

openlp/core/utils/actions.py

@@ -295,7 +295,7 @@ class ActionList(object):
                 ActionList.shortcut_map[shortcuts[1]] = actions
             else:
                 log.warn('Shortcut "%s" is removed from "%s" because another action already uses this shortcut.' %
-                    (shortcuts[1], action.objectName()))
+                         (shortcuts[1], action.objectName()))
                 shortcuts.remove(shortcuts[1])
         # Check the primary shortcut.
         existing_actions = ActionList.shortcut_map.get(shortcuts[0], [])
@@ -306,7 +306,7 @@ class ActionList(object):
             ActionList.shortcut_map[shortcuts[0]] = actions
         else:
             log.warn('Shortcut "%s" is removed from "%s" because another action already uses this shortcut.' %
-                (shortcuts[0], action.objectName()))
+                     (shortcuts[0], action.objectName()))
             shortcuts.remove(shortcuts[0])
         action.setShortcuts([QtGui.QKeySequence(shortcut) for shortcut in shortcuts])
 

openlp/core/utils/languagemanager.py

@@ -74,7 +74,7 @@ class LanguageManager(object):
         log.debug('Translation files: %s', AppLocation.get_directory(
             AppLocation.LanguageDir))
         trans_dir = QtCore.QDir(AppLocation.get_directory(AppLocation.LanguageDir))
-        file_names = trans_dir.entryList('*.qm', QtCore.QDir.Files, QtCore.QDir.Name)
+        file_names = trans_dir.entryList(['*.qm'], QtCore.QDir.Files, QtCore.QDir.Name)
         # Remove qm files from the list which start with "qt_".
         file_names = [file_ for file_ in file_names if not file_.startswith('qt_')]
         return list(map(trans_dir.filePath, file_names))
@@ -126,8 +126,9 @@ class LanguageManager(object):
         log.info('Language file: \'%s\' written to conf file' % language)
         if message:
             QtGui.QMessageBox.information(None,
-                translate('OpenLP.LanguageManager', 'Language'),
-                translate('OpenLP.LanguageManager', 'Please restart OpenLP to use your new language setting.'))
+                                          translate('OpenLP.LanguageManager', 'Language'),
+                                          translate('OpenLP.LanguageManager', 'Please restart OpenLP to use your new '
+                                                                              'language setting.'))
 
     @staticmethod
     def init_qm_list():

openlp/plugins/alerts/alertsplugin.py

@@ -207,12 +207,12 @@ class AlertsPlugin(Plugin):
         """
         Called to define all translatable texts of the plugin
         """
-        ## Name PluginList ##
+        # Name PluginList
         self.text_strings[StringContent.Name] = {
             'singular': translate('AlertsPlugin', 'Alert', 'name singular'),
             'plural': translate('AlertsPlugin', 'Alerts', 'name plural')
         }
-        ## Name for MediaDockManager, SettingsManager ##
+        # Name for MediaDockManager, SettingsManager
         self.text_strings[StringContent.VisibleName] = {
             'title': translate('AlertsPlugin', 'Alerts', 'container title')
         }
@@ -246,4 +246,4 @@ class AlertsPlugin(Plugin):
         align = VerticalType.Names[self.settings_tab.location]
         frame.evaluateJavaScript('update_css("%s", "%s", "%s", "%s", "%s")' %
                                  (align, self.settings_tab.font_face, self.settings_tab.font_size,
-                                 self.settings_tab.font_color, self.settings_tab.background_color))
+                                  self.settings_tab.font_color, self.settings_tab.background_color))

openlp/plugins/alerts/forms/alertform.py

@@ -46,7 +46,7 @@ class AlertForm(QtGui.QDialog, Ui_AlertDialog):
         self.manager = plugin.manager
         self.plugin = plugin
         self.item_id = None
-        super(AlertForm, self).__init__( Registry().get('main_window'))
+        super(AlertForm, self).__init__(Registry().get('main_window'))
         self.setupUi(self)
         self.display_button.clicked.connect(self.on_display_clicked)
         self.display_close_button.clicked.connect(self.on_display_close_clicked)

openlp/plugins/alerts/lib/alertsmanager.py

@@ -97,4 +97,4 @@ class AlertsManager(OpenLPMixin, RegistryMixin, QtCore.QObject, RegistryProperti
             self.live_controller.display.alert('', alert_tab.location)
         self.killTimer(self.timer_id)
         self.timer_id = 0
-        self.generate_alert()
+        self.generate_alert()

openlp/plugins/bibles/bibleplugin.py

@@ -88,8 +88,6 @@ class BiblePlugin(Plugin):
         self.import_bible_item.setVisible(True)
         action_list = ActionList.get_instance()
         action_list.add_action(self.import_bible_item, UiStrings().Import)
-        # Do not add the action to the list yet.
-        #action_list.add_action(self.export_bible_item, UiStrings().Export)
         # Set to invisible until we can export bibles
         self.export_bible_item.setVisible(False)
         self.tools_upgrade_item.setVisible(bool(self.manager.old_bible_databases))
@@ -104,7 +102,6 @@ class BiblePlugin(Plugin):
         action_list = ActionList.get_instance()
         action_list.remove_action(self.import_bible_item, UiStrings().Import)
         self.import_bible_item.setVisible(False)
-        #action_list.remove_action(self.export_bible_item, UiStrings().Export)
         self.export_bible_item.setVisible(False)
 
     def app_startup(self):
@@ -113,21 +110,29 @@ class BiblePlugin(Plugin):
         """
         super(BiblePlugin, self).app_startup()
         if self.manager.old_bible_databases:
-            if QtGui.QMessageBox.information(self.main_window,
-                translate('OpenLP', 'Information'),
-                translate('OpenLP', 'Bible format has changed.\nYou have to upgrade your existing Bibles.\n'
-                          'Should OpenLP upgrade now?'),
-                QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes | QtGui.QMessageBox.No)) == \
+            if QtGui.QMessageBox.information(
+                    self.main_window, translate('OpenLP', 'Information'),
+                    translate('OpenLP', 'Bible format has changed.\nYou have to upgrade your '
+                                        'existing Bibles.\nShould OpenLP upgrade now?'),
+                    QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes | QtGui.QMessageBox.No)) == \
                     QtGui.QMessageBox.Yes:
                 self.on_tools_upgrade_Item_triggered()
 
     def add_import_menu_item(self, import_menu):
+        """
+
+        :param import_menu:
+        """
         self.import_bible_item = create_action(import_menu, 'importBibleItem',
                                                text=translate('BiblesPlugin', '&Bible'), visible=False,
                                                triggers=self.on_bible_import_click)
         import_menu.addAction(self.import_bible_item)
 
-    def add_export_menu_Item(self, export_menu):
+    def add_export_menu_item(self, export_menu):
+        """
+
+        :param export_menu:
+        """
         self.export_bible_item = create_action(export_menu, 'exportBibleItem',
                                                text=translate('BiblesPlugin', '&Bible'), visible=False)
         export_menu.addAction(self.export_bible_item)
@@ -190,12 +195,12 @@ class BiblePlugin(Plugin):
         """
         Called to define all translatable texts of the plugin
         """
-        ## Name PluginList ##
+        # Name PluginList
         self.text_strings[StringContent.Name] = {
             'singular': translate('BiblesPlugin', 'Bible', 'name singular'),
             'plural': translate('BiblesPlugin', 'Bibles', 'name plural')
         }
-        ## Name for MediaDockManager, SettingsManager ##
+        # Name for MediaDockManager, SettingsManager
         self.text_strings[StringContent.VisibleName] = {
             'title': translate('BiblesPlugin', 'Bibles', 'container title')
         }

openlp/plugins/bibles/forms/bibleimportform.py

@@ -44,6 +44,7 @@ from openlp.plugins.bibles.lib.db import BiblesResourcesDB, clean_filename
 
 log = logging.getLogger(__name__)
 
+
 class WebDownload(object):
     """
     Provides an enumeration for the web bible types available to OpenLP.
@@ -81,258 +82,257 @@ class BibleImportForm(OpenLPWizard):
         Set up the UI for the bible wizard.
         """
         super(BibleImportForm, self).setupUi(image)
-        self.formatComboBox.currentIndexChanged.connect(self.onCurrentIndexChanged)
+        self.format_combo_box.currentIndexChanged.connect(self.on_current_index_changed)
 
-    def onCurrentIndexChanged(self, index):
+    def on_current_index_changed(self, index):
         """
         Called when the format combo box's index changed. We have to check if
         the import is available and accordingly to disable or enable the next
         button.
         """
-        self.selectStack.setCurrentIndex(index)
+        self.select_stack.setCurrentIndex(index)
 
     def custom_init(self):
         """
         Perform any custom initialisation for bible importing.
         """
         self.manager.set_process_dialog(self)
-        self.loadWebBibles()
+        self.load_Web_Bibles()
         self.restart()
-        self.selectStack.setCurrentIndex(0)
+        self.select_stack.setCurrentIndex(0)
 
     def custom_signals(self):
         """
         Set up the signals used in the bible importer.
         """
-        self.webSourceComboBox.currentIndexChanged.connect(self.onWebSourceComboBoxIndexChanged)
-        self.osisBrowseButton.clicked.connect(self.onOsisBrowseButtonClicked)
-        self.csvBooksButton.clicked.connect(self.onCsvBooksBrowseButtonClicked)
-        self.csvVersesButton.clicked.connect(self.onCsvVersesBrowseButtonClicked)
-        self.openSongBrowseButton.clicked.connect(self.onOpenSongBrowseButtonClicked)
+        self.web_source_combo_box.currentIndexChanged.connect(self.on_web_source_combo_box_index_changed)
+        self.osis_browse_button.clicked.connect(self.on_osis_browse_button_clicked)
+        self.csv_books_button.clicked.connect(self.on_csv_books_browse_button_clicked)
+        self.csv_verses_button.clicked.connect(self.on_csv_verses_browse_button_clicked)
+        self.open_song_browse_button.clicked.connect(self.on_open_song_browse_button_clicked)
 
     def add_custom_pages(self):
         """
         Add the bible import specific wizard pages.
         """
         # Select Page
-        self.selectPage = QtGui.QWizardPage()
-        self.selectPage.setObjectName('SelectPage')
-        self.selectPageLayout = QtGui.QVBoxLayout(self.selectPage)
-        self.selectPageLayout.setObjectName('SelectPageLayout')
-        self.formatLayout = QtGui.QFormLayout()
-        self.formatLayout.setObjectName('FormatLayout')
-        self.formatLabel = QtGui.QLabel(self.selectPage)
-        self.formatLabel.setObjectName('FormatLabel')
-        self.formatComboBox = QtGui.QComboBox(self.selectPage)
-        self.formatComboBox.addItems(['', '', '', ''])
-        self.formatComboBox.setObjectName('FormatComboBox')
-        self.formatLayout.addRow(self.formatLabel, self.formatComboBox)
+        self.select_page = QtGui.QWizardPage()
+        self.select_page.setObjectName('SelectPage')
+        self.select_page_layout = QtGui.QVBoxLayout(self.select_page)
+        self.select_page_layout.setObjectName('SelectPageLayout')
+        self.format_layout = QtGui.QFormLayout()
+        self.format_layout.setObjectName('FormatLayout')
+        self.format_label = QtGui.QLabel(self.select_page)
+        self.format_label.setObjectName('FormatLabel')
+        self.format_combo_box = QtGui.QComboBox(self.select_page)
+        self.format_combo_box.addItems(['', '', '', ''])
+        self.format_combo_box.setObjectName('FormatComboBox')
+        self.format_layout.addRow(self.format_label, self.format_combo_box)
         self.spacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum)
-        self.formatLayout.setItem(1, QtGui.QFormLayout.LabelRole, self.spacer)
-        self.selectPageLayout.addLayout(self.formatLayout)
-        self.selectStack = QtGui.QStackedLayout()
-        self.selectStack.setObjectName('SelectStack')
-        self.osisWidget = QtGui.QWidget(self.selectPage)
-        self.osisWidget.setObjectName('OsisWidget')
-        self.osisLayout = QtGui.QFormLayout(self.osisWidget)
-        self.osisLayout.setMargin(0)
-        self.osisLayout.setObjectName('OsisLayout')
-        self.osisFileLabel = QtGui.QLabel(self.osisWidget)
-        self.osisFileLabel.setObjectName('OsisFileLabel')
-        self.osisFileLayout = QtGui.QHBoxLayout()
-        self.osisFileLayout.setObjectName('OsisFileLayout')
-        self.osisFileEdit = QtGui.QLineEdit(self.osisWidget)
-        self.osisFileEdit.setObjectName('OsisFileEdit')
-        self.osisFileLayout.addWidget(self.osisFileEdit)
-        self.osisBrowseButton = QtGui.QToolButton(self.osisWidget)
-        self.osisBrowseButton.setIcon(self.open_icon)
-        self.osisBrowseButton.setObjectName('OsisBrowseButton')
-        self.osisFileLayout.addWidget(self.osisBrowseButton)
-        self.osisLayout.addRow(self.osisFileLabel, self.osisFileLayout)
-        self.osisLayout.setItem(1, QtGui.QFormLayout.LabelRole, self.spacer)
-        self.selectStack.addWidget(self.osisWidget)
-        self.csvWidget = QtGui.QWidget(self.selectPage)
-        self.csvWidget.setObjectName('CsvWidget')
-        self.csvLayout = QtGui.QFormLayout(self.csvWidget)
-        self.csvLayout.setMargin(0)
-        self.csvLayout.setObjectName('CsvLayout')
-        self.csvBooksLabel = QtGui.QLabel(self.csvWidget)
-        self.csvBooksLabel.setObjectName('CsvBooksLabel')
-        self.csvBooksLayout = QtGui.QHBoxLayout()
-        self.csvBooksLayout.setObjectName('CsvBooksLayout')
-        self.csvBooksEdit = QtGui.QLineEdit(self.csvWidget)
-        self.csvBooksEdit.setObjectName('CsvBooksEdit')
-        self.csvBooksLayout.addWidget(self.csvBooksEdit)
-        self.csvBooksButton = QtGui.QToolButton(self.csvWidget)
-        self.csvBooksButton.setIcon(self.open_icon)
-        self.csvBooksButton.setObjectName('CsvBooksButton')
-        self.csvBooksLayout.addWidget(self.csvBooksButton)
-        self.csvLayout.addRow(self.csvBooksLabel, self.csvBooksLayout)
-        self.csvVersesLabel = QtGui.QLabel(self.csvWidget)
-        self.csvVersesLabel.setObjectName('CsvVersesLabel')
-        self.csvVersesLayout = QtGui.QHBoxLayout()
-        self.csvVersesLayout.setObjectName('CsvVersesLayout')
-        self.csvVersesEdit = QtGui.QLineEdit(self.csvWidget)
-        self.csvVersesEdit.setObjectName('CsvVersesEdit')
-        self.csvVersesLayout.addWidget(self.csvVersesEdit)
-        self.csvVersesButton = QtGui.QToolButton(self.csvWidget)
-        self.csvVersesButton.setIcon(self.open_icon)
-        self.csvVersesButton.setObjectName('CsvVersesButton')
-        self.csvVersesLayout.addWidget(self.csvVersesButton)
-        self.csvLayout.addRow(self.csvVersesLabel, self.csvVersesLayout)
-        self.csvLayout.setItem(3, QtGui.QFormLayout.LabelRole, self.spacer)
-        self.selectStack.addWidget(self.csvWidget)
-        self.openSongWidget = QtGui.QWidget(self.selectPage)
-        self.openSongWidget.setObjectName('OpenSongWidget')
-        self.openSongLayout = QtGui.QFormLayout(self.openSongWidget)
-        self.openSongLayout.setMargin(0)
-        self.openSongLayout.setObjectName('OpenSongLayout')
-        self.openSongFileLabel = QtGui.QLabel(self.openSongWidget)
-        self.openSongFileLabel.setObjectName('OpenSongFileLabel')
-        self.openSongFileLayout = QtGui.QHBoxLayout()
-        self.openSongFileLayout.setObjectName('OpenSongFileLayout')
-        self.openSongFileEdit = QtGui.QLineEdit(self.openSongWidget)
-        self.openSongFileEdit.setObjectName('OpenSongFileEdit')
-        self.openSongFileLayout.addWidget(self.openSongFileEdit)
-        self.openSongBrowseButton = QtGui.QToolButton(self.openSongWidget)
-        self.openSongBrowseButton.setIcon(self.open_icon)
-        self.openSongBrowseButton.setObjectName('OpenSongBrowseButton')
-        self.openSongFileLayout.addWidget(self.openSongBrowseButton)
-        self.openSongLayout.addRow(self.openSongFileLabel, self.openSongFileLayout)
-        self.openSongLayout.setItem(1, QtGui.QFormLayout.LabelRole, self.spacer)
-        self.selectStack.addWidget(self.openSongWidget)
-        self.webTabWidget = QtGui.QTabWidget(self.selectPage)
-        self.webTabWidget.setObjectName('WebTabWidget')
-        self.webBibleTab = QtGui.QWidget()
-        self.webBibleTab.setObjectName('WebBibleTab')
-        self.webBibleLayout = QtGui.QFormLayout(self.webBibleTab)
-        self.webBibleLayout.setObjectName('WebBibleLayout')
-        self.webSourceLabel = QtGui.QLabel(self.webBibleTab)
-        self.webSourceLabel.setObjectName('WebSourceLabel')
-        self.webBibleLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.webSourceLabel)
-        self.webSourceComboBox = QtGui.QComboBox(self.webBibleTab)
-        self.webSourceComboBox.setObjectName('WebSourceComboBox')
-        self.webSourceComboBox.addItems(['', '', ''])
-        self.webBibleLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.webSourceComboBox)
-        self.webTranslationLabel = QtGui.QLabel(self.webBibleTab)
-        self.webTranslationLabel.setObjectName('webTranslationLabel')
-        self.webBibleLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.webTranslationLabel)
-        self.webTranslationComboBox = QtGui.QComboBox(self.webBibleTab)
-        self.webTranslationComboBox.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToContents)
-        self.webTranslationComboBox.setObjectName('WebTranslationComboBox')
-        self.webBibleLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.webTranslationComboBox)
-        self.webTabWidget.addTab(self.webBibleTab, '')
-        self.webProxyTab = QtGui.QWidget()
-        self.webProxyTab.setObjectName('WebProxyTab')
-        self.webProxyLayout = QtGui.QFormLayout(self.webProxyTab)
-        self.webProxyLayout.setObjectName('WebProxyLayout')
-        self.webServerLabel = QtGui.QLabel(self.webProxyTab)
-        self.webServerLabel.setObjectName('WebServerLabel')
-        self.webProxyLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.webServerLabel)
-        self.webServerEdit = QtGui.QLineEdit(self.webProxyTab)
-        self.webServerEdit.setObjectName('WebServerEdit')
-        self.webProxyLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.webServerEdit)
-        self.webUserLabel = QtGui.QLabel(self.webProxyTab)
-        self.webUserLabel.setObjectName('WebUserLabel')
-        self.webProxyLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.webUserLabel)
-        self.webUserEdit = QtGui.QLineEdit(self.webProxyTab)
-        self.webUserEdit.setObjectName('WebUserEdit')
-        self.webProxyLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.webUserEdit)
-        self.webPasswordLabel = QtGui.QLabel(self.webProxyTab)
-        self.webPasswordLabel.setObjectName('WebPasswordLabel')
-        self.webProxyLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.webPasswordLabel)
-        self.webPasswordEdit = QtGui.QLineEdit(self.webProxyTab)
-        self.webPasswordEdit.setObjectName('WebPasswordEdit')
-        self.webProxyLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.webPasswordEdit)
-        self.webTabWidget.addTab(self.webProxyTab, '')
-        self.selectStack.addWidget(self.webTabWidget)
-        self.selectPageLayout.addLayout(self.selectStack)
-        self.addPage(self.selectPage)
+        self.format_layout.setItem(1, QtGui.QFormLayout.LabelRole, self.spacer)
+        self.select_page_layout.addLayout(self.format_layout)
+        self.select_stack = QtGui.QStackedLayout()
+        self.select_stack.setObjectName('SelectStack')
+        self.osis_widget = QtGui.QWidget(self.select_page)
+        self.osis_widget.setObjectName('OsisWidget')
+        self.osis_layout = QtGui.QFormLayout(self.osis_widget)
+        self.osis_layout.setMargin(0)
+        self.osis_layout.setObjectName('OsisLayout')
+        self.osis_file_label = QtGui.QLabel(self.osis_widget)
+        self.osis_file_label.setObjectName('OsisFileLabel')
+        self.osis_file_layout = QtGui.QHBoxLayout()
+        self.osis_file_layout.setObjectName('OsisFileLayout')
+        self.osis_file_edit = QtGui.QLineEdit(self.osis_widget)
+        self.osis_file_edit.setObjectName('OsisFileEdit')
+        self.osis_file_layout.addWidget(self.osis_file_edit)
+        self.osis_browse_button = QtGui.QToolButton(self.osis_widget)
+        self.osis_browse_button.setIcon(self.open_icon)
+        self.osis_browse_button.setObjectName('OsisBrowseButton')
+        self.osis_file_layout.addWidget(self.osis_browse_button)
+        self.osis_layout.addRow(self.osis_file_label, self.osis_file_layout)
+        self.osis_layout.setItem(1, QtGui.QFormLayout.LabelRole, self.spacer)
+        self.select_stack.addWidget(self.osis_widget)
+        self.csv_widget = QtGui.QWidget(self.select_page)
+        self.csv_widget.setObjectName('CsvWidget')
+        self.csv_layout = QtGui.QFormLayout(self.csv_widget)
+        self.csv_layout.setMargin(0)
+        self.csv_layout.setObjectName('CsvLayout')
+        self.csv_books_label = QtGui.QLabel(self.csv_widget)
+        self.csv_books_label.setObjectName('CsvBooksLabel')
+        self.csv_books_layout = QtGui.QHBoxLayout()
+        self.csv_books_layout.setObjectName('CsvBooksLayout')
+        self.csv_books_edit = QtGui.QLineEdit(self.csv_widget)
+        self.csv_books_edit.setObjectName('CsvBooksEdit')
+        self.csv_books_layout.addWidget(self.csv_books_edit)
+        self.csv_books_button = QtGui.QToolButton(self.csv_widget)
+        self.csv_books_button.setIcon(self.open_icon)
+        self.csv_books_button.setObjectName('CsvBooksButton')
+        self.csv_books_layout.addWidget(self.csv_books_button)
+        self.csv_layout.addRow(self.csv_books_label, self.csv_books_layout)
+        self.csv_verses_label = QtGui.QLabel(self.csv_widget)
+        self.csv_verses_label.setObjectName('CsvVersesLabel')
+        self.csv_verses_layout = QtGui.QHBoxLayout()
+        self.csv_verses_layout.setObjectName('CsvVersesLayout')
+        self.csv_verses_edit = QtGui.QLineEdit(self.csv_widget)
+        self.csv_verses_edit.setObjectName('CsvVersesEdit')
+        self.csv_verses_layout.addWidget(self.csv_verses_edit)
+        self.csv_verses_button = QtGui.QToolButton(self.csv_widget)
+        self.csv_verses_button.setIcon(self.open_icon)
+        self.csv_verses_button.setObjectName('CsvVersesButton')
+        self.csv_verses_layout.addWidget(self.csv_verses_button)
+        self.csv_layout.addRow(self.csv_verses_label, self.csv_verses_layout)
+        self.csv_layout.setItem(3, QtGui.QFormLayout.LabelRole, self.spacer)
+        self.select_stack.addWidget(self.csv_widget)
+        self.open_song_widget = QtGui.QWidget(self.select_page)
+        self.open_song_widget.setObjectName('OpenSongWidget')
+        self.open_song_layout = QtGui.QFormLayout(self.open_song_widget)
+        self.open_song_layout.setMargin(0)
+        self.open_song_layout.setObjectName('OpenSongLayout')
+        self.open_song_file_label = QtGui.QLabel(self.open_song_widget)
+        self.open_song_file_label.setObjectName('OpenSongFileLabel')
+        self.open_song_file_layout = QtGui.QHBoxLayout()
+        self.open_song_file_layout.setObjectName('OpenSongFileLayout')
+        self.open_song_file_edit = QtGui.QLineEdit(self.open_song_widget)
+        self.open_song_file_edit.setObjectName('OpenSongFileEdit')
+        self.open_song_file_layout.addWidget(self.open_song_file_edit)
+        self.open_song_browse_button = QtGui.QToolButton(self.open_song_widget)
+        self.open_song_browse_button.setIcon(self.open_icon)
+        self.open_song_browse_button.setObjectName('OpenSongBrowseButton')
+        self.open_song_file_layout.addWidget(self.open_song_browse_button)
+        self.open_song_layout.addRow(self.open_song_file_label, self.open_song_file_layout)
+        self.open_song_layout.setItem(1, QtGui.QFormLayout.LabelRole, self.spacer)
+        self.select_stack.addWidget(self.open_song_widget)
+        self.web_tab_widget = QtGui.QTabWidget(self.select_page)
+        self.web_tab_widget.setObjectName('WebTabWidget')
+        self.web_bible_tab = QtGui.QWidget()
+        self.web_bible_tab.setObjectName('WebBibleTab')
+        self.web_bible_layout = QtGui.QFormLayout(self.web_bible_tab)
+        self.web_bible_layout.setObjectName('WebBibleLayout')
+        self.web_source_label = QtGui.QLabel(self.web_bible_tab)
+        self.web_source_label.setObjectName('WebSourceLabel')
+        self.web_bible_layout.setWidget(0, QtGui.QFormLayout.LabelRole, self.web_source_label)
+        self.web_source_combo_box = QtGui.QComboBox(self.web_bible_tab)
+        self.web_source_combo_box.setObjectName('WebSourceComboBox')
+        self.web_source_combo_box.addItems(['', '', ''])
+        self.web_bible_layout.setWidget(0, QtGui.QFormLayout.FieldRole, self.web_source_combo_box)
+        self.web_translation_label = QtGui.QLabel(self.web_bible_tab)
+        self.web_translation_label.setObjectName('web_translation_label')
+        self.web_bible_layout.setWidget(1, QtGui.QFormLayout.LabelRole, self.web_translation_label)
+        self.web_translation_combo_box = QtGui.QComboBox(self.web_bible_tab)
+        self.web_translation_combo_box.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToContents)
+        self.web_translation_combo_box.setObjectName('WebTranslationComboBox')
+        self.web_bible_layout.setWidget(1, QtGui.QFormLayout.FieldRole, self.web_translation_combo_box)
+        self.web_tab_widget.addTab(self.web_bible_tab, '')
+        self.web_proxy_tab = QtGui.QWidget()
+        self.web_proxy_tab.setObjectName('WebProxyTab')
+        self.web_proxy_layout = QtGui.QFormLayout(self.web_proxy_tab)
+        self.web_proxy_layout.setObjectName('WebProxyLayout')
+        self.web_server_label = QtGui.QLabel(self.web_proxy_tab)
+        self.web_server_label.setObjectName('WebServerLabel')
+        self.web_proxy_layout.setWidget(0, QtGui.QFormLayout.LabelRole, self.web_server_label)
+        self.web_server_edit = QtGui.QLineEdit(self.web_proxy_tab)
+        self.web_server_edit.setObjectName('WebServerEdit')
+        self.web_proxy_layout.setWidget(0, QtGui.QFormLayout.FieldRole, self.web_server_edit)
+        self.web_user_label = QtGui.QLabel(self.web_proxy_tab)
+        self.web_user_label.setObjectName('WebUserLabel')
+        self.web_proxy_layout.setWidget(1, QtGui.QFormLayout.LabelRole, self.web_user_label)
+        self.web_user_edit = QtGui.QLineEdit(self.web_proxy_tab)
+        self.web_user_edit.setObjectName('WebUserEdit')
+        self.web_proxy_layout.setWidget(1, QtGui.QFormLayout.FieldRole, self.web_user_edit)
+        self.web_password_label = QtGui.QLabel(self.web_proxy_tab)
+        self.web_password_label.setObjectName('WebPasswordLabel')
+        self.web_proxy_layout.setWidget(2, QtGui.QFormLayout.LabelRole, self.web_password_label)
+        self.web_password_edit = QtGui.QLineEdit(self.web_proxy_tab)
+        self.web_password_edit.setObjectName('WebPasswordEdit')
+        self.web_proxy_layout.setWidget(2, QtGui.QFormLayout.FieldRole, self.web_password_edit)
+        self.web_tab_widget.addTab(self.web_proxy_tab, '')
+        self.select_stack.addWidget(self.web_tab_widget)
+        self.select_page_layout.addLayout(self.select_stack)
+        self.addPage(self.select_page)
         # License Page
-        self.licenseDetailsPage = QtGui.QWizardPage()
-        self.licenseDetailsPage.setObjectName('LicenseDetailsPage')
-        self.licenseDetailsLayout = QtGui.QFormLayout(self.licenseDetailsPage)
-        self.licenseDetailsLayout.setObjectName('LicenseDetailsLayout')
-        self.versionNameLabel = QtGui.QLabel(self.licenseDetailsPage)
-        self.versionNameLabel.setObjectName('VersionNameLabel')
-        self.licenseDetailsLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.versionNameLabel)
-        self.versionNameEdit = QtGui.QLineEdit(self.licenseDetailsPage)
-        self.versionNameEdit.setObjectName('VersionNameEdit')
-        self.licenseDetailsLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.versionNameEdit)
-        self.copyrightLabel = QtGui.QLabel(self.licenseDetailsPage)
-        self.copyrightLabel.setObjectName('CopyrightLabel')
-        self.licenseDetailsLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.copyrightLabel)
-        self.copyrightEdit = QtGui.QLineEdit(self.licenseDetailsPage)
-        self.copyrightEdit.setObjectName('CopyrightEdit')
-        self.licenseDetailsLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.copyrightEdit)
-        self.permissionsLabel = QtGui.QLabel(self.licenseDetailsPage)
-        self.permissionsLabel.setObjectName('PermissionsLabel')
-        self.licenseDetailsLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
-            self.permissionsLabel)
-        self.permissionsEdit = QtGui.QLineEdit(self.licenseDetailsPage)
-        self.permissionsEdit.setObjectName('PermissionsEdit')
-        self.licenseDetailsLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.permissionsEdit)
-        self.addPage(self.licenseDetailsPage)
+        self.license_details_page = QtGui.QWizardPage()
+        self.license_details_page.setObjectName('LicenseDetailsPage')
+        self.license_details_layout = QtGui.QFormLayout(self.license_details_page)
+        self.license_details_layout.setObjectName('LicenseDetailsLayout')
+        self.version_name_label = QtGui.QLabel(self.license_details_page)
+        self.version_name_label.setObjectName('VersionNameLabel')
+        self.license_details_layout.setWidget(0, QtGui.QFormLayout.LabelRole, self.version_name_label)
+        self.version_name_edit = QtGui.QLineEdit(self.license_details_page)
+        self.version_name_edit.setObjectName('VersionNameEdit')
+        self.license_details_layout.setWidget(0, QtGui.QFormLayout.FieldRole, self.version_name_edit)
+        self.copyright_label = QtGui.QLabel(self.license_details_page)
+        self.copyright_label.setObjectName('CopyrightLabel')
+        self.license_details_layout.setWidget(1, QtGui.QFormLayout.LabelRole, self.copyright_label)
+        self.copyright_edit = QtGui.QLineEdit(self.license_details_page)
+        self.copyright_edit.setObjectName('CopyrightEdit')
+        self.license_details_layout.setWidget(1, QtGui.QFormLayout.FieldRole, self.copyright_edit)
+        self.permissions_label = QtGui.QLabel(self.license_details_page)
+        self.permissions_label.setObjectName('PermissionsLabel')
+        self.license_details_layout.setWidget(2, QtGui.QFormLayout.LabelRole, self.permissions_label)
+        self.permissions_edit = QtGui.QLineEdit(self.license_details_page)
+        self.permissions_edit.setObjectName('PermissionsEdit')
+        self.license_details_layout.setWidget(2, QtGui.QFormLayout.FieldRole, self.permissions_edit)
+        self.addPage(self.license_details_page)
 
     def retranslateUi(self):
         """
         Allow for localisation of the bible import wizard.
         """
         self.setWindowTitle(translate('BiblesPlugin.ImportWizardForm', 'Bible Import Wizard'))
-        self.title_label.setText(WizardStrings.HeaderStyle %
-            translate('OpenLP.Ui', 'Welcome to the Bible Import Wizard'))
+        self.title_label.setText(WizardStrings.HeaderStyle % translate('OpenLP.Ui',
+                                                                       'Welcome to the Bible Import Wizard'))
         self.information_label.setText(
             translate('BiblesPlugin.ImportWizardForm',
-            'This wizard will help you to import Bibles from a variety of '
-            'formats. Click the next button below to start the process by '
-            'selecting a format to import from.'))
-        self.selectPage.setTitle(WizardStrings.ImportSelect)
-        self.selectPage.setSubTitle(WizardStrings.ImportSelectLong)
-        self.formatLabel.setText(WizardStrings.FormatLabel)
-        self.formatComboBox.setItemText(BibleFormat.OSIS, WizardStrings.OSIS)
-        self.formatComboBox.setItemText(BibleFormat.CSV, WizardStrings.CSV)
-        self.formatComboBox.setItemText(BibleFormat.OpenSong, WizardStrings.OS)
-        self.formatComboBox.setItemText(BibleFormat.WebDownload,
-            translate('BiblesPlugin.ImportWizardForm', 'Web Download'))
-        self.osisFileLabel.setText(translate('BiblesPlugin.ImportWizardForm', 'Bible file:'))
-        self.csvBooksLabel.setText(translate('BiblesPlugin.ImportWizardForm', 'Books file:'))
-        self.csvVersesLabel.setText(translate('BiblesPlugin.ImportWizardForm', 'Verses file:'))
-        self.openSongFileLabel.setText(translate('BiblesPlugin.ImportWizardForm', 'Bible file:'))
-        self.webSourceLabel.setText(translate('BiblesPlugin.ImportWizardForm', 'Location:'))
-        self.webSourceComboBox.setItemText(WebDownload.Crosswalk,
-            translate('BiblesPlugin.ImportWizardForm', 'Crosswalk'))
-        self.webSourceComboBox.setItemText(WebDownload.BibleGateway,
-            translate('BiblesPlugin.ImportWizardForm', 'BibleGateway'))
-        self.webSourceComboBox.setItemText(WebDownload.Bibleserver,
-            translate('BiblesPlugin.ImportWizardForm', 'Bibleserver'))
-        self.webTranslationLabel.setText(translate('BiblesPlugin.ImportWizardForm', 'Bible:'))
-        self.webTabWidget.setTabText(self.webTabWidget.indexOf(self.webBibleTab),
-            translate('BiblesPlugin.ImportWizardForm', 'Download Options'))
-        self.webServerLabel.setText(translate('BiblesPlugin.ImportWizardForm', 'Server:'))
-        self.webUserLabel.setText(translate('BiblesPlugin.ImportWizardForm', 'Username:'))
-        self.webPasswordLabel.setText(translate('BiblesPlugin.ImportWizardForm', 'Password:'))
-        self.webTabWidget.setTabText(self.webTabWidget.indexOf(self.webProxyTab),
-            translate('BiblesPlugin.ImportWizardForm',
-            'Proxy Server (Optional)'))
-        self.licenseDetailsPage.setTitle(
+                      'This wizard will help you to import Bibles from a variety of '
+                      'formats. Click the next button below to start the process by '
+                      'selecting a format to import from.'))
+        self.select_page.setTitle(WizardStrings.ImportSelect)
+        self.select_page.setSubTitle(WizardStrings.ImportSelectLong)
+        self.format_label.setText(WizardStrings.FormatLabel)
+        self.format_combo_box.setItemText(BibleFormat.OSIS, WizardStrings.OSIS)
+        self.format_combo_box.setItemText(BibleFormat.CSV, WizardStrings.CSV)
+        self.format_combo_box.setItemText(BibleFormat.OpenSong, WizardStrings.OS)
+        self.format_combo_box.setItemText(BibleFormat.WebDownload, translate('BiblesPlugin.ImportWizardForm',
+                                                                             'Web Download'))
+        self.osis_file_label.setText(translate('BiblesPlugin.ImportWizardForm', 'Bible file:'))
+        self.csv_books_label.setText(translate('BiblesPlugin.ImportWizardForm', 'Books file:'))
+        self.csv_verses_label.setText(translate('BiblesPlugin.ImportWizardForm', 'Verses file:'))
+        self.open_song_file_label.setText(translate('BiblesPlugin.ImportWizardForm', 'Bible file:'))
+        self.web_source_label.setText(translate('BiblesPlugin.ImportWizardForm', 'Location:'))
+        self.web_source_combo_box.setItemText(WebDownload.Crosswalk, translate('BiblesPlugin.ImportWizardForm',
+                                                                               'Crosswalk'))
+        self.web_source_combo_box.setItemText(WebDownload.BibleGateway, translate('BiblesPlugin.ImportWizardForm',
+                                                                                  'BibleGateway'))
+        self.web_source_combo_box.setItemText(WebDownload.Bibleserver, translate('BiblesPlugin.ImportWizardForm',
+                                                                                 'Bibleserver'))
+        self.web_translation_label.setText(translate('BiblesPlugin.ImportWizardForm', 'Bible:'))
+        self.web_tab_widget.setTabText(self.web_tab_widget.indexOf(self.web_bible_tab),
+                                       translate('BiblesPlugin.ImportWizardForm', 'Download Options'))
+        self.web_server_label.setText(translate('BiblesPlugin.ImportWizardForm', 'Server:'))
+        self.web_user_label.setText(translate('BiblesPlugin.ImportWizardForm', 'Username:'))
+        self.web_password_label.setText(translate('BiblesPlugin.ImportWizardForm', 'Password:'))
+        self.web_tab_widget.setTabText(
+            self.web_tab_widget.indexOf(self.web_proxy_tab), translate('BiblesPlugin.ImportWizardForm',
+                                                                       'Proxy Server (Optional)'))
+        self.license_details_page.setTitle(
             translate('BiblesPlugin.ImportWizardForm', 'License Details'))
-        self.licenseDetailsPage.setSubTitle(translate('BiblesPlugin.ImportWizardForm',
-            'Set up the Bible\'s license details.'))
-        self.versionNameLabel.setText(translate('BiblesPlugin.ImportWizardForm', 'Version name:'))
-        self.copyrightLabel.setText(translate('BiblesPlugin.ImportWizardForm', 'Copyright:'))
-        self.permissionsLabel.setText(translate('BiblesPlugin.ImportWizardForm', 'Permissions:'))
+        self.license_details_page.setSubTitle(translate('BiblesPlugin.ImportWizardForm',
+                                                        'Set up the Bible\'s license details.'))
+        self.version_name_label.setText(translate('BiblesPlugin.ImportWizardForm', 'Version name:'))
+        self.copyright_label.setText(translate('BiblesPlugin.ImportWizardForm', 'Copyright:'))
+        self.permissions_label.setText(translate('BiblesPlugin.ImportWizardForm', 'Permissions:'))
         self.progress_page.setTitle(WizardStrings.Importing)
         self.progress_page.setSubTitle(translate('BiblesPlugin.ImportWizardForm',
-            'Please wait while your Bible is imported.'))
+                                                 'Please wait while your Bible is imported.'))
         self.progress_label.setText(WizardStrings.Ready)
         self.progress_bar.setFormat('%p%')
         # Align all QFormLayouts towards each other.
-        labelWidth = max(self.formatLabel.minimumSizeHint().width(),
-            self.osisFileLabel.minimumSizeHint().width(),
-            self.csvBooksLabel.minimumSizeHint().width(),
-            self.csvVersesLabel.minimumSizeHint().width(),
-            self.openSongFileLabel.minimumSizeHint().width())
-        self.spacer.changeSize(labelWidth, 0, QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+        label_width = max(self.format_label.minimumSizeHint().width(),
+                          self.osis_file_label.minimumSizeHint().width(),
+                          self.csv_books_label.minimumSizeHint().width(),
+                          self.csv_verses_label.minimumSizeHint().width(),
+                          self.open_song_file_label.minimumSizeHint().width())
+        self.spacer.changeSize(label_width, 0, QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
 
     def validateCurrentPage(self):
         """
@@ -340,122 +340,130 @@ class BibleImportForm(OpenLPWizard):
         """
         if self.currentPage() == self.welcome_page:
             return True
-        elif self.currentPage() == self.selectPage:
+        elif self.currentPage() == self.select_page:
             if self.field('source_format') == BibleFormat.OSIS:
                 if not self.field('osis_location'):
                     critical_error_message_box(UiStrings().NFSs, WizardStrings.YouSpecifyFile % WizardStrings.OSIS)
-                    self.osisFileEdit.setFocus()
+                    self.osis_file_edit.setFocus()
                     return False
             elif self.field('source_format') == BibleFormat.CSV:
                 if not self.field('csv_booksfile'):
-                    critical_error_message_box(UiStrings().NFSs, translate('BiblesPlugin.ImportWizardForm',
-                        'You need to specify a file with books of the Bible to use in the import.'))
-                    self.csvBooksEdit.setFocus()
+                    critical_error_message_box(
+                        UiStrings().NFSs, translate('BiblesPlugin.ImportWizardForm',
+                                                    'You need to specify a file with books of the Bible to use in the '
+                                                    'import.'))
+                    self.csv_books_edit.setFocus()
                     return False
                 elif not self.field('csv_versefile'):
-                    critical_error_message_box(UiStrings().NFSs,
-                        translate('BiblesPlugin.ImportWizardForm',
-                            'You need to specify a file of Bible verses to import.'))
-                    self.csvVersesEdit.setFocus()
+                    critical_error_message_box(
+                        UiStrings().NFSs,
+                        translate('BiblesPlugin.ImportWizardForm', 'You need to specify a file of Bible verses to '
+                                                                   'import.'))
+                    self.csv_verses_edit.setFocus()
                     return False
             elif self.field('source_format') == BibleFormat.OpenSong:
                 if not self.field('opensong_file'):
                     critical_error_message_box(UiStrings().NFSs, WizardStrings.YouSpecifyFile % WizardStrings.OS)
-                    self.openSongFileEdit.setFocus()
+                    self.open_song_file_edit.setFocus()
                     return False
             elif self.field('source_format') == BibleFormat.WebDownload:
-                self.versionNameEdit.setText(self.webTranslationComboBox.currentText())
+                self.version_name_edit.setText(self.web_translation_combo_box.currentText())
                 return True
             return True
-        elif self.currentPage() == self.licenseDetailsPage:
+        elif self.currentPage() == self.license_details_page:
             license_version = self.field('license_version')
             license_copyright = self.field('license_copyright')
             path = AppLocation.get_section_data_path('bibles')
             if not license_version:
-                critical_error_message_box(UiStrings().EmptyField,
+                critical_error_message_box(
+                    UiStrings().EmptyField,
                     translate('BiblesPlugin.ImportWizardForm', 'You need to specify a version name for your Bible.'))
-                self.versionNameEdit.setFocus()
+                self.version_name_edit.setFocus()
                 return False
             elif not license_copyright:
-                critical_error_message_box(UiStrings().EmptyField,
+                critical_error_message_box(
+                    UiStrings().EmptyField,
                     translate('BiblesPlugin.ImportWizardForm', 'You need to set a copyright for your Bible. '
-                        'Bibles in the Public Domain need to be marked as such.'))
-                self.copyrightEdit.setFocus()
+                              'Bibles in the Public Domain need to be marked as such.'))
+                self.copyright_edit.setFocus()
                 return False
             elif self.manager.exists(license_version):
-                critical_error_message_box(translate('BiblesPlugin.ImportWizardForm', 'Bible Exists'),
+                critical_error_message_box(
+                    translate('BiblesPlugin.ImportWizardForm', 'Bible Exists'),
                     translate('BiblesPlugin.ImportWizardForm',
-                        'This Bible already exists. Please import a different Bible or first delete the existing one.'))
-                self.versionNameEdit.setFocus()
+                              'This Bible already exists. Please import a different Bible or first delete the '
+                              'existing one.'))
+                self.version_name_edit.setFocus()
                 return False
-            elif os.path.exists(os.path.join(path, clean_filename(
-                license_version))):
+            elif os.path.exists(os.path.join(path, clean_filename(license_version))):
                 critical_error_message_box(
                     translate('BiblesPlugin.ImportWizardForm', 'Bible Exists'),
                     translate('BiblesPlugin.ImportWizardForm', 'This Bible already exists. Please import '
-                        'a different Bible or first delete the existing one.'))
-                self.versionNameEdit.setFocus()
+                              'a different Bible or first delete the existing one.'))
+                self.version_name_edit.setFocus()
                 return False
             return True
         if self.currentPage() == self.progress_page:
             return True
 
-    def onWebSourceComboBoxIndexChanged(self, index):
+    def on_web_source_combo_box_index_changed(self, index):
         """
-        Setup the list of Bibles when you select a different source on the web
-        download page.
+        Setup the list of Bibles when you select a different source on the web download page.
 
-        ``index``
-            The index of the combo box.
+        :param index: The index of the combo box.
         """
-        self.webTranslationComboBox.clear()
+        self.web_translation_combo_box.clear()
         bibles = list(self.web_bible_list[index].keys())
         bibles.sort(key=get_locale_key)
-        self.webTranslationComboBox.addItems(bibles)
+        self.web_translation_combo_box.addItems(bibles)
 
-    def onOsisBrowseButtonClicked(self):
+    def on_osis_browse_button_clicked(self):
         """
         Show the file open dialog for the OSIS file.
         """
-        self.get_file_name(WizardStrings.OpenTypeFile % WizardStrings.OSIS, self.osisFileEdit, 'last directory import')
+        self.get_file_name(WizardStrings.OpenTypeFile % WizardStrings.OSIS, self.osis_file_edit,
+                           'last directory import')
 
-    def onCsvBooksBrowseButtonClicked(self):
+    def on_csv_books_browse_button_clicked(self):
         """
         Show the file open dialog for the books CSV file.
         """
-        self.get_file_name(WizardStrings.OpenTypeFile % WizardStrings.CSV, self.csvBooksEdit, 'last directory import',
-            '%s (*.csv)' % translate('BiblesPlugin.ImportWizardForm', 'CSV File'))
+        self.get_file_name(
+            WizardStrings.OpenTypeFile % WizardStrings.CSV, self.csv_books_edit, 'last directory import', '%s (*.csv)' %
+            translate('BiblesPlugin.ImportWizardForm', 'CSV File'))
 
-    def onCsvVersesBrowseButtonClicked(self):
+    def on_csv_verses_browse_button_clicked(self):
         """
         Show the file open dialog for the verses CSV file.
         """
-        self.get_file_name(WizardStrings.OpenTypeFile % WizardStrings.CSV, self.csvVersesEdit, 'last directory import',
-            '%s (*.csv)' % translate('BiblesPlugin.ImportWizardForm', 'CSV File'))
+        self.get_file_name(WizardStrings.OpenTypeFile % WizardStrings.CSV, self.csv_verses_edit,
+                           'last directory import', '%s (*.csv)' %
+                                                    translate('BiblesPlugin.ImportWizardForm', 'CSV File'))
 
-    def onOpenSongBrowseButtonClicked(self):
+    def on_open_song_browse_button_clicked(self):
         """
         Show the file open dialog for the OpenSong file.
         """
-        self.get_file_name(WizardStrings.OpenTypeFile % WizardStrings.OS, self.openSongFileEdit, 'last directory import')
+        self.get_file_name(WizardStrings.OpenTypeFile % WizardStrings.OS, self.open_song_file_edit,
+                           'last directory import')
 
     def register_fields(self):
         """
         Register the bible import wizard fields.
         """
-        self.selectPage.registerField('source_format', self.formatComboBox)
-        self.selectPage.registerField('osis_location', self.osisFileEdit)
-        self.selectPage.registerField('csv_booksfile', self.csvBooksEdit)
-        self.selectPage.registerField('csv_versefile', self.csvVersesEdit)
-        self.selectPage.registerField('opensong_file', self.openSongFileEdit)
-        self.selectPage.registerField('web_location', self.webSourceComboBox)
-        self.selectPage.registerField('web_biblename', self.webTranslationComboBox)
-        self.selectPage.registerField('proxy_server', self.webServerEdit)
-        self.selectPage.registerField('proxy_username', self.webUserEdit)
-        self.selectPage.registerField('proxy_password', self.webPasswordEdit)
-        self.licenseDetailsPage.registerField('license_version', self.versionNameEdit)
-        self.licenseDetailsPage.registerField('license_copyright', self.copyrightEdit)
-        self.licenseDetailsPage.registerField('license_permissions', self.permissionsEdit)
+        self.select_page.registerField('source_format', self.format_combo_box)
+        self.select_page.registerField('osis_location', self.osis_file_edit)
+        self.select_page.registerField('csv_booksfile', self.csv_books_edit)
+        self.select_page.registerField('csv_versefile', self.csv_verses_edit)
+        self.select_page.registerField('opensong_file', self.open_song_file_edit)
+        self.select_page.registerField('web_location', self.web_source_combo_box)
+        self.select_page.registerField('web_biblename', self.web_translation_combo_box)
+        self.select_page.registerField('proxy_server', self.web_server_edit)
+        self.select_page.registerField('proxy_username', self.web_user_edit)
+        self.select_page.registerField('proxy_password', self.web_password_edit)
+        self.license_details_page.registerField('license_version', self.version_name_edit)
+        self.license_details_page.registerField('license_copyright', self.copyright_edit)
+        self.license_details_page.registerField('license_permissions', self.permissions_edit)
 
     def setDefaults(self):
         """
@@ -472,33 +480,32 @@ class BibleImportForm(OpenLPWizard):
         self.setField('csv_versefile', '')
         self.setField('opensong_file', '')
         self.setField('web_location', WebDownload.Crosswalk)
-        self.setField('web_biblename', self.webTranslationComboBox.currentIndex())
+        self.setField('web_biblename', self.web_translation_combo_box.currentIndex())
         self.setField('proxy_server', settings.value('proxy address'))
         self.setField('proxy_username', settings.value('proxy username'))
         self.setField('proxy_password', settings.value('proxy password'))
-        self.setField('license_version', self.versionNameEdit.text())
-        self.setField('license_copyright', self.copyrightEdit.text())
-        self.setField('license_permissions', self.permissionsEdit.text())
-        self.onWebSourceComboBoxIndexChanged(WebDownload.Crosswalk)
+        self.setField('license_version', self.version_name_edit.text())
+        self.setField('license_copyright', self.copyright_edit.text())
+        self.setField('license_permissions', self.permissions_edit.text())
+        self.on_web_source_combo_box_index_changed(WebDownload.Crosswalk)
         settings.endGroup()
 
-    def loadWebBibles(self):
+    def load_Web_Bibles(self):
         """
         Load the lists of Crosswalk, BibleGateway and Bibleserver bibles.
         """
         # Load Crosswalk Bibles.
-        self.loadBibleResource(WebDownload.Crosswalk)
+        self.load_Bible_Resource(WebDownload.Crosswalk)
         # Load BibleGateway Bibles.
-        self.loadBibleResource(WebDownload.BibleGateway)
+        self.load_Bible_Resource(WebDownload.BibleGateway)
         # Load and Bibleserver Bibles.
-        self.loadBibleResource(WebDownload.Bibleserver)
+        self.load_Bible_Resource(WebDownload.Bibleserver)
 
-    def loadBibleResource(self, download_type):
+    def load_Bible_Resource(self, download_type):
         """
         Loads a web bible from bible_resources.sqlite.
 
-        ``download_type``
-            The WebDownload type e.g. bibleserver.
+        :param download_type: The WebDownload type e.g. bibleserver.
         """
         self.web_bible_list[download_type] = {}
         bibles = BiblesResourcesDB.get_webbibles(WebDownload.Names[download_type])
@@ -530,28 +537,22 @@ class BibleImportForm(OpenLPWizard):
         importer = None
         if bible_type == BibleFormat.OSIS:
             # Import an OSIS bible.
-            importer = self.manager.import_bible(BibleFormat.OSIS,
-                name=license_version,
-                filename=self.field('osis_location')
-            )
+            importer = self.manager.import_bible(BibleFormat.OSIS, name=license_version,
+                                                 filename=self.field('osis_location'))
         elif bible_type == BibleFormat.CSV:
             # Import a CSV bible.
-            importer = self.manager.import_bible(BibleFormat.CSV,
-                name=license_version,
-                booksfile=self.field('csv_booksfile'),
-                versefile=self.field('csv_versefile')
-            )
+            importer = self.manager.import_bible(BibleFormat.CSV, name=license_version,
+                                                 booksfile=self.field('csv_booksfile'),
+                                                 versefile=self.field('csv_versefile'))
         elif bible_type == BibleFormat.OpenSong:
             # Import an OpenSong bible.
-            importer = self.manager.import_bible(BibleFormat.OpenSong,
-                name=license_version,
-                filename=self.field('opensong_file')
-            )
+            importer = self.manager.import_bible(BibleFormat.OpenSong, name=license_version,
+                                                 filename=self.field('opensong_file'))
         elif bible_type == BibleFormat.WebDownload:
             # Import a bible from the web.
             self.progress_bar.setMaximum(1)
             download_location = self.field('web_location')
-            bible_version = self.webTranslationComboBox.currentText()
+            bible_version = self.web_translation_combo_box.currentText()
             bible = self.web_bible_list[download_location][bible_version]
             importer = self.manager.import_bible(
                 BibleFormat.WebDownload, name=license_version,
@@ -562,13 +563,12 @@ class BibleImportForm(OpenLPWizard):
                 proxy_password=self.field('proxy_password')
             )
         if importer.do_import(license_version):
-            self.manager.save_meta_data(license_version, license_version,
-                license_copyright, license_permissions)
+            self.manager.save_meta_data(license_version, license_version, license_copyright, license_permissions)
             self.manager.reload_bibles()
             if bible_type == BibleFormat.WebDownload:
                 self.progress_label.setText(
                     translate('BiblesPlugin.ImportWizardForm', 'Registered Bible. Please note, that verses will be '
-                    'downloaded on\ndemand and thus an internet connection is required.'))
+                              'downloaded on\ndemand and thus an internet connection is required.'))
             else:
                 self.progress_label.setText(WizardStrings.FinishedImport)
         else:

openlp/plugins/bibles/forms/bibleupgradeform.py

@@ -78,7 +78,7 @@ class BibleUpgradeForm(OpenLPWizard):
         Set up the UI for the bible wizard.
         """
         super(BibleUpgradeForm, self).setupUi(image)
-        Registry().execute('openlp_stop_wizard', self.stop_import)
+        Registry().register_function('openlp_stop_wizard', self.stop_import)
 
     def stop_import(self):
         """
@@ -96,34 +96,34 @@ class BibleUpgradeForm(OpenLPWizard):
         if not self.currentPage() == self.progress_page:
             self.done(QtGui.QDialog.Rejected)
 
-    def onCurrentIdChanged(self, pageId):
+    def onCurrentIdChanged(self, page_id):
         """
         Perform necessary functions depending on which wizard page is active.
         """
-        if self.page(pageId) == self.progress_page:
+        if self.page(page_id) == self.progress_page:
             self.pre_wizard()
             self.perform_wizard()
             self.post_wizard()
-        elif self.page(pageId) == self.selectPage and not self.files:
+        elif self.page(page_id) == self.selectPage and not self.files:
             self.next()
 
-    def onBackupBrowseButtonClicked(self):
+    def on_backup_browse_button_clicked(self):
         """
         Show the file open dialog for the OSIS file.
         """
-        filename = QtGui.QFileDialog.getExistingDirectory(self,
-            translate('BiblesPlugin.UpgradeWizardForm', 'Select a Backup Directory'), '')
+        filename = QtGui.QFileDialog.getExistingDirectory(self, translate('BiblesPlugin.UpgradeWizardForm',
+                                                                          'Select a Backup Directory'), '')
         if filename:
             self.backupDirectoryEdit.setText(filename)
 
-    def onNoBackupCheckBoxToggled(self, checked):
+    def on_no_backup_check_box_toggled(self, checked):
         """
         Enable or disable the backup directory widgets.
         """
         self.backupDirectoryEdit.setEnabled(not checked)
         self.backupBrowseButton.setEnabled(not checked)
 
-    def backupOldBibles(self, backup_directory):
+    def backup_old_bibles(self, backup_directory):
         """
         Backup old bible databases in a given folder.
         """
@@ -147,8 +147,8 @@ class BibleUpgradeForm(OpenLPWizard):
         """
         Set up the signals used in the bible importer.
         """
-        self.backupBrowseButton.clicked.connect(self.onBackupBrowseButtonClicked)
-        self.noBackupCheckBox.toggled.connect(self.onNoBackupCheckBoxToggled)
+        self.backupBrowseButton.clicked.connect(self.on_backup_browse_button_clicked)
+        self.noBackupCheckBox.toggled.connect(self.on_no_backup_check_box_toggled)
 
     def add_custom_pages(self):
         """
@@ -238,32 +238,34 @@ class BibleUpgradeForm(OpenLPWizard):
         Allow for localisation of the bible import wizard.
         """
         self.setWindowTitle(translate('BiblesPlugin.UpgradeWizardForm', 'Bible Upgrade Wizard'))
-        self.title_label.setText(WizardStrings.HeaderStyle %
-            translate('OpenLP.Ui', 'Welcome to the Bible Upgrade Wizard'))
-        self.information_label.setText(translate('BiblesPlugin.UpgradeWizardForm',
-            'This wizard will help you to upgrade your existing Bibles from a prior version of OpenLP 2. '
-            'Click the next button below to start the upgrade process.'))
+        self.title_label.setText(WizardStrings.HeaderStyle % translate('OpenLP.Ui',
+                                                                       'Welcome to the Bible Upgrade Wizard'))
+        self.information_label.setText(
+            translate('BiblesPlugin.UpgradeWizardForm',
+                      'This wizard will help you to upgrade your existing Bibles from a prior version of OpenLP 2. '
+                      'Click the next button below to start the upgrade process.'))
         self.backup_page.setTitle(translate('BiblesPlugin.UpgradeWizardForm', 'Select Backup Directory'))
-        self.backup_page.setSubTitle(translate('BiblesPlugin.UpgradeWizardForm',
-            'Please select a backup directory for your Bibles'))
-        self.backupInfoLabel.setText(translate('BiblesPlugin.UpgradeWizardForm',
-            'Previous releases of OpenLP 2.0 are unable to use upgraded Bibles.'
-            ' This will create a backup of your current Bibles so that you can '
-            'simply copy the files back to your OpenLP data directory if you '
-            'need to revert to a previous release of OpenLP. Instructions on '
-            'how to restore the files can be found in our <a href="'
-            'http://wiki.openlp.org/faq">Frequently Asked Questions</a>.'))
-        self.selectLabel.setText(translate('BiblesPlugin.UpgradeWizardForm',
-            'Please select a backup location for your Bibles.'))
+        self.backup_page.setSubTitle(
+            translate('BiblesPlugin.UpgradeWizardForm', 'Please select a backup directory for your Bibles'))
+        self.backupInfoLabel.setText(
+            translate('BiblesPlugin.UpgradeWizardForm',
+                      'Previous releases of OpenLP 2.0 are unable to use upgraded Bibles.'
+                      ' This will create a backup of your current Bibles so that you can '
+                      'simply copy the files back to your OpenLP data directory if you '
+                      'need to revert to a previous release of OpenLP. Instructions on '
+                      'how to restore the files can be found in our <a href="'
+                      'http://wiki.openlp.org/faq">Frequently Asked Questions</a>.'))
+        self.selectLabel.setText(
+            translate('BiblesPlugin.UpgradeWizardForm', 'Please select a backup location for your Bibles.'))
         self.backupDirectoryLabel.setText(translate('BiblesPlugin.UpgradeWizardForm', 'Backup Directory:'))
         self.noBackupCheckBox.setText(
             translate('BiblesPlugin.UpgradeWizardForm', 'There is no need to backup my Bibles'))
         self.selectPage.setTitle(translate('BiblesPlugin.UpgradeWizardForm', 'Select Bibles'))
-        self.selectPage.setSubTitle(translate('BiblesPlugin.UpgradeWizardForm',
-            'Please select the Bibles to upgrade'))
+        self.selectPage.setSubTitle(
+            translate('BiblesPlugin.UpgradeWizardForm', 'Please select the Bibles to upgrade'))
         self.progress_page.setTitle(translate('BiblesPlugin.UpgradeWizardForm', 'Upgrading'))
-        self.progress_page.setSubTitle(translate('BiblesPlugin.UpgradeWizardForm',
-            'Please wait while your Bibles are upgraded.'))
+        self.progress_page.setSubTitle(
+            translate('BiblesPlugin.UpgradeWizardForm', 'Please wait while your Bibles are upgraded.'))
         self.progress_label.setText(WizardStrings.Ready)
         self.progress_bar.setFormat('%p%')
 
@@ -277,16 +279,18 @@ class BibleUpgradeForm(OpenLPWizard):
             if not self.noBackupCheckBox.checkState() == QtCore.Qt.Checked:
                 backup_path = self.backupDirectoryEdit.text()
                 if not backup_path:
-                    critical_error_message_box(UiStrings().EmptyField,
-                        translate('BiblesPlugin.UpgradeWizardForm',
-                            'You need to specify a backup directory for your Bibles.'))
+                    critical_error_message_box(
+                        UiStrings().EmptyField,
+                        translate('BiblesPlugin.UpgradeWizardForm', 'You need to specify a backup directory for '
+                                                                    'your Bibles.'))
                     self.backupDirectoryEdit.setFocus()
                     return False
                 else:
-                    if not self.backupOldBibles(backup_path):
-                        critical_error_message_box(UiStrings().Error,
-                            translate('BiblesPlugin.UpgradeWizardForm', 'The backup was not successful.\nTo backup your '
-                                'Bibles you need permission to write to the given directory.'))
+                    if not self.backup_old_bibles(backup_path):
+                        critical_error_message_box(
+                            UiStrings().Error,
+                            translate('BiblesPlugin.UpgradeWizardForm', 'The backup was not successful.\nTo backup '
+                                      'your Bibles you need permission to write to the given directory.'))
                         return False
             return True
         elif self.currentPage() == self.selectPage:
@@ -340,8 +344,8 @@ class BibleUpgradeForm(OpenLPWizard):
         self.includeWebBible = False
         proxy_server = None
         if not self.files:
-            self.progress_label.setText(translate('BiblesPlugin.UpgradeWizardForm',
-                    'There are no Bibles that need to be upgraded.'))
+            self.progress_label.setText(
+                translate('BiblesPlugin.UpgradeWizardForm', 'There are no Bibles that need to be upgraded.'))
             self.progress_bar.hide()
             return
         max_bibles = 0
@@ -363,11 +367,11 @@ class BibleUpgradeForm(OpenLPWizard):
                 self.success[number] = False
                 continue
             self.progress_bar.reset()
-            old_bible = OldBibleDB(self.media_item, path=self.temp_dir,
-                file=filename[0])
+            old_bible = OldBibleDB(self.media_item, path=self.temp_dir, file=filename[0])
             name = filename[1]
-            self.progress_label.setText(translate('BiblesPlugin.UpgradeWizardForm',
-                'Upgrading Bible %s of %s: "%s"\nUpgrading ...') % (number + 1, max_bibles, name))
+            self.progress_label.setText(
+                translate('BiblesPlugin.UpgradeWizardForm',
+                          'Upgrading Bible %s of %s: "%s"\nUpgrading ...') % (number + 1, max_bibles, name))
             self.new_bibles[number] = BibleDB(self.media_item, path=self.path, name=name, file=filename[0])
             self.new_bibles[number].register(self.plugin.upgrade_wizard)
             metadata = old_bible.get_metadata()
@@ -404,7 +408,7 @@ class BibleUpgradeForm(OpenLPWizard):
                     critical_error_message_box(
                         translate('BiblesPlugin.UpgradeWizardForm', 'Download Error'),
                         translate('BiblesPlugin.UpgradeWizardForm',
-                            'To upgrade your Web Bibles an Internet connection is required.'))
+                                  'To upgrade your Web Bibles an Internet connection is required.'))
                     self.increment_progress_bar(translate(
                         'BiblesPlugin.UpgradeWizardForm', 'Upgrading Bible %s of %s: "%s"\nFailed') %
                         (number + 1, max_bibles, name), self.progress_bar.maximum() - self.progress_bar.value())
@@ -415,16 +419,16 @@ class BibleUpgradeForm(OpenLPWizard):
                     meta_data['download_source'].lower())
                 if bible and bible['language_id']:
                     language_id = bible['language_id']
-                    self.new_bibles[number].save_meta('language_id',
-                        language_id)
+                    self.new_bibles[number].save_meta('language_id', language_id)
                 else:
                     language_id = self.new_bibles[number].get_language(name)
                 if not language_id:
                     log.warn('Upgrading from "%s" failed' % filename[0])
                     self.new_bibles[number].session.close()
                     del self.new_bibles[number]
-                    self.increment_progress_bar(translate('BiblesPlugin.UpgradeWizardForm',
-                        'Upgrading Bible %s of %s: "%s"\nFailed') % (number + 1, max_bibles, name),
+                    self.increment_progress_bar(
+                        translate('BiblesPlugin.UpgradeWizardForm',
+                                  'Upgrading Bible %s of %s: "%s"\nFailed') % (number + 1, max_bibles, name),
                         self.progress_bar.maximum() - self.progress_bar.value())
                     self.success[number] = False
                     continue
@@ -433,8 +437,10 @@ class BibleUpgradeForm(OpenLPWizard):
                     if self.stop_import_flag:
                         self.success[number] = False
                         break
-                    self.increment_progress_bar(translate('BiblesPlugin.UpgradeWizardForm',
-                        'Upgrading Bible %s of %s: "%s"\nUpgrading %s ...') % (number + 1, max_bibles, name, book))
+                    self.increment_progress_bar(
+                        translate('BiblesPlugin.UpgradeWizardForm',
+                                  'Upgrading Bible %s of %s: "%s"\nUpgrading %s ...') %
+                        (number + 1, max_bibles, name, book))
                     book_ref_id = self.new_bibles[number].\
                         get_book_ref_id_by_name(book, len(books), language_id)
                     if not book_ref_id:
@@ -445,8 +451,7 @@ class BibleUpgradeForm(OpenLPWizard):
                         self.success[number] = False
                         break
                     book_details = BiblesResourcesDB.get_book_by_id(book_ref_id)
-                    db_book = self.new_bibles[number].create_book(book,
-                        book_ref_id, book_details['testament_id'])
+                    db_book = self.new_bibles[number].create_book(book, book_ref_id, book_details['testament_id'])
                     # Try to import already downloaded verses.
                     oldbook = old_bible.get_book(book)
                     if oldbook:
@@ -458,9 +463,8 @@ class BibleUpgradeForm(OpenLPWizard):
                             if self.stop_import_flag:
                                 self.success[number] = False
                                 break
-                            self.new_bibles[number].create_verse(db_book.id,
-                                int(verse['chapter']),
-                                int(verse['verse']), str(verse['text']))
+                            self.new_bibles[number].create_verse(db_book.id, int(verse['chapter']),
+                                                                 int(verse['verse']), str(verse['text']))
                             self.application.process_events()
                         self.new_bibles[number].session.commit()
             else:
@@ -471,8 +475,9 @@ class BibleUpgradeForm(OpenLPWizard):
                     log.warn('Upgrading books from "%s" failed' % name)
                     self.new_bibles[number].session.close()
                     del self.new_bibles[number]
-                    self.increment_progress_bar(translate('BiblesPlugin.UpgradeWizardForm',
-                        'Upgrading Bible %s of %s: "%s"\nFailed') % (number + 1, max_bibles, name),
+                    self.increment_progress_bar(
+                        translate('BiblesPlugin.UpgradeWizardForm',
+                                  'Upgrading Bible %s of %s: "%s"\nFailed') % (number + 1, max_bibles, name),
                         self.progress_bar.maximum() - self.progress_bar.value())
                     self.success[number] = False
                     continue
@@ -482,8 +487,9 @@ class BibleUpgradeForm(OpenLPWizard):
                     if self.stop_import_flag:
                         self.success[number] = False
                         break
-                    self.increment_progress_bar(translate('BiblesPlugin.UpgradeWizardForm',
-                        'Upgrading Bible %s of %s: "%s"\nUpgrading %s ...') %
+                    self.increment_progress_bar(
+                        translate('BiblesPlugin.UpgradeWizardForm',
+                                  'Upgrading Bible %s of %s: "%s"\nUpgrading %s ...') %
                         (number + 1, max_bibles, name, book['name']))
                     book_ref_id = self.new_bibles[number].get_book_ref_id_by_name(book['name'], len(books), language_id)
                     if not book_ref_id:
@@ -493,8 +499,8 @@ class BibleUpgradeForm(OpenLPWizard):
                         self.success[number] = False
                         break
                     book_details = BiblesResourcesDB.get_book_by_id(book_ref_id)
-                    db_book = self.new_bibles[number].create_book(book['name'],
-                        book_ref_id, book_details['testament_id'])
+                    db_book = self.new_bibles[number].create_book(book['name'], book_ref_id,
+                                                                  book_details['testament_id'])
                     verses = old_bible.get_verses(book['id'])
                     if not verses:
                         log.warn('No verses found to import for book "%s"', book['name'])
@@ -504,20 +510,21 @@ class BibleUpgradeForm(OpenLPWizard):
                         if self.stop_import_flag:
                             self.success[number] = False
                             break
-                        self.new_bibles[number].create_verse(db_book.id,
-                            int(verse['chapter']),
-                            int(verse['verse']), str(verse['text']))
+                        self.new_bibles[number].create_verse(db_book.id, int(verse['chapter']), int(verse['verse']),
+                                                             str(verse['text']))
                         self.application.process_events()
                     self.new_bibles[number].session.commit()
             if not self.success.get(number, True):
-                self.increment_progress_bar(translate('BiblesPlugin.UpgradeWizardForm',
-                    'Upgrading Bible %s of %s: "%s"\nFailed') % (number + 1, max_bibles, name),
+                self.increment_progress_bar(
+                    translate('BiblesPlugin.UpgradeWizardForm',
+                              'Upgrading Bible %s of %s: "%s"\nFailed') % (number + 1, max_bibles, name),
                     self.progress_bar.maximum() - self.progress_bar.value())
             else:
                 self.success[number] = True
                 self.new_bibles[number].save_meta('name', name)
-                self.increment_progress_bar(translate('BiblesPlugin.UpgradeWizardForm',
-                    'Upgrading Bible %s of %s: "%s"\nComplete') % (number + 1, max_bibles, name))
+                self.increment_progress_bar(
+                    translate('BiblesPlugin.UpgradeWizardForm',
+                              'Upgrading Bible %s of %s: "%s"\nComplete') % (number + 1, max_bibles, name))
             if number in self.new_bibles:
                 self.new_bibles[number].session.close()
         # Close the last bible's connection if possible.
@@ -545,12 +552,15 @@ class BibleUpgradeForm(OpenLPWizard):
             failed_import_text = ''
         if successful_import > 0:
             if self.includeWebBible:
-                self.progress_label.setText(translate('BiblesPlugin.UpgradeWizardForm',
-                    'Upgrading Bible(s): %s successful%s\nPlease note that verses from Web Bibles will be downloaded '
-                    'on demand and so an Internet connection is required.') % (successful_import, failed_import_text))
+                self.progress_label.setText(
+                    translate('BiblesPlugin.UpgradeWizardForm',
+                              'Upgrading Bible(s): %s successful%s\nPlease note that verses from Web Bibles will be '
+                              'downloaded on demand and so an Internet connection is required.') %
+                    (successful_import, failed_import_text))
             else:
-                self.progress_label.setText(translate('BiblesPlugin.UpgradeWizardForm',
-                    'Upgrading Bible(s): %s successful%s') % (successful_import, failed_import_text))
+                self.progress_label.setText(
+                    translate('BiblesPlugin.UpgradeWizardForm', 'Upgrading Bible(s): %s successful%s') % (
+                        successful_import, failed_import_text))
         else:
             self.progress_label.setText(translate('BiblesPlugin.UpgradeWizardForm', 'Upgrade failed.'))
         # Remove temp directory.

openlp/plugins/bibles/forms/booknamedialog.py

@@ -32,6 +32,7 @@ from PyQt4 import QtCore, QtGui
 from openlp.core.common import translate
 from openlp.core.lib.ui import create_button_box
 
+
 class Ui_BookNameDialog(object):
     def setupUi(self, book_name_dialog):
         book_name_dialog.setObjectName('book_name_dialog')
@@ -48,15 +49,15 @@ class Ui_BookNameDialog(object):
         self.corresponding_layout.setColumnStretch(1, 1)
         self.corresponding_layout.setSpacing(8)
         self.corresponding_layout.setObjectName('corresponding_layout')
-        self.currentLabel = QtGui.QLabel(book_name_dialog)
-        self.currentLabel.setObjectName('currentLabel')
-        self.corresponding_layout.addWidget(self.currentLabel, 0, 0, 1, 1)
+        self.current_label = QtGui.QLabel(book_name_dialog)
+        self.current_label.setObjectName('current_label')
+        self.corresponding_layout.addWidget(self.current_label, 0, 0, 1, 1)
         self.current_book_label = QtGui.QLabel(book_name_dialog)
         self.current_book_label.setObjectName('current_book_label')
         self.corresponding_layout.addWidget(self.current_book_label, 0, 1, 1, 1)
-        self.correspondingLabel = QtGui.QLabel(book_name_dialog)
-        self.correspondingLabel.setObjectName('correspondingLabel')
-        self.corresponding_layout.addWidget(self.correspondingLabel, 1, 0, 1, 1)
+        self.corresponding_label = QtGui.QLabel(book_name_dialog)
+        self.corresponding_label.setObjectName('corresponding_label')
+        self.corresponding_layout.addWidget(self.corresponding_label, 1, 0, 1, 1)
         self.corresponding_combo_box = QtGui.QComboBox(book_name_dialog)
         self.corresponding_combo_box.setObjectName('corresponding_combo_box')
         self.corresponding_layout.addWidget(self.corresponding_combo_box, 1, 1, 1, 1)
@@ -87,11 +88,11 @@ class Ui_BookNameDialog(object):
 
     def retranslateUi(self, book_name_dialog):
         book_name_dialog.setWindowTitle(translate('BiblesPlugin.BookNameDialog', 'Select Book Name'))
-        self.info_label.setText(translate('BiblesPlugin.BookNameDialog',
-            'The following book name cannot be matched up internally. '
-            'Please select the corresponding name from the list.'))
-        self.currentLabel.setText(translate('BiblesPlugin.BookNameDialog', 'Current name:'))
-        self.correspondingLabel.setText(translate('BiblesPlugin.BookNameDialog', 'Corresponding name:'))
+        self.info_label.setText(
+            translate('BiblesPlugin.BookNameDialog', 'The following book name cannot be matched up internally. '
+                      'Please select the corresponding name from the list.'))
+        self.current_label.setText(translate('BiblesPlugin.BookNameDialog', 'Current name:'))
+        self.corresponding_label.setText(translate('BiblesPlugin.BookNameDialog', 'Corresponding name:'))
         self.options_group_box.setTitle(translate('BiblesPlugin.BookNameDialog', 'Show Books From'))
         self.old_testament_check_box.setText(translate('BiblesPlugin.BookNameDialog', 'Old Testament'))
         self.new_testament_check_box.setText(translate('BiblesPlugin.BookNameDialog', 'New Testament'))

openlp/plugins/bibles/forms/booknameform.py

@@ -52,7 +52,7 @@ class BookNameForm(QDialog, Ui_BookNameDialog):
     """
     log.info('BookNameForm loaded')
 
-    def __init__(self, parent = None):
+    def __init__(self, parent=None):
         """
         Constructor
         """
@@ -66,11 +66,11 @@ class BookNameForm(QDialog, Ui_BookNameDialog):
         """
         Set up the signals used in the booknameform.
         """
-        self.old_testament_check_box.stateChanged.connect(self.onCheckBoxIndexChanged)
-        self.new_testament_check_box.stateChanged.connect(self.onCheckBoxIndexChanged)
-        self.apocrypha_check_box.stateChanged.connect(self.onCheckBoxIndexChanged)
+        self.old_testament_check_box.stateChanged.connect(self.on_check_box_index_changed)
+        self.new_testament_check_box.stateChanged.connect(self.on_check_box_index_changed)
+        self.apocrypha_check_box.stateChanged.connect(self.on_check_box_index_changed)
 
-    def onCheckBoxIndexChanged(self, index):
+    def on_check_box_index_changed(self, index):
         """
         Reload Combobox if CheckBox state has changed
         """
@@ -119,7 +119,8 @@ class BookNameForm(QDialog, Ui_BookNameDialog):
             cor_book = self.corresponding_combo_box.currentText()
             for character in '\\.^$*+?{}[]()':
                 cor_book = cor_book.replace(character, '\\' + character)
-            books = [key for key in list(self.book_names.keys()) if re.match(cor_book, str(self.book_names[key]), re.UNICODE)]
+            books = [key for key in list(self.book_names.keys()) if re.match(cor_book, str(self.book_names[key]),
+                                                                             re.UNICODE)]
             books = [_f for _f in map(BiblesResourcesDB.get_book, books) if _f]
             if books:
                 self.book_id = books[0]['id']

openlp/plugins/bibles/forms/editbibledialog.py

@@ -107,7 +107,7 @@ class Ui_EditBibleDialog(object):
         self.book_name_widget_layout = QtGui.QFormLayout(self.book_name_widget)
         self.book_name_widget_layout.setObjectName('book_name_widget_layout')
         self.book_name_label = {}
-        self.book_name_edit= {}
+        self.book_name_edit = {}
         for book in BiblesResourcesDB.get_books():
             self.book_name_label[book['abbreviation']] = QtGui.QLabel(self.book_name_widget)
             self.book_name_label[book['abbreviation']].setObjectName('book_name_label[%s]' % book['abbreviation'])
@@ -131,24 +131,28 @@ class Ui_EditBibleDialog(object):
         self.book_names = BibleStrings().BookNames
         edit_bible_dialog.setWindowTitle(translate('BiblesPlugin.EditBibleForm', 'Bible Editor'))
         # Meta tab
-        self.bible_tab_widget.setTabText( self.bible_tab_widget.indexOf(self.meta_tab),
-            translate('SongsPlugin.EditBibleForm', 'Meta Data'))
+        self.bible_tab_widget.setTabText(
+            self.bible_tab_widget.indexOf(self.meta_tab), translate('SongsPlugin.EditBibleForm', 'Meta Data'))
         self.license_details_group_box.setTitle(translate('BiblesPlugin.EditBibleForm', 'License Details'))
         self.version_name_label.setText(translate('BiblesPlugin.EditBibleForm', 'Version name:'))
         self.copyright_label.setText(translate('BiblesPlugin.EditBibleForm', 'Copyright:'))
         self.permissions_label.setText(translate('BiblesPlugin.EditBibleForm', 'Permissions:'))
         self.language_selection_group_box.setTitle(translate('BiblesPlugin.EditBibleForm', 'Default Bible Language'))
-        self.language_selection_label.setText(translate('BiblesPlugin.EditBibleForm',
-            'Book name language in search field, search results and on display:'))
+        self.language_selection_label.setText(
+            translate('BiblesPlugin.EditBibleForm', 'Book name language in search field, search results and '
+                                                    'on display:'))
         self.language_selection_combo_box.setItemText(0, translate('BiblesPlugin.EditBibleForm', 'Global Settings'))
-        self.language_selection_combo_box.setItemText(LanguageSelection.Bible + 1,
+        self.language_selection_combo_box.setItemText(
+            LanguageSelection.Bible + 1,
             translate('BiblesPlugin.EditBibleForm', 'Bible Language'))
-        self.language_selection_combo_box.setItemText(LanguageSelection.Application + 1,
-            translate('BiblesPlugin.EditBibleForm', 'Application Language'))
-        self.language_selection_combo_box.setItemText(LanguageSelection.English + 1,
+        self.language_selection_combo_box.setItemText(
+            LanguageSelection.Application + 1, translate('BiblesPlugin.EditBibleForm', 'Application Language'))
+        self.language_selection_combo_box.setItemText(
+            LanguageSelection.English + 1,
             translate('BiblesPlugin.EditBibleForm', 'English'))
         # Book name tab
-        self.bible_tab_widget.setTabText(self.bible_tab_widget.indexOf(self.book_name_tab),
+        self.bible_tab_widget.setTabText(
+            self.bible_tab_widget.indexOf(self.book_name_tab),
             translate('SongsPlugin.EditBibleForm', 'Custom Book Names'))
         for book in BiblesResourcesDB.get_books():
             self.book_name_label[book['abbreviation']].setText('%s:' % str(self.book_names[book['abbreviation']]))

openlp/plugins/bibles/forms/editbibleform.py

@@ -176,7 +176,7 @@ class EditBibleForm(QtGui.QDialog, Ui_EditBibleDialog, RegistryProperties):
             critical_error_message_box(
                 UiStrings().EmptyField,
                 translate('BiblesPlugin.BibleEditForm', 'You need to specify a book name for "%s".') %
-                           self.book_names[abbreviation])
+                self.book_names[abbreviation])
             return False
         elif not book_regex.match(new_book_name):
             self.book_name_edit[abbreviation].setFocus()

openlp/plugins/bibles/forms/languagedialog.py

@@ -32,6 +32,7 @@ from PyQt4 import QtGui
 from openlp.core.common import translate
 from openlp.core.lib.ui import create_button_box
 
+
 class Ui_LanguageDialog(object):
     def setupUi(self, language_dialog):
         language_dialog.setObjectName('language_dialog')
@@ -54,11 +55,11 @@ class Ui_LanguageDialog(object):
         self.language_label.setObjectName('language_label')
         self.language_h_box_layout.addWidget(self.language_label)
         self.language_combo_box = QtGui.QComboBox(language_dialog)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.language_combo_box.sizePolicy().hasHeightForWidth())
-        self.language_combo_box.setSizePolicy(sizePolicy)
+        size_policy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed)
+        size_policy.setHorizontalStretch(0)
+        size_policy.setVerticalStretch(0)
+        size_policy.setHeightForWidth(self.language_combo_box.sizePolicy().hasHeightForWidth())
+        self.language_combo_box.setSizePolicy(size_policy)
         self.language_combo_box.setObjectName('language_combo_box')
         self.language_h_box_layout.addWidget(self.language_combo_box)
         self.language_layout.addLayout(self.language_h_box_layout)
@@ -70,7 +71,8 @@ class Ui_LanguageDialog(object):
     def retranslateUi(self, language_dialog):
         language_dialog.setWindowTitle(translate('BiblesPlugin.LanguageDialog', 'Select Language'))
         self.bible_label.setText(translate('BiblesPlugin.LanguageDialog', ''))
-        self.info_label.setText(translate('BiblesPlugin.LanguageDialog',
-            'OpenLP is unable to determine the language of this translation of the Bible. Please select the language '
-            'from the list below.'))
+        self.info_label.setText(
+            translate('BiblesPlugin.LanguageDialog',
+                      'OpenLP is unable to determine the language of this translation of the Bible. Please select '
+                      'the language from the list below.'))
         self.language_label.setText(translate('BiblesPlugin.LanguageDialog', 'Language:'))

openlp/plugins/bibles/forms/languageform.py

@@ -36,8 +36,7 @@ from PyQt4.QtGui import QDialog
 
 from openlp.core.common import translate
 from openlp.core.lib.ui import critical_error_message_box
-from openlp.plugins.bibles.forms.languagedialog import \
-    Ui_LanguageDialog
+from openlp.plugins.bibles.forms.languagedialog import Ui_LanguageDialog
 from openlp.plugins.bibles.lib.db import BiblesResourcesDB
 
 

openlp/plugins/bibles/lib/__init__.py

@@ -218,9 +218,10 @@ def update_reference_separators():
     REFERENCE_MATCHES['range'] = re.compile('^\s*%s\s*$' % range_regex, re.UNICODE)
     REFERENCE_MATCHES['range_separator'] = re.compile(REFERENCE_SEPARATORS['sep_l'], re.UNICODE)
     # full reference match: <book>(<range>(,(?!$)|(?=$)))+
-    REFERENCE_MATCHES['full'] = re.compile('^\s*(?!\s)(?P<book>[\d]*[^\d]+)(?<!\s)\s*'
-        '(?P<ranges>(?:%(range_regex)s(?:%(sep_l)s(?!\s*$)|(?=\s*$)))+)\s*$' \
-        % dict(list(REFERENCE_SEPARATORS.items()) + [('range_regex', range_regex)]), re.UNICODE)
+    REFERENCE_MATCHES['full'] = \
+        re.compile('^\s*(?!\s)(?P<book>[\d]*[^\d]+)(?<!\s)\s*'
+                   '(?P<ranges>(?:%(range_regex)s(?:%(sep_l)s(?!\s*$)|(?=\s*$)))+)\s*$'
+                   % dict(list(REFERENCE_SEPARATORS.items()) + [('range_regex', range_regex)]), re.UNICODE)
 
 
 def get_reference_separator(separator_type):

openlp/plugins/bibles/lib/biblestab.py

@@ -422,7 +422,7 @@ class BiblesTab(SettingsTab):
             color.setAlpha(128)
         palette.setColor(QtGui.QPalette.Active, QtGui.QPalette.Text, color)
         return palette
-    
+
     def check_is_verse_number_visible(self):
         """
         Enables / Disables verse settings dependent on is_verse_number_visible
@@ -430,4 +430,3 @@ class BiblesTab(SettingsTab):
         self.new_chapters_check_box.setEnabled(self.is_verse_number_visible)
         self.display_style_label.setEnabled(self.is_verse_number_visible)
         self.display_style_combo_box.setEnabled(self.is_verse_number_visible)
-

openlp/plugins/bibles/lib/db.py

@@ -32,9 +32,11 @@ import logging
 import os
 import re
 import sqlite3
+import time
 
 from PyQt4 import QtCore
 from sqlalchemy import Column, ForeignKey, Table, or_, types, func
+from sqlalchemy.exc import OperationalError
 from sqlalchemy.orm import class_mapper, mapper, relation
 from sqlalchemy.orm.exc import UnmappedClassError
 
@@ -80,23 +82,20 @@ def init_schema(url):
 
     meta_table = Table('metadata', metadata,
                        Column('key', types.Unicode(255), primary_key=True, index=True),
-                       Column('value', types.Unicode(255)),
-    )
+                       Column('value', types.Unicode(255)),)
 
     book_table = Table('book', metadata,
                        Column('id', types.Integer, primary_key=True),
                        Column('book_reference_id', types.Integer, index=True),
                        Column('testament_reference_id', types.Integer),
-                       Column('name', types.Unicode(50), index=True),
-    )
+                       Column('name', types.Unicode(50), index=True),)
     verse_table = Table('verse', metadata,
                         Column('id', types.Integer, primary_key=True, index=True),
                         Column('book_id', types.Integer, ForeignKey(
                             'book.id'), index=True),
                         Column('chapter', types.Integer, index=True),
                         Column('verse', types.Integer, index=True),
-                        Column('text', types.UnicodeText, index=True),
-    )
+                        Column('text', types.UnicodeText, index=True),)
 
     try:
         class_mapper(BibleMeta)
@@ -157,7 +156,7 @@ class BibleDB(QtCore.QObject, Manager, RegistryProperties):
         if 'path' in kwargs:
             self.path = kwargs['path']
         self.wizard = None
-        Registry().execute('openlp_stop_wizard', self.stop_import)
+        Registry().register_function('openlp_stop_wizard', self.stop_import)
 
     def stop_import(self):
         """
@@ -194,7 +193,7 @@ class BibleDB(QtCore.QObject, Manager, RegistryProperties):
         :param testament: *Defaults to 1.* The testament_reference_id from
             bibles_resources.sqlite of the testament this book belongs to.
         """
-        log.debug('BibleDB.create_book("%s", "%s")', name, bk_ref_id)
+        log.debug('BibleDB.create_book("%s", "%s")' % (name, bk_ref_id))
         book = Book.populate(name=name, book_reference_id=bk_ref_id, testament_reference_id=testament)
         self.save_object(book)
         return book
@@ -205,7 +204,7 @@ class BibleDB(QtCore.QObject, Manager, RegistryProperties):
 
         :param book: The book object
         """
-        log.debug('BibleDB.update_book("%s")', book.name)
+        log.debug('BibleDB.update_book("%s")' % book.name)
         return self.save_object(book)
 
     def delete_book(self, db_book):
@@ -214,7 +213,7 @@ class BibleDB(QtCore.QObject, Manager, RegistryProperties):
 
         :param db_book: The book object.
         """
-        log.debug('BibleDB.delete_book("%s")', db_book.name)
+        log.debug('BibleDB.delete_book("%s")' % db_book.name)
         if self.delete_object(Book, db_book.id):
             return True
         return False
@@ -225,9 +224,10 @@ class BibleDB(QtCore.QObject, Manager, RegistryProperties):
 
         :param book_id: The id of the book being appended.
         :param chapter: The chapter number.
-        :param text_list: A dict of the verses to be inserted. The key is the verse number, and the value is the verse text.
+        :param text_list: A dict of the verses to be inserted. The key is the verse number, and the value is the
+        verse text.
         """
-        log.debug('BibleDBcreate_chapter("%s", "%s")', book_id, chapter)
+        log.debug('BibleDBcreate_chapter("%s", "%s")' % (book_id, chapter))
         # Text list has book and chapter as first two elements of the array.
         for verse_number, verse_text in text_list.items():
             verse = Verse.populate(
@@ -237,7 +237,12 @@ class BibleDB(QtCore.QObject, Manager, RegistryProperties):
                 text=verse_text
             )
             self.session.add(verse)
-        self.session.commit()
+        try:
+            self.session.commit()
+        except OperationalError:
+            # Wait 10ms and try again (lp#1154467)
+            time.sleep(0.01)
+            self.session.commit()
 
     def create_verse(self, book_id, chapter, verse, text):
         """
@@ -269,7 +274,7 @@ class BibleDB(QtCore.QObject, Manager, RegistryProperties):
         """
         if not isinstance(value, str):
             value = str(value)
-        log.debug('BibleDB.save_meta("%s/%s")', key, value)
+        log.debug('BibleDB.save_meta("%s/%s")' % (key, value))
         meta = self.get_object(BibleMeta, key)
         if meta:
             meta.value = value
@@ -283,7 +288,7 @@ class BibleDB(QtCore.QObject, Manager, RegistryProperties):
 
         :param book: The name of the book to return.
         """
-        log.debug('BibleDB.get_book("%s")', book)
+        log.debug('BibleDB.get_book("%s")' % book)
         return self.get_object_filtered(Book, Book.name.like(book + '%'))
 
     def get_books(self):
@@ -294,17 +299,17 @@ class BibleDB(QtCore.QObject, Manager, RegistryProperties):
         log.debug('BibleDB.get_books()')
         return self.get_all_objects(Book, order_by_ref=Book.id)
 
-    def get_book_by_book_ref_id(self, id):
+    def get_book_by_book_ref_id(self, ref_id):
         """
         Return a book object from the database.
 
-        :param id: The reference id of the book to return.
+        :param ref_id: The reference id of the book to return.
         """
-        log.debug('BibleDB.get_book_by_book_ref_id("%s")', id)
-        return self.get_object_filtered(Book, Book.book_reference_id.like(id))
+        log.debug('BibleDB.get_book_by_book_ref_id("%s")' % ref_id)
+        return self.get_object_filtered(Book, Book.book_reference_id.like(ref_id))
 
     def get_book_ref_id_by_name(self, book, maxbooks, language_id=None):
-        log.debug('BibleDB.get_book_ref_id_by_name:("%s", "%s")', book, language_id)
+        log.debug('BibleDB.get_book_ref_id_by_name:("%s", "%s")' % (book, language_id))
         book_id = None
         if BiblesResourcesDB.get_book(book, True):
             book_temp = BiblesResourcesDB.get_book(book, True)
@@ -330,7 +335,7 @@ class BibleDB(QtCore.QObject, Manager, RegistryProperties):
         :param book: The name of the book, according to the selected language.
         :param language_selection:  The language selection the user has chosen in the settings section of the Bible.
         """
-        log.debug('get_book_ref_id_by_localised_name("%s", "%s")', book, language_selection)
+        log.debug('get_book_ref_id_by_localised_name("%s", "%s")' % (book, language_selection))
         from openlp.plugins.bibles.lib import LanguageSelection, BibleStrings
         book_names = BibleStrings().BookNames
         # escape reserved characters
@@ -378,14 +383,14 @@ class BibleDB(QtCore.QObject, Manager, RegistryProperties):
                 [(u'35', 1, 1, 1), (u'35', 2, 2, 3)]
         :param show_error:
         """
-        log.debug('BibleDB.get_verses("%s")', reference_list)
+        log.debug('BibleDB.get_verses("%s")' % reference_list)
         verse_list = []
         book_error = False
         for book_id, chapter, start_verse, end_verse in reference_list:
             db_book = self.get_book_by_book_ref_id(book_id)
             if db_book:
                 book_id = db_book.book_reference_id
-                log.debug('Book name corrected to "%s"', db_book.name)
+                log.debug('Book name corrected to "%s"' % db_book.name)
                 if end_verse == -1:
                     end_verse = self.get_verse_count(book_id, chapter)
                 verses = self.session.query(Verse) \
@@ -397,7 +402,7 @@ class BibleDB(QtCore.QObject, Manager, RegistryProperties):
                     .all()
                 verse_list.extend(verses)
             else:
-                log.debug('OpenLP failed to find book with id "%s"', book_id)
+                log.debug('OpenLP failed to find book with id "%s"' % book_id)
                 book_error = True
         if book_error and show_error:
             critical_error_message_box(
@@ -416,7 +421,7 @@ class BibleDB(QtCore.QObject, Manager, RegistryProperties):
             contains spaces, it will split apart and AND'd on the list of
             values.
         """
-        log.debug('BibleDB.verse_search("%s")', text)
+        log.debug('BibleDB.verse_search("%s")' % text)
         verses = self.session.query(Verse)
         if text.find(',') > -1:
             keywords = ['%%%s%%' % keyword.strip() for keyword in text.split(',')]
@@ -435,9 +440,9 @@ class BibleDB(QtCore.QObject, Manager, RegistryProperties):
 
         :param book: The book object to get the chapter count for.
         """
-        log.debug('BibleDB.get_chapter_count("%s")', book.name)
+        log.debug('BibleDB.get_chapter_count("%s")' % book.name)
         count = self.session.query(func.max(Verse.chapter)).join(Book).filter(
-            Book.book_reference_id==book.book_reference_id).scalar()
+            Book.book_reference_id == book.book_reference_id).scalar()
         if not count:
             return 0
         return count
@@ -449,7 +454,7 @@ class BibleDB(QtCore.QObject, Manager, RegistryProperties):
         :param book_ref_id: The book reference id.
         :param chapter: The chapter to get the verse count for.
         """
-        log.debug('BibleDB.get_verse_count("%s", "%s")', book_ref_id, chapter)
+        log.debug('BibleDB.get_verse_count("%s", "%s")' % (book_ref_id, chapter))
         count = self.session.query(func.max(Verse.verse)).join(Book) \
             .filter(Book.book_reference_id == book_ref_id) \
             .filter(Verse.chapter == chapter) \
@@ -563,9 +568,9 @@ class BiblesResourcesDB(QtCore.QObject, Manager):
         Return a book by name or abbreviation.
 
         :param name: The name or abbreviation of the book.
-        :param lower: True if the comparsion should be only lowercase
+        :param lower: True if the comparison should be only lowercase
         """
-        log.debug('BiblesResourcesDB.get_book("%s")', name)
+        log.debug('BiblesResourcesDB.get_book("%s")' % name)
         if not isinstance(name, str):
             name = str(name)
         if lower:
@@ -594,7 +599,7 @@ class BiblesResourcesDB(QtCore.QObject, Manager):
 
         :param string: The string to search for in the book names or abbreviations.
         """
-        log.debug('BiblesResourcesDB.get_book_like("%s")', string)
+        log.debug('BiblesResourcesDB.get_book_like("%s")' % string)
         if not isinstance(string, str):
             name = str(string)
         books = BiblesResourcesDB.run_sql(
@@ -613,17 +618,17 @@ class BiblesResourcesDB(QtCore.QObject, Manager):
             return None
 
     @staticmethod
-    def get_book_by_id(id):
+    def get_book_by_id(book_id):
         """
         Return a book by id.
 
-        :param id: The id of the book.
+        :param book_id: The id of the book.
         """
-        log.debug('BiblesResourcesDB.get_book_by_id("%s")', id)
-        if not isinstance(id, int):
-            id = int(id)
+        log.debug('BiblesResourcesDB.get_book_by_id("%s")' % book_id)
+        if not isinstance(book_id, int):
+            book_id = int(book_id)
         books = BiblesResourcesDB.run_sql(
-            'SELECT id, testament_id, name, abbreviation, chapters FROM book_reference WHERE id = ?', (id, ))
+            'SELECT id, testament_id, name, abbreviation, chapters FROM book_reference WHERE id = ?', (book_id, ))
         if books:
             return {
                 'id': books[0][0],
@@ -643,7 +648,7 @@ class BiblesResourcesDB(QtCore.QObject, Manager):
         :param book_ref_id: The id of a book.
         :param chapter: The chapter number.
         """
-        log.debug('BiblesResourcesDB.get_chapter("%s", "%s")', book_ref_id, chapter)
+        log.debug('BiblesResourcesDB.get_chapter("%s", "%s")' % (book_ref_id, chapter))
         if not isinstance(chapter, int):
             chapter = int(chapter)
         chapters = BiblesResourcesDB.run_sql(
@@ -651,10 +656,10 @@ class BiblesResourcesDB(QtCore.QObject, Manager):
             'chapter, verse_count FROM chapters WHERE book_reference_id = ?', (book_ref_id,))
         try:
             return {
-                'id': chapters[chapter-1][0],
-                'book_reference_id': chapters[chapter-1][1],
-                'chapter': chapters[chapter-1][2],
-                'verse_count': chapters[chapter-1][3]
+                'id': chapters[chapter - 1][0],
+                'book_reference_id': chapters[chapter - 1][1],
+                'chapter': chapters[chapter - 1][2],
+                'verse_count': chapters[chapter - 1][3]
             }
         except (IndexError, TypeError):
             return None
@@ -666,7 +671,7 @@ class BiblesResourcesDB(QtCore.QObject, Manager):
 
         :param book_ref_id: The id of the book.
         """
-        log.debug('BiblesResourcesDB.get_chapter_count("%s")', book_ref_id)
+        log.debug('BiblesResourcesDB.get_chapter_count("%s")' % book_ref_id)
         details = BiblesResourcesDB.get_book_by_id(book_ref_id)
         if details:
             return details['chapters']
@@ -680,7 +685,7 @@ class BiblesResourcesDB(QtCore.QObject, Manager):
         :param book_ref_id: The id of the book.
         :param chapter: The number of the chapter.
         """
-        log.debug('BiblesResourcesDB.get_verse_count("%s", "%s")', book_ref_id, chapter)
+        log.debug('BiblesResourcesDB.get_verse_count("%s", "%s")' % (book_ref_id, chapter))
         details = BiblesResourcesDB.get_chapter(book_ref_id, chapter)
         if details:
             return details['verse_count']
@@ -693,7 +698,7 @@ class BiblesResourcesDB(QtCore.QObject, Manager):
 
         :param source: The name or abbreviation of the book.
         """
-        log.debug('BiblesResourcesDB.get_download_source("%s")', source)
+        log.debug('BiblesResourcesDB.get_download_source("%s")' % source)
         if not isinstance(source, str):
             source = str(source)
         source = source.title()
@@ -714,12 +719,12 @@ class BiblesResourcesDB(QtCore.QObject, Manager):
 
         :param source: The source of the web_bible.
         """
-        log.debug('BiblesResourcesDB.get_webbibles("%s")', source)
+        log.debug('BiblesResourcesDB.get_webbibles("%s")' % source)
         if not isinstance(source, str):
             source = str(source)
         source = BiblesResourcesDB.get_download_source(source)
-        bibles = BiblesResourcesDB.run_sql('SELECT id, name, abbreviation, '
-            'language_id, download_source_id FROM webbibles WHERE download_source_id = ?', (source['id'],))
+        bibles = BiblesResourcesDB.run_sql('SELECT id, name, abbreviation, language_id, download_source_id '
+                                           'FROM webbibles WHERE download_source_id = ?', (source['id'],))
         if bibles:
             return [{
                 'id': bible[0],
@@ -739,7 +744,7 @@ class BiblesResourcesDB(QtCore.QObject, Manager):
         :param abbreviation: The abbreviation of the web_bible.
         :param source: The source of the web_bible.
         """
-        log.debug('BiblesResourcesDB.get_webbibles("%s", "%s")', abbreviation, source)
+        log.debug('BiblesResourcesDB.get_webbibles("%s", "%s")' % (abbreviation, source))
         if not isinstance(abbreviation, str):
             abbreviation = str(abbreviation)
         if not isinstance(source, str):
@@ -767,7 +772,7 @@ class BiblesResourcesDB(QtCore.QObject, Manager):
         :param name: The name to search the id.
         :param language_id: The language_id for which language should be searched
         """
-        log.debug('BiblesResourcesDB.get_alternative_book_name("%s", "%s")', name, language_id)
+        log.debug('BiblesResourcesDB.get_alternative_book_name("%s", "%s")' % (name, language_id))
         if language_id:
             books = BiblesResourcesDB.run_sql(
                 'SELECT book_reference_id, name FROM alternative_book_names WHERE language_id = ? ORDER BY id',
@@ -786,7 +791,7 @@ class BiblesResourcesDB(QtCore.QObject, Manager):
 
         :param name: The name or abbreviation of the language.
         """
-        log.debug('BiblesResourcesDB.get_language("%s")', name)
+        log.debug('BiblesResourcesDB.get_language("%s")' % name)
         if not isinstance(name, str):
             name = str(name)
         language = BiblesResourcesDB.run_sql(
@@ -824,10 +829,9 @@ class BiblesResourcesDB(QtCore.QObject, Manager):
         log.debug('BiblesResourcesDB.get_testament_reference()')
         testaments = BiblesResourcesDB.run_sql('SELECT id, name FROM testament_reference ORDER BY id')
         return [
-            {
-            'id': testament[0],
-            'name': str(testament[1])
-            }
+            {'id': testament[0],
+             'name': str(testament[1])
+             }
             for testament in testaments
         ]
 
@@ -849,13 +853,13 @@ class AlternativeBookNamesDB(QtCore.QObject, Manager):
             file_path = os.path.join(
                 AppLocation.get_directory(AppLocation.DataDir), 'bibles', 'alternative_book_names.sqlite')
             if not os.path.exists(file_path):
-                #create new DB, create table alternative_book_names
+                # create new DB, create table alternative_book_names
                 AlternativeBookNamesDB.conn = sqlite3.connect(file_path)
                 AlternativeBookNamesDB.conn.execute(
                     'CREATE TABLE alternative_book_names(id INTEGER NOT NULL, '
                     'book_reference_id INTEGER, language_id INTEGER, name VARCHAR(50), PRIMARY KEY (id))')
             else:
-                #use existing DB
+                # use existing DB
                 AlternativeBookNamesDB.conn = sqlite3.connect(file_path)
             AlternativeBookNamesDB.cursor = AlternativeBookNamesDB.conn.cursor()
         return AlternativeBookNamesDB.cursor
@@ -883,7 +887,7 @@ class AlternativeBookNamesDB(QtCore.QObject, Manager):
         :param name: The name to search the id.
         :param language_id: The language_id for which language should be searched
         """
-        log.debug('AlternativeBookNamesDB.get_book_reference_id("%s", "%s")', name, language_id)
+        log.debug('AlternativeBookNamesDB.get_book_reference_id("%s", "%s")' % (name, language_id))
         if language_id:
             books = AlternativeBookNamesDB.run_sql(
                 'SELECT book_reference_id, name FROM alternative_book_names WHERE language_id = ?', (language_id, ))
@@ -904,8 +908,8 @@ class AlternativeBookNamesDB(QtCore.QObject, Manager):
         :param book_reference_id: The book_reference_id of the book.
         :param language_id: The language to which the alternative book name belong.
         """
-        log.debug('AlternativeBookNamesDB.create_alternative_book_name("%s", "%s", "%s")',
-                  name, book_reference_id, language_id)
+        log.debug('AlternativeBookNamesDB.create_alternative_book_name("%s", "%s", "%s")' %
+                  (name, book_reference_id, language_id))
         return AlternativeBookNamesDB.run_sql(
             'INSERT INTO alternative_book_names(book_reference_id, language_id, name) '
             'VALUES (?, ?, ?)', (book_reference_id, language_id, name), True)
@@ -934,7 +938,7 @@ class OldBibleDB(QtCore.QObject, Manager):
         QtCore.QObject.__init__(self)
         if 'path' not in kwargs:
             raise KeyError('Missing keyword argument "path".')
-        if  'file' not in kwargs:
+        if 'file' not in kwargs:
             raise KeyError('Missing keyword argument "file".')
         if 'path' in kwargs:
             self.path = kwargs['path']

openlp/plugins/bibles/lib/http.py

@@ -32,7 +32,9 @@ The :mod:`http` module enables OpenLP to retrieve scripture from bible websites.
 import logging
 import re
 import socket
-import urllib.request, urllib.parse, urllib.error
+import urllib.request
+import urllib.parse
+import urllib.error
 from html.parser import HTMLParseError
 
 from bs4 import BeautifulSoup, NavigableString, Tag
@@ -487,7 +489,7 @@ class HTTPBible(BibleDB, RegistryProperties):
                       (self.download_source, self.download_name))
             return False
         self.wizard.progress_bar.setMaximum(len(books) + 2)
-        self.wizard.increment_progress_bar(translate( 'BiblesPlugin.HTTPBible', 'Registering Language...'))
+        self.wizard.increment_progress_bar(translate('BiblesPlugin.HTTPBible', 'Registering Language...'))
         bible = BiblesResourcesDB.get_webbible(self.download_name, self.download_source.lower())
         if bible['language_id']:
             language_id = bible['language_id']
@@ -550,10 +552,10 @@ class HTTPBible(BibleDB, RegistryProperties):
                 self.application.set_busy_cursor()
                 search_results = self.get_chapter(book, reference[1])
                 if search_results and search_results.has_verse_list():
-                    ## We have found a book of the bible lets check to see
-                    ## if it was there. By reusing the returned book name
-                    ## we get a correct book. For example it is possible
-                    ## to request ac and get Acts back.
+                    # We have found a book of the bible lets check to see
+                    # if it was there. By reusing the returned book name
+                    # we get a correct book. For example it is possible
+                    # to request ac and get Acts back.
                     book_name = search_results.book
                     self.application.process_events()
                     # Check to see if book/chapter exists.

openlp/plugins/bibles/lib/mediaitem.py

@@ -480,6 +480,10 @@ class BibleMediaItem(MediaManagerItem):
                 self.reload_bibles()
 
     def on_delete_click(self):
+        """
+        When the delete button is pressed
+        """
+        bible = None
         if self.quickTab.isVisible():
             bible = self.quickVersionComboBox.currentText()
         elif self.advancedTab.isVisible():
@@ -488,8 +492,9 @@ class BibleMediaItem(MediaManagerItem):
             if QtGui.QMessageBox.question(
                     self, UiStrings().ConfirmDelete,
                     translate('BiblesPlugin.MediaItem', 'Are you sure you want to completely delete "%s" Bible from '
-                              'OpenLP?\n\nYou will need to re-import this Bible to use it again.') % bible,
-                QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes | QtGui.QMessageBox.No),
+                                                        'OpenLP?\n\nYou will need to re-import this Bible to use it '
+                                                        'again.') % bible,
+                    QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes | QtGui.QMessageBox.No),
                     QtGui.QMessageBox.Yes) == QtGui.QMessageBox.No:
                 return
             self.plugin.manager.delete_bible(bible)
@@ -664,7 +669,7 @@ class BibleMediaItem(MediaManagerItem):
                     db_book = bibles[second_bible].get_book_by_book_ref_id(verse.book.book_reference_id)
                     if not db_book:
                         log.debug('Passage "%s %d:%d" not found in Second Bible' %
-                            (verse.book.name, verse.chapter, verse.verse))
+                                  (verse.book.name, verse.chapter, verse.verse))
                         passage_not_found = True
                         count += 1
                         continue
@@ -752,7 +757,7 @@ class BibleMediaItem(MediaManagerItem):
                     log.exception('The second_search_results does not have as many verses as the search_results.')
                     break
                 bible_text = '%s %d%s%d (%s, %s)' % (book, verse.chapter, verse_separator, verse.verse, version,
-                             second_version)
+                                                     second_version)
             else:
                 bible_text = '%s %d%s%d (%s)' % (book, verse.chapter, verse_separator, verse.verse, version)
             bible_verse = QtGui.QListWidgetItem(bible_text)
@@ -840,6 +845,7 @@ class BibleMediaItem(MediaManagerItem):
         service_item.add_capability(ItemCapabilities.CanPreview)
         service_item.add_capability(ItemCapabilities.CanLoop)
         service_item.add_capability(ItemCapabilities.CanWordSplit)
+        service_item.add_capability(ItemCapabilities.CanEditTitle)
         # Service Item: Title
         service_item.title = create_separated_list(raw_title)
         # Service Item: Theme
@@ -910,8 +916,8 @@ class BibleMediaItem(MediaManagerItem):
         elif old_verse + 1 != verse and old_chapter == chapter:
             # We are still in the same chapter, but a verse has been skipped.
             return True
-        elif old_chapter + 1 == chapter and (verse != 1 or
-            old_verse != self.plugin.manager.get_verse_count(old_bible, old_book, old_chapter)):
+        elif old_chapter + 1 == chapter and (verse != 1 or old_verse !=
+                                             self.plugin.manager.get_verse_count(old_bible, old_book, old_chapter)):
             # We are in the following chapter, but the last verse was not the
             # last verse of the chapter or the current verse is not the
             # first one of the chapter.

openlp/plugins/bibles/lib/opensong.py

@@ -73,13 +73,13 @@ class OpenSongBible(BibleDB):
         log.debug('Starting OpenSong import from "%s"' % self.filename)
         if not isinstance(self.filename, str):
             self.filename = str(self.filename, 'utf8')
-        file = None
+        import_file = None
         success = True
         try:
             # NOTE: We don't need to do any of the normal encoding detection here, because lxml does it's own encoding
             # detection, and the two mechanisms together interfere with each other.
-            file = open(self.filename, 'r')
-            opensong = objectify.parse(file)
+            import_file = open(self.filename, 'rb')
+            opensong = objectify.parse(import_file)
             bible = opensong.getroot()
             language_id = self.get_language(bible_name)
             if not language_id:
@@ -93,7 +93,7 @@ class OpenSongBible(BibleDB):
                     log.error('Importing books from "%s" failed' % self.filename)
                     return False
                 book_details = BiblesResourcesDB.get_book_by_id(book_ref_id)
-                db_book = self.create_book(str(book.attrib['n']), book_ref_id, book_details['testament_id'])
+                db_book = self.create_book(book.attrib['n'], book_ref_id, book_details['testament_id'])
                 chapter_number = 0
                 for chapter in book.c:
                     if self.stop_import_flag:
@@ -122,8 +122,8 @@ class OpenSongBible(BibleDB):
                             verse_number += 1
                         self.create_verse(db_book.id, chapter_number, verse_number, self.get_text(verse))
                     self.wizard.increment_progress_bar(
-                        translate('BiblesPlugin.Opensong', 'Importing %s %s...',
-                                  'Importing <book name> <chapter>...')) % (db_book.name, chapter_number)
+                        translate('BiblesPlugin.Opensong', 'Importing %(bookname)s %(chapter)s...' %
+                                  {'bookname': db_book.name, 'chapter': chapter_number}))
                 self.session.commit()
             self.application.process_events()
         except etree.XMLSyntaxError as inst:
@@ -137,8 +137,8 @@ class OpenSongBible(BibleDB):
             log.exception('Loading Bible from OpenSong file failed')
             success = False
         finally:
-            if file:
-                file.close()
+            if import_file:
+                import_file.close()
         if self.stop_import_flag:
             return False
         else:

openlp/plugins/bibles/lib/upgrade.py

@@ -31,10 +31,8 @@ The :mod:`upgrade` module provides a way for the database and schema that is the
 """
 import logging
 
-from sqlalchemy import Table, func, select, insert
-
-__version__ = 1
 log = logging.getLogger(__name__)
+__version__ = 1
 
 
 def upgrade_1(session, metadata):
@@ -43,136 +41,4 @@ def upgrade_1(session, metadata):
 
     This upgrade renames a number of keys to a single naming convention.
     """
-    metadata_table = Table('metadata', metadata, autoload=True)
-    # Copy "Version" to "name" ("version" used by upgrade system)
-    # TODO: Clean up in a subsequent release of OpenLP (like 2.0 final)
-    session.execute(insert(metadata_table).values(
-        key='name',
-        value=select(
-            [metadata_table.c.value],
-            metadata_table.c.key == 'Version'
-        ).as_scalar()
-    ))
-    # Copy "Copyright" to "copyright"
-    # TODO: Clean up in a subsequent release of OpenLP (like 2.0 final)
-    session.execute(insert(metadata_table).values(
-        key='copyright',
-        value=select(
-            [metadata_table.c.value],
-            metadata_table.c.key == 'Copyright'
-        ).as_scalar()
-    ))
-    # Copy "Permissions" to "permissions"
-    # TODO: Clean up in a subsequent release of OpenLP (like 2.0 final)
-    session.execute(insert(metadata_table).values(
-        key='permissions',
-        value=select(
-            [metadata_table.c.value],
-            metadata_table.c.key == 'Permissions'
-        ).as_scalar()
-    ))
-    # Copy "Bookname language" to "book_name_language"
-    # TODO: Clean up in a subsequent release of OpenLP (like 2.0 final)
-    value_count = session.execute(
-        select(
-            [func.count(metadata_table.c.value)],
-            metadata_table.c.key == 'Bookname language'
-        )
-    ).scalar()
-    if value_count > 0:
-        session.execute(insert(metadata_table).values(
-            key='book_name_language',
-            value=select(
-                [metadata_table.c.value],
-                metadata_table.c.key == 'Bookname language'
-            ).as_scalar()
-        ))
-    # Copy "download source" to "download_source"
-    # TODO: Clean up in a subsequent release of OpenLP (like 2.0 final)
-    value_count = session.execute(
-        select(
-            [func.count(metadata_table.c.value)],
-            metadata_table.c.key == 'download source'
-        )
-    ).scalar()
-    log.debug('download source: %s', value_count)
-    if value_count > 0:
-        session.execute(insert(metadata_table).values(
-            key='download_source',
-            value=select(
-                [metadata_table.c.value],
-                metadata_table.c.key == 'download source'
-            ).as_scalar()
-        ))
-    # Copy "download name" to "download_name"
-    # TODO: Clean up in a subsequent release of OpenLP (like 2.0 final)
-    value_count = session.execute(
-        select(
-            [func.count(metadata_table.c.value)],
-            metadata_table.c.key == 'download name'
-        )
-    ).scalar()
-    log.debug('download name: %s', value_count)
-    if value_count > 0:
-        session.execute(insert(metadata_table).values(
-            key='download_name',
-            value=select(
-                [metadata_table.c.value],
-                metadata_table.c.key == 'download name'
-            ).as_scalar()
-        ))
-    # Copy "proxy server" to "proxy_server"
-    # TODO: Clean up in a subsequent release of OpenLP (like 2.0 final)
-    value_count = session.execute(
-        select(
-            [func.count(metadata_table.c.value)],
-            metadata_table.c.key == 'proxy server'
-        )
-    ).scalar()
-    log.debug('proxy server: %s', value_count)
-    if value_count > 0:
-        session.execute(insert(metadata_table).values(
-            key='proxy_server',
-            value=select(
-                [metadata_table.c.value],
-                metadata_table.c.key == 'proxy server'
-            ).as_scalar()
-        ))
-    # Copy "proxy username" to "proxy_username"
-    # TODO: Clean up in a subsequent release of OpenLP (like 2.0 final)
-    value_count = session.execute(
-        select(
-            [func.count(metadata_table.c.value)],
-            metadata_table.c.key == 'proxy username'
-        )
-    ).scalar()
-    log.debug('proxy username: %s', value_count)
-    if value_count > 0:
-        session.execute(insert(metadata_table).values(
-            key='proxy_username',
-            value=select(
-                [metadata_table.c.value],
-                metadata_table.c.key == 'proxy username'
-            ).as_scalar()
-        ))
-    # Copy "proxy password" to "proxy_password"
-    # TODO: Clean up in a subsequent release of OpenLP (like 2.0 final)
-    value_count = session.execute(
-        select(
-            [func.count(metadata_table.c.value)],
-            metadata_table.c.key == 'proxy password'
-        )
-    ).scalar()
-    log.debug('proxy password: %s', value_count)
-    if value_count > 0:
-        session.execute(insert(metadata_table).values(
-            key='proxy_password',
-            value=select(
-                [metadata_table.c.value],
-                metadata_table.c.key == 'proxy password'
-            ).as_scalar()
-        ))
-    # TODO: Clean up in a subsequent release of OpenLP (like 2.0 final)
-    #session.execute(delete(metadata_table)\
-    #    .where(metadata_table.c.key == u'dbversion'))
-    session.commit()
+    log.info('No upgrades to perform')

openlp/plugins/bibles/lib/versereferencelist.py

@@ -94,5 +94,5 @@ class VerseReferenceList(object):
                 result = result + ', ' + version['permission']
         result = result.rstrip()
         if result.endswith(','):
-            return result[:len(result)-1]
+            return result[:len(result) - 1]
         return result

openlp/plugins/custom/customplugin.py

@@ -43,7 +43,7 @@ log = logging.getLogger(__name__)
 
 __default_settings__ = {
     'custom/db type': 'sqlite',
-    'custom/last search type':  CustomSearch.Titles,
+    'custom/last search type': CustomSearch.Titles,
     'custom/display footer': True,
     'custom/add custom from service': True
 }
@@ -97,12 +97,12 @@ class CustomPlugin(Plugin):
         """
         Called to define all translatable texts of the plugin
         """
-        ## Name PluginList ##
+        # Name PluginList
         self.text_strings[StringContent.Name] = {
             'singular': translate('CustomPlugin', 'Custom Slide', 'name singular'),
             'plural': translate('CustomPlugin', 'Custom Slides', 'name plural')
         }
-        ## Name for MediaDockManager, SettingsManager ##
+        # Name for MediaDockManager, SettingsManager
         self.text_strings[StringContent.VisibleName] = {
             'title': translate('CustomPlugin', 'Custom Slides', 'container title')
         }

openlp/plugins/custom/forms/editcustomslidedialog.py

@@ -33,6 +33,7 @@ from openlp.core.common import UiStrings, translate
 from openlp.core.lib import SpellTextEdit
 from openlp.core.lib.ui import create_button, create_button_box
 
+
 class Ui_CustomSlideEditDialog(object):
     def setupUi(self, custom_slide_edit_dialog):
         custom_slide_edit_dialog.setObjectName('custom_slide_edit_dialog')
@@ -45,7 +46,7 @@ class Ui_CustomSlideEditDialog(object):
         self.insert_button = create_button(custom_slide_edit_dialog, 'insertButton',
                                            icon=':/general/general_add.png')
         self.button_box = create_button_box(custom_slide_edit_dialog, 'button_box', ['cancel', 'save'],
-            [self.split_button, self.insert_button])
+                                            [self.split_button, self.insert_button])
         self.dialog_layout.addWidget(self.button_box)
         self.retranslateUi(custom_slide_edit_dialog)
 

openlp/plugins/custom/forms/editcustomslideform.py

@@ -1,4 +1,3 @@
-#lint:disable
 # -*- coding: utf-8 -*-
 # vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
 

openlp/plugins/custom/lib/customxmlhandler.py

@@ -51,7 +51,7 @@ from lxml import etree, objectify
 log = logging.getLogger(__name__)
 
 
-#TODO: These classes need to be refactored into a single class.
+# TODO: These classes need to be refactored into a single class.
 class CustomXMLBuilder(object):
     """
     This class builds the XML used to describe songs.

openlp/plugins/custom/lib/mediaitem.py

@@ -33,8 +33,8 @@ from PyQt4 import QtCore, QtGui
 from sqlalchemy.sql import or_, func, and_
 
 from openlp.core.common import Registry, Settings, UiStrings, translate
-from openlp.core.lib import MediaManagerItem, ItemCapabilities, ServiceItemContext, PluginStatus,\
-   check_item_selected
+from openlp.core.lib import MediaManagerItem, ItemCapabilities, ServiceItemContext, PluginStatus, \
+    check_item_selected
 from openlp.plugins.custom.forms.editcustomform import EditCustomForm
 from openlp.plugins.custom.lib import CustomXMLParser, CustomXMLBuilder
 from openlp.plugins.custom.lib.db import CustomSlide
@@ -105,12 +105,10 @@ class CustomMediaItem(MediaManagerItem):
         """
         Initialise the UI so it can provide Searches
         """
-        self.search_text_edit.set_search_types([(CustomSearch.Titles, ':/songs/song_search_title.png',
-                                                translate('SongsPlugin.MediaItem', 'Titles'),
-                                                translate('SongsPlugin.MediaItem', 'Search Titles...')),
-                                                (CustomSearch.Themes, ':/slides/slide_theme.png', UiStrings().Themes,
-                                                UiStrings().SearchThemes)
-                                                ])
+        self.search_text_edit.set_search_types(
+            [(CustomSearch.Titles, ':/songs/song_search_title.png', translate('SongsPlugin.MediaItem', 'Titles'),
+              translate('SongsPlugin.MediaItem', 'Search Titles...')),
+             (CustomSearch.Themes, ':/slides/slide_theme.png', UiStrings().Themes, UiStrings().SearchThemes)])
         self.search_text_edit.set_current_search_type(Settings().value('%s/last search type' % self.settings_section))
         self.load_list(self.plugin.db_manager.get_all_objects(CustomSlide, order_by_ref=CustomSlide.title))
         self.config_update()
@@ -191,10 +189,9 @@ class CustomMediaItem(MediaManagerItem):
             if QtGui.QMessageBox.question(self, UiStrings().ConfirmDelete,
                                           translate('CustomPlugin.MediaItem',
                                                     'Are you sure you want to delete the %n selected custom slide(s)?',
-                                                    '',
-                                          QtCore.QCoreApplication.CodecForTr, len(items)),
-                                          QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes
-                                                  | QtGui.QMessageBox.No),
+                                                    '', QtCore.QCoreApplication.CodecForTr, len(items)),
+                                          QtGui.QMessageBox.StandardButtons(
+                                              QtGui.QMessageBox.Yes | QtGui.QMessageBox.No),
                                           QtGui.QMessageBox.Yes) == QtGui.QMessageBox.No:
                 return
             row_list = [item.row() for item in self.list_view.selectedIndexes()]
@@ -348,4 +345,3 @@ class CustomMediaItem(MediaManagerItem):
                                                                     func.lower(CustomSlide.text).like(search)),
                                                                 order_by_ref=CustomSlide.title)
         return [[custom.id, custom.title] for custom in search_results]
-

openlp/plugins/images/forms/addgroupform.py

@@ -50,7 +50,8 @@ class AddGroupForm(QtGui.QDialog, Ui_AddGroupDialog):
         Show the form.
 
         :param clear:  Set to False if the text input box should not be cleared when showing the dialog (default: True).
-        :param show_top_level_group:  Set to True when "-- Top level group --" should be showed as first item (default: False).
+        :param show_top_level_group:  Set to True when "-- Top level group --" should be showed as first item
+        (default: False).
         :param selected_group: The ID of the group that should be selected by default when showing the dialog.
         """
         if clear:

openlp/plugins/images/imageplugin.py

@@ -95,12 +95,12 @@ class ImagePlugin(Plugin):
         """
         Called to define all translatable texts of the plugin.
         """
-        ## Name PluginList ##
+        # Name PluginList
         self.text_strings[StringContent.Name] = {
             'singular': translate('ImagePlugin', 'Image', 'name singular'),
             'plural': translate('ImagePlugin', 'Images', 'name plural')
         }
-        ## Name for MediaDockManager, SettingsManager ##
+        # Name for MediaDockManager, SettingsManager
         self.text_strings[StringContent.VisibleName] = {'title': translate('ImagePlugin', 'Images', 'container title')}
         # Middle Header Bar
         tooltips = {

openlp/plugins/images/lib/mediaitem.py

@@ -75,7 +75,7 @@ class ImageMediaItem(MediaManagerItem):
     def retranslateUi(self):
         self.on_new_prompt = translate('ImagePlugin.MediaItem', 'Select Image(s)')
         file_formats = get_images_filter()
-        self.on_new_file_masks = '%s;;%s (*.*) (*)' % (file_formats, UiStrings().AllFiles)
+        self.on_new_file_masks = '%s;;%s (*)' % (file_formats, UiStrings().AllFiles)
         self.add_group_action.setText(UiStrings().AddGroup)
         self.add_group_action.setToolTip(UiStrings().AddGroup)
         self.replace_action.setText(UiStrings().ReplaceBG)
@@ -327,7 +327,8 @@ class ImageMediaItem(MediaManagerItem):
 
         :param images: A List of Image Filenames objects that will be used to reload the mediamanager list.
         :param initial_load: When set to False, the busy cursor and progressbar will be shown while loading images.
-        :param open_group: ImageGroups object of the group that must be expanded after reloading the list in the interface.
+        :param open_group: 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()
@@ -462,7 +463,8 @@ class ImageMediaItem(MediaManagerItem):
 
         :param images_list: A List of strings containing image filenames
         :param group_id: The ID of the group to save the images in
-        :param reload_list: This boolean is set to True when the list in the interface should be reloaded after saving the new images
+        :param reload_list: This boolean is set to True when the list in the interface should be reloaded after saving
+        the new images
         """
         for filename in images_list:
             if not isinstance(filename, str):
@@ -548,6 +550,7 @@ class ImageMediaItem(MediaManagerItem):
         service_item.add_capability(ItemCapabilities.CanPreview)
         service_item.add_capability(ItemCapabilities.CanLoop)
         service_item.add_capability(ItemCapabilities.CanAppend)
+        service_item.add_capability(ItemCapabilities.CanEditTitle)
         # force a nonexistent theme
         service_item.theme = -1
         missing_items_file_names = []

openlp/plugins/media/lib/mediaitem.py

@@ -34,7 +34,7 @@ from PyQt4 import QtCore, QtGui
 
 from openlp.core.common import Registry, RegistryProperties, AppLocation, Settings, check_directory_exists, UiStrings,\
     translate
-from openlp.core.lib import ItemCapabilities, MediaManagerItem,MediaType, ServiceItem, ServiceItemContext, \
+from openlp.core.lib import ItemCapabilities, MediaManagerItem, MediaType, ServiceItem, ServiceItemContext, \
     build_icon, check_item_selected
 from openlp.core.lib.ui import critical_error_message_box, create_horizontal_adjusting_combo_box
 from openlp.core.ui import DisplayController, Display, DisplayControllerType
@@ -95,7 +95,6 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties):
         self.reset_action.setToolTip(UiStrings().ResetLiveBG)
         self.automatic = UiStrings().Automatic
         self.display_type_label.setText(translate('MediaPlugin.MediaItem', 'Use Player:'))
-        #self.rebuild_players()
 
     def required_icons(self):
         """
@@ -141,7 +140,7 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties):
         if index == 0:
             set_media_players(player)
         else:
-            set_media_players(player, player[index-1])
+            set_media_players(player, player[index - 1])
 
     def on_reset_click(self):
         """
@@ -161,7 +160,7 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties):
         Called to replace Live background with the media selected.
         """
         if check_item_selected(self.list_view,
-                               translate('MediaPlugin.MediaItem', 
+                               translate('MediaPlugin.MediaItem',
                                          'You must select a media file to replace the background with.')):
             item = self.list_view.currentItem()
             filename = item.data(QtCore.Qt.UserRole)
@@ -170,12 +169,12 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties):
                 service_item.title = 'webkit'
                 service_item.processor = 'webkit'
                 (path, name) = os.path.split(filename)
-                service_item.add_from_command(path, name,CLAPPERBOARD)
+                service_item.add_from_command(path, name, CLAPPERBOARD)
                 if self.media_controller.video(DisplayControllerType.Live, service_item, video_behind_text=True):
                     self.reset_action.setVisible(True)
                 else:
                     critical_error_message_box(UiStrings().LiveBGError,
-                                               translate('MediaPlugin.MediaItem', 
+                                               translate('MediaPlugin.MediaItem',
                                                          'There was no display item to amend.'))
             else:
                 critical_error_message_box(UiStrings().LiveBGError,
@@ -216,6 +215,7 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties):
             if not self.media_controller.media_length(service_item):
                 return False
         service_item.add_capability(ItemCapabilities.CanAutoStartForLive)
+        service_item.add_capability(ItemCapabilities.CanEditTitle)
         service_item.add_capability(ItemCapabilities.RequiresMedia)
         if Settings().value(self.settings_section + '/media auto start') == QtCore.Qt.Checked:
             service_item.will_auto_start = True

openlp/plugins/media/mediaplugin.py

@@ -73,12 +73,12 @@ class MediaPlugin(Plugin):
         """
         Called to define all translatable texts of the plugin
         """
-        ## Name PluginList ##
+        # Name PluginList
         self.text_strings[StringContent.Name] = {
             'singular': translate('MediaPlugin', 'Media', 'name singular'),
             'plural': translate('MediaPlugin', 'Media', 'name plural')
         }
-        ## Name for MediaDockManager, SettingsManager ##
+        # Name for MediaDockManager, SettingsManager
         self.text_strings[StringContent.VisibleName] = {
             'title': translate('MediaPlugin', 'Media', 'container title')
         }

openlp/plugins/presentations/lib/impresscontroller.py

@@ -29,7 +29,8 @@
 
 # OOo API documentation:
 # http://api.openoffice.org/docs/common/ref/com/sun/star/presentation/XSlideShowController.html
-# http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Basic/Getting_Information_about_UNO_Objects#Inspecting_interfaces_during_debugging
+# http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Basic
+#                          /Getting_Information_about_UNO_Objects#Inspecting_interfaces_during_debugging
 # http://docs.go-oo.org/sd/html/classsd_1_1SlideShow.html
 # http://www.oooforum.org/forum/viewtopic.phtml?t=5252
 # http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/Working_with_Presentations
@@ -45,6 +46,7 @@ if os.name == 'nt':
     from win32com.client import Dispatch
     import pywintypes
     # Declare an empty exception to match the exception imported from UNO
+
     class ErrorCodeIOException(Exception):
         pass
 else:
@@ -204,7 +206,7 @@ class ImpressDocument(PresentationDocument):
     Class which holds information and controls a single presentation.
     """
 
-    def __init__ (self, controller, presentation):
+    def __init__(self, controller, presentation):
         """
         Constructor, store information about the file and initialise.
         """
@@ -354,7 +356,7 @@ class ImpressDocument(PresentationDocument):
         log.debug('unblank screen OpenOffice')
         return self.control.resume()
 
-    def blank_screen (self):
+    def blank_screen(self):
         """
         Blanks the screen.
         """
@@ -376,8 +378,6 @@ class ImpressDocument(PresentationDocument):
         Stop the presentation, remove from screen.
         """
         log.debug('stop presentation OpenOffice')
-        # deactivate should hide the screen according to docs, but doesn't
-        #self.control.deactivate()
         self.presentation.end()
         self.control = None
 

openlp/plugins/presentations/lib/mediaitem.py

@@ -263,6 +263,7 @@ class PresentationMediaItem(MediaManagerItem):
         file_type = os.path.splitext(filename)[1][1:]
         if not self.display_type_combo_box.currentText():
             return False
+        service_item.add_capability(ItemCapabilities.CanEditTitle)
         if (file_type == 'pdf' or file_type == 'xps') and context != ServiceItemContext.Service:
             service_item.add_capability(ItemCapabilities.CanMaintain)
             service_item.add_capability(ItemCapabilities.CanPreview)

openlp/plugins/presentations/lib/pdfcontroller.py

@@ -74,7 +74,7 @@ class PdfController(PresentationController):
         runlog = ''
         log.debug('testing program_path: %s', program_path)
         try:
-            runlog = check_output([program_path,  '--help'], stderr=STDOUT)
+            runlog = check_output([program_path, '--help'], stderr=STDOUT)
         except CalledProcessError as e:
             runlog = e.output
         except Exception:
@@ -132,7 +132,8 @@ class PdfController(PresentationController):
                 DEVNULL = open(os.devnull, 'wb')
                 # First try to find mupdf
                 try:
-                    self.mudrawbin = check_output(['which', 'mudraw'], stderr=DEVNULL).decode(encoding='UTF-8').rstrip('\n')
+                    self.mudrawbin = check_output(['which', 'mudraw'],
+                                                  stderr=DEVNULL).decode(encoding='UTF-8').rstrip('\n')
                 except CalledProcessError:
                     self.mudrawbin = ''
                 # if mupdf isn't installed, fallback to ghostscript
@@ -182,7 +183,7 @@ class PdfDocument(PresentationDocument):
         self.image_files = []
         self.num_pages = -1
 
-    def gs_get_resolution(self,  size):
+    def gs_get_resolution(self, size):
         """
         Only used when using ghostscript
         Ghostscript can't scale automatically while keeping aspect like mupdf, so we need
@@ -192,7 +193,8 @@ class PdfDocument(PresentationDocument):
         :return: The resolution dpi to be used.
         """
         # Use a postscript script to get size of the pdf. It is assumed that all pages have same size
-        gs_resolution_script = AppLocation.get_directory(AppLocation.PluginsDir) + '/presentations/lib/ghostscript_get_resolution.ps'
+        gs_resolution_script = AppLocation.get_directory(
+            AppLocation.PluginsDir) + '/presentations/lib/ghostscript_get_resolution.ps'
         # Run the script on the pdf to get the size
         runlog = []
         try:
@@ -202,19 +204,19 @@ class PdfDocument(PresentationDocument):
             log.debug(' '.join(e.cmd))
             log.debug(e.output)
         # Extract the pdf resolution from output, the format is " Size: x: <width>, y: <height>"
-        width = 0
-        height = 0
+        width = 0.0
+        height = 0.0
         for line in runlog.splitlines():
             try:
-                width = int(re.search('.*Size: x: (\d+\.?\d*), y: \d+.*', line.decode()).group(1))
-                height = int(re.search('.*Size: x: \d+\.?\d*, y: (\d+\.?\d*).*', line.decode()).group(1))
+                width = float(re.search('.*Size: x: (\d+\.?\d*), y: \d+.*', line.decode()).group(1))
+                height = float(re.search('.*Size: x: \d+\.?\d*, y: (\d+\.?\d*).*', line.decode()).group(1))
                 break
             except AttributeError:
-                pass
+                continue
         # Calculate the ratio from pdf to screen
         if width > 0 and height > 0:
-            width_ratio = size.right() / float(width)
-            height_ratio = size.bottom() / float(height)
+            width_ratio = size.right() / width
+            height_ratio = size.bottom() / height
             # return the resolution that should be used. 72 is default.
             if width_ratio > height_ratio:
                 return int(height_ratio * 72)
@@ -234,7 +236,7 @@ class PdfDocument(PresentationDocument):
         if os.path.isfile(os.path.join(self.get_temp_folder(), 'mainslide001.png')):
             created_files = sorted(os.listdir(self.get_temp_folder()))
             for fn in created_files:
-                if os.path.isfile(os.path.join(self.get_temp_folder(),  fn)):
+                if os.path.isfile(os.path.join(self.get_temp_folder(), fn)):
                     self.image_files.append(os.path.join(self.get_temp_folder(), fn))
             self.num_pages = len(self.image_files)
             return True

openlp/plugins/presentations/lib/powerpointcontroller.py

@@ -252,7 +252,7 @@ class PowerpointDocument(PresentationDocument):
             Starts a presentation from the beginning.
             """
             log.debug('start_presentation')
-            #SlideShowWindow measures its size/position by points, not pixels
+            # SlideShowWindow measures its size/position by points, not pixels
             try:
                 dpi = win32ui.GetActiveWindow().GetDC().GetDeviceCaps(88)
             except win32ui.error:

openlp/plugins/presentations/lib/pptviewcontroller.py

@@ -39,6 +39,7 @@ if os.name == 'nt':
     from ctypes import cdll
     from ctypes.wintypes import RECT
 
+from openlp.core.utils import AppLocation
 from openlp.core.lib import ScreenList
 from .presentationcontroller import PresentationController, PresentationDocument
 
@@ -90,8 +91,8 @@ class PptviewController(PresentationController):
             if self.process:
                 return
             log.debug('start PPTView')
-            dll_path = os.path.join(
-                self.plugin_manager.base_path, 'presentations', 'lib', 'pptviewlib', 'pptviewlib.dll')
+            dll_path = os.path.join(AppLocation.get_directory(AppLocation.AppDir),
+                                    'plugins', 'presentations', 'lib', 'pptviewlib', 'pptviewlib.dll')
             self.process = cdll.LoadLibrary(dll_path)
             if log.isEnabledFor(logging.DEBUG):
                 self.process.SetDebug(1)

openlp/plugins/presentations/lib/pptviewlib/ppttest.py

@@ -32,6 +32,7 @@ from PyQt4 import QtGui, QtCore
 from ctypes import *
 from ctypes.wintypes import RECT
 
+
 class PPTViewer(QtGui.QWidget):
     """
     Standalone Test Harness for the pptviewlib library
@@ -169,16 +170,16 @@ class PPTViewer(QtGui.QWidget):
         app.processEvents()
 
     def openClick(self):
-        oldid = self.pptid;
+        oldid = self.pptid
         rect = RECT(int(self.xEdit.text()), int(self.yEdit.text()),
-            int(self.widthEdit.text()), int(self.heightEdit.text()))
+                    int(self.widthEdit.text()), int(self.heightEdit.text()))
         filename = str(self.pptEdit.text().replace('/', '\\'))
         folder = str(self.folderEdit.text().replace('/', '\\'))
         print(filename, folder)
         self.pptid = self.pptdll.OpenPPT(filename, None, rect, folder)
         print('id: ' + str(self.pptid))
         if oldid >= 0:
-            self.pptdll.ClosePPT(oldid);
+            self.pptdll.ClosePPT(oldid)
         slides = self.pptdll.GetSlideCount(self.pptid)
         print('slidecount: ' + str(slides))
         self.total.setNum(self.pptdll.GetSlideCount(self.pptid))
@@ -201,8 +202,7 @@ class PPTViewer(QtGui.QWidget):
         app.processEvents()
 
     def openDialog(self):
-        self.pptEdit.setText(QtGui.QFileDialog.getOpenFileName(self,
-            'Open file'))
+        self.pptEdit.setText(QtGui.QFileDialog.getOpenFileName(self, 'Open file'))
 
 if __name__ == '__main__':
     pptdll = cdll.LoadLibrary(r'pptviewlib.dll')

openlp/plugins/presentations/lib/presentationcontroller.py

@@ -122,8 +122,10 @@ class PresentationDocument(object):
         a file, e.g. thumbnails
         """
         try:
-            shutil.rmtree(self.get_thumbnail_folder())
-            shutil.rmtree(self.get_temp_folder())
+            if os.path.exists(self.get_thumbnail_folder()):
+                shutil.rmtree(self.get_thumbnail_folder())
+            if os.path.exists(self.get_temp_folder()):
+                shutil.rmtree(self.get_temp_folder())
         except OSError:
             log.exception('Failed to delete presentation controller files')
 

openlp/plugins/presentations/lib/presentationtab.py

@@ -175,10 +175,10 @@ class PresentationTab(SettingsTab):
         if pdf_program == '':
             enable_pdf_program = 0
         if pdf_program != Settings().value(self.settings_section + '/pdf_program'):
-            Settings().setValue(self.settings_section + '/pdf_program',  pdf_program)
+            Settings().setValue(self.settings_section + '/pdf_program', pdf_program)
             changed = True
         if enable_pdf_program != Settings().value(self.settings_section + '/enable_pdf_program'):
-            Settings().setValue(self.settings_section + '/enable_pdf_program',  enable_pdf_program)
+            Settings().setValue(self.settings_section + '/enable_pdf_program', enable_pdf_program)
             changed = True
         if changed:
             self.settings_form.register_post_process('mediaitem_suffix_reset')

openlp/plugins/presentations/presentationplugin.py

@@ -156,12 +156,12 @@ class PresentationPlugin(Plugin):
         """
         Called to define all translatable texts of the plugin.
         """
-        ## Name PluginList ##
+        # Name PluginList
         self.text_strings[StringContent.Name] = {
             'singular': translate('PresentationPlugin', 'Presentation', 'name singular'),
             'plural': translate('PresentationPlugin', 'Presentations', 'name plural')
         }
-        ## Name for MediaDockManager, SettingsManager ##
+        # Name for MediaDockManager, SettingsManager
         self.text_strings[StringContent.VisibleName] = {
             'title': translate('PresentationPlugin', 'Presentations', 'container title')
         }

openlp/plugins/remotes/lib/httpserver.py

@@ -28,15 +28,15 @@
 ###############################################################################
 
 """
-The :mod:`http` module contains the API web server. This is a lightweight web
-server used by remotes to interact with OpenLP. It uses JSON to communicate with
-the remotes.
+The :mod:`http` module contains the API web server. This is a lightweight web server used by remotes to interact
+with OpenLP. It uses JSON to communicate with the remotes.
 """
 
 import ssl
 import socket
 import os
 import logging
+import time
 
 from PyQt4 import QtCore
 
@@ -53,8 +53,8 @@ log = logging.getLogger(__name__)
 class CustomHandler(BaseHTTPRequestHandler, HttpRouter):
     """
     Stateless session handler to handle the HTTP request and process it.
-    This class handles just the overrides to the base methods and the logic to invoke the
-    methods within the HttpRouter class.
+    This class handles just the overrides to the base methods and the logic to invoke the methods within the HttpRouter
+    class.
     DO not try change the structure as this is as per the documentation.
     """
 
@@ -116,9 +116,20 @@ class OpenLPServer():
             log.debug('Started ssl httpd...')
         else:
             port = Settings().value(self.settings_section + '/port')
-            self.httpd = ThreadingHTTPServer((address, port), CustomHandler)
+            loop = 1
+            while loop < 3:
+                try:
+                    self.httpd = ThreadingHTTPServer((address, port), CustomHandler)
+                except OSError:
+                    loop += 1
+                    time.sleep(0.1)
+                except:
+                    log.error('Failed to start server ')
             log.debug('Started non ssl httpd...')
-        self.httpd.serve_forever()
+        if hasattr(self, 'httpd') and self.httpd:
+            self.httpd.serve_forever()
+        else:
+            log.debug('Failed to start server')
 
     def stop_server(self):
         """
@@ -144,6 +155,3 @@ class HTTPSServer(HTTPServer):
             server_side=True)
         self.server_bind()
         self.server_activate()
-
-
-

openlp/plugins/remotes/lib/remotetab.py

@@ -225,7 +225,8 @@ class RemoteTab(SettingsTab):
                     continue
                 for address in interface.addressEntries():
                     ip = address.ip()
-                    if ip.protocol() == QtNetwork.QAbstractSocket.IPv4Protocol and ip != QtNetwork.QHostAddress.LocalHost:
+                    if ip.protocol() == QtNetwork.QAbstractSocket.IPv4Protocol and \
+                       ip != QtNetwork.QHostAddress.LocalHost:
                         return ip.toString()
         return ip_address
 
@@ -262,9 +263,9 @@ class RemoteTab(SettingsTab):
                 Settings().value(self.settings_section + '/port') != self.port_spin_box.value() or \
                 Settings().value(self.settings_section + '/https port') != self.https_port_spin_box.value() or \
                 Settings().value(self.settings_section + '/https enabled') != \
-                        self.https_settings_group_box.isChecked() or \
+                self.https_settings_group_box.isChecked() or \
                 Settings().value(self.settings_section + '/authentication enabled') != \
-                        self.user_login_group_box.isChecked():
+                self.user_login_group_box.isChecked():
             self.settings_form.register_post_process('remotes_config_updated')
         Settings().setValue(self.settings_section + '/port', self.port_spin_box.value())
         Settings().setValue(self.settings_section + '/https port', self.https_port_spin_box.value())

openlp/plugins/remotes/remoteplugin.py

@@ -37,14 +37,14 @@ from openlp.plugins.remotes.lib import RemoteTab, OpenLPServer, WebSocketManager
 log = logging.getLogger(__name__)
 
 __default_settings__ = {
-        'remotes/twelve hour': True,
-        'remotes/port': 4316,
-        'remotes/https port': 4317,
-        'remotes/https enabled': False,
-        'remotes/user id': 'openlp',
-        'remotes/password': 'password',
-        'remotes/authentication enabled': False,
-        'remotes/ip address': '0.0.0.0'
+    'remotes/twelve hour': True,
+    'remotes/port': 4316,
+    'remotes/https port': 4317,
+    'remotes/https enabled': False,
+    'remotes/user id': 'openlp',
+    'remotes/password': 'password',
+    'remotes/authentication enabled': False,
+    'remotes/ip address': '0.0.0.0'
 }
 
 
@@ -100,12 +100,12 @@ class RemotesPlugin(Plugin):
         """
         Called to define all translatable texts of the plugin
         """
-        ## Name PluginList ##
+        # Name PluginList
         self.text_strings[StringContent.Name] = {
             'singular': translate('RemotePlugin', 'Remote', 'name singular'),
             'plural': translate('RemotePlugin', 'Remotes', 'name plural')
         }
-        ## Name for MediaDockManager, SettingsManager ##
+        # Name for MediaDockManager, SettingsManager
         self.text_strings[StringContent.VisibleName] = {
             'title': translate('RemotePlugin', 'Remote', 'container title')
         }