turn off progress on error

This commit is contained in:
Damien Elmes 2009-01-16 20:22:04 +09:00
parent ad159aec86
commit 383317d311
3 changed files with 8 additions and 6 deletions

View file

@ -126,6 +126,7 @@ class ImportDialog(QDialog):
self.dialog.status.setText(msg)
return
finally:
self.parent.deck.finishProgress()
self.parent.deck.setUndoEnd(n)
txt = (
_("Importing complete. %(num)d cards imported from %(file)s.\n") %
@ -136,7 +137,6 @@ class ImportDialog(QDialog):
self.dialog.status.setText(txt)
self.file = None
self.maybePreview()
self.parent.deck.updateAllPriorities()
self.parent.reset()
def setupMappingFrame(self):

View file

@ -1942,11 +1942,13 @@ day = :d""", d=yesterday)
title, min, max)
def onUpdateProgress(self, label=None, value=None):
self.progressWin.update(label, value)
if self.progressWin:
self.progressWin.update(label, value)
def onFinishProgress(self):
self.progressWin.finish()
self.progressWin = None
if self.progressWin:
self.progressWin.finish()
self.progressWin = None
# Advanced features
##########################################################################

View file

@ -195,17 +195,17 @@ class ProgressWin(object):
self.diag.setAutoClose(False)
self.diag.setAutoReset(False)
self.diag.setMinimumDuration(0)
self.diag.show()
self.counter = min
self.min = min
self.max = max
self.lastTime = time.time()
self.app = QApplication.instance()
self.diag.show()
self.app.processEvents()
def update(self, label=None, value=None):
self.app.processEvents()
print self.min, self.counter, self.max, label, time.time() - self.lastTime
#print self.min, self.counter, self.max, label, time.time() - self.lastTime
self.lastTime = time.time()
if label:
self.diag.setLabelText(label)