Review fixes

This commit is contained in:
Tim Bentley 2011-02-20 07:37:44 +00:00
parent 4fb831f96c
commit de66d53e73
3 changed files with 9 additions and 9 deletions

View File

@ -18,3 +18,4 @@ translate OpenLP, have a look at the OpenLP wiki::
http://wiki.openlp.org/ http://wiki.openlp.org/
Thanks for downloading OpenLP 2.0! Thanks for downloading OpenLP 2.0!

View File

@ -57,7 +57,7 @@ class Ui_PrintServiceDialog(object):
self.toolbar.setIconSize(QtCore.QSize(22, 22)) self.toolbar.setIconSize(QtCore.QSize(22, 22))
self.toolbar.setToolButtonStyle(QtCore.Qt.ToolButtonTextBesideIcon) self.toolbar.setToolButtonStyle(QtCore.Qt.ToolButtonTextBesideIcon)
self.printButton = self.toolbar.addAction( self.printButton = self.toolbar.addAction(
QtGui.QIcon(build_icon(u':/general/general_print.png')), 'Print') build_icon(u':/general/general_print.png'), 'Print')
self.optionsButton = QtGui.QToolButton(self.toolbar) self.optionsButton = QtGui.QToolButton(self.toolbar)
self.optionsButton.setText(translate('OpenLP.PrintServiceForm', self.optionsButton.setText(translate('OpenLP.PrintServiceForm',
'Options')) 'Options'))
@ -68,14 +68,14 @@ class Ui_PrintServiceDialog(object):
self.optionsButton.setCheckable(True) self.optionsButton.setCheckable(True)
self.toolbar.addWidget(self.optionsButton) self.toolbar.addWidget(self.optionsButton)
self.closeButton = self.toolbar.addAction( self.closeButton = self.toolbar.addAction(
QtGui.QIcon(build_icon(u':/system/system_close.png')), build_icon(u':/system/system_close.png'),
translate('OpenLP.PrintServiceForm', 'Close')) translate('OpenLP.PrintServiceForm', 'Close'))
self.toolbar.addSeparator() self.toolbar.addSeparator()
self.plainCopy = self.toolbar.addAction( self.plainCopy = self.toolbar.addAction(
QtGui.QIcon(build_icon(u':/system/system_edit_copy.png')), build_icon(u':/system/system_edit_copy.png'),
translate('OpenLP.PrintServiceForm', 'Copy')) translate('OpenLP.PrintServiceForm', 'Copy'))
self.htmlCopy = self.toolbar.addAction( self.htmlCopy = self.toolbar.addAction(
QtGui.QIcon(build_icon(u':/system/system_edit_copy.png')), build_icon(u':/system/system_edit_copy.png'),
translate('OpenLP.PrintServiceForm', 'Copy as HTML')) translate('OpenLP.PrintServiceForm', 'Copy as HTML'))
self.toolbar.addSeparator() self.toolbar.addSeparator()
self.zoomInButton = QtGui.QToolButton(self.toolbar) self.zoomInButton = QtGui.QToolButton(self.toolbar)
@ -147,8 +147,7 @@ class Ui_PrintServiceDialog(object):
QtCore.SIGNAL(u'toggled(bool)'), self.toggleOptions) QtCore.SIGNAL(u'toggled(bool)'), self.toggleOptions)
def retranslateUi(self, printServiceDialog): def retranslateUi(self, printServiceDialog):
printServiceDialog.setWindowTitle( printServiceDialog.setWindowTitle(UiStrings.PrintServiceOrder)
translate('OpenLP.PrintServiceForm', 'Print Service Order'))
self.slideTextCheckBox.setText(translate('OpenLP.PrintServiceForm', self.slideTextCheckBox.setText(translate('OpenLP.PrintServiceForm',
'Include slide text if available')) 'Include slide text if available'))
self.notesCheckBox.setText(translate('OpenLP.PrintServiceForm', self.notesCheckBox.setText(translate('OpenLP.PrintServiceForm',

View File

@ -129,12 +129,12 @@ class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog):
# Add service items' notes. # Add service items' notes.
if self.notesCheckBox.isChecked(): if self.notesCheckBox.isChecked():
if item.notes: if item.notes:
text += u'<p><b>%s</b></p>%s' % (translate( text += u'<p><strong>%s</strong></p>%s' % (translate(
'OpenLP.ServiceManager', 'Notes:'), 'OpenLP.ServiceManager', 'Notes:'),
item.notes.replace(u'\n', u'<br />')) item.notes.replace(u'\n', u'<br />'))
# Add play length of media files. # Add play length of media files.
if item.is_media() and self.metaDataCheckBox.isChecked(): if item.is_media() and self.metaDataCheckBox.isChecked():
text += u'<p><b>%s</b> %s</p>' % (translate( text += u'<p><strong>%s</strong> %s</p>' % (translate(
'OpenLP.ServiceManager', u'Playing time:'), 'OpenLP.ServiceManager', u'Playing time:'),
unicode(datetime.timedelta(seconds=item.media_length))) unicode(datetime.timedelta(seconds=item.media_length)))
if self.footerTextEdit.toPlainText(): if self.footerTextEdit.toPlainText():