Head 1189

This commit is contained in:
M2j 2011-01-05 18:17:22 +01:00
commit 6dca24bc3c
3 changed files with 15 additions and 9 deletions

View File

@ -31,12 +31,18 @@ class HideMode(object):
"""
This is an enumeration class which specifies the different modes of hiding
the display.
The ``Blank`` option is used to hide all output, specifically by covering
the display with a black screen.
The ``Theme`` option is used to hide all output, but covers the display with
the current theme background, as opposed to black.
Lastly, the ``Desktop`` mode hides all output by minimising the display,
leaving the user's desktop showing.
``Blank``
This mode is used to hide all output, specifically by covering the
display with a black screen.
``Theme``
This mode is used to hide all output, but covers the display with the
current theme background, as opposed to black.
``Desktop``
This mode hides all output by minimising the display, leaving the user's
desktop showing.
"""
Blank = 1
Theme = 2

View File

@ -370,7 +370,7 @@ class ServiceManager(QtGui.QWidget):
translate('OpenLP.ServiceManager', 'Open File'),
SettingsManager.get_last_dir(self.parent.serviceSettingsSection),
translate('OpenLP.ServiceManager',
'OpenLP Service Files (*.osz) (*.osz)')))
'OpenLP Service Files (*.osz)')))
if not fileName:
return False
SettingsManager.set_last_dir(self.parent.serviceSettingsSection,
@ -460,7 +460,7 @@ class ServiceManager(QtGui.QWidget):
translate('OpenLP.ServiceManager', 'Save Service'),
SettingsManager.get_last_dir(self.parent.serviceSettingsSection),
translate('OpenLP.ServiceManager',
'OpenLP Service Files (*.osz) (*.osz)')))
'OpenLP Service Files (*.osz)')))
if not fileName:
return False
if os.path.splitext(fileName)[1] == u'':

View File

@ -109,7 +109,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
author_name = QtGui.QListWidgetItem(author.display_name)
else:
author_name = QtGui.QListWidgetItem(
u' '.join(author.first_name, author.last_name))
u' '.join([author.first_name, author.last_name]))
author_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(author.id))
self.authorsListWidget.addItem(author_name)
if self.authorsListWidget.count() == 0: