mirror of
https://github.com/ankitects/anki.git
synced 2025-09-24 16:56:36 -04:00
remove context menu for now, speed up toolbar rendering in browser
This commit is contained in:
parent
967dff23dd
commit
4eba9eb913
2 changed files with 7 additions and 7 deletions
|
@ -315,6 +315,7 @@ class Browser(QMainWindow):
|
||||||
self.form.splitter_2.setChildrenCollapsible(False)
|
self.form.splitter_2.setChildrenCollapsible(False)
|
||||||
self.form.splitter.setChildrenCollapsible(False)
|
self.form.splitter.setChildrenCollapsible(False)
|
||||||
self.card = None
|
self.card = None
|
||||||
|
self.setupToolbar()
|
||||||
self.setupColumns()
|
self.setupColumns()
|
||||||
self.setupTable()
|
self.setupTable()
|
||||||
self.setupMenus()
|
self.setupMenus()
|
||||||
|
@ -323,7 +324,6 @@ class Browser(QMainWindow):
|
||||||
self.setupHeaders()
|
self.setupHeaders()
|
||||||
self.setupHooks()
|
self.setupHooks()
|
||||||
self.setupEditor()
|
self.setupEditor()
|
||||||
self.setupToolbar()
|
|
||||||
self.updateFont()
|
self.updateFont()
|
||||||
self.onUndoState(self.mw.form.actionUndo.isEnabled())
|
self.onUndoState(self.mw.form.actionUndo.isEnabled())
|
||||||
self.form.searchEdit.setFocus()
|
self.form.searchEdit.setFocus()
|
||||||
|
@ -337,6 +337,7 @@ class Browser(QMainWindow):
|
||||||
self.toolbarWeb.setFixedHeight(34)
|
self.toolbarWeb.setFixedHeight(34)
|
||||||
self.toolbar = BrowserToolbar(self.mw, self.toolbarWeb, self)
|
self.toolbar = BrowserToolbar(self.mw, self.toolbarWeb, self)
|
||||||
self.form.verticalLayout_3.insertWidget(0, self.toolbarWeb)
|
self.form.verticalLayout_3.insertWidget(0, self.toolbarWeb)
|
||||||
|
self.toolbar.draw()
|
||||||
|
|
||||||
def setupMenus(self):
|
def setupMenus(self):
|
||||||
# actions
|
# actions
|
||||||
|
@ -1425,7 +1426,6 @@ class BrowserToolbar(Toolbar):
|
||||||
Toolbar.__init__(self, mw, web)
|
Toolbar.__init__(self, mw, web)
|
||||||
|
|
||||||
def draw(self):
|
def draw(self):
|
||||||
single = self.browser.editor.note
|
|
||||||
mark = self.browser.isMarked()
|
mark = self.browser.isMarked()
|
||||||
pause = self.browser.isSuspended()
|
pause = self.browser.isSuspended()
|
||||||
links = self.always[:]
|
links = self.always[:]
|
||||||
|
@ -1440,10 +1440,9 @@ class BrowserToolbar(Toolbar):
|
||||||
<a class=hitem href="%s"><img src="qrc:/icons/%s.png"></a>'''
|
<a class=hitem href="%s"><img src="qrc:/icons/%s.png"></a>'''
|
||||||
return fmt % (link, icon)
|
return fmt % (link, icon)
|
||||||
right = ""
|
right = ""
|
||||||
if self.browser.card:
|
right += borderImg("info", "info", False)
|
||||||
right += borderImg("info", "info", False)
|
right += borderImg("mark", "star16", mark)
|
||||||
right += borderImg("mark", "star16", mark)
|
right += borderImg("pause", "pause16", pause)
|
||||||
right += borderImg("pause", "pause16", pause)
|
|
||||||
self.web.stdHtml(self._body % (
|
self.web.stdHtml(self._body % (
|
||||||
" "+
|
" "+
|
||||||
"<span style='font-weight:normal;'>%s</span>"%_("On Selected:"),
|
"<span style='font-weight:normal;'>%s</span>"%_("On Selected:"),
|
||||||
|
|
|
@ -16,7 +16,8 @@ class Toolbar(object):
|
||||||
|
|
||||||
def draw(self):
|
def draw(self):
|
||||||
self.web.stdHtml(self._body % (
|
self.web.stdHtml(self._body % (
|
||||||
'<a class="hitem" href="anki">Anki ▾</a>',
|
# may want a context menu here in the future
|
||||||
|
' '*20,
|
||||||
self._centerLinks(),
|
self._centerLinks(),
|
||||||
self._rightIcons()),
|
self._rightIcons()),
|
||||||
self._css, focus=False)
|
self._css, focus=False)
|
||||||
|
|
Loading…
Reference in a new issue