From 0f98c4fd8fe74481a2b2694262d73811769408e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Armin=20K=C3=B6hler?= <orangeshirt@web.de>
Date: Wed, 25 May 2011 22:20:17 +0200
Subject: [PATCH] change behaviour if "Cancel" button is pushed.

---
 .../plugins/bibles/forms/bibleupgradeform.py  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/openlp/plugins/bibles/forms/bibleupgradeform.py b/openlp/plugins/bibles/forms/bibleupgradeform.py
index 3ddf66f10..b210b7c95 100644
--- a/openlp/plugins/bibles/forms/bibleupgradeform.py
+++ b/openlp/plugins/bibles/forms/bibleupgradeform.py
@@ -110,12 +110,7 @@ class BibleUpgradeForm(OpenLPWizard):
         Stop the wizard on cancel button, close button or ESC key.
         """
         log.debug(u'Wizard cancelled by user')
-        if self.currentPage() == self.progressPage:
-            Receiver.send_message(u'openlp_stop_wizard')
-            for bible in self.newbibles.itervalues():
-                delete_database(self.path, clean_filename(
-                    bible.get_name())) 
-        self.done(QtGui.QDialog.Rejected)
+        self.stop_import_flag = True
 
     def onCurrentIdChanged(self, pageId):
         """
@@ -133,7 +128,7 @@ class BibleUpgradeForm(OpenLPWizard):
         Some cleanup while finishing
         """
         for number, filename in enumerate(self.files):
-            if self.success[number]:
+            if number in self.success and self.success[number] == True:
                 delete_file(os.path.join(self.path, filename))
 
     def customInit(self):
@@ -440,6 +435,7 @@ class BibleUpgradeForm(OpenLPWizard):
         number = 0
         for biblenumber, filename in enumerate(self.files):
             if self.stop_import_flag:
+                bible_failed = True
                 break
             bible_failed = False
             self.success[biblenumber] = False
@@ -536,6 +532,7 @@ class BibleUpgradeForm(OpenLPWizard):
                 self.progressBar.setMaximum(len(books))
                 for book in books:
                     if self.stop_import_flag:
+                        bible_failed = True
                         break
                     self.incrementProgressBar(unicode(translate(
                         'BiblesPlugin.UpgradeWizardForm', 
@@ -579,6 +576,7 @@ class BibleUpgradeForm(OpenLPWizard):
                 self.progressBar.setMaximum(len(books))
                 for book in books:
                     if self.stop_import_flag:
+                        bible_failed = True
                         break
                     self.incrementProgressBar(unicode(translate(
                         'BiblesPlugin.UpgradeWizardForm', 
@@ -624,15 +622,17 @@ class BibleUpgradeForm(OpenLPWizard):
                     'Upgrading Bible %s of %s: "%s"\nFailed')) % 
                     (number+1, self.maxBibles, name), 
                     self.progressBar.maximum()-self.progressBar.value())
+                delete_database(self.path, 
+                    clean_filename(self.newbibles[number].get_name()))
             number += 1
         self.mediaItem.reloadBibles()
         successful_import = 0
         failed_import = 0
-        for number, success in self.success.iteritems():
-            if success == True:
+        for number, filename in enumerate(self.files):
+        #for number, success in self.success.iteritems():
+            if number in self.success and self.success[number] == True:
                 successful_import += 1
-            elif success == False and self.checkBox[number].checkState() == \
-                QtCore.Qt.Checked:
+            elif self.checkBox[number].checkState() == QtCore.Qt.Checked:
                 failed_import += 1
         if failed_import > 0:
             failed_import_text = unicode(translate(