forked from openlp/openlp
r1347
This commit is contained in:
commit
9082abad67
|
@ -162,9 +162,7 @@ class ServiceItem(object):
|
||||||
line_break = True
|
line_break = True
|
||||||
if self.is_capable(ItemCapabilities.NoLineBreaks):
|
if self.is_capable(ItemCapabilities.NoLineBreaks):
|
||||||
line_break = False
|
line_break = False
|
||||||
theme = None
|
theme = self.theme if self.theme else None
|
||||||
if self.theme:
|
|
||||||
theme = self.theme
|
|
||||||
self.main, self.footer = \
|
self.main, self.footer = \
|
||||||
self.render_manager.set_override_theme(theme, useOverride)
|
self.render_manager.set_override_theme(theme, useOverride)
|
||||||
self.themedata = self.render_manager.renderer._theme
|
self.themedata = self.render_manager.renderer._theme
|
||||||
|
@ -187,11 +185,7 @@ class ServiceItem(object):
|
||||||
self.title = clean_tags(self.title)
|
self.title = clean_tags(self.title)
|
||||||
self.foot_text = None
|
self.foot_text = None
|
||||||
if self.raw_footer:
|
if self.raw_footer:
|
||||||
for foot in self.raw_footer:
|
self.foot_text = u'<br>'.join(self.raw_footer)
|
||||||
if not self.foot_text:
|
|
||||||
self.foot_text = foot
|
|
||||||
else:
|
|
||||||
self.foot_text = u'%s<br>%s' % (self.foot_text, foot)
|
|
||||||
|
|
||||||
def add_from_image(self, path, title):
|
def add_from_image(self, path, title):
|
||||||
"""
|
"""
|
||||||
|
@ -204,8 +198,7 @@ class ServiceItem(object):
|
||||||
A title for the slide in the service item.
|
A title for the slide in the service item.
|
||||||
"""
|
"""
|
||||||
self.service_item_type = ServiceItemType.Image
|
self.service_item_type = ServiceItemType.Image
|
||||||
self._raw_frames.append(
|
self._raw_frames.append({u'title': title, u'path': path})
|
||||||
{u'title': title, u'path': path})
|
|
||||||
self.render_manager.image_manager.add_image(title, path)
|
self.render_manager.image_manager.add_image(title, path)
|
||||||
self._new_item()
|
self._new_item()
|
||||||
|
|
||||||
|
|
|
@ -106,38 +106,36 @@ class Ui_AboutDialog(object):
|
||||||
))
|
))
|
||||||
self.aboutNotebook.setTabText(
|
self.aboutNotebook.setTabText(
|
||||||
self.aboutNotebook.indexOf(self.aboutTab), UiStrings.About)
|
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'
|
'Project Lead\n'
|
||||||
' Raoul "superfly" Snyman\n'
|
' %s\n'
|
||||||
'\n'
|
'\n'
|
||||||
'Developers\n'
|
'Developers\n'
|
||||||
' Tim "TRB143" Bentley\n'
|
' %s\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'
|
|
||||||
'\n'
|
'\n'
|
||||||
'Contributors\n'
|
'Contributors\n'
|
||||||
' Meinert "m2j" Jordan\n'
|
' %s\n'
|
||||||
' Andreas "googol" Preikschat\n'
|
|
||||||
' Christian "crichter" Richter\n'
|
|
||||||
' Philip "Phill" Ridout\n'
|
|
||||||
' Maikel Stuivenberg\n'
|
|
||||||
' Carsten "catini" Tingaard\n'
|
|
||||||
' Frode "frodus" Woldsund\n'
|
|
||||||
'\n'
|
'\n'
|
||||||
'Testers\n'
|
'Testers\n'
|
||||||
' Philip "Phill" Ridout\n'
|
' %s\n'
|
||||||
' Wesley "wrst" Stout (lead)\n'
|
|
||||||
'\n'
|
'\n'
|
||||||
'Packagers\n'
|
'Packagers\n'
|
||||||
' Thomas "tabthorpe" Abthorpe (FreeBSD)\n'
|
' %s\n'
|
||||||
' Tim "TRB143" Bentley (Fedora)\n'
|
|
||||||
' Michael "cocooncrash" Gorven (Ubuntu)\n'
|
|
||||||
' Matthias "matthub" Hub (Mac OS X)\n'
|
|
||||||
' Raoul "superfly" Snyman (Windows, Ubuntu)\n'
|
|
||||||
'\n'
|
'\n'
|
||||||
'Built With\n'
|
'Built With\n'
|
||||||
' Python: http://www.python.org/\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'
|
' God our Father, for sending His Son to die\n'
|
||||||
' on the cross, setting us free from sin. We\n'
|
' on the cross, setting us free from sin. We\n'
|
||||||
' bring this software to you for free because\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.setTabText(
|
||||||
self.aboutNotebook.indexOf(self.creditsTab),
|
self.aboutNotebook.indexOf(self.creditsTab),
|
||||||
translate('OpenLP.AboutForm', 'Credits'))
|
translate('OpenLP.AboutForm', 'Credits'))
|
||||||
self.licenseTextEdit.setPlainText(translate('OpenLP.AboutForm',
|
copyright = translate('OpenLP.AboutForm',
|
||||||
'Copyright \xa9 2004-2011 Raoul Snyman\n'
|
'Copyright \xa9 2004-2011 Raoul Snyman\n'
|
||||||
'Portions copyright \xa9 2004-2011 '
|
'Portions copyright \xa9 2004-2011 '
|
||||||
'Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,\n'
|
'Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,\n'
|
||||||
'Meinert Jordan, Andreas Preikschat, Christian Richter, Philip\n'
|
'Meinert Jordan, Andreas Preikschat, Christian Richter, Philip\n'
|
||||||
'Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carstenn'
|
'Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carstenn'
|
||||||
'Tinggaard, Frode Woldsund\n'
|
'Tinggaard, Frode Woldsund')
|
||||||
'\n'
|
licence = translate('OpenLP.AboutForm',
|
||||||
'This program is free software; you can redistribute it and/or '
|
'This program is free software; you can redistribute it and/or '
|
||||||
'modify it under the terms of the GNU General Public License as '
|
'modify it under the terms of the GNU General Public License as '
|
||||||
'published by the Free Software Foundation; version 2 of the '
|
'published by the Free Software Foundation; version 2 of the '
|
||||||
'License.\n'
|
'License.')
|
||||||
'\n'
|
disclaimer = translate('OpenLP.AboutForm',
|
||||||
'This program is distributed in the hope that it will be useful, '
|
'This program is distributed in the hope that it will be useful, '
|
||||||
'but WITHOUT ANY WARRANTY; without even the implied warranty of '
|
'but WITHOUT ANY WARRANTY; without even the implied warranty of '
|
||||||
'MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See below '
|
'MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See below '
|
||||||
'for more details.\n'
|
'for more details.')
|
||||||
'\n'
|
gpltext = ('GNU GENERAL PUBLIC LICENSE\n'
|
||||||
'\n'
|
|
||||||
'GNU GENERAL PUBLIC LICENSE\n'
|
|
||||||
'Version 2, June 1991\n'
|
'Version 2, June 1991\n'
|
||||||
'\n'
|
'\n'
|
||||||
'Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 '
|
'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 '
|
'subroutine library, you may consider it more useful to permit '
|
||||||
'linking proprietary applications with the library. If this is '
|
'linking proprietary applications with the library. If this is '
|
||||||
'what you want to do, use the GNU Lesser General Public License '
|
'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.setTabText(
|
||||||
self.aboutNotebook.indexOf(self.licenseTab),
|
self.aboutNotebook.indexOf(self.licenseTab),
|
||||||
translate('OpenLP.AboutForm', 'License'))
|
translate('OpenLP.AboutForm', 'License'))
|
||||||
|
|
|
@ -163,7 +163,7 @@ class AlertForm(QtGui.QDialog, Ui_AlertDialog):
|
||||||
# We found '<>' in the alert text, but the ParameterEdit field is empty.
|
# We found '<>' in the alert text, but the ParameterEdit field is empty.
|
||||||
if text.find(u'<>') != -1 and not self.parameterEdit.text() and \
|
if text.find(u'<>') != -1 and not self.parameterEdit.text() and \
|
||||||
QtGui.QMessageBox.question(self,
|
QtGui.QMessageBox.question(self,
|
||||||
translate('AlertPlugin.AlertForm', 'No Parameter found'),
|
translate('AlertPlugin.AlertForm', 'No Parameter Found'),
|
||||||
translate('AlertPlugin.AlertForm', 'You have not entered a '
|
translate('AlertPlugin.AlertForm', 'You have not entered a '
|
||||||
'parameter to be replaced.\nDo you want to continue anyway?'),
|
'parameter to be replaced.\nDo you want to continue anyway?'),
|
||||||
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No |
|
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No |
|
||||||
|
@ -174,9 +174,9 @@ class AlertForm(QtGui.QDialog, Ui_AlertDialog):
|
||||||
# in the alert text.
|
# in the alert text.
|
||||||
elif text.find(u'<>') == -1 and self.parameterEdit.text() and \
|
elif text.find(u'<>') == -1 and self.parameterEdit.text() and \
|
||||||
QtGui.QMessageBox.question(self,
|
QtGui.QMessageBox.question(self,
|
||||||
translate('AlertPlugin.AlertForm', 'No Placeholder found'),
|
translate('AlertPlugin.AlertForm', 'No Placeholder Found'),
|
||||||
translate('AlertPlugin.AlertForm', 'The alert text does not'
|
translate('AlertPlugin.AlertForm', 'The alert text does not'
|
||||||
' contain \'<>\'.\nDo want to continue anyway?'),
|
' contain \'<>\'.\nDo you want to continue anyway?'),
|
||||||
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No |
|
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No |
|
||||||
QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.No:
|
QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.No:
|
||||||
self.parameterEdit.setFocus()
|
self.parameterEdit.setFocus()
|
||||||
|
|
|
@ -226,7 +226,7 @@ class SongExportForm(OpenLPWizard):
|
||||||
translate('SongsPlugin.ExportWizardForm',
|
translate('SongsPlugin.ExportWizardForm',
|
||||||
'No Save Location specified'),
|
'No Save Location specified'),
|
||||||
translate('SongsPlugin.ExportWizardForm',
|
translate('SongsPlugin.ExportWizardForm',
|
||||||
'You need to specified a directory to save the songs in.'))
|
'You need to specify a directory.'))
|
||||||
return False
|
return False
|
||||||
return True
|
return True
|
||||||
elif self.currentPage() == self.progressPage:
|
elif self.currentPage() == self.progressPage:
|
||||||
|
@ -355,7 +355,7 @@ class SongExportForm(OpenLPWizard):
|
||||||
the path to *directoryLineEdit*.
|
the path to *directoryLineEdit*.
|
||||||
"""
|
"""
|
||||||
path = unicode(QtGui.QFileDialog.getExistingDirectory(self,
|
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),
|
SettingsManager.get_last_dir(self.plugin.settingsSection, 1),
|
||||||
options=QtGui.QFileDialog.ShowDirsOnly))
|
options=QtGui.QFileDialog.ShowDirsOnly))
|
||||||
SettingsManager.set_last_dir(self.plugin.settingsSection, path, 1)
|
SettingsManager.set_last_dir(self.plugin.settingsSection, path, 1)
|
||||||
|
|
3503
resources/i18n/af.ts
3503
resources/i18n/af.ts
File diff suppressed because it is too large
Load Diff
4014
resources/i18n/de.ts
4014
resources/i18n/de.ts
File diff suppressed because it is too large
Load Diff
3485
resources/i18n/en.ts
3485
resources/i18n/en.ts
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
3499
resources/i18n/es.ts
3499
resources/i18n/es.ts
File diff suppressed because it is too large
Load Diff
3737
resources/i18n/et.ts
3737
resources/i18n/et.ts
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
3501
resources/i18n/hu.ts
3501
resources/i18n/hu.ts
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
4691
resources/i18n/ja.ts
4691
resources/i18n/ja.ts
File diff suppressed because it is too large
Load Diff
3487
resources/i18n/ko.ts
3487
resources/i18n/ko.ts
File diff suppressed because it is too large
Load Diff
3491
resources/i18n/nb.ts
3491
resources/i18n/nb.ts
File diff suppressed because it is too large
Load Diff
6305
resources/i18n/nl.ts
6305
resources/i18n/nl.ts
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
3623
resources/i18n/sv.ts
3623
resources/i18n/sv.ts
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue