Copy custom icons when copying/moving entries/groups to another database.

src/core/Group.cpp

@@ -436,6 +436,27 @@ QList<const Group*> Group::groupsRecursive(bool includeSelf) const
     return groupList;
 }
 
+QSet<Uuid> Group::customIconsRecursive() const
+{
+    QSet<Uuid> result;
+
+    if (!iconUuid().isNull()) {
+        result.insert(iconUuid());
+    }
+
+    Q_FOREACH (Entry* entry, entriesRecursive(true)) {
+        if (!entry->iconUuid().isNull()) {
+            result.insert(entry->iconUuid());
+        }
+    }
+
+    Q_FOREACH (Group* group, m_children) {
+        result.unite(group->customIconsRecursive());
+    }
+
+    return result;
+}
+
 Group* Group::clone() const
 {
     // TODO: what to do about custom icons?

src/core/Group.h

@@ -99,6 +99,7 @@ public:
     const QList<Entry*>& entries() const;
     QList<Entry*> entriesRecursive(bool includeHistoryItems = false) const;
     QList<const Group*> groupsRecursive(bool includeSelf) const;
+    QSet<Uuid> customIconsRecursive() const;
     Group* clone() const;
 
     QList<Entry*> search(const QString& searchTerm, Qt::CaseSensitivity caseSensitivity,

src/core/Metadata.cpp

@@ -348,6 +348,17 @@ void Metadata::removeCustomIcon(const Uuid& uuid)
     Q_EMIT modified();
 }
 
+void Metadata::copyCustomIcons(const QSet<Uuid>& iconList, const Metadata* otherMetadata)
+{
+    Q_FOREACH (const Uuid& uuid, iconList) {
+        Q_ASSERT(otherMetadata->containsCustomIcon(uuid));
+
+        if (!containsCustomIcon(uuid)) {
+            addCustomIcon(uuid, otherMetadata->customIcon(uuid));
+        }
+    }
+}
+
 void Metadata::setRecycleBinEnabled(bool value)
 {
     set(m_recycleBinEnabled, value);

src/core/Metadata.h

@@ -91,6 +91,7 @@ public:
     // void setAutoEnableVisualHiding(bool value);
     void addCustomIcon(const Uuid& uuid, const QImage& icon);
     void removeCustomIcon(const Uuid& uuid);
+    void copyCustomIcons(const QSet<Uuid>& iconList, const Metadata* otherMetadata);
     void setRecycleBinEnabled(bool value);
     void setRecycleBin(Group* group);
     void setRecycleBinChanged(const QDateTime& value);

src/gui/group/GroupModel.cpp

@@ -23,6 +23,7 @@
 #include "core/Database.h"
 #include "core/DatabaseIcons.h"
 #include "core/Group.h"
+#include "core/Metadata.h"
 #include "core/Tools.h"
 
 GroupModel::GroupModel(Database* db, QObject* parent)
@@ -262,6 +263,14 @@ bool GroupModel::dropMimeData(const QMimeData* data, Qt::DropAction action,
             group = dragGroup->clone();
         }
 
+        Database* sourceDb = dragGroup->database();
+        Database* targetDb = parentGroup->database();
+
+        if (sourceDb != targetDb) {
+            QSet<Uuid> customIcons = group->customIconsRecursive();
+            targetDb->metadata()->copyCustomIcons(customIcons, sourceDb->metadata());
+        }
+
         group->setParent(parentGroup, row);
     }
     else {
@@ -292,6 +301,16 @@ bool GroupModel::dropMimeData(const QMimeData* data, Qt::DropAction action,
                 entry = dragEntry->clone();
             }
 
+            Database* sourceDb = dragEntry->group()->database();
+            Database* targetDb = parentGroup->database();
+            Uuid customIcon = entry->iconUuid();
+
+            if (sourceDb != targetDb && !customIcon.isNull()
+                    && !targetDb->metadata()->containsCustomIcon(customIcon)) {
+                targetDb->metadata()->addCustomIcon(customIcon,
+                                                    sourceDb->metadata()->customIcon(customIcon));
+            }
+
             entry->setGroup(parentGroup);
         }
     }