merging changes from trunk

openlp.pyw

@@ -133,6 +133,7 @@ class OpenLP(QtGui.QApplication):
             u'general/update check', QtCore.QVariant(True)).toBool()
         if update_check:
             VersionThread(self.mainWindow).start()
+        Receiver.send_message(u'maindisplay_blank_check')
         self.mainWindow.appStartup()
         DelayStartThread(self.mainWindow).start()
         return self.exec_()

openlp/core/lib/__init__.py

@@ -137,13 +137,12 @@ def image_to_byte(image):
     # convert to base64 encoding so does not get missed!
     return byte_array.toBase64()
 
-def resize_image(image, width, height, background=QtCore.Qt.black):
+def resize_image(image_path, width, height, background=QtCore.Qt.black):
     """
     Resize an image to fit on the current screen.
 
-    ``image``
+    ``image_path``
-        The image to resize. It has to be either a ``QImage`` instance or the
+        The path to the image to resize.
-        path to the image.
 
     ``width``
         The new image width.
@@ -155,16 +154,24 @@ def resize_image(image, width, height, background=QtCore.Qt.black):
         The background colour defaults to black.
     """
     log.debug(u'resize_image - start')
-    if isinstance(image, QtGui.QImage):
+    reader = QtGui.QImageReader(image_path)
-        preview = image
+    # The image's ratio.
+    image_ratio = float(reader.size().width()) / float(reader.size().height())
+    resize_ratio = float(width) / float(height)
+    # Figure out the size we want to resize the image to (keep aspect ratio).
+    if image_ratio == resize_ratio:
+        size = QtCore.QSize(width, height)
+    elif image_ratio < resize_ratio:
+        # Use the image's height as reference for the new size.
+        size = QtCore.QSize(image_ratio * height, height)
     else:
-        preview = QtGui.QImage(image)
+        # Use the image's width as reference for the new size.
-    if not preview.isNull():
+        size = QtCore.QSize(width, 1 / (image_ratio / width))
-        # Only resize if different size
+    reader.setScaledSize(size)
-        if preview.width() == width and preview.height == height:
+    preview = reader.read()
-            return preview
+    if image_ratio == resize_ratio:
-        preview = preview.scaled(width, height, QtCore.Qt.KeepAspectRatio,
+        # We neither need to centre the image nor add "bars" to the image.
-            QtCore.Qt.SmoothTransformation)
+        return preview
     realw = preview.width()
     realh = preview.height()
     # and move it to the centre of the preview space

openlp/core/lib/mediamanageritem.py

@@ -91,7 +91,8 @@ class MediaManagerItem(QtGui.QWidget):
         Constructor to create the media manager item.
         """
         QtGui.QWidget.__init__(self, parent)
-        self.whitespace = re.compile(r'\W+', re.UNICODE)
+        self.hide()
+        self.whitespace = re.compile(r'[\W_]+', re.UNICODE)
         self.plugin = plugin
         visible_title = self.plugin.getString(StringContent.VisibleName)
         self.title = unicode(visible_title[u'title'])
@@ -390,21 +391,26 @@ class MediaManagerItem(QtGui.QWidget):
             self.iconFromFile(image, thumb)
         return True
 
-    def iconFromFile(self, image, thumb):
+    def iconFromFile(self, image_path, thumb_path):
         """
         Create a thumbnail icon from a given image.
 
-        ``image``
+        ``image_path``
             The image file to create the icon from.
 
-        ``thumb``
+        ``thumb_path``
-            The filename to save the thumbnail to
+            The filename to save the thumbnail to.
         """
-        icon = build_icon(unicode(image))
+        ext = os.path.splitext(thumb_path)[1].lower()
-        pixmap = icon.pixmap(QtCore.QSize(88, 50))
+        reader = QtGui.QImageReader(image_path)
-        ext = os.path.splitext(thumb)[1].lower()
+        ratio = float(reader.size().width()) / float(reader.size().height())
-        pixmap.save(thumb, ext[1:])
+        reader.setScaledSize(QtCore.QSize(int(ratio * 88), 88))
-        return icon
+        thumb = reader.read()
+        thumb.save(thumb_path, ext[1:])
+        if os.path.exists(thumb_path):
+            return build_icon(unicode(thumb_path))
+        # Fallback for files with animation support.
+        return build_icon(unicode(image_path))
 
     def loadList(self, list):
         raise NotImplementedError(u'MediaManagerItem.loadList needs to be '
@@ -453,7 +459,8 @@ class MediaManagerItem(QtGui.QWidget):
         """
         if QtCore.QSettings().value(u'advanced/single click preview',
             QtCore.QVariant(False)).toBool() and self.quickPreviewAllowed \
-            and self.listView.selectedIndexes():
+            and self.listView.selectedIndexes() \
+            and self.auto_select_id == -1:
             self.onPreviewClick(True)
 
     def onPreviewClick(self, keepFocus=False):

openlp/core/lib/plugin.py

@@ -300,6 +300,12 @@ class Plugin(QtCore.QObject):
         if self.mediaItem:
             self.mediadock.remove_dock(self.mediaItem)
 
+    def appStartup(self):
+        """
+        Perform tasks on application starup
+        """
+        pass
+
     def usesTheme(self, theme):
         """
         Called to find out if a plugin is currently using a theme.

openlp/core/lib/renderer.py

@@ -67,7 +67,7 @@ class Renderer(object):
     ``theme_manager``
         The ThemeManager instance, used to get the current theme details.
         """
-        log.debug(u'Initilisation started')
+        log.debug(u'Initialisation started')
         self.theme_manager = theme_manager
         self.image_manager = image_manager
         self.screens = ScreenList.get_instance()
@@ -86,6 +86,8 @@ class Renderer(object):
         """
         log.debug(u'Update Display')
         self._calculate_default(self.screens.current[u'size'])
+        if self.display:
+            self.display.close()
         self.display = MainDisplay(None, self.image_manager, False)
         self.display.setup()
         self.bg_frame = None
@@ -241,7 +243,7 @@ class Renderer(object):
         ``screen``
             The QSize of the screen.
         """
-        log.debug(u'calculate default %s', screen)
+        log.debug(u'_calculate default %s', screen)
         self.width = screen.width()
         self.height = screen.height()
         self.screen_ratio = float(self.height) / float(self.width)
@@ -286,7 +288,7 @@ class Renderer(object):
         ``rect_footer``
             The footer text block.
         """
-        log.debug(u'set_text_rectangle %s , %s' % (rect_main, rect_footer))
+        log.debug(u'_set_text_rectangle %s , %s' % (rect_main, rect_footer))
         self._rect = rect_main
         self._rect_footer = rect_footer
         self.page_width = self._rect.width()
@@ -339,7 +341,7 @@ class Renderer(object):
             # Text too long so go to next page.
             if self.web_frame.contentsSize().height() > self.page_height:
                 if force_page and line_count > 0:
-                    Receiver.send_message(u'theme_line_count', line_count)
+                    Receiver.send_message(u'theme_line_count', line_count - 1)
                 line_count = -1
                 while html_text.endswith(u'<br>'):
                     html_text = html_text[:-4]

openlp/core/ui/exceptionform.py

@@ -106,7 +106,7 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog):
         """
         Saving exception log and system informations to a file.
         """
-        report = unicode(translate('OpenLP.ExceptionForm',
+        report_text = unicode(translate('OpenLP.ExceptionForm',
             '**OpenLP Bug Report**\n'
             'Version: %s\n\n'
             '--- Details of the Exception. ---\n\n%s\n\n '
@@ -122,21 +122,21 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog):
             filename = unicode(QtCore.QDir.toNativeSeparators(filename))
             SettingsManager.set_last_dir(self.settingsSection, os.path.dirname(
                 filename))
-            report = report % self._createReport()
+            report_text = report_text % self._createReport()
             try:
-                file = open(filename, u'w')
+                report_file = open(filename, u'w')
                 try:
-                    file.write(report)
+                    report_file.write(report_text)
                 except UnicodeError:
-                    file.close()
+                    report_file.close()
-                    file = open(filename, u'wb')
+                    report_file = open(filename, u'wb')
-                    file.write(report.encode(u'utf-8'))
+                    report_file.write(report_text.encode(u'utf-8'))
                 finally:
-                    file.close()
+                    report_file.close()
             except IOError:
                 log.exception(u'Failed to write crash report')
             finally:
-                file.close()
+                report_file.close()
 
     def onSendReportButtonPressed(self):
         """

openlp/core/ui/maindisplay.py

@@ -63,6 +63,7 @@ class MainDisplay(QtGui.QGraphicsView):
         self.setStyleSheet(u'border: 0px; margin: 0px; padding: 0px;')
         self.setWindowFlags(QtCore.Qt.FramelessWindowHint | QtCore.Qt.Tool |
             QtCore.Qt.WindowStaysOnTopHint)
+        self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
         if self.isLive:
             QtCore.QObject.connect(Receiver.get_receiver(),
                 QtCore.SIGNAL(u'maindisplay_hide'), self.hideDisplay)
@@ -148,7 +149,6 @@ class MainDisplay(QtGui.QGraphicsView):
             self.__hideMouse()
             # To display or not to display?
             if not self.screen[u'primary']:
-                self.show()
                 self.primary = False
             else:
                 self.primary = True

openlp/core/ui/mainwindow.py

@@ -655,7 +655,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         # Give all the plugins a chance to perform some tasks at startup
         Receiver.send_message(u'openlp_process_events')
         for plugin in self.pluginManager.plugins:
-            if hasattr(plugin, u'appStartup'):
+            if plugin.isActive():
                 Receiver.send_message(u'openlp_process_events')
                 plugin.appStartup()
         Receiver.send_message(u'openlp_process_events')
@@ -678,13 +678,12 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
     def blankCheck(self):
         """
         Check and display message if screen blank on setup.
-        Triggered by delay thread.
         """
         settings = QtCore.QSettings()
+        self.liveController.mainDisplaySetBackground()
         if settings.value(u'%s/screen blank' % self.generalSettingsSection,
             QtCore.QVariant(False)).toBool():
-            self.liveController.mainDisplaySetBackground()
+            if settings.value(u'%s/blank warning' % self.generalSettingsSection,
-            if settings.value(u'blank warning',
                 QtCore.QVariant(False)).toBool():
                 QtGui.QMessageBox.question(self,
                     translate('OpenLP.MainWindow',

openlp/core/ui/pluginform.py

@@ -132,6 +132,7 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog):
             Receiver.send_message(u'cursor_busy')
             self.activePlugin.toggleStatus(PluginStatus.Active)
             Receiver.send_message(u'cursor_normal')
+            self.activePlugin.appStartup()
         else:
             self.activePlugin.toggleStatus(PluginStatus.Inactive)
         status_text = unicode(

openlp/core/ui/screen.py

@@ -79,7 +79,7 @@ class ScreenList(object):
         ``number``
             The number of the screen, which size has changed.
         """
-        log.info(u'screenResolutionChanged %d' % number)
+        log.info(u'screen_resolution_changed %d' % number)
         for screen in self.screen_list:
             if number == screen[u'number']:
                 newScreen = {
@@ -104,6 +104,9 @@ class ScreenList(object):
         ``changed_screen``
             The screen's number which has been (un)plugged.
         """
+        # Do not log at start up.
+        if changed_screen != -1:
+            log.info(u'screen_count_changed %d' % self.desktop.numScreens())
         # Remove unplugged screens.
         for screen in copy.deepcopy(self.screen_list):
             if screen[u'number'] == self.desktop.numScreens():
@@ -116,8 +119,7 @@ class ScreenList(object):
                     u'size': self.desktop.screenGeometry(number),
                     u'primary': (self.desktop.primaryScreen() == number)
                 })
-        # We do not want to send this message, when the method is called the
+        # We do not want to send this message at start up.
-        # first time.
         if changed_screen != -1:
             # Reload setting tabs to apply possible changes.
             Receiver.send_message(u'config_screen_changed')
@@ -241,6 +243,7 @@ class ScreenList(object):
         height = settings.value(u'height',
             QtCore.QVariant(self.current[u'size'].height())).toInt()[0]
         self.override[u'size'] = QtCore.QRect(x, y, width, height)
+        self.override[u'primary'] = False
         settings.endGroup()
         if override_display:
             self.set_override_display()

openlp/core/ui/servicemanager.py

@@ -959,6 +959,7 @@ class ServiceManager(QtGui.QWidget):
             treewidgetitem.setToolTip(0, serviceitem.notes)
             treewidgetitem.setData(0, QtCore.Qt.UserRole,
                 QtCore.QVariant(item[u'order']))
+            treewidgetitem.setSelected(item[u'selected'])
             # Add the children to their parent treewidgetitem.
             for count, frame in enumerate(serviceitem.get_frames()):
                 child = QtGui.QTreeWidgetItem(treewidgetitem)
@@ -1030,16 +1031,35 @@ class ServiceManager(QtGui.QWidget):
         # force reset of renderer as theme data has changed
         self.mainwindow.renderer.themedata = None
         if self.serviceItems:
+            for item in self.serviceItems:
+                item[u'selected'] = False
+            serviceIterator = QtGui.QTreeWidgetItemIterator(
+                self.serviceManagerList)
+            selectedItem = None
+            while serviceIterator.value():
+                if serviceIterator.value().isSelected():
+                    selectedItem = serviceIterator.value()
+                serviceIterator += 1
+            if selectedItem is not None:
+                if selectedItem.parent() is None:
+                    pos = selectedItem.data(0, QtCore.Qt.UserRole).toInt()[0]
+                else:
+                    pos = selectedItem.parent().data(0, QtCore.Qt.UserRole). \
+                        toInt()[0]
+                self.serviceItems[pos - 1][u'selected'] = True
             tempServiceItems = self.serviceItems
             self.serviceManagerList.clear()
             self.serviceItems = []
             self.isNew = True
             for item in tempServiceItems:
                 self.addServiceItem(
-                    item[u'service_item'], False, expand=item[u'expanded'])
+                    item[u'service_item'], False, expand=item[u'expanded'],
+                    repaint=False, selected=item[u'selected'])
             # Set to False as items may have changed rendering
             # does not impact the saved song so True may also be valid
             self.setModified()
+            # Repaint it once only at the end
+            self.repaintServiceList(-1, -1)
         Receiver.send_message(u'cursor_normal')
 
     def serviceItemUpdate(self, message):
@@ -1069,7 +1089,7 @@ class ServiceManager(QtGui.QWidget):
         self.setModified()
 
     def addServiceItem(self, item, rebuild=False, expand=None, replace=False,
-        repaint=True):
+        repaint=True, selected=False):
         """
         Add a Service item to the list
 
@@ -1097,17 +1117,17 @@ class ServiceManager(QtGui.QWidget):
                     for inditem in item:
                         self.serviceItems.append({u'service_item': inditem,
                             u'order': len(self.serviceItems) + 1,
-                            u'expanded': expand})
+                            u'expanded': expand, u'selected': selected})
                 else:
                     self.serviceItems.append({u'service_item': item,
                         u'order': len(self.serviceItems) + 1,
-                        u'expanded': expand})
+                        u'expanded': expand, u'selected': selected})
                 if repaint:
                     self.repaintServiceList(len(self.serviceItems) - 1, -1)
             else:
                 self.serviceItems.insert(self.dropPosition,
                     {u'service_item': item, u'order': self.dropPosition,
-                    u'expanded': expand})
+                    u'expanded': expand, u'selected': selected})
                 self.repaintServiceList(self.dropPosition, -1)
             # if rebuilding list make sure live is fixed.
             if rebuild:

openlp/core/ui/slidecontroller.py

@@ -59,6 +59,7 @@ class SlideController(QtGui.QWidget):
         """
         QtGui.QWidget.__init__(self, parent)
         self.isLive = isLive
+        self.display = None
         self.screens = ScreenList.get_instance()
         self.ratio = float(self.screens.current[u'size'].width()) / \
             float(self.screens.current[u'size'].height())
@@ -422,6 +423,8 @@ class SlideController(QtGui.QWidget):
         screen previews.
         """
         # rebuild display as screen size changed
+        if self.display:
+            self.display.close()
         self.display = MainDisplay(self, self.image_manager, self.isLive)
         self.display.alertTab = self.alertTab
         self.display.setup()
@@ -742,8 +745,10 @@ class SlideController(QtGui.QWidget):
                 self.onThemeDisplay(True)
             elif display_type == u'hidden':
                 self.onHideDisplay(True)
-            else:
+            elif display_type == u'blanked':
                 self.onBlankDisplay(True)
+            else:
+                Receiver.send_message(u'maindisplay_show')
 
     def onSlideBlank(self):
         """

openlp/core/ui/themeform.py

@@ -202,7 +202,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
         Updates the lines on a page on the wizard
         """
         self.mainLineCountLabel.setText(unicode(translate('OpenLP.ThemeForm',
-            '(%d lines per slide)')) % int(lines))
+            '(approximately %d lines per slide)')) % int(lines))
 
     def resizeEvent(self, event=None):
         """

openlp/core/utils/__init__.py

@@ -69,7 +69,6 @@ class VersionThread(QtCore.QThread):
         Run the thread.
         """
         time.sleep(1)
-        Receiver.send_message(u'maindisplay_blank_check')
         app_version = get_application_version()
         version = check_latest_version(app_version)
         remote_version = {}

openlp/core/utils/languagemanager.py

@@ -77,6 +77,8 @@ class LanguageManager(object):
             AppLocation.LanguageDir))
         file_names = trans_dir.entryList(QtCore.QStringList(u'*.qm'),
                 QtCore.QDir.Files, QtCore.QDir.Name)
+        # Remove qm files from the list which start with "qt_".
+        file_names = file_names.filter(QtCore.QRegExp("^(?!qt_)"))
         for name in file_names:
             file_names.replaceInStrings(name, trans_dir.filePath(name))
         return file_names

openlp/plugins/bibles/forms/bibleupgradeform.py

@@ -33,7 +33,8 @@ import shutil
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import Receiver, SettingsManager, translate
+from openlp.core.lib import Receiver, SettingsManager, translate, \
+    check_directory_exists
 from openlp.core.lib.db import delete_database
 from openlp.core.lib.ui import UiStrings, critical_error_message_box
 from openlp.core.ui.wizard import OpenLPWizard, WizardStrings
@@ -94,7 +95,7 @@ class BibleUpgradeForm(OpenLPWizard):
 
     def onCheckBoxIndexChanged(self, index):
         """
-        Show/ Hide warnings if CheckBox state has changed
+        Show/Hide warnings if CheckBox state has changed
         """
         for number, filename in enumerate(self.files):
             if not self.checkBox[number].checkState() == QtCore.Qt.Checked:
@@ -114,6 +115,8 @@ class BibleUpgradeForm(OpenLPWizard):
         self.stop_import_flag = True
         if not self.currentPage() == self.progressPage:
             self.done(QtGui.QDialog.Rejected)
+        else:
+            self.postWizard()
 
     def onCurrentIdChanged(self, pageId):
         """
@@ -126,14 +129,6 @@ class BibleUpgradeForm(OpenLPWizard):
         elif self.page(pageId) == self.selectPage and self.maxBibles == 0:
             self.next()
 
-    def onFinishButton(self):
-        """
-        Some cleanup while finishing
-        """
-        for number, filename in enumerate(self.files):
-            if number in self.success and self.success[number] == True:
-                delete_file(os.path.join(self.path, filename[0]))
-
     def onBackupBrowseButtonClicked(self):
         """
         Show the file open dialog for the OSIS file.
@@ -154,17 +149,19 @@ class BibleUpgradeForm(OpenLPWizard):
         self.backupDirectoryEdit.setEnabled(not checked)
         self.backupBrowseButton.setEnabled(not checked)
 
-    def backupOldBibles(self, backupdirectory):
+    def backupOldBibles(self, backup_directory):
         """
         Backup old bible databases in a given folder.
         """
+        check_directory_exists(backup_directory)
+        success = True
         for filename in self.files:
             try:
-                shutil.copy(os.path.join(self.path, filename[0]), 
+                shutil.copy(os.path.join(self.path, filename[0]),
-                    backupdirectory)
+                    backup_directory)
             except:
-                return False
+                success = False
-        return True
+        return success
 
     def customInit(self):
         """
@@ -177,8 +174,6 @@ class BibleUpgradeForm(OpenLPWizard):
         """
         Set up the signals used in the bible importer.
         """
-        QtCore.QObject.connect(self.finishButton,
-            QtCore.SIGNAL(u'clicked()'), self.onFinishButton)
         QtCore.QObject.connect(self.backupBrowseButton,
             QtCore.SIGNAL(u'clicked()'), self.onBackupBrowseButtonClicked)
         QtCore.QObject.connect(self.noBackupCheckBox,
@@ -318,7 +313,7 @@ class BibleUpgradeForm(OpenLPWizard):
                 QtGui.QFormLayout.FieldRole, self.versionNameEdit[number])
             self.versionNameEdit[number].setText(bible.get_name())
             self.formLayout.addWidget(self.formWidget[number])
-            #Set up the Signal for the checkbox
+            # Set up the Signal for the checkbox.
             QtCore.QObject.connect(self.checkBox[number],
                 QtCore.SIGNAL(u'stateChanged(int)'),
                 self.onCheckBoxIndexChanged)
@@ -414,29 +409,22 @@ class BibleUpgradeForm(OpenLPWizard):
             return True
         elif self.currentPage() == self.backupPage:
             if not self.noBackupCheckBox.checkState() == QtCore.Qt.Checked:
-                if not unicode(self.backupDirectoryEdit.text()):
+                backup_path = unicode(self.backupDirectoryEdit.text())
+                if not backup_path:
                     critical_error_message_box(UiStrings().EmptyField,
                         translate('BiblesPlugin.UpgradeWizardForm',
                         'You need to specify a Backup Directory for your '
                         'Bibles.'))
                     self.backupDirectoryEdit.setFocus()
                     return False
-                elif not os.path.exists(unicode(
-                    self.backupDirectoryEdit.text())):
-                    critical_error_message_box(UiStrings().Error,
-                        translate('BiblesPlugin.UpgradeWizardForm',
-                        'The given path is not an existing directory.'))
-                    self.backupDirectoryEdit.setFocus()
-                    return False
                 else:
-                    if not self.backupOldBibles(unicode(
+                    if not self.backupOldBibles(backup_path):
-                        self.backupDirectoryEdit.text())):
                         critical_error_message_box(UiStrings().Error,
-                        translate('BiblesPlugin.UpgradeWizardForm',
+                            translate('BiblesPlugin.UpgradeWizardForm',
-                        'The backup was not successfull.\nTo backup your '
+                            'The backup was not successful.\nTo backup your '
-                        'Bibles you need the permission to write in the given '
+                            'Bibles you need permission to write to the given '
-                        'directory. If you have a permissions to write and '
+                            'directory. If you have write permissions and this '
-                        'this error still occurs, please report a bug.'))
+                            'error still occurs, please report a bug.'))
                         return False
             return True
         elif self.currentPage() == self.selectPage:
@@ -540,7 +528,7 @@ class BibleUpgradeForm(OpenLPWizard):
         """
         Perform the actual upgrade.
         """
-        include_webbible = False
+        self.include_webbible = False
         proxy_server = None
         if self.maxBibles == 0:
             self.progressLabel.setText(
@@ -582,19 +570,19 @@ class BibleUpgradeForm(OpenLPWizard):
                 name = unicode(self.versionNameEdit[biblenumber].text())
             self.newbibles[number] = BibleDB(self.mediaItem, path=self.path,
                 name=name)
+            self.newbibles[number].register(self.plugin.upgrade_wizard)
             metadata = oldbible.get_metadata()
             webbible = False
             meta_data = {}
             for meta in metadata:
                 meta_data[meta[u'key']] = meta[u'value']
-                if not meta[u'key'] == u'Version':
+                if not meta[u'key'] == u'Version' and not meta[u'key'] == \
+                    u'dbversion':
                     self.newbibles[number].create_meta(meta[u'key'],
                         meta[u'value'])
-                else:
-                    self.newbibles[number].create_meta(meta[u'key'], name)
                 if meta[u'key'] == u'download source':
                     webbible = True
-                    include_webbible = True
+                    self.include_webbible = True
                 if meta.has_key(u'proxy server'):
                     proxy_server = meta[u'proxy server']
             if webbible:
@@ -606,12 +594,11 @@ class BibleUpgradeForm(OpenLPWizard):
                     handler = BSExtract(proxy_server)
                 books = handler.get_books_from_http(meta_data[u'download name'])
                 if not books:
-                    log.exception(u'Upgrading books from %s - download '\
+                    log.error(u'Upgrading books from %s - download '\
                         u'name: "%s" failed' % (
                         meta_data[u'download source'], 
                         meta_data[u'download name']))
-                    delete_database(self.path, 
+                    delete_database(self.path, clean_filename(name)) 
-                        clean_filename(self.newbibles[number].get_name())) 
                     del self.newbibles[number]
                     critical_error_message_box(
                         translate('BiblesPlugin.UpgradeWizardForm', 
@@ -630,16 +617,15 @@ class BibleUpgradeForm(OpenLPWizard):
                 bible = BiblesResourcesDB.get_webbible(
                     meta_data[u'download name'], 
                     meta_data[u'download source'].lower())
-                if bible[u'language_id']:
+                if bible and bible[u'language_id']:
                     language_id = bible[u'language_id']
                     self.newbibles[number].create_meta(u'language_id',
                         language_id)
                 else:
                     language_id = self.newbibles[number].get_language(name)
                 if not language_id:
-                    log.exception(u'Upgrading from "%s" failed' % filename[0])
+                    log.warn(u'Upgrading from "%s" failed' % filename[0])
-                    delete_database(self.path, 
+                    delete_database(self.path, clean_filename(name))
-                        clean_filename(self.newbibles[number].get_name()))
                     del self.newbibles[number]
                     self.incrementProgressBar(unicode(translate(
                         'BiblesPlugin.UpgradeWizardForm', 
@@ -661,27 +647,42 @@ class BibleUpgradeForm(OpenLPWizard):
                     book_ref_id = self.newbibles[number].\
                         get_book_ref_id_by_name(book, len(books), language_id)
                     if not book_ref_id:
-                        log.exception(u'Upgrading books from %s - download '\
+                        log.warn(u'Upgrading books from %s - download '\
                             u'name: "%s" aborted by user' % (
                             meta_data[u'download source'], 
                             meta_data[u'download name']))
-                        delete_database(self.path, 
+                        delete_database(self.path, clean_filename(name))
-                            clean_filename(self.newbibles[number].get_name()))
                         del self.newbibles[number]
                         bible_failed = True
                         break
                     book_details = BiblesResourcesDB.get_book_by_id(book_ref_id)
-                    self.newbibles[number].create_book(book, book_ref_id, 
+                    db_book = self.newbibles[number].create_book(book, 
-                        book_details[u'testament_id'])
+                        book_ref_id, book_details[u'testament_id'])
+                    # Try to import still downloaded verses
+                    oldbook = oldbible.get_book(book)
+                    if oldbook:
+                        verses = oldbible.get_verses(oldbook[u'id'])
+                        if not verses:
+                            log.warn(u'No verses found to import for book '
+                                u'"%s"', book)
+                            continue
+                        for verse in verses:
+                            if self.stop_import_flag:
+                                bible_failed = True
+                                break
+                            self.newbibles[number].create_verse(db_book.id, 
+                                int(verse[u'chapter']), 
+                                int(verse[u'verse']), unicode(verse[u'text']))
+                            Receiver.send_message(u'openlp_process_events')
+                        self.newbibles[number].session.commit()
             else:
                 language_id = self.newbibles[number].get_object(BibleMeta,
                     u'language_id')
                 if not language_id:
                     language_id = self.newbibles[number].get_language(name)
                 if not language_id:
-                    log.exception(u'Upgrading books from "%s" failed' % name)
+                    log.warn(u'Upgrading books from "%s" failed' % name)
-                    delete_database(self.path, 
+                    delete_database(self.path, clean_filename(name))
-                        clean_filename(self.newbibles[number].get_name()))
                     del self.newbibles[number]
                     self.incrementProgressBar(unicode(translate(
                         'BiblesPlugin.UpgradeWizardForm', 
@@ -705,10 +706,9 @@ class BibleUpgradeForm(OpenLPWizard):
                         get_book_ref_id_by_name(book[u'name'], len(books), 
                         language_id)
                     if not book_ref_id:
-                        log.exception(u'Upgrading books from %s " '\
+                        log.warn(u'Upgrading books from %s " '\
                             'failed - aborted by user' % name)
-                        delete_database(self.path, 
+                        delete_database(self.path, clean_filename(name))
-                            clean_filename(self.newbibles[number].get_name()))
                         del self.newbibles[number]
                         bible_failed = True
                         break
@@ -717,7 +717,7 @@ class BibleUpgradeForm(OpenLPWizard):
                         book_ref_id, book_details[u'testament_id'])
                     verses = oldbible.get_verses(book[u'id'])
                     if not verses:
-                        log.exception(u'No verses found to import for book '
+                        log.warn(u'No verses found to import for book '
                             u'"%s"', book[u'name'])
                         self.newbibles[number].delete_book(db_book)
                         continue
@@ -731,6 +731,8 @@ class BibleUpgradeForm(OpenLPWizard):
                         Receiver.send_message(u'openlp_process_events')
                     self.newbibles[number].session.commit()
             if not bible_failed:
+                self.newbibles[number].create_meta(u'Version', name)
+                delete_file(os.path.join(self.path, filename[0]))
                 self.incrementProgressBar(unicode(translate(
                     'BiblesPlugin.UpgradeWizardForm', 
                     'Upgrading Bible %s of %s: "%s"\n'
@@ -743,10 +745,13 @@ class BibleUpgradeForm(OpenLPWizard):
                     'Upgrading Bible %s of %s: "%s"\nFailed')) % 
                     (number + 1, self.maxBibles, name), 
                     self.progressBar.maximum() - self.progressBar.value())
-                delete_database(self.path, 
+                delete_database(self.path, clean_filename(name))
-                    clean_filename(name))
             number += 1
-        self.mediaItem.reloadBibles()
+
+    def postWizard(self):
+        """
+        Clean up the UI after the import has finished.
+        """
         successful_import = 0
         failed_import = 0
         for number, filename in enumerate(self.files):
@@ -761,7 +766,7 @@ class BibleUpgradeForm(OpenLPWizard):
         else:
             failed_import_text = u''
         if successful_import > 0:
-            if include_webbible:
+            if self.include_webbible:
                 self.progressLabel.setText(unicode(
                     translate('BiblesPlugin.UpgradeWizardForm', 'Upgrading '
                     'Bible(s): %s successful%s\nPlease note, that verses from '
@@ -777,3 +782,4 @@ class BibleUpgradeForm(OpenLPWizard):
             self.progressLabel.setText(
                     translate('BiblesPlugin.UpgradeWizardForm', 'Upgrade '
                     'failed.'))
+        OpenLPWizard.postWizard(self)

openlp/plugins/bibles/forms/booknameform.py

@@ -70,15 +70,15 @@ class BookNameForm(QDialog, Ui_BookNameDialog):
             self.onCheckBoxIndexChanged)
 
     def onCheckBoxIndexChanged(self, index):
-        '''
+        """
         Reload Combobox if CheckBox state has changed
-        '''
+        """
         self.reloadComboBox()
 
     def reloadComboBox(self):
-        '''
+        """
         Reload the Combobox items
-        '''
+        """
         self.correspondingComboBox.clear()
         items = BiblesResourcesDB.get_books()
         for item in items:

openlp/plugins/bibles/lib/db.py

@@ -381,6 +381,7 @@ class BibleDB(QtCore.QObject, Manager):
         """
         log.debug(u'BibleDB.get_verses("%s")', reference_list)
         verse_list = []
+        book_error = False
         for book_id, chapter, start_verse, end_verse in reference_list:
             db_book = self.get_book_by_book_ref_id(book_id)
             if db_book:
@@ -398,12 +399,13 @@ class BibleDB(QtCore.QObject, Manager):
                 verse_list.extend(verses)
             else:
                 log.debug(u'OpenLP failed to find book with id "%s"', book_id)
-                if show_error:
+                book_error = True
-                    critical_error_message_box(
+        if book_error and show_error:
-                        translate('BiblesPlugin', 'No Book Found'),
+            critical_error_message_box(
-                        translate('BiblesPlugin', 'No matching book '
+                translate('BiblesPlugin', 'No Book Found'),
-                        'could be found in this Bible. Check that you '
+                translate('BiblesPlugin', 'No matching book '
-                        'have spelled the name of the book correctly.'))
+                'could be found in this Bible. Check that you '
+                'have spelled the name of the book correctly.'))
         return verse_list
 
     def verse_search(self, text):
@@ -1043,6 +1045,28 @@ class OldBibleDB(QtCore.QObject, Manager):
         else:
             return None
 
+    def get_book(self, name):
+        """
+        Return a book by name or abbreviation.
+
+        ``name``
+            The name or abbreviation of the book.
+        """
+        if not isinstance(name, unicode):
+            name = unicode(name)
+        books = self.run_sql(u'SELECT id, testament_id, name, '
+                u'abbreviation FROM book WHERE LOWER(name) = ? OR '
+                u'LOWER(abbreviation) = ?', (name.lower(), name.lower()))
+        if books:
+            return {
+                u'id': books[0][0],
+                u'testament_id': books[0][1],
+                u'name': unicode(books[0][2]),
+                u'abbreviation': unicode(books[0][3])
+            }
+        else:
+            return None
+
     def get_books(self):
         """
         Returns the books of the Bible.

openlp/plugins/bibles/lib/http.py

@@ -72,9 +72,8 @@ class BGExtract(object):
         log.debug(u'BGExtract.get_bible_chapter("%s", "%s", "%s")', version, 
             bookname, chapter)
         urlbookname = urllib.quote(bookname.encode("utf-8"))
-        url_params = urllib.urlencode(
+        url_params = u'search=%s+%s&version=%s' % (urlbookname, chapter, 
-            {u'search': u'%s %s' % (urlbookname, chapter),
+            version)
-            u'version': u'%s' % version})
         cleaner = [(re.compile('&nbsp;|<br />|\'\+\''), lambda match: '')]
         soup = get_soup_for_bible_ref(
             u'http://www.biblegateway.com/passage/?%s' % url_params,
@@ -97,10 +96,10 @@ class BGExtract(object):
         verse_list = {}
         # Cater for inconsistent mark up in the first verse of a chapter.
         first_verse = verses.find(u'versenum')
-        if first_verse:
+        if first_verse and len(first_verse.contents):
             verse_list[1] = unicode(first_verse.contents[0])
         for verse in verses(u'sup', u'versenum'):
-            raw_verse_num =  verse.next
+            raw_verse_num = verse.next
             clean_verse_num = 0
             # Not all verses exist in all translations and may or may not be
             # represented by a verse number. If they are not fine, if they are
@@ -110,7 +109,7 @@ class BGExtract(object):
             try:
                 clean_verse_num = int(str(raw_verse_num))
             except ValueError:
-                log.exception(u'Illegal verse number in %s %s %s:%s',
+                log.warn(u'Illegal verse number in %s %s %s:%s',
                     version, bookname, chapter, unicode(raw_verse_num))
             if clean_verse_num:
                 verse_text = raw_verse_num.next
@@ -140,16 +139,17 @@ class BGExtract(object):
         """
         log.debug(u'BGExtract.get_books_from_http("%s")', version)
         url_params = urllib.urlencode(
-            {u'search': 'Bible-List', u'version': u'%s' % version})
+            {u'action': 'getVersionInfo', u'vid': u'%s' % version})
-        reference_url = u'http://www.biblegateway.com/passage/?%s' % url_params
+        reference_url = u'http://www.biblegateway.com/versions/?%s#books' % \
+            url_params
         page = get_web_page(reference_url)
         if not page:
             send_error_message(u'download')
             return None
         page_source = page.read()
         page_source = unicode(page_source, 'utf8')
-        page_source_temp = re.search(u'<table id="booklist".*?>.*?</table>', \
+        page_source_temp = re.search(u'<table .*?class="infotable".*?>.*?'\
-            page_source, re.DOTALL)
+            u'</table>', page_source, re.DOTALL)
         if page_source_temp:
             soup = page_source_temp.group(0)
         else:
@@ -157,15 +157,17 @@ class BGExtract(object):
         try:
             soup = BeautifulSoup(soup)
         except HTMLParseError:
-            log.exception(u'BeautifulSoup could not parse the Bible page.')
+            log.error(u'BeautifulSoup could not parse the Bible page.')
+            send_error_message(u'parse')
+            return None
         if not soup:
             send_error_message(u'parse')
             return None
         Receiver.send_message(u'openlp_process_events')
-        content = soup.find(u'table', {u'id': u'booklist'})
+        content = soup.find(u'table', {u'class': u'infotable'})
         content = content.findAll(u'tr')
         if not content:
-            log.exception(u'No books found in the Biblegateway response.')
+            log.error(u'No books found in the Biblegateway response.')
             send_error_message(u'parse')
             return None
         books = []
@@ -200,9 +202,10 @@ class BSExtract(object):
         """
         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"))
-        chapter_url = u'http://m.bibleserver.com/text/%s/%s%s' % \
+        chapter_url = u'http://m.bibleserver.com/text/%s/%s%d' % \
-            (version, urlbookname, chapter)
+            (urlversion, urlbookname, chapter)
         header = (u'Accept-Language', u'en')
         soup = get_soup_for_bible_ref(chapter_url, header)
         if not soup:
@@ -210,7 +213,7 @@ class BSExtract(object):
         Receiver.send_message(u'openlp_process_events')
         content = soup.find(u'div', u'content')
         if not content:
-            log.exception(u'No verses found in the Bibleserver response.')
+            log.error(u'No verses found in the Bibleserver response.')
             send_error_message(u'parse')
             return None
         content = content.find(u'div').findAll(u'div')
@@ -231,14 +234,15 @@ class BSExtract(object):
             The version of the Bible like NIV for New International Version
         """
         log.debug(u'BSExtract.get_books_from_http("%s")', version)
+        urlversion = urllib.quote(version.encode("utf-8"))
         chapter_url = u'http://m.bibleserver.com/overlay/selectBook?'\
-            'translation=%s' % (version)
+            'translation=%s' % (urlversion)
         soup = get_soup_for_bible_ref(chapter_url)
         if not soup:
             return None
         content = soup.find(u'ul')
         if not content:
-            log.exception(u'No books found in the Bibleserver response.')
+            log.error(u'No books found in the Bibleserver response.')
             send_error_message(u'parse')
             return None
         content = content.findAll(u'li')
@@ -282,7 +286,7 @@ class CWExtract(object):
         Receiver.send_message(u'openlp_process_events')
         htmlverses = soup.findAll(u'span', u'versetext')
         if not htmlverses:
-            log.debug(u'No verses found in the CrossWalk response.')
+            log.error(u'No verses found in the CrossWalk response.')
             send_error_message(u'parse')
             return None
         verses = {}
@@ -334,7 +338,7 @@ class CWExtract(object):
         content = soup.find(u'div', {u'class': u'Body'})
         content = content.find(u'ul', {u'class': u'parent'})
         if not content:
-            log.exception(u'No books found in the Crosswalk response.')
+            log.error(u'No books found in the Crosswalk response.')
             send_error_message(u'parse')
             return None
         content = content.findAll(u'li')

openlp/plugins/bibles/lib/mediaitem.py

@@ -675,9 +675,32 @@ class BibleMediaItem(MediaManagerItem):
                 second_bible, text)
             if second_bible and self.search_results:
                 text = []
+                new_search_results = []
+                count = 0
+                passage_not_found = False
                 for verse in self.search_results:
-                    text.append((verse.book.name, verse.chapter, verse.verse,
+                    db_book = bibles[second_bible].get_book_by_book_ref_id(
-                        verse.verse))
+                        verse.book.book_reference_id)
+                    if not db_book:
+                        log.debug(u'Passage "%s %d:%d" not found in Second '
+                            u'Bible' % (verse.book.name, verse.chapter,
+                            verse.verse))
+                        passage_not_found = True
+                        count += 1
+                        continue
+                    new_search_results.append(verse)
+                    text.append((verse.book.book_reference_id, verse.chapter,
+                        verse.verse, verse.verse))
+                if passage_not_found:
+                    QtGui.QMessageBox.information(self,
+                        translate('BiblePlugin.MediaItem', 'Information'),
+                        unicode(translate('BiblePlugin.MediaItem',
+                        'The second Bibles does not contain all the verses '
+                        'that are in the main Bible. Only verses found in both '
+                        'Bibles will be shown. %d verses have not been '
+                        'included in the results.')) % count,
+                        QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
+                self.search_results = new_search_results
                 self.second_search_results = \
                     bibles[second_bible].get_verses(text)
         if not self.quickLockButton.isChecked():
@@ -749,7 +772,7 @@ class BibleMediaItem(MediaManagerItem):
                     log.exception(u'The second_search_results does not have as '
                     'many verses as the search_results.')
                     break
-                bible_text = u' %s %d%s%d (%s, %s)' % (verse.book.name,
+                bible_text = u'%s %d%s%d (%s, %s)' % (verse.book.name,
                     verse.chapter, verse_separator, verse.verse, version,
                     second_version)
             else:
@@ -807,7 +830,7 @@ class BibleMediaItem(MediaManagerItem):
                 bible_text = u''
             # If we are 'Verse Per Line' then force a new line.
             elif self.settings.layout_style == LayoutStyle.VersePerLine:
-                bible_text = u'%s %s %s\n' % (bible_text, verse_text, text)
+                bible_text = u'%s%s %s\n' % (bible_text, verse_text, text)
             # We have to be 'Continuous'.
             else:
                 bible_text = u'%s %s %s\n' % (bible_text, verse_text, text)
@@ -845,7 +868,8 @@ class BibleMediaItem(MediaManagerItem):
             service_item.theme = None
         else:
             service_item.theme = self.settings.bible_theme
-        [service_item.add_from_text(slide[:30], slide) for slide in raw_slides]
+        for slide in raw_slides:
+            service_item.add_from_text(slide[:30], slide)
         return True
 
     def formatTitle(self, start_bitem, old_bitem):
@@ -959,7 +983,7 @@ class BibleMediaItem(MediaManagerItem):
         Search for some Bible verses (by reference).
         """
         bible = unicode(self.quickVersionComboBox.currentText())
-        search_results = self.plugin.manager.get_verses(bible, string, False)
+        search_results = self.plugin.manager.get_verses(bible, string, False, False)
         results = []
         if search_results:
             versetext = u' '.join([verse.text for verse in search_results])

openlp/plugins/custom/forms/editcustomform.py

@@ -93,6 +93,7 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
             self.titleEdit.setText(u'')
             self.creditEdit.setText(u'')
             self.themeComboBox.setCurrentIndex(0)
+            self.titleEdit.setFocus(QtCore.Qt.OtherFocusReason)
         else:
             self.customSlide = self.manager.get_object(CustomSlide, id)
             self.titleEdit.setText(self.customSlide.title)
@@ -115,7 +116,6 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
     def accept(self):
         log.debug(u'accept')
         if self.saveCustom():
-            Receiver.send_message(u'custom_load_list')
             QtGui.QDialog.accept(self)
 
     def saveCustom(self):

openlp/plugins/custom/lib/mediaitem.py

@@ -109,7 +109,7 @@ class CustomMediaItem(MediaManagerItem):
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'custom_edit_clear'), self.onRemoteEditClear)
         QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'custom_load_list'), self.initialise)
+            QtCore.SIGNAL(u'custom_load_list'), self.loadList)
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'custom_preview'), self.onPreviewClick)
 
@@ -129,14 +129,6 @@ class CustomMediaItem(MediaManagerItem):
         self.searchTextEdit.setCurrentSearchType(QtCore.QSettings().value(
             u'%s/last search type' % self.settingsSection,
             QtCore.QVariant(CustomSearch.Titles)).toInt()[0])
-        # Called to redisplay the custom list screen edith from a search
-        # or from the exit of the Custom edit dialog. If remote editing is
-        # active trigger it and clean up so it will not update again.
-        if self.remoteTriggered == u'L':
-            self.onAddClick()
-        if self.remoteTriggered == u'P':
-            self.onPreviewClick()
-        self.onRemoteEditClear()
 
     def loadList(self, custom_slides):
         # Sort out what custom we want to select after loading the list.
@@ -155,11 +147,20 @@ class CustomMediaItem(MediaManagerItem):
             if custom_slide.id == self.auto_select_id:
                 self.listView.setCurrentItem(custom_name)
         self.auto_select_id = -1
+        # Called to redisplay the custom list screen edith from a search
+        # or from the exit of the Custom edit dialog. If remote editing is
+        # active trigger it and clean up so it will not update again.
+        if self.remoteTriggered == u'L':
+            self.onAddClick()
+        if self.remoteTriggered == u'P':
+            self.onPreviewClick()
+        self.onRemoteEditClear()
 
     def onNewClick(self):
         self.edit_custom_form.loadCustom(0)
         self.edit_custom_form.exec_()
-        self.initialise()
+        self.onClearTextButtonClick()
+        self.onSelectionChange()
 
     def onRemoteEditClear(self):
         self.remoteTriggered = None
@@ -179,6 +180,8 @@ class CustomMediaItem(MediaManagerItem):
             self.remoteTriggered = remote_type
             self.edit_custom_form.loadCustom(custom_id, (remote_type == u'P'))
             self.edit_custom_form.exec_()
+            self.auto_select_id = -1
+            self.onSearchTextButtonClick()
 
     def onEditClick(self):
         """
@@ -189,7 +192,8 @@ class CustomMediaItem(MediaManagerItem):
             item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
             self.edit_custom_form.loadCustom(item_id, False)
             self.edit_custom_form.exec_()
-            self.initialise()
+            self.auto_select_id = -1
+            self.onSearchTextButtonClick()
 
     def onDeleteClick(self):
         """

openlp/plugins/presentations/lib/impresscontroller.py

@@ -125,7 +125,7 @@ class ImpressController(PresentationController):
             try:
                 uno_instance = get_uno_instance(resolver)
             except:
-                log.exception(u'Unable to find running instance ')
+                log.warn(u'Unable to find running instance ')
                 self.start_process()
                 loop += 1
         try:
@@ -136,7 +136,7 @@ class ImpressController(PresentationController):
                 "com.sun.star.frame.Desktop", uno_instance)
             return desktop
         except:
-            log.exception(u'Failed to get UNO desktop')
+            log.warn(u'Failed to get UNO desktop')
             return None
 
     def get_com_desktop(self):
@@ -151,7 +151,7 @@ class ImpressController(PresentationController):
         try:
             desktop = self.manager.createInstance(u'com.sun.star.frame.Desktop')
         except AttributeError:
-            log.exception(u'Failure to find desktop - Impress may have closed')
+            log.warn(u'Failure to find desktop - Impress may have closed')
         return desktop if desktop else None
 
     def get_com_servicemanager(self):
@@ -162,7 +162,7 @@ class ImpressController(PresentationController):
         try:
             return Dispatch(u'com.sun.star.ServiceManager')
         except pywintypes.com_error:
-            log.exception(u'Failed to get COM service manager. '
+            log.warn(u'Failed to get COM service manager. '
                 u'Impress Controller has been disabled')
             return None
 
@@ -180,7 +180,7 @@ class ImpressController(PresentationController):
             else:
                 desktop = self.get_com_desktop()
         except:
-            log.exception(u'Failed to find an OpenOffice desktop to terminate')
+            log.warn(u'Failed to find an OpenOffice desktop to terminate')
         if not desktop:
             return
         docs = desktop.getComponents()
@@ -191,7 +191,7 @@ class ImpressController(PresentationController):
                 desktop.terminate()
                 log.debug(u'OpenOffice killed')
             except:
-                log.exception(u'Failed to terminate OpenOffice')
+                log.warn(u'Failed to terminate OpenOffice')
 
 
 class ImpressDocument(PresentationDocument):
@@ -244,7 +244,7 @@ class ImpressDocument(PresentationDocument):
             self.document = desktop.loadComponentFromURL(url, u'_blank',
                 0, properties)
         except:
-            log.exception(u'Failed to load presentation %s' % url)
+            log.warn(u'Failed to load presentation %s' % url)
             return False
         if os.name == u'nt':
             # As we can't start minimized the Impress window gets in the way.
@@ -323,7 +323,7 @@ class ImpressDocument(PresentationDocument):
                     self.presentation = None
                     self.document.dispose()
                 except:
-                    log.exception("Closing presentation failed")
+                    log.warn("Closing presentation failed")
             self.document = None
         self.controller.remove_doc(self)
 
@@ -341,7 +341,7 @@ class ImpressDocument(PresentationDocument):
                 log.debug("getPresentation failed to find a presentation")
                 return False
         except:
-            log.exception("getPresentation failed to find a presentation")
+            log.warn("getPresentation failed to find a presentation")
             return False
         return True
 

openlp/plugins/presentations/presentationplugin.py

@@ -77,7 +77,7 @@ class PresentationPlugin(Plugin):
                 try:
                     self.controllers[controller].start_process()
                 except:
-                    log.exception(u'Failed to start controller process')
+                    log.warn(u'Failed to start controller process')
                     self.controllers[controller].available = False
         self.mediaItem.buildFileMaskString()
 
@@ -128,7 +128,7 @@ class PresentationPlugin(Plugin):
                     try:
                         __import__(modulename, globals(), locals(), [])
                     except ImportError:
-                        log.exception(u'Failed to import %s on path %s',
+                        log.warn(u'Failed to import %s on path %s',
                             modulename, path)
         controller_classes = PresentationController.__subclasses__()
         for controller_class in controller_classes:

openlp/plugins/songs/forms/editsongform.py

@@ -696,7 +696,6 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
         self.clearCaches()
         if self._validate_song():
             self.saveSong()
-            Receiver.send_message(u'songs_load_list')
             self.song = None
             QtGui.QDialog.accept(self)
 

openlp/plugins/songs/forms/songimportform.py

@@ -772,9 +772,9 @@ class SongImportForm(OpenLPWizard):
             SettingsManager.get_last_dir(self.plugin.settingsSection, 1))
         if not filename:
             return
-        file = codecs.open(filename, u'w', u'utf-8')
+        report_file = codecs.open(filename, u'w', u'utf-8')
-        file.write(self.errorReportTextEdit.toPlainText())
+        report_file.write(self.errorReportTextEdit.toPlainText())
-        file.close()
+        report_file.close()
 
     def addFileSelectItem(self, prefix, obj_prefix=None, can_disable=False,
         single_select=False):

openlp/plugins/songs/lib/__init__.py

@@ -32,6 +32,9 @@ from openlp.core.lib import translate
 from db import Author
 from ui import SongStrings
 
+WHITESPACE = re.compile(r'[\W_]+', re.UNICODE)
+APOSTROPHE = re.compile(u'[\'`’ʻ′]', re.UNICODE)
+
 class VerseType(object):
     """
     VerseType provides an enumeration for the tags that may be associated
@@ -246,6 +249,12 @@ def retrieve_windows_encoding(recommendation=None):
         return None
     return filter(lambda item: item[1] == choice[0], encodings)[0][0]
 
+def clean_string(string):
+    """
+    Strips punctuation from the passed string to assist searching
+    """
+    return WHITESPACE.sub(u' ', APOSTROPHE.sub(u'', string)).lower()
+
 def clean_song(manager, song):
     """
     Cleans the search title, rebuilds the search lyrics, adds a default author
@@ -262,9 +271,8 @@ def clean_song(manager, song):
     if song.alternate_title is None:
         song.alternate_title = u''
     song.alternate_title = song.alternate_title.strip()
-    whitespace = re.compile(r'\W+', re.UNICODE)
+    song.search_title = clean_string(song.title) + u'@' + \
-    song.search_title = (whitespace.sub(u' ', song.title).strip() + u'@' +
+        clean_string(song.alternate_title)
-        whitespace.sub(u' ', song.alternate_title).strip()).strip().lower()
     # Only do this, if we the song is a 1.9.4 song (or older).
     if song.lyrics.find(u'<lyrics language="en">') != -1:
         # Remove the old "language" attribute from lyrics tag (prior to 1.9.5).
@@ -273,8 +281,8 @@ def clean_song(manager, song):
         song.lyrics = song.lyrics.replace(
             u'<lyrics language="en">', u'<lyrics>')
         verses = SongXML().get_verses(song.lyrics)
-        lyrics = u' '.join([whitespace.sub(u' ', verse[1]) for verse in verses])
+        song.search_lyrics = u' '.join([clean_string(verse[1])
-        song.search_lyrics = lyrics.lower()
+            for verse in verses])
         # We need a new and clean SongXML instance.
         sxml = SongXML()
         # Rebuild the song's verses, to remove any wrong verse names (for
@@ -316,6 +324,11 @@ def clean_song(manager, song):
             if order not in compare_order:
                 song.verse_order = u''
                 break
+    else:
+        verses = SongXML().get_verses(song.lyrics)
+        song.search_lyrics = u' '.join([clean_string(verse[1])
+            for verse in verses])
+
     # The song does not have any author, add one.
     if not song.authors:
         name = SongStrings.AuthorUnknown

openlp/plugins/songs/lib/easislidesimport.py

@@ -61,8 +61,8 @@ class EasiSlidesImport(SongImport):
         """
         log.info(u'Importing EasiSlides XML file %s', self.import_source)
         parser = etree.XMLParser(remove_blank_text=True)
-        file = etree.parse(self.import_source, parser)
+        parsed_file = etree.parse(self.import_source, parser)
-        xml = unicode(etree.tostring(file))
+        xml = unicode(etree.tostring(parsed_file))
         song_xml = objectify.fromstring(xml)
         self.import_wizard.progressBar.setMaximum(len(song_xml.Item))
         for song in song_xml.Item:

openlp/plugins/songs/lib/importer.py

@@ -28,6 +28,7 @@
 The :mod:`importer` modules provides the general song import functionality.
 """
 import logging
+
 from opensongimport import OpenSongImport
 from easislidesimport import EasiSlidesImport
 from olpimport import OpenLPSongImport

openlp/plugins/songs/lib/mediaitem.py

@@ -38,7 +38,8 @@ from openlp.core.lib.searchedit import SearchEdit
 from openlp.core.lib.ui import UiStrings
 from openlp.plugins.songs.forms import EditSongForm, SongMaintenanceForm, \
     SongImportForm, SongExportForm
-from openlp.plugins.songs.lib import OpenLyrics, SongXML, VerseType
+from openlp.plugins.songs.lib import OpenLyrics, SongXML, VerseType, \
+    clean_string
 from openlp.plugins.songs.lib.db import Author, Song
 from openlp.plugins.songs.lib.ui import SongStrings
 
@@ -181,13 +182,14 @@ class SongMediaItem(MediaManagerItem):
         elif search_type == SongSearch.Titles:
             log.debug(u'Titles Search')
             search_results = self.plugin.manager.get_all_objects(Song,
-                Song.search_title.like(u'%' + self.whitespace.sub(u' ',
+                Song.search_title.like(u'%' + clean_string(search_keywords) +
-                search_keywords.lower()) + u'%'))
+                    u'%'))
             self.displayResultsSong(search_results)
         elif search_type == SongSearch.Lyrics:
             log.debug(u'Lyrics Search')
             search_results = self.plugin.manager.get_all_objects(Song,
-                Song.search_lyrics.like(u'%' + search_keywords.lower() + u'%'))
+                Song.search_lyrics.like(u'%' + clean_string(search_keywords) +
+                    u'%'))
             self.displayResultsSong(search_results)
         elif search_type == SongSearch.Authors:
             log.debug(u'Authors Search')
@@ -198,16 +200,16 @@ class SongMediaItem(MediaManagerItem):
         elif search_type == SongSearch.Themes:
             log.debug(u'Theme Search')
             search_results = self.plugin.manager.get_all_objects(Song,
-                Song.theme_name.like(u'%' + self.whitespace.sub(u' ',
+                Song.theme_name.like(u'%' + search_keywords + u'%'))
-                search_keywords) + u'%'))
             self.displayResultsSong(search_results)
         self.check_search_result()
 
     def searchEntire(self, search_keywords):
         return self.plugin.manager.get_all_objects(Song,
-            or_(Song.search_title.like(u'%' + self.whitespace.sub(u' ',
+            or_(Song.search_title.like(u'%' + clean_string(search_keywords)
-            search_keywords.lower()) + u'%'),
+                + u'%'),
-            Song.search_lyrics.like(u'%' + search_keywords.lower() + u'%'),
+            Song.search_lyrics.like(u'%' + clean_string(search_keywords)
+                + u'%'),
             Song.comments.like(u'%' + search_keywords.lower() + u'%')))
 
     def onSongListLoad(self):
@@ -300,6 +302,9 @@ class SongMediaItem(MediaManagerItem):
         log.debug(u'onNewClick')
         self.edit_song_form.newSong()
         self.edit_song_form.exec_()
+        self.onClearTextButtonClick()
+        self.onSelectionChange()
+        self.auto_select_id = -1
 
     def onSongMaintenanceClick(self):
         self.song_maintenance_form.exec_()
@@ -324,6 +329,8 @@ class SongMediaItem(MediaManagerItem):
             self.remoteTriggered = remote_type
             self.edit_song_form.loadSong(song_id, (remote_type == u'P'))
             self.edit_song_form.exec_()
+            self.auto_select_id = -1
+            self.onSongListLoad()
 
     def onEditClick(self):
         """
@@ -335,6 +342,8 @@ class SongMediaItem(MediaManagerItem):
             item_id = (self.editItem.data(QtCore.Qt.UserRole)).toInt()[0]
             self.edit_song_form.loadSong(item_id, False)
             self.edit_song_form.exec_()
+            self.auto_select_id = -1
+            self.onSongListLoad()
         self.editItem = None
 
     def onDeleteClick(self):

scripts/windows-builder.py

@@ -102,6 +102,13 @@ psvince.dll
     the install will fail.  The dll can be obtained from here:
     http://www.vincenzo.net/isxkb/index.php?title=PSVince)
 
+Mako    
+    Mako Templates for Python.  This package is required for building the
+    remote plugin.  It can be installed by going to your
+    python_directory\scripts\.. and running "easy_install Mako".  If you do not
+    have easy_install, the Mako package can be obtained here:
+    http://www.makotemplates.org/download.html
+
 """
 
 import os
@@ -194,7 +201,8 @@ def write_version_file():
     code = bzr.wait()
     if code != 0:
         raise Exception(u'Error running bzr log')
-    latest = output.split(u':')[0]
+    outputAscii = unicode(output, errors='ignore')
+    latest = outputAscii.split(u':')[0]
     versionstring = latest == revision and tag or u'%s-bzr%s' % (tag, latest)
     f = open(os.path.join(dist_path, u'.version'), u'w')
     f.write(versionstring)