[Digikam-devel] extragear/graphics/digikam/libs/database

[Andi Clemens]

SVN commit 984831 by aclemens:

Don't display the tag symbol inside of a tag thumbnail. This looks
strange.
Maybe we should even thing about getting rid of the tag border as soon
as a tag thumbnail has been set, like we do in album folder view?

For those of you who have "a tag inside a tag":
Right-click on the tag thumbnail and choose "Reset Icon".

CCMAIL:digikam-devel at kde.org

 M  +10 -2     albumdb.cpp  


--- trunk/extragear/graphics/digikam/libs/database/albumdb.cpp #984830:984831
@@ -497,8 +497,16 @@
 {
     if (!iconKDE.isEmpty())
     {
-        d->db->execSql( QString("UPDATE Tags SET iconkde=?, icon=0 WHERE id=?;"),
-                        iconKDE, tagID );
+        if (iconKDE.toLower() == QString("tag"))
+        {
+            d->db->execSql( QString("UPDATE Tags SET iconkde=NULL, icon=0 WHERE id=?;"),
+                            tagID );
+        }
+        else
+        {
+            d->db->execSql( QString("UPDATE Tags SET iconkde=?, icon=0 WHERE id=?;"),
+                            iconKDE, tagID );
+        }
     }
     else
     {