GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-24 16:56:36 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

remove 'building queue..', use reset(), remove rebuild=True

Browse source
This commit is contained in:
Damien Elmes 2008-11-15 19:13:07 +09:00
parent d149554bd1
commit fc8b3ab3f0
3 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ankiqt/ui/importing.py
View file

@ -134,7 +134,7 @@ class ImportDialog(QDialog):
self.file = None self.file = None
self.maybePreview() self.maybePreview()
self.parent.deck.updateAllPriorities() self.parent.deck.updateAllPriorities()
self.parent.rebuildQueue() self.parent.reset()
def setupMappingFrame(self): def setupMappingFrame(self):
# qt seems to have a bug with adding/removing from a grid, so we add # qt seems to have a bug with adding/removing from a grid, so we add

24
ankiqt/ui/main.py
View file

@ -105,18 +105,8 @@ class AnkiQt(QMainWindow):
self.deck.refresh() self.deck.refresh()
self.deck.updateAllPriorities() self.deck.updateAllPriorities()
self.deck.rebuildCounts() self.deck.rebuildCounts()
self.rebuildQueue() self.deck.rebuildQueue()
self.moveToState("initial")
def rebuildQueue(self):
# qt on mac is misbehaving
mac = sys.platform.startswith("darwin")
if not mac: self.setEnabled(False)
self.mainWin.mainText.clear()
self.mainWin.mainText.setHtml(_("<h1>Building revision queue..</h1>"))
self.app.processEvents()
self.deck.rebuildQueue()
if not mac: self.setEnabled(True)
self.moveToState("initial")
def moveToState(self, state): def moveToState(self, state):
t = time.time() t = time.time()
@ -413,7 +403,7 @@ class AnkiQt(QMainWindow):
if not os.path.exists(deckPath): if not os.path.exists(deckPath):
return return
try: try:
self.deck = DeckStorage.Deck(deckPath, rebuild=False) self.deck = DeckStorage.Deck(deckPath)
except (IOError, ImportError): except (IOError, ImportError):
return return
except DeckWrongFormatError, e: except DeckWrongFormatError, e:
@ -430,7 +420,7 @@ class AnkiQt(QMainWindow):
if self.syncDeck(interactive=False): if self.syncDeck(interactive=False):
return True return True
try: try:
self.rebuildQueue() self.reset()
except: except:
traceback.print_exc() traceback.print_exc()
if ui.utils.askUser(_( if ui.utils.askUser(_(
@ -440,7 +430,7 @@ class AnkiQt(QMainWindow):
self.onCheckDB() self.onCheckDB()
# try again # try again
try: try:
self.rebuildQueue() self.reset()
except: except:
ui.utils.showWarning( ui.utils.showWarning(
_("Unable to recover. Deck load failed.")) _("Unable to recover. Deck load failed."))
@ -1020,7 +1010,7 @@ class AnkiQt(QMainWindow):
self.deck.easyIntervalMin = 0.2083 self.deck.easyIntervalMin = 0.2083
self.deck.easyIntervalMax = 0.25 self.deck.easyIntervalMax = 0.25
self.deck.syncName = None self.deck.syncName = None
self.rebuildQueue() self.reset()
# Language handling # Language handling
########################################################################## ##########################################################################
@ -1488,7 +1478,7 @@ backup and then run this command again after syncing.""")
ret = _("Problems found:\n%s") % ret ret = _("Problems found:\n%s") % ret
ui.utils.showWarning(ret) ui.utils.showWarning(ret)
ret = False ret = False
self.rebuildQueue() self.reset()
return ret return ret
def onOptimizeDB(self): def onOptimizeDB(self):

3
ankiqt/ui/sync.py
View file

@ -86,8 +86,7 @@ class Sync(QThread):
return return
# reconnect # reconnect
try: try:
self.deck = DeckStorage.Deck(self.parent.deckPath, rebuild=False, self.deck = DeckStorage.Deck(self.parent.deckPath, backup=False)
backup=False, lock=True)
client = SyncClient(self.deck) client = SyncClient(self.deck)
client.setServer(proxy) client.setServer(proxy)
proxy.deckName = self.parent.syncName proxy.deckName = self.parent.syncName