From 6b6da86c54cbd64b6044a2b30df7aaaa5ed6efc1 Mon Sep 17 00:00:00 2001
From: Philip Ridout <phill.ridout@googlemail.com>
Date: Fri, 27 Aug 2010 20:53:22 +0100
Subject: [PATCH] wow_import implemented in to import wizard bug fix in
 wizzard, so that it starts from the first page if used previously bux fix in
 importer, so that it resets the defualts after commiting a song to the db

---
 openlp/plugins/songs/forms/songimportform.py |  3 ++-
 openlp/plugins/songs/lib/importer.py         |  3 +++
 openlp/plugins/songs/lib/songimport.py       | 16 +++++++++-------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/openlp/plugins/songs/forms/songimportform.py b/openlp/plugins/songs/forms/songimportform.py
index 68bba299d..6fb6b38a0 100644
--- a/openlp/plugins/songs/forms/songimportform.py
+++ b/openlp/plugins/songs/forms/songimportform.py
@@ -160,7 +160,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_SongImportWizard):
                     self.openSongAddButton.setFocus()
                     return False
             elif source_format == SongFormat.WordsOfWorship:
-                if self.wordsOfWorshipListWidget.count() == 0:
+                if self.wordsOfWorshipFileListWidget.count() == 0:
                     QtGui.QMessageBox.critical(self,
                         translate('SongsPlugin.ImportWizardForm',
                             'No Words of Worship Files Selected'),
@@ -315,6 +315,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_SongImportWizard):
         pass
 
     def setDefaults(self):
+        self.restart()
         self.formatComboBox.setCurrentIndex(0)
         self.openLP2FilenameEdit.setText(u'')
         self.openLP1FilenameEdit.setText(u'')
diff --git a/openlp/plugins/songs/lib/importer.py b/openlp/plugins/songs/lib/importer.py
index 7410a5184..ae18f4389 100644
--- a/openlp/plugins/songs/lib/importer.py
+++ b/openlp/plugins/songs/lib/importer.py
@@ -29,6 +29,7 @@ from olpimport import OpenLPSongImport
 try:
     from sofimport import SofImport
     from oooimport import OooImport
+    from wowimport import WowImport
 except ImportError:
     pass
 
@@ -63,6 +64,8 @@ class SongFormat(object):
             return OpenSongImport
         elif format == SongFormat.SongsOfFellowship:
             return SofImport
+        elif format == SongFormat.WordsOfWorship:
+            return WowImport
         elif format == SongFormat.Generic:
             return OooImport
 #        else:
diff --git a/openlp/plugins/songs/lib/songimport.py b/openlp/plugins/songs/lib/songimport.py
index 2ffb0beda..84f0ffd93 100644
--- a/openlp/plugins/songs/lib/songimport.py
+++ b/openlp/plugins/songs/lib/songimport.py
@@ -52,6 +52,13 @@ class SongImport(QtCore.QObject):
         """
         self.manager = manager
         self.stop_import_flag = False
+        self.copyright_string = unicode(translate(
+            'SongsPlugin.SongImport', 'copyright'))
+        self.copyright_symbol = unicode(translate(
+            'SongsPlugin.SongImport', '\xa9'))
+        self.setDefaults()
+    
+    def setDefaults(self):
         self.title = u''
         self.song_number = u''
         self.alternate_title = u''
@@ -67,13 +74,7 @@ class SongImport(QtCore.QObject):
         self.verses = []
         self.versecount = 0
         self.choruscount = 0
-        self.copyright_string = unicode(translate(
-            'SongsPlugin.SongImport', 'copyright'))
-        self.copyright_symbol = unicode(translate(
-            'SongsPlugin.SongImport', '\xa9'))
-        QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'songs_stop_import'), self.stop_import)
-
+ 
     def stop_import(self):
         """
         Sets the flag for importers to stop their import
@@ -298,6 +299,7 @@ class SongImport(QtCore.QObject):
                 topic = Topic.populate(name=topictext)
             song.topics.append(topic)
         self.manager.save_object(song)
+        self.setDefaults()
 
     def print_song(self):
         """