X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/c8a4f1fd8d3c9b50e51b7234123b3fbe0b979552..da795d20e2f2fa57ac9cafdffcfac4d092d8eaea:/src/dolphindetailsview.cpp

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index 88537471b..87fa85165 100644
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -30,11 +30,11 @@
 #include <kdirmodel.h>
 #include <kfileitemdelegate.h>
 
-#include <QHeaderView>
+#include <QtGui/QHeaderView>
 
 DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* controller) :
-        QTreeView(parent),
-        m_controller(controller)
+    QTreeView(parent),
+    m_controller(controller)
 {
     Q_ASSERT(controller != 0);
 
@@ -46,6 +46,7 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
     setDragDropMode(QAbstractItemView::DragDrop);
     setDropIndicatorShown(false);
 
+    setMouseTracking(true);
     viewport()->setAttribute(Qt::WA_Hover);
 
     const ViewProperties props(controller->url());
@@ -60,11 +61,19 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
     connect(parent, SIGNAL(sortOrderChanged(Qt::SortOrder)),
             this, SLOT(setSortIndicatorOrder(Qt::SortOrder)));
 
-    connect(this, SIGNAL(clicked(const QModelIndex&)),
-            controller, SLOT(triggerItem(const QModelIndex&)));
+    if (KGlobalSettings::singleClick()) {
+        connect(this, SIGNAL(clicked(const QModelIndex&)),
+                controller, SLOT(triggerItem(const QModelIndex&)));
+    } else {
+        connect(this, SIGNAL(doubleClicked(const QModelIndex&)),
+                controller, SLOT(triggerItem(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()),
+            controller, SLOT(emitViewportEntered()));
     connect(controller, SIGNAL(zoomIn()),
             this, SLOT(zoomIn()));
     connect(controller, SIGNAL(zoomOut()),
@@ -116,6 +125,10 @@ bool DolphinDetailsView::event(QEvent* event)
         if (!settings->showGroup()) {
             hideColumn(KDirModel::Group);
         }
+
+        if (!settings->showType()) {
+            hideColumn(KDirModel::Type);
+        }
     }
 
     return QTreeView::event(event);
@@ -179,6 +192,18 @@ void DolphinDetailsView::synchronizeSortingState(int column)
     m_controller->indicateSortOrderChange(sortOrder);
 }
 
+void DolphinDetailsView::slotEntered(const QModelIndex& index)
+{
+    const QPoint pos = viewport()->mapFromGlobal(QCursor::pos());
+    const int nameColumnWidth = header()->sectionSize(KDirModel::Name);
+    if (pos.x() < nameColumnWidth) {
+        m_controller->emitItemEntered(index);
+    }
+    else {
+        m_controller->emitViewportEntered();
+    }
+}
+
 void DolphinDetailsView::zoomIn()
 {
     if (isZoomInPossible()) {