From 960cf5e713190bddbd0b852dbeba920c06f50963 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 25 Jan 2022 20:18:34 +0530
Subject: [PATCH] Some more context menu icons

---
 src/calibre/gui2/actions/sort.py             | 4 ++++
 src/calibre/gui2/search_restriction_mixin.py | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/calibre/gui2/actions/sort.py b/src/calibre/gui2/actions/sort.py
index ff1050f92c..58dd7a73fb 100644
--- a/src/calibre/gui2/actions/sort.py
+++ b/src/calibre/gui2/actions/sort.py
@@ -10,6 +10,7 @@ from qt.core import QAction, QDialog, QIcon, QToolButton, pyqtSignal
 
 from calibre.gui2.actions import InterfaceAction
 from calibre.utils.icu import primary_sort_key
+from calibre.library.field_metadata import category_icon_map
 from polyglot.builtins import iteritems
 
 SORT_HIDDEN_PREF = 'sort-action-hidden-fields'
@@ -36,6 +37,9 @@ class SortAction(QAction):
         QAction.__init__(self, text, parent)
         self.key, self.ascending = key, ascending
         self.triggered.connect(self)
+        ic = category_icon_map['custom:'] if self.key.startswith('#') else category_icon_map.get(key)
+        if ic:
+            self.setIcon(QIcon.ic(ic))
 
     def __call__(self):
         self.sort_requested.emit(self.key, self.ascending)
diff --git a/src/calibre/gui2/search_restriction_mixin.py b/src/calibre/gui2/search_restriction_mixin.py
index 896133863b..f7b433ecab 100644
--- a/src/calibre/gui2/search_restriction_mixin.py
+++ b/src/calibre/gui2/search_restriction_mixin.py
@@ -368,7 +368,7 @@ class SearchRestrictionMixin:
     def build_virtual_library_menu(self, m, add_tabs_action=True):
         m.clear()
 
-        a = m.addAction(_('Create Virtual library'))
+        a = m.addAction(QIcon.ic('plus.png'), _('Create Virtual library'))
         a.triggered.connect(partial(self.do_create_edit, name=None))
         db = self.current_db
         virt_libs = db.new_api.pref('virtual_libraries', {})
@@ -376,15 +376,15 @@ class SearchRestrictionMixin:
         a = self.edit_menu
         self.build_virtual_library_list(a, self.do_create_edit)
         if virt_libs:
-            m.addMenu(a)
+            m.addMenu(a).setIcon(QIcon.ic('edit_input.png'))
 
         a = self.rm_menu
         self.build_virtual_library_list(a, self.remove_vl_triggered)
         if virt_libs:
-            m.addMenu(a)
+            m.addMenu(a).setIcon(QIcon.ic('minus.png'))
 
         if virt_libs:
-            m.addAction(_('Quick select Virtual library'), self.choose_vl_triggerred)
+            m.addAction(QIcon.ic('toc.png'), _('Quick select Virtual library'), self.choose_vl_triggerred)
 
         if add_tabs_action:
             if gprefs['show_vl_tabs']: