[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [digikam] /: use CoreDbOperationGroup
From:       Maik Qualmann <null () kde ! org>
Date:       2018-07-31 20:12:20
Message-ID: E1fkb0G-0000zd-65 () code ! kde ! org
[Download RAW message or body]

Git commit ff2415c06095c98a439f886002bb6df824c12db9 by Maik Qualmann.
Committed on 31/07/2018 at 20:11.
Pushed by mqualmann into branch 'master'.

use CoreDbOperationGroup
BUGS: 91562
FIXED-IN: 6.0.0

M  +2    -1    NEWS
M  +7    -1    core/app/items/digikamimageview.cpp

https://commits.kde.org/digikam/ff2415c06095c98a439f886002bb6df824c12db9

diff --git a/NEWS b/NEWS
index 0f5e942c82..d54b3f4328 100644
--- a/NEWS
+++ b/NEWS
@@ -306,4 +306,5 @@ BUGFIXES:
 251 ==> 396712 - "Save Search" does not work.
 252 ==> 396944 - Integrity constraint violation on Albums.icons when migrating from sqlite to mysql.
 253 ==> 396952 - Cut and Paste Into Caption Has Incorrect Font Initially.
-254 ==> 
+254 ==> 91562  - Change order of pictures in the virtual album manually.
+255 ==> 
diff --git a/core/app/items/digikamimageview.cpp b/core/app/items/digikamimageview.cpp
index c6098e4d0b..57e6f1347a 100644
--- a/core/app/items/digikamimageview.cpp
+++ b/core/app/items/digikamimageview.cpp
@@ -43,6 +43,7 @@
 #include "digikam_debug.h"
 #include "albummanager.h"
 #include "coredb.h"
+#include "coredboperationgroup.h"
 #include "advancedrenamedialog.h"
 #include "advancedrenameprocessdialog.h"
 #include "applicationsettings.h"
@@ -228,6 +229,9 @@ void DigikamImageView::dragDropSort(const ImageInfo& pick, const QList<ImageInfo
 
     QApplication::setOverrideCursor(Qt::WaitCursor);
 
+    CoreDbOperationGroup group;
+    group.setMaximumTime(200);
+
     foreach(ImageInfo info, infoList)
     {
         if (!found && info.name() == pick.name())
@@ -251,8 +255,10 @@ void DigikamImageView::dragDropSort(const ImageInfo& pick, const QList<ImageInfo
             }
 
             info.setManualOrder(counter);
-            counter += (order ? 1000 : -1000);
+            counter += (order ? 100 : -100);
         }
+
+        group.allowLift();
     }
 
     QApplication::restoreOverrideCursor();
[prev in list] [next in list] [prev in thread] [next in thread]