add loadDeck hook, fix hideWelcome behaviour

- if hideWelcome is true after a sync, do nothing at all
- make sure to reset hideWelcome on deck load
This commit is contained in:
Damien Elmes 2010-07-27 16:59:04 +09:00
parent 18c8d6766d
commit 7a510cc111

View file

@ -711,6 +711,7 @@ new:
if not os.path.exists(deckPath): if not os.path.exists(deckPath):
self.moveToState("noDeck") self.moveToState("noDeck")
return return
self.hideWelcome = False
try: try:
self.deck = DeckStorage.Deck(deckPath) self.deck = DeckStorage.Deck(deckPath)
except Exception, e: except Exception, e:
@ -754,6 +755,7 @@ Debug info:\n%s""") % traceback.format_exc(), help="DeckErrors")
self.deck = None self.deck = None
return 0 return 0
self.moveToState("noDeck") self.moveToState("noDeck")
runHook("loadDeck")
return True return True
def maybeLoadLastDeck(self, args): def maybeLoadLastDeck(self, args):
@ -2224,8 +2226,16 @@ Are you sure?""" % deckName),
def onSyncFinished(self): def onSyncFinished(self):
"Reopen after sync finished." "Reopen after sync finished."
self.mainWin.buttonStack.show() self.mainWin.buttonStack.show()
if self.hideWelcome:
# no deck load & no deck browser, as we're about to quit or do
# something manually
pass
else:
if self.loadAfterSync == -1: if self.loadAfterSync == -1:
print self.hideWelcome
# after sync all, so refresh browser list # after sync all, so refresh browser list
self.browserLastRefreshed = 0
self.moveToState("noDeck") self.moveToState("noDeck")
elif self.loadAfterSync: elif self.loadAfterSync:
if self.loadAfterSync == 2: if self.loadAfterSync == 2:
@ -2240,7 +2250,7 @@ Are you sure?""" % deckName),
self.deck.syncName = self.syncName self.deck.syncName = self.syncName
self.deck.s.flush() self.deck.s.flush()
self.deck.s.commit() self.deck.s.commit()
elif not self.hideWelcome: else:
self.moveToState("noDeck") self.moveToState("noDeck")
self.deckPath = None self.deckPath = None
self.syncFinished = True self.syncFinished = True