fix bugs introduced in previous #472 fix
This commit is contained in:
parent
827ed998ea
commit
8fc4dcd50d
@ -52,6 +52,10 @@ class CardLayout(QDialog):
|
|||||||
self.redrawing = True
|
self.redrawing = True
|
||||||
self.updateTabs()
|
self.updateTabs()
|
||||||
self.redrawing = False
|
self.redrawing = False
|
||||||
|
idx = self.ord
|
||||||
|
if idx >= len(self.cards):
|
||||||
|
idx = len(self.cards) - 1
|
||||||
|
self.selectCard(idx)
|
||||||
|
|
||||||
def setupTabs(self):
|
def setupTabs(self):
|
||||||
c = self.connect
|
c = self.connect
|
||||||
@ -175,14 +179,15 @@ Please create a new card type first."""))
|
|||||||
##########################################################################
|
##########################################################################
|
||||||
|
|
||||||
def selectCard(self, idx):
|
def selectCard(self, idx):
|
||||||
|
if self.tabs.currentIndex() == idx:
|
||||||
|
# trigger a re-read
|
||||||
|
self.onCardSelected(idx)
|
||||||
|
else:
|
||||||
self.tabs.setCurrentIndex(idx)
|
self.tabs.setCurrentIndex(idx)
|
||||||
|
|
||||||
def onCardSelected(self, idx):
|
def onCardSelected(self, idx):
|
||||||
if self.redrawing:
|
if self.redrawing:
|
||||||
return
|
return
|
||||||
self.ord = idx
|
|
||||||
if idx >= len(self.cards):
|
|
||||||
idx = len(self.cards) - 1
|
|
||||||
self.card = self.cards[idx]
|
self.card = self.cards[idx]
|
||||||
self.tab = self.forms[idx]
|
self.tab = self.forms[idx]
|
||||||
self.tabs.setCurrentIndex(idx)
|
self.tabs.setCurrentIndex(idx)
|
||||||
@ -289,8 +294,8 @@ Please create a new card type first."""))
|
|||||||
t['qfmt'] = "%s<br>\n%s" % (_("Edit to customize"), old['qfmt'])
|
t['qfmt'] = "%s<br>\n%s" % (_("Edit to customize"), old['qfmt'])
|
||||||
t['afmt'] = old['afmt']
|
t['afmt'] = old['afmt']
|
||||||
self.mm.addTemplate(self.model, t)
|
self.mm.addTemplate(self.model, t)
|
||||||
|
self.ord = len(self.cards)
|
||||||
self.redraw()
|
self.redraw()
|
||||||
self.selectCard(t['ord'])
|
|
||||||
|
|
||||||
def onFlip(self):
|
def onFlip(self):
|
||||||
old = self.card.template()
|
old = self.card.template()
|
||||||
|
Loading…
Reference in New Issue
Block a user