From 03577285bbe4722242fbeac6e39da42d346af25c Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Fri, 25 May 2012 10:07:05 +0900
Subject: [PATCH] reword use current deck option in prefs

---
 aqt/preferences.py      |  4 ++--
 designer/preferences.ui | 25 ++++++++++++++++---------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/aqt/preferences.py b/aqt/preferences.py
index 8da5e0174..5de43f0e8 100644
--- a/aqt/preferences.py
+++ b/aqt/preferences.py
@@ -53,7 +53,7 @@ class Preferences(QDialog):
         f.showProgress.setChecked(qc['dueCounts'])
         f.newSpread.addItems(c.newCardSchedulingLabels().values())
         f.newSpread.setCurrentIndex(qc['newSpread'])
-        f.useCurrent.setChecked(qc.get("addToCur", True))
+        f.useCurrent.setCurrentIndex(int(not qc.get("addToCur", True)))
 
     def updateCollection(self):
         f = self.form
@@ -64,7 +64,7 @@ class Preferences(QDialog):
         qc['newSpread'] = f.newSpread.currentIndex()
         qc['timeLim'] = f.timeLimit.value()*60
         qc['collapseTime'] = f.lrnCutoff.value()*60
-        qc['addToCur'] = f.useCurrent.isChecked()
+        qc['addToCur'] = not f.useCurrent.currentIndex()
         hrs = f.dayOffset.value()
         old = self.startDate
         date = datetime.datetime(
diff --git a/designer/preferences.ui b/designer/preferences.ui
index 8d161a721..f6d155406 100644
--- a/designer/preferences.ui
+++ b/designer/preferences.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>441</width>
-    <height>426</height>
+    <height>445</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -44,13 +44,6 @@
          </property>
         </widget>
        </item>
-       <item>
-        <widget class="QCheckBox" name="useCurrent">
-         <property name="text">
-          <string>Use the current deck as the default when adding notes</string>
-         </property>
-        </widget>
-       </item>
        <item>
         <widget class="QCheckBox" name="stripHTML">
          <property name="text">
@@ -65,6 +58,20 @@
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QComboBox" name="useCurrent">
+         <item>
+          <property name="text">
+           <string>When adding, default to current deck</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Change deck depending on note type</string>
+          </property>
+         </item>
+        </widget>
+       </item>
        <item>
         <widget class="QComboBox" name="newSpread"/>
        </item>
@@ -387,9 +394,9 @@
  <tabstops>
   <tabstop>showEstimates</tabstop>
   <tabstop>showProgress</tabstop>
-  <tabstop>useCurrent</tabstop>
   <tabstop>stripHTML</tabstop>
   <tabstop>pastePNG</tabstop>
+  <tabstop>useCurrent</tabstop>
   <tabstop>newSpread</tabstop>
   <tabstop>dayOffset</tabstop>
   <tabstop>lrnCutoff</tabstop>