openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge branch 'printservicelabels' into 'master' 

Updated Print Service labels for Copy and Custom Footer Text

Closes #270

See merge request openlp/openlp!51
This commit is contained in:
Raoul Snyman 2019-10-23 04:22:28 +00:00
parent 846a77cae7 212d4c8678
commit 3d1af40823
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/core/ui/printservicedialog.py
View File

@ -67,7 +67,7 @@ class Ui_PrintServiceDialog(object):
self.toolbar.addWidget(self.options_button)
self.toolbar.addSeparator()
self.plain_copy = self.toolbar.addAction(UiIcons().clone,
translate('OpenLP.PrintServiceForm', 'Copy'))
translate('OpenLP.PrintServiceForm', 'Copy as Text'))
self.html_copy = self.toolbar.addAction(UiIcons().clone,
translate('OpenLP.PrintServiceForm', 'Copy as HTML'))
self.toolbar.addSeparator()
@ -139,7 +139,7 @@ class Ui_PrintServiceDialog(object):
self.zoom_in_button.setToolTip(translate('OpenLP.PrintServiceForm', 'Zoom In'))
self.options_button.setText(translate('OpenLP.PrintServiceForm', 'Options'))
self.title_label.setText(translate('OpenLP.PrintServiceForm', 'Title:'))
self.footer_label.setText(translate('OpenLP.PrintServiceForm', 'Custom Footer Text:'))
self.footer_label.setText(translate('OpenLP.PrintServiceForm', 'Service Note Text:'))
self.options_group_box.setTitle(translate('OpenLP.PrintServiceForm', 'Other Options'))
self.slide_text_check_box.setText(translate('OpenLP.PrintServiceForm', 'Include slide text if available'))
self.page_break_after_text.setText(translate('OpenLP.PrintServiceForm', 'Add page break before each text item'))

2
openlp/core/ui/printserviceform.py
View File

@ -197,7 +197,7 @@ class PrintServiceForm(QtWidgets.QDialog, Ui_PrintServiceDialog, RegistryPropert
if self.footer_text_edit.toPlainText():
div = self._add_element('div', parent=html_data.body, class_id='customNotes')
self._add_element(
'span', translate('OpenLP.ServiceManager', 'Custom Service Notes: '), div, class_id='customNotesTitle')
'span', translate('OpenLP.ServiceManager', 'Service Notes: '), div, class_id='customNotesTitle')
self._add_element('span', html.escape(self.footer_text_edit.toPlainText()), div, class_id='customNotesText')
self.document.setHtml(lxml.html.tostring(html_data).decode())
self.preview_widget.updatePreview()