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

List:       kde-commits
Subject:    extragear/multimedia/k3b
From:       Michal Malek <michalm () jabster ! pl>
Date:       2010-07-03 21:28:47
Message-ID: 20100703212847.9D74FAC8E3 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1145708 by mmalek:

Fixed dropping files from Dolphin
BUG: 242745

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


--- trunk/extragear/multimedia/k3b/ChangeLog #1145707:1145708
@@ -8,6 +8,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
 ===
--- trunk/extragear/multimedia/k3b/src/projects/k3bdataprojectmodel.cpp #1145707:1145708
@@ -417,7 +417,7 @@
 
 Qt::DropActions K3b::DataProjectModel::supportedDropActions() const
 {
-    return Qt::CopyAction;
+    return Qt::CopyAction | Qt::MoveAction;
 }
 
 
@@ -450,6 +450,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]