From 918bfa2e6205f8f3ebeceef41b7436a7bdda57dc Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Sat, 10 Dec 2011 23:48:36 +0900
Subject: [PATCH] move some prefs into collection

---
 anki/collection.py | 4 +++-
 anki/decks.py      | 1 +
 anki/sched.py      | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/anki/collection.py b/anki/collection.py
index e62b2258a..862055135 100644
--- a/anki/collection.py
+++ b/anki/collection.py
@@ -19,12 +19,14 @@ import anki.latex # sets up hook
 import anki.cards, anki.notes, anki.template, anki.cram, anki.find
 
 defaultConf = {
-    # scheduling options
+    # review options
     'activeDecks': [1],
     'curDeck': 1,
     'newSpread': NEW_CARDS_DISTRIBUTE,
     'collapseTime': 1200,
     'timeLim': 0,
+    'estTimes': True,
+    'dueCounts': True,
     # other config
     'curModel': None,
     'nextPos': 1,
diff --git a/anki/decks.py b/anki/decks.py
index ccced239b..8810cde10 100644
--- a/anki/decks.py
+++ b/anki/decks.py
@@ -53,6 +53,7 @@ defaultConf = {
         'order': REV_CARDS_RANDOM,
     },
     'maxTaken': 60,
+    'autoplay': True,
     'mod': 0,
     'usn': 0,
 }
diff --git a/anki/sched.py b/anki/sched.py
index 47fbebb5e..d951eebf9 100644
--- a/anki/sched.py
+++ b/anki/sched.py
@@ -884,7 +884,7 @@ and due >= ?""" % scids, now, self.col.usn(), shiftby, low)
         self.sortCards(cids)
 
     def resortConf(self, conf):
-        for did in self.mw.decks.didsForConf(conf):
+        for did in self.col.decks.didsForConf(conf):
             if conf['new']['order'] == 0:
                 self.randomizeCards(did)
             else: