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

Head

Browse Source
This commit is contained in:
Jonathan Corwin 2010-07-22 08:24:23 +01:00
commit 641803a1fa
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,7 @@ import os
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import MediaManagerItem, BaseListWithDnD, build_icon, \ from openlp.core.lib import MediaManagerItem, BaseListWithDnD, build_icon, \
SettingsManager, translate, check_item_selected, Receiver SettingsManager, translate, check_item_selected, Receiver
from openlp.plugins.presentations.lib import MessageListener from openlp.plugins.presentations.lib import MessageListener
log = logging.getLogger(__name__) log = logging.getLogger(__name__)

6
openlp/plugins/songs/lib/olpimport.py
View File

@ -140,7 +140,11 @@ class OpenLPSongImport(object):
if has_media_files: if has_media_files:
new_song.alternate_title = song.alternate_title new_song.alternate_title = song.alternate_title
else: else:
new_song.alternate_title = u'' old_titles = song.search_title.split(u'@')
if len(old_titles) > 1:
new_song.alternate_title = old_titles[1]
else:
new_song.alternate_title = u''
new_song.search_title = song.search_title new_song.search_title = song.search_title
new_song.song_number = song.song_number new_song.song_number = song.song_number
new_song.lyrics = song.lyrics new_song.lyrics = song.lyrics