r1955

openlp/core/lib/__init__.py

@@ -62,6 +62,7 @@ class ServiceItemAction(object):
     PreviousLastSlide = 2
     Next = 3
 
+
 def translate(context, text, comment=None,
     encoding=QtCore.QCoreApplication.CodecForTr, n=-1,
     translate=QtCore.QCoreApplication.translate):
@@ -83,6 +84,7 @@ def translate(context, text, comment=None,
     """
     return translate(context, text, comment, encoding, n)
 
+
 def get_text_file_string(text_file):
     """
     Open a file and return its content as unicode string. If the supplied file
@@ -111,6 +113,7 @@ def get_text_file_string(text_file):
             file_handle.close()
     return content_string
 
+
 def str_to_bool(stringvalue):
     """
     Convert a string version of a boolean into a real boolean.
@@ -122,6 +125,7 @@ def str_to_bool(stringvalue):
         return stringvalue
     return unicode(stringvalue).strip().lower() in (u'true', u'yes', u'y')
 
+
 def build_icon(icon):
     """
     Build a QIcon instance from an existing QIcon, a resource location, or a
@@ -148,6 +152,7 @@ def build_icon(icon):
             QtGui.QIcon.Normal, QtGui.QIcon.Off)
     return button_icon
 
+
 def image_to_byte(image):
     """
     Resize an image to fit on the current screen for the web and returns
@@ -166,6 +171,7 @@ def image_to_byte(image):
     # convert to base64 encoding so does not get missed!
     return byte_array.toBase64()
 
+
 def create_thumb(image_path, thumb_path, return_icon=True, size=None):
     """
     Create a thumbnail from the given image path and depending on
@@ -201,6 +207,7 @@ def create_thumb(image_path, thumb_path, return_icon=True, size=None):
     # Fallback for files with animation support.
     return build_icon(unicode(image_path))
 
+
 def validate_thumb(file_path, thumb_path):
     """
     Validates whether an file's thumb still exists and if is up to date.
@@ -219,6 +226,7 @@ def validate_thumb(file_path, thumb_path):
     thumb_date = os.stat(thumb_path).st_mtime
     return image_date <= thumb_date
 
+
 def resize_image(image_path, width, height, background=u'#000000'):
     """
     Resize an image to fit on the current screen.
@@ -266,6 +274,7 @@ def resize_image(image_path, width, height, background=u'#000000'):
     painter.drawImage((width - realw) / 2, (height - realh) / 2, preview)
     return new_image
 
+
 def check_item_selected(list_widget, message):
     """
     Check if a list item is selected so an action may be performed on it
@@ -282,6 +291,7 @@ def check_item_selected(list_widget, message):
         return False
     return True
 
+
 def clean_tags(text):
     """
     Remove Tags from text for display
@@ -294,6 +304,7 @@ def clean_tags(text):
         text = text.replace(tag[u'end tag'], u'')
     return text
 
+
 def expand_tags(text):
     """
     Expand tags HTML for display
@@ -303,6 +314,7 @@ def expand_tags(text):
         text = text.replace(tag[u'end tag'], tag[u'end html'])
     return text
 
+
 def check_directory_exists(dir):
     """
     Check a theme directory exists and if not create it
@@ -317,6 +329,7 @@ def check_directory_exists(dir):
     except IOError:
         pass
 
+
 def create_separated_list(stringlist):
     """
     Returns a string that represents a join of a list of strings with a
@@ -345,6 +358,7 @@ def create_separated_list(stringlist):
         return unicode(translate('OpenLP.core.lib', '%1, %2',
             u'Locale list separator: start').arg(stringlist[0], merged))
 
+
 from eventreceiver import Receiver
 from listwidgetwithdnd import ListWidgetWithDnD
 from formattingtags import FormattingTags

openlp/core/lib/mediamanageritem.py

@@ -582,7 +582,7 @@ class MediaManagerItem(QtGui.QWidget):
         Common method for generating a service item
         """
         serviceItem = ServiceItem(self.plugin)
-        serviceItem.add_icon(self.plugin.icon_path)
+        serviceItem.add_icon(self.plugin.iconPath)
         if self.generateSlideData(serviceItem, item, xmlVersion, remote):
             return serviceItem
         else:

openlp/core/lib/plugin.py

@@ -155,9 +155,9 @@ class Plugin(QtCore.QObject):
             self.version = get_application_version()[u'version']
         self.settingsSection = self.name
         self.icon = None
-        self.media_item_class = media_item_class
-        self.settings_tab_class = settings_tab_class
-        self.settings_tab = None
+        self.mediaItemClass = media_item_class
+        self.settingsTabClass = settings_tab_class
+        self.settingsTab = None
         self.mediaItem = None
         self.weight = 0
         self.status = PluginStatus.Inactive
@@ -166,9 +166,9 @@ class Plugin(QtCore.QObject):
         self.renderer = plugin_helpers[u'renderer']
         self.serviceManager = plugin_helpers[u'service']
         self.settingsForm = plugin_helpers[u'settings form']
-        self.mediadock = plugin_helpers[u'toolbox']
+        self.mediaDock = plugin_helpers[u'toolbox']
         self.pluginManager = plugin_helpers[u'pluginmanager']
-        self.formparent = plugin_helpers[u'formparent']
+        self.formParent = plugin_helpers[u'formparent']
         self.mediaController = plugin_helpers[u'mediacontroller']
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'%s_add_service_item' % self.name),
@@ -219,8 +219,8 @@ class Plugin(QtCore.QObject):
         Construct a MediaManagerItem object with all the buttons and things
         you need, and return it for integration into OpenLP.
         """
-        if self.media_item_class:
-            self.mediaItem = self.media_item_class(self.mediadock.media_dock,
+        if self.mediaItemClass:
+            self.mediaItem = self.mediaItemClass(self.mediaDock.media_dock,
                 self, self.icon)
 
     def addImportMenuItem(self, importMenu):
@@ -255,10 +255,10 @@ class Plugin(QtCore.QObject):
         Create a tab for the settings window to display the configurable options
         for this plugin to the user.
         """
-        if self.settings_tab_class:
-            self.settings_tab = self.settings_tab_class(parent, self.name,
+        if self.settingsTabClass:
+            self.settingsTab = self.settingsTabClass(parent, self.name,
                 self.getString(StringContent.VisibleName)[u'title'],
-                self.icon_path)
+                self.iconPath)
 
     def addToMenu(self, menubar):
         """
@@ -294,14 +294,14 @@ class Plugin(QtCore.QObject):
         """
         if self.mediaItem:
             self.mediaItem.initialise()
-            self.mediadock.insert_dock(self.mediaItem, self.icon, self.weight)
+            self.mediaDock.insert_dock(self.mediaItem, self.icon, self.weight)
 
     def finalise(self):
         """
         Called by the plugin Manager to cleanup things.
         """
         if self.mediaItem:
-            self.mediadock.remove_dock(self.mediaItem)
+            self.mediaDock.remove_dock(self.mediaItem)
 
     def appStartup(self):
         """

openlp/core/lib/renderer.py

@@ -364,7 +364,7 @@ class Renderer(object):
         self.web.setVisible(False)
         self.web.resize(self.page_width, self.page_height)
         self.web_frame = self.web.page().mainFrame()
-        # Adjust width and height to account for shadow. outline done in css
+        # Adjust width and height to account for shadow. outline done in css.
         html = u"""<!DOCTYPE html><html><head><script>
             function show_text(newtext) {
                 var main = document.getElementById('main');

openlp/core/lib/settingsmanager.py

@@ -104,7 +104,7 @@ class SettingsManager(object):
             u'%s count' % name, QtCore.QVariant(0)).toInt()[0]
         new_count = len(list)
         settings.setValue(u'%s count' % name, QtCore.QVariant(new_count))
-        for counter in range (0, new_count):
+        for counter in range(new_count):
             settings.setValue(
                 u'%s %d' % (name, counter), QtCore.QVariant(list[counter-1]))
         if old_count > new_count:
@@ -130,7 +130,7 @@ class SettingsManager(object):
             u'%s count' % name, QtCore.QVariant(0)).toInt()[0]
         list = []
         if list_count:
-            for counter in range(0, list_count):
+            for counter in range(list_count):
                 item = unicode(
                     settings.value(u'%s %d' % (name, counter)).toString())
                 if item:

openlp/core/lib/settingstab.py

@@ -47,7 +47,7 @@ class SettingsTab(QtGui.QWidget):
         self.tabTitleVisible = visible_title
         self.settingsSection = self.tabTitle.lower()
         if icon_path:
-            self.icon_path = icon_path
+            self.iconPath = icon_path
         self.setupUi()
         self.retranslateUi()
         self.initialise()

openlp/core/lib/ui.py

@@ -143,6 +143,7 @@ class UiStrings(object):
         self.View = translate('OpenLP.Ui', 'View')
         self.ViewMode = translate('OpenLP.Ui', 'View Mode')
 
+
 def add_welcome_page(parent, image):
     """
     Generate an opening welcome page for a wizard using a provided image.
@@ -170,6 +171,7 @@ def add_welcome_page(parent, image):
     parent.welcomeLayout.addStretch()
     parent.addPage(parent.welcomePage)
 
+
 def create_button_box(dialog, name, standard_buttons, custom_buttons=[]):
     """
     Creates a QDialogButtonBox with the given buttons. The ``accepted()`` and
@@ -216,6 +218,7 @@ def create_button_box(dialog, name, standard_buttons, custom_buttons=[]):
         dialog.reject)
     return button_box
 
+
 def critical_error_message_box(title=None, message=None, parent=None,
     question=False):
     """
@@ -242,6 +245,7 @@ def critical_error_message_box(title=None, message=None, parent=None,
     data[u'title'] = title if title else UiStrings().Error
     return Receiver.send_message(u'openlp_error_message', data)
 
+
 def create_horizontal_adjusting_combo_box(parent, name):
     """
     Creates a QComboBox with adapting width for media items.
@@ -258,6 +262,7 @@ def create_horizontal_adjusting_combo_box(parent, name):
     combo.setSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
     return combo
 
+
 def create_button(parent, name, **kwargs):
     """
     Return an button with the object name set and the given parameters.
@@ -324,6 +329,7 @@ def create_button(parent, name, **kwargs):
             log.warn(u'Parameter %s was not consumed in create_button().', key)
     return button
 
+
 def create_action(parent, name, **kwargs):
     """
     Return an action with the object name set and the given parameters.
@@ -411,6 +417,7 @@ def create_action(parent, name, **kwargs):
             log.warn(u'Parameter %s was not consumed in create_action().', key)
     return action
 
+
 def create_widget_action(parent, name=u'', **kwargs):
     """
     Return a new QAction by calling ``create_action(parent, name, **kwargs)``.
@@ -422,6 +429,7 @@ def create_widget_action(parent, name=u'', **kwargs):
     parent.addAction(action)
     return action
 
+
 def set_case_insensitive_completer(cache, widget):
     """
     Sets a case insensitive text completer for a widget.
@@ -436,6 +444,7 @@ def set_case_insensitive_completer(cache, widget):
     completer.setCaseSensitivity(QtCore.Qt.CaseInsensitive)
     widget.setCompleter(completer)
 
+
 def create_valign_selection_widgets(parent):
     """
     Creates a standard label and combo box for asking users to select a
@@ -455,6 +464,7 @@ def create_valign_selection_widgets(parent):
     label.setBuddy(combo_box)
     return label, combo_box
 
+
 def find_and_set_in_combo_box(combo_box, value_to_find):
     """
     Find a string in a combo box and set it as the selected item if present

openlp/core/ui/advancedtab.py

@@ -59,7 +59,7 @@ class AdvancedTab(SettingsTab):
             '#strftime-strptime-behavior for more information.'))
         self.defaultImage = u':/graphics/openlp-splash-screen.png'
         self.defaultColor = u'#ffffff'
-        self.icon_path = u':/system/system_settings.png'
+        self.iconPath = u':/system/system_settings.png'
         advanced_translated = translate('OpenLP.AdvancedTab', 'Advanced')
         SettingsTab.__init__(self, parent, u'Advanced', advanced_translated)
 

openlp/core/ui/exceptionform.py

@@ -77,6 +77,8 @@ try:
     UNO_VERSION = node.getByName(u'ooSetupVersion')
 except ImportError:
     UNO_VERSION = u'-'
+except:
+    UNO_VERSION = u'- (Possible non-standard UNO installation)'
 try:
     WEBKIT_VERSION = QtWebKit.qWebKitVersion()
 except AttributeError:

openlp/core/ui/generaltab.py

@@ -43,7 +43,7 @@ class GeneralTab(SettingsTab):
         Initialise the general settings tab
         """
         self.screens = ScreenList.get_instance()
-        self.icon_path = u':/icon/openlp-logo-16x16.png'
+        self.iconPath = u':/icon/openlp-logo-16x16.png'
         generalTranslated = translate('OpenLP.GeneralTab', 'General')
         SettingsTab.__init__(self, parent, u'General', generalTranslated)
 

openlp/core/ui/mainwindow.py

@@ -554,9 +554,9 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         # (not for use by plugins)
         self.uiSettingsSection = u'user interface'
         self.generalSettingsSection = u'general'
-        self.advancedlSettingsSection = u'advanced'
+        self.advancedSettingsSection = u'advanced'
         self.shortcutsSettingsSection = u'shortcuts'
-        self.servicemanagerSettingsSection = u'servicemanager'
+        self.serviceManagerSettingsSection = u'servicemanager'
         self.songsSettingsSection = u'songs'
         self.themesSettingsSection = u'themes'
         self.displayTagsSection = u'displayTags'
@@ -568,8 +568,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         self.shortcutForm = ShortcutListForm(self)
         self.recentFiles = QtCore.QStringList()
         # Set up the path with plugins
-        pluginpath = AppLocation.get_directory(AppLocation.PluginsDir)
-        self.pluginManager = PluginManager(pluginpath)
+        plugin_path = AppLocation.get_directory(AppLocation.PluginsDir)
+        self.pluginManager = PluginManager(plugin_path)
         self.pluginHelpers = {}
         self.imageManager = ImageManager()
         self.mediaController = MediaController(self)
@@ -661,7 +661,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         self.pluginHelpers[u'pluginmanager'] = self.pluginManager
         self.pluginHelpers[u'formparent'] = self
         self.pluginHelpers[u'mediacontroller'] = self.mediaController
-        self.pluginManager.find_plugins(pluginpath, self.pluginHelpers)
+        self.pluginManager.find_plugins(plugin_path, self.pluginHelpers)
         # hook methods have to happen after find_plugins. Find plugins needs
         # the controllers hence the hooks have moved from setupUI() to here
         # Find and insert settings tabs
@@ -944,10 +944,10 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         setting_sections = []
         # Add main sections.
         setting_sections.extend([self.generalSettingsSection])
-        setting_sections.extend([self.advancedlSettingsSection])
+        setting_sections.extend([self.advancedSettingsSection])
         setting_sections.extend([self.uiSettingsSection])
         setting_sections.extend([self.shortcutsSettingsSection])
-        setting_sections.extend([self.servicemanagerSettingsSection])
+        setting_sections.extend([self.serviceManagerSettingsSection])
         setting_sections.extend([self.themesSettingsSection])
         setting_sections.extend([self.displayTagsSection])
         setting_sections.extend([self.headerSection])
@@ -1027,10 +1027,10 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         setting_sections = []
         # Add main sections.
         setting_sections.extend([self.generalSettingsSection])
-        setting_sections.extend([self.advancedlSettingsSection])
+        setting_sections.extend([self.advancedSettingsSection])
         setting_sections.extend([self.uiSettingsSection])
         setting_sections.extend([self.shortcutsSettingsSection])
-        setting_sections.extend([self.servicemanagerSettingsSection])
+        setting_sections.extend([self.serviceManagerSettingsSection])
         setting_sections.extend([self.themesSettingsSection])
         setting_sections.extend([self.displayTagsSection])
         # Add plugin sections.
@@ -1314,10 +1314,10 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             u'/enable slide loop'):
             if QtCore.QSettings().value(self.generalSettingsSection +
                 u'/enable slide loop', QtCore.QVariant(True)).toBool():
-                QtCore.QSettings().setValue(self.advancedlSettingsSection +
+                QtCore.QSettings().setValue(self.advancedSettingsSection +
                     u'/slide limits', QtCore.QVariant(SlideLimits.Wrap))
             else:
-                QtCore.QSettings().setValue(self.advancedlSettingsSection +
+                QtCore.QSettings().setValue(self.advancedSettingsSection +
                     u'/slide limits', QtCore.QVariant(SlideLimits.End))
             QtCore.QSettings().remove(self.generalSettingsSection +
                 u'/enable slide loop')

openlp/core/ui/servicemanager.py

@@ -272,7 +272,7 @@ class ServiceManager(QtGui.QWidget):
             QtCore.SIGNAL(u'service_item_update'), self.serviceItemUpdate)
         # Last little bits of setting up
         self.service_theme = unicode(QtCore.QSettings().value(
-            self.mainwindow.servicemanagerSettingsSection + u'/service theme',
+            self.mainwindow.serviceManagerSettingsSection + u'/service theme',
             QtCore.QVariant(u'')).toString())
         self.servicePath = AppLocation.get_section_data_path(u'servicemanager')
         # build the drag and drop context menu
@@ -411,7 +411,7 @@ class ServiceManager(QtGui.QWidget):
                 self.mainwindow,
                 translate('OpenLP.ServiceManager', 'Open File'),
                 SettingsManager.get_last_dir(
-                self.mainwindow.servicemanagerSettingsSection),
+                self.mainwindow.serviceManagerSettingsSection),
                 translate('OpenLP.ServiceManager',
                 'OpenLP Service Files (*.osz)')))
             if not fileName:
@@ -419,7 +419,7 @@ class ServiceManager(QtGui.QWidget):
         else:
             fileName = loadFile
         SettingsManager.set_last_dir(
-            self.mainwindow.servicemanagerSettingsSection,
+            self.mainwindow.serviceManagerSettingsSection,
             split_filename(fileName)[0])
         self.loadFile(fileName)
 
@@ -469,7 +469,7 @@ class ServiceManager(QtGui.QWidget):
         service_file_name = '%s.osd' % basename
         log.debug(u'ServiceManager.saveFile - %s', path_file_name)
         SettingsManager.set_last_dir(
-            self.mainwindow.servicemanagerSettingsSection,
+            self.mainwindow.serviceManagerSettingsSection,
             path)
         service = []
         write_list = []
@@ -622,7 +622,7 @@ class ServiceManager(QtGui.QWidget):
         else:
             default_filename = u''
         directory = unicode(SettingsManager.get_last_dir(
-            self.mainwindow.servicemanagerSettingsSection))
+            self.mainwindow.serviceManagerSettingsSection))
         path = os.path.join(directory, default_filename)
         fileName = unicode(QtGui.QFileDialog.getSaveFileName(self.mainwindow,
             UiStrings().SaveService, path,
@@ -1107,7 +1107,7 @@ class ServiceManager(QtGui.QWidget):
         self.service_theme = unicode(self.themeComboBox.currentText())
         self.mainwindow.renderer.set_service_theme(self.service_theme)
         QtCore.QSettings().setValue(
-            self.mainwindow.servicemanagerSettingsSection +
+            self.mainwindow.serviceManagerSettingsSection +
                 u'/service theme',
             QtCore.QVariant(self.service_theme))
         self.regenerateServiceItems(True)

openlp/core/ui/settingsform.py

@@ -65,8 +65,8 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
         self.insertTab(self.advancedTab, 2, PluginStatus.Active)
         count = 3
         for plugin in self.plugins:
-            if plugin.settings_tab:
-                self.insertTab(plugin.settings_tab, count, plugin.status)
+            if plugin.settingsTab:
+                self.insertTab(plugin.settingsTab, count, plugin.status)
                 count += 1
         self.settingListWidget.setCurrentRow(0)
         return QtGui.QDialog.exec_(self)
@@ -80,7 +80,7 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
         pos = self.stackedLayout.addWidget(tab)
         if is_active:
             item_name = QtGui.QListWidgetItem(tab.tabTitleVisible)
-            icon = build_icon(tab.icon_path)
+            icon = build_icon(tab.iconPath)
             item_name.setIcon(icon)
             self.settingListWidget.insertItem(location, item_name)
         else:
@@ -114,8 +114,8 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
         self.themesTab.postSetUp()
         self.advancedTab.postSetUp()
         for plugin in self.plugins:
-            if plugin.settings_tab:
-                plugin.settings_tab.postSetUp()
+            if plugin.settingsTab:
+                plugin.settingsTab.postSetUp()
 
     def tabChanged(self, tabIndex):
         """

openlp/core/ui/slidecontroller.py

@@ -648,8 +648,8 @@ class SlideController(Controller):
 
     def onSongBarHandler(self):
         request = unicode(self.sender().text())
-        slideno = self.slideList[request]
-        self.__updatePreviewSelection(slideno)
+        slide_no = self.slideList[request]
+        self.__updatePreviewSelection(slide_no)
         self.slideSelected()
 
     def receiveSpinDelay(self, value):
@@ -663,7 +663,7 @@ class SlideController(Controller):
         Updates the Slide Limits variable from the settings.
         """
         self.slide_limits = QtCore.QSettings().value(
-            self.parent().advancedlSettingsSection + u'/slide limits',
+            self.parent().advancedSettingsSection + u'/slide limits',
             QtCore.QVariant(SlideLimits.End)).toInt()[0]
 
     def enableToolBar(self, item):

openlp/core/ui/themestab.py

@@ -39,7 +39,7 @@ class ThemesTab(SettingsTab):
         self.mainwindow = mainwindow
         generalTranslated = translate('OpenLP.ThemesTab', 'Themes')
         SettingsTab.__init__(self, parent, u'Themes', generalTranslated)
-        self.icon_path = u':/themes/theme_new.png'
+        self.iconPath = u':/themes/theme_new.png'
 
     def setupUi(self):
         self.setObjectName(u'ThemesTab')

openlp/core/ui/wizard.py

@@ -46,6 +46,7 @@ class WizardStrings(object):
     # the writers translating their own product name.
     CCLI = u'CCLI/SongSelect'
     CSV = u'CSV'
+    DB = u'DreamBeam'
     EW = u'EasyWorship'
     ES = u'EasySlides'
     FP = u'Foilpresenter'

openlp/core/utils/__init__.py

@@ -72,6 +72,7 @@ class VersionThread(QtCore.QThread):
         time.sleep(1)
         app_version = get_application_version()
         version = check_latest_version(app_version)
+        print app_version, version
         remote_version = {}
         local_version = {}
         match = VERSION_SPLITTER.match(version)

openlp/plugins/alerts/alertsplugin.py

@@ -117,8 +117,8 @@ class AlertsPlugin(Plugin):
         Plugin.__init__(self, u'alerts', plugin_helpers,
             settings_tab_class=AlertsTab)
         self.weight = -3
-        self.icon_path = u':/plugins/plugin_alerts.png'
-        self.icon = build_icon(self.icon_path)
+        self.iconPath = u':/plugins/plugin_alerts.png'
+        self.icon = build_icon(self.iconPath)
         self.alertsmanager = AlertsManager(self)
         self.manager = Manager(u'alerts', init_schema)
         self.alertForm = AlertForm(self)
@@ -197,10 +197,10 @@ class AlertsPlugin(Plugin):
         """
         Add CSS to the main display.
         """
-        align = VerticalType.Names[self.settings_tab.location]
-        return CSS % (align, self.settings_tab.font_face,
-            self.settings_tab.font_size, self.settings_tab.font_color,
-            self.settings_tab.bg_color)
+        align = VerticalType.Names[self.settingsTab.location]
+        return CSS % (align, self.settingsTab.font_face,
+            self.settingsTab.font_size, self.settingsTab.font_color,
+            self.settingsTab.bg_color)
 
     def getDisplayHtml(self):
         """
@@ -215,7 +215,7 @@ class AlertsPlugin(Plugin):
         ``frame``
             The Web frame holding the page.
         """
-        align = VerticalType.Names[self.settings_tab.location]
+        align = VerticalType.Names[self.settingsTab.location]
         frame.evaluateJavaScript(u'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.bg_color))
+            (align, self.settingsTab.font_face, self.settingsTab.font_size,
+            self.settingsTab.font_color, self.settingsTab.bg_color))

openlp/plugins/alerts/forms/alertform.py

@@ -43,7 +43,7 @@ class AlertForm(QtGui.QDialog, Ui_AlertDialog):
         self.manager = plugin.manager
         self.plugin = plugin
         self.item_id = None
-        QtGui.QDialog.__init__(self, plugin.formparent)
+        QtGui.QDialog.__init__(self, plugin.formParent)
         self.setupUi(self)
         QtCore.QObject.connect(self.displayButton,
             QtCore.SIGNAL(u'clicked()'), self.onDisplayClicked)

openlp/plugins/alerts/lib/alertsmanager.py

@@ -84,7 +84,7 @@ class AlertsManager(QtCore.QObject):
         if not self.alertList:
             return
         text = self.alertList.pop(0)
-        alertTab = self.parent().settings_tab
+        alertTab = self.parent().settingsTab
         self.parent().liveController.display.alert(text, alertTab.location)
         # Check to see if we have a timer running.
         if self.timer_id == 0:
@@ -100,7 +100,7 @@ class AlertsManager(QtCore.QObject):
         """
         log.debug(u'timer event')
         if event.timerId() == self.timer_id:
-            alertTab = self.parent().settings_tab
+            alertTab = self.parent().settingsTab
             self.parent().liveController.display.alert(u'', alertTab.location)
         self.killTimer(self.timer_id)
         self.timer_id = 0

openlp/plugins/bibles/bibleplugin.py

@@ -27,7 +27,7 @@
 
 import logging
 
-from PyQt4 import QtGui
+from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import Plugin, StringContent, build_icon, translate
 from openlp.core.lib.ui import create_action, UiStrings
@@ -44,8 +44,8 @@ class BiblePlugin(Plugin):
         Plugin.__init__(self, u'bibles', plugin_helpers,
             BibleMediaItem, BiblesTab)
         self.weight = -9
-        self.icon_path = u':/plugins/plugin_bibles.png'
-        self.icon = build_icon(self.icon_path)
+        self.iconPath = u':/plugins/plugin_bibles.png'
+        self.icon = build_icon(self.iconPath)
         self.manager = None
 
     def initialise(self):
@@ -81,16 +81,23 @@ class BiblePlugin(Plugin):
 
     def appStartup(self):
         """
-        Perform tasks on application starup
+        Perform tasks on application startup
         """
         if len(self.manager.old_bible_databases):
-            if QtGui.QMessageBox.information(self.formparent,
+            if QtGui.QMessageBox.information(self.formParent,
                 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.onToolsUpgradeItemTriggered()
+        settings = QtCore.QSettings()
+        settings.beginGroup(self.settingsSection)
+        if settings.contains(u'bookname language'):
+            settings.setValue(u'book name language', settings.value(
+                u'bookname language', QtCore.QVariant(0)).toInt()[0])
+            settings.remove(u'bookname language')
+        settings.endGroup()
 
     def addImportMenuItem(self, import_menu):
         self.importBibleItem = create_action(import_menu, u'importBibleItem',
@@ -126,7 +133,7 @@ class BiblePlugin(Plugin):
         Upgrade older bible databases.
         """
         if not hasattr(self, u'upgrade_wizard'):
-            self.upgrade_wizard = BibleUpgradeForm(self.formparent,
+            self.upgrade_wizard = BibleUpgradeForm(self.formParent,
                 self.manager, self)
         # If the import was not cancelled then reload.
         if self.upgrade_wizard.exec_():
@@ -145,11 +152,10 @@ class BiblePlugin(Plugin):
     def usesTheme(self, theme):
         """
         Called to find out if the bible plugin is currently using a theme.
-        Returns True if the theme is being used, otherwise returns False.
+        Returns ``True`` if the theme is being used, otherwise returns
+        ``False``.
         """
-        if unicode(self.settings_tab.bible_theme) == theme:
-            return True
-        return False
+        return unicode(self.settingsTab.bible_theme) == theme
 
     def renameTheme(self, oldTheme, newTheme):
         """
@@ -163,8 +169,8 @@ class BiblePlugin(Plugin):
         ``newTheme``
             The new name the plugin should now use.
         """
-        self.settings_tab.bible_theme = newTheme
-        self.settings_tab.save()
+        self.settingsTab.bible_theme = newTheme
+        self.settingsTab.save()
 
     def setPluginTextStrings(self):
         """

openlp/plugins/bibles/forms/bibleupgradeform.py

@@ -371,7 +371,7 @@ class BibleUpgradeForm(OpenLPWizard):
         """
         Perform the actual upgrade.
         """
-        self.include_webbible = False
+        self.includeWebBible = False
         proxy_server = None
         if not self.files:
             self.progressLabel.setText(
@@ -383,14 +383,14 @@ class BibleUpgradeForm(OpenLPWizard):
         for number, file in enumerate(self.files):
             if self.checkBox[number].checkState() == QtCore.Qt.Checked:
                 max_bibles += 1
-        oldBible = None
+        old_bible = None
         for number, filename in enumerate(self.files):
             # Close the previous bible's connection.
-            if oldBible is not None:
-                oldBible.close_connection()
+            if old_bible is not None:
+                old_bible.close_connection()
                 # Set to None to make obvious that we have already closed the
                 # database.
-                oldBible = None
+                old_bible = None
             if self.stop_import_flag:
                 self.success[number] = False
                 break
@@ -398,7 +398,7 @@ class BibleUpgradeForm(OpenLPWizard):
                 self.success[number] = False
                 continue
             self.progressBar.reset()
-            oldBible = OldBibleDB(self.mediaItem, path=self.temp_dir,
+            old_bible = OldBibleDB(self.mediaItem, path=self.temp_dir,
                 file=filename[0])
             name = filename[1]
             self.progressLabel.setText(unicode(translate(
@@ -408,33 +408,39 @@ class BibleUpgradeForm(OpenLPWizard):
             self.newbibles[number] = BibleDB(self.mediaItem, path=self.path,
                 name=name, file=filename[0])
             self.newbibles[number].register(self.plugin.upgrade_wizard)
-            metadata = oldBible.get_metadata()
-            webbible = False
+            metadata = old_bible.get_metadata()
+            web_bible = False
             meta_data = {}
             for meta in metadata:
+                # Upgrade the names of the metadata keys
+                if meta[u'key'] == u'Version':
+                    meta[u'key'] = u'name'
+                if meta[u'key'] == u'Bookname language':
+                    meta[u'key'] = 'book_name_language'
+                meta[u'key'] = meta[u'key'].lower().replace(' ', '_')
+                # Copy the metadata
                 meta_data[meta[u'key']] = meta[u'value']
-                if not meta[u'key'] == u'Version' and not meta[u'key'] == \
-                    u'dbversion':
+                if meta[u'key'] != u'name' and meta[u'key'] != u'dbversion':
                     self.newbibles[number].save_meta(meta[u'key'],
                         meta[u'value'])
-                if meta[u'key'] == u'download source':
-                    webbible = True
-                    self.include_webbible = True
-                if meta.has_key(u'proxy server'):
-                    proxy_server = meta[u'proxy server']
-            if webbible:
-                if meta_data[u'download source'].lower() == u'crosswalk':
+                if meta[u'key'] == u'download_source':
+                    web_bible = True
+                    self.includeWebBible = True
+                if meta.has_key(u'proxy_server'):
+                    proxy_server = meta[u'proxy_server']
+            if web_bible:
+                if meta_data[u'download_source'].lower() == u'crosswalk':
                     handler = CWExtract(proxy_server)
-                elif meta_data[u'download source'].lower() == u'biblegateway':
+                elif meta_data[u'download_source'].lower() == u'biblegateway':
                     handler = BGExtract(proxy_server)
-                elif meta_data[u'download source'].lower() == u'bibleserver':
+                elif meta_data[u'download_source'].lower() == u'bibleserver':
                     handler = BSExtract(proxy_server)
-                books = handler.get_books_from_http(meta_data[u'download name'])
+                books = handler.get_books_from_http(meta_data[u'download_name'])
                 if not books:
                     log.error(u'Upgrading books from %s - download '\
                         u'name: "%s" failed' % (
-                        meta_data[u'download source'],
-                        meta_data[u'download name']))
+                        meta_data[u'download_source'],
+                        meta_data[u'download_name']))
                     self.newbibles[number].session.close()
                     del self.newbibles[number]
                     critical_error_message_box(
@@ -451,8 +457,8 @@ class BibleUpgradeForm(OpenLPWizard):
                     self.success[number] = False
                     continue
                 bible = BiblesResourcesDB.get_webbible(
-                    meta_data[u'download name'],
-                    meta_data[u'download source'].lower())
+                    meta_data[u'download_name'],
+                    meta_data[u'download_source'].lower())
                 if bible and bible[u'language_id']:
                     language_id = bible[u'language_id']
                     self.newbibles[number].save_meta(u'language_id',
@@ -485,8 +491,8 @@ class BibleUpgradeForm(OpenLPWizard):
                     if not book_ref_id:
                         log.warn(u'Upgrading books from %s - download '\
                             u'name: "%s" aborted by user' % (
-                            meta_data[u'download source'],
-                            meta_data[u'download name']))
+                            meta_data[u'download_source'],
+                            meta_data[u'download_name']))
                         self.newbibles[number].session.close()
                         del self.newbibles[number]
                         self.success[number] = False
@@ -495,9 +501,9 @@ class BibleUpgradeForm(OpenLPWizard):
                     db_book = self.newbibles[number].create_book(book,
                         book_ref_id, book_details[u'testament_id'])
                     # Try to import already downloaded verses.
-                    oldbook = oldBible.get_book(book)
+                    oldbook = old_bible.get_book(book)
                     if oldbook:
-                        verses = oldBible.get_verses(oldbook[u'id'])
+                        verses = old_bible.get_verses(oldbook[u'id'])
                         if not verses:
                             log.warn(u'No verses found to import for book '
                                 u'"%s"', book)
@@ -527,7 +533,7 @@ class BibleUpgradeForm(OpenLPWizard):
                         self.progressBar.maximum() - self.progressBar.value())
                     self.success[number] = False
                     continue
-                books = oldBible.get_books()
+                books = old_bible.get_books()
                 self.progressBar.setMaximum(len(books))
                 for book in books:
                     if self.stop_import_flag:
@@ -551,7 +557,7 @@ class BibleUpgradeForm(OpenLPWizard):
                     book_details = BiblesResourcesDB.get_book_by_id(book_ref_id)
                     db_book = self.newbibles[number].create_book(book[u'name'],
                         book_ref_id, book_details[u'testament_id'])
-                    verses = oldBible.get_verses(book[u'id'])
+                    verses = old_bible.get_verses(book[u'id'])
                     if not verses:
                         log.warn(u'No verses found to import for book '
                             u'"%s"', book[u'name'])
@@ -574,7 +580,7 @@ class BibleUpgradeForm(OpenLPWizard):
                     self.progressBar.maximum() - self.progressBar.value())
             else:
                 self.success[number] = True
-                self.newbibles[number].save_meta(u'Version', name)
+                self.newbibles[number].save_meta(u'name', name)
                 self.incrementProgressBar(unicode(translate(
                     'BiblesPlugin.UpgradeWizardForm',
                     'Upgrading Bible %s of %s: "%s"\n'
@@ -583,8 +589,8 @@ class BibleUpgradeForm(OpenLPWizard):
             if self.newbibles.has_key(number):
                 self.newbibles[number].session.close()
         # Close the last bible's connection if possible.
-        if oldBible is not None:
-            oldBible.close_connection()
+        if old_bible is not None:
+            old_bible.close_connection()
 
     def postWizard(self):
         """
@@ -608,7 +614,7 @@ class BibleUpgradeForm(OpenLPWizard):
         else:
             failed_import_text = u''
         if successful_import > 0:
-            if self.include_webbible:
+            if self.includeWebBible:
                 self.progressLabel.setText(unicode(
                     translate('BiblesPlugin.UpgradeWizardForm', 'Upgrading '
                     'Bible(s): %s successful%s\nPlease note that verses from '

openlp/plugins/bibles/forms/booknamedialog.py

@@ -90,7 +90,7 @@ class Ui_BookNameDialog(object):
             'Select Book Name'))
         self.infoLabel.setText(translate('BiblesPlugin.BookNameDialog',
             'The following book name cannot be matched up internally. Please '
-            'select the corresponding English name from the list.'))
+            'select the corresponding name from the list.'))
         self.currentLabel.setText(translate('BiblesPlugin.BookNameDialog',
             'Current name:'))
         self.correspondingLabel.setText(translate(

openlp/plugins/bibles/forms/booknameform.py

@@ -28,6 +28,7 @@
 Module implementing BookNameForm.
 """
 import logging
+import re
 
 from PyQt4.QtGui import QDialog
 from PyQt4 import QtCore
@@ -36,6 +37,7 @@ from openlp.core.lib import translate
 from openlp.core.lib.ui import critical_error_message_box
 from openlp.plugins.bibles.forms.booknamedialog import \
     Ui_BookNameDialog
+from openlp.plugins.bibles.lib import BibleStrings
 from openlp.plugins.bibles.lib.db import BiblesResourcesDB
 
 log = logging.getLogger(__name__)
@@ -54,6 +56,8 @@ class BookNameForm(QDialog, Ui_BookNameDialog):
         QDialog.__init__(self, parent)
         self.setupUi(self)
         self.customSignals()
+        self.book_names = BibleStrings().BookNames
+        self.book_id = False
 
     def customSignals(self):
         """
@@ -97,7 +101,8 @@ class BookNameForm(QDialog, Ui_BookNameDialog):
                 and item[u'testament_id'] == 3:
                 addBook = False
             if addBook:
-                self.correspondingComboBox.addItem(item[u'name'])
+                self.correspondingComboBox.addItem(
+                    self.book_names[item[u'abbreviation']])
 
     def exec_(self, name, books, maxbooks):
         self.books = books
@@ -120,4 +125,13 @@ class BookNameForm(QDialog, Ui_BookNameDialog):
             self.correspondingComboBox.setFocus()
             return False
         else:
+            cor_book = unicode(self.correspondingComboBox.currentText())
+            for character in u'\\.^$*+?{}[]()':
+                cor_book = cor_book.replace(character, u'\\' + character)
+            books = filter(lambda key:
+                re.match(cor_book, unicode(self.book_names[key]), re.UNICODE),
+                self.book_names.keys())
+            books = filter(None, map(BiblesResourcesDB.get_book, books))
+            if books:
+                self.book_id = books[0][u'id']
             return QDialog.accept(self)

openlp/plugins/bibles/forms/editbibledialog.py

@@ -141,7 +141,7 @@ class Ui_EditBibleDialog(object):
         QtCore.QMetaObject.connectSlotsByName(editBibleDialog)
 
     def retranslateUi(self, editBibleDialog):
-        self.booknames = BibleStrings().Booknames
+        self.book_names = BibleStrings().BookNames
         editBibleDialog.setWindowTitle(
             translate('BiblesPlugin.EditBibleForm', 'Bible Editor'))
         # Meta tab
@@ -178,4 +178,4 @@ class Ui_EditBibleDialog(object):
             translate('SongsPlugin.EditBibleForm', 'Custom Book Names'))
         for book in BiblesResourcesDB.get_books():
             self.bookNameLabel[book[u'abbreviation']].setText(
-                u'%s:' % unicode(self.booknames[book[u'abbreviation']]))
+                u'%s:' % unicode(self.book_names[book[u'abbreviation']]))

openlp/plugins/bibles/forms/editbibleform.py

@@ -50,7 +50,7 @@ class EditBibleForm(QtGui.QDialog, Ui_EditBibleDialog):
         """
         QtGui.QDialog.__init__(self, parent)
         self.mediaitem = mediaitem
-        self.booknames = BibleStrings().Booknames
+        self.book_names = BibleStrings().BookNames
         self.setupUi(self)
         self.manager = manager
 
@@ -64,19 +64,19 @@ class EditBibleForm(QtGui.QDialog, Ui_EditBibleDialog):
         log.debug(u'Load Bible')
         self.bible = bible
         self.versionNameEdit.setText(
-            self.manager.get_meta_data(self.bible, u'Version').value)
+            self.manager.get_meta_data(self.bible, u'name').value)
         self.copyrightEdit.setText(
-            self.manager.get_meta_data(self.bible, u'Copyright').value)
+            self.manager.get_meta_data(self.bible, u'copyright').value)
         self.permissionsEdit.setText(
-            self.manager.get_meta_data(self.bible, u'Permissions').value)
-        bookname_language = self.manager.get_meta_data(self.bible,
-            u'Bookname language')
-        if bookname_language and bookname_language.value != u'None':
+            self.manager.get_meta_data(self.bible, u'permissions').value)
+        book_name_language = self.manager.get_meta_data(self.bible,
+            u'book_name_language')
+        if book_name_language and book_name_language.value != u'None':
             self.languageSelectionComboBox.setCurrentIndex(
-                int(bookname_language.value) + 1)
+                int(book_name_language.value) + 1)
         self.books = {}
         self.webbible = self.manager.get_meta_data(self.bible,
-            u'download source')
+            u'download_source')
         if self.webbible:
             self.bookNameNotice.setText(translate('BiblesPlugin.EditBibleForm',
                 'This is a Web Download Bible.\nIt is not possible to '
@@ -119,9 +119,9 @@ class EditBibleForm(QtGui.QDialog, Ui_EditBibleDialog):
         version = unicode(self.versionNameEdit.text())
         copyright = unicode(self.copyrightEdit.text())
         permissions = unicode(self.permissionsEdit.text())
-        bookname_language = self.languageSelectionComboBox.currentIndex() - 1
-        if bookname_language == -1:
-            bookname_language = None
+        book_name_language = self.languageSelectionComboBox.currentIndex() - 1
+        if book_name_language == -1:
+            book_name_language = None
         if not self.validateMeta(version, copyright):
             return
         if not self.webbible:
@@ -135,7 +135,7 @@ class EditBibleForm(QtGui.QDialog, Ui_EditBibleDialog):
         Receiver.send_message(u'openlp_process_events')
         Receiver.send_message(u'cursor_busy')
         self.manager.save_meta_data(self.bible, version, copyright, permissions,
-            bookname_language)
+            book_name_language)
         if not self.webbible:
             for abbr, book in self.books.iteritems():
                 if book:
@@ -146,11 +146,11 @@ class EditBibleForm(QtGui.QDialog, Ui_EditBibleDialog):
         Receiver.send_message(u'cursor_normal')
         QtGui.QDialog.accept(self)
 
-    def validateMeta(self, version, copyright):
+    def validateMeta(self, name, copyright):
         """
         Validate the Meta before saving.
         """
-        if not version:
+        if not name:
             self.versionNameEdit.setFocus()
             critical_error_message_box(UiStrings().EmptyField,
                 translate('BiblesPlugin.BibleEditForm',
@@ -163,9 +163,9 @@ class EditBibleForm(QtGui.QDialog, Ui_EditBibleDialog):
                 'You need to set a copyright for your Bible. '
                 'Bibles in the Public Domain need to be marked as such.'))
             return False
-        elif self.manager.exists(version) and \
-            self.manager.get_meta_data(self.bible, u'Version').value != \
-            version:
+        elif self.manager.exists(name) and \
+            self.manager.get_meta_data(self.bible, u'name').value != \
+            name:
             self.versionNameEdit.setFocus()
             critical_error_message_box(
                 translate('BiblesPlugin.BibleEditForm', 'Bible Exists'),
@@ -175,37 +175,37 @@ class EditBibleForm(QtGui.QDialog, Ui_EditBibleDialog):
             return False
         return True
 
-    def validateBook(self, new_bookname, abbreviation):
+    def validateBook(self, new_book_name, abbreviation):
         """
         Validate a book.
         """
         book_regex = re.compile(u'[\d]*[^\d]+$')
-        if not new_bookname:
+        if not new_book_name:
             self.bookNameEdit[abbreviation].setFocus()
             critical_error_message_box(UiStrings().EmptyField,
                 unicode(translate('BiblesPlugin.BibleEditForm',
                 'You need to specify a book name for "%s".')) %
-                self.booknames[abbreviation])
+                self.book_names[abbreviation])
             return False
-        elif not book_regex.match(new_bookname):
+        elif not book_regex.match(new_book_name):
             self.bookNameEdit[abbreviation].setFocus()
             critical_error_message_box(UiStrings().EmptyField,
                 unicode(translate('BiblesPlugin.BibleEditForm',
                 'The book name "%s" is not correct.\nNumbers can only be used '
                 'at the beginning and must\nbe followed by one or more '
-                'non-numeric characters.')) % new_bookname)
+                'non-numeric characters.')) % new_book_name)
             return False
         for abbr, book in self.books.iteritems():
             if book:
                 if abbr == abbreviation:
                     continue
-                if unicode(self.bookNameEdit[abbr].text()) == new_bookname:
+                if unicode(self.bookNameEdit[abbr].text()) == new_book_name:
                     self.bookNameEdit[abbreviation].setFocus()
                     critical_error_message_box(
                         translate('BiblesPlugin.BibleEditForm',
                         'Duplicate Book Name'),
                         unicode(translate('BiblesPlugin.BibleEditForm',
                         'The Book Name "%s" has been entered more than once.'))
-                        % new_bookname)
+                        % new_book_name)
                     return False
         return True

openlp/plugins/bibles/lib/__init__.py

@@ -88,7 +88,7 @@ class BibleStrings(object):
         """
         These strings should need a good reason to be retranslated elsewhere.
         """
-        self.Booknames = {
+        self.BookNames = {
             u'Gen': translate('BiblesPlugin', 'Genesis'),
             u'Exod': translate('BiblesPlugin', 'Exodus'),
             u'Lev': translate('BiblesPlugin', 'Leviticus'),
@@ -355,7 +355,7 @@ def parse_reference(reference, bible, language_selection, book_ref_id=False):
         log.debug(u'Matched reference %s' % reference)
         book = match.group(u'book')
         if not book_ref_id:
-            booknames = BibleStrings().Booknames
+            book_names = BibleStrings().BookNames
             # escape reserved characters
             book_escaped = book
             for character in u'\\.^$*+?{}[]()':
@@ -369,7 +369,7 @@ def parse_reference(reference, bible, language_selection, book_ref_id=False):
                     book_ref_id = db_book.book_reference_id
             elif language_selection == LanguageSelection.Application:
                 books = filter(lambda key:
-                    regex_book.match(unicode(booknames[key])), booknames.keys())
+                    regex_book.match(unicode(book_names[key])), book_names.keys())
                 books = filter(None, map(BiblesResourcesDB.get_book, books))
                 for value in books:
                     if bible.get_book_by_book_ref_id(value[u'id']):

openlp/plugins/bibles/lib/biblestab.py

@@ -483,7 +483,7 @@ class BiblesTab(SettingsTab):
                 self.getGreyTextPalette(False))
             self.endSeparatorCheckBox.setChecked(True)
         self.language_selection = settings.value(
-            u'bookname language', QtCore.QVariant(0)).toInt()[0]
+            u'book name language', QtCore.QVariant(0)).toInt()[0]
         self.languageSelectionComboBox.setCurrentIndex(self.language_selection)
         settings.endGroup()
 
@@ -496,7 +496,7 @@ class BiblesTab(SettingsTab):
             QtCore.QVariant(self.display_style))
         settings.setValue(u'verse layout style',
             QtCore.QVariant(self.layout_style))
-        settings.setValue(u'bookname language',
+        settings.setValue(u'book name language',
             QtCore.QVariant(self.language_selection))
         settings.setValue(u'second bibles', QtCore.QVariant(self.second_bibles))
         settings.setValue(u'bible theme', QtCore.QVariant(self.bible_theme))

openlp/plugins/bibles/lib/db.py

@@ -39,6 +39,7 @@ from openlp.core.lib import Receiver, translate
 from openlp.core.lib.db import BaseModel, init_db, Manager
 from openlp.core.lib.ui import critical_error_message_box
 from openlp.core.utils import AppLocation, clean_filename
+import upgrade
 
 log = logging.getLogger(__name__)
 
@@ -147,7 +148,7 @@ class BibleDB(QtCore.QObject, Manager):
             self.file = clean_filename(self.name) + u'.sqlite'
         if u'file' in kwargs:
             self.file = kwargs[u'file']
-        Manager.__init__(self, u'bibles', init_schema, self.file)
+        Manager.__init__(self, u'bibles', init_schema, self.file, upgrade)
         if u'file' in kwargs:
             self.get_name()
         if u'path' in kwargs:
@@ -167,7 +168,7 @@ class BibleDB(QtCore.QObject, Manager):
         """
         Returns the version name of the Bible.
         """
-        version_name = self.get_object(BibleMeta, u'Version')
+        version_name = self.get_object(BibleMeta, u'name')
         self.name = version_name.value if version_name else None
         return self.name
 
@@ -182,7 +183,6 @@ class BibleDB(QtCore.QObject, Manager):
             The actual Qt wizard form.
         """
         self.wizard = wizard
-        self.save_meta(u'dbversion', u'2')
         return self.name
 
     def create_book(self, name, bk_ref_id, testament=1):
@@ -332,6 +332,7 @@ class BibleDB(QtCore.QObject, Manager):
     def get_book_ref_id_by_name(self, book, maxbooks, language_id=None):
         log.debug(u'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)
             book_id = book_temp[u'id']
@@ -341,26 +342,13 @@ class BibleDB(QtCore.QObject, Manager):
             book_id = AlternativeBookNamesDB.get_book_reference_id(book)
         else:
             from openlp.plugins.bibles.forms import BookNameForm
-            book_ref = None
             book_name = BookNameForm(self.wizard)
             if book_name.exec_(book, self.get_books(), maxbooks):
-                book_ref = unicode(
-                    book_name.correspondingComboBox.currentText())
-            if not book_ref:
-                return None
-            else:
-                book_temp = BiblesResourcesDB.get_book(book_ref)
-            if book_temp:
-                book_id = book_temp[u'id']
-            else:
-                return None
+                book_id = book_name.book_id
             if book_id:
                 AlternativeBookNamesDB.create_alternative_book_name(
                     book, book_id, language_id)
-        if book_id:
-            return book_id
-        else:
-            return None
+        return book_id
 
     def get_verses(self, reference_list, show_error=True):
         """
@@ -495,7 +483,7 @@ class BibleDB(QtCore.QObject, Manager):
         prior to 1.9.6.
         """
         try:
-            columns = self.session.query(Book).all()
+            self.session.query(Book).all()
         except:
             return True
         return False
@@ -562,16 +550,13 @@ class BiblesResourcesDB(QtCore.QObject, Manager):
         log.debug(u'BiblesResourcesDB.get_books()')
         books = BiblesResourcesDB.run_sql(u'SELECT id, testament_id, name, '
                 u'abbreviation, chapters FROM book_reference ORDER BY id')
-        return [
-            {
-                u'id': book[0],
-                u'testament_id': book[1],
-                u'name': unicode(book[2]),
-                u'abbreviation': unicode(book[3]),
-                u'chapters': book[4]
-            }
-            for book in books
-        ]
+        return [{
+            u'id': book[0],
+            u'testament_id': book[1],
+            u'name': unicode(book[2]),
+            u'abbreviation': unicode(book[3]),
+            u'chapters': book[4]
+        } for book in books]
 
     @staticmethod
     def get_book(name, lower=False):
@@ -613,7 +598,7 @@ class BiblesResourcesDB(QtCore.QObject, Manager):
         Return the books which include string.
 
         ``string``
-            The string to search for in the booknames or abbreviations.
+            The string to search for in the book names or abbreviations.
         """
         log.debug(u'BiblesResourcesDB.get_book_like("%s")', string)
         if not isinstance(string, unicode):
@@ -623,16 +608,13 @@ class BiblesResourcesDB(QtCore.QObject, Manager):
                 u'LOWER(name) LIKE ? OR LOWER(abbreviation) LIKE ?',
                 (u'%' + string.lower() + u'%', u'%' + string.lower() + u'%'))
         if books:
-            return [
-                {
+            return [{
                 u'id': book[0],
                 u'testament_id': book[1],
                 u'name': unicode(book[2]),
                 u'abbreviation': unicode(book[3]),
                 u'chapters': book[4]
-                }
-                for book in books
-            ]
+            } for book in books]
         else:
             return None
 
@@ -759,16 +741,13 @@ class BiblesResourcesDB(QtCore.QObject, Manager):
             u'language_id, download_source_id FROM webbibles WHERE '
             u'download_source_id = ?', (source[u'id'],))
         if bibles:
-            return [
-                {
+            return [{
                 u'id': bible[0],
                 u'name': bible[1],
                 u'abbreviation': bible[2],
                 u'language_id': bible[3],
                 u'download_source_id': bible[4]
-                }
-                for bible in bibles
-            ]
+            } for bible in bibles]
         else:
             return None
 
@@ -801,7 +780,7 @@ class BiblesResourcesDB(QtCore.QObject, Manager):
                 u'abbreviation': bible[0][2],
                 u'language_id': bible[0][3],
                 u'download_source_id': bible[0][4]
-                }
+            }
         except (IndexError, TypeError):
             return None
 
@@ -862,14 +841,11 @@ class BiblesResourcesDB(QtCore.QObject, Manager):
         languages = BiblesResourcesDB.run_sql(u'SELECT id, name, code FROM '
                 u'language ORDER by name')
         if languages:
-            return [
-                {
+            return [{
                 u'id': language[0],
                 u'name': unicode(language[1]),
                 u'code': unicode(language[2])
-                }
-                for language in languages
-            ]
+            } for language in languages]
         else:
             return None
 
@@ -1048,7 +1024,7 @@ class OldBibleDB(QtCore.QObject, Manager):
         Returns the version name of the Bible.
         """
         version_name = self.run_sql(u'SELECT value FROM '
-                u'metadata WHERE key = "Version"')
+                u'metadata WHERE key = "name"')
         if version_name:
             self.name = version_name[0][0]
         else:
@@ -1062,13 +1038,10 @@ class OldBibleDB(QtCore.QObject, Manager):
         metadata = self.run_sql(u'SELECT key, value FROM metadata '
             u'ORDER BY rowid')
         if metadata:
-            return [
-                {
+            return [{
                 u'key': unicode(meta[0]),
                 u'value': unicode(meta[1])
-                }
-                for meta in metadata
-            ]
+            } for meta in metadata]
         else:
             return None
 
@@ -1100,13 +1073,10 @@ class OldBibleDB(QtCore.QObject, Manager):
         """
         books = self.run_sql(u'SELECT name, id FROM book ORDER BY id')
         if books:
-            return [
-                {
+            return [{
                 u'name': unicode(book[0]),
                 u'id':int(book[1])
-                }
-                for book in books
-            ]
+            } for book in books]
         else:
             return None
 
@@ -1117,15 +1087,12 @@ class OldBibleDB(QtCore.QObject, Manager):
         verses = self.run_sql(u'SELECT book_id, chapter, verse, text FROM '
             u'verse WHERE book_id = ? ORDER BY id', (book_id, ))
         if verses:
-            return [
-                {
+            return [{
                 u'book_id': int(verse[0]),
                 u'chapter': int(verse[1]),
                 u'verse': int(verse[2]),
                 u'text': unicode(verse[3])
-                }
-                for verse in verses
-            ]
+            } for verse in verses]
         else:
             return None
 

openlp/plugins/bibles/lib/http.py

@@ -49,28 +49,28 @@ class BGExtract(object):
     """
     Extract verses from BibleGateway
     """
-    def __init__(self, proxyurl=None):
-        log.debug(u'BGExtract.init("%s")', proxyurl)
-        self.proxyurl = proxyurl
+    def __init__(self, proxy_url=None):
+        log.debug(u'BGExtract.init("%s")', proxy_url)
+        self.proxy_url = proxy_url
         socket.setdefaulttimeout(30)
 
-    def get_bible_chapter(self, version, bookname, chapter):
+    def get_bible_chapter(self, version, book_name, chapter):
         """
         Access and decode Bibles via the BibleGateway website.
 
         ``version``
             The version of the Bible like 31 for New International version.
 
-        ``bookname``
+        ``book_name``
             Name of the Book.
 
         ``chapter``
             Chapter number.
         """
         log.debug(u'BGExtract.get_bible_chapter("%s", "%s", "%s")', version,
-            bookname, chapter)
-        urlbookname = urllib.quote(bookname.encode("utf-8"))
-        url_params = u'search=%s+%s&version=%s' % (urlbookname, chapter,
+            book_name, chapter)
+        url_book_name = urllib.quote(book_name.encode("utf-8"))
+        url_params = u'search=%s+%s&version=%s' % (url_book_name, chapter,
             version)
         cleaner = [(re.compile('&nbsp;|<br />|\'\+\''), lambda match: '')]
         soup = get_soup_for_bible_ref(
@@ -120,7 +120,7 @@ class BGExtract(object):
                 clean_verse_num = int(str(raw_verse_num))
             except ValueError:
                 log.warn(u'Illegal verse number in %s %s %s:%s',
-                    version, bookname, chapter, unicode(raw_verse_num))
+                    version, book_name, chapter, unicode(raw_verse_num))
             if clean_verse_num:
                 verse_text = raw_verse_num.next
                 part = raw_verse_num.next.next
@@ -138,7 +138,7 @@ class BGExtract(object):
             log.debug(u'No content found in the BibleGateway response.')
             send_error_message(u'parse')
             return None
-        return SearchResults(bookname, chapter, verse_list)
+        return SearchResults(book_name, chapter, verse_list)
 
     def get_books_from_http(self, version):
         """
@@ -195,30 +195,30 @@ class BSExtract(object):
     """
     Extract verses from Bibleserver.com
     """
-    def __init__(self, proxyurl=None):
-        log.debug(u'BSExtract.init("%s")', proxyurl)
-        self.proxyurl = proxyurl
+    def __init__(self, proxy_url=None):
+        log.debug(u'BSExtract.init("%s")', proxy_url)
+        self.proxy_url = proxy_url
         socket.setdefaulttimeout(30)
 
-    def get_bible_chapter(self, version, bookname, chapter):
+    def get_bible_chapter(self, version, book_name, chapter):
         """
         Access and decode bibles via Bibleserver mobile website
 
         ``version``
             The version of the bible like NIV for New International Version
 
-        ``bookname``
+        ``book_name``
             Text name of bible book e.g. Genesis, 1. John, 1John or Offenbarung
 
         ``chapter``
             Chapter number
         """
         log.debug(u'BSExtract.get_bible_chapter("%s", "%s", "%s")', version,
-            bookname, chapter)
-        urlversion = urllib.quote(version.encode("utf-8"))
-        urlbookname = urllib.quote(bookname.encode("utf-8"))
+            book_name, chapter)
+        url_version = urllib.quote(version.encode("utf-8"))
+        url_book_name = urllib.quote(book_name.encode("utf-8"))
         chapter_url = u'http://m.bibleserver.com/text/%s/%s%d' % \
-            (urlversion, urlbookname, chapter)
+            (url_version, url_book_name, chapter)
         header = (u'Accept-Language', u'en')
         soup = get_soup_for_bible_ref(chapter_url, header)
         if not soup:
@@ -236,7 +236,7 @@ class BSExtract(object):
             Receiver.send_message(u'openlp_process_events')
             versenumber = int(verse_number.sub(r'\3', verse[u'class']))
             verses[versenumber] = verse.contents[1].rstrip(u'\n')
-        return SearchResults(bookname, chapter, verses)
+        return SearchResults(book_name, chapter, verses)
 
     def get_books_from_http(self, version):
         """
@@ -268,72 +268,72 @@ class CWExtract(object):
     """
     Extract verses from CrossWalk/BibleStudyTools
     """
-    def __init__(self, proxyurl=None):
-        log.debug(u'CWExtract.init("%s")', proxyurl)
-        self.proxyurl = proxyurl
+    def __init__(self, proxy_url=None):
+        log.debug(u'CWExtract.init("%s")', proxy_url)
+        self.proxy_url = proxy_url
         socket.setdefaulttimeout(30)
 
-    def get_bible_chapter(self, version, bookname, chapter):
+    def get_bible_chapter(self, version, book_name, chapter):
         """
         Access and decode bibles via the Crosswalk website
 
         ``version``
             The version of the Bible like niv for New International Version
 
-        ``bookname``
+        ``book_name``
             Text name of in english e.g. 'gen' for Genesis
 
         ``chapter``
             Chapter number
         """
         log.debug(u'CWExtract.get_bible_chapter("%s", "%s", "%s")', version,
-            bookname, chapter)
-        urlbookname = bookname.replace(u' ', u'-')
-        urlbookname = urlbookname.lower()
-        urlbookname = urllib.quote(urlbookname.encode("utf-8"))
+            book_name, chapter)
+        url_book_name = book_name.replace(u' ', u'-')
+        url_book_name = url_book_name.lower()
+        url_book_name = urllib.quote(url_book_name.encode("utf-8"))
         chapter_url = u'http://www.biblestudytools.com/%s/%s/%s.html' % \
-            (version, urlbookname, chapter)
+            (version, url_book_name, chapter)
         soup = get_soup_for_bible_ref(chapter_url)
         if not soup:
             return None
         Receiver.send_message(u'openlp_process_events')
-        htmlverses = soup.findAll(u'span', u'versetext')
-        if not htmlverses:
+        html_verses = soup.findAll(u'span', u'versetext')
+        if not html_verses:
             log.error(u'No verses found in the CrossWalk response.')
             send_error_message(u'parse')
             return None
         verses = {}
         reduce_spaces = re.compile(r'[ ]{2,}')
         fix_punctuation = re.compile(r'[ ]+([.,;])')
-        for verse in htmlverses:
+        for verse in html_verses:
             Receiver.send_message(u'openlp_process_events')
-            versenumber = int(verse.contents[0].contents[0])
-            versetext = u''
+            verse_number = int(verse.contents[0].contents[0])
+            verse_text = u''
             for part in verse.contents:
                 Receiver.send_message(u'openlp_process_events')
                 if isinstance(part, NavigableString):
-                    versetext = versetext + part
+                    verse_text = verse_text + part
                 elif part and part.attrMap and \
                     (part.attrMap[u'class'] == u'WordsOfChrist' or \
                     part.attrMap[u'class'] == u'strongs'):
                     for subpart in part.contents:
                         Receiver.send_message(u'openlp_process_events')
                         if isinstance(subpart, NavigableString):
-                            versetext = versetext + subpart
+                            verse_text = verse_text + subpart
                         elif subpart and subpart.attrMap and \
                             subpart.attrMap[u'class'] == u'strongs':
                             for subsub in subpart.contents:
                                 Receiver.send_message(u'openlp_process_events')
                                 if isinstance(subsub, NavigableString):
-                                    versetext = versetext + subsub
+                                    verse_text = verse_text + subsub
             Receiver.send_message(u'openlp_process_events')
             # Fix up leading and trailing spaces, multiple spaces, and spaces
             # between text and , and .
-            versetext = versetext.strip(u'\n\r\t ')
-            versetext = reduce_spaces.sub(u' ', versetext)
-            versetext = fix_punctuation.sub(r'\1', versetext)
-            verses[versenumber] = versetext
-        return SearchResults(bookname, chapter, verses)
+            verse_text = verse_text.strip(u'\n\r\t ')
+            verse_text = reduce_spaces.sub(u' ', verse_text)
+            verse_text = fix_punctuation.sub(r'\1', verse_text)
+            verses[verse_number] = verse_text
+        return SearchResults(book_name, chapter, verses)
 
     def get_books_from_http(self, version):
         """
@@ -401,16 +401,16 @@ class HTTPBible(BibleDB):
         self.wizard.incrementProgressBar(unicode(translate(
             'BiblesPlugin.HTTPBible',
             'Registering Bible and loading books...')))
-        self.save_meta(u'download source', self.download_source)
-        self.save_meta(u'download name', self.download_name)
+        self.save_meta(u'download_source', self.download_source)
+        self.save_meta(u'download_name', self.download_name)
         if self.proxy_server:
-            self.save_meta(u'proxy server', self.proxy_server)
+            self.save_meta(u'proxy_server', self.proxy_server)
         if self.proxy_username:
             # Store the proxy userid.
-            self.save_meta(u'proxy username', self.proxy_username)
+            self.save_meta(u'proxy_username', self.proxy_username)
         if self.proxy_password:
             # Store the proxy password.
-            self.save_meta(u'proxy password', self.proxy_password)
+            self.save_meta(u'proxy_password', self.proxy_password)
         if self.download_source.lower() == u'crosswalk':
             handler = CWExtract(self.proxy_server)
         elif self.download_source.lower() == u'biblegateway':
@@ -499,10 +499,10 @@ class HTTPBible(BibleDB):
                     ## 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.
-                    bookname = search_results.book
+                    book_name = search_results.book
                     Receiver.send_message(u'openlp_process_events')
                     # Check to see if book/chapter exists.
-                    db_book = self.get_book(bookname)
+                    db_book = self.get_book(book_name)
                     self.create_chapter(db_book.id, search_results.chapter,
                         search_results.verselist)
                     Receiver.send_message(u'openlp_process_events')

openlp/plugins/bibles/lib/manager.py

@@ -164,12 +164,12 @@ class BibleManager(object):
             self.db_cache[name] = bible
             # Look to see if lazy load bible exists and get create getter.
             source = self.db_cache[name].get_object(BibleMeta,
-                u'download source')
+                u'download_source')
             if source:
                 download_name = self.db_cache[name].get_object(BibleMeta,
-                    u'download name').value
+                    u'download_name').value
                 meta_proxy = self.db_cache[name].get_object(BibleMeta,
-                    u'proxy url')
+                    u'proxy_server')
                 web_bible = HTTPBible(self.parent, path=self.path,
                     file=filename, download_source=source.value,
                     download_name=download_name)
@@ -330,7 +330,7 @@ class BibleManager(object):
                     'Import Wizard to install one or more Bibles.')
                     })
             return None
-        language_selection = self.get_meta_data(bible, u'Bookname language')
+        language_selection = self.get_meta_data(bible, u'book_name_language')
         if language_selection:
             language_selection = int(language_selection.value)
         if language_selection is None or language_selection == -1:
@@ -377,7 +377,7 @@ class BibleManager(object):
             Unicode. The Bible to get the language selection from.
         """
         log.debug(u'BibleManager.get_language_selection("%s")', bible)
-        language_selection = self.get_meta_data(bible, u'Bookname language')
+        language_selection = self.get_meta_data(bible, u'book_name_language')
         if language_selection and language_selection.value != u'None':
             return int(language_selection.value)
         if language_selection is None or  language_selection.value == u'None':
@@ -410,17 +410,17 @@ class BibleManager(object):
             return None
         # Check if the bible or second_bible is a web bible.
         webbible = self.db_cache[bible].get_object(BibleMeta,
-            u'download source')
+            u'download_source')
         second_webbible = u''
         if second_bible:
             second_webbible = self.db_cache[second_bible].get_object(BibleMeta,
-                u'download source')
+                u'download_source')
         if webbible or second_webbible:
             Receiver.send_message(u'openlp_information_message', {
                 u'title': translate('BiblesPlugin.BibleManager',
-                'Web Bible cannot be used'),
+                    'Web Bible cannot be used'),
                 u'message': translate('BiblesPlugin.BibleManager',
-                'Text Search is not available with Web Bibles.')
+                    'Text Search is not available with Web Bibles.')
                 })
             return None
         if text:
@@ -428,27 +428,27 @@ class BibleManager(object):
         else:
             Receiver.send_message(u'openlp_information_message', {
                 u'title': translate('BiblesPlugin.BibleManager',
-                'Scripture Reference Error'),
+                    'Scripture Reference Error'),
                 u'message': translate('BiblesPlugin.BibleManager',
-                'You did not enter a search keyword.\n'
-                'You can separate different keywords by a space to search for '
-                'all of your keywords and you can separate them by a comma to '
-                'search for one of them.')
+                    'You did not enter a search keyword.\n'
+                    'You can separate different keywords by a space to '
+                    'search for all of your keywords and you can separate '
+                    'them by a comma to search for one of them.')
                 })
             return None
 
     def save_meta_data(self, bible, version, copyright, permissions, 
-        bookname_language=None):
+        book_name_language=None):
         """
         Saves the bibles meta data.
         """
         log.debug(u'save_meta data %s, %s, %s, %s',
             bible, version, copyright, permissions)
-        self.db_cache[bible].save_meta(u'Version', version)
-        self.db_cache[bible].save_meta(u'Copyright', copyright)
-        self.db_cache[bible].save_meta(u'Permissions', permissions)
-        self.db_cache[bible].save_meta(u'Bookname language',
-            bookname_language)
+        self.db_cache[bible].save_meta(u'name', version)
+        self.db_cache[bible].save_meta(u'copyright', copyright)
+        self.db_cache[bible].save_meta(u'permissions', permissions)
+        self.db_cache[bible].save_meta(u'book_name_language',
+            book_name_language)
 
     def get_meta_data(self, bible, key):
         """

openlp/plugins/bibles/lib/mediaitem.py

@@ -64,7 +64,7 @@ class BibleMediaItem(MediaManagerItem):
         self.unlockIcon = build_icon(u':/bibles/bibles_search_unlock.png')
         MediaManagerItem.__init__(self, parent, plugin, icon)
         # Place to store the search results for both bibles.
-        self.settings = self.plugin.settings_tab
+        self.settings = self.plugin.settingsTab
         self.quickPreviewAllowed = True
         self.hasSearch = True
         self.search_results = {}
@@ -433,7 +433,7 @@ class BibleMediaItem(MediaManagerItem):
         self.advancedBookComboBox.clear()
         first = True
         language_selection = self.plugin.manager.get_language_selection(bible)
-        booknames = BibleStrings().Booknames
+        book_names = BibleStrings().BookNames
         for book in book_data:
             row = self.advancedBookComboBox.count()
             if language_selection == LanguageSelection.Bible:
@@ -442,7 +442,7 @@ class BibleMediaItem(MediaManagerItem):
                 data = BiblesResourcesDB.get_book_by_id(
                     book[u'book_reference_id'])
                 self.advancedBookComboBox.addItem(
-                    booknames[data[u'abbreviation']])
+                    book_names[data[u'abbreviation']])
             elif language_selection == LanguageSelection.English:
                 data = BiblesResourcesDB.get_book_by_id(
                     book[u'book_reference_id'])
@@ -509,12 +509,12 @@ class BibleMediaItem(MediaManagerItem):
                 if language_selection == LanguageSelection.Bible:
                     books = [book.name + u' ' for book in book_data]
                 elif language_selection == LanguageSelection.Application:
-                    booknames = BibleStrings().Booknames
+                    book_names = BibleStrings().BookNames
                     for book in book_data:
                         data = BiblesResourcesDB.get_book_by_id(
                         book.book_reference_id)
                         books.append(unicode(
-                            booknames[data[u'abbreviation']]) + u' ')
+                            book_names[data[u'abbreviation']]) + u' ')
                 elif language_selection == LanguageSelection.English:
                     for book in book_data:
                         data = BiblesResourcesDB.get_book_by_id(
@@ -537,7 +537,7 @@ class BibleMediaItem(MediaManagerItem):
         elif self.advancedTab.isVisible():
             bible = unicode(self.advancedVersionComboBox.currentText())
         if bible:
-            self.editBibleForm = EditBibleForm(self, self.plugin.formparent,
+            self.editBibleForm = EditBibleForm(self, self.plugin.formParent,
                 self.plugin.manager)
             self.editBibleForm.loadBible(bible)
             if self.editBibleForm.exec_():
@@ -806,30 +806,30 @@ class BibleMediaItem(MediaManagerItem):
         further action is saved for/in each row.
         """
         verse_separator = get_reference_separator(u'sep_v_display')
-        version = self.plugin.manager.get_meta_data(bible, u'Version').value
-        copyright = self.plugin.manager.get_meta_data(bible, u'Copyright').value
+        version = self.plugin.manager.get_meta_data(bible, u'name').value
+        copyright = self.plugin.manager.get_meta_data(bible, u'copyright').value
         permissions = \
-            self.plugin.manager.get_meta_data(bible, u'Permissions').value
+            self.plugin.manager.get_meta_data(bible, u'permissions').value
         second_version = u''
         second_copyright = u''
         second_permissions = u''
         if second_bible:
             second_version = self.plugin.manager.get_meta_data(
-                second_bible, u'Version').value
+                second_bible, u'name').value
             second_copyright = self.plugin.manager.get_meta_data(
-                second_bible, u'Copyright').value
+                second_bible, u'copyright').value
             second_permissions = self.plugin.manager.get_meta_data(
-                second_bible, u'Permissions').value
+                second_bible, u'permissions').value
         items = []
         language_selection = self.plugin.manager.get_language_selection(bible)
         for count, verse in enumerate(search_results):
             if language_selection == LanguageSelection.Bible:
                 book = verse.book.name
             elif language_selection == LanguageSelection.Application:
-                booknames = BibleStrings().Booknames
+                book_names = BibleStrings().Booknames
                 data = BiblesResourcesDB.get_book_by_id(
                 verse.book.book_reference_id)
-                book = unicode(booknames[data[u'abbreviation']])
+                book = unicode(book_names[data[u'abbreviation']])
             elif language_selection == LanguageSelection.English:
                 data = BiblesResourcesDB.get_book_by_id(
                     verse.book.book_reference_id)

openlp/plugins/bibles/lib/osis.py

@@ -50,8 +50,6 @@ class OSISBible(BibleDB):
         log.debug(self.__class__.__name__)
         BibleDB.__init__(self, parent, **kwargs)
         self.filename = kwargs[u'filename']
-        fbibles = None
-        self.books = {}
         self.language_regex = re.compile(r'<language.*>(.*?)</language>')
         self.verse_regex = re.compile(
             r'<verse osisID="([a-zA-Z0-9 ]*).([0-9]*).([0-9]*)">(.*?)</verse>')
@@ -74,16 +72,6 @@ class OSISBible(BibleDB):
         filepath = os.path.join(
             AppLocation.get_directory(AppLocation.PluginsDir), u'bibles',
             u'resources', u'osisbooks.csv')
-        try:
-            fbibles = open(filepath, u'r')
-            for line in fbibles:
-                book = line.split(u',')
-                self.books[book[0]] = (book[1].strip(), book[2].strip())
-        except IOError:
-            log.exception(u'OSIS bible import failed')
-        finally:
-            if fbibles:
-                fbibles.close()
 
     def do_import(self, bible_name=None):
         """
@@ -101,6 +89,8 @@ class OSISBible(BibleDB):
         try:
             detect_file = open(self.filename, u'r')
             details = chardet.detect(detect_file.read(1048576))
+            detect_file.seek(0)
+            lines_in_file = int(len(detect_file.readlines()))
         except IOError:
             log.exception(u'Failed to detect OSIS file encoding')
             return
@@ -111,6 +101,17 @@ class OSISBible(BibleDB):
             osis = codecs.open(self.filename, u'r', details['encoding'])
             repl = replacement
             language_id = False
+            # Decide if the bible propably contains only NT or AT and NT or 
+            # AT, NT and Apocrypha
+            if lines_in_file < 11500:
+                book_count = 27
+                chapter_count = 260
+            elif lines_in_file < 34200:
+                book_count = 66
+                chapter_count = 1188
+            else:
+                book_count = 67
+                chapter_count = 1336
             for file_record in osis:
                 if self.stop_import_flag:
                     break
@@ -134,36 +135,32 @@ class OSISBible(BibleDB):
                                 % self.filename)
                             return False
                     match_count += 1
-                    book = match.group(1)
+                    book = unicode(match.group(1))
                     chapter = int(match.group(2))
                     verse = int(match.group(3))
                     verse_text = match.group(4)
-                    if not db_book or db_book.name != self.books[book][0]:
-                        log.debug(u'New book: "%s"' % self.books[book][0])
-                        book_ref_id = self.get_book_ref_id_by_name(unicode(
-                            self.books[book][0]), 67, language_id)
-                        if not book_ref_id:
-                            log.exception(u'Importing books from "%s" '\
-                                'failed' % self.filename)
-                            return False
-                        book_details = BiblesResourcesDB.get_book_by_id(
-                            book_ref_id)
+                    book_ref_id = self.get_book_ref_id_by_name(book, book_count,
+                        language_id)
+                    if not book_ref_id:
+                        log.exception(u'Importing books from "%s" failed' %
+                            self.filename)
+                        return False
+                    book_details = BiblesResourcesDB.get_book_by_id(book_ref_id)
+                    if not db_book or db_book.name != book_details[u'name']:
+                        log.debug(u'New book: "%s"' % book_details[u'name'])
                         db_book = self.create_book(
-                            unicode(self.books[book][0]),
+                            book_details[u'name'],
                             book_ref_id,
                             book_details[u'testament_id'])
                     if last_chapter == 0:
-                        if book == u'Gen':
-                            self.wizard.progressBar.setMaximum(1188)
-                        else:
-                            self.wizard.progressBar.setMaximum(260)
+                        self.wizard.progressBar.setMaximum(chapter_count)
                     if last_chapter != chapter:
                         if last_chapter != 0:
                             self.session.commit()
                         self.wizard.incrementProgressBar(unicode(translate(
                             'BiblesPlugin.OsisImport', 'Importing %s %s...',
                             'Importing <book name> <chapter>...')) %
-                            (self.books[match.group(1)][0], chapter))
+                            (book_details[u'name'], chapter))
                         last_chapter = chapter
                     # All of this rigmarol below is because the mod2osis
                     # tool from the Sword library embeds XML in the OSIS

openlp/plugins/bibles/lib/upgrade.py

@@ -0,0 +1,191 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2012 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2012 Tim Bentley, Gerald Britton, Jonathan      #
+# Corwin, Michael Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan,      #
+# Armin Köhler, Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias     #
+# Põldaru, Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith,    #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund             #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+"""
+The :mod:`upgrade` module provides a way for the database and schema that is the
+backend for the Bibles plugin
+"""
+import logging
+
+from sqlalchemy import Table, func, select, insert
+
+__version__ = 1
+log = logging.getLogger(__name__)
+
+def upgrade_setup(metadata):
+    """
+    Set up the latest revision all tables, with reflection, needed for the
+    upgrade process. If you want to drop a table, you need to remove it from
+    here, and add it to your upgrade function.
+    """
+    # Don't define the "metadata" table, as the upgrade mechanism already
+    # defines it.
+    tables = {
+        u'book': Table(u'book', metadata, autoload=True),
+        u'verse': Table(u'verse', metadata, autoload=True)
+    }
+    return tables
+
+
+def upgrade_1(session, metadata, tables):
+    """
+    Version 1 upgrade.
+
+    This upgrade renames a number of keys to a single naming convention..
+    """
+    metadata_table = metadata.tables[u'metadata']
+    # 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=u'name',
+        value=select(
+            [metadata_table.c.value],
+            metadata_table.c.key == u'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=u'copyright',
+        value=select(
+            [metadata_table.c.value],
+            metadata_table.c.key == u'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=u'permissions',
+        value=select(
+            [metadata_table.c.value],
+            metadata_table.c.key == u'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 == u'Bookname language'
+        )
+    ).scalar()
+    if value_count > 0:
+        session.execute(insert(metadata_table).values(
+            key=u'book_name_language',
+            value=select(
+                [metadata_table.c.value],
+                metadata_table.c.key == u'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 == u'download source'
+        )
+    ).scalar()
+    log.debug(u'download source: %s', value_count)
+    if value_count > 0:
+        session.execute(insert(metadata_table).values(
+            key=u'download_source',
+            value=select(
+                [metadata_table.c.value],
+                metadata_table.c.key == u'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 == u'download name'
+        )
+    ).scalar()
+    log.debug(u'download name: %s', value_count)
+    if value_count > 0:
+        session.execute(insert(metadata_table).values(
+            key=u'download_name',
+            value=select(
+                [metadata_table.c.value],
+                metadata_table.c.key == u'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 == u'proxy server'
+        )
+    ).scalar()
+    log.debug(u'proxy server: %s', value_count)
+    if value_count > 0:
+        session.execute(insert(metadata_table).values(
+            key=u'proxy_server',
+            value=select(
+                [metadata_table.c.value],
+                metadata_table.c.key == u'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 == u'proxy username'
+        )
+    ).scalar()
+    log.debug(u'proxy username: %s', value_count)
+    if value_count > 0:
+        session.execute(insert(metadata_table).values(
+            key=u'proxy_username',
+            value=select(
+                [metadata_table.c.value],
+                metadata_table.c.key == u'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 == u'proxy password'
+        )
+    ).scalar()
+    log.debug(u'proxy password: %s', value_count)
+    if value_count > 0:
+        session.execute(insert(metadata_table).values(
+            key=u'proxy_password',
+            value=select(
+                [metadata_table.c.value],
+                metadata_table.c.key == u'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()

openlp/plugins/bibles/resources/osisbooks.csv

@@ -1,76 +0,0 @@
-Gen,Genesis,Gen
-Exod,Exodus,Exod
-Lev,Leviticus,Lev
-Num,Numbers,Num
-Deut,Deuteronomy,Deut
-Josh,Joshua,Josh
-Judg,Judges,Judg
-Ruth,Ruth,Ruth
-1Sam,1 Samuel,1Sam
-2Sam,2 Samuel,2Sam
-1Kgs,1 Kings,1Kgs
-2Kgs,2 Kings,2Kgs
-1Chr,1 Chronicles,1Chr
-2Chr,2 Chronicles,2Chr
-Ezra,Ezra,Ezra
-Neh,Nehemiah,Neh
-Esth,Esther,Esth
-Job,Job,Job
-Ps,Psalms,Ps
-Prov,Proverbs,Prov
-Eccl,Ecclesiastes,Eccl
-Song,Song of Songs,Song
-Isa,Isaiah,Isa
-Jer,Jeremiah,Jer
-Lam,Lamentations,Lam
-Ezek,Ezekiel,Ezek
-Dan,Daniel,Dan
-Hos,Hosea,Hos
-Joel,Joel,Joel
-Amos,Amos,Amos
-Obad,Obad,Obad
-Jonah,Jonah,Jonah
-Mic,Micah,Mic
-Nah,Naham,Nah
-Hab,Habakkuk,Hab
-Zeph,Zephaniah,Zeph
-Hag,Haggai,Hag
-Zech,Zechariah,Zech
-Mal,Malachi,Mal
-Matt,Matthew,Matt
-Mark,Mark,Mark
-Luke,Luke,Luke
-John,John,John
-Acts,Acts,Acts
-Rom,Romans,Rom
-1Cor,1 Corinthians,1Cor
-2Cor,2 Corinthians,2Cor
-Gal,Galatians,Gal
-Eph,Ephesians,Eph
-Phil,Philippians,Phil
-Col,Colossians,Col
-1Thess,1 Thessalonians,1Thess
-2Thess,2 Thessalonians,2Thess
-1Tim,1 Timothy,1Tim
-2Tim,2 Timothy,2Tim
-Titus,Titus,Titus
-Phlm,Philemon,Phlm
-Heb,Hebrews,Heb
-Jas,James,Jas
-1Pet,1 Peter,1Pet
-2Pet,2 Peter,2Pet
-1John,1 John,1John
-2John,2 John,2John
-3John,3 John,3John
-Jude,Jude,Jude
-Rev,Revelation,Rev
-Jdt,Judith,Jdt
-Wis,Wisdom,Wis
-Tob,Tobit,Tob
-Sir,Sirach,Sir
-Bar,Baruch,Bar
-1Macc,1 Maccabees,1Macc
-2Macc,2 Maccabees,2Macc
-AddDan,Rest of Daniel,AddDan
-AddEsth,Rest of Esther,AddEsth
-PrMan,Prayer of Manasses,PrMan

openlp/plugins/custom/customplugin.py

@@ -50,8 +50,8 @@ class CustomPlugin(Plugin):
             CustomMediaItem, CustomTab)
         self.weight = -5
         self.manager = Manager(u'custom', init_schema)
-        self.icon_path = u':/plugins/plugin_custom.png'
-        self.icon = build_icon(self.icon_path)
+        self.iconPath = u':/plugins/plugin_custom.png'
+        self.icon = build_icon(self.iconPath)
 
     def about(self):
         about_text = translate('CustomPlugin', '<strong>Custom Slide Plugin'

openlp/plugins/custom/lib/mediaitem.py

@@ -57,7 +57,7 @@ class CustomMediaItem(MediaManagerItem):
     def __init__(self, parent, plugin, icon):
         self.IconPath = u'custom/custom'
         MediaManagerItem.__init__(self, parent, plugin, icon)
-        self.edit_custom_form = EditCustomForm(self, self.plugin.formparent,
+        self.edit_custom_form = EditCustomForm(self, self.plugin.formParent,
             self.plugin.manager)
         self.singleServiceItem = False
         self.quickPreviewAllowed = True

openlp/plugins/images/imageplugin.py

@@ -42,8 +42,8 @@ class ImagePlugin(Plugin):
         Plugin.__init__(self, u'images', plugin_helpers, ImageMediaItem,
             ImageTab)
         self.weight = -7
-        self.icon_path = u':/plugins/plugin_images.png'
-        self.icon = build_icon(self.icon_path)
+        self.iconPath = u':/plugins/plugin_images.png'
+        self.icon = build_icon(self.iconPath)
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'image_updated'), self.image_updated)
 

openlp/plugins/images/lib/mediaitem.py

@@ -106,24 +106,24 @@ class ImageMediaItem(MediaManagerItem):
             row_list = [item.row() for item in self.listView.selectedIndexes()]
             row_list.sort(reverse=True)
             Receiver.send_message(u'cursor_busy')
-            self.plugin.formparent.displayProgressBar(len(row_list))
+            self.plugin.formParent.displayProgressBar(len(row_list))
             for row in row_list:
                 text = self.listView.item(row)
                 if text:
                     delete_file(os.path.join(self.servicePath,
                         unicode(text.text())))
                 self.listView.takeItem(row)
-                self.plugin.formparent.incrementProgressBar()
+                self.plugin.formParent.incrementProgressBar()
             SettingsManager.set_list(self.settingsSection,
                 u'images', self.getFileList())
-            self.plugin.formparent.finishedProgressBar()
+            self.plugin.formParent.finishedProgressBar()
             Receiver.send_message(u'cursor_normal')
         self.listView.blockSignals(False)
 
     def loadList(self, images, initialLoad=False):
         if not initialLoad:
             Receiver.send_message(u'cursor_busy')
-            self.plugin.formparent.displayProgressBar(len(images))
+            self.plugin.formParent.displayProgressBar(len(images))
         # Sort the themes by its filename considering language specific
         # characters. lower() is needed for windows!
         images.sort(cmp=locale.strcoll,
@@ -144,9 +144,9 @@ class ImageMediaItem(MediaManagerItem):
             item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(imageFile))
             self.listView.addItem(item_name)
             if not initialLoad:
-                self.plugin.formparent.incrementProgressBar()
+                self.plugin.formParent.incrementProgressBar()
         if not initialLoad:
-            self.plugin.formparent.finishedProgressBar()
+            self.plugin.formParent.finishedProgressBar()
             Receiver.send_message(u'cursor_normal')
 
     def generateSlideData(self, service_item, item=None, xmlVersion=False,

openlp/plugins/media/mediaplugin.py

@@ -41,8 +41,8 @@ class MediaPlugin(Plugin):
         Plugin.__init__(self, u'media', plugin_helpers,
             MediaMediaItem)
         self.weight = -6
-        self.icon_path = u':/plugins/plugin_media.png'
-        self.icon = build_icon(self.icon_path)
+        self.iconPath = u':/plugins/plugin_media.png'
+        self.icon = build_icon(self.iconPath)
         # passed with drag and drop messages
         self.dnd_id = u'Media'
         self.audio_extensions_list = \
@@ -59,8 +59,8 @@ class MediaPlugin(Plugin):
         Create the settings Tab
         """
         visible_name = self.getString(StringContent.VisibleName)
-        self.settings_tab = MediaTab(parent, self.name, visible_name[u'title'],
-            self.mediaController.mediaPlayers, self.icon_path)
+        self.settingsTab = MediaTab(parent, self.name, visible_name[u'title'],
+            self.mediaController.mediaPlayers, self.iconPath)
 
     def about(self):
         about_text = translate('MediaPlugin', '<strong>Media Plugin</strong>'
@@ -142,6 +142,6 @@ class MediaPlugin(Plugin):
                 self.mediaController.mediaPlayers[u'phonon'].isActive = True
                 settings.setValue(u'players', \
                     QtCore.QVariant(u','.join(new_players)))
-                self.settings_tab.load()
+                self.settingsTab.load()
             settings.remove(u'use phonon')
         settings.endGroup()

openlp/plugins/presentations/lib/impresscontroller.py

@@ -42,6 +42,9 @@ import time
 if os.name == u'nt':
     from win32com.client import Dispatch
     import pywintypes
+    # Declare an empty exception to match the exception imported from UNO
+    class ErrorCodeIOException(Exception):
+        pass
 else:
     try:
         import uno
@@ -339,7 +342,6 @@ class ImpressDocument(PresentationDocument):
         Returns true if a presentation is loaded
         """
         log.debug(u'is loaded OpenOffice')
-        #print "is_loaded "
         if self.presentation is None or self.document is None:
             log.debug("is_loaded: no presentation or document")
             return False
@@ -357,14 +359,9 @@ class ImpressDocument(PresentationDocument):
         Returns true if a presentation is active and running
         """
         log.debug(u'is active OpenOffice')
-        #print "is_active "
         if not self.is_loaded():
-            #print "False "
             return False
-        #print "self.con ", self.control
-        if self.control is None:
-            return False
-        return True
+        return self.control is not None
 
     def unblank_screen(self):
         """

openlp/plugins/presentations/lib/mediaitem.py

@@ -166,14 +166,14 @@ class PresentationMediaItem(MediaManagerItem):
         Receiver.send_message(u'cursor_busy')
         if not initialLoad:
             Receiver.send_message(u'cursor_busy')
-            self.plugin.formparent.displayProgressBar(len(files))
+            self.plugin.formParent.displayProgressBar(len(files))
         # Sort the themes by its filename considering language specific
         # characters. lower() is needed for windows!
         files.sort(cmp=locale.strcoll,
             key=lambda filename: os.path.split(unicode(filename))[1].lower())
         for file in files:
             if not initialLoad:
-                self.plugin.formparent.incrementProgressBar()
+                self.plugin.formParent.incrementProgressBar()
             if currlist.count(file) > 0:
                 continue
             filename = os.path.split(unicode(file))[1]
@@ -217,7 +217,7 @@ class PresentationMediaItem(MediaManagerItem):
             self.listView.addItem(item_name)
         Receiver.send_message(u'cursor_normal')
         if not initialLoad:
-            self.plugin.formparent.finishedProgressBar()
+            self.plugin.formParent.finishedProgressBar()
             Receiver.send_message(u'cursor_normal')
 
     def onDeleteClick(self):
@@ -229,7 +229,7 @@ class PresentationMediaItem(MediaManagerItem):
             row_list = [item.row() for item in items]
             row_list.sort(reverse=True)
             Receiver.send_message(u'cursor_busy')
-            self.plugin.formparent.displayProgressBar(len(row_list))
+            self.plugin.formParent.displayProgressBar(len(row_list))
             for item in items:
                 filepath = unicode(item.data(
                     QtCore.Qt.UserRole).toString())
@@ -237,8 +237,8 @@ class PresentationMediaItem(MediaManagerItem):
                     doc = self.controllers[cidx].add_document(filepath)
                     doc.presentation_deleted()
                     doc.close_presentation()
-                self.plugin.formparent.incrementProgressBar()
-            self.plugin.formparent.finishedProgressBar()
+                self.plugin.formParent.incrementProgressBar()
+            self.plugin.formParent.finishedProgressBar()
             Receiver.send_message(u'cursor_normal')
             for row in row_list:
                 self.listView.takeItem(row)
@@ -263,50 +263,49 @@ class PresentationMediaItem(MediaManagerItem):
         service_item.add_capability(ItemCapabilities.ProvidesOwnDisplay)
         service_item.add_capability(ItemCapabilities.HasDetailedTitleDisplay)
         shortname = service_item.shortname
-        if shortname:
-            for bitem in items:
-                filename = unicode(bitem.data(QtCore.Qt.UserRole).toString())
-                if os.path.exists(filename):
-                    if shortname == self.Automatic:
-                        service_item.shortname = \
-                            self.findControllerByType(filename)
-                        if not service_item.shortname:
-                            return False
-                    controller = self.controllers[service_item.shortname]
-                    (path, name) = os.path.split(filename)
-                    doc = controller.add_document(filename)
-                    if doc.get_thumbnail_path(1, True) is None:
-                        doc.load_presentation()
-                    i = 1
-                    img = doc.get_thumbnail_path(i, True)
-                    if img:
-                        while img:
-                            service_item.add_from_command(path, name, img)
-                            i = i + 1
-                            img = doc.get_thumbnail_path(i, True)
-                        doc.close_presentation()
-                        return True
-                    else:
-                        # File is no longer present
-                        if not remote:
-                            critical_error_message_box(
-                                translate('PresentationPlugin.MediaItem',
-                                'Missing Presentation'),
-                                unicode(translate(
-                                'PresentationPlugin.MediaItem',
-                                'The Presentation %s is incomplete,'
-                                ' please reload.')) % filename)
+        if not shortname:
+            return False
+        for bitem in items:
+            filename = unicode(bitem.data(QtCore.Qt.UserRole).toString())
+            if os.path.exists(filename):
+                if shortname == self.Automatic:
+                    service_item.shortname = self.findControllerByType(filename)
+                    if not service_item.shortname:
                         return False
+                controller = self.controllers[service_item.shortname]
+                (path, name) = os.path.split(filename)
+                doc = controller.add_document(filename)
+                if doc.get_thumbnail_path(1, True) is None:
+                    doc.load_presentation()
+                i = 1
+                img = doc.get_thumbnail_path(i, True)
+                if img:
+                    while img:
+                        service_item.add_from_command(path, name, img)
+                        i = i + 1
+                        img = doc.get_thumbnail_path(i, True)
+                    doc.close_presentation()
+                    return True
                 else:
                     # File is no longer present
+                    if not remote:
+                        critical_error_message_box(
+                            translate('PresentationPlugin.MediaItem',
+                            'Missing Presentation'),
+                            unicode(translate(
+                            'PresentationPlugin.MediaItem',
+                            'The presentation %s is incomplete,'
+                            ' please reload.')) % filename)
+                    return False
+            else:
+                # File is no longer present
+                if not remote:
                     critical_error_message_box(
                         translate('PresentationPlugin.MediaItem',
                         'Missing Presentation'),
                         unicode(translate('PresentationPlugin.MediaItem',
-                        'The Presentation %s no longer exists.')) % filename)
-                    return False
-        else:
-            return False
+                        'The presentation %s no longer exists.')) % filename)
+                return False
 
     def findControllerByType(self, filename):
         """

openlp/plugins/presentations/presentationplugin.py

@@ -54,16 +54,16 @@ class PresentationPlugin(Plugin):
         self.controllers = {}
         Plugin.__init__(self, u'presentations', plugin_helpers)
         self.weight = -8
-        self.icon_path = u':/plugins/plugin_presentations.png'
-        self.icon = build_icon(self.icon_path)
+        self.iconPath = u':/plugins/plugin_presentations.png'
+        self.icon = build_icon(self.iconPath)
 
     def createSettingsTab(self, parent):
         """
         Create the settings Tab
         """
         visible_name = self.getString(StringContent.VisibleName)
-        self.settings_tab = PresentationTab(parent, self.name,
-            visible_name[u'title'], self.controllers, self.icon_path)
+        self.settingsTab = PresentationTab(parent, self.name,
+            visible_name[u'title'], self.controllers, self.iconPath)
 
     def initialise(self):
         """
@@ -99,7 +99,7 @@ class PresentationPlugin(Plugin):
         Create the Media Manager List
         """
         self.mediaItem = PresentationMediaItem(
-            self.mediadock.media_dock, self, self.icon, self.controllers)
+            self.mediaDock.media_dock, self, self.icon, self.controllers)
 
     def registerControllers(self, controller):
         """
@@ -134,10 +134,7 @@ class PresentationPlugin(Plugin):
         for controller_class in controller_classes:
             controller = controller_class(self)
             self.registerControllers(controller)
-        if self.controllers:
-            return True
-        else:
-            return False
+        return bool(self.controllers)
 
     def about(self):
         """

openlp/plugins/remotes/remoteplugin.py

@@ -41,8 +41,8 @@ class RemotesPlugin(Plugin):
         """
         Plugin.__init__(self, u'remotes', plugin_helpers,
             settings_tab_class=RemoteTab)
-        self.icon_path = u':/plugins/plugin_remote.png'
-        self.icon = build_icon(self.icon_path)
+        self.iconPath = u':/plugins/plugin_remote.png'
+        self.icon = build_icon(self.iconPath)
         self.weight = -1
         self.server = None
 

openlp/plugins/songs/forms/songimportform.py

@@ -57,7 +57,7 @@ class SongImportForm(OpenLPWizard):
         ``plugin``
             The songs plugin.
         """
-        self.clipboard = plugin.formparent.clipboard
+        self.clipboard = plugin.formParent.clipboard
         OpenLPWizard.__init__(self, parent, plugin, u'songImportWizard',
             u':/wizards/wizard_importsong.bmp')
 
@@ -129,6 +129,12 @@ class SongImportForm(OpenLPWizard):
         QtCore.QObject.connect(self.ccliRemoveButton,
             QtCore.SIGNAL(u'clicked()'),
             self.onCCLIRemoveButtonClicked)
+        QtCore.QObject.connect(self.dreamBeamAddButton,
+            QtCore.SIGNAL(u'clicked()'),
+            self.onDreamBeamAddButtonClicked)
+        QtCore.QObject.connect(self.dreamBeamRemoveButton,
+            QtCore.SIGNAL(u'clicked()'),
+            self.onDreamBeamRemoveButtonClicked)
         QtCore.QObject.connect(self.songsOfFellowshipAddButton,
             QtCore.SIGNAL(u'clicked()'),
             self.onSongsOfFellowshipAddButtonClicked)
@@ -201,6 +207,8 @@ class SongImportForm(OpenLPWizard):
         self.addFileSelectItem(u'generic', None, True)
         # CCLI File import
         self.addFileSelectItem(u'ccli')
+        # DreamBeam
+        self.addFileSelectItem(u'dreamBeam')
         # EasySlides
         self.addFileSelectItem(u'easySlides', single_select=True)
         # EasyWorship
@@ -247,6 +255,8 @@ class SongImportForm(OpenLPWizard):
             translate('SongsPlugin.ImportWizardForm',
             'Generic Document/Presentation'))
         self.formatComboBox.setItemText(SongFormat.CCLI, WizardStrings.CCLI)
+        self.formatComboBox.setItemText(
+            SongFormat.DreamBeam, WizardStrings.DB)
         self.formatComboBox.setItemText(
             SongFormat.EasySlides, WizardStrings.ES)
         self.formatComboBox.setItemText(
@@ -291,6 +301,10 @@ class SongImportForm(OpenLPWizard):
             translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
         self.ccliRemoveButton.setText(
             translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
+        self.dreamBeamAddButton.setText(
+            translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
+        self.dreamBeamRemoveButton.setText(
+            translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
         self.songsOfFellowshipAddButton.setText(
             translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
         self.songsOfFellowshipRemoveButton.setText(
@@ -397,6 +411,12 @@ class SongImportForm(OpenLPWizard):
                         WizardStrings.YouSpecifyFile % WizardStrings.CCLI)
                     self.ccliAddButton.setFocus()
                     return False
+            elif source_format == SongFormat.DreamBeam:
+                if self.dreamBeamFileListWidget.count() == 0:
+                    critical_error_message_box(UiStrings().NFSp,
+                        WizardStrings.YouSpecifyFile % WizardStrings.DB)
+                    self.dreamBeamAddButton.setFocus()
+                    return False
             elif source_format == SongFormat.SongsOfFellowship:
                 if self.songsOfFellowshipFileListWidget.count() == 0:
                     critical_error_message_box(UiStrings().NFSp,
@@ -433,7 +453,7 @@ class SongImportForm(OpenLPWizard):
                 if self.songShowPlusFileListWidget.count() == 0:
                     critical_error_message_box(UiStrings().NFSp,
                         WizardStrings.YouSpecifyFile % WizardStrings.SSP)
-                    self.wordsOfWorshipAddButton.setFocus()
+                    self.songShowPlusAddButton.setFocus()
                     return False
             elif source_format == SongFormat.FoilPresenter:
                 if self.foilPresenterFileListWidget.count() == 0:
@@ -564,6 +584,22 @@ class SongImportForm(OpenLPWizard):
         """
         self.removeSelectedItems(self.ccliFileListWidget)
 
+    def onDreamBeamAddButtonClicked(self):
+        """
+        Get DreamBeam song database files
+        """
+        self.getFiles(WizardStrings.OpenTypeFile % WizardStrings.DB,
+            self.dreamBeamFileListWidget, u'%s (*.xml)'
+            % translate('SongsPlugin.ImportWizardForm',
+            'DreamBeam Song Files')
+        )
+
+    def onDreamBeamRemoveButtonClicked(self):
+        """
+        Remove selected DreamBeam files from the import list
+        """
+        self.removeSelectedItems(self.dreamBeamFileListWidget)
+
     def onSongsOfFellowshipAddButtonClicked(self):
         """
         Get Songs of Fellowship song database files
@@ -680,6 +716,7 @@ class SongImportForm(OpenLPWizard):
         self.openSongFileListWidget.clear()
         self.wordsOfWorshipFileListWidget.clear()
         self.ccliFileListWidget.clear()
+        self.dreamBeamFileListWidget.clear()
         self.songsOfFellowshipFileListWidget.clear()
         self.genericFileListWidget.clear()
         self.easySlidesFilenameEdit.setText(u'')
@@ -741,6 +778,12 @@ class SongImportForm(OpenLPWizard):
             importer = self.plugin.importSongs(SongFormat.CCLI,
                 filenames=self.getListOfFiles(self.ccliFileListWidget)
             )
+        elif source_format == SongFormat.DreamBeam:
+            # Import DreamBeam songs
+            importer = self.plugin.importSongs(SongFormat.DreamBeam,
+                filenames=self.getListOfFiles(
+                    self.dreamBeamFileListWidget)
+            )
         elif source_format == SongFormat.SongsOfFellowship:
             # Import a Songs of Fellowship RTF file
             importer = self.plugin.importSongs(SongFormat.SongsOfFellowship,

openlp/plugins/songs/lib/dreambeamimport.py

@@ -0,0 +1,157 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2012 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2012 Tim Bentley, Gerald Britton, Jonathan      #
+# Corwin, Michael Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan,      #
+# Armin Köhler, Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias     #
+# Põldaru, Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith,    #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund             #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+"""
+The :mod:`dreambeamimport` module provides the functionality for importing
+DreamBeam songs into the OpenLP database.
+"""
+import os
+import sys
+import logging
+
+from lxml import etree, objectify
+
+from openlp.core.lib import translate
+from openlp.plugins.songs.lib.songimport import SongImport
+from openlp.plugins.songs.lib.ui import SongStrings
+
+log = logging.getLogger(__name__)
+
+class DreamBeamImport(SongImport):
+    """
+    The :class:`DreamBeamImport` class provides the ability to import song files from
+    DreamBeam.
+    
+    An example of DreamBeam xml mark-up::
+    
+        <?xml version="1.0"?>
+        <DreamSong xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+          <WordWrap>false</WordWrap>
+          <Version>0.80</Version>
+          <Title>Amazing Grace</Title>
+          <Author>John Newton</Author>
+          <Collection />
+          <Number />
+          <Notes />
+          <KeyRangeLow>F</KeyRangeLow>
+          <KeyRangeHigh>G</KeyRangeHigh>
+          <MinorKey>false</MinorKey>
+          <DualLanguage>false</DualLanguage>
+          <SongLyrics>
+            <LyricsItem Type="Verse" Number="1">Amazing Grace, how sweet the sound,
+            That saved a wretch like me.
+            I once was lost but now am found,
+            Was blind, but now, I see.</LyricsItem>
+            <LyricsItem Type="Verse" Number="2">T’was Grace that taught my heart to fear.
+            And Grace, my fears relieved.
+            How precious did that Grace appear…
+            the hour I first believed.</LyricsItem>
+          </SongLyrics>
+          <Sequence>
+            <LyricsSequenceItem Type="Verse" Number="1" />
+            <LyricsSequenceItem Type="Verse" Number="2" />
+          </Sequence>
+          <ShowRectangles>false</ShowRectangles>
+        </DreamSong>
+
+    Valid extensions for a DreamBeam song file are:
+
+        * \*.xml
+    """
+    
+    def doImport(self):
+        """
+        Receive a single file or a list of files to import.
+        """
+        if isinstance(self.importSource, list):
+            self.importWizard.progressBar.setMaximum(len(self.importSource))
+            for file in self.importSource:
+                if self.stopImportFlag:
+                    return
+                self.setDefaults()
+                parser = etree.XMLParser(remove_blank_text=True)
+                try:
+                    parsed_file = etree.parse(open(file, u'r'), parser)
+                except etree.XMLSyntaxError:
+                    log.exception(u'XML syntax error in file %s' % file)
+                    self.logError(file, SongStrings.XMLSyntaxError)
+                    continue
+                xml = unicode(etree.tostring(parsed_file))
+                song_xml = objectify.fromstring(xml)
+                if song_xml.tag != u'DreamSong':
+                    self.logError(file, unicode(
+                        translate('SongsPlugin.DreamBeamImport',
+                        ('Invalid DreamBeam song file. Missing '
+                            'DreamSong tag.'))))
+                    continue
+                if hasattr(song_xml, u'Version'):
+                    self.version = float(song_xml.Version.text)
+                else:
+                    self.version = 0
+                # Version numbers found in DreamBeam Source /FileTypes/Song.cs
+                if self.version >= 0.5:
+                    if hasattr(song_xml, u'Title'):
+                        self.title = unicode(song_xml.Title.text)
+                    if hasattr(song_xml, u'Author'):
+                        author_copyright = song_xml.Author.text
+                    if hasattr(song_xml, u'SongLyrics'):
+                        for lyrics_item in song_xml.SongLyrics.iterchildren():
+                            verse_type =  lyrics_item.get(u'Type')
+                            verse_number = lyrics_item.get(u'Number')
+                            verse_text = unicode(lyrics_item.text)
+                            self.addVerse(verse_text, 
+                                (u'%s%s' % (verse_type[:1], verse_number)))
+                    if hasattr(song_xml, u'Collection'):
+                        self.songBookName = unicode(song_xml.Collection.text)
+                    if hasattr(song_xml, u'Number'):
+                        self.songNumber = unicode(song_xml.Number.text)
+                    if hasattr(song_xml, u'Sequence'):
+                        for LyricsSequenceItem in (
+                            song_xml.Sequence.iterchildren()):
+                            self.verseOrderList.append(
+                                "%s%s" % (LyricsSequenceItem.get(u'Type')[:1], 
+                                LyricsSequenceItem.get(u'Number')))
+                    if hasattr(song_xml, u'Notes'):
+                        self.comments = unicode(song_xml.Notes.text)
+                else:
+                    if hasattr(song_xml.Text0, u'Text'):
+                        self.title = unicode(song_xml.Text0.Text.text)
+                    if hasattr(song_xml.Text1, u'Text'):
+                        self.lyrics = unicode(song_xml.Text1.Text.text)
+                        for verse in self.lyrics.split(u'\n\n\n'):
+                            self.addVerse(verse)
+                    if hasattr(song_xml.Text2, u'Text'):
+                        author_copyright = song_xml.Text2.Text.text
+                if author_copyright:
+                    author_copyright = unicode(author_copyright)
+                    if author_copyright.find(
+                        unicode(SongStrings.CopyrightSymbol)) >= 0:
+                        self.addCopyright(author_copyright)
+                    else:
+                        self.parseAuthor(author_copyright)
+                if not self.finish():
+                    self.logError(file)

openlp/plugins/songs/lib/foilpresenterimport.py

@@ -413,7 +413,7 @@ class FoilPresenter(object):
         temp_verse_order_backup = []
         temp_sortnr_backup = 1
         temp_sortnr_liste = []
-        versenumber = {
+        verse_count = {
             VerseType.Tags[VerseType.Verse]: 1,
             VerseType.Tags[VerseType.Chorus]: 1,
             VerseType.Tags[VerseType.Bridge]: 1,
@@ -463,8 +463,8 @@ class FoilPresenter(object):
             verse_number = re.compile(u'[a-zA-Z.+-_ ]*').sub(u'', verse_name)
             # Foilpresenter allows e. g. "C", but we need "C1".
             if not verse_number:
-                verse_number = unicode(versenumber[verse_type])
-                versenumber[verse_type] += 1
+                verse_number = unicode(verse_count[verse_type])
+                verse_count[verse_type] += 1
             else:
                 # test if foilpresenter have the same versenumber two times with
                 # different parts raise the verse number
@@ -508,13 +508,13 @@ class FoilPresenter(object):
         song.song_number = u''
         try:
             for bucheintrag in foilpresenterfolie.buch.bucheintrag:
-                bookname = self._child(bucheintrag.name)
-                if bookname:
+                book_name = self._child(bucheintrag.name)
+                if book_name:
                     book = self.manager.get_object_filtered(Book,
-                        Book.name == bookname)
+                        Book.name == book_name)
                     if book is None:
                         # We need to create a book, because it does not exist.
-                        book = Book.populate(name=bookname, publisher=u'')
+                        book = Book.populate(name=book_name, publisher=u'')
                         self.manager.save_object(book)
                     song.song_book_id = book.id
                     try:
@@ -537,12 +537,12 @@ class FoilPresenter(object):
         ``song``
             The song object.
         """
-        for titelstring in foilpresenterfolie.titel.titelstring:
+        for title_string in foilpresenterfolie.titel.titelstring:
             if not song.title:
-                song.title = self._child(titelstring)
+                song.title = self._child(title_string)
                 song.alternate_title = u''
             else:
-                song.alternate_title = self._child(titelstring)
+                song.alternate_title = self._child(title_string)
 
     def _process_topics(self, foilpresenterfolie, song):
         """
@@ -556,13 +556,13 @@ class FoilPresenter(object):
         """
         try:
             for name in foilpresenterfolie.kategorien.name:
-                topictext = self._child(name)
-                if topictext:
+                topic_text = self._child(name)
+                if topic_text:
                     topic = self.manager.get_object_filtered(Topic,
-                        Topic.name == topictext)
+                        Topic.name == topic_text)
                     if topic is None:
                         # We need to create a topic, because it does not exist.
-                        topic = Topic.populate(name=topictext)
+                        topic = Topic.populate(name=topic_text)
                         self.manager.save_object(topic)
                     song.topics.append(topic)
         except AttributeError:

openlp/plugins/songs/lib/importer.py

@@ -35,6 +35,7 @@ from olpimport import OpenLPSongImport
 from openlyricsimport import OpenLyricsImport
 from wowimport import WowImport
 from cclifileimport import CCLIFileImport
+from dreambeamimport import DreamBeamImport
 from ewimport import EasyWorshipSongImport
 from songbeamerimport import SongBeamerImport
 from songshowplusimport import SongShowPlusImport
@@ -73,15 +74,16 @@ class SongFormat(object):
     OpenLP1 = 2
     Generic = 3
     CCLI = 4
-    EasySlides = 5
-    EasyWorship = 6
-    FoilPresenter = 7
-    OpenSong = 8
-    SongBeamer = 9
-    SongShowPlus = 10
-    SongsOfFellowship = 11
-    WordsOfWorship = 12
-    #CSV = 13
+    DreamBeam = 5
+    EasySlides = 6
+    EasyWorship = 7
+    FoilPresenter = 8
+    OpenSong = 9
+    SongBeamer = 10
+    SongShowPlus = 11
+    SongsOfFellowship = 12
+    WordsOfWorship = 13
+    #CSV = 14
 
     @staticmethod
     def get_class(format):
@@ -107,6 +109,8 @@ class SongFormat(object):
             return OooImport
         elif format == SongFormat.CCLI:
             return CCLIFileImport
+        elif format == SongFormat.DreamBeam:
+            return DreamBeamImport
         elif format == SongFormat.EasySlides:
             return EasySlidesImport
         elif format == SongFormat.EasyWorship:
@@ -130,6 +134,7 @@ class SongFormat(object):
             SongFormat.OpenLP1,
             SongFormat.Generic,
             SongFormat.CCLI,
+            SongFormat.DreamBeam, 
             SongFormat.EasySlides,
             SongFormat.EasyWorship,
             SongFormat.FoilPresenter,

openlp/plugins/songs/lib/mediaitem.py

@@ -68,7 +68,7 @@ class SongMediaItem(MediaManagerItem):
     def __init__(self, parent, plugin, icon):
         self.IconPath = u'songs/song'
         MediaManagerItem.__init__(self, parent, plugin, icon)
-        self.editSongForm = EditSongForm(self, self.plugin.formparent,
+        self.editSongForm = EditSongForm(self, self.plugin.formParent,
             self.plugin.manager)
         self.openLyrics = OpenLyrics(self.plugin.manager)
         self.singleServiceItem = False
@@ -409,7 +409,7 @@ class SongMediaItem(MediaManagerItem):
                 QtGui.QMessageBox.Yes) == QtGui.QMessageBox.No:
                 return
             Receiver.send_message(u'cursor_busy')
-            self.plugin.formparent.displayProgressBar(len(items))
+            self.plugin.formParent.displayProgressBar(len(items))
             for item in items:
                 item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
                 media_files = self.plugin.manager.get_all_objects(MediaFile,
@@ -428,8 +428,8 @@ class SongMediaItem(MediaManagerItem):
                 except OSError:
                     log.exception(u'Could not remove directory: %s', save_path)
                 self.plugin.manager.delete_object(Song, item_id)
-                self.plugin.formparent.incrementProgressBar()
-            self.plugin.formparent.finishedProgressBar()
+                self.plugin.formParent.incrementProgressBar()
+            self.plugin.formParent.finishedProgressBar()
             Receiver.send_message(u'cursor_normal')
             self.onSearchTextButtonClicked()
 

openlp/plugins/songs/lib/olp1import.py

@@ -60,7 +60,7 @@ class OpenLP1SongImport(SongImport):
         """
         SongImport.__init__(self, manager, **kwargs)
         self.availableThemes = \
-            kwargs[u'plugin'].formparent.themeManagerContents.getThemes()
+            kwargs[u'plugin'].formParent.themeManagerContents.getThemes()
 
     def doImport(self):
         """

openlp/plugins/songs/lib/songshowplusimport.py

@@ -25,8 +25,8 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 """
-The :mod:`wowimport` module provides the functionality for importing Words of
-Worship songs into the OpenLP database.
+The :mod:`songshowplusimport` module provides the functionality for importing 
+SongShow Plus songs into the OpenLP database.
 """
 import os
 import logging

openlp/plugins/songs/lib/upgrade.py

@@ -75,6 +75,7 @@ def upgrade_1(session, metadata, tables):
         ForeignKeyConstraint([u'song_id'], [u'songs.id'],
             table=tables[u'media_files']).create()
 
+
 def upgrade_2(session, metadata, tables):
     """
     Version 2 upgrade.
@@ -86,6 +87,7 @@ def upgrade_2(session, metadata, tables):
     Column(u'last_modified', types.DateTime(), default=func.now())\
         .create(table=tables[u'songs'])
 
+
 def upgrade_3(session, metadata, tables):
     """
     Version 3 upgrade.

openlp/plugins/songs/lib/xml.py

@@ -521,9 +521,9 @@ class OpenLyrics(object):
         if hasattr(properties, u'comments'):
             comments_list = []
             for comment in properties.comments.comment:
-                commenttext = self._text(comment)
-                if commenttext:
-                    comments_list.append(commenttext)
+                comment_text = self._text(comment)
+                if comment_text:
+                    comments_list.append(comment_text)
             song.comments = u'\n'.join(comments_list)
 
     def _process_copyright(self, properties, song):
@@ -746,13 +746,13 @@ class OpenLyrics(object):
         song.song_number = u''
         if hasattr(properties, u'songbooks'):
             for songbook in properties.songbooks.songbook:
-                bookname = songbook.get(u'name', u'')
-                if bookname:
+                book_name = songbook.get(u'name', u'')
+                if book_name:
                     book = self.manager.get_object_filtered(Book,
-                        Book.name == bookname)
+                        Book.name == book_name)
                     if book is None:
                         # We need to create a book, because it does not exist.
-                        book = Book.populate(name=bookname, publisher=u'')
+                        book = Book.populate(name=book_name, publisher=u'')
                         self.manager.save_object(book)
                     song.song_book_id = book.id
                     song.song_number = songbook.get(u'entry', u'')
@@ -787,14 +787,14 @@ class OpenLyrics(object):
             The song object.
         """
         if hasattr(properties, u'themes'):
-            for topictext in properties.themes.theme:
-                topictext = self._text(topictext)
-                if topictext:
+            for topic_text in properties.themes.theme:
+                topic_text = self._text(topic_text)
+                if topic_text:
                     topic = self.manager.get_object_filtered(Topic,
-                        Topic.name == topictext)
+                        Topic.name == topic_text)
                     if topic is None:
                         # We need to create a topic, because it does not exist.
-                        topic = Topic.populate(name=topictext)
+                        topic = Topic.populate(name=topic_text)
                         self.manager.save_object(topic)
                     song.topics.append(topic)
 
@@ -813,6 +813,7 @@ class OpenLyricsError(Exception):
     VerseError = 2
 
     def __init__(self, type, log_message, display_message):
+        Exception.__init__(self)
         self.type = type
         self.log_message = log_message
         self.display_message = display_message

openlp/plugins/songs/songsplugin.py

@@ -61,8 +61,8 @@ class SongsPlugin(Plugin):
         Plugin.__init__(self, u'songs', plugin_helpers, SongMediaItem, SongsTab)
         self.manager = Manager(u'songs', init_schema, upgrade_mod=upgrade)
         self.weight = -10
-        self.icon_path = u':/plugins/plugin_songs.png'
-        self.icon = build_icon(self.icon_path)
+        self.iconPath = u':/plugins/plugin_songs.png'
+        self.icon = build_icon(self.iconPath)
 
     def checkPreConditions(self):
         return self.manager.session is not None
@@ -144,7 +144,7 @@ class SongsPlugin(Plugin):
             return
         progressDialog = QtGui.QProgressDialog(
             translate('SongsPlugin', 'Reindexing songs...'), UiStrings().Cancel,
-            0, maxSongs, self.formparent)
+            0, maxSongs, self.formParent)
         progressDialog.setWindowModality(QtCore.Qt.WindowModal)
         songs = self.manager.get_all_objects(Song)
         for number, song in enumerate(songs):
@@ -241,7 +241,7 @@ class SongsPlugin(Plugin):
                 song_dbs.append(os.path.join(db_dir, sfile))
         if len(song_dbs) == 0:
             return
-        progress = QtGui.QProgressDialog(self.formparent)
+        progress = QtGui.QProgressDialog(self.formParent)
         progress.setWindowModality(QtCore.Qt.WindowModal)
         progress.setLabelText(translate('OpenLP.Ui', 'Starting import...'))
         progress.setCancelButton(None)

openlp/plugins/songusage/songusageplugin.py

@@ -98,13 +98,13 @@ class SongUsagePlugin(Plugin):
         self.songUsageMenu.addAction(self.songUsageReport)
         self.songUsageMenu.addAction(self.songUsageDelete)
         self.songUsageActiveButton = QtGui.QToolButton(
-            self.formparent.statusBar)
+            self.formParent.statusBar)
         self.songUsageActiveButton.setCheckable(True)
         self.songUsageActiveButton.setAutoRaise(True)
         self.songUsageActiveButton.setStatusTip(translate('SongUsagePlugin',
             'Toggle the tracking of song usage.'))
         self.songUsageActiveButton.setObjectName(u'songUsageActiveButton')
-        self.formparent.statusBar.insertPermanentWidget(1,
+        self.formParent.statusBar.insertPermanentWidget(1,
             self.songUsageActiveButton)
         self.songUsageActiveButton.hide()
         # Signals and slots
@@ -138,8 +138,8 @@ class SongUsagePlugin(Plugin):
         action_list.add_action(self.songUsageReport,
             unicode(translate('SongUsagePlugin', 'Song Usage')))
         self.songUsageDeleteForm = SongUsageDeleteForm(self.manager,
-            self.formparent)
-        self.songUsageDetailForm = SongUsageDetailForm(self, self.formparent)
+            self.formParent)
+        self.songUsageDetailForm = SongUsageDetailForm(self, self.formParent)
         self.songUsageMenu.menuAction().setVisible(True)
         self.songUsageActiveButton.show()