From 97283985895f364f885a6005e93152678db14236 Mon Sep 17 00:00:00 2001
From: mattesony <49170923+mattesony@users.noreply.github.com>
Date: Tue, 1 Nov 2022 23:23:29 -0700
Subject: [PATCH] Added icon for expire action

---
 COPYING                                       |  3 +-
 .../scalable/actions/entry-expire.svg         | 51 +++++++++++++++++++
 share/icons/icons.qrc                         |  1 +
 src/gui/reports/ReportsWidgetHealthcheck.cpp  |  2 +-
 src/gui/reports/ReportsWidgetHibp.cpp         |  2 +-
 5 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 share/icons/application/scalable/actions/entry-expire.svg

diff --git a/COPYING b/COPYING
index a518de87e3..b32ff2e3eb 100644
--- a/COPYING
+++ b/COPYING
@@ -135,7 +135,8 @@ Copyright: none
 License: CC0
 Comment: Taken from https://github.com/paomedia/small-n-flat
 
-Files: share/icons/badges/2_Expired.svg
+Files: share/icons/application/scalable/actions/entry-expire.svg
+       share/icons/badges/2_Expired.svg
        share/icons/database/C37_KPercentage.svg
        share/icons/database/C45_Cancel.svg
        share/icons/database/C46_Help.svg
diff --git a/share/icons/application/scalable/actions/entry-expire.svg b/share/icons/application/scalable/actions/entry-expire.svg
new file mode 100644
index 0000000000..0a3a1f1ec6
--- /dev/null
+++ b/share/icons/application/scalable/actions/entry-expire.svg
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 48 48"
+   style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2"
+   version="1.1"
+   id="svg10"
+   sodipodi:docname="entry-expire.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     id="namedview12"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="16"
+     inkscape:cx="30"
+     inkscape:cy="17.59375"
+     inkscape:window-width="1720"
+     inkscape:window-height="1370"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g4" />
+  <g
+     transform="matrix(0.983029,0,0,0.983029,-2.1525036,-4.6916677)"
+     id="g4"
+     style="display:inline;fill:#000000;fill-opacity:1"
+     inkscape:groupmode="layer"
+     inkscape:label="#g4">
+    <path
+       id="circle2"
+       style="fill:#000000;fill-opacity:1;stroke-width:0.983029"
+       d="M 24,4 A 19.999724,19.999724 0 0 0 4,24 19.999724,19.999724 0 0 0 24,44 19.999724,19.999724 0 0 0 44,24 19.999724,19.999724 0 0 0 24,4 Z m -8.361328,10.15625 h 4.679687 L 24,20.941406 27.681641,14.15625 h 4.679687 L 26.630859,23.931641 32.5,33.84375 H 27.792969 L 24,26.949219 20.207031,33.84375 H 15.5 l 5.869141,-9.912109 z"
+       transform="matrix(1.017264,0,0,1.017264,2.1896644,4.7726646)" />
+  </g>
+  <g
+     transform="matrix(27.6873,0,0,27.6873,15.195439,33.842835)"
+     id="g8"
+     style="display:inline;fill:#ffffff;fill-opacity:1"
+     inkscape:groupmode="layer"
+     inkscape:label="#g8" />
+</svg>
diff --git a/share/icons/icons.qrc b/share/icons/icons.qrc
index 4982e3b0e3..8824e1d3b4 100644
--- a/share/icons/icons.qrc
+++ b/share/icons/icons.qrc
@@ -36,6 +36,7 @@
         <file>application/scalable/actions/edit-clear-locationbar-rtl.svg</file>
         <file>application/scalable/actions/entry-clone.svg</file>
         <file>application/scalable/actions/entry-delete.svg</file>
+        <file>application/scalable/actions/entry-expire.svg</file>
         <file>application/scalable/actions/entry-restore.svg</file>
         <file>application/scalable/actions/entry-edit.svg</file>
         <file>application/scalable/actions/entry-new.svg</file>
diff --git a/src/gui/reports/ReportsWidgetHealthcheck.cpp b/src/gui/reports/ReportsWidgetHealthcheck.cpp
index 48aaed6d12..865020f1e7 100644
--- a/src/gui/reports/ReportsWidgetHealthcheck.cpp
+++ b/src/gui/reports/ReportsWidgetHealthcheck.cpp
@@ -331,7 +331,7 @@ void ReportsWidgetHealthcheck::customMenuRequested(QPoint pos)
     }
 
     // Create the "Expire entry" menu item
-    const auto expEntry = new QAction(tr("Expire Entry(s)…", "", selected.size()), this);
+    const auto expEntry = new QAction(icons()->icon("entry-expire"), tr("Expire Entry(s)…", "", selected.size()), this);
     menu->addAction(expEntry);
     connect(expEntry, &QAction::triggered, this, &ReportsWidgetHealthcheck::expireSelectedEntries);
 
diff --git a/src/gui/reports/ReportsWidgetHibp.cpp b/src/gui/reports/ReportsWidgetHibp.cpp
index f1b921cd1b..a32c3c9025 100644
--- a/src/gui/reports/ReportsWidgetHibp.cpp
+++ b/src/gui/reports/ReportsWidgetHibp.cpp
@@ -375,7 +375,7 @@ void ReportsWidgetHibp::customMenuRequested(QPoint pos)
     }
 
     // Create the "Expire entry" menu item
-    const auto expEntry = new QAction(tr("Expire Entry(s)…", "", selected.size()), this);
+    const auto expEntry = new QAction(icons()->icon("entry-expire"), tr("Expire Entry(s)…", "", selected.size()), this);
     menu->addAction(expEntry);
     connect(expEntry, &QAction::triggered, this, &ReportsWidgetHibp::expireSelectedEntries);