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

remove toolbar in browser in favour of menu items

Browse source
This commit is contained in:
Damien Elmes 2017-08-11 14:40:51 +10:00
parent 1c88315e86
commit 6c765d7302
3 changed files with 138 additions and 240 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

148
aqt/browser.py
View file

@ -20,7 +20,6 @@ from aqt.utils import saveGeom, restoreGeom, saveSplitter, restoreSplitter, \
showInfo, askUser, tooltip, openHelp, showWarning, shortcut, mungeQA
from anki.hooks import runHook, addHook, remHook
from aqt.webview import AnkiWebView
from aqt.toolbar import Toolbar
from anki.consts import *
from anki.sound import playFromText, clearAudioQueue
@ -373,7 +372,6 @@ class Browser(QMainWindow):
self.form.splitter_2.setChildrenCollapsible(False)
self.form.splitter.setChildrenCollapsible(False)
self.card = None
self.setupToolbar()
self.setupColumns()
self.setupTable()
self.setupMenus()
@ -386,30 +384,34 @@ class Browser(QMainWindow):
self.setupSearch()
self.show()
def setupToolbar(self):
self.toolbarWeb = AnkiWebView()
self.toolbarWeb.title = "browser toolbar"
self.toolbar = BrowserToolbar(self.mw, self.toolbarWeb, self)
self.form.verticalLayout_3.insertWidget(0, self.toolbarWeb)
self.toolbar.draw()
def setupMenus(self):
# actions
f = self.form
if not isMac:
f.actionClose.setVisible(False)
f.actionReposition.triggered.connect(self.reposition)
f.actionReschedule.triggered.connect(self.reschedule)
f.actionChangeModel.triggered.connect(self.onChangeModel)
# edit
f.actionUndo.triggered.connect(self.mw.onUndo)
f.previewButton.clicked.connect(self.onTogglePreview)
f.previewButton.setToolTip(_("Preview Selected Card (%s)") %
shortcut(_("Ctrl+Shift+P")))
shortcut(_("Ctrl+Shift+P")))
# edit
f.actionUndo.triggered.connect(self.mw.onUndo)
f.actionInvertSelection.triggered.connect(self.invertSelection)
f.actionSelectNotes.triggered.connect(self.selectNotes)
f.actionFindReplace.triggered.connect(self.onFindReplace)
if not isMac:
f.actionClose.setVisible(False)
# notes
f.actionAdd.triggered.connect(self.mw.onAddCard)
f.actionAdd_Tags.triggered.connect(lambda: self.addTags())
f.actionRemove_Tags.triggered.connect(lambda: self.deleteTags())
f.actionClear_Unused_Tags.triggered.connect(self.clearUnusedTags)
f.actionChangeModel.triggered.connect(self.onChangeModel)
f.actionFindDuplicates.triggered.connect(self.onFindDupes)
f.actionFindReplace.triggered.connect(self.onFindReplace)
f.actionToggle_Mark.triggered.connect(lambda: self.onMark())
f.actionDelete.triggered.connect(self.deleteNotes)
# cards
f.actionChange_Deck.triggered.connect(self.setDeck)
f.action_Info.triggered.connect(self.showCardInfo)
f.actionReposition.triggered.connect(self.reposition)
f.actionReschedule.triggered.connect(self.reschedule)
f.actionToggle_Suspend.triggered.connect(self.onSuspend)
# jumps
f.actionPreviousCard.triggered.connect(self.onPreviousCard)
f.actionNextCard.triggered.connect(self.onNextCard)
@ -426,29 +428,6 @@ class Browser(QMainWindow):
self.pgUpCut.activated.connect(self.onFirstCard)
self.pgDownCut = QShortcut(QKeySequence("Shift+End"), self)
self.pgDownCut.activated.connect(self.onLastCard)
# add note
self.addCut = QShortcut(QKeySequence("Ctrl+E"), self)
self.addCut.activated.connect(self.mw.onAddCard)
# card info
self.infoCut = QShortcut(QKeySequence("Ctrl+Shift+I"), self)
self.infoCut.activated.connect(self.showCardInfo)
# set deck
self.changeDeckCut = QShortcut(QKeySequence("Ctrl+D"), self)
self.changeDeckCut.activated.connect(self.setDeck)
# add/remove tags
self.tagCut1 = QShortcut(QKeySequence("Ctrl+Shift+A"), self)
self.tagCut1.activated.connect(self.addTags)
self.tagCut2 = QShortcut(QKeySequence("Ctrl+Shift+D"), self)
self.tagCut2.activated.connect(self.deleteTags)
self.tagCut3 = QShortcut(QKeySequence("Ctrl+K"), self)
self.tagCut3.activated.connect(self.onMark)
# suspending
self.susCut1 = QShortcut(QKeySequence("Ctrl+J"), self)
self.susCut1.activated.connect(self.onSuspend)
# deletion
self.delCut1 = QShortcut(QKeySequence("Ctrl+Delete"), self)
self.delCut1.setAutoRepeat(False)
self.delCut1.activated.connect(self.deleteNotes)
# add-on hook
runHook('browser.setupMenus', self)
self.mw.maybeHideAccelerators(self)
@ -635,7 +614,6 @@ class Browser(QMainWindow):
self.editor.card = self.card
self.singleCard = True
self._renderPreview(True)
self.toolbar.update()
def refreshCurrentCard(self, note):
self.model.refreshNote(note)
@ -1278,6 +1256,13 @@ update cards set usn=?, mod=?, did=? where id in """ + scids,
self.addTags(tags, label, _("Enter tags to delete:"),
func=self.col.tags.bulkRem)
def clearUnusedTags(self):
self.editor.saveNow(self._clearUnusedTags)
def _clearUnusedTags(self):
self.col.tags.registerNotes()
self.buildTree()
# Suspending and marking
######################################################################
@ -1789,85 +1774,6 @@ Are you sure you want to continue?""")):
def onHelp(self):
openHelp("browsermisc")
# Toolbar
######################################################################
class BrowserToolbar(Toolbar):
def __init__(self, mw, web, browser):
self.browser = browser
Toolbar.__init__(self, mw, web)
def draw(self):
self.web.onBridgeCmd = self._linkHandler
self.web.stdHtml(self.html(),
css=["toolbar.css", "browser-toolbar.css"])
self.update()
if isLin:
# adjust height on a delay to work around a qt crash when
# opening the browser
self.browser.mw.progress.timer(10, self.web.adjustHeightToFit, False)
else:
self.web.adjustHeightToFit()
def update(self):
for link, enabled in (
("mark", self.browser.isMarked()),
("pause", self.browser.isSuspended())):
if enabled:
self.web.eval("$('#%s').addClass('buttonOn')" % link)
else:
self.web.eval("$('#%s').removeClass('buttonOn')" % link)
def html(self):
def borderImg(link, icon, title, tooltip=None):
fmt = '''\
<a class=hitem title="%s" href=# onclick="pycmd('%s')"><img id=%s valign=bottom src="qrc:/icons/%s.png"> %s</a>'''
return fmt % (tooltip or title, link, link, icon, title)
right = "<div>"
right += borderImg("add", "add16", _("Add"),
shortcut(_("Add Note (Ctrl+E)")))
right += borderImg("info", "info", _("Info"),
shortcut(_("Card Info (Ctrl+Shift+I)")))
right += borderImg("mark", "star16", _("Mark"),
shortcut(_("Mark Note (Ctrl+K)")))
right += borderImg("pause", "pause16", _("Suspend"),
shortcut(_("Suspend Card (Ctrl+J)")))
right += borderImg("setDeck", "deck16", _("Change Deck"),
shortcut(_("Move To Deck (Ctrl+D)")))
right += borderImg("addtag", "addtag16", _("Add Tags"),
shortcut(_("Bulk Add Tags (Ctrl+Shift+A)")))
right += borderImg("deletetag", "deletetag16", _("Remove Tags"), shortcut(_(
"Bulk Remove Tags (Ctrl+Shift+D)")))
right += borderImg("delete", "delete16", _("Delete"), shortcut(_("Ctrl+Delete")))
right += "</div>"
return self._body % right
# Link handling
######################################################################
def _linkHandler(self, l):
if l == "anki":
self.showMenu()
elif l == "add":
self.browser.mw.onAddCard()
elif l == "delete":
self.browser.deleteNotes()
elif l == "setDeck":
self.browser.setDeck()
# icons
elif l == "info":
self.browser.showCardInfo()
elif l == "mark":
self.browser.onMark()
elif l == "pause":
self.browser.onSuspend()
elif l == "addtag":
self.browser.addTags()
elif l == "deletetag":
self.browser.deleteTags()
# Favourites button
######################################################################
class FavouritesLineEdit(QLineEdit):

209
designer/browser.ui
View file

@ -28,16 +28,7 @@
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<property name="margin">
<number>0</number>
</property>
<item>
@ -85,20 +76,17 @@
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<property name="margin">
<number>0</number>
</property>
<item>
<layout class="QGridLayout" name="gridLayout">
<property name="horizontalSpacing">
<number>6</number>
</property>
<property name="verticalSpacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
@ -108,12 +96,6 @@
<property name="rightMargin">
<number>0</number>
</property>
<property name="horizontalSpacing">
<number>6</number>
</property>
<property name="verticalSpacing">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QComboBox" name="searchEdit">
<property name="sizePolicy">
@ -268,18 +250,10 @@
</property>
<addaction name="actionUndo"/>
<addaction name="separator"/>
<addaction name="actionReschedule"/>
<addaction name="actionReposition"/>
<addaction name="separator"/>
<addaction name="actionChangeModel"/>
<addaction name="separator"/>
<addaction name="actionSelectAll"/>
<addaction name="actionSelectNotes"/>
<addaction name="actionInvertSelection"/>
<addaction name="separator"/>
<addaction name="actionFindDuplicates"/>
<addaction name="actionFindReplace"/>
<addaction name="separator"/>
<addaction name="actionClose"/>
</widget>
<widget class="QMenu" name="menuJump">
@ -302,15 +276,45 @@
</property>
<addaction name="actionGuide"/>
</widget>
<widget class="QMenu" name="menu_Cards">
<property name="title">
<string>&amp;Cards</string>
</property>
<addaction name="actionChange_Deck"/>
<addaction name="separator"/>
<addaction name="actionReschedule"/>
<addaction name="actionReposition"/>
<addaction name="separator"/>
<addaction name="actionToggle_Suspend"/>
<addaction name="separator"/>
<addaction name="action_Info"/>
</widget>
<widget class="QMenu" name="menu_Notes">
<property name="title">
<string>&amp;Notes</string>
</property>
<addaction name="actionAdd"/>
<addaction name="separator"/>
<addaction name="actionAdd_Tags"/>
<addaction name="actionRemove_Tags"/>
<addaction name="actionClear_Unused_Tags"/>
<addaction name="separator"/>
<addaction name="actionChangeModel"/>
<addaction name="separator"/>
<addaction name="actionFindDuplicates"/>
<addaction name="actionFindReplace"/>
<addaction name="separator"/>
<addaction name="actionToggle_Mark"/>
<addaction name="separator"/>
<addaction name="actionDelete"/>
</widget>
<addaction name="menuEdit"/>
<addaction name="menu_Notes"/>
<addaction name="menu_Cards"/>
<addaction name="menuJump"/>
<addaction name="menu_Help"/>
</widget>
<action name="actionReschedule">
<property name="icon">
<iconset resource="icons.qrc">
<normaloff>:/icons/view-pim-calendar.png</normaloff>:/icons/view-pim-calendar.png</iconset>
</property>
<property name="text">
<string>&amp;Reschedule...</string>
</property>
@ -324,10 +328,6 @@
</property>
</action>
<action name="actionUndo">
<property name="icon">
<iconset resource="icons.qrc">
<normaloff>:/icons/edit-undo.png</normaloff>:/icons/edit-undo.png</iconset>
</property>
<property name="text">
<string>&amp;Undo</string>
</property>
@ -341,10 +341,6 @@
</property>
</action>
<action name="actionFind">
<property name="icon">
<iconset>
<normaloff>:/icons/document-preview.png</normaloff>:/icons/document-preview.png</iconset>
</property>
<property name="text">
<string>&amp;Find</string>
</property>
@ -353,10 +349,6 @@
</property>
</action>
<action name="actionNote">
<property name="icon">
<iconset>
<normaloff>:/icons/Anki_Fact.png</normaloff>:/icons/Anki_Fact.png</iconset>
</property>
<property name="text">
<string>N&amp;ote</string>
</property>
@ -365,10 +357,6 @@
</property>
</action>
<action name="actionNextCard">
<property name="icon">
<iconset resource="icons.qrc">
<normaloff>:/icons/go-next.png</normaloff>:/icons/go-next.png</iconset>
</property>
<property name="text">
<string>&amp;Next Card</string>
</property>
@ -377,10 +365,6 @@
</property>
</action>
<action name="actionPreviousCard">
<property name="icon">
<iconset resource="icons.qrc">
<normaloff>:/icons/go-previous.png</normaloff>:/icons/go-previous.png</iconset>
</property>
<property name="text">
<string>&amp;Previous Card</string>
</property>
@ -389,10 +373,6 @@
</property>
</action>
<action name="actionGuide">
<property name="icon">
<iconset resource="icons.qrc">
<normaloff>:/icons/help.png</normaloff>:/icons/help.png</iconset>
</property>
<property name="text">
<string>&amp;Guide</string>
</property>
@ -401,10 +381,6 @@
</property>
</action>
<action name="actionChangeModel">
<property name="icon">
<iconset resource="icons.qrc">
<normaloff>:/icons/system-software-update.png</normaloff>:/icons/system-software-update.png</iconset>
</property>
<property name="text">
<string>Change Note Type...</string>
</property>
@ -421,10 +397,6 @@
</property>
</action>
<action name="actionFindReplace">
<property name="icon">
<iconset resource="icons.qrc">
<normaloff>:/icons/edit-find-replace.png</normaloff>:/icons/edit-find-replace.png</iconset>
</property>
<property name="text">
<string>Find and Re&amp;place...</string>
</property>
@ -433,19 +405,11 @@
</property>
</action>
<action name="actionCram">
<property name="icon">
<iconset resource="icons.qrc">
<normaloff>:/icons/view-pim-calendar.png</normaloff>:/icons/view-pim-calendar.png</iconset>
</property>
<property name="text">
<string>&amp;Cram...</string>
</property>
</action>
<action name="actionTags">
<property name="icon">
<iconset resource="icons.qrc">
<normaloff>:/icons/anki-tag.png</normaloff>:/icons/anki-tag.png</iconset>
</property>
<property name="text">
<string>Fil&amp;ters</string>
</property>
@ -454,10 +418,6 @@
</property>
</action>
<action name="actionCardList">
<property name="icon">
<iconset>
<normaloff>:/icons/generate_07.png</normaloff>:/icons/generate_07.png</iconset>
</property>
<property name="text">
<string>Card List</string>
</property>
@ -466,19 +426,11 @@
</property>
</action>
<action name="actionFindDuplicates">
<property name="icon">
<iconset resource="icons.qrc">
<normaloff>:/icons/edit-find 2.png</normaloff>:/icons/edit-find 2.png</iconset>
</property>
<property name="text">
<string>Find &amp;Duplicates...</string>
</property>
</action>
<action name="actionReposition">
<property name="icon">
<iconset resource="icons.qrc">
<normaloff>:/icons/view-sort-ascending.png</normaloff>:/icons/view-sort-ascending.png</iconset>
</property>
<property name="text">
<string>Reposition...</string>
</property>
@ -487,10 +439,6 @@
</property>
</action>
<action name="actionFirstCard">
<property name="icon">
<iconset resource="icons.qrc">
<normaloff>:/icons/arrow-up.png</normaloff>:/icons/arrow-up.png</iconset>
</property>
<property name="text">
<string>First Card</string>
</property>
@ -499,10 +447,6 @@
</property>
</action>
<action name="actionLastCard">
<property name="icon">
<iconset resource="icons.qrc">
<normaloff>:/icons/arrow-down.png</normaloff>:/icons/arrow-down.png</iconset>
</property>
<property name="text">
<string>Last Card</string>
</property>
@ -518,6 +462,75 @@
<string>Ctrl+W</string>
</property>
</action>
<action name="action_Info">
<property name="text">
<string>&amp;Info...</string>
</property>
<property name="shortcut">
<string>Ctrl+Shift+I</string>
</property>
</action>
<action name="actionAdd_Tags">
<property name="text">
<string>Add Tags...</string>
</property>
<property name="shortcut">
<string>Ctrl+Shift+A</string>
</property>
</action>
<action name="actionRemove_Tags">
<property name="text">
<string>Remove Tags...</string>
</property>
<property name="shortcut">
<string>Ctrl+Shift+D</string>
</property>
</action>
<action name="actionClear_Unused_Tags">
<property name="text">
<string>Clear Unused Tags</string>
</property>
</action>
<action name="actionToggle_Suspend">
<property name="text">
<string>Toggle Suspend</string>
</property>
<property name="shortcut">
<string>Ctrl+J</string>
</property>
</action>
<action name="actionDelete">
<property name="text">
<string>Delete</string>
</property>
<property name="shortcut">
<string>Ctrl+Del</string>
</property>
</action>
<action name="actionAdd">
<property name="text">
<string>Add...</string>
</property>
<property name="shortcut">
<string>Ctrl+E</string>
</property>
</action>
<action name="actionChange_Deck">
<property name="text">
<string>Change Deck...</string>
</property>
<property name="shortcut">
<string>Ctrl+D</string>
</property>
</action>
<action name="actionToggle_Mark">
<property name="text">
<string>Toggle Mark</string>
</property>
<property name="shortcut">
<string>Ctrl+K</string>
</property>
</action>
</widget>
<resources>
<include location="icons.qrc"/>

21
web/browser-toolbar.css
View file

@ -1,21 +0,0 @@
#header {
font-weight: normal;
}
a {
margin-right: 1em;
}
.hitem {
overflow: hidden;
white-space: nowrap;
}
.hitem img {
padding: 1px;
}
.buttonOn {
border: 1px solid #aaa;
padding: 0 !important;
}