mirror of
https://github.com/ankitects/anki.git
synced 2025-09-18 22:12:21 -04:00
drop support for old full toolbar - can be done in a plugin
This commit is contained in:
parent
b0cf565e6f
commit
7a138927cc
3 changed files with 8 additions and 35 deletions
|
@ -91,7 +91,6 @@ class Config(dict):
|
|||
'showTimer': True,
|
||||
'showToolbar': True,
|
||||
'showTrayIcon': False,
|
||||
'simpleToolbar': True,
|
||||
'sortIndex': 0,
|
||||
'splitQA': True,
|
||||
'standaloneWindows': True,
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -3171,22 +3171,6 @@
|
|||
<attribute name="toolBarBreak">
|
||||
<bool>false</bool>
|
||||
</attribute>
|
||||
<addaction name="actionNew"/>
|
||||
<addaction name="actionOpen"/>
|
||||
<addaction name="actionSave"/>
|
||||
<addaction name="actionSyncdeck"/>
|
||||
<addaction name="separator"/>
|
||||
<addaction name="actionAddcards"/>
|
||||
<addaction name="actionEditCurrent"/>
|
||||
<addaction name="actionEditdeck"/>
|
||||
<addaction name="actionStudyOptions"/>
|
||||
<addaction name="separator"/>
|
||||
<addaction name="actionGraphs"/>
|
||||
<addaction name="actionDstats"/>
|
||||
<addaction name="actionCstats"/>
|
||||
<addaction name="separator"/>
|
||||
<addaction name="actionRepeatAudio"/>
|
||||
<addaction name="actionMarkCard"/>
|
||||
</widget>
|
||||
<action name="actionExit">
|
||||
<property name="icon">
|
||||
|
|
Loading…
Reference in a new issue