openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/bible-importer into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  #644106 Bible import wizard only works once
  https://bugs.launchpad.net/bugs/644106


Fix for bug #644106
-- 
https://code.launchpad.net/~raoul-snyman/openlp/bible-importer/+merge/36181
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/bible-importer into lp:openlp.

=== modified file 'openlp/plugins/bibles/forms/importwizardform.py'
--- openlp/plugins/bibles/forms/importwizardform.py	2010-09-18 15:24:39 +0000
+++ openlp/plugins/bibles/forms/importwizardform.py	2010-09-21 18:18:40 +0000
@@ -290,6 +290,9 @@
     def setDefaults(self):
         settings = QtCore.QSettings()
         settings.beginGroup(self.bibleplugin.settingsSection)
+        self.restart()
+        self.finishButton.setVisible(False)
+        self.cancelButton.setVisible(True)
         self.setField(u'source_format', QtCore.QVariant(0))
         self.setField(u'osis_location', QtCore.QVariant(''))
         self.setField(u'csv_booksfile', QtCore.QVariant(''))

=== modified file 'openlp/plugins/songs/forms/songimportform.py'
--- openlp/plugins/songs/forms/songimportform.py	2010-09-20 18:22:57 +0000
+++ openlp/plugins/songs/forms/songimportform.py	2010-09-21 18:18:40 +0000
@@ -361,6 +361,8 @@
 
     def setDefaults(self):
         self.restart()
+        self.finishButton.setVisible(False)
+        self.cancelButton.setVisible(True)
         self.formatComboBox.setCurrentIndex(0)
         self.openLP2FilenameEdit.setText(u'')
         self.openLP1FilenameEdit.setText(u'')