diff --git a/openlp/core/ui/advancedtab.py b/openlp/core/ui/advancedtab.py index 10660a914..db6efcf4c 100644 --- a/openlp/core/ui/advancedtab.py +++ b/openlp/core/ui/advancedtab.py @@ -142,7 +142,7 @@ class AdvancedTab(SettingsTab): self.serviceOrderGroupBox.setTitle(translate('OpenLP.AdvancedTab', 'Service Order Print')) self.detailedServicePrintCheckBox.setText(translate('OpenLP.AdvancedTab', - 'Included detailed information')) + 'Print slide texts and service item notes as well')) # self.sharedDirGroupBox.setTitle( # translate('AdvancedTab', 'Central Data Store')) # self.sharedCheckBox.setText( diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 6b0b84472..81599085b 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -856,7 +856,7 @@ class ServiceManager(QtGui.QWidget): one it allows the item to be displayed. """ if serviceItem.is_command(): - type = serviceItem._raw_frames[0][u'title'].split(u'.')[1] + type = serviceItem._raw_frames[0][u'title'].split(u'.')[-1] if type not in self.suffixes: serviceItem.is_valid = False @@ -1188,16 +1188,19 @@ class ServiceManager(QtGui.QWidget): Print a Service Order Sheet. """ if not self.serviceItems: + criticalErrorMessageBox( + message=translate('OpenLP.ServiceManager', + 'There is no service item in this service.')) return printDialog = QtGui.QPrintDialog() if not printDialog.exec_(): return - text = u'

%s

' % translate('OpenLP.ServiceManager', + text = u'

%s

' % translate('OpenLP.ServiceManager', 'Service Order Sheet') for item in self.serviceItems: item = item[u'service_item'] # add the title - text += u'

%s

' % (item.icon, + text += u'

%s

' % (item.icon, item.get_display_title()) if not QtCore.QSettings().value(u'advanced' + u'/detailed service print', QtCore.QVariant(True)).toBool():