GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-18 22:12:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Fix pylints and type annotations in dyndeckconf

Browse source 
Also fix int representation of learning steps.
This commit is contained in:
RumovZ 2021-02-01 09:56:10 +01:00
parent 5aac81d15f
commit d2024d1d1e
2 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
qt/aqt/dyndeckconf.py
View file

@ -8,6 +8,7 @@ from anki.collection import SearchTerm
from anki.decks import Deck from anki.decks import Deck
from anki.errors import InvalidInput from anki.errors import InvalidInput
from anki.lang import without_unicode_isolation from anki.lang import without_unicode_isolation
from aqt import AnkiQt
from aqt.qt import * from aqt.qt import *
from aqt.utils import ( from aqt.utils import (
TR, TR,
@ -26,7 +27,9 @@ from aqt.utils import (
class DeckConf(QDialog): class DeckConf(QDialog):
"""Dialogue to modify and build a filtered deck.""" """Dialogue to modify and build a filtered deck."""
def __init__(self, mw, search: Optional[str] = None, deck: Optional[Deck] = None): def __init__(
self, mw: AnkiQt, search: Optional[str] = None, deck: Optional[Deck] = None
):
"""If 'deck' is an existing filtered deck, load and modify its settings. """If 'deck' is an existing filtered deck, load and modify its settings.
Otherwise, build a new one and derive settings from the current deck. Otherwise, build a new one and derive settings from the current deck.
""" """
@ -75,7 +78,9 @@ class DeckConf(QDialog):
self.show() self.show()
def reopen(self, _mw, search: Optional[str] = None, _deck: Optional[Deck] = None): def reopen(
self, _mw: AnkiQt, search: Optional[str] = None, _deck: Optional[Deck] = None
):
if search is not None: if search is not None:
self.form.search.setText(search) self.form.search.setText(search)
self.form.search.selectAll() self.form.search.selectAll()
@ -90,7 +95,7 @@ class DeckConf(QDialog):
self.did = self.mw.col.decks.new_filtered(name) self.did = self.mw.col.decks.new_filtered(name)
self.deck = self.mw.col.decks.current() self.deck = self.mw.col.decks.current()
def set_default_searches(self, deck_name): def set_default_searches(self, deck_name: str):
self.form.search.setText( self.form.search.setText(
self.mw.col.build_search_string( self.mw.col.build_search_string(
SearchTerm(deck=deck_name), SearchTerm(deck=deck_name),
@ -112,7 +117,7 @@ class DeckConf(QDialog):
qconnect(self.form.resched.stateChanged, self._onReschedToggled) qconnect(self.form.resched.stateChanged, self._onReschedToggled)
def _onReschedToggled(self, _state): def _onReschedToggled(self, _state: int):
self.form.previewDelayWidget.setVisible( self.form.previewDelayWidget.setVisible(
not self.form.resched.isChecked() and self.mw.col.schedVer() > 1 not self.form.resched.isChecked() and self.mw.col.schedVer() > 1
) )
@ -206,11 +211,15 @@ class DeckConf(QDialog):
# Step load/save - fixme: share with std options screen # Step load/save - fixme: share with std options screen
######################################################## ########################################################
def listToUser(self, l): def listToUser(self, values: List[Union[float, int]]) -> str:
return " ".join([str(x) for x in l]) return " ".join(
[str(int(val)) if int(val) == val else str(val) for val in values]
)
def userToList(self, w, minSize=1) -> Optional[List[Union[float, int]]]: def userToList(
items = str(w.text()).split(" ") self, line: QLineEdit, minSize: int = 1
) -> Optional[List[Union[float, int]]]:
items = str(line.text()).split(" ")
ret = [] ret = []
for item in items: for item in items:
if not item: if not item:

6
qt/aqt/main.py
View file

@ -1051,15 +1051,13 @@ title="%s" %s>%s</button>""" % (
aqt.dialogs.open("EditCurrent", self) aqt.dialogs.open("EditCurrent", self)
def onDeckConf(self, deck=None): def onDeckConf(self, deck=None):
import aqt.deckconf
if not deck: if not deck:
deck = self.col.decks.current() deck = self.col.decks.current()
if deck["dyn"]: if deck["dyn"]:
import aqt
aqt.dialogs.open("DynDeckConfDialog", self, deck=deck) aqt.dialogs.open("DynDeckConfDialog", self, deck=deck)
else: else:
import aqt.deckconf
aqt.deckconf.DeckConf(self, deck) aqt.deckconf.DeckConf(self, deck)
def onOverview(self): def onOverview(self):