diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index de4f2fd81..9f2d0ff37 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -162,9 +162,7 @@ class ServiceItem(object):
line_break = True
if self.is_capable(ItemCapabilities.NoLineBreaks):
line_break = False
- theme = None
- if self.theme:
- theme = self.theme
+ theme = self.theme if self.theme else None
self.main, self.footer = \
self.render_manager.set_override_theme(theme, useOverride)
self.themedata = self.render_manager.renderer._theme
@@ -187,11 +185,7 @@ class ServiceItem(object):
self.title = clean_tags(self.title)
self.foot_text = None
if self.raw_footer:
- for foot in self.raw_footer:
- if not self.foot_text:
- self.foot_text = foot
- else:
- self.foot_text = u'%s
%s' % (self.foot_text, foot)
+ self.foot_text = u'
'.join(self.raw_footer)
def add_from_image(self, path, title):
"""
@@ -204,8 +198,7 @@ class ServiceItem(object):
A title for the slide in the service item.
"""
self.service_item_type = ServiceItemType.Image
- self._raw_frames.append(
- {u'title': title, u'path': path})
+ self._raw_frames.append({u'title': title, u'path': path})
self.render_manager.image_manager.add_image(title, path)
self._new_item()
diff --git a/openlp/core/ui/aboutdialog.py b/openlp/core/ui/aboutdialog.py
index 5ba5783ea..c3ab5a00f 100644
--- a/openlp/core/ui/aboutdialog.py
+++ b/openlp/core/ui/aboutdialog.py
@@ -106,38 +106,36 @@ class Ui_AboutDialog(object):
))
self.aboutNotebook.setTabText(
self.aboutNotebook.indexOf(self.aboutTab), UiStrings.About)
- self.creditsTextEdit.setPlainText(translate('OpenLP.AboutForm',
+ lead = u'Raoul "superfly" Snyman'
+ developers = [u'Tim "TRB143" Bentley', u'Jonathan "gushie" Corwin',
+ u'Michael "cocooncrash" Gorven', u'Scott "sguerrieri" Guerrieri',
+ u'Raoul "superfly" Snyman', u'Martin "mijiti" Thompson',
+ u'Jon "Meths" Tibble<']
+ contributors = [u'Meinert "m2j" Jordan', u'Andreas "googol" Preikschat',
+ u'Christian "crichter" Richter', u'Philip "Phill" Ridout',
+ u'Maikel Stuivenberg', u'Carsten "catini" Tingaard',
+ u'Frode "frodus" Woldsund']
+ testers = [u'Philip "Phill" Ridout', u'Wesley "wrst" Stout (lead)']
+ packagers = [u'Thomas "tabthorpe" Abthorpe (FreeBSD)',
+ u'Tim "TRB143" Bentley (Fedora)',
+ u'Michael "cocooncrash" Gorven (Ubuntu)',
+ u'Matthias "matthub" Hub (Mac OS X)',
+ u'Raoul "superfly" Snyman (Windows, Ubuntu)']
+ self.creditsTextEdit.setPlainText(unicode(translate('OpenLP.AboutForm',
'Project Lead\n'
- ' Raoul "superfly" Snyman\n'
+ ' %s\n'
'\n'
'Developers\n'
- ' Tim "TRB143" Bentley\n'
- ' Jonathan "gushie" Corwin\n'
- ' Michael "cocooncrash" Gorven\n'
- ' Scott "sguerrieri" Guerrieri\n'
- ' Raoul "superfly" Snyman\n'
- ' Martin "mijiti" Thompson\n'
- ' Jon "Meths" Tibble\n'
+ ' %s\n'
'\n'
'Contributors\n'
- ' Meinert "m2j" Jordan\n'
- ' Andreas "googol" Preikschat\n'
- ' Christian "crichter" Richter\n'
- ' Philip "Phill" Ridout\n'
- ' Maikel Stuivenberg\n'
- ' Carsten "catini" Tingaard\n'
- ' Frode "frodus" Woldsund\n'
+ ' %s\n'
'\n'
'Testers\n'
- ' Philip "Phill" Ridout\n'
- ' Wesley "wrst" Stout (lead)\n'
+ ' %s\n'
'\n'
'Packagers\n'
- ' Thomas "tabthorpe" Abthorpe (FreeBSD)\n'
- ' Tim "TRB143" Bentley (Fedora)\n'
- ' Michael "cocooncrash" Gorven (Ubuntu)\n'
- ' Matthias "matthub" Hub (Mac OS X)\n'
- ' Raoul "superfly" Snyman (Windows, Ubuntu)\n'
+ ' %s\n'
'\n'
'Built With\n'
' Python: http://www.python.org/\n'
@@ -155,31 +153,30 @@ class Ui_AboutDialog(object):
' God our Father, for sending His Son to die\n'
' on the cross, setting us free from sin. We\n'
' bring this software to you for free because\n'
- ' He has set us free.'
- ))
+ ' He has set us free.')) % (lead, u'\n '.join(developers),
+ u'\n '.join(contributors), u'\n '.join(testers),
+ u'\n '.join(packagers)))
self.aboutNotebook.setTabText(
self.aboutNotebook.indexOf(self.creditsTab),
translate('OpenLP.AboutForm', 'Credits'))
- self.licenseTextEdit.setPlainText(translate('OpenLP.AboutForm',
+ copyright = translate('OpenLP.AboutForm',
'Copyright \xa9 2004-2011 Raoul Snyman\n'
'Portions copyright \xa9 2004-2011 '
'Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,\n'
'Meinert Jordan, Andreas Preikschat, Christian Richter, Philip\n'
'Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carstenn'
- 'Tinggaard, Frode Woldsund\n'
- '\n'
+ 'Tinggaard, Frode Woldsund')
+ licence = translate('OpenLP.AboutForm',
'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.\n'
- '\n'
+ 'License.')
+ disclaimer = translate('OpenLP.AboutForm',
'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 below '
- 'for more details.\n'
- '\n'
- '\n'
- 'GNU GENERAL PUBLIC LICENSE\n'
+ 'for more details.')
+ gpltext = ('GNU GENERAL PUBLIC LICENSE\n'
'Version 2, June 1991\n'
'\n'
'Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 '
@@ -549,7 +546,9 @@ class Ui_AboutDialog(object):
'subroutine library, you may consider it more useful to permit '
'linking proprietary applications with the library. If this is '
'what you want to do, use the GNU Lesser General Public License '
- 'instead of this License.'))
+ 'instead of this License.')
+ self.licenseTextEdit.setPlainText(u'%s\n\n%s\n\n%s\n\n\n%s' %
+ (copyright, licence, disclaimer, gpltext))
self.aboutNotebook.setTabText(
self.aboutNotebook.indexOf(self.licenseTab),
translate('OpenLP.AboutForm', 'License'))
diff --git a/openlp/plugins/songs/forms/editverseform.py b/openlp/plugins/songs/forms/editverseform.py
index 8a52c1859..645de8a60 100644
--- a/openlp/plugins/songs/forms/editverseform.py
+++ b/openlp/plugins/songs/forms/editverseform.py
@@ -98,7 +98,10 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog):
match = self.verse_regex.match(text)
if match:
verse_tag = match.group(1)
- verse_num = int(match.group(2))
+ try:
+ verse_num = int(match.group(2))
+ except ValueError:
+ verse_num = 1
verse_type_index = VerseType.from_loose_input(verse_tag)
if verse_type_index is not None:
self.verseNumberBox.setValue(verse_num)
@@ -127,7 +130,10 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog):
if match:
verse_type = match.group(1)
verse_type_index = VerseType.from_loose_input(verse_type)
- verse_number = int(match.group(2))
+ try:
+ verse_number = int(match.group(2))
+ except ValueError:
+ verse_number = 1
if verse_type_index is not None:
self.verseTypeComboBox.setCurrentIndex(verse_type_index)
self.verseNumberBox.setValue(verse_number)
diff --git a/openlp/plugins/songs/forms/songexportform.py b/openlp/plugins/songs/forms/songexportform.py
index 231d8fd43..dbcff42f3 100644
--- a/openlp/plugins/songs/forms/songexportform.py
+++ b/openlp/plugins/songs/forms/songexportform.py
@@ -226,7 +226,7 @@ class SongExportForm(OpenLPWizard):
translate('SongsPlugin.ExportWizardForm',
'No Save Location specified'),
translate('SongsPlugin.ExportWizardForm',
- 'You need to specified a directory to save the songs in.'))
+ 'You need to specify a directory.'))
return False
return True
elif self.currentPage() == self.progressPage:
@@ -355,7 +355,7 @@ class SongExportForm(OpenLPWizard):
the path to *directoryLineEdit*.
"""
path = unicode(QtGui.QFileDialog.getExistingDirectory(self,
- translate('SongsPlugin.ExportWizardForm', 'Selecte to Folder'),
+ translate('SongsPlugin.ExportWizardForm', 'Select Destination Folder'),
SettingsManager.get_last_dir(self.plugin.settingsSection, 1),
options=QtGui.QFileDialog.ShowDirsOnly))
SettingsManager.set_last_dir(self.plugin.settingsSection, path, 1)