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

List:       kde-commits
Subject:    branches/k3b/2.0
From:       Michal Malek <michalm () jabster ! pl>
Date:       2010-07-03 21:26:24
Message-ID: 20100703212624.9F2B2AC8E3 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1145707 by mmalek:

Fixed dropping files from Dolphin
BUG: 242745


 M  +1 -0      ChangeLog  
 M  +4 -1      src/projects/k3bdataprojectmodel.cpp  


--- branches/k3b/2.0/ChangeLog #1145706:1145707
@@ -2,6 +2,7 @@
 =====
 Bugfixes:
  * Freeze on ripping Audio CD using external encoder to MP3 or FLAC (236466)
+ * Drag and drop from Dolphin doesn't work (242745)
 
 2.0
 ===
--- branches/k3b/2.0/src/projects/k3bdataprojectmodel.cpp #1145706:1145707
@@ -434,7 +434,7 @@
 
 Qt::DropActions K3b::DataProjectModel::supportedDropActions() const
 {
-    return Qt::CopyAction;
+    return Qt::CopyAction | Qt::MoveAction;
 }
 
 
@@ -467,6 +467,9 @@
     }
 
     if ( data->hasFormat( "application/x-k3bdataitem" ) ) {
+        if( action == Qt::MoveAction )
+            return false;
+
         kDebug() << "data item drop";
 
         QByteArray itemData = data->data( "application/x-k3bdataitem" );
[prev in list] [next in list] [prev in thread] [next in thread]