GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-20 06:52:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

fix progress window getting stuck on ubuntu 16.10

Browse source 
https://anki.tenderapp.com/discussions/beta-testing/231-anki-210-alpha-9#comment_41810358
This commit is contained in:
Damien Elmes 2017-01-25 16:50:57 +10:00
parent 6ae21e86af
commit 9ed315cbb7
1 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
aqt/progress.py
View file

@ -118,9 +118,7 @@ Your pysqlite2 is too old. Anki will appear frozen during long operations.""")
# by the db handler # by the db handler
self._win.setMinimumDuration(100000) self._win.setMinimumDuration(100000)
if immediate: if immediate:
self._shown = True self._showWin()
self._win.show()
self.app.processEvents()
else: else:
self._shown = False self._shown = False
self._counter = min self._counter = min
@ -128,7 +126,6 @@ Your pysqlite2 is too old. Anki will appear frozen during long operations.""")
self._max = max self._max = max
self._firstTime = time.time() self._firstTime = time.time()
self._lastUpdate = time.time() self._lastUpdate = time.time()
self._disabled = False
return self._win return self._win
def update(self, label=None, value=None, process=True, maybeShow=True): def update(self, label=None, value=None, process=True, maybeShow=True):
@ -149,8 +146,7 @@ Your pysqlite2 is too old. Anki will appear frozen during long operations.""")
self._levels -= 1 self._levels -= 1
self._levels = max(0, self._levels) self._levels = max(0, self._levels)
if self._levels == 0 and self._win: if self._levels == 0 and self._win:
self._win.cancel() self._closeWin()
self._unsetBusy()
def clear(self): def clear(self):
"Restore the interface after an error." "Restore the interface after an error."
@ -166,16 +162,31 @@ Your pysqlite2 is too old. Anki will appear frozen during long operations.""")
return return
delta = time.time() - self._firstTime delta = time.time() - self._firstTime
if delta > 0.5: if delta > 0.5:
self._shown = True self._showWin()
def _showWin(self):
self._shown = time.time()
self._win.show() self._win.show()
self._setBusy() self._setBusy()
def _closeWin(self):
if self._shown:
while True:
# give the window system a second to present
# window before we close it again - fixes
# progress window getting stuck, especially
# on ubuntu 16.10+
elap = time.time() - self._shown
if elap >= 0.5:
break
self.app.processEvents(QEventLoop.ExcludeUserInputEvents)
self._win.cancel()
self._unsetBusy()
def _setBusy(self): def _setBusy(self):
self._disabled = True
self.mw.app.setOverrideCursor(QCursor(Qt.WaitCursor)) self.mw.app.setOverrideCursor(QCursor(Qt.WaitCursor))
def _unsetBusy(self): def _unsetBusy(self):
self._disabled = False
self.app.restoreOverrideCursor() self.app.restoreOverrideCursor()
def busy(self): def busy(self):