don't show deck browser when quitting

This commit is contained in:
Damien Elmes 2011-03-23 10:49:42 +09:00
parent b6844ba817
commit ccd49ece47

View file

@ -92,9 +92,6 @@ class AnkiQt(QMainWindow):
def _deckBrowserState(self, oldState): def _deckBrowserState(self, oldState):
# shouldn't call this directly; call close # shouldn't call this directly; call close
self.deck = None
self.currentCard = None
self.lastCard = None
self.disableDeckMenuItems() self.disableDeckMenuItems()
self.closeAllDeckWindows() self.closeAllDeckWindows()
self.deckBrowser.show() self.deckBrowser.show()
@ -569,23 +566,17 @@ Debug info:\n%s""") % traceback.format_exc(), help="DeckErrors")
else: else:
self.app.activeWindow().close() self.app.activeWindow().close()
def close(self, hideWelcome=False, parent=None): def close(self, showBrowser=True):
"(Auto)save and close. Prompt if necessary. True if okay to proceed." "(Auto)save and close. Prompt if necessary. True if okay to proceed."
if not self.deck:
return
# allow any focusOut()s to run first # allow any focusOut()s to run first
self.setFocus() self.setFocus()
if not parent:
parent = self
self.hideWelcome = hideWelcome
self.closeAllDeckWindows() self.closeAllDeckWindows()
synced = False self.deck.close()
if self.deck is not None: self.deck = None
# save and close if showBrowser:
self.deck.close()
self.deck = None
if not hideWelcome and not synced:
self.moveToState("deckBrowser") self.moveToState("deckBrowser")
self.hideWelcome = False
return True
def inMainWindow(self): def inMainWindow(self):
if not self.app.activeWindow(): if not self.app.activeWindow():
@ -854,9 +845,9 @@ your deck."""))
if self.state == "editCurrentFact": if self.state == "editCurrentFact":
event.ignore() event.ignore()
return self.moveToState("saveEdit") return self.moveToState("saveEdit")
self.close() self.close(showBrowser=False)
if self.config['syncOnProgramOpen']: if self.config['syncOnProgramOpen']:
self.hideWelcome = True self.showBrowser = False
self.syncDeck(interactive=False) self.syncDeck(interactive=False)
self.prepareForExit() self.prepareForExit()
event.accept() event.accept()
@ -1652,7 +1643,7 @@ Are you sure?""" % deckName),
self.form.buttonStack.show() self.form.buttonStack.show()
try: try:
try: try:
if self.hideWelcome: if not self.showBrowser:
# no deck load & no deck browser, as we're about to quit or do # no deck load & no deck browser, as we're about to quit or do
# something manually # something manually
pass pass