GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-12-14 07:10:59 -05:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

update fields on focus change

Browse source
This commit is contained in:
Damien Elmes 2008-10-20 00:00:17 +09:00
parent 96e88468b7
commit a61d8d916a
9 changed files with 84 additions and 150 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ankiqt/ui/addcards.py
View file

@ -34,8 +34,6 @@ class AddCards(QDialog):
self.editor = ui.facteditor.FactEditor(self, self.editor = ui.facteditor.FactEditor(self,
self.dialog.fieldsArea, self.dialog.fieldsArea,
self.parent.deck) self.parent.deck)
self.editor.onFactValid = self.onValid
self.editor.onFactInvalid = self.onInvalid
def addChooser(self): def addChooser(self):
self.modelChooser = ui.modelchooser.ModelChooser(self, self.modelChooser = ui.modelchooser.ModelChooser(self,
@ -48,7 +46,7 @@ class AddCards(QDialog):
QDesktopServices.openUrl(QUrl(ankiqt.appWiki + "AddFacts")) QDesktopServices.openUrl(QUrl(ankiqt.appWiki + "AddFacts"))
def addButtons(self): def addButtons(self):
self.addButton = QPushButton(_("&Add cards")) self.addButton = QPushButton(_("&Add"))
self.dialog.buttonBox.addButton(self.addButton, self.dialog.buttonBox.addButton(self.addButton,
QDialogButtonBox.ActionRole) QDialogButtonBox.ActionRole)
self.addButton.setShortcut(_("Ctrl+Return")) self.addButton.setShortcut(_("Ctrl+Return"))
@ -81,15 +79,20 @@ class AddCards(QDialog):
# set the new fact # set the new fact
self.editor.setFact(fact, check=True) self.editor.setFact(fact, check=True)
def onValid(self, fact):
self.addButton.setEnabled(True)
def onInvalid(self, fact):
self.addButton.setEnabled(False)
def addCards(self): def addCards(self):
# make sure updated
w = self.editor.focusedEdit()
self.addButton.setFocus()
fact = self.editor.fact fact = self.editor.fact
try:
cards = self.parent.deck.addFact(fact) cards = self.parent.deck.addFact(fact)
except FactInvalidError:
ui.utils.showInfo(_(
"Some fields are missing or not unique."),
parent=self, help="AddItems#AddError")
if w:
w.setFocus()
return
if not cards: if not cards:
ui.utils.showWarning(_("""\ ui.utils.showWarning(_("""\
The input you have provided would make an empty The input you have provided would make an empty

6
ankiqt/ui/cardlist.py
View file

@ -361,7 +361,7 @@ class EditDeck(QDialog):
self.updateSearch() self.updateSearch()
def updateFilterLabel(self): def updateFilterLabel(self):
self.setWindowTitle(_("Anki - Edit Deck (%(cur)d " self.setWindowTitle(_("Anki - Edit Items (%(cur)d "
"of %(tot)d cards shown)") % "of %(tot)d cards shown)") %
{"cur": len(self.model.cards), {"cur": len(self.model.cards),
"tot": self.deck.cardCount()}) "tot": self.deck.cardCount()})
@ -501,11 +501,15 @@ where id in (%s)""" % ",".join([
self.dialog.tableView.setEnabled(True) self.dialog.tableView.setEnabled(True)
self.dialog.searchGroup.setEnabled(True) self.dialog.searchGroup.setEnabled(True)
self.dialog.sortGroup.setEnabled(True) self.dialog.sortGroup.setEnabled(True)
self.dialog.actionGroup.setEnabled(True)
self.dialog.cardInfoGroup.setEnabled(True)
def onFactInvalid(self, fact): def onFactInvalid(self, fact):
self.dialog.tableView.setEnabled(False) self.dialog.tableView.setEnabled(False)
self.dialog.searchGroup.setEnabled(False) self.dialog.searchGroup.setEnabled(False)
self.dialog.sortGroup.setEnabled(False) self.dialog.sortGroup.setEnabled(False)
self.dialog.actionGroup.setEnabled(False)
self.dialog.cardInfoGroup.setEnabled(False)
def rowChanged(self, current, previous): def rowChanged(self, current, previous):
self.currentRow = current self.currentRow = current

55
ankiqt/ui/facteditor.py
View file

@ -23,7 +23,6 @@ class FactEditor(object):
self.fact = None self.fact = None
self.fontChanged = False self.fontChanged = False
self.setupFields() self.setupFields()
self.checkTimer = None
self.onChange = None self.onChange = None
self.onFactValid = None self.onFactValid = None
self.onFactInvalid = None self.onFactInvalid = None
@ -169,7 +168,6 @@ class FactEditor(object):
self.fieldsFrame = None self.fieldsFrame = None
self.widget.setLayout(self.fieldsBox) self.widget.setLayout(self.fieldsBox)
self.updatingFields = False
def _makeGrid(self): def _makeGrid(self):
"Rebuild the grid to avoid trigging QT bugs." "Rebuild the grid to avoid trigging QT bugs."
@ -202,25 +200,19 @@ class FactEditor(object):
self.fieldsGrid.addWidget(w, n, 1) self.fieldsGrid.addWidget(w, n, 1)
self.fields[field.name] = (field, w) self.fields[field.name] = (field, w)
# catch changes # catch changes
w.connect(w, SIGNAL("textChanged()"), w.connect(w, SIGNAL("lostFocus"),
lambda f=field, w=w: self.fieldChanged(f, w)) lambda f=field, w=w: self.lostFocus(f, w))
w.connect(w, SIGNAL("currentCharFormatChanged(QTextCharFormat)"), w.connect(w, SIGNAL("currentCharFormatChanged(QTextCharFormat)"),
lambda w=w: self.formatChanged(w)) lambda w=w: self.formatChanged(w))
n += 1 n += 1
# tags # tags
self.fieldsGrid.addWidget(QLabel(_("Tags")), n, 0) self.fieldsGrid.addWidget(QLabel(_("Tags")), n, 0)
self.tags = ui.tagedit.TagEdit(self.parent) self.tags = ui.tagedit.TagEdit(self.parent)
self.tags.connect(self.tags, SIGNAL("textChanged(QString)"), self.tags.connect(self.tags, SIGNAL("lostFocus"),
self.onTagChange) self.onTagChange)
# update available tags # update available tags
self.tags.setDeck(self.deck) self.tags.setDeck(self.deck)
self.fieldsGrid.addWidget(self.tags, n, 1) self.fieldsGrid.addWidget(self.tags, n, 1)
# status warning
n += 1
self.warning = QLabel()
self.warning.setFixedHeight(20)
self.warning.setOpenExternalLinks(True)
self.fieldsGrid.addWidget(self.warning, n, 1)
# update fields # update fields
self.updateFields(check) self.updateFields(check)
self.parent.setUpdatesEnabled(True) self.parent.setUpdatesEnabled(True)
@ -236,7 +228,6 @@ class FactEditor(object):
def updateFields(self, check=True, font=True): def updateFields(self, check=True, font=True):
"Update field text (if changed) and font/colours." "Update field text (if changed) and font/colours."
self.updatingFields = True
# text # text
for (name, (field, w)) in self.fields.items(): for (name, (field, w)) in self.fields.items():
new = self.fact[name] new = self.fact[name]
@ -261,13 +252,10 @@ class FactEditor(object):
self.tags.blockSignals(True) self.tags.blockSignals(True)
self.tags.setText(self.fact.tags) self.tags.setText(self.fact.tags)
self.tags.blockSignals(False) self.tags.blockSignals(False)
self.updatingFields = False
if check: if check:
self.checkValid() self.checkValid()
def fieldChanged(self, field, widget): def lostFocus(self, field, widget):
if self.updatingFields:
return
value = tidyHTML(unicode(widget.toHtml())) value = tidyHTML(unicode(widget.toHtml()))
if value and not value.strip(): if value and not value.strip():
widget.setText("") widget.setText("")
@ -278,24 +266,11 @@ class FactEditor(object):
self.fact.onKeyPress(field, value) self.fact.onKeyPress(field, value)
# the keypress handler may have changed something, so update all # the keypress handler may have changed something, so update all
self.updateFields(font=False) self.updateFields(font=False)
self.checkValid()
if self.onChange: if self.onChange:
self.onChange(field) self.onChange(field)
self.scheduleCheck()
self.formatChanged(None) self.formatChanged(None)
def scheduleCheck(self):
if not self.deck:
return
interval = 200
if self.checkTimer:
self.checkTimer.setInterval(interval)
else:
self.checkTimer = QTimer(self.parent)
self.checkTimer.setSingleShot(True)
self.checkTimer.start(interval)
self.parent.connect(self.checkTimer, SIGNAL("timeout()"),
self.checkValid)
def checkValid(self): def checkValid(self):
empty = [] empty = []
dupe = [] dupe = []
@ -313,7 +288,6 @@ class FactEditor(object):
else: else:
p.setColor(QPalette.Base, QColor("#ffffff")) p.setColor(QPalette.Base, QColor("#ffffff"))
self.fields[field.name][1].setPalette(p) self.fields[field.name][1].setPalette(p)
self.checkTimer = None
# call relevant hooks # call relevant hooks
invalid = len(empty+dupe) invalid = len(empty+dupe)
if self.factState != "valid" and not invalid: if self.factState != "valid" and not invalid:
@ -324,20 +298,9 @@ class FactEditor(object):
if self.onFactInvalid: if self.onFactInvalid:
self.onFactInvalid(self.fact) self.onFactInvalid(self.fact)
self.factState = "invalid" self.factState = "invalid"
if invalid:
self.warning.setText(_(
"Some fields are "
"<a href=http://ichi2.net/anki/wiki/Key_Terms_and_Concepts"
"#head-6ba367d55922a618ab147debfbac98635d1a4dc2>missing</a>"
" or not "
"<a href=http://ichi2.net/anki/wiki/Key_Terms_and_Concepts"
"#head-0c33560cb828fde1c19af1cd260388457b57812a>unique</a>."))
else:
self.warning.setText(_("All fields valid"))
def onTagChange(self, text): def onTagChange(self):
if not self.updatingFields: self.fact.tags = unicode(self.tags.text())
self.fact.tags = unicode(text)
if self.onChange: if self.onChange:
self.onChange(None) self.onChange(None)
self.fact.setModified(textChanged=True) self.fact.setModified(textChanged=True)
@ -503,11 +466,15 @@ class FactEdit(QTextEdit):
html = re.sub("\s\s+", " ", html).strip() html = re.sub("\s\s+", " ", html).strip()
return html return html
def leaveEvent(self, evt):
QTextEdit.leaveEvent(self, evt)
def focusOutEvent(self, evt): def focusOutEvent(self, evt):
QTextEdit.focusOutEvent(self, evt) QTextEdit.focusOutEvent(self, evt)
self.parent.lastFocusedEdit = self self.parent.lastFocusedEdit = self
self.parent.resetFormatButtons() self.parent.resetFormatButtons()
self.parent.disableButtons() self.parent.disableButtons()
self.emit(SIGNAL("lostFocus"))
# this shouldn't be necessary if/when we move away from kakasi # this shouldn't be necessary if/when we move away from kakasi
def mouseDoubleClickEvent(self, evt): def mouseDoubleClickEvent(self, evt):

3
ankiqt/ui/modelproperties.py
View file

@ -166,7 +166,8 @@ class ModelProperties(QDialog):
return return
if len(self.m.fieldModels) < 2: if len(self.m.fieldModels) < 2:
ui.utils.showInfo( ui.utils.showInfo(
_("Please add a new field first.")) _("Please add a new field first."),
parent=self)
return return
field = self.m.fieldModels[row] field = self.m.fieldModels[row]
count = self.deck.fieldModelUseCount(field) count = self.deck.fieldModelUseCount(field)

4
ankiqt/ui/tagedit.py
View file

@ -34,6 +34,10 @@ class TagEdit(QLineEdit):
else: else:
QLineEdit.keyPressEvent(self, evt) QLineEdit.keyPressEvent(self, evt)
def focusOutEvent(self, evt):
QLineEdit.focusOutEvent(self, evt)
self.emit(SIGNAL("lostFocus"))
class TagCompleter(QCompleter): class TagCompleter(QCompleter):
def __init__(self, *args): def __init__(self, *args):

18
ankiqt/ui/utils.py
View file

@ -7,17 +7,31 @@ from PyQt4.QtCore import *
import re, os import re, os
import ankiqt import ankiqt
def openLink(link):
QDesktopServices.openUrl(QUrl(link))
def openWikiLink(page):
openLink(ankiqt.appWiki + page)
def showWarning(text, parent=None): def showWarning(text, parent=None):
"Show a small warning with an OK button." "Show a small warning with an OK button."
if not parent: if not parent:
parent = ankiqt.mw parent = ankiqt.mw
QMessageBox.warning(parent, "Anki", text) QMessageBox.warning(parent, "Anki", text)
def showInfo(text, parent=None): def showInfo(text, parent=None, help=""):
"Show a small info window with an OK button." "Show a small info window with an OK button."
if not parent: if not parent:
parent = ankiqt.mw parent = ankiqt.mw
QMessageBox.information(parent, "Anki", text) sb = QMessageBox.Ok
if help:
sb |= QMessageBox.Help
while 1:
ret = QMessageBox.information(parent, "Anki", text, sb)
if ret == QMessageBox.Help:
openWikiLink(help)
else:
break
def askUser(text, parent=None): def askUser(text, parent=None):
"Show a yes/no question. Return true if yes." "Show a yes/no question. Return true if yes."

2
designer/addcards.ui
View file

@ -10,7 +10,7 @@
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
<string>Anki - Add Cards</string> <string>Anki - Add Items</string>
</property> </property>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<property name="spacing" > <property name="spacing" >

116
designer/cardlist.ui
View file

@ -13,25 +13,17 @@
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
<string>Anki - Edit Deck</string> <string>Anki - Edit Items</string>
</property> </property>
<property name="windowIcon" > <property name="windowIcon" >
<iconset resource="../icons.qrc" >:/icons/view_text.png</iconset> <iconset resource="../icons.qrc" >
<normaloff>:/icons/view_text.png</normaloff>:/icons/view_text.png</iconset>
</property> </property>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout" >
<property name="spacing" > <property name="spacing" >
<number>3</number> <number>3</number>
</property> </property>
<property name="leftMargin" > <property name="margin" >
<number>3</number>
</property>
<property name="topMargin" >
<number>3</number>
</property>
<property name="rightMargin" >
<number>3</number>
</property>
<property name="bottomMargin" >
<number>3</number> <number>3</number>
</property> </property>
<item> <item>
@ -39,16 +31,7 @@
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<property name="leftMargin" > <property name="margin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
@ -72,16 +55,7 @@
<property name="spacing" > <property name="spacing" >
<number>3</number> <number>3</number>
</property> </property>
<property name="leftMargin" > <property name="margin" >
<number>3</number>
</property>
<property name="topMargin" >
<number>3</number>
</property>
<property name="rightMargin" >
<number>3</number>
</property>
<property name="bottomMargin" >
<number>3</number> <number>3</number>
</property> </property>
<item> <item>
@ -113,16 +87,7 @@
<property name="spacing" > <property name="spacing" >
<number>3</number> <number>3</number>
</property> </property>
<property name="leftMargin" > <property name="margin" >
<number>3</number>
</property>
<property name="topMargin" >
<number>3</number>
</property>
<property name="rightMargin" >
<number>3</number>
</property>
<property name="bottomMargin" >
<number>3</number> <number>3</number>
</property> </property>
<item> <item>
@ -132,7 +97,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="groupBox" > <widget class="QGroupBox" name="actionGroup" >
<property name="title" > <property name="title" >
<string>Actions on selected..</string> <string>Actions on selected..</string>
</property> </property>
@ -140,16 +105,7 @@
<property name="spacing" > <property name="spacing" >
<number>3</number> <number>3</number>
</property> </property>
<property name="leftMargin" > <property name="margin" >
<number>3</number>
</property>
<property name="topMargin" >
<number>3</number>
</property>
<property name="rightMargin" >
<number>3</number>
</property>
<property name="bottomMargin" >
<number>3</number> <number>3</number>
</property> </property>
<item> <item>
@ -158,7 +114,8 @@
<string>Facts..</string> <string>Facts..</string>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="../icons.qrc" >:/icons/Anki_Fact.png</iconset> <iconset resource="../icons.qrc" >
<normaloff>:/icons/Anki_Fact.png</normaloff>:/icons/Anki_Fact.png</iconset>
</property> </property>
<property name="autoDefault" > <property name="autoDefault" >
<bool>false</bool> <bool>false</bool>
@ -171,7 +128,8 @@
<string>Cards..</string> <string>Cards..</string>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="../icons.qrc" >:/icons/Anki_Card.png</iconset> <iconset resource="../icons.qrc" >
<normaloff>:/icons/Anki_Card.png</normaloff>:/icons/Anki_Card.png</iconset>
</property> </property>
<property name="autoDefault" > <property name="autoDefault" >
<bool>false</bool> <bool>false</bool>
@ -237,36 +195,15 @@
<property name="spacing" > <property name="spacing" >
<number>0</number> <number>0</number>
</property> </property>
<property name="leftMargin" > <property name="margin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="leftMargin" > <property name="margin" >
<number>0</number> <number>0</number>
</property> </property>
<property name="topMargin" > <property name="spacing" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="1" > <item row="0" column="1" >
@ -310,7 +247,8 @@
</layout> </layout>
<action name="action_Delete_card" > <action name="action_Delete_card" >
<property name="icon" > <property name="icon" >
<iconset resource="../icons.qrc" >:/icons/editdelete.png</iconset> <iconset resource="../icons.qrc" >
<normaloff>:/icons/editdelete.png</normaloff>:/icons/editdelete.png</iconset>
</property> </property>
<property name="text" > <property name="text" >
<string>Toggle Delete</string> <string>Toggle Delete</string>
@ -318,7 +256,8 @@
</action> </action>
<action name="actionAdd_fact_tag" > <action name="actionAdd_fact_tag" >
<property name="icon" > <property name="icon" >
<iconset resource="../icons.qrc" >:/icons/Anki_Add_Tag.png</iconset> <iconset resource="../icons.qrc" >
<normaloff>:/icons/Anki_Add_Tag.png</normaloff>:/icons/Anki_Add_Tag.png</iconset>
</property> </property>
<property name="text" > <property name="text" >
<string>Add Tag..</string> <string>Add Tag..</string>
@ -326,7 +265,8 @@
</action> </action>
<action name="actionAdd_card_tag" > <action name="actionAdd_card_tag" >
<property name="icon" > <property name="icon" >
<iconset resource="../icons.qrc" >:/icons/Anki_Add_Tag.png</iconset> <iconset resource="../icons.qrc" >
<normaloff>:/icons/Anki_Add_Tag.png</normaloff>:/icons/Anki_Add_Tag.png</iconset>
</property> </property>
<property name="text" > <property name="text" >
<string>Add Tag..</string> <string>Add Tag..</string>
@ -334,7 +274,8 @@
</action> </action>
<action name="actionDelete_fact_tag" > <action name="actionDelete_fact_tag" >
<property name="icon" > <property name="icon" >
<iconset resource="../icons.qrc" >:/icons/Anki_Del_Tag.png</iconset> <iconset resource="../icons.qrc" >
<normaloff>:/icons/Anki_Del_Tag.png</normaloff>:/icons/Anki_Del_Tag.png</iconset>
</property> </property>
<property name="text" > <property name="text" >
<string>Delete Tag..</string> <string>Delete Tag..</string>
@ -342,7 +283,8 @@
</action> </action>
<action name="actionDelete_card_tag" > <action name="actionDelete_card_tag" >
<property name="icon" > <property name="icon" >
<iconset resource="../icons.qrc" >:/icons/Anki_Del_Tag.png</iconset> <iconset resource="../icons.qrc" >
<normaloff>:/icons/Anki_Del_Tag.png</normaloff>:/icons/Anki_Del_Tag.png</iconset>
</property> </property>
<property name="text" > <property name="text" >
<string>Delete Tag..</string> <string>Delete Tag..</string>
@ -350,7 +292,8 @@
</action> </action>
<action name="actionAdd_Missing_Cards" > <action name="actionAdd_Missing_Cards" >
<property name="icon" > <property name="icon" >
<iconset resource="../icons.qrc" >:/icons/Anki_Card.png</iconset> <iconset resource="../icons.qrc" >
<normaloff>:/icons/Anki_Card.png</normaloff>:/icons/Anki_Card.png</iconset>
</property> </property>
<property name="text" > <property name="text" >
<string>Add Missing Active Cards</string> <string>Add Missing Active Cards</string>
@ -358,7 +301,8 @@
</action> </action>
<action name="actionDelete_Fact" > <action name="actionDelete_Fact" >
<property name="icon" > <property name="icon" >
<iconset resource="../icons.qrc" >:/icons/editdelete.png</iconset> <iconset resource="../icons.qrc" >
<normaloff>:/icons/editdelete.png</normaloff>:/icons/editdelete.png</iconset>
</property> </property>
<property name="text" > <property name="text" >
<string>Toggle Delete</string> <string>Toggle Delete</string>

7
designer/main.ui
View file

@ -622,10 +622,7 @@
<normaloff>:/icons/list-add.png</normaloff>:/icons/list-add.png</iconset> <normaloff>:/icons/list-add.png</normaloff>:/icons/list-add.png</iconset>
</property> </property>
<property name="text" > <property name="text" >
<string>&amp;Add Facts..</string> <string>&amp;Add Items..</string>
</property>
<property name="toolTip" >
<string>Add Cards</string>
</property> </property>
<property name="shortcut" > <property name="shortcut" >
<string>Ctrl+A</string> <string>Ctrl+A</string>
@ -637,7 +634,7 @@
<normaloff>:/icons/view_text.png</normaloff>:/icons/view_text.png</iconset> <normaloff>:/icons/view_text.png</normaloff>:/icons/view_text.png</iconset>
</property> </property>
<property name="text" > <property name="text" >
<string>&amp;Edit Facts..</string> <string>&amp;Edit Items..</string>
</property> </property>
<property name="shortcut" > <property name="shortcut" >
<string>Ctrl+E</string> <string>Ctrl+E</string>