fix hide toolbar, update prefs dialog, fix save cram & close bug

ankiqt/config.py

@@ -52,7 +52,6 @@ class Config(dict):
             'showTrayIcon': False,
             'showTimer': True,
             'showSuspendedCards': True,
-            'show3AnswerButtons': True,
             'simpleToolbar': True,
             }
         for (k,v) in fields.items():

ankiqt/ui/main.py

@@ -708,7 +708,6 @@ class AnkiQt(QMainWindow):
     def saveDeck(self):
         self.setStatus(_("Saving.."))
         self.deck.save()
-        self.updateRecentFiles(self.deck.path)
         self.updateTitleBar()
         self.setStatus(_("Saving..done"))
 
@@ -782,6 +781,7 @@ class AnkiQt(QMainWindow):
         if not self.config['showToolbar']:
             self.removeToolBar(mw.toolBar)
             mw.toolBar.hide()
+            return
         if self.config['simpleToolbar']:
             self.removeToolBar(mw.toolBar)
             mw.toolBar.hide()

ankiqt/ui/preferences.py

@@ -163,8 +163,6 @@ class Preferences(QDialog):
 
     def setupAdvanced(self):
         self.dialog.showToolbar.setChecked(self.config['showToolbar'])
-        self.dialog.compactEaseButtons.setChecked(
-            self.config['show3AnswerButtons'])
         self.dialog.tallButtons.setChecked(
             self.config['easeButtonHeight'] != 'standard')
         self.dialog.suppressEstimates.setChecked(self.config['suppressEstimates'])
@@ -177,7 +175,6 @@ class Preferences(QDialog):
 
     def updateAdvanced(self):
         self.config['showToolbar'] = self.dialog.showToolbar.isChecked()
-        self.config['show3AnswerButtons'] = self.dialog.compactEaseButtons.isChecked()
         if self.dialog.tallButtons.isChecked():
             self.config['easeButtonHeight'] = 'tall'
         else:

designer/preferences.ui

@@ -456,62 +456,55 @@
           </widget>
          </item>
          <item row="1" column="0" >
-          <widget class="QCheckBox" name="compactEaseButtons" >
-           <property name="text" >
-            <string>Show 3 answer buttons, not 5</string>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="0" >
           <widget class="QCheckBox" name="simpleToolbar" >
            <property name="text" >
             <string>Simple toolbar</string>
            </property>
           </widget>
          </item>
-         <item row="3" column="0" >
+         <item row="2" column="0" >
           <widget class="QCheckBox" name="showTimer" >
            <property name="text" >
             <string>Show timer</string>
            </property>
           </widget>
          </item>
-         <item row="4" column="0" >
+         <item row="3" column="0" >
           <widget class="QCheckBox" name="suppressEstimates" >
            <property name="text" >
             <string>Hide next interval when showing answer buttons</string>
            </property>
           </widget>
          </item>
-         <item row="5" column="0" >
+         <item row="4" column="0" >
           <widget class="QCheckBox" name="showLastCardContent" >
            <property name="text" >
             <string>Show last card's question/answer</string>
            </property>
           </widget>
          </item>
-         <item row="6" column="0" >
+         <item row="5" column="0" >
           <widget class="QCheckBox" name="showLastCardInterval" >
            <property name="text" >
             <string>Show last card's interval</string>
            </property>
           </widget>
          </item>
-         <item row="7" column="0" >
+         <item row="6" column="0" >
           <widget class="QCheckBox" name="showToolbar" >
            <property name="text" >
             <string>Show toolbar on startup</string>
            </property>
           </widget>
          </item>
-         <item row="8" column="0" >
+         <item row="7" column="0" >
           <widget class="QCheckBox" name="tallButtons" >
            <property name="text" >
             <string>Tall buttons (for touchscreen)</string>
            </property>
           </widget>
          </item>
-         <item row="9" column="0" >
+         <item row="8" column="0" >
           <widget class="QCheckBox" name="showTray" >
            <property name="text" >
             <string>Show tray icon</string>
@@ -597,7 +590,6 @@
   <tabstop>syncPass</tabstop>
   <tabstop>syncOnOpen</tabstop>
   <tabstop>syncOnClose</tabstop>
-  <tabstop>compactEaseButtons</tabstop>
   <tabstop>simpleToolbar</tabstop>
   <tabstop>showTimer</tabstop>
   <tabstop>suppressEstimates</tabstop>