diff --git a/ankiqt/config.py b/ankiqt/config.py index f8de29d4f..5ba4895fb 100644 --- a/ankiqt/config.py +++ b/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(): diff --git a/ankiqt/ui/main.py b/ankiqt/ui/main.py index 300c8cf01..9b794636d 100644 --- a/ankiqt/ui/main.py +++ b/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() diff --git a/ankiqt/ui/preferences.py b/ankiqt/ui/preferences.py index bde1b9097..1420f5e2b 100644 --- a/ankiqt/ui/preferences.py +++ b/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: diff --git a/designer/preferences.ui b/designer/preferences.ui index bd3437746..9e7801693 100644 --- a/designer/preferences.ui +++ b/designer/preferences.ui @@ -456,62 +456,55 @@ - - - Show 3 answer buttons, not 5 - - - - Simple toolbar - + Show timer - + Hide next interval when showing answer buttons - + Show last card's question/answer - + Show last card's interval - + Show toolbar on startup - + Tall buttons (for touchscreen) - + Show tray icon @@ -597,7 +590,6 @@ syncPass syncOnOpen syncOnClose - compactEaseButtons simpleToolbar showTimer suppressEstimates