raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

change behaviour if "Cancel" button is pushed.

This commit is contained in:
Armin Köhler 2011-05-25 22:20:17 +02:00
parent 175d6cebb2
commit 0f98c4fd8f
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
openlp/plugins/bibles/forms/bibleupgradeform.py
View File

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