X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/136fd2ec49cbba41b6a8d26c241c363573a3c3b8..ec00f379dc42b00a64ab1af25bb4bb1a06bd7449:/src/dolphindetailsview.cpp

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index c3cf44388..1aec30cca 100644
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -52,6 +52,7 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
     setSelectionBehavior(SelectItems);
     setDragDropMode(QAbstractItemView::DragDrop);
     setDropIndicatorShown(false);
+    setAlternatingRowColors(true);
 
     setMouseTracking(true);
     viewport()->setAttribute(Qt::WA_Hover);
@@ -70,13 +71,11 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
 
     if (KGlobalSettings::singleClick()) {
         connect(this, SIGNAL(clicked(const QModelIndex&)),
-                controller, SLOT(triggerItem(const QModelIndex&)));
+                this, SLOT(slotItemActivated(const QModelIndex&)));
     } else {
         connect(this, SIGNAL(doubleClicked(const QModelIndex&)),
-                controller, SLOT(triggerItem(const QModelIndex&)));
+                this, SLOT(slotItemActivated(const QModelIndex&)));
     }
-    connect(this, SIGNAL(activated(const QModelIndex&)),
-            controller, SLOT(triggerItem(const QModelIndex&)));
     connect(this, SIGNAL(entered(const QModelIndex&)),
             this, SLOT(slotEntered(const QModelIndex&)));
     connect(this, SIGNAL(viewportEntered()),
@@ -155,15 +154,18 @@ void DolphinDetailsView::contextMenuEvent(QContextMenuEvent* event)
 
 void DolphinDetailsView::mousePressEvent(QMouseEvent* event)
 {
-    if (!indexAt(event->pos()).isValid()) {
+    m_controller->triggerActivation();
+
+    QTreeView::mousePressEvent(event);
+
+    const QModelIndex index = indexAt(event->pos());
+    if (!index.isValid() || (index.column() != KDirModel::Name)) {
         const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
         if (!(modifier & Qt::ShiftModifier) && !(modifier & Qt::ControlModifier)) {
             clearSelection();
         }
     }
 
-    QTreeView::mousePressEvent(event);
-
     if (event->button() == Qt::LeftButton) {
         m_showElasticBand = true;
 
@@ -190,7 +192,6 @@ void DolphinDetailsView::mouseReleaseEvent(QMouseEvent* event)
         updateElasticBand();
         m_showElasticBand = false;
     }
-    m_controller->triggerActivation();
 }
 
 void DolphinDetailsView::dragEnterEvent(QDragEnterEvent* event)
@@ -220,11 +221,15 @@ void DolphinDetailsView::dragMoveEvent(QDragMoveEvent* event)
     QTreeView::dragMoveEvent(event);
 
     // TODO: remove this code when the issue #160611 is solved in Qt 4.4
-    const QPoint pos(0, event->pos().y());
-    const QModelIndex index = indexAt(pos);
-    setDirtyRegion(m_dropRect);
-    m_dropRect = visualRect(index);
     setDirtyRegion(m_dropRect);
+    const QModelIndex index = indexAt(event->pos());
+    if (!index.isValid() || (index.column() != KDirModel::Name)) {
+        m_dragging = false;
+    } else {
+        m_dragging = true;
+        m_dropRect = visualRect(index);
+        setDirtyRegion(m_dropRect);
+    }
 }
 
 void DolphinDetailsView::dropEvent(QDropEvent* event)
@@ -259,16 +264,10 @@ void DolphinDetailsView::paintEvent(QPaintEvent* event)
         painter.restore();
     }
 
+    // TODO: remove this code when the issue #160611 is solved in Qt 4.4
     if (m_dragging) {
-        // TODO: remove this code when the issue #160611 is solved in Qt 4.4
-        QPainter painter(viewport());
-        painter.save();
-        QBrush brush(m_viewOptions.palette.brush(QPalette::Normal, QPalette::Highlight));
-        QColor color = brush.color();
-        color.setAlpha(64);
-        brush.setColor(color);
-        painter.fillRect(m_dropRect, brush);
-        painter.restore();
+        const QBrush& brush = m_viewOptions.palette.brush(QPalette::Normal, QPalette::Highlight);
+        DolphinController::drawHoverIndication(viewport(), m_dropRect, brush);
     }
 }
 
@@ -392,4 +391,19 @@ QRect DolphinDetailsView::elasticBandRect() const
     return QRect(topLeft, m_elasticBandDestination).normalized();
 }
 
+static bool isValidNameIndex(const QModelIndex& index)
+{
+    return index.isValid() && (index.column() == KDirModel::Name);
+}
+
+void DolphinDetailsView::slotItemActivated(const QModelIndex& index)
+{
+    if (!isValidNameIndex(index)) {
+        clearSelection();
+        m_controller->emitItemEntered(index);
+    } else {
+        m_controller->triggerItem(index);
+    }
+}
+
 #include "dolphindetailsview.moc"