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

Fix song loading and wildcard import 

bzr-revno: 906
This commit is contained in:
Jon Tibble 2010-07-02 11:37:16 +01:00
parent 32702d48a2 9e1474e851
commit 16ed2a3407
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/plugins/presentations/lib/pptviewcontroller.py
View File

@ -27,7 +27,7 @@ import os
import logging import logging
if os.name == u'nt': if os.name == u'nt':
from ctypes import * from ctypes import cdll
from ctypes.wintypes import RECT from ctypes.wintypes import RECT
from presentationcontroller import PresentationController, PresentationDocument from presentationcontroller import PresentationController, PresentationDocument

3
openlp/plugins/songs/lib/mediaitem.py
View File

@ -371,7 +371,8 @@ class SongMediaItem(MediaManagerItem):
author_list = author_list + unicode(author.display_name) author_list = author_list + unicode(author.display_name)
author_audit.append(unicode(author.display_name)) author_audit.append(unicode(author.display_name))
if song.ccli_number is None or len(song.ccli_number) == 0: if song.ccli_number is None or len(song.ccli_number) == 0:
ccli = self.parent.settings_form.GeneralTab.CCLINumber ccli = QtCore.QSettings().value(u'general/ccli number',
QtCore.QVariant(u'')).toString()
else: else:
ccli = unicode(song.ccli_number) ccli = unicode(song.ccli_number)
raw_footer.append(song.title) raw_footer.append(song.title)