diff --git a/openlp/plugins/remotes/html/openlp.js b/openlp/plugins/remotes/html/openlp.js
index aac244dd5..9bf34a1cc 100644
--- a/openlp/plugins/remotes/html/openlp.js
+++ b/openlp/plugins/remotes/html/openlp.js
@@ -271,9 +271,15 @@ window.OpenLP = {
if (typeof value[0] !== "number"){
value[0] = OpenLP.escapeString(value[0])
}
+ var txt = "";
+ if (value[2].length > 0) {
+ txt = value[1] + " ( " + value[2] + " )";
+ } else {
+ txt = value[1];
+ }
ul.append($("
").append($("").attr("href", "#options")
.attr("data-rel", "dialog").attr("value", value[0])
- .click(OpenLP.showOptions).text(value[1])));
+ .click(OpenLP.showOptions).text(txt)));
});
}
ul.listview("refresh");
diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py
index d617d4941..6be8cb52c 100644
--- a/openlp/plugins/songs/forms/editsongform.py
+++ b/openlp/plugins/songs/forms/editsongform.py
@@ -178,7 +178,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog, RegistryProperties):
if invalid_verses:
valid = create_separated_list(verse_names)
if len(invalid_verses) > 1:
- msg = translate('SongsPlugin.EditSongForm', 'There are no verses corresponding to "%(invalid)s".'
+ msg = translate('SongsPlugin.EditSongForm', 'There are no verses corresponding to "%(invalid)s". '
'Valid entries are %(valid)s.\nPlease enter the verses separated by spaces.') % \
{'invalid': ', '.join(invalid_verses), 'valid': valid}
else:
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index c0c58ff90..75f8f54fd 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -115,7 +115,7 @@ class SongMediaItem(MediaManagerItem):
Is triggered when the songs config is updated
"""
log.debug('config_updated')
- self.search_as_you_type = Settings().value(self.settings_section + '/search as type')
+ self.search_as_you_type = Settings().value('advanced/search as type')
self.update_service_on_edit = Settings().value(self.settings_section + '/update service on edit')
self.add_song_from_service = Settings().value(self.settings_section + '/add song from service')
self.display_songbook = Settings().value(self.settings_section + '/display songbook')
@@ -590,4 +590,4 @@ class SongMediaItem(MediaManagerItem):
:param show_error: Is this an error?
"""
search_results = self.search_entire(string)
- return [[song.id, song.title] for song in search_results]
+ return [[song.id, song.title, song.alternate_title] for song in search_results]
diff --git a/openlp/plugins/songs/lib/openlyricsxml.py b/openlp/plugins/songs/lib/openlyricsxml.py
index 13be57350..5c6951dfd 100644
--- a/openlp/plugins/songs/lib/openlyricsxml.py
+++ b/openlp/plugins/songs/lib/openlyricsxml.py
@@ -121,17 +121,7 @@ class SongXML(object):
"""
self.song_xml = None
verse_list = []
- if not xml.startswith('')
- self.lyrics = etree.SubElement(self.song_xml, 'lyrics')
- verses = xml.split('\n\n')
- for count, verse in enumerate(verses):
- verse_list.append([{'type': 'v', 'label': str(count)}, str(verse)])
- self.add_verse_to_lyrics('v', str(count), verse)
- return verse_list
- elif xml.startswith('