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

Simplify sidebar context menu separators

Browse source 
Qt can collapse consecutive menu separators, so no need to check if a
subroutine has actually added any actions to the menu.
This commit is contained in:
RumovZ 2021-09-19 18:33:36 +02:00
parent f00f7f099f
commit 94b261f1ef
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
qt/aqt/browser/sidebar/tree.py
View file

@ -867,10 +867,13 @@ class SidebarTreeView(QTreeView):
def show_context_menu(self, item: SidebarItem, index: QModelIndex) -> None: def show_context_menu(self, item: SidebarItem, index: QModelIndex) -> None:
menu = QMenu() menu = QMenu()
self._maybe_add_type_specific_actions(menu, item) self._maybe_add_type_specific_actions(menu, item)
menu.addSeparator()
self._maybe_add_delete_action(menu, item, index) self._maybe_add_delete_action(menu, item, index)
self._maybe_add_rename_actions(menu, item, index) self._maybe_add_rename_actions(menu, item, index)
self._maybe_add_find_and_replace_action(menu, item, index) self._maybe_add_find_and_replace_action(menu, item, index)
menu.addSeparator()
self._maybe_add_search_actions(menu) self._maybe_add_search_actions(menu)
menu.addSeparator()
self._maybe_add_tree_actions(menu) self._maybe_add_tree_actions(menu)
gui_hooks.browser_sidebar_will_show_context_menu(self, menu, item, index) gui_hooks.browser_sidebar_will_show_context_menu(self, menu, item, index)
if menu.children(): if menu.children():
@ -932,7 +935,6 @@ class SidebarTreeView(QTreeView):
] ]
if not nodes: if not nodes:
return return
menu.addSeparator()
if len(nodes) == 1: if len(nodes) == 1:
menu.addAction(tr.actions_search(), lambda: self.update_search(*nodes)) menu.addAction(tr.actions_search(), lambda: self.update_search(*nodes))
return return
@ -963,7 +965,6 @@ class SidebarTreeView(QTreeView):
if not any(item.children for item in selected_items): if not any(item.children for item in selected_items):
return return
menu.addSeparator()
if any(not item.expanded for item in selected_items if item.children): if any(not item.expanded for item in selected_items if item.children):
menu.addAction(tr.browsing_sidebar_expand(), lambda: set_expanded(True)) menu.addAction(tr.browsing_sidebar_expand(), lambda: set_expanded(True))
if any(item.expanded for item in selected_items if item.children): if any(item.expanded for item in selected_items if item.children):