Use hover effect from KFileItemDelegate also for the details view and assure that...

svn path=/trunk/KDE/kdebase/apps/; revision=640453

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index 6406cb81dd8a5ac910fe154a2f301efbe091e3a2..683a97e4ef186291f7c803516c610964753d7001 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -42,6 +42,9 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
     setRootIsDecorated(false);
     setSortingEnabled(true);
     setUniformRowHeights(true);
+    setSelectionBehavior(SelectItems);
+
+    viewport()->setAttribute(Qt::WA_Hover);
 
     const ViewProperties props(controller->url());
     setSortIndicatorSection(props.sorting());

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 2956cf6bea3e1d81b65c4a01f9a46df746c02fc5..47c98f03fa95e5517ee4e4b54d18fb5fb776703f 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -622,6 +622,10 @@ void DolphinView::loadDirectory(const KUrl& url)
 
 void DolphinView::triggerItem(const QModelIndex& index)
 {
+    if (!isValidNameIndex(index)) {
+        return;
+    }
+
     const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
     if ((modifier & Qt::ShiftModifier) || (modifier & Qt::ControlModifier)) {
         // items are selected by the user, hence don't trigger the
@@ -893,7 +897,7 @@ void DolphinView::openContextMenu(const QPoint& pos)
     KFileItem* item = 0;
 
     const QModelIndex index = itemView()->indexAt(pos);
-    if (index.isValid()) {
+    if (isValidNameIndex(index)) {
         item = fileItem(index);
     }
 
@@ -906,7 +910,7 @@ void DolphinView::dropUrls(const KUrl::List& urls,
 {
     KFileItem* directory = 0;
     const QModelIndex index = itemView()->indexAt(pos);
-    if (index.isValid()) {
+    if (isValidNameIndex(index)) {
         KFileItem* item = fileItem(index);
         assert(item != 0);
         if (item->isDir()) {
@@ -1021,4 +1025,9 @@ QAbstractItemView* DolphinView::itemView() const
     return m_iconsView;
 }
 
+bool DolphinView::isValidNameIndex(const QModelIndex& index) const
+{
+    return index.isValid() && (index.column() == KDirModel::Name);
+}
+
 #include "dolphinview.moc"

diff --git a/src/dolphinview.h b/src/dolphinview.h
index 63ceb983a9f1ca4346f1289255ef22fc7e6134de..2507e9e8e69bcfa4a10963a2e6992bb55db7c94a 100644 (file)
--- a/src/dolphinview.h
+++ b/src/dolphinview.h
@@ -516,6 +516,12 @@ private:
      */
     QAbstractItemView* itemView() const;
 
+    /**
+     * Returns true if the index is valid and represents
+     * the column KDirModel::Name.
+     */
+    bool isValidNameIndex(const QModelIndex& index) const;
+
 private:
     bool m_showProgress;
     Mode m_mode;