mirror of
https://github.com/ankitects/anki.git
synced 2025-09-24 16:56:36 -04:00
turn off progress on error
This commit is contained in:
parent
ad159aec86
commit
383317d311
3 changed files with 8 additions and 6 deletions
|
@ -126,6 +126,7 @@ class ImportDialog(QDialog):
|
||||||
self.dialog.status.setText(msg)
|
self.dialog.status.setText(msg)
|
||||||
return
|
return
|
||||||
finally:
|
finally:
|
||||||
|
self.parent.deck.finishProgress()
|
||||||
self.parent.deck.setUndoEnd(n)
|
self.parent.deck.setUndoEnd(n)
|
||||||
txt = (
|
txt = (
|
||||||
_("Importing complete. %(num)d cards imported from %(file)s.\n") %
|
_("Importing complete. %(num)d cards imported from %(file)s.\n") %
|
||||||
|
@ -136,7 +137,6 @@ class ImportDialog(QDialog):
|
||||||
self.dialog.status.setText(txt)
|
self.dialog.status.setText(txt)
|
||||||
self.file = None
|
self.file = None
|
||||||
self.maybePreview()
|
self.maybePreview()
|
||||||
self.parent.deck.updateAllPriorities()
|
|
||||||
self.parent.reset()
|
self.parent.reset()
|
||||||
|
|
||||||
def setupMappingFrame(self):
|
def setupMappingFrame(self):
|
||||||
|
|
|
@ -1942,9 +1942,11 @@ day = :d""", d=yesterday)
|
||||||
title, min, max)
|
title, min, max)
|
||||||
|
|
||||||
def onUpdateProgress(self, label=None, value=None):
|
def onUpdateProgress(self, label=None, value=None):
|
||||||
|
if self.progressWin:
|
||||||
self.progressWin.update(label, value)
|
self.progressWin.update(label, value)
|
||||||
|
|
||||||
def onFinishProgress(self):
|
def onFinishProgress(self):
|
||||||
|
if self.progressWin:
|
||||||
self.progressWin.finish()
|
self.progressWin.finish()
|
||||||
self.progressWin = None
|
self.progressWin = None
|
||||||
|
|
||||||
|
|
|
@ -195,17 +195,17 @@ class ProgressWin(object):
|
||||||
self.diag.setAutoClose(False)
|
self.diag.setAutoClose(False)
|
||||||
self.diag.setAutoReset(False)
|
self.diag.setAutoReset(False)
|
||||||
self.diag.setMinimumDuration(0)
|
self.diag.setMinimumDuration(0)
|
||||||
self.diag.show()
|
|
||||||
self.counter = min
|
self.counter = min
|
||||||
self.min = min
|
self.min = min
|
||||||
self.max = max
|
self.max = max
|
||||||
self.lastTime = time.time()
|
self.lastTime = time.time()
|
||||||
self.app = QApplication.instance()
|
self.app = QApplication.instance()
|
||||||
|
self.diag.show()
|
||||||
self.app.processEvents()
|
self.app.processEvents()
|
||||||
|
|
||||||
def update(self, label=None, value=None):
|
def update(self, label=None, value=None):
|
||||||
self.app.processEvents()
|
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()
|
self.lastTime = time.time()
|
||||||
if label:
|
if label:
|
||||||
self.diag.setLabelText(label)
|
self.diag.setLabelText(label)
|
||||||
|
|
Loading…
Reference in a new issue