Minor refactoring

ping · Jul 7, 2023 · 99c88a4 · 99c88a4
1 parent 8f1385d
commit 99c88a4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/calibre-plugin/__init__.py b/calibre-plugin/__init__.py
@@ -24,12 +24,12 @@
 
 
 class PluginIcons(str, Enum):
-    ReturnLoan = "return"
+    Return = "return"
     Download = "download"
     ExternalLink = "ext-link"
     Refresh = "refresh"
-    Borrow = "borrow"
-    CancelHold = "cancel-hold"
+    Add = "add-file"
+    Delete = "delete"
     AddMagazine = "magazines-add"
     CancelMagazine = "cancel-sub"
 
@@ -38,12 +38,12 @@ def __str__(self):
 
 
 ICON_MAP = {
-    PluginIcons.ReturnLoan: "arrow-go-back-fill.png",
+    PluginIcons.Return: "arrow-go-back-fill.png",
     PluginIcons.Download: "download-line.png",
     PluginIcons.ExternalLink: "external-link-line.png",
     PluginIcons.Refresh: "refresh-line.png",
-    PluginIcons.Borrow: "file-add-line.png",
-    PluginIcons.CancelHold: "delete-bin-line.png",
+    PluginIcons.Add: "file-add-line.png",
+    PluginIcons.Delete: "delete-bin-line.png",
     PluginIcons.AddMagazine: "heart-add-line.png",
     PluginIcons.CancelMagazine: "dislike-line.png",
 }

diff --git a/calibre-plugin/dialog/holds.py b/calibre-plugin/dialog/holds.py
@@ -126,7 +126,7 @@ def __init__(self, gui, icon, do_user_config, icons):
         )
         # Borrow button
         self.borrow_btn = QPushButton(_("Borrow"), self)
-        self.borrow_btn.setIcon(self.icons[PluginIcons.Borrow])
+        self.borrow_btn.setIcon(self.icons[PluginIcons.Add])
         self.borrow_btn.setAutoDefault(False)
         self.borrow_btn.setToolTip(_("Borrow selected hold"))
         self.borrow_btn.setStyleSheet("padding: 4px 16px")
@@ -177,7 +177,7 @@ def holds_view_context_menu_requested(self, pos):
             lambda: self.view_in_overdrive_action_triggered(indices, self.holds_model)
         )
         cancel_action = menu.addAction(_("Cancel hold"))
-        cancel_action.setIcon(self.icons[PluginIcons.CancelHold])
+        cancel_action.setIcon(self.icons[PluginIcons.Delete])
         cancel_action.triggered.connect(lambda: self.cancel_action_triggered(indices))
         menu.exec(QCursor.pos())
 

diff --git a/calibre-plugin/dialog/loans.py b/calibre-plugin/dialog/loans.py
@@ -190,7 +190,7 @@ def loans_view_context_menu_requested(self, pos):
                 n=len(indices)
             )
         )
-        return_action.setIcon(self.icons[PluginIcons.ReturnLoan])
+        return_action.setIcon(self.icons[PluginIcons.Return])
         return_action.triggered.connect(lambda: self.return_action_triggered(indices))
         menu.exec(QCursor.pos())
 

diff --git a/calibre-plugin/dialog/magazines.py b/calibre-plugin/dialog/magazines.py
@@ -162,7 +162,7 @@ def __init__(self, gui, icon, do_user_config, icons):
 
         # Borrow button
         self.magazines_borrow_btn = QPushButton(_("Borrow"), self)
-        self.magazines_borrow_btn.setIcon(self.icons[PluginIcons.Borrow])
+        self.magazines_borrow_btn.setIcon(self.icons[PluginIcons.Add])
         self.magazines_borrow_btn.setAutoDefault(False)
         self.magazines_borrow_btn.setToolTip(_("Borrow selected magazine"))
         self.magazines_borrow_btn.setStyleSheet("padding: 4px 16px")