Replace database icons with SVG's

Original source of icons is the icon8 library (http://icons8.com/c/flat-color-icons) and Paomedia (https://github.com/paomedia/small-n-flat). All icons used are licensed MIT or CC0; annotated in COPYING.

* Closes #4071

* Increase default size of database icons to 24px and entry preview panel to 48px
* Add shell script to assemble the database icons

* Use QIcon to seamlessly support High DPI displays and pixmap caching
* Add badge support for KeeShare groups and expired entries.
* Guard against use of QPixmap::fromImage without a GUI

* Add SVG minify and improve `make icons`

Co-authored-by: Wolfram Rösler <wolfram@roesler-ac.de>

1 files changed, 5 insertions, 6 deletions

diff --git a/src/core/Merger.cpp b/src/core/Merger.cpp
index 2becd8a68..83b1e5a44 100644
--- a/src/core/Merger.cpp
+++ b/src/core/Merger.cpp
@@ -612,12 +612,11 @@ Merger::ChangeList Merger::mergeMetadata(const MergeContext& context)
     auto* sourceMetadata = context.m_sourceDb->metadata();
     auto* targetMetadata = context.m_targetDb->metadata();
 
-    const auto keys = sourceMetadata->customIcons().keys();
-    for (QUuid customIconId : keys) {
-        if (!targetMetadata->containsCustomIcon(customIconId)) {
-            QImage customIcon = sourceMetadata->customIcon(customIconId);
-            targetMetadata->addCustomIcon(customIconId, customIcon);
-            changes << tr("Adding missing icon %1").arg(QString::fromLatin1(customIconId.toRfc4122().toHex()));
+    for (const auto& iconUuid : sourceMetadata->customIconsOrder()) {
+        if (!targetMetadata->hasCustomIcon(iconUuid)) {
+            QImage customIcon = sourceMetadata->customIcon(iconUuid);
+            targetMetadata->addCustomIcon(iconUuid, customIcon);
+            changes << tr("Adding missing icon %1").arg(QString::fromLatin1(iconUuid.toRfc4122().toHex()));
         }
     }