raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

fixed a bug with items like 'test.test.avi' not loading; added error message when aborting

Browse Source
This commit is contained in:
Andreas Preikschat 2011-02-01 11:06:56 +01:00
commit fbbeddd65d
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,7 +142,7 @@ class AdvancedTab(SettingsTab):
self.serviceOrderGroupBox.setTitle(translate('OpenLP.AdvancedTab', self.serviceOrderGroupBox.setTitle(translate('OpenLP.AdvancedTab',
'Service Order Print')) 'Service Order Print'))
self.detailedServicePrintCheckBox.setText(translate('OpenLP.AdvancedTab', self.detailedServicePrintCheckBox.setText(translate('OpenLP.AdvancedTab',
'Included detailed information')) 'Print slide texts and service item notes as well'))
# self.sharedDirGroupBox.setTitle( # self.sharedDirGroupBox.setTitle(
# translate('AdvancedTab', 'Central Data Store')) # translate('AdvancedTab', 'Central Data Store'))
# self.sharedCheckBox.setText( # self.sharedCheckBox.setText(

9
openlp/core/ui/servicemanager.py
View File

@ -856,7 +856,7 @@ class ServiceManager(QtGui.QWidget):
one it allows the item to be displayed. one it allows the item to be displayed.
""" """
if serviceItem.is_command(): 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: if type not in self.suffixes:
serviceItem.is_valid = False serviceItem.is_valid = False
@ -1188,16 +1188,19 @@ class ServiceManager(QtGui.QWidget):
Print a Service Order Sheet. Print a Service Order Sheet.
""" """
if not self.serviceItems: if not self.serviceItems:
criticalErrorMessageBox(
message=translate('OpenLP.ServiceManager',
'There is no service item in this service.'))
return return
printDialog = QtGui.QPrintDialog() printDialog = QtGui.QPrintDialog()
if not printDialog.exec_(): if not printDialog.exec_():
return return
text = u'<h1>%s</h1>' % translate('OpenLP.ServiceManager', text = u'<h2>%s</h2>' % translate('OpenLP.ServiceManager',
'Service Order Sheet') 'Service Order Sheet')
for item in self.serviceItems: for item in self.serviceItems:
item = item[u'service_item'] item = item[u'service_item']
# add the title # add the title
text += u'<h2><img src="%s" /> %s</h2>' % (item.icon, text += u'<h4><img src="%s" /> %s</h4>' % (item.icon,
item.get_display_title()) item.get_display_title())
if not QtCore.QSettings().value(u'advanced' + if not QtCore.QSettings().value(u'advanced' +
u'/detailed service print', QtCore.QVariant(True)).toBool(): u'/detailed service print', QtCore.QVariant(True)).toBool():