Fwd: extragear/graphics/digikam/digikam

Another possibility would be to check if only one collection is set.
If so, move the album to the collection root.

Andi

SVN commit 985047 by aclemens:

Dropping an album into an empty space in the albumfolderview added this
album to the albumroot. But since we have multiple collections, this
isn't working anymore.

Disabling it for now because we get an error, but I would suggest to
remove  this forever, because we can not guess the
correct collection, in where the album should be moved.

 M  +10 -1     albumfolderview.cpp  


--- trunk/extragear/graphics/digikam/digikam/albumfolderview.cpp #985046:985047
@@ -970,6 +970,9 @@
 
         if (AlbumSettings::instance()->getAlbumSortOrder() == AlbumSettings::ByFolder)
         {
+            if (!itemDrop)
+                return;
+
             // TODO: Copy?
             KMenu popMenu(this);
             popMenu.addTitle(SmallIcon("digikam"), i18n("My Albums"));
@@ -983,12 +986,18 @@
             {
                 PAlbum *album = itemDrag->album();
                 PAlbum *destAlbum;
+
+                /*
                 if(!itemDrop)
                 {
+                    // FIXME: old code? Doesn't seem to work with multiple collections anymore.
+                    // returning for now. Any better solution?
+
                     // move dragItem to the root
-                    destAlbum = d->albumMan->findPAlbum(0);
+                    // destAlbum = d->albumMan->findPAlbum(0);
                 }
                 else
+                */
                 {
                     // move dragItem below dropItem
                     destAlbum = itemDrop->album();

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel