rimach has proposed merging lp:~crichter/openlp/bugfixing into lp:openlp.
Requested reviews:
Raoul Snyman (raoul-snyman)
For more details, see:
https://code.launchpad.net/~crichter/openlp/bugfixing/+merge/44711
- 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/44711
Your team OpenLP Core is subscribed to branch 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-26 21:02:57 +0000
@@ -90,6 +90,7 @@
len(self.import_source))
for file in self.import_source:
# TODO: check that it is a valid SongBeamer file
+ self.set_defaults()
self.current_verse = u''
self.current_verse_type = u'V'
read_verses = False
@@ -105,6 +106,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()
@@ -129,7 +132,8 @@
if self.current_verse:
self.replace_html_tags()
self.add_verse(self.current_verse, self.current_verse_type)
- self.finish()
+ if self.check_complete():
+ self.finish()
self.import_wizard.incrementProgressBar(u'%s %s...' %
(translate('SongsPlugin.SongBeamerImport', 'Importing'),
self.file_name))
=== 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-26 21:02:57 +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
