X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/ffcd3ed51435668b203ce58d34d2d625e9a7889d..8a08dd71cae63ce4e2df8dbf5d93b8ba0dd27340:/src/sidebartreeview.cpp

diff --git a/src/sidebartreeview.cpp b/src/sidebartreeview.cpp
index c3b255f21..92e8e2908 100644
--- a/src/sidebartreeview.cpp
+++ b/src/sidebartreeview.cpp
@@ -19,17 +19,17 @@
 
 #include "sidebartreeview.h"
 
+#include "dolphincontroller.h"
+
 #include <kdirmodel.h>
 #include <kfileitemdelegate.h>
-
-#include <QDragEnterEvent>
-#include <QDropEvent>
+#include <QKeyEvent>
+#include <QPainter>
 #include <QHeaderView>
 
-SidebarTreeView::SidebarTreeView(DolphinMainWindow* mainWindow,
-                                 QWidget* parent) :
+SidebarTreeView::SidebarTreeView(QWidget* parent) :
     QTreeView(parent),
-    m_mainWindow(mainWindow)
+    m_dragging(false)
 {
     setAcceptDrops(true);
     setUniformRowHeights(true);
@@ -37,9 +37,16 @@ SidebarTreeView::SidebarTreeView(DolphinMainWindow* mainWindow,
     setEditTriggers(QAbstractItemView::NoEditTriggers);
     setSortingEnabled(true);
     setFrameStyle(QFrame::NoFrame);
+    setDragDropMode(QAbstractItemView::DragDrop);
+    setDropIndicatorShown(false);
+    setAutoExpandDelay(300);
 
     viewport()->setAttribute(Qt::WA_Hover);
 
+    QPalette palette = viewport()->palette();
+    palette.setColor(viewport()->backgroundRole(), Qt::transparent);
+    viewport()->setPalette(palette);
+
     KFileItemDelegate* delegate = new KFileItemDelegate(this);
     setItemDelegate(delegate);
 }
@@ -57,6 +64,7 @@ bool SidebarTreeView::event(QEvent* event)
         hideColumn(KDirModel::Permissions);
         hideColumn(KDirModel::Owner);
         hideColumn(KDirModel::Group);
+        hideColumn(KDirModel::Type);
         header()->hide();
     }
 
@@ -68,21 +76,54 @@ void SidebarTreeView::dragEnterEvent(QDragEnterEvent* event)
     if (event->mimeData()->hasUrls()) {
         event->acceptProposedAction();
     }
+    QTreeView::dragEnterEvent(event);
+    m_dragging = true;
+}
+
+void SidebarTreeView::dragLeaveEvent(QDragLeaveEvent* event)
+{
+    QTreeView::dragLeaveEvent(event);
+
+    // TODO: remove this code when the issue #160611 is solved in Qt 4.4
+    m_dragging = false;
+    setDirtyRegion(m_dropRect);
+}
+
+void SidebarTreeView::dragMoveEvent(QDragMoveEvent* event)
+{
+    QTreeView::dragMoveEvent(event);
+
+    // TODO: remove this code when the issue #160611 is solved in Qt 4.4
+    const QModelIndex index = indexAt(event->pos());
+    setDirtyRegion(m_dropRect);
+    m_dropRect = visualRect(index);
+    setDirtyRegion(m_dropRect);
 }
 
 void SidebarTreeView::dropEvent(QDropEvent* event)
 {
     const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
-    if (urls.isEmpty() || (event->source() == this)) {
+    if (urls.isEmpty()) {
         QTreeView::dropEvent(event);
-    }
-    else {
+    } else {
         event->acceptProposedAction();
         const QModelIndex index = indexAt(event->pos());
         if (index.isValid()) {
             emit urlsDropped(urls, index);
         }
     }
+    m_dragging = false;
+}
+
+void SidebarTreeView::paintEvent(QPaintEvent* event)
+{
+    QTreeView::paintEvent(event);
+
+    // TODO: remove this code when the issue #160611 is solved in Qt 4.4
+    if (m_dragging) {
+        const QBrush& brush = palette().brush(QPalette::Normal, QPalette::Highlight);
+        DolphinController::drawHoverIndication(viewport(), m_dropRect, brush);
+    }
 }
 
 #include "sidebartreeview.moc"