fixed some activation issues in combination with split views

[dolphin.git] / src / dolphindetailsview.cpp

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index 7737799768dea4ad7d7b927d032029a2a9f14d14..6a3f4bf187661d1442e1e4e8785e91adde25180d 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -28,13 +28,20 @@
 #include "dolphin_detailsmodesettings.h"
 
 #include <kdirmodel.h>
 #include "dolphin_detailsmodesettings.h"
 
 #include <kdirmodel.h>

-#include <kfileitemdelegate.h>

 
 

+#include <QApplication>

 #include <QHeaderView>
 #include <QHeaderView>

+#include <QRubberBand>
+#include <QPainter>
+#include <QScrollBar>

 
 DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* controller) :
     QTreeView(parent),
 
 DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* controller) :
     QTreeView(parent),

-    m_controller(controller)
+    m_controller(controller),
+    m_dragging(false),
+    m_showElasticBand(false),
+    m_elasticBandOrigin(),
+    m_elasticBandDestination()

 {
     Q_ASSERT(controller != 0);
 
 {
     Q_ASSERT(controller != 0);
 


@@ -43,7 +50,10 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
     setSortingEnabled(true);
     setUniformRowHeights(true);
     setSelectionBehavior(SelectItems);
     setSortingEnabled(true);
     setUniformRowHeights(true);
     setSelectionBehavior(SelectItems);

+    setDragDropMode(QAbstractItemView::DragDrop);
+    setDropIndicatorShown(false);

 
 

+    setMouseTracking(true);

     viewport()->setAttribute(Qt::WA_Hover);
 
     const ViewProperties props(controller->url());
     viewport()->setAttribute(Qt::WA_Hover);
 
     const ViewProperties props(controller->url());


@@ -58,11 +68,19 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
     connect(parent, SIGNAL(sortOrderChanged(Qt::SortOrder)),
             this, SLOT(setSortIndicatorOrder(Qt::SortOrder)));
 
     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(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()),
     connect(controller, SIGNAL(zoomIn()),
             this, SLOT(zoomIn()));
     connect(controller, SIGNAL(zoomOut()),


@@ -73,11 +91,13 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
     Q_ASSERT(settings != 0);
 
     m_viewOptions = QTreeView::viewOptions();
     Q_ASSERT(settings != 0);
 
     m_viewOptions = QTreeView::viewOptions();

-    m_viewOptions.font = QFont(settings->fontFamily(), settings->fontSize());
-    updateDecorationSize();

 
 

-    KFileItemDelegate* delegate = new KFileItemDelegate(parent);
-    setItemDelegate(delegate);
+    QFont font(settings->fontFamily(), settings->fontSize());
+    font.setItalic(settings->italicFont());
+    font.setBold(settings->boldFont());
+    m_viewOptions.font = font;
+
+    updateDecorationSize();

 }
 
 DolphinDetailsView::~DolphinDetailsView()
 }
 
 DolphinDetailsView::~DolphinDetailsView()


@@ -113,6 +133,10 @@ bool DolphinDetailsView::event(QEvent* event)
         if (!settings->showGroup()) {
             hideColumn(KDirModel::Group);
         }
         if (!settings->showGroup()) {
             hideColumn(KDirModel::Group);
         }

+
+        if (!settings->showType()) {
+            hideColumn(KDirModel::Type);
+        }

     }
 
     return QTreeView::event(event);
     }
 
     return QTreeView::event(event);


@@ -129,10 +153,46 @@ void DolphinDetailsView::contextMenuEvent(QContextMenuEvent* event)
     m_controller->triggerContextMenuRequest(event->pos());
 }
 
     m_controller->triggerContextMenuRequest(event->pos());
 }
 

+void DolphinDetailsView::mousePressEvent(QMouseEvent* event)
+{
+    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();
+        }
+    }
+
+    if (event->button() == Qt::LeftButton) {
+        m_showElasticBand = true;
+
+        const QPoint pos(contentsPos());
+        m_elasticBandOrigin = event->pos();
+        m_elasticBandOrigin.setX(m_elasticBandOrigin.x() + pos.x());
+        m_elasticBandOrigin.setY(m_elasticBandOrigin.y() + pos.y());
+        m_elasticBandDestination = event->pos();
+    }
+}
+
+void DolphinDetailsView::mouseMoveEvent(QMouseEvent* event)
+{
+    QTreeView::mouseMoveEvent(event);
+    if (m_showElasticBand) {
+        updateElasticBand();
+    }
+}
+

 void DolphinDetailsView::mouseReleaseEvent(QMouseEvent* event)
 {
     QTreeView::mouseReleaseEvent(event);
 void DolphinDetailsView::mouseReleaseEvent(QMouseEvent* event)
 {
     QTreeView::mouseReleaseEvent(event);

-    m_controller->triggerActivation();
+    if (m_showElasticBand) {
+        updateElasticBand();
+        m_showElasticBand = false;
+    }

 }
 
 void DolphinDetailsView::dragEnterEvent(QDragEnterEvent* event)
 }
 
 void DolphinDetailsView::dragEnterEvent(QDragEnterEvent* event)


@@ -140,17 +200,81 @@ void DolphinDetailsView::dragEnterEvent(QDragEnterEvent* event)
     if (event->mimeData()->hasUrls()) {
         event->acceptProposedAction();
     }
     if (event->mimeData()->hasUrls()) {
         event->acceptProposedAction();
     }

+
+    if (m_showElasticBand) {
+        updateElasticBand();
+        m_showElasticBand = false;
+    }
+    m_dragging = true;
+}
+
+void DolphinDetailsView::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 DolphinDetailsView::dragMoveEvent(QDragMoveEvent* event)
+{
+    QTreeView::dragMoveEvent(event);
+
+    // TODO: remove this code when the issue #160611 is solved in Qt 4.4
+    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)
 {
     const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
 }
 
 void DolphinDetailsView::dropEvent(QDropEvent* event)
 {
     const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());

-    if (urls.isEmpty() || (event->source() == this)) {
-        QTreeView::dropEvent(event);
-    }
-    else {
+    if (!urls.isEmpty()) {

         event->acceptProposedAction();
         event->acceptProposedAction();

-        m_controller->indicateDroppedUrls(urls, event->pos());
+        m_controller->indicateDroppedUrls(urls,
+                                          indexAt(event->pos()),
+                                          event->source());
+    }
+    QTreeView::dropEvent(event);
+    m_dragging = false;
+}
+
+void DolphinDetailsView::paintEvent(QPaintEvent* event)
+{
+    QTreeView::paintEvent(event);
+    if (m_showElasticBand) {
+        // The following code has been taken from QListView
+        // and adapted to DolphinDetailsView.
+        // (C) 1992-2007 Trolltech ASA
+        QStyleOptionRubberBand opt;
+        opt.initFrom(this);
+        opt.shape = QRubberBand::Rectangle;
+        opt.opaque = false;
+        opt.rect = elasticBandRect();
+
+        QPainter painter(viewport());
+        painter.save();
+        style()->drawControl(QStyle::CE_RubberBand, &opt, &painter);
+        painter.restore();
+    }
+
+    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();

     }
 }
 
     }
 }
 


@@ -176,15 +300,36 @@ void DolphinDetailsView::synchronizeSortingState(int column)
     m_controller->indicateSortOrderChange(sortOrder);
 }
 
     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::updateElasticBand()
+{
+    Q_ASSERT(m_showElasticBand);
+    QRect dirtyRegion(elasticBandRect());
+    m_elasticBandDestination = viewport()->mapFromGlobal(QCursor::pos());
+    dirtyRegion = dirtyRegion.united(elasticBandRect());
+    setDirtyRegion(dirtyRegion);
+}
+

 void DolphinDetailsView::zoomIn()
 {
     if (isZoomInPossible()) {
         DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
         // TODO: get rid of K3Icon sizes
         switch (settings->iconSize()) {
 void DolphinDetailsView::zoomIn()
 {
     if (isZoomInPossible()) {
         DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
         // TODO: get rid of K3Icon sizes
         switch (settings->iconSize()) {

-            case K3Icon::SizeSmall:  settings->setIconSize(K3Icon::SizeMedium); break;
-            case K3Icon::SizeMedium: settings->setIconSize(K3Icon::SizeLarge); break;
-            default: Q_ASSERT(false); break;
+        case K3Icon::SizeSmall:  settings->setIconSize(K3Icon::SizeMedium); break;
+        case K3Icon::SizeMedium: settings->setIconSize(K3Icon::SizeLarge); break;
+        default: Q_ASSERT(false); break;

         }
         updateDecorationSize();
     }
         }
         updateDecorationSize();
     }


@@ -196,9 +341,9 @@ void DolphinDetailsView::zoomOut()
         DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
         // TODO: get rid of K3Icon sizes
         switch (settings->iconSize()) {
         DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
         // TODO: get rid of K3Icon sizes
         switch (settings->iconSize()) {

-            case K3Icon::SizeLarge:  settings->setIconSize(K3Icon::SizeMedium); break;
-            case K3Icon::SizeMedium: settings->setIconSize(K3Icon::SizeSmall); break;
-            default: Q_ASSERT(false); break;
+        case K3Icon::SizeLarge:  settings->setIconSize(K3Icon::SizeMedium); break;
+        case K3Icon::SizeMedium: settings->setIconSize(K3Icon::SizeSmall); break;
+        default: Q_ASSERT(false); break;

         }
         updateDecorationSize();
     }
         }
         updateDecorationSize();
     }


@@ -228,4 +373,29 @@ void DolphinDetailsView::updateDecorationSize()
     doItemsLayout();
 }
 
     doItemsLayout();
 }
 

+QPoint DolphinDetailsView::contentsPos() const
+{
+    // implementation note: the horizonal position is ignored currently, as no
+    // horizontal scrolling is done anyway during a selection
+    const QScrollBar* scrollbar = verticalScrollBar();
+    Q_ASSERT(scrollbar != 0);
+
+    const int maxHeight = maximumViewportSize().height();
+    const int height = scrollbar->maximum() - scrollbar->minimum() + 1;
+    const int visibleHeight = model()->rowCount() + 1 - height;
+    if (visibleHeight <= 0) {
+        return QPoint(0, 0);
+    }
+
+    const int y = scrollbar->sliderPosition() * maxHeight / visibleHeight;
+    return QPoint(0, y);
+}
+
+QRect DolphinDetailsView::elasticBandRect() const
+{
+    const QPoint pos(contentsPos());
+    const QPoint topLeft(m_elasticBandOrigin.x() - pos.x(), m_elasticBandOrigin.y() - pos.y());
+    return QRect(topLeft, m_elasticBandDestination).normalized();
+}
+

 #include "dolphindetailsview.moc"
 #include "dolphindetailsview.moc"