openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #01169
[Merge] lp:~trb143/openlp/futures into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/futures into lp:openlp.
Requested reviews:
Raoul Snyman (raoul-snyman)
Yet more text fixes
Fix bug in service manager when nothing is present and you try to use the context menu
--
https://code.launchpad.net/~trb143/openlp/futures/+merge/21310
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py 2010-03-09 19:45:13 +0000
+++ openlp/core/ui/servicemanager.py 2010-03-13 08:48:19 +0000
@@ -216,6 +216,8 @@
def contextMenu(self, point):
item = self.ServiceManagerList.itemAt(point)
+ if item is None:
+ return
if item.parent() is None:
pos = item.data(0, QtCore.Qt.UserRole).toInt()[0]
else:
=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py 2010-03-09 19:43:11 +0000
+++ openlp/core/ui/thememanager.py 2010-03-13 08:48:19 +0000
@@ -177,20 +177,20 @@
if theme != unicode(item.data(QtCore.Qt.UserRole).toString()):
QtGui.QMessageBox.critical(
self, self.trUtf8('Error'),
- self.trUtf8('You are unable to delete the default theme!'),
+ self.trUtf8('You are unable to delete the default theme.'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
else:
for plugin in self.parent.plugin_manager.plugins:
if not plugin.can_delete_theme(theme):
QtGui.QMessageBox.critical(
self, self.trUtf8('Error'),
- self.trUtf8('theme %s is use in %s plugin' % (theme, plugin.name)),
+ self.trUtf8('Theme %s is use in %s plugin' % (theme, plugin.name)),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
return
if unicode(self.parent.ServiceManagerContents.ThemeComboBox.currentText()) == theme:
QtGui.QMessageBox.critical(
self, self.trUtf8('Error'),
- self.trUtf8('theme %s is use Service Manager' % theme),
+ self.trUtf8('Theme %s is use by Service Manager' % theme),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
return
self.themelist.remove(theme)
@@ -216,7 +216,7 @@
item = self.ThemeListWidget.currentItem()
if item is None:
QtGui.QMessageBox.critical(self, self.trUtf8('Error'),
- self.trUtf8('You have not selected a theme!'),
+ self.trUtf8('You have not selected a theme.'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
return
theme = unicode(item.data(QtCore.Qt.UserRole).toString())
@@ -359,7 +359,7 @@
except:
QtGui.QMessageBox.critical(
self, self.trUtf8('Error'),
- self.trUtf8('File is not a valid theme!'),
+ self.trUtf8('File is not a valid theme.'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
log.exception(u'Importing theme from zip file failed %s' % filename)
finally:
=== modified file 'openlp/plugins/alerts/forms/alerteditform.py'
--- openlp/plugins/alerts/forms/alerteditform.py 2010-03-09 19:43:11 +0000
+++ openlp/plugins/alerts/forms/alerteditform.py 2010-03-13 08:48:19 +0000
@@ -85,7 +85,7 @@
if self.AlertLineEdit.text():
QtGui.QMessageBox.information(self,
self.trUtf8('Item selected to Edit'),
- self.trUtf8('Please Save or Clear seletced item'))
+ self.trUtf8('Please save or clear selected item'))
else:
self.EditButton.setEnabled(True)
self.DeleteButton.setEnabled(True)
=== modified file 'openlp/plugins/bibles/forms/importwizardform.py'
--- openlp/plugins/bibles/forms/importwizardform.py 2010-03-05 18:37:52 +0000
+++ openlp/plugins/bibles/forms/importwizardform.py 2010-03-13 08:48:19 +0000
@@ -110,7 +110,7 @@
QtGui.QMessageBox.critical(self,
self.trUtf8('Invalid Bible Location'),
self.trUtf8('You need to specify a file to import your '
- 'Bible from!'),
+ 'Bible from.'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
self.OSISLocationEdit.setFocus()
return False
@@ -119,7 +119,7 @@
QtGui.QMessageBox.critical(self,
self.trUtf8('Invalid Books File'),
self.trUtf8('You need to specify a file with books of '
- 'the Bible to use in the import!'),
+ 'the Bible to use in the import.'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
self.BooksLocationEdit.setFocus()
return False
@@ -127,7 +127,7 @@
QtGui.QMessageBox.critical(self,
self.trUtf8('Invalid Verse File'),
self.trUtf8('You need to specify a file of Bible '
- 'verses to import!'),
+ 'verses to import.'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
self.CsvVerseLocationEdit.setFocus()
return False
@@ -136,7 +136,7 @@
QtGui.QMessageBox.critical(self,
self.trUtf8('Invalid OpenSong Bible'),
self.trUtf8('You need to specify an OpenSong Bible '
- 'file to import!'),
+ 'file to import.'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
self.OpenSongFileEdit.setFocus()
return False
@@ -147,7 +147,7 @@
QtGui.QMessageBox.critical(self,
self.trUtf8('Empty Version Name'),
self.trUtf8('You need to specify a version name for your '
- 'Bible!'),
+ 'Bible.'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
self.VersionNameEdit.setFocus()
return False
=== modified file 'openlp/plugins/custom/customplugin.py'
--- openlp/plugins/custom/customplugin.py 2010-03-04 19:03:09 +0000
+++ openlp/plugins/custom/customplugin.py 2010-03-13 08:48:19 +0000
@@ -69,7 +69,7 @@
def about(self):
about_text = self.trUtf8('<b>Custom Plugin</b><br>This plugin '
'allows slides to be displayed on the screen in the same way '
- 'songs are. This plugin provides greater freedom over the '
+ 'songs are. This plugin provides greater freedom over the '
'songs plugin.<br>')
return about_text
=== modified file 'openlp/plugins/images/lib/mediaitem.py'
--- openlp/plugins/images/lib/mediaitem.py 2010-03-07 20:45:27 +0000
+++ openlp/plugins/images/lib/mediaitem.py 2010-03-13 08:48:19 +0000
@@ -61,7 +61,7 @@
def retranslateUi(self):
self.OnNewPrompt = self.trUtf8('Select Image(s)')
self.OnNewFileMasks = \
- self.trUtf8('Images (*.jpg *jpeg *.gif *.png *.bmp);; All files (*)')
+ self.trUtf8('Images (*.jpg *.jpeg *.gif *.png *.bmp);; All files (*)')
def requiredIcons(self):
MediaManagerItem.requiredIcons(self)
@@ -101,7 +101,7 @@
self.OverrideCheckBox.setChecked(False)
self.OverrideCheckBox.setText(self.trUtf8('Override background'))
self.OverrideCheckBox.setStatusTip(
- self.trUtf8('Allow background of live slide to be overridden'))
+ self.trUtf8('Allow the background of live slide to be overridden'))
self.OverrideLayout.addWidget(self.OverrideCheckBox)
self.OverrideLabel = QtGui.QLabel(self.ImageWidget)
self.OverrideLabel.setObjectName(u'OverrideLabel')
=== modified file 'openlp/plugins/presentations/presentationplugin.py'
--- openlp/plugins/presentations/presentationplugin.py 2010-03-09 19:43:11 +0000
+++ openlp/plugins/presentations/presentationplugin.py 2010-03-13 08:48:19 +0000
@@ -111,6 +111,6 @@
def about(self):
about_text = self.trUtf8('<b>Presentation Plugin</b> <br> Delivers '
'the ability to show presentations using a number of different '
- 'programs. The choice of available presentation programs is '
+ 'programs. The choice of available presentation programs is '
'available to the user in a drop down box.')
return about_text
=== modified file 'openlp/plugins/songusage/forms/songusagedeleteform.py'
--- openlp/plugins/songusage/forms/songusagedeleteform.py 2010-02-17 19:13:04 +0000
+++ openlp/plugins/songusage/forms/songusagedeleteform.py 2010-03-13 08:48:19 +0000
@@ -41,8 +41,8 @@
def accept(self):
ret = QtGui.QMessageBox.question(self,
- self.trUtf8('Delete Selected Audit Events?'),
- self.trUtf8('Are you sure you want to delete selected Audit Data?'),
+ self.trUtf8('Delete Selected Song Usage Events?'),
+ self.trUtf8('Are you sure you want to delete selected Song Usage data?'),
QtGui.QMessageBox.StandardButtons(
QtGui.QMessageBox.Ok |
QtGui.QMessageBox.Cancel),
=== modified file 'openlp/plugins/songusage/forms/songusagedetailform.py'
--- openlp/plugins/songusage/forms/songusagedetailform.py 2010-02-27 15:31:23 +0000
+++ openlp/plugins/songusage/forms/songusagedetailform.py 2010-03-13 08:48:19 +0000
@@ -81,7 +81,7 @@
instance.copyright, instance.ccl_number , instance.authors)
file.write(record)
except:
- log.exception(u'Failed to write out audit records')
+ log.exception(u'Failed to write out song usage records')
finally:
if file:
file.close()
Follow ups
