From c2d9ab94236017bf1c25a684b7c405a692a8ed42 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Sat, 13 Nov 2010 21:55:03 +0900 Subject: [PATCH] update deckproperties diag for new delay1 handling --- ankiqt/ui/deckproperties.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/ankiqt/ui/deckproperties.py b/ankiqt/ui/deckproperties.py index 156f52a43..736008f12 100644 --- a/ankiqt/ui/deckproperties.py +++ b/ankiqt/ui/deckproperties.py @@ -56,7 +56,7 @@ class DeckProperties(QDialog): v = getattr(self.d, type + "IntervalMax") getattr(self.dialog, type + "Max").setText(str(v)) self.dialog.delay0.setText(unicode(self.d.delay0/60.0)) - self.dialog.delay1.setText(unicode(self.d.delay1/60.0)) + self.dialog.delay1.setText(unicode(self.d.delay1)) self.dialog.delay2.setText(unicode(self.d.delay2)) self.dialog.collapse.setCheckState(self.d.collapseTime and Qt.Checked or Qt.Unchecked) @@ -183,11 +183,8 @@ class DeckProperties(QDialog): try: v = float(self.dialog.delay0.text()) * 60.0 self.updateField(self.d, 'delay0', v) - v2 = float(self.dialog.delay1.text()) * 60.0 - if v2 < v: - ui.utils.showInfo(_("Again (Young) must be <= Again (Mature)."), - parent=self.parent) - v2 = v + v2 = int(self.dialog.delay1.text()) + v2 = max(0, v2) self.updateField(self.d, 'delay1', v2) v = float(self.dialog.delay2.text()) self.updateField(self.d, 'delay2', min(v, 1))