diff --git a/openlp/core/lib/ui.py b/openlp/core/lib/ui.py
index 27c510eb2..a98e2fb7f 100644
--- a/openlp/core/lib/ui.py
+++ b/openlp/core/lib/ui.py
@@ -44,8 +44,6 @@ class UiStrings(object):
Advanced = translate('OpenLP.Ui', 'Advanced')
AllFiles = translate('OpenLP.Ui', 'All Files')
Authors = translate('OpenLP.Ui', 'Authors')
- CopyToHtml = translate('OpenLP.Ui', 'Copy to HTML')
- CopyToText = translate('OpenLP.Ui', 'Copy to Text')
CreateService = translate('OpenLP.Ui', 'Create a new service.')
Delete = translate('OpenLP.Ui', '&Delete')
Edit = translate('OpenLP.Ui', '&Edit')
diff --git a/openlp/core/ui/printserviceorderdialog.py b/openlp/core/ui/printserviceorderdialog.py
index c464a7814..c8b47b3e3 100644
--- a/openlp/core/ui/printserviceorderdialog.py
+++ b/openlp/core/ui/printserviceorderdialog.py
@@ -32,6 +32,8 @@ from openlp.core.lib.ui import UiStrings
class Ui_PrintServiceOrderDialog(object):
def setupUi(self, printServiceOrderDialog):
printServiceOrderDialog.setObjectName(u'printServiceOrderDialog')
+ self.verticalLayout = QtGui.QGridLayout(printServiceOrderDialog)
+ self.verticalLayout.setObjectName(u'verticalLayout')
self.dialogLayout = QtGui.QGridLayout(printServiceOrderDialog)
self.dialogLayout.setObjectName(u'dialogLayout')
self.perviewLayout = QtGui.QVBoxLayout()
@@ -76,9 +78,6 @@ class Ui_PrintServiceOrderDialog(object):
self.printMetaDataCheckBox = QtGui.QCheckBox(printServiceOrderDialog)
self.printMetaDataCheckBox.setObjectName(u'printMetaDataCheckBox')
self.settingsLayout.addWidget(self.printMetaDataCheckBox)
- self.copyMetaDataCheckBox = QtGui.QCheckBox(printServiceOrderDialog)
- self.copyMetaDataCheckBox.setObjectName(u'copyMetaDataCheckBox')
- self.settingsLayout.addWidget(self.copyMetaDataCheckBox)
spacerItem = QtGui.QSpacerItem(20, 40,
QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
self.settingsLayout.addItem(spacerItem)
@@ -94,6 +93,9 @@ class Ui_PrintServiceOrderDialog(object):
spacerItem = QtGui.QSpacerItem(40, 20,
QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
self.buttonLayout.addItem(spacerItem)
+ self.copyHtmlButton = QtGui.QPushButton(printServiceOrderDialog)
+ self.copyHtmlButton.setObjectName(u'copyHtmlButton')
+ self.buttonLayout.addWidget(self.copyHtmlButton)
self.copyTextButton = QtGui.QPushButton(printServiceOrderDialog)
self.copyTextButton.setObjectName(u'copyTextButton')
self.buttonLayout.addWidget(self.copyTextButton)
@@ -103,7 +105,7 @@ class Ui_PrintServiceOrderDialog(object):
self.cancelButton = QtGui.QPushButton(printServiceOrderDialog)
self.cancelButton.setObjectName(u'cancelButton')
self.buttonLayout.addWidget(self.cancelButton)
- self.dialogLayout.addLayout(self.buttonLayout, 1, 3, 1, 1)
+ self.dialogLayout.addLayout(self.buttonLayout, 2, 2, 1, 1)
self.zoomButtonLayout = QtGui.QHBoxLayout()
self.zoomButtonLayout.setObjectName(u'zoomButtonLayout')
spacerItem = QtGui.QSpacerItem(40, 20,
@@ -134,14 +136,14 @@ class Ui_PrintServiceOrderDialog(object):
self.printMetaDataCheckBox.setText(
translate('OpenLP.PrintServiceOrderForm',
'Include play length of media items'))
- self.copyMetaDataCheckBox.setText(
- translate('OpenLP.PrintServiceOrderForm',
- 'Copy output as HTML'))
self.serviceTitleLabel.setText(translate(
'OpenLP.PrintServiceOrderForm', 'Title:'))
self.serviceTitleLineEdit.setText(translate('OpenLP.ServiceManager',
'Service Order Sheet'))
- self.copyTextButton.setText(UiStrings.CopyToText)
+ self.copyTextButton.setText(translate('OpenLP.ServiceManager',
+ 'Copy to Clipboard as Text'))
+ self.copyHtmlButton.setText(translate('OpenLP.ServiceManager',
+ 'Copy to Clipboard as Html'))
self.printButton.setText(translate('OpenLP.ServiceManager', 'Print'))
self.cancelButton.setText(translate('OpenLP.ServiceManager', 'Cancel'))
self.customNotesLabel.setText(
diff --git a/openlp/core/ui/printserviceorderform.py b/openlp/core/ui/printserviceorderform.py
index cfd0f7a52..48cd606d0 100644
--- a/openlp/core/ui/printserviceorderform.py
+++ b/openlp/core/ui/printserviceorderform.py
@@ -53,10 +53,6 @@ class PrintServiceOrderForm(QtGui.QDialog, Ui_PrintServiceOrderDialog):
u'print file meta data', QtCore.QVariant(False)).toBool())
self.printNotesCheckBox.setChecked(settings.value(
u'print notes', QtCore.QVariant(False)).toBool())
- self.copyMetaDataCheckBox.setChecked(settings.value(
- u'html copy', QtCore.QVariant(False)).toBool())
- if self.copyMetaDataCheckBox.isChecked():
- self.copyTextButton.setText(UiStrings.CopyToHtml)
settings.endGroup()
# Signals
QtCore.QObject.connect(self.printButton,
@@ -82,8 +78,8 @@ class PrintServiceOrderForm(QtGui.QDialog, Ui_PrintServiceOrderDialog):
QtCore.SIGNAL(u'clicked()'), self.reject)
QtCore.QObject.connect(self.copyTextButton,
QtCore.SIGNAL(u'clicked()'), self.copyText)
- QtCore.QObject.connect(self.copyMetaDataCheckBox,
- QtCore.SIGNAL(u'stateChanged(int)'), self.updateTextFormat)
+ QtCore.QObject.connect(self.copyHtmlButton,
+ QtCore.SIGNAL(u'clicked()'), self.copyHtmlText)
self.updatePreviewText()
def updatePreviewText(self):
@@ -150,11 +146,18 @@ class PrintServiceOrderForm(QtGui.QDialog, Ui_PrintServiceOrderDialog):
self.document.print_(printer)
def copyText(self):
- if self.copyMetaDataCheckBox.isChecked():
- self.parent.clipboard.setText(self.document.toHtml())
- else:
- self.parent.clipboard.setText(self.document.toPlainText())
- self.accept()
+ """
+ Copies the display text to the clipboard as plain text
+ """
+ self.parent.clipboard.setText(self.document.toPlainText())
+
+
+ def copyHtmlText(self):
+ """
+ Copies the display text to the clipboard as Html
+ """
+ self.parent.clipboard.setText(self.document.toHtml())
+
def printServiceOrder(self):
"""
@@ -200,8 +203,6 @@ class PrintServiceOrderForm(QtGui.QDialog, Ui_PrintServiceOrderDialog):
QtCore.QVariant(self.printMetaDataCheckBox.isChecked()))
settings.setValue(u'print notes',
QtCore.QVariant(self.printNotesCheckBox.isChecked()))
- settings.setValue(u'html copy',
- QtCore.QVariant(self.copyMetaDataCheckBox.isChecked()))
settings.endGroup()
# Close the dialog.
return QtGui.QDialog.accept(self)
diff --git a/resources/forms/printserviceorderdialog.ui b/resources/forms/printserviceorderdialog.ui
index 131979b65..f95aff17b 100644
--- a/resources/forms/printserviceorderdialog.ui
+++ b/resources/forms/printserviceorderdialog.ui
@@ -7,197 +7,221 @@
0
0
494
- 426
+ 434
Dialog
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Service Title:
-
-
-
-
-
- -
-
-
- Include slide text if avaialbe
-
-
-
- -
-
-
- Include service item notes
-
-
-
- -
-
-
- Include play lenght of media items
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- <b>Custom Notes:</b>
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- Cancel
-
-
-
- -
-
-
- Print
-
-
-
-
-
- -
-
-
-
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- ...
-
-
-
- :/general/general_zoom_out.png:/general/general_zoom_out.png
-
-
-
- -
-
-
-
- :/general/general_zoom_in.png:/general/general_zoom_in.png
-
-
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
- Preview:
-
-
-
- -
-
-
- true
-
-
-
- 0
- 0
-
-
-
-
- 0
- 0
-
-
-
-
-
-
-
-
-
-
+
+
+
+ 4
+ 4
+ 491
+ 432
+
+
+
+ -
+
+
-
+
+
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Service Title:
+
+
+
+
+
+ -
+
+
+ Include slide text if avaialbe
+
+
+
+ -
+
+
+ Include service item notes
+
+
+
+ -
+
+
+ Include play lenght of media items
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+ <b>Custom Notes:</b>
+
+
+
+ -
+
+
+
+
+ -
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ ...
+
+
+
+ :/general/general_zoom_out.png:/general/general_zoom_out.png
+
+
+
+ -
+
+
+
+ :/general/general_zoom_in.png:/general/general_zoom_in.png
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Preview:
+
+
+
+ -
+
+
+ true
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+ spacer_3
+
+
+
+
+
+
+ -
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ Cancel
+
+
+
+ -
+
+
+ Cancel
+
+
+
+ -
+
+
+ Cancel
+
+
+
+ -
+
+
+ Print
+
+
+
+
+
+
+