From 44b05747782ce8643aaa4c928424a62aa92c0bae Mon Sep 17 00:00:00 2001 From: rimach Date: Tue, 7 Dec 2010 23:47:02 +0100 Subject: [PATCH 1/3] fix for missing title field --- openlp/plugins/songs/lib/songbeamerimport.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openlp/plugins/songs/lib/songbeamerimport.py b/openlp/plugins/songs/lib/songbeamerimport.py index 8b07d2b32..0eb4927bc 100644 --- a/openlp/plugins/songs/lib/songbeamerimport.py +++ b/openlp/plugins/songs/lib/songbeamerimport.py @@ -99,13 +99,16 @@ class SongBeamerImport(SongImport): self.songData = infile.readlines() else: return False + self.title = self.file_name.split('.sng')[0] + self.read_verse = False for line in self.songData: line = line.strip() if line.startswith('#'): log.debug(u'find tag: %s' % line) if not self.parse_tags(line): return False - elif line.startswith('---'): + elif line.startswith('---') or \ + line.startswith('--'): log.debug(u'find ---') if len(self.current_verse) > 0: self.add_verse(self.current_verse, From 96ee7fb34391bfd5c7906ff98daea493e1b8ad41 Mon Sep 17 00:00:00 2001 From: rimach Date: Mon, 20 Dec 2010 08:50:39 +0100 Subject: [PATCH 2/3] correct SongTab Signal connection --- openlp/plugins/songs/lib/songstab.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/plugins/songs/lib/songstab.py b/openlp/plugins/songs/lib/songstab.py index 1ffb5bba6..7744a28d3 100644 --- a/openlp/plugins/songs/lib/songstab.py +++ b/openlp/plugins/songs/lib/songstab.py @@ -72,7 +72,7 @@ class SongsTab(SettingsTab): 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) From 2cb38c6ab876cd14c637146ddc656f34b372e199 Mon Sep 17 00:00:00 2001 From: rimach Date: Sun, 26 Dec 2010 21:55:40 +0100 Subject: [PATCH 3/3] add complete check --- openlp/plugins/songs/lib/songbeamerimport.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openlp/plugins/songs/lib/songbeamerimport.py b/openlp/plugins/songs/lib/songbeamerimport.py index b61f2ae5f..651d16a3d 100644 --- a/openlp/plugins/songs/lib/songbeamerimport.py +++ b/openlp/plugins/songs/lib/songbeamerimport.py @@ -90,6 +90,7 @@ class SongBeamerImport(SongImport): 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 @@ -131,7 +132,8 @@ class SongBeamerImport(SongImport): 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))