r1630

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()
+    if image_ratio == resize_ratio:
+        # We neither need to centre the image nor add "bars" to the image.
         return preview
-        preview = preview.scaled(width, height, QtCore.Qt.KeepAspectRatio,
-            QtCore.Qt.SmoothTransformation)
     realw = preview.width()
     realh = preview.height()
     # and move it to the centre of the preview space

openlp/core/lib/mediamanageritem.py

@@ -90,7 +90,7 @@ class MediaManagerItem(QtGui.QWidget):
         """
         Constructor to create the media manager item.
         """
-        QtGui.QWidget.__init__(self, parent)
+        QtGui.QWidget.__init__(self)
         self.hide()
         self.whitespace = re.compile(r'[\W_]+', re.UNICODE)
         self.plugin = plugin
@@ -341,8 +341,8 @@ class MediaManagerItem(QtGui.QWidget):
                     critical_error_message_box(
                         UiStrings().Duplicate,
                         unicode(translate('OpenLP.MediaManagerItem',
-                        'Duplicate file name %s.\nFilename already exists in '
+                        'Duplicate filename %s.\nThis filename is already in '
-                        'list')) % filename)
+                        'the list')) % filename)
                 else:
                     newFiles.append(file)
             self.loadList(newFiles)

openlp/core/lib/ui.py

@@ -85,7 +85,6 @@ class UiStrings(object):
         self.LengthTime = unicode(translate('OpenLP.Ui', 'Length %s'))
         self.Live = translate('OpenLP.Ui', 'Live')
         self.LiveBGError = translate('OpenLP.Ui', 'Live Background Error')
-        self.LivePanel = translate('OpenLP.Ui', 'Live Panel')
         self.LiveToolbar = translate('OpenLP.Ui', 'Live Toolbar')
         self.Load = translate('OpenLP.Ui', 'Load')
         self.Minutes = translate('OpenLP.Ui', 'm',
@@ -102,14 +101,13 @@ class UiStrings(object):
         self.OLPV2 = translate('OpenLP.Ui', 'OpenLP 2.0')
         self.OpenLPStart = translate('OpenLP.Ui', 'OpenLP is already running. '
             'Do you wish to continue?')
-        self.OpenService = translate('OpenLP.Ui', 'Open Service')
+        self.OpenService = translate('OpenLP.Ui', 'Open service.')
         self.Preview = translate('OpenLP.Ui', 'Preview')
-        self.PreviewPanel = translate('OpenLP.Ui', 'Preview Panel')
+        self.PrintService = translate('OpenLP.Ui', 'Print Service')
-        self.PrintServiceOrder = translate('OpenLP.Ui', 'Print Service Order')
         self.ReplaceBG = translate('OpenLP.Ui', 'Replace Background')
-        self.ReplaceLiveBG = translate('OpenLP.Ui', 'Replace Live Background')
+        self.ReplaceLiveBG = translate('OpenLP.Ui', 'Replace live background.')
         self.ResetBG = translate('OpenLP.Ui', 'Reset Background')
-        self.ResetLiveBG = translate('OpenLP.Ui', 'Reset Live Background')
+        self.ResetLiveBG = translate('OpenLP.Ui', 'Reset live background.')
         self.Seconds = translate('OpenLP.Ui', 's',
             'The abbreviated unit for seconds')
         self.SaveAndPreview = translate('OpenLP.Ui', 'Save && Preview')
@@ -121,6 +119,9 @@ class UiStrings(object):
         self.Settings = translate('OpenLP.Ui', 'Settings')
         self.SaveService = translate('OpenLP.Ui', 'Save Service')
         self.Service = translate('OpenLP.Ui', 'Service')
+        self.Split = translate('OpenLP.Ui', '&Split')
+        self.SplitToolTip = translate('OpenLP.Ui', 'Split a slide into two '
+            'only if it does not fit on the screen as one slide.')
         self.StartTimeCode = unicode(translate('OpenLP.Ui', 'Start %s'))
         self.Theme = translate('OpenLP.Ui', 'Theme', 'Singular')
         self.Themes = translate('OpenLP.Ui', 'Themes', 'Plural')

openlp/core/ui/displaytagform.py

@@ -128,7 +128,7 @@ class DisplayTagForm(QtGui.QDialog, Ui_DisplayTagDialog):
         tag = {
             u'desc': translate('OpenLP.DisplayTagTab', 'New Tag'),
             u'start tag': u'{n}',
-            u'start html': translate('OpenLP.DisplayTagTab', '<Html_here>'),
+            u'start html': translate('OpenLP.DisplayTagTab', '<HTML here>'),
             u'end tag': u'{/n}',
             u'end html': translate('OpenLP.DisplayTagTab', '</and here>'),
             u'protected': False

openlp/core/ui/firsttimeform.py

@@ -200,15 +200,14 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
         """
         Prepare the UI for the process.
         """
-        # We start on 2 for plugins status setting plus a "finished" point.
+        self.max_progress = 0
-        max_progress = 2
         # Loop through the songs list and increase for each selected item
         for i in xrange(self.songsListWidget.count()):
             item = self.songsListWidget.item(i)
             if item.checkState() == QtCore.Qt.Checked:
                 filename = item.data(QtCore.Qt.UserRole).toString()
                 size = self._getFileSize(u'%s%s' % (self.web, filename))
-                max_progress += size
+                self.max_progress += size
         # Loop through the Bibles list and increase for each selected item
         iterator = QtGui.QTreeWidgetItemIterator(self.biblesTreeWidget)
         while iterator.value():
@@ -216,7 +215,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
             if item.parent() and item.checkState(0) == QtCore.Qt.Checked:
                 filename = item.data(0, QtCore.Qt.UserRole).toString()
                 size = self._getFileSize(u'%s%s' % (self.web, filename))
-                max_progress += size
+                self.max_progress += size
             iterator += 1
         # Loop through the themes list and increase for each selected item
         for i in xrange(self.themesListWidget.count()):
@@ -224,23 +223,40 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
             if item.checkState() == QtCore.Qt.Checked:
                 filename = item.data(QtCore.Qt.UserRole).toString()
                 size = self._getFileSize(u'%s%s' % (self.web, filename))
-                max_progress += size
+                self.max_progress += size
         self.finishButton.setVisible(False)
+        if self.max_progress:
+            # Add on 2 for plugins status setting plus a "finished" point.
+            self.max_progress = self.max_progress + 2
             self.progressBar.setValue(0)
             self.progressBar.setMinimum(0)
-        self.progressBar.setMaximum(max_progress)
+            self.progressBar.setMaximum(self.max_progress)
+            self.progressPage.setTitle(translate('OpenLP.FirstTimeWizard',
+                'Setting Up And Downloading'))
+            self.progressPage.setSubTitle(translate('OpenLP.FirstTimeWizard',
+                'Please wait while OpenLP is set up '
+                'and your data is downloaded.'))
+        else:
+            self.progressBar.setVisible(False)
+            self.progressPage.setTitle(translate('OpenLP.FirstTimeWizard',
+                'Setting Up'))
+            self.progressPage.setSubTitle(u'Setup complete.')
 
     def _postWizard(self):
         """
         Clean up the UI after the process has finished.
         """
+        if self.max_progress:
             self.progressBar.setValue(self.progressBar.maximum())
+            self.progressLabel.setText(translate('OpenLP.FirstTimeWizard',
+                'Download complete. Click the finish button to start OpenLP.'))
+        else:
+            self.progressLabel.setText(translate('OpenLP.FirstTimeWizard',
+                'Click the finish button to start OpenLP.'))
         self.finishButton.setVisible(True)
         self.finishButton.setEnabled(True)
         self.cancelButton.setVisible(False)
         self.nextButton.setVisible(False)
-        self.progressLabel.setText(translate('OpenLP.FirstTimeWizard',
-            'Download complete. Click the finish button to start OpenLP.'))
         Receiver.send_message(u'openlp_process_events')
 
     def _performWizard(self):

openlp/core/ui/firsttimewizard.py

@@ -254,10 +254,6 @@ class Ui_FirstTimeWizard(object):
             'Default Settings'))
         self.defaultsPage.setSubTitle(translate('OpenLP.FirstTimeWizard',
             'Set up default settings to be used by OpenLP.'))
-        self.progressPage.setTitle(translate('OpenLP.FirstTimeWizard',
-            'Setting Up And Importing'))
-        self.progressPage.setSubTitle(translate('OpenLP.FirstTimeWizard',
-            'Please wait while OpenLP is set up and your data is imported.'))
         self.displayLabel.setText(translate('OpenLP.FirstTimeWizard',
             'Default output display:'))
         self.themeLabel.setText(translate('OpenLP.FirstTimeWizard',

openlp/core/ui/mainwindow.py

@@ -356,9 +356,9 @@ class Ui_MainWindow(object):
             translate('OpenLP.MainWindow', 'Save Service As'))
         self.fileSaveAsItem.setStatusTip(translate('OpenLP.MainWindow',
             'Save the current service under a new name.'))
-        self.printServiceOrderItem.setText(UiStrings().PrintServiceOrder)
+        self.printServiceOrderItem.setText(UiStrings().PrintService)
         self.printServiceOrderItem.setStatusTip(translate('OpenLP.MainWindow',
-            'Print the current Service Order.'))
+            'Print the current service.'))
         self.fileExitItem.setText(
             translate('OpenLP.MainWindow', 'E&xit'))
         self.fileExitItem.setStatusTip(

openlp/core/ui/printservicedialog.py

@@ -149,7 +149,7 @@ class Ui_PrintServiceDialog(object):
             QtCore.SIGNAL(u'toggled(bool)'), self.toggleOptions)
 
     def retranslateUi(self, printServiceDialog):
-        printServiceDialog.setWindowTitle(UiStrings().PrintServiceOrder)
+        printServiceDialog.setWindowTitle(UiStrings().PrintService)
         self.slideTextCheckBox.setText(translate('OpenLP.PrintServiceForm',
             'Include slide text if available'))
         self.pageBreakAfterText.setText(translate('OpenLP.PrintServiceForm',
@@ -159,7 +159,7 @@ class Ui_PrintServiceDialog(object):
         self.metaDataCheckBox.setText(translate('OpenLP.PrintServiceForm',
             'Include play length of media items'))
         self.titleLineEdit.setText(translate('OpenLP.PrintServiceForm',
-            'Service Order Sheet'))
+            'Service Sheet'))
         self.zoomComboBox.addItem(ZoomSize.Sizes[ZoomSize.Page])
         self.zoomComboBox.addItem(ZoomSize.Sizes[ZoomSize.Width])
         self.zoomComboBox.addItem(ZoomSize.Sizes[ZoomSize.OneHundred])

openlp/core/ui/servicemanager.py

@@ -629,7 +629,7 @@ class ServiceManager(QtGui.QWidget):
                 QtGui.QMessageBox.information(self,
                     translate('OpenLP.ServiceManager', 'Corrupt File'),
                     translate('OpenLP.ServiceManager', 'This file is either '
-                    'corrupt or not an OpenLP 2.0 service file.'))
+                    'corrupt or it is not an OpenLP 2.0 service file.'))
             return
         finally:
             if fileTo:

openlp/core/ui/starttimeform.py

@@ -74,14 +74,14 @@ class StartTimeForm(QtGui.QDialog, Ui_StartTimeDialog):
                 title=translate('OpenLP.StartTimeForm',
                 'Time Validation Error'),
                 message=translate('OpenLP.StartTimeForm',
-                'End time is set after the end of the media item'))
+                'Finish time is set after the end of the media item'))
             return
         elif start > end:
             critical_error_message_box(
                 title=translate('OpenLP.StartTimeForm',
                 'Time Validation Error'),
                 message=translate('OpenLP.StartTimeForm',
-                'Start time is after the End Time of the media item'))
+                'Start time is after the finish time of the media item'))
             return
         self.item[u'service_item'].start_time = start
         self.item[u'service_item'].end_time = end

openlp/plugins/bibles/bibleplugin.py

@@ -120,7 +120,7 @@ class BiblePlugin(Plugin):
             translate('BiblePlugin', '&Upgrade older Bibles'))
         self.toolsUpgradeItem.setStatusTip(
             translate('BiblePlugin', 'Upgrade the Bible databases to the '
-            'latest format'))
+            'latest format.'))
         tools_menu.addAction(self.toolsUpgradeItem)
         QtCore.QObject.connect(self.toolsUpgradeItem,
             QtCore.SIGNAL(u'triggered()'), self.onToolsUpgradeItemTriggered)

openlp/plugins/bibles/forms/bibleupgradeform.py

@@ -423,8 +423,7 @@ class BibleUpgradeForm(OpenLPWizard):
                             translate('BiblesPlugin.UpgradeWizardForm',
                             'The backup was not successful.\nTo backup your '
                             'Bibles you need permission to write to the given '
-                            'directory. If you have write permissions and this '
+                            'directory.'))
-                            'error still occurs, please report a bug.'))
                         return False
             return True
         elif self.currentPage() == self.selectPage:
@@ -521,7 +520,7 @@ class BibleUpgradeForm(OpenLPWizard):
         OpenLPWizard.preWizard(self)
         self.progressLabel.setText(translate(
             'BiblesPlugin.UpgradeWizardForm',
-            'Starting upgrading Bible(s)...'))
+            'Starting Bible upgrade...'))
         Receiver.send_message(u'openlp_process_events')
 
     def performWizard(self):
@@ -605,8 +604,7 @@ class BibleUpgradeForm(OpenLPWizard):
                         'Download Error'),
                         translate('BiblesPlugin.UpgradeWizardForm',
                         'To upgrade your Web Bibles an Internet connection is '
-                        'required. If you have a working Internet connection '
+                        'required.'))
-                        'and this error still occurs, please report a bug.'))
                     self.incrementProgressBar(unicode(translate(
                         'BiblesPlugin.UpgradeWizardForm',
                         'Upgrading Bible %s of %s: "%s"\nFailed')) %
@@ -732,11 +730,12 @@ class BibleUpgradeForm(OpenLPWizard):
                     self.newbibles[number].session.commit()
             if not bible_failed:
                 self.newbibles[number].create_meta(u'Version', name)
+                oldbible.close_connection()
                 delete_file(os.path.join(self.path, filename[0]))
                 self.incrementProgressBar(unicode(translate(
                     'BiblesPlugin.UpgradeWizardForm',
                     'Upgrading Bible %s of %s: "%s"\n'
-                    'Done')) % 
+                    'Complete')) %
                     (number + 1, self.maxBibles, name))
                 self.success[biblenumber] = True
             else:
@@ -769,8 +768,8 @@ class BibleUpgradeForm(OpenLPWizard):
             if self.include_webbible:
                 self.progressLabel.setText(unicode(
                     translate('BiblesPlugin.UpgradeWizardForm', 'Upgrading '
-                    'Bible(s): %s successful%s\nPlease note, that verses from '
+                    'Bible(s): %s successful%s\nPlease note that verses from '
-                    'Web Bibles will be downloaded\non demand and so an '
+                    'Web Bibles will be downloaded on demand and so an '
                     'Internet connection is required.')) %
                     (successful_import, failed_import_text))
             else:

openlp/plugins/bibles/lib/db.py

@@ -1101,3 +1101,7 @@ class OldBibleDB(QtCore.QObject, Manager):
             ]
         else:
             return None
+
+    def close_connection(self):
+        self.cursor.close()
+        self.connection.close()

openlp/plugins/bibles/lib/mediaitem.py

@@ -695,7 +695,7 @@ class BibleMediaItem(MediaManagerItem):
                     QtGui.QMessageBox.information(self,
                         translate('BiblePlugin.MediaItem', 'Information'),
                         unicode(translate('BiblePlugin.MediaItem',
-                        'The second Bibles does not contain all the verses '
+                        'The second Bible 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,

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)

openlp/plugins/custom/forms/editcustomslidedialog.py

@@ -28,7 +28,7 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import translate, SpellTextEdit, build_icon
-from openlp.core.lib.ui import create_accept_reject_button_box
+from openlp.core.lib.ui import create_accept_reject_button_box, UiStrings
 
 class Ui_CustomSlideEditDialog(object):
     def setupUi(self, customSlideEditDialog):
@@ -54,11 +54,8 @@ class Ui_CustomSlideEditDialog(object):
         QtCore.QMetaObject.connectSlotsByName(customSlideEditDialog)
 
     def retranslateUi(self, customSlideEditDialog):
-        self.splitButton.setText(
+        self.splitButton.setText(UiStrings().Split)
-            translate('CustomPlugin.EditCustomForm', 'Split Slide'))
+        self.splitButton.setToolTip(UiStrings().SplitToolTip)
-        self.splitButton.setToolTip(
-            translate('CustomPlugin.EditCustomForm', 'Split a slide into two '
-            'only if it does not fit on the screen as one slide.'))
         self.insertButton.setText(
             translate('CustomPlugin.EditCustomForm', 'Insert Slide'))
         self.insertButton.setToolTip(

openlp/plugins/songs/forms/editversedialog.py

@@ -28,7 +28,7 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import build_icon, translate, SpellTextEdit
-from openlp.core.lib.ui import create_accept_reject_button_box
+from openlp.core.lib.ui import create_accept_reject_button_box, UiStrings
 from openlp.plugins.songs.lib import VerseType
 
 class Ui_EditVerseDialog(object):
@@ -89,11 +89,8 @@ class Ui_EditVerseDialog(object):
             VerseType.TranslatedNames[VerseType.Ending])
         self.verseTypeComboBox.setItemText(VerseType.Other,
             VerseType.TranslatedNames[VerseType.Other])
-        self.splitButton.setText(
+        self.splitButton.setText(UiStrings().Split)
-            translate('SongsPlugin.EditVerseForm', '&Split'))
+        self.splitButton.setToolTip(UiStrings().SplitToolTip)
-        self.splitButton.setToolTip(
-            translate('SongsPlugin.EditVerseForm', 'Split a slide into two '
-            'only if it does not fit on the screen as one slide.'))
         self.insertButton.setText(
             translate('SongsPlugin.EditVerseForm', '&Insert'))
         self.insertButton.setToolTip(

openlp/plugins/songs/forms/songimportform.py

@@ -297,7 +297,7 @@ class SongImportForm(OpenLPWizard):
         self.songsOfFellowshipDisabledLabel.setText(
             translate('SongsPlugin.ImportWizardForm', 'The Songs of '
             'Fellowship importer has been disabled because OpenLP cannot '
-            'find OpenOffice.org on your computer.'))
+            'access OpenOffice or LibreOffice.'))
         self.genericAddButton.setText(
             translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
         self.genericRemoveButton.setText(
@@ -305,7 +305,7 @@ class SongImportForm(OpenLPWizard):
         self.genericDisabledLabel.setText(
             translate('SongsPlugin.ImportWizardForm', 'The generic document/'
             'presentation importer has been disabled because OpenLP cannot '
-            'find OpenOffice.org on your computer.'))
+            'access OpenOffice or LibreOffice.'))
         self.easiSlidesFilenameLabel.setText(
             translate('SongsPlugin.ImportWizardForm', 'Filename:'))
         self.easiSlidesBrowseButton.setText(UiStrings().Browse)

openlp/plugins/songs/lib/oooimport.py

@@ -68,7 +68,7 @@ class OooImport(SongImport):
             self.log_error(
                 self.import_source[0],
                 translate('SongsPlugin.SongImport',
-                    'Unable to open OpenOffice.org or LibreOffice'))
+                'Cannot access OpenOffice or LibreOffice'))
             log.error(exc)
             return
         self.import_wizard.progressBar.setMaximum(len(self.import_source))

resources/openlp.desktop

@@ -2,7 +2,6 @@
 Categories=AudioVideo;
 Comment[de]=
 Comment=
-Encoding=UTF-8
 Exec=openlp %F
 GenericName[de]=Church lyrics projection
 GenericName=Church lyrics projection
@@ -13,7 +12,6 @@ Name=OpenLP
 Path=
 StartupNotify=true
 Terminal=false
-TerminalOptions=
 Type=Application
 X-DBUS-ServiceName=
 X-DBUS-StartupType=