rimach has proposed merging lp:~crichter/openlp/bugfixing into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
- Correct Signal slot connection for SongAddFromServiceCheckBox
- many Songbeamer Files dont use the title flag, instead of this they use the
file name as title
--
https://code.launchpad.net/~crichter/openlp/bugfixing/+merge/44196
Your team OpenLP Core is requested to review the proposed merge of
lp:~crichter/openlp/bugfixing into lp:openlp.
=== modified file 'openlp/plugins/songs/lib/songbeamerimport.py'
--- openlp/plugins/songs/lib/songbeamerimport.py 2010-12-13 14:24:16 +0000
+++ openlp/plugins/songs/lib/songbeamerimport.py 2010-12-20 08:09:12 +0000
@@ -105,6 +105,8 @@
infile.close()
else:
return False
+ self.title = self.file_name.split('.sng')[0]
+ read_verses = False
for line in self.songData:
# Just make sure that the line is of the type 'Unicode'.
line = unicode(line).strip()
=== modified file 'openlp/plugins/songs/lib/songstab.py'
--- openlp/plugins/songs/lib/songstab.py 2010-11-03 18:03:28 +0000
+++ openlp/plugins/songs/lib/songstab.py 2010-12-20 08:09:12 +0000
@@ -72,7 +72,7 @@
QtCore.QObject.connect(self.SongUpdateOnEditCheckBox,
QtCore.SIGNAL(u'stateChanged(int)'),
self.onSongUpdateOnEditCheckBoxChanged)
- QtCore.QObject.connect(self.SongBarActiveCheckBox,
+ QtCore.QObject.connect(self.SongAddFromServiceCheckBox,
QtCore.SIGNAL(u'stateChanged(int)'),
self.onSongAddFromServiceCheckBoxChanged)
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
