From de66d53e73c06b11cbf1bf41aa6f37bb7f625609 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 20 Feb 2011 07:37:44 +0000 Subject: [PATCH] Review fixes --- README.txt | 3 ++- openlp/core/ui/printservicedialog.py | 11 +++++------ openlp/core/ui/printserviceform.py | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.txt b/README.txt index 15f58e6d0..0b26d74fc 100644 --- a/README.txt +++ b/README.txt @@ -17,4 +17,5 @@ translate OpenLP, have a look at the OpenLP wiki:: http://wiki.openlp.org/ -Thanks for downloading OpenLP 2.0! \ No newline at end of file +Thanks for downloading OpenLP 2.0! + diff --git a/openlp/core/ui/printservicedialog.py b/openlp/core/ui/printservicedialog.py index aac5a3e44..ec4e054c3 100644 --- a/openlp/core/ui/printservicedialog.py +++ b/openlp/core/ui/printservicedialog.py @@ -57,7 +57,7 @@ class Ui_PrintServiceDialog(object): self.toolbar.setIconSize(QtCore.QSize(22, 22)) self.toolbar.setToolButtonStyle(QtCore.Qt.ToolButtonTextBesideIcon) 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.setText(translate('OpenLP.PrintServiceForm', 'Options')) @@ -68,14 +68,14 @@ class Ui_PrintServiceDialog(object): self.optionsButton.setCheckable(True) self.toolbar.addWidget(self.optionsButton) 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')) self.toolbar.addSeparator() 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')) 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')) self.toolbar.addSeparator() self.zoomInButton = QtGui.QToolButton(self.toolbar) @@ -147,8 +147,7 @@ class Ui_PrintServiceDialog(object): QtCore.SIGNAL(u'toggled(bool)'), self.toggleOptions) def retranslateUi(self, printServiceDialog): - printServiceDialog.setWindowTitle( - translate('OpenLP.PrintServiceForm', 'Print Service Order')) + printServiceDialog.setWindowTitle(UiStrings.PrintServiceOrder) self.slideTextCheckBox.setText(translate('OpenLP.PrintServiceForm', 'Include slide text if available')) self.notesCheckBox.setText(translate('OpenLP.PrintServiceForm', diff --git a/openlp/core/ui/printserviceform.py b/openlp/core/ui/printserviceform.py index 66d23f80a..882e39fca 100644 --- a/openlp/core/ui/printserviceform.py +++ b/openlp/core/ui/printserviceform.py @@ -129,12 +129,12 @@ class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog): # Add service items' notes. if self.notesCheckBox.isChecked(): if item.notes: - text += u'

%s

%s' % (translate( + text += u'

%s

%s' % (translate( 'OpenLP.ServiceManager', 'Notes:'), item.notes.replace(u'\n', u'
')) # Add play length of media files. if item.is_media() and self.metaDataCheckBox.isChecked(): - text += u'

%s %s

' % (translate( + text += u'

%s %s

' % (translate( 'OpenLP.ServiceManager', u'Playing time:'), unicode(datetime.timedelta(seconds=item.media_length))) if self.footerTextEdit.toPlainText():