diff --git a/ankiqt/config.py b/ankiqt/config.py index b70907cac..b6cdfa950 100644 --- a/ankiqt/config.py +++ b/ankiqt/config.py @@ -91,7 +91,6 @@ class Config(dict): 'showTimer': True, 'showToolbar': True, 'showTrayIcon': False, - 'simpleToolbar': True, 'sortIndex': 0, 'splitQA': True, 'standaloneWindows': True, diff --git a/ankiqt/ui/main.py b/ankiqt/ui/main.py index 82ac9f0d3..86d823d71 100755 --- a/ankiqt/ui/main.py +++ b/ankiqt/ui/main.py @@ -1743,24 +1743,14 @@ learnt today") def setupToolbar(self): mw = self.mainWin - if self.config['simpleToolbar']: - self.removeToolBar(mw.toolBar) - mw.toolBar.hide() - ver = QtConfig.qt_version >> 8 - if not sys.platform.startswith("darwin") and ver >= 0x407: - # this became necessary in 4.7 or we end up with two toolbars - mw.toolBar.deleteLater() - mw.toolBar = QToolBar(self) - mw.toolBar.setObjectName("toolBar") - mw.toolBar.addAction(mw.actionAddcards) - mw.toolBar.addAction(mw.actionEditCurrent) - mw.toolBar.addAction(mw.actionEditdeck) - mw.toolBar.addAction(mw.actionStudyOptions) - mw.toolBar.addAction(mw.actionGraphs) - mw.toolBar.addAction(mw.actionMarkCard) - mw.toolBar.addAction(mw.actionRepeatAudio) - mw.toolBar.addAction(mw.actionClose) - self.addToolBar(Qt.TopToolBarArea, mw.toolBar) + mw.toolBar.addAction(mw.actionAddcards) + mw.toolBar.addAction(mw.actionEditCurrent) + mw.toolBar.addAction(mw.actionEditdeck) + mw.toolBar.addAction(mw.actionStudyOptions) + mw.toolBar.addAction(mw.actionGraphs) + mw.toolBar.addAction(mw.actionMarkCard) + mw.toolBar.addAction(mw.actionRepeatAudio) + mw.toolBar.addAction(mw.actionClose) mw.toolBar.setIconSize(QSize(self.config['iconSize'], self.config['iconSize'])) toggle = mw.toolBar.toggleViewAction() diff --git a/designer/main.ui b/designer/main.ui index e689867e1..b61c1a522 100644 --- a/designer/main.ui +++ b/designer/main.ui @@ -3171,22 +3171,6 @@ false - - - - - - - - - - - - - - - -