Use KonqOperations::doDrop() instead of a custom dropping code. Still some minor...

[dolphin.git] / src / dolphincolumnwidget.cpp

diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp
index 5b3ffae59171c51d89d1217fe6124f1ab1e21f53..f5d3ca435938e621b485f2cb60ca3d25f42e10c8 100644 (file)
--- a/src/dolphincolumnwidget.cpp
+++ b/src/dolphincolumnwidget.cpp
@@ -29,13 +29,13 @@
 #include "dolphin_generalsettings.h"
 #include "draganddrophelper.h"
 #include "folderexpander.h"
-#include "kfilepreviewgenerator.h"
 #include "selectionmanager.h"
 #include "tooltipmanager.h"
 
 #include <kcolorscheme.h>
 #include <kdirlister.h>
 #include <kfileitem.h>
+#include <kfilepreviewgenerator.h>
 #include <kio/previewjob.h>
 #include <kiconeffect.h>
 #include <kjob.h>
@@ -93,6 +93,7 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent,
     setDecorationSize(QSize(iconSize, iconSize));
 
     KFileItemDelegate* delegate = new KFileItemDelegate(this);
+    delegate->setShowToolTipWhenElided(false);
     setItemDelegate(delegate);
 
     activate();
@@ -132,7 +133,7 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent,
     }
 
     m_previewGenerator = new KFilePreviewGenerator(this, m_proxyModel);
-    m_previewGenerator->setShowPreview(m_view->m_controller->dolphinView()->showPreview());
+    m_previewGenerator->setPreviewShown(m_view->m_controller->dolphinView()->showPreview());
 
     if (DolphinSettings::instance().generalSettings()->showToolTips()) {
         new ToolTipManager(this, m_proxyModel);
@@ -213,7 +214,7 @@ void DolphinColumnWidget::setShowHiddenFiles(bool show)
 
 void DolphinColumnWidget::setShowPreview(bool show)
 {
-    m_previewGenerator->setShowPreview(show);
+    m_previewGenerator->setPreviewShown(show);
 
     m_dirLister->stop();
     m_dirLister->openUrl(m_url, KDirLister::Reload);
@@ -330,16 +331,10 @@ void DolphinColumnWidget::dragMoveEvent(QDragMoveEvent* event)
 
 void DolphinColumnWidget::dropEvent(QDropEvent* event)
 {
-    const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
-    if (!urls.isEmpty()) {
-        const QModelIndex index = indexAt(event->pos());
-        m_view->m_controller->setItemView(this);
-        const KFileItem item = m_view->m_controller->itemForIndex(index);
-        m_view->m_controller->indicateDroppedUrls(urls,
-                                                  url(),
-                                                  item);
-        event->acceptProposedAction();
-    }
+    const QModelIndex index = indexAt(event->pos());
+    m_view->m_controller->setItemView(this);
+    const KFileItem item = m_view->m_controller->itemForIndex(index);
+    m_view->m_controller->indicateDroppedUrls(item, url(), event);
     QListView::dropEvent(event);
 }