GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-19 06:22:22 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

drop support for old full toolbar - can be done in a plugin

Browse source
This commit is contained in:
Damien Elmes 2010-10-27 21:34:08 +09:00
parent b0cf565e6f
commit 7a138927cc
3 changed files with 8 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ankiqt/config.py
View file

@ -91,7 +91,6 @@ class Config(dict):
'showTimer': True, 'showTimer': True,
'showToolbar': True, 'showToolbar': True,
'showTrayIcon': False, 'showTrayIcon': False,
'simpleToolbar': True,
'sortIndex': 0, 'sortIndex': 0,
'splitQA': True, 'splitQA': True,
'standaloneWindows': True, 'standaloneWindows': True,

26
ankiqt/ui/main.py
View file

@ -1743,24 +1743,14 @@ learnt today")
def setupToolbar(self): def setupToolbar(self):
mw = self.mainWin mw = self.mainWin
if self.config['simpleToolbar']: mw.toolBar.addAction(mw.actionAddcards)
self.removeToolBar(mw.toolBar) mw.toolBar.addAction(mw.actionEditCurrent)
mw.toolBar.hide() mw.toolBar.addAction(mw.actionEditdeck)
ver = QtConfig.qt_version >> 8 mw.toolBar.addAction(mw.actionStudyOptions)
if not sys.platform.startswith("darwin") and ver >= 0x407: mw.toolBar.addAction(mw.actionGraphs)
# this became necessary in 4.7 or we end up with two toolbars mw.toolBar.addAction(mw.actionMarkCard)
mw.toolBar.deleteLater() mw.toolBar.addAction(mw.actionRepeatAudio)
mw.toolBar = QToolBar(self) mw.toolBar.addAction(mw.actionClose)
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.setIconSize(QSize(self.config['iconSize'], mw.toolBar.setIconSize(QSize(self.config['iconSize'],
self.config['iconSize'])) self.config['iconSize']))
toggle = mw.toolBar.toggleViewAction() toggle = mw.toolBar.toggleViewAction()

16
designer/main.ui
View file

@ -3171,22 +3171,6 @@
<attribute name="toolBarBreak"> <attribute name="toolBarBreak">
<bool>false</bool> <bool>false</bool>
</attribute> </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> </widget>
<action name="actionExit"> <action name="actionExit">
<property name="icon"> <property name="icon">